diff options
Diffstat (limited to 'pkgs/applications')
1076 files changed, 28778 insertions, 22518 deletions
diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 62a72fea62a0a..4d45de86f3a1f 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libtool ]; - NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; meta = with lib; { description = "ReplayGain for AAC files"; diff --git a/pkgs/applications/audio/aaxtomp3/default.nix b/pkgs/applications/audio/aaxtomp3/default.nix index 358dfce0d4f05..59bd228d4751a 100644 --- a/pkgs/applications/audio/aaxtomp3/default.nix +++ b/pkgs/applications/audio/aaxtomp3/default.nix @@ -1,31 +1,22 @@ -{ coreutils +{ bash +, bc +, coreutils , fetchFromGitHub , ffmpeg , findutils +, gawk , gnugrep , gnused , jq , lame , lib -, makeWrapper , mediainfo , mp4v2 -, stdenv +, ncurses +, resholve }: -let - runtimeInputs = [ - coreutils - ffmpeg - findutils - gnugrep - gnused - jq - lame - mediainfo - mp4v2 - ]; -in -stdenv.mkDerivation rec { + +resholve.mkDerivation rec { pname = "aaxtomp3"; version = "1.3"; @@ -36,17 +27,48 @@ stdenv.mkDerivation rec { hash = "sha256-7a9ZVvobWH/gPxa3cFiPL+vlu8h1Dxtcq0trm3HzlQg="; }; - dontBuild = false; - - nativeBuildInputs = [ makeWrapper ]; + postPatch = '' + substituteInPlace AAXtoMP3 \ + --replace 'AAXtoMP3' 'aaxtomp3' + substituteInPlace interactiveAAXtoMP3 \ + --replace 'AAXtoMP3' 'aaxtomp3' \ + --replace 'call="./aaxtomp3"' 'call="$AAXTOMP3"' + ''; installPhase = '' - install -Dm755 AAXtoMP3 $out/bin/aaxtomp3 - wrapProgram $out/bin/aaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs} - install -Dm755 interactiveAAXtoMP3 $out/bin/interactiveaaxtomp3 - wrapProgram $out/bin/interactiveaaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs} + install -Dm 755 AAXtoMP3 $out/bin/aaxtomp3 + install -Dm 755 interactiveAAXtoMP3 $out/bin/interactiveaaxtomp3 ''; + solutions.default = { + scripts = [ + "bin/aaxtomp3" + "bin/interactiveaaxtomp3" + ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + bc + coreutils + ffmpeg + findutils + gawk + gnugrep + gnused + jq + lame + mediainfo + mp4v2 + ncurses + ]; + keep."$call" = true; + fix = { + "$AAXTOMP3" = [ "${placeholder "out"}/bin/aaxtomp3" ]; + "$FIND" = [ "find" ]; + "$GREP" = [ "grep" ]; + "$SED" = [ "sed" ]; + }; + }; + meta = with lib; { description = "Convert Audible's .aax filetype to MP3, FLAC, M4A, or OPUS"; homepage = "https://krumpetpirate.github.io/AAXtoMP3"; diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index a0f5b48a63231..a5d82b6e00ddd 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { "-DADLplug_Jack=${if withJack then "ON" else "OFF"}" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ # "fp.h" file not found "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers" ]); diff --git a/pkgs/applications/audio/aether-lv2/default.nix b/pkgs/applications/audio/aether-lv2/default.nix index e912c7fa49a42..6710aaa87f4e3 100644 --- a/pkgs/applications/audio/aether-lv2/default.nix +++ b/pkgs/applications/audio/aether-lv2/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { lv2 libX11 libGL libGLU mesa ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + "-Wno-error=stringop-overflow" + ]; + installPhase = '' mkdir -p $out/lib/lv2 cp -r aether.lv2 $out/lib/lv2 diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 6ed488d7d643f..a57f43eea651a 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper -, qt5, requireFile, unzip, wine +{ lib, + stdenv, + multiStdenv, + fetchFromGitHub, + requireFile, + unzip, + wine, + cmake, + makeWrapper, + wrapQtAppsHook, + file, + libX11, + qt5 }: let @@ -13,11 +24,11 @@ let }; vst-sdk = stdenv.mkDerivation rec { - name = "vstsdk368_08_11_2017_build_121"; + name = "vstsdk369_01_03_2018_build_132"; src = requireFile { name = "${name}.zip"; url = "http://www.steinberg.net/en/company/developers.html"; - sha256 = "e0f235d8826d70f1ae0ae5929cd198acae1ecff74612fde5c60cbfb45c2f4a70"; + sha256 = "0r29fv6yhm2m5yznn8m4my7fq01w1lpphax4sshagy6b1dgjlv3w"; }; nativeBuildInputs = [ unzip ]; installPhase = "cp -r . $out"; @@ -42,9 +53,18 @@ multiStdenv.mkDerivation { src = airwave-src; - nativeBuildInputs = [ cmake makeWrapper ]; - - buildInputs = [ file libX11 qt5.qtbase wine-xembed ]; + nativeBuildInputs = [ + cmake + makeWrapper + wrapQtAppsHook + ]; + + buildInputs = [ + file + libX11 + qt5.qtbase + wine-xembed + ]; postPatch = '' # Binaries not used directly should land in libexec/. diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix index b58dbddc811ff..15db4c1cf03d9 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 = "14.0"; + version = "16.0"; src = fetchFromGitHub { owner = "hannesbraun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-urlj9XwMqKt5JvvsA1f7YpuLhQXMGxp0V1pGv+LTroE="; + sha256 = "sha256-jdeJ/VAJTDeiR9pyYps82F2Ty16r+a/FK+XV5L3rWco="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 276b3d6c7bc22..e48e27b5cc699 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -4,7 +4,6 @@ , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem , fftw, phonon, plasma-framework, threadweaver, breeze-icons , curl, ffmpeg, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mariadb-embedded, pcre, snappy, taglib, taglib_extras -, pmdk, numactl }: mkDerivation rec { diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index 3051dc7ceb828..ed421277f9d07 100644 --- a/pkgs/applications/audio/amberol/default.nix +++ b/pkgs/applications/audio/amberol/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "amberol"; - version = "0.9.2"; + version = "unstable-2023-01-12"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; - rev = version; - hash = "sha256-L8yHKwtCAZC1myIouL0Oq3lj0QPWn5dVe0g3nkyAKI8="; + rev = "0623386c813d0d68564002324958cef7217cec7f"; + hash = "sha256-nVL4ydTg4ncDCA9J9qWv+RPDC0Txr/qpo5XxIUiV0zQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-0XuWBUG37GNHRXgjz0/Vv6VSqaPG36xTj7oN0ukFIJY="; + hash = "sha256-E0ivUWD3jP/T1GOJ11grDwcF+m92I+W2a2HhZX1bCso="; }; postPatch = '' diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix index acd8bf1f74f0b..c51dced37724d 100644 --- a/pkgs/applications/audio/ams/default.nix +++ b/pkgs/applications/audio/ams/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Realtime modular synthesizer for ALSA"; - homepage = "http://alsamodular.sourceforge.net"; + homepage = "https://alsamodular.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ sjfloat ]; diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix index bd5a644857409..0184b042888b8 100644 --- a/pkgs/applications/audio/ashuffle/default.nix +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -6,24 +6,24 @@ , meson , ninja , libmpdclient -, libyamlcpp +, yaml-cpp }: stdenv.mkDerivation rec { pname = "ashuffle"; - version = "3.13.4"; + version = "3.13.6"; src = fetchFromGitHub { owner = "joshkunz"; repo = "ashuffle"; rev = "v${version}"; - sha256 = "sha256-J6NN0Rsc9Zw9gagksDlwpwEErs+4XmrGF9YHKlAE1FA="; + sha256 = "sha256-8XjLs4MI5MXvA6veCoTAj8tlYDe7YTggutO3F9eNyMM="; fetchSubmodules = true; }; dontUseCmakeConfigure = true; nativeBuildInputs = [ cmake pkg-config meson ninja ]; - buildInputs = [ libmpdclient libyamlcpp ]; + buildInputs = [ libmpdclient yaml-cpp ]; mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ]; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 44ba848bc2b70..4a652e1ac474d 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Audacity-${version}"; - sha256 = "sha256-0F9+4hyUoKb0UP5t02yws/ErogscvI1nsdnSTpcr53E="; + hash = "sha256-gz2o0Rj4364nJAvJmMQzwIQycoQmqz2/43DBvd3qbho="; }; postPatch = '' diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index bb89cb45672bd..aaf6777533ffd 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; # https://bugs.launchpad.net/audio-recorder/+bug/1784622 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 875daa196d5dd..0cb33062bd0ed 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -1,39 +1,67 @@ -{ mkDerivation -, stdenv +{ stdenv , lib , fetchFromGitHub -, qmake , pkg-config -, qttools +, qmake +, qt5compat ? null , qtbase +, qttools , rtaudio , rtmidi +, wrapQtAppsHook }: -mkDerivation rec { +assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null; + +stdenv.mkDerivation rec { pname = "bambootracker"; - version = "0.5.3"; + version = "0.6.1"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-OaktEUWWDEW+MYnQkaB8FvkuH29VDXFqBVSTEJ7Sz7A="; + hash = "sha256-Ymi1tjJCgStF0Rtseelq/YuTtBs2PrbF898TlbjyYUw="; }; - nativeBuildInputs = [ qmake qttools pkg-config ]; + postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") '' + # Work around lrelease finding in qmake being broken by using pre-Qt5.12 code path + # https://github.com/NixOS/nixpkgs/issues/214765 + substituteInPlace BambooTracker/lang/lang.pri \ + --replace 'equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12)' 'if(true)' + ''; + + nativeBuildInputs = [ + pkg-config + qmake + qttools + wrapQtAppsHook + ]; - buildInputs = [ qtbase rtaudio rtmidi ]; + buildInputs = [ + qtbase + rtaudio + rtmidi + ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [ + qt5compat + ]; - qmakeFlags = [ "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ]; + qmakeFlags = [ + "CONFIG+=system_rtaudio" + "CONFIG+=system_rtmidi" + ]; postConfigure = "make qmake_all"; + # Wrapping the inside of the app bundles, avoiding double-wrapping + dontWrapQtApps = stdenv.hostPlatform.isDarwin; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/{bin,Applications}/BambooTracker.app ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker + wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker ''; meta = with lib; { diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 6c48c756ab24c..919768d58ed73 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -66,6 +66,10 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + postPatch = '' + sed '1i#include <memory>' -i Source/TitleBar.h # gcc12 + ''; + cmakeBuildType = "Release"; cmakeFlags = lib.optionals enableVST2 [ "-DBESPOKE_VST2_SDK_LOCATION=${vst-sdk}/VST2_SDK" ]; @@ -104,7 +108,7 @@ stdenv.mkDerivation rec { CoreAudioKit ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ # Fails to find fp.h on its own "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/" ]); diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index b96155cf688bf..39227fd065227 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: brightonCLI.o:/build/bristol-0.60.11/brighton/brightonCLI.c:139: multiple definition of # `event'; brightonMixerMenu.o:/build/bristol-0.60.11/brighton/brightonMixerMenu.c:1182: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preInstall = '' sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A range of synthesiser, electric piano and organ emulations"; - homepage = "http://bristol.sourceforge.net"; + homepage = "https://bristol.sourceforge.net"; license = licenses.gpl3; platforms = ["x86_64-linux" "i686-linux"]; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 4ab651e3fb847..e4e679e780828 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "17x4hylgq4dn9qycsdacfxy64f5cv57n2qgkvsdp524gnqzw4az3"; }; + outputs = [ "out" "doc" ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkg-config ]; @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://calf-studio-gear.org"; + homepage = "https://calf-studio-gear.org"; description = "A set of high quality open source audio plugins for musicians"; license = licenses.lgpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index 562a53fe59275..221febf35dcd1 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "callaudiod"; - version = "0.1.4"; + version = "0.1.7"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "mobian1"; repo = pname; rev = version; - sha256 = "sha256-71+9ALz55aqxXRBRwOcs9fwiQK31pJ9E72pGRmt0OkE="; + sha256 = "sha256-BDEu3ASlnovMK0lQC+CQvpXvtdt33BRntstPAWaAnsg="; }; strictDeps = true; diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 68eb295c48525..358c1f0e7900e 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -2,6 +2,9 @@ stdenv , fetchFromGitHub , fetchurl +, cmake +, dbus +, file , freetype , jansson , lib @@ -11,32 +14,44 @@ , libXext , libXrandr , libarchive +, libjack2 , liblo , libsamplerate -, mesa +, libsndfile +, makeWrapper , pkg-config , python3 , speexdsp +, libglvnd }: stdenv.mkDerivation rec { pname = "cardinal"; - version = "22.11"; + version = "22.12"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - sha256 = "sha256-xYQi209whY5/lN+6Fp7PTp7JSzL6RS6VL+Exst7RrS0="; + sha256 = "sha256-fyko5cWjBNNaw8qL9uyyRxW5MFXKmOsBoR5u05AWxWY="; }; prePatch = '' patchShebangs ./dpf/utils/generate-ttl.sh ''; + dontUseCmakeConfigure = true; enableParallelBuilding = true; + strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + cmake + file + pkg-config + makeWrapper + python3 + ]; buildInputs = [ + dbus freetype jansson libGL @@ -44,18 +59,25 @@ stdenv.mkDerivation rec { libXcursor libXext libXrandr - libXrandr libarchive liblo libsamplerate - mesa - python3 + libsndfile speexdsp + libglvnd ]; hardeningDisable = [ "format" ]; makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram $out/bin/Cardinal \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]} + + # this doesn't work and is mainly just a test tool for the developers anyway. + rm -f $out/bin/CardinalNative + ''; + meta = { description = "Plugin wrapper around VCV Rack"; homepage = "https://github.com/DISTRHO/cardinal"; diff --git a/pkgs/applications/audio/cavalier/default.nix b/pkgs/applications/audio/cavalier/default.nix new file mode 100644 index 0000000000000..17fdabc5bc0db --- /dev/null +++ b/pkgs/applications/audio/cavalier/default.nix @@ -0,0 +1,68 @@ +{ lib +, python3 +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gobject-introspection +, glib +, gtk4 +, librsvg +, libadwaita +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +, cava +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cavalier"; + version = "2023.01.29"; + format = "other"; + + src = fetchFromGitHub { + owner = "fsobolev"; + repo = pname; + rev = version; + hash = "sha256-6bvi73cFQHtIyD4d4+mqje0qkmG4wkahZ2ohda5RvRQ="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + librsvg + libadwaita + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + ]; + + # Prevent double wrapping + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH ":" "${lib.makeBinPath [ cava ]}" + ) + ''; + + meta = with lib; { + description = "Audio visualizer based on CAVA with customizable LibAdwaita interface"; + homepage = "https://github.com/fsobolev/cavalier"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index bb0e885cd7465..a62337d7d55ac 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.4.1.1"; + version = "1.4.2.0"; pname = "chuck"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "sha256-RFnubxUdpy3N4VJeCv4FMp1hCGNWsWjs/AvDpXApD2M="; + sha256 = "sha256-hIwsC9rYgXWSTFqUufKGqoT0Gnsf4nR4KQ0iSVbj8xg="; }; nativeBuildInputs = [ flex bison which ] diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index dc8ea92ae2421..6afddb467d0d3 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -3,6 +3,7 @@ , AudioUnit , CoreAudio , CoreMIDI +, portaudio , alsa-lib ? null , libpulseaudio ? null , libjack2 ? null @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ] ++ lib.optionals stdenv.isDarwin [ - Accelerate AudioUnit CoreAudio CoreMIDI + Accelerate AudioUnit CoreAudio CoreMIDI portaudio ] ++ lib.optionals stdenv.isLinux (builtins.filter (optional: optional != null) [ alsa-lib libpulseaudio libjack2 liblo ladspa-sdk fluidsynth eigen diff --git a/pkgs/applications/audio/eartag/default.nix b/pkgs/applications/audio/eartag/default.nix index 0db9da5d2161d..8a4ffab5dc1fe 100644 --- a/pkgs/applications/audio/eartag/default.nix +++ b/pkgs/applications/audio/eartag/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitLab , meson , ninja , pkg-config @@ -18,14 +18,15 @@ python3Packages.buildPythonApplication rec { pname = "eartag"; - version = "0.3.1"; + version = "0.3.2"; format = "other"; - src = fetchFromGitHub { + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; owner = "knuxify"; repo = pname; - rev = "refs/tags/${version}"; - sha256 = "sha256-gN3V5ZHlhHp52Jg/i+hDLEDpSvP8yFngujyw5ZncQQg="; + rev = version; + sha256 = "sha256-XvbfQtE8LsztQ2VByG2jLYND3qVpH6owdAgh3b//lI4="; }; postPatch = '' @@ -67,7 +68,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - homepage = "https://github.com/knuxify/eartag"; + homepage = "https://gitlab.gnome.org/knuxify/eartag"; description = "Simple music tag editor"; # This seems to be using ICU license but we're flagging it to MIT license # since ICU license is a modified version of MIT and to prevent it from diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix index 0c48c582c4fc2..776698a06d0d7 100644 --- a/pkgs/applications/audio/eflite/default.nix +++ b/pkgs/applications/audio/eflite/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { CFLAGS = lib.optionalString debug " -DDEBUG=2"; meta = { - homepage = "http://eflite.sourceforge.net"; + homepage = "https://eflite.sourceforge.net"; description = "Speech server for screen readers"; longDescription = '' EFlite is a speech server for Emacspeak and other screen diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 84eb4e1d39c92..28b60fa600743 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "espeak-ng"; - version = "1.51"; + version = "1.51.1"; src = fetchFromGitHub { owner = "espeak-ng"; repo = "espeak-ng"; rev = version; - hash = "sha256-KwzMlQ3/JgpNOpuV4zNc0zG9oWEGFbVSJ4bEd3dtD3Y="; + hash = "sha256-aAJ+k+kkOS6k835mEW7BvgAIYGhUHxf7Q4P5cKO8XTk="; }; patches = lib.optionals mbrolaSupport [ diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index 2c59068720d08..7164cb5fd3e0c 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { prePatch = '' sed -e s,/bin/ln,ln,g -i src/Makefile sed -e 's,^CXXFLAGS=-O2,CXXFLAGS=-O2 -D PATH_ESPEAK_DATA=\\\"$(DATADIR)\\\",' -i src/Makefile - '' + (if portaudio.api_version == 19 then '' + '' + (lib.optionalString (portaudio.api_version == 19) '' cp src/portaudio19.h src/portaudio.h - '' else ""); + ''); configurePhase = '' cd src diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix index be6e0fcca228a..2350bde0bd6ac 100644 --- a/pkgs/applications/audio/fdkaac/default.nix +++ b/pkgs/applications/audio/fdkaac/default.nix @@ -2,24 +2,15 @@ stdenv.mkDerivation rec { pname = "fdkaac"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "nu774"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7a8JlQtMGuMWgU/HePd31/EvtBNc2tBMz8V8NQivuNo="; + sha256 = "sha256-GYvI9T5Bv2OcK0hMAQE7/tE6ajDyqkaak66b3Hc0Fls="; }; - patches = [ - # To be removed when 1.0.4 is released, see https://github.com/nu774/fdkaac/issues/54 - (fetchpatch { - name = "CVE-2022-37781.patch"; - url = "https://github.com/nu774/fdkaac/commit/ecddb7d63306e01d137d65bbbe7b78c1e779943c.patch"; - sha256 = "sha256-uZPf5tqBmF7VWp1fJcjp5pbYGRfzqgPZpBHpkdWYkV0="; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ fdk_aac ]; diff --git a/pkgs/applications/audio/fire/default.nix b/pkgs/applications/audio/fire/default.nix index 54d5bba446618..93536944d96dd 100644 --- a/pkgs/applications/audio/fire/default.nix +++ b/pkgs/applications/audio/fire/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { ''; # Fails to find fp.h on its own - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/"; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/applications/audio/flac2all/default.nix b/pkgs/applications/audio/flac2all/default.nix new file mode 100644 index 0000000000000..e0681b94f6837 --- /dev/null +++ b/pkgs/applications/audio/flac2all/default.nix @@ -0,0 +1,45 @@ +{ python3Packages, lib, flac, lame, opusTools, vorbis-tools, ffmpeg }: + +python3Packages.buildPythonApplication rec { + pname = "flac2all"; + version = "5.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "OBjlr7cbSx2WOIfZUNwHy5Hpb2Fmh3vmZdc70JiWsiI="; + }; + + # Not sure why this is needed, but setup.py expects this to be set + postPatch = '' + echo ${version} > ./flac2all_pkg/version + ''; + + propagatedBuildInputs = [ + python3Packages.pyzmq + ]; + + postInstall = '' + wrapProgram $out/bin/flac2all \ + --set PATH ${lib.makeBinPath [ + # Hard requirements + flac + lame + # Optional deps depending on encoding types + opusTools + vorbis-tools + ffmpeg + ]} + ''; + + # Has no standard tests, so we verify a few imports instead. + doCheck = false; + pythonImportsCheck = [ "flac2all_pkg.vorbis" "flac2all_pkg.mp3" ]; + + meta = with lib; { + description = "Multi process, clustered, FLAC to multi codec audio converter with tagging support"; + homepage = "https://github.com/ZivaVatra/flac2all"; + license = licenses.gpl3; + # TODO: This has only been tested on Linux, but may work on Mac too. + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 98b9faf8d24ac..4564fcccc4e16 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "9.5.1"; + version = "10.0.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "sha256-45aA2Ib69Gb1Mg/5907rp1nfRbNyQq12pm/aFwTdgeA="; + sha256 = "sha256-59p5x+d7Vmxx+bdBDxrlf4+NRIdUBuRk+DqohV98XYY="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index cbed4b36181eb..df42258700cad 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "sha256-7SuM7a8IIecAJ83QvJfUba/wArAEXywqL2HwVbeG8H4="; + sha256 = "05lr9f0q4x1kvgfa3xrfmagpwvijv9m1s316aa9figqlkcc5vv4k"; }; nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index b7afb0d57a03a..531352d0ed949 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ]; })) ]; - NIX_CFLAGS_COMPILE = toString + env.NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ]); hardeningDisable = [ "format" ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { software, released under the GNU GPL license. '' ; - homepage = "http://freewheeling.sourceforge.net"; + homepage = "https://freewheeling.sourceforge.net"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.sepi ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix index 0f15775b38d54..372a873ca5804 100644 --- a/pkgs/applications/audio/furnace/default.nix +++ b/pkgs/applications/audio/furnace/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "furnace"; - version = "0.6pre3"; + version = "0.6pre4-hotfix"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-bHVeTw69k6LLcrfkmGxvjlFfR/hWiCfm/P3utknid1o="; + sha256 = "sha256-lJtV/0GnWN5mSjv2LaPEMnkuThaNeijBMjLGFPOJX4k="; }; nativeBuildInputs = [ @@ -63,6 +63,12 @@ stdenv.mkDerivation rec { "-DWARNINGS_ARE_ERRORS=ON" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but breaks on darwin (with clang) or aarch64 (old gcc) + "-Wno-error=mismatched-new-delete" + "-Wno-error=use-after-free" + ]); + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # Normal CMake install phase on Darwin only installs the binary, the user is expected to use CPack to build a # bundle. That adds alot of overhead for not much benefit (CPack is currently abit broken, and needs impure access diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index 15eccc46943fa..c5dcec05a9d1d 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-w" "-Wno-error" ]; diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index 42b28eacc4f46..e7753ef28e6b3 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: src/net/../gnauralnet.h:233: multiple definition of `GN_ScheduleFingerprint'; # src/net/../../src/gnauralnet.h:233: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; postInstall = '' mkdir -p $out/share/applications diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix new file mode 100644 index 0000000000000..e08400220790f --- /dev/null +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, clangStdenv +, pkg-config +, alsa-lib +, flac +}: + +# gcc only supports objc on darwin +buildGoModule.override { stdenv = clangStdenv; } rec { + pname = "go-musicfox"; + version = "3.7.0"; + + src = fetchFromGitHub { + owner = "anhoder"; + repo = pname; + rev = "v${version}"; + hash = "sha256-IXB5eOXVtoe21WbQa9x5SKcgUpgyjVx48998vdccMPM="; + }; + + deleteVendor = true; + + vendorHash = null; + + subPackages = [ "cmd/musicfox.go" ]; + + ldflags = [ + "-s" + "-w" + "-X go-musicfox/pkg/constants.AppVersion=${version}" + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsa-lib + flac + ]; + + meta = with lib; { + description = "Terminal netease cloud music client written in Go"; + homepage = "https://github.com/anhoder/go-musicfox"; + license = licenses.mit; + mainProgram = "musicfox"; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 1b20f306166f8..f988e5cd1d420 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.9.4-1"; + version = "3.9.5-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-10gcVxMLhMXUblvJYLj0TTwGFl1YHI7HU3TfHXtJ+24="; + sha256 = "sha256-5OqTQBOYE6XU3BRiVwXOHrn22bVZzIIeZI8pgsWxhPw="; }; postPatch = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "-DINSTALL_DEPEND=OFF" ] ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF"; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications,bin,lib} @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { meta = { description = "Virtual Pipe Organ Software"; - homepage = "https://sourceforge.net/projects/ourorgan"; - license = lib.licenses.gpl2; + homepage = "https://github.com/GrandOrgue/grandorgue"; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.puzzlewolf ]; }; diff --git a/pkgs/applications/audio/gtkcord4/default.nix b/pkgs/applications/audio/gtkcord4/default.nix index 5611407cfe913..f5b2cf5576e3d 100644 --- a/pkgs/applications/audio/gtkcord4/default.nix +++ b/pkgs/applications/audio/gtkcord4/default.nix @@ -5,24 +5,27 @@ , glib , gobject-introspection , graphene +, gst_all_1 , gtk4 , lib , libadwaita +, libcanberra-gtk3 , pango , pkg-config +, sound-theme-freedesktop , withLibadwaita ? false , wrapGAppsHook4 }: buildGoModule rec { pname = "gtkcord4"; - version = "0.0.6"; + version = "0.0.9"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - hash = "sha256-uEG1pAHMQT+C/E5rKByflvL0NNkC8SeSPMAXanzvhE4="; + hash = "sha256-55mS+hrhLLRkhgih5lvdM9Xka+WKg2iliFm6TYF6n3w="; }; nativeBuildInputs = [ @@ -38,6 +41,14 @@ buildGoModule rec { graphene gtk4 pango + # Optional according to upstream but required for sound and video + 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 + libcanberra-gtk3 + sound-theme-freedesktop ] ++ lib.optionals withLibadwaita [ libadwaita ]; @@ -45,12 +56,12 @@ buildGoModule rec { tags = lib.optionals withLibadwaita [ "libadwaita" ]; postInstall = '' - install -D -m 444 -t $out/share/applications .nix/com.github.diamondburned.gtkcord4.desktop + 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 ''; - vendorHash = "sha256-QZSjSk1xu5ZcrNEra5TxnUVvlQWb5/h31fm5Nc7WMoI="; + vendorHash = "sha256-IQpokMeo46vZIdVA1F7JILXCN9bUqTMOCa/SQ0JSjaM="; meta = with lib; { description = "GTK4 Discord client in Go, attempt #4."; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 220d2d38e145d..a16ad3c932017 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: .libs/autodetection.o:/build/gtkpod-2.1.5/libgtkpod/gtkpod_app_iface.h:248: multiple definition of # `gtkpod_app'; .libs/gtkpod_app_iface.o:/build/gtkpod-2.1.5/libgtkpod/gtkpod_app_iface.h:248: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 870f4b216f51f..3033888996a19 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { "--install-roboto-font" ] ++ optional optimizationSupport "--optimization"; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ]; meta = with lib; { description = "A virtual guitar amplifier for Linux running with JACK"; diff --git a/pkgs/applications/audio/gwc/default.nix b/pkgs/applications/audio/gwc/default.nix index aeb64b92c88ad..29bfc047e1993 100644 --- a/pkgs/applications/audio/gwc/default.nix +++ b/pkgs/applications/audio/gwc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "gwc"; - version = "0.22-05"; + version = "0.22-06"; src = fetchFromGitHub { owner = "AlisterH"; repo = pname; rev = version; - sha256 = "sha256-FHKu5qAyRyMxXdWYTCeAc6Q4J+NOaU1SGgoTbe0PiFE="; + sha256 = "sha256-hRwy++gZiW/olIIeiVTpdIjPLIHgvgVUGEaUX9tpFbY="; }; nativeBuildInputs = [ @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GUI application for removing noise (hiss, pops and clicks) from audio files"; homepage = "https://github.com/AlisterH/gwc/"; + changelog = "https://github.com/AlisterH/gwc/blob/${version}/Changelog"; license = licenses.gpl2Plus; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index 5e8747f765669..847096c38816f 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "GxPlugins.lv2"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "brummer10"; repo = pname; rev = "v${version}"; - sha256 = "02fksl8wr443ygwgcd1c2zab8kp67a6ps12k71ysqx7szv4zq877"; + sha256 = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index 684f074b4e612..78891967fa41d 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -16,20 +16,20 @@ stdenv.mkDerivation rec { pname = "helvum"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "pipewire"; repo = pname; rev = version; - sha256 = "0nhv6zw2zzxz2bg2zj32w1brywnm5lv6j3cvmmvwshc389z2k5x1"; + hash = "sha256-TvjO7fGobGmAltVHeXWyMtMLANdVWVGvBYq20JD3mMI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-EIHO9qVPIXgezfFOaarlTU0an762nFmX1ELbQuAZ7rY"; + hash = "sha256-W5Imlut30cjV4A6TCjBFLbViB0CDUucNsvIUiCXqu7I="; }; nativeBuildInputs = [ @@ -50,9 +50,6 @@ stdenv.mkDerivation rec { pipewire ]; - # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream - NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; - meta = with lib; { description = "A GTK patchbay for pipewire"; homepage = "https://gitlab.freedesktop.org/pipewire/helvum"; diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 420c11562e2a0..8cf55289b2f33 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ladspaH gtk2 alsa-lib libxml2 lrdf ]; - NIX_LDFLAGS = "-ldl -lm -lpthread"; + NIX_LDFLAGS = "-lm -lpthread"; meta = { description = ''An effects "rack" for the JACK low latency audio API''; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 70cb4d7f11094..e130d9a642d42 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -19,16 +19,14 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: jamin-preferences.o:/build/jamin-0.95.0/src/hdeq.h:64: multiple definition of # `l_notebook1'; jamin-callbacks.o:/build/jamin-0.95.0/src/hdeq.h:64: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; - - NIX_LDFLAGS = "-ldl"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; postInstall = '' wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa ''; meta = with lib; { - homepage = "http://jamin.sourceforge.net"; + homepage = "https://jamin.sourceforge.net"; description = "JACK Audio Mastering interface"; license = licenses.gpl2; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index d9d7bf19e7d61..7a1676e7873c5 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, jre }: +{ stdenv, lib, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { pname = "JMusicBot"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib cp $src $out/lib/JMusicBot - makeWrapper ${jre}/bin/java $out/bin/JMusicBot \ + makeWrapper ${jre_headless}/bin/java $out/bin/JMusicBot \ --add-flags "-Xmx1G -Dnogui=true -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -jar $out/lib/JMusicBot" ''; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; - platforms = platforms.all; + inherit (jre_headless.meta) platforms; }; } diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/applications/audio/klystrack/default.nix index 362c76a0d4dec..9ea5f40be14bb 100644 --- a/pkgs/applications/audio/klystrack/default.nix +++ b/pkgs/applications/audio/klystrack/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # ld: libengine_gui.a(gui_menu.o):(.bss+0x0): multiple definition of # `menu_t'; objs.release/action.o:(.bss+0x20): first defined here # TODO: remove it for 1.7.7+ release as it was fixed upstream. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; buildFlags = [ "PREFIX=${placeholder "out"}" "CFG=release" ]; diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index 47a36ed1b5dfd..8055683a3fcf4 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl }: + stdenv.mkDerivation rec { pname = "ladspa-sdk"; version = "1.15"; @@ -7,12 +8,27 @@ stdenv.mkDerivation rec { sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2"; }; + sourceRoot = "ladspa_sdk_${version}/src"; + + strictDeps = true; + patchPhase = '' - cd src sed -i 's@/usr/@$(out)/@g' Makefile - sed -i 's@-mkdirhier@mkdir -p@g' Makefile ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CPP=${stdenv.cc.targetPrefix}c++" + ]; + + # The default target also runs tests, which we don't want to do in + # the build phase as it would break cross. + buildFlags = [ "targets" ]; + + # Tests try to create and play a sound file. Playing will fail, but + # it's probably still useful to run the part that creates the file. + doCheck = true; + meta = { description = "The SDK for the LADSPA audio plugin standard"; longDescription = '' diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix new file mode 100644 index 0000000000000..04216bdf09f6f --- /dev/null +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitea +, pkg-config +, stdenv +, openssl +, libiconv +, Security }: + +rustPlatform.buildRustPackage rec { + pname = "listenbrainz-mpd"; + version = "2.0.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "elomatreb"; + repo = "listenbrainz-mpd"; + rev = "v${version}"; + hash = "sha256-DO7YUqaJZyVWjiAZ9WIVNTTvOU0qdsI2ct7aT/6O5dQ="; + }; + + cargoHash = "sha256-MiAalxe0drRHrST3maVvi8GM2y3d0z4Zl7R7Zx8VjEM="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]; + + meta = with lib; { + homepage = "https://codeberg.org/elomatreb/listenbrainz-mpd"; + changelog = "https://codeberg.org/elomatreb/listenbrainz-mpd/src/tag/v${version}/CHANGELOG.md"; + description = "ListenBrainz submission client for MPD"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ DeeUnderscore ]; + }; +} diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index abeaa7dff4270..846936e65f6a7 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ "PLATFORM=DEB" ] ++ lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ]; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ] ++ - lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; + env.NIX_CFLAGS_COMPILE = toString ([ "-fpermissive" ] ++ + lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"); NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework Foundation"; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 3ee546de223b3..005bef77d4567 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,5 +1,5 @@ { lib -, fetchgit +, fetchFromGitLab , nix-update-script , meson , ninja @@ -9,7 +9,7 @@ , gst_all_1 , libhandy , libsecret -, libsoup +, libsoup_3 , appstream-glib , desktop-file-utils , totem-pl-parser @@ -25,16 +25,17 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.35"; + version = "1.4.37"; format = "other"; - doCheck = false; - src = fetchgit { - url = "https://gitlab.gnome.org/World/lollypop"; - rev = "refs/tags/${version}"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = pname; + rev = version; fetchSubmodules = true; - sha256 = "sha256-Rdp0gZjdj2tXOWarsTpqgvSZVXAQsCLfk5oUyalE/ZA="; + sha256 = "sha256-3GPmGNbbSxvLq0t3F9q1x64BwNQCEvFQWLb0bSO9KUY="; }; nativeBuildInputs = [ @@ -59,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { gstreamer gtk3 libhandy - libsoup + libsoup_3 pango totem-pl-parser ] ++ lib.optional lastFMSupport libsecret; @@ -98,7 +99,6 @@ python3.pkgs.buildPythonApplication rec { updateScript = nix-update-script { }; }; - meta = with lib; { changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; description = "A modern music player for GNOME"; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index be841577ad79b..c3d8671b26dd1 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -4,22 +4,24 @@ , ladspaH, php, libXrandr }: stdenv.mkDerivation rec { - pname = "lsp-plugins"; - version = "1.2.4"; + pname = "lsp-plugins"; + version = "1.2.5"; - src = fetchurl { - url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-GTrcUy10bN9Xj2I7uuGyP82c6NVpnQbXTI85H231yyo="; - }; + src = fetchurl { + url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; + sha256 = "sha256-YYrt+FbpY7iEui0aw4Ce94BW1SHDk0OH8gFSzkW2fkw="; + }; - nativeBuildInputs = [ pkg-config php makeWrapper ]; - buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH libXrandr ]; + outputs = [ "out" "dev" "doc" ]; - makeFlags = [ - "PREFIX=${placeholder "out"}" + nativeBuildInputs = [ pkg-config php makeWrapper ]; + buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH libXrandr ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" ]; - NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; + env.NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; configurePhase = '' make config PREFIX=${placeholder "out"} diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix index 9a046a2e11aac..2ba12575543c1 100644 --- a/pkgs/applications/audio/mi2ly/default.nix +++ b/pkgs/applications/audio/mi2ly/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = [ "-fgnu89-inline" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-fgnu89-inline" ]; buildPhase = "./cc"; installPhase = '' diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index 7e11c0a8d75fd..2819e288ec115 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation rec { pcre2 ] ++ lib.optional pulseaudioSupport libpulseaudio; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=free-nonheap-object" + ]; + postInstall = '' wrapProgram $out/bin/mimic \ --run "export ALSA_PLUGIN_DIR=${alsa-plugins}/lib/alsa-lib" diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/applications/audio/mmtc/default.nix index 5a229f0ae3485..ccbe14d767252 100644 --- a/pkgs/applications/audio/mmtc/default.nix +++ b/pkgs/applications/audio/mmtc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mmtc"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7jQwa4BfyI1CPnMt1YEP9rE6cok90FbEJpyLAPFuxtE="; + sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4="; }; - cargoSha256 = "sha256-f18aXs8PyA0IaGnPG568ZB/oPsAO+U44WsoDNEgKKXk="; + cargoSha256 = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index 0d65fe813ec19..8d4a63f3b9ef1 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libvorbis ] ++ lib.optional stdenv.isDarwin SDL; - NIX_CFLAGS_COMPILE = toString ([ + env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-reserved-user-defined-literal" diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index 9a693c0eaa39f..7746d1c63fa83 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: /build/cc566Cj9.o:(.bss+0x0): multiple definition of `mpc123_file_reader'; ao.o:(.bss+0x40): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; buildInputs = [ gettext libmpcdec libao ]; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 29f28203e1389..3eb2cf20ee777 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "mpg123"; - version = "1.29.3"; + version = "1.31.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ljiF2Mx3Ji8ot3GHx9GJ4yGV5kJE3iUwt5jd8yGD6Ec="; + sha256 = "sha256-sX8ikF4x9DtrQB399qce0Ru30Fb2jbRJ1wufmug5x94="; }; outputs = [ "out" ] ++ lib.optionals withConplay [ "conplay" ]; diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 4a73ddf03c877..e00b6722f38d6 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: volume.o:/build/mpg321-0.3.2-orig/mpg321.h:119: multiple definition of # `loop_remaining'; mpg321.o:/build/mpg321-0.3.2-orig/mpg321.h:119: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; configureFlags = [ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ] diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 065c943764ea1..5663070d7dfeb 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libsamplerate libsndfile lilv lrdf lv2 qtsvg rtaudio rubberband sord ]; - NIX_CFLAGS_COMPILE = [ "-I${lib.getDev serd}/include/serd-0" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev serd}/include/serd-0" ]; meta = with lib; { homepage = "https://muse-sequencer.github.io/"; diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 88b5d3b74c150..652adb03b66ac 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -1,8 +1,9 @@ { stdenv, lib, fetchurl, undmg }: let - versionComponents = [ "3" "6" "2" "548020600" ]; + versionComponents = [ "4" "0" "1" ]; appName = "MuseScore ${builtins.head versionComponents}"; + ref = "230121751"; in stdenv.mkDerivation rec { @@ -13,8 +14,8 @@ stdenv.mkDerivation rec { sourceRoot = "${appName}.app"; src = fetchurl { - url = "https://github.com/musescore/MuseScore/releases/download/v${lib.concatStringsSep "." (lib.take 3 versionComponents)}/MuseScore-${version}.dmg"; - sha256 = "sha256-lHckfhTTrDzaGwlbnZ5w0O1gMPbRmrmgATIGMY517l0="; + url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.${ref}.dmg"; + hash = "sha256-tkIEV+tCS0SYh2TlC70/zEBUEOSg//EaSKDGA7kH/vo="; }; buildInputs = [ undmg ]; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 573a78a92583b..97f71a1b48f8a 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,28 +1,35 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, ninja , alsa-lib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects +, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects, flac , qtquickcontrols2, qtscript, qtsvg, qttools -, qtwebengine, qtxmlpatterns +, qtwebengine, qtxmlpatterns, qtnetworkauth, qtx11extras , nixosTests }: mkDerivation rec { pname = "musescore"; - version = "3.6.2"; + version = "4.0.1"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${version}"; - sha256 = "sha256-GBGAD/qdOhoNfDzI+O0EiKgeb86GFJxpci35T6tZ+2s="; + sha256 = "sha256-Xhjjm/pYcjfZE632eP2jujqUAmzdYNa81EPrvS5UKnQ="; }; - patches = [ - ./remove_qtwebengine_install_hack.patch + # See https://github.com/musescore/MuseScore/issues/15571 + (fetchpatch { + url = "https://github.com/musescore/MuseScore/commit/365be5dfb7296ebee4677cb74b67c1721bc2cf7b.patch"; + hash = "sha256-tJ2M21i3geO9OsjUQKNatSXTkJ5U9qMT4RLNdJnyoKw="; + }) ]; cmakeFlags = [ "-DMUSESCORE_BUILD_CONFIG=release" + # Disable the _usage_ of the `/bin/crashpad_handler` utility. See: + # https://github.com/musescore/MuseScore/pull/15577 + "-DBUILD_CRASHPAD_CLIENT=OFF" + # Use our freetype "-DUSE_SYSTEM_FREETYPE=ON" ]; @@ -34,13 +41,13 @@ mkDerivation rec { "--set-default QT_QPA_PLATFORM xcb" ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ninja ]; buildInputs = [ alsa-lib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis - portaudio portmidi # tesseract + portaudio portmidi flac # tesseract qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2 - qtscript qtsvg qttools qtwebengine qtxmlpatterns + qtscript qtsvg qttools qtwebengine qtxmlpatterns qtnetworkauth qtx11extras ]; passthru.tests = nixosTests.musescore; @@ -48,8 +55,11 @@ mkDerivation rec { meta = with lib; { description = "Music notation and composition software"; homepage = "https://musescore.org/"; - license = licenses.gpl2; + license = licenses.gpl3Only; maintainers = with maintainers; [ vandenoever turion doronbehar ]; + # Darwin requires CoreMIDI from SDK 11.3, we use the upstream built .dmg + # file in ./darwin.nix in the meantime. platforms = platforms.linux; + mainProgram = "mscore"; }; } diff --git a/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch b/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch deleted file mode 100644 index 57a6092d58522..0000000000000 --- a/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/main/CMakeLists.txt -+++ b/main/CMakeLists.txt -@@ -220,16 +219,0 @@ else (MINGW) -- ## install qwebengine core -- if (NOT APPLE AND USE_WEBENGINE) -- install(PROGRAMS -- ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess -- DESTINATION bin -- ) -- install(DIRECTORY -- ${QT_INSTALL_DATA}/resources -- DESTINATION lib/qt5 -- ) -- install(DIRECTORY -- ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales -- DESTINATION lib/qt5/translations -- ) -- endif(NOT APPLE AND USE_WEBENGINE) -- diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 7dd7670d67f79..c9e1bed1db25b 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -1,39 +1,44 @@ -{ lib -, stdenv +{ asio , cmake -, pkg-config -, boost , curl , fetchFromGitHub , fetchpatch , ffmpeg , gnutls , lame +, lib , libev +, game-music-emu , libmicrohttpd , libopenmpt , mpg123 , ncurses +, pkg-config +, portaudio +, stdenv , taglib # Linux Dependencies , alsa-lib +, pipewireSupport ? !stdenv.hostPlatform.isDarwin, pipewire , pulseaudio -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd +, sndioSupport ? true, sndio , systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd # Darwin Dependencies , Cocoa , SystemConfiguration +, coreaudioSupport ? stdenv.hostPlatform.isDarwin, CoreAudio }: stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.98.1"; + version = "0.99.5"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "sha256-pnAdlCCqWzR0W8dF9CE48K8yHMVIx3egZlXvibxU18A="; + sha256 = "sha256-SbWL36GRIJPSvxZyj6sebJxTkSPsUcsKyC3TmcIq2O0"; }; outputs = [ "out" "dev" ]; @@ -44,16 +49,18 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost + asio curl ffmpeg gnutls lame libev + game-music-emu libmicrohttpd libopenmpt mpg123 ncurses + portaudio taglib ] ++ lib.optionals systemdSupport [ systemd @@ -61,6 +68,12 @@ stdenv.mkDerivation rec { alsa-lib pulseaudio ] ++ lib.optionals stdenv.isDarwin [ Cocoa SystemConfiguration + ] ++ lib.optionals coreaudioSupport [ + CoreAudio + ] ++ lib.optional sndioSupport [ + sndio + ] ++ lib.optional pipewireSupport [ + pipewire ]; cmakeFlags = [ diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index 0d10b55d32964..470d5c1050753 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; buildInputs = [ eigen ffmpeg ]; - fixupPhase = if stdenv.isDarwin then '' + fixupPhase = lib.optionalString stdenv.isDarwin '' install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib - '' else ""; + ''; meta = with lib; { homepage = "https://www.musly.org"; diff --git a/pkgs/applications/audio/netease-music-tui/Cargo.lock b/pkgs/applications/audio/netease-music-tui/Cargo.lock new file mode 100644 index 0000000000000..471b1a53eae7d --- /dev/null +++ b/pkgs/applications/audio/netease-music-tui/Cargo.lock @@ -0,0 +1,2778 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +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 = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "alsa" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" +dependencies = [ + "alsa-sys", + "bitflags", + "libc", + "nix", +] + +[[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_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "async-compression" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +dependencies = [ + "bytes 0.5.6", + "flate2", + "futures-core", + "memchr", + "pin-project-lite 0.2.9", +] + +[[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.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base64" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bindgen" +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "lazy_static 1.4.0", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" +dependencies = [ + "byteorder", + "iovec", +] + +[[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "cc" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +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 7.1.1", +] + +[[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 0.2.15", + "time 0.1.44", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "clang-sys" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "claxon" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" + +[[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 = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes 1.2.1", + "memchr", +] + +[[package]] +name = "config" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9107d78ed62b3fa5a86e7d18e647abed48cfd8f8fab6c72f4cdb982d196f7e6" +dependencies = [ + "lazy_static 1.4.0", + "nom 4.2.3", + "rust-ini", + "serde 1.0.147", + "serde-hjson", + "serde_json", + "toml 0.4.10", + "yaml-rust", +] + +[[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + +[[package]] +name = "cookie" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" +dependencies = [ + "percent-encoding", + "time 0.2.27", + "version_check 0.9.4", +] + +[[package]] +name = "cookie_store" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3" +dependencies = [ + "cookie", + "idna 0.2.3", + "log", + "publicsuffix", + "serde 1.0.147", + "serde_json", + "time 0.2.27", + "url", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "coreaudio-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" +dependencies = [ + "bitflags", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb" +dependencies = [ + "bindgen", +] + +[[package]] +name = "cpal" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "jni", + "js-sys", + "lazy_static 1.4.0", + "libc", + "mach", + "ndk", + "ndk-glue", + "nix", + "oboe", + "parking_lot", + "stdweb 0.1.3", + "thiserror", + "web-sys", + "winapi 0.3.9", +] + +[[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 = "cxx" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "dbus" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add8dd36d6d34a084220eb9fe216d3e230d52b37c31702e1ffda4fb2d4ef950e" +dependencies = [ + "libc", + "libdbus-sys", +] + +[[package]] +name = "dirs" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +dependencies = [ + "cfg-if 0.1.10", + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + +[[package]] +name = "dtoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "flate2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[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.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-executor" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" + +[[package]] +name = "futures-macro" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite 0.2.9", + "pin-utils", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.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 = "gimli" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "h2" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", + "tracing-futures", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hound" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" + +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes 1.2.1", + "fnv", + "itoa 1.0.4", +] + +[[package]] +name = "http-body" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" +dependencies = [ + "bytes 0.5.6", + "http", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" + +[[package]] +name = "hyper" +version = "0.13.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" +dependencies = [ + "bytes 0.5.6", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa 0.4.8", + "pin-project", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" +dependencies = [ + "bytes 0.5.6", + "hyper", + "native-tls", + "tokio", + "tokio-tls", +] + +[[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 = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[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 = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "ipnet" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" + +[[package]] +name = "itertools" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[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-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" +checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +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 = "lazy_static" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" + +[[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 = "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.137" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" + +[[package]] +name = "libdbus-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +dependencies = [ + "cc", +] + +[[package]] +name = "linked-hash-map" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd" +dependencies = [ + "serde 0.8.23", + "serde_test", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[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 1.0.0", +] + +[[package]] +name = "log-panics" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" +dependencies = [ + "log", +] + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[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 = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[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 = "minimp3" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "985438f75febf74c392071a975a29641b420dd84431135a6e6db721de4b74372" +dependencies = [ + "minimp3-sys", + "slice-deque", + "thiserror", +] + +[[package]] +name = "minimp3-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90" +dependencies = [ + "cc", +] + +[[package]] +name = "miniz_oxide" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +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 = "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 = "mp3-duration" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "348bdc7300502f0801e5b57c448815713cd843b744ef9bda252a2698fdf90a0f" +dependencies = [ + "thiserror", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static 1.4.0", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-glue" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f" +dependencies = [ + "lazy_static 1.4.0", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-macro", + "ndk-sys", +] + +[[package]] +name = "ndk-macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" +dependencies = [ + "darling", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[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 = "netease_music_tui" +version = "0.1.3" +dependencies = [ + "base64 0.11.0", + "byteorder", + "bytes 0.4.12", + "chrono", + "config", + "cpal", + "dbus", + "dirs", + "failure", + "futures", + "hex", + "lazy_static 1.4.0", + "log", + "log-panics", + "mp3-duration", + "num-bigint", + "openssl", + "rand", + "regex", + "reqwest", + "rodio", + "serde 1.0.147", + "serde_derive", + "serde_json", + "serde_urlencoded 0.6.1", + "simple-logging", + "tempfile", + "termion", + "tokio", + "tui", + "unicode-width", +] + +[[package]] +name = "nix" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +dependencies = [ + "bitflags", + "cc", + "cfg-if 1.0.0", + "libc", + "memoffset", +] + +[[package]] +name = "nom" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" +dependencies = [ + "memchr", + "version_check 0.1.5", +] + +[[package]] +name = "nom" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[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 0.2.15", +] + +[[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", +] + +[[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.15", +] + +[[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.15", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "numtoa" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" + +[[package]] +name = "object" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +dependencies = [ + "memchr", +] + +[[package]] +name = "oboe" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" +dependencies = [ + "jni", + "ndk", + "ndk-context", + "num-derive", + "num-traits 0.2.15", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" +dependencies = [ + "cc", +] + +[[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.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "openssl" +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", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +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-sys" +version = "0.9.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[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", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi 0.3.9", +] + +[[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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + +[[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.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[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.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +dependencies = [ + "once_cell", + "thiserror", + "toml 0.5.9", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro2" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "publicsuffix" +version = "1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" +dependencies = [ + "idna 0.2.3", + "url", +] + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha", + "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 0.1.16", +] + +[[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.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_termios" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" +dependencies = [ + "redox_syscall 0.2.16", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom 0.2.8", + "redox_syscall 0.2.16", + "thiserror", +] + +[[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 = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "reqwest" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +dependencies = [ + "async-compression", + "base64 0.13.1", + "bytes 0.5.6", + "cookie", + "cookie_store", + "encoding_rs", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "lazy_static 1.4.0", + "log", + "mime", + "mime_guess", + "native-tls", + "percent-encoding", + "pin-project-lite 0.2.9", + "serde 1.0.147", + "serde_urlencoded 0.7.1", + "time 0.2.27", + "tokio", + "tokio-socks", + "tokio-tls", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rodio" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e" +dependencies = [ + "claxon", + "cpal", + "hound", + "lewton", + "minimp3", +] + +[[package]] +name = "rust-ini" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[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.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static 1.4.0", + "windows-sys", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" + +[[package]] +name = "security-framework" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" + +[[package]] +name = "serde" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-hjson" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153" +dependencies = [ + "lazy_static 0.2.11", + "linked-hash-map 0.3.0", + "num-traits 0.1.43", + "regex", + "serde 0.8.23", +] + +[[package]] +name = "serde_derive" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" +dependencies = [ + "itoa 1.0.4", + "ryu", + "serde 1.0.147", +] + +[[package]] +name = "serde_test" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5" +dependencies = [ + "serde 0.8.23", +] + +[[package]] +name = "serde_urlencoded" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" +dependencies = [ + "dtoa", + "itoa 0.4.8", + "serde 1.0.147", + "url", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa 1.0.4", + "ryu", + "serde 1.0.147", +] + +[[package]] +name = "sha1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "simple-logging" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00d48e85675326bb182a2286ea7c1a0b264333ae10f27a937a72be08628b542" +dependencies = [ + "lazy_static 1.4.0", + "log", + "thread-id", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slice-deque" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25" +dependencies = [ + "libc", + "mach", + "winapi 0.3.9", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check 0.9.4", +] + +[[package]] +name = "stdweb" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" + +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde 1.0.147", + "serde_derive", + "syn", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde 1.0.147", + "serde_derive", + "serde_json", + "sha1", + "syn", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + +[[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.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +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 = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if 1.0.0", + "fastrand", + "libc", + "redox_syscall 0.2.16", + "remove_dir_all", + "winapi 0.3.9", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "termion" +version = "1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" +dependencies = [ + "libc", + "numtoa", + "redox_syscall 0.2.16", + "redox_termios", +] + +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread-id" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" +dependencies = [ + "libc", + "redox_syscall 0.1.57", + "winapi 0.3.9", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + +[[package]] +name = "time" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb 0.4.20", + "time-macros", + "version_check 0.9.4", + "winapi 0.3.9", +] + +[[package]] +name = "time-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "iovec", + "lazy_static 1.4.0", + "memchr", + "mio", + "num_cpus", + "pin-project-lite 0.1.12", + "slab", + "tokio-macros", +] + +[[package]] +name = "tokio-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-socks" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539" +dependencies = [ + "bytes 0.4.12", + "either", + "futures", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +dependencies = [ + "bytes 0.5.6", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.1.12", + "tokio", +] + +[[package]] +name = "toml" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" +dependencies = [ + "serde 1.0.147", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde 1.0.147", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if 1.0.0", + "log", + "pin-project-lite 0.2.9", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +[[package]] +name = "tui" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b422ff4986065d33272b587907654f918a3fe8702786a8110bf68dede0d8ee" +dependencies = [ + "bitflags", + "cassowary", + "either", + "itertools", + "log", + "termion", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check 0.9.4", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" + +[[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 = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna 0.3.0", + "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.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[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 = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if 1.0.0", + "serde 1.0.147", + "serde_json", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "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 = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "winreg" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map 0.5.6", +] diff --git a/pkgs/applications/audio/netease-music-tui/cargo-lock.patch b/pkgs/applications/audio/netease-music-tui/cargo-lock.patch deleted file mode 100644 index 45754a1f9e5d8..0000000000000 --- a/pkgs/applications/audio/netease-music-tui/cargo-lock.patch +++ /dev/null @@ -1,2784 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..471b1a5 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,2778 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+version = 3 -+ -+[[package]] -+name = "addr2line" -+version = "0.17.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -+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 = "0.7.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "alsa" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" -+dependencies = [ -+ "alsa-sys", -+ "bitflags", -+ "libc", -+ "nix", -+] -+ -+[[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_system_properties" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "async-compression" -+version = "0.3.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -+dependencies = [ -+ "bytes 0.5.6", -+ "flate2", -+ "futures-core", -+ "memchr", -+ "pin-project-lite 0.2.9", -+] -+ -+[[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.66" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" -+dependencies = [ -+ "addr2line", -+ "cc", -+ "cfg-if 1.0.0", -+ "libc", -+ "miniz_oxide", -+ "object", -+ "rustc-demangle", -+] -+ -+[[package]] -+name = "base-x" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" -+ -+[[package]] -+name = "base64" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" -+ -+[[package]] -+name = "base64" -+version = "0.13.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" -+ -+[[package]] -+name = "bindgen" -+version = "0.61.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a" -+dependencies = [ -+ "bitflags", -+ "cexpr", -+ "clang-sys", -+ "lazy_static 1.4.0", -+ "lazycell", -+ "peeking_take_while", -+ "proc-macro2", -+ "quote", -+ "regex", -+ "rustc-hash", -+ "shlex", -+ "syn", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -+ -+[[package]] -+name = "bumpalo" -+version = "3.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" -+ -+[[package]] -+name = "byteorder" -+version = "1.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -+ -+[[package]] -+name = "bytes" -+version = "0.4.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -+dependencies = [ -+ "byteorder", -+ "iovec", -+] -+ -+[[package]] -+name = "bytes" -+version = "0.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" -+ -+[[package]] -+name = "bytes" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" -+ -+[[package]] -+name = "cassowary" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" -+ -+[[package]] -+name = "cc" -+version = "1.0.76" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" -+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 7.1.1", -+] -+ -+[[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 0.2.15", -+ "time 0.1.44", -+ "wasm-bindgen", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "clang-sys" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" -+dependencies = [ -+ "glob", -+ "libc", -+ "libloading", -+] -+ -+[[package]] -+name = "claxon" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" -+ -+[[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 = "combine" -+version = "4.6.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -+dependencies = [ -+ "bytes 1.2.1", -+ "memchr", -+] -+ -+[[package]] -+name = "config" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f9107d78ed62b3fa5a86e7d18e647abed48cfd8f8fab6c72f4cdb982d196f7e6" -+dependencies = [ -+ "lazy_static 1.4.0", -+ "nom 4.2.3", -+ "rust-ini", -+ "serde 1.0.147", -+ "serde-hjson", -+ "serde_json", -+ "toml 0.4.10", -+ "yaml-rust", -+] -+ -+[[package]] -+name = "const_fn" -+version = "0.4.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" -+ -+[[package]] -+name = "cookie" -+version = "0.14.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" -+dependencies = [ -+ "percent-encoding", -+ "time 0.2.27", -+ "version_check 0.9.4", -+] -+ -+[[package]] -+name = "cookie_store" -+version = "0.12.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3" -+dependencies = [ -+ "cookie", -+ "idna 0.2.3", -+ "log", -+ "publicsuffix", -+ "serde 1.0.147", -+ "serde_json", -+ "time 0.2.27", -+ "url", -+] -+ -+[[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.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" -+ -+[[package]] -+name = "coreaudio-rs" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" -+dependencies = [ -+ "bitflags", -+ "coreaudio-sys", -+] -+ -+[[package]] -+name = "coreaudio-sys" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb" -+dependencies = [ -+ "bindgen", -+] -+ -+[[package]] -+name = "cpal" -+version = "0.13.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" -+dependencies = [ -+ "alsa", -+ "core-foundation-sys", -+ "coreaudio-rs", -+ "jni", -+ "js-sys", -+ "lazy_static 1.4.0", -+ "libc", -+ "mach", -+ "ndk", -+ "ndk-glue", -+ "nix", -+ "oboe", -+ "parking_lot", -+ "stdweb 0.1.3", -+ "thiserror", -+ "web-sys", -+ "winapi 0.3.9", -+] -+ -+[[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 = "cxx" -+version = "1.0.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" -+dependencies = [ -+ "cc", -+ "cxxbridge-flags", -+ "cxxbridge-macro", -+ "link-cplusplus", -+] -+ -+[[package]] -+name = "cxx-build" -+version = "1.0.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" -+dependencies = [ -+ "cc", -+ "codespan-reporting", -+ "once_cell", -+ "proc-macro2", -+ "quote", -+ "scratch", -+ "syn", -+] -+ -+[[package]] -+name = "cxxbridge-flags" -+version = "1.0.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" -+ -+[[package]] -+name = "cxxbridge-macro" -+version = "1.0.82" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "darling" -+version = "0.13.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -+dependencies = [ -+ "darling_core", -+ "darling_macro", -+] -+ -+[[package]] -+name = "darling_core" -+version = "0.13.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -+dependencies = [ -+ "fnv", -+ "ident_case", -+ "proc-macro2", -+ "quote", -+ "strsim", -+ "syn", -+] -+ -+[[package]] -+name = "darling_macro" -+version = "0.13.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -+dependencies = [ -+ "darling_core", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "dbus" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "add8dd36d6d34a084220eb9fe216d3e230d52b37c31702e1ffda4fb2d4ef950e" -+dependencies = [ -+ "libc", -+ "libdbus-sys", -+] -+ -+[[package]] -+name = "dirs" -+version = "2.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -+dependencies = [ -+ "cfg-if 0.1.10", -+ "dirs-sys", -+] -+ -+[[package]] -+name = "dirs-sys" -+version = "0.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -+dependencies = [ -+ "libc", -+ "redox_users", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "discard" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" -+ -+[[package]] -+name = "dtoa" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" -+ -+[[package]] -+name = "either" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" -+ -+[[package]] -+name = "encoding_rs" -+version = "0.8.31" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -+dependencies = [ -+ "cfg-if 1.0.0", -+] -+ -+[[package]] -+name = "failure" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -+dependencies = [ -+ "backtrace", -+ "failure_derive", -+] -+ -+[[package]] -+name = "failure_derive" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "synstructure", -+] -+ -+[[package]] -+name = "fastrand" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -+dependencies = [ -+ "instant", -+] -+ -+[[package]] -+name = "flate2" -+version = "1.0.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -+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.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -+dependencies = [ -+ "percent-encoding", -+] -+ -+[[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.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-executor", -+ "futures-io", -+ "futures-sink", -+ "futures-task", -+ "futures-util", -+] -+ -+[[package]] -+name = "futures-channel" -+version = "0.3.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" -+dependencies = [ -+ "futures-core", -+ "futures-sink", -+] -+ -+[[package]] -+name = "futures-core" -+version = "0.3.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" -+ -+[[package]] -+name = "futures-executor" -+version = "0.3.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" -+dependencies = [ -+ "futures-core", -+ "futures-task", -+ "futures-util", -+] -+ -+[[package]] -+name = "futures-io" -+version = "0.3.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" -+ -+[[package]] -+name = "futures-macro" -+version = "0.3.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "futures-sink" -+version = "0.3.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" -+ -+[[package]] -+name = "futures-task" -+version = "0.3.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" -+ -+[[package]] -+name = "futures-util" -+version = "0.3.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" -+dependencies = [ -+ "futures-channel", -+ "futures-core", -+ "futures-io", -+ "futures-macro", -+ "futures-sink", -+ "futures-task", -+ "memchr", -+ "pin-project-lite 0.2.9", -+ "pin-utils", -+ "slab", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "libc", -+ "wasi 0.9.0+wasi-snapshot-preview1", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.2.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 = "gimli" -+version = "0.26.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" -+ -+[[package]] -+name = "glob" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+ -+[[package]] -+name = "h2" -+version = "0.2.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -+dependencies = [ -+ "bytes 0.5.6", -+ "fnv", -+ "futures-core", -+ "futures-sink", -+ "futures-util", -+ "http", -+ "indexmap", -+ "slab", -+ "tokio", -+ "tokio-util", -+ "tracing", -+ "tracing-futures", -+] -+ -+[[package]] -+name = "hashbrown" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "hex" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -+ -+[[package]] -+name = "hound" -+version = "3.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" -+ -+[[package]] -+name = "http" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -+dependencies = [ -+ "bytes 1.2.1", -+ "fnv", -+ "itoa 1.0.4", -+] -+ -+[[package]] -+name = "http-body" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -+dependencies = [ -+ "bytes 0.5.6", -+ "http", -+] -+ -+[[package]] -+name = "httparse" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" -+ -+[[package]] -+name = "httpdate" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" -+ -+[[package]] -+name = "hyper" -+version = "0.13.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" -+dependencies = [ -+ "bytes 0.5.6", -+ "futures-channel", -+ "futures-core", -+ "futures-util", -+ "h2", -+ "http", -+ "http-body", -+ "httparse", -+ "httpdate", -+ "itoa 0.4.8", -+ "pin-project", -+ "socket2", -+ "tokio", -+ "tower-service", -+ "tracing", -+ "want", -+] -+ -+[[package]] -+name = "hyper-tls" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" -+dependencies = [ -+ "bytes 0.5.6", -+ "hyper", -+ "native-tls", -+ "tokio", -+ "tokio-tls", -+] -+ -+[[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 = "idna" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -+dependencies = [ -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "idna" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -+dependencies = [ -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ -+[[package]] -+name = "indexmap" -+version = "1.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -+dependencies = [ -+ "autocfg", -+ "hashbrown", -+] -+ -+[[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 = "iovec" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "ipnet" -+version = "2.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" -+ -+[[package]] -+name = "itertools" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -+dependencies = [ -+ "either", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" -+ -+[[package]] -+name = "itoa" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" -+ -+[[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-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" -+checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "js-sys" -+version = "0.3.60" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -+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 = "lazy_static" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" -+ -+[[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 = "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.137" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" -+ -+[[package]] -+name = "libdbus-sys" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" -+dependencies = [ -+ "pkg-config", -+] -+ -+[[package]] -+name = "libloading" -+version = "0.7.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "link-cplusplus" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" -+dependencies = [ -+ "cc", -+] -+ -+[[package]] -+name = "linked-hash-map" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd" -+dependencies = [ -+ "serde 0.8.23", -+ "serde_test", -+] -+ -+[[package]] -+name = "linked-hash-map" -+version = "0.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -+ -+[[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 1.0.0", -+] -+ -+[[package]] -+name = "log-panics" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" -+dependencies = [ -+ "log", -+] -+ -+[[package]] -+name = "mach" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "matches" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -+ -+[[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 = "mime" -+version = "0.3.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -+ -+[[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 = "minimp3" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "985438f75febf74c392071a975a29641b420dd84431135a6e6db721de4b74372" -+dependencies = [ -+ "minimp3-sys", -+ "slice-deque", -+ "thiserror", -+] -+ -+[[package]] -+name = "minimp3-sys" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90" -+dependencies = [ -+ "cc", -+] -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -+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 = "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 = "mp3-duration" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "348bdc7300502f0801e5b57c448815713cd843b744ef9bda252a2698fdf90a0f" -+dependencies = [ -+ "thiserror", -+] -+ -+[[package]] -+name = "native-tls" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -+dependencies = [ -+ "lazy_static 1.4.0", -+ "libc", -+ "log", -+ "openssl", -+ "openssl-probe", -+ "openssl-sys", -+ "schannel", -+ "security-framework", -+ "security-framework-sys", -+ "tempfile", -+] -+ -+[[package]] -+name = "ndk" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -+dependencies = [ -+ "bitflags", -+ "jni-sys", -+ "ndk-sys", -+ "num_enum", -+ "thiserror", -+] -+ -+[[package]] -+name = "ndk-context" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -+ -+[[package]] -+name = "ndk-glue" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f" -+dependencies = [ -+ "lazy_static 1.4.0", -+ "libc", -+ "log", -+ "ndk", -+ "ndk-context", -+ "ndk-macro", -+ "ndk-sys", -+] -+ -+[[package]] -+name = "ndk-macro" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -+dependencies = [ -+ "darling", -+ "proc-macro-crate", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "ndk-sys" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -+dependencies = [ -+ "jni-sys", -+] -+ -+[[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 = "netease_music_tui" -+version = "0.1.3" -+dependencies = [ -+ "base64 0.11.0", -+ "byteorder", -+ "bytes 0.4.12", -+ "chrono", -+ "config", -+ "cpal", -+ "dbus", -+ "dirs", -+ "failure", -+ "futures", -+ "hex", -+ "lazy_static 1.4.0", -+ "log", -+ "log-panics", -+ "mp3-duration", -+ "num-bigint", -+ "openssl", -+ "rand", -+ "regex", -+ "reqwest", -+ "rodio", -+ "serde 1.0.147", -+ "serde_derive", -+ "serde_json", -+ "serde_urlencoded 0.6.1", -+ "simple-logging", -+ "tempfile", -+ "termion", -+ "tokio", -+ "tui", -+ "unicode-width", -+] -+ -+[[package]] -+name = "nix" -+version = "0.23.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" -+dependencies = [ -+ "bitflags", -+ "cc", -+ "cfg-if 1.0.0", -+ "libc", -+ "memoffset", -+] -+ -+[[package]] -+name = "nom" -+version = "4.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -+dependencies = [ -+ "memchr", -+ "version_check 0.1.5", -+] -+ -+[[package]] -+name = "nom" -+version = "7.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -+dependencies = [ -+ "memchr", -+ "minimal-lexical", -+] -+ -+[[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 0.2.15", -+] -+ -+[[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", -+] -+ -+[[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.15", -+] -+ -+[[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.15", -+] -+ -+[[package]] -+name = "num-traits" -+version = "0.2.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "num_cpus" -+version = "1.14.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] -+name = "num_enum" -+version = "0.5.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" -+dependencies = [ -+ "num_enum_derive", -+] -+ -+[[package]] -+name = "num_enum_derive" -+version = "0.5.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" -+dependencies = [ -+ "proc-macro-crate", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "numtoa" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" -+ -+[[package]] -+name = "object" -+version = "0.29.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -+dependencies = [ -+ "memchr", -+] -+ -+[[package]] -+name = "oboe" -+version = "0.4.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" -+dependencies = [ -+ "jni", -+ "ndk", -+ "ndk-context", -+ "num-derive", -+ "num-traits 0.2.15", -+ "oboe-sys", -+] -+ -+[[package]] -+name = "oboe-sys" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" -+dependencies = [ -+ "cc", -+] -+ -+[[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.16.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" -+ -+[[package]] -+name = "openssl" -+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", -+ "libc", -+ "once_cell", -+ "openssl-macros", -+ "openssl-sys", -+] -+ -+[[package]] -+name = "openssl-macros" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -+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-sys" -+version = "0.9.77" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" -+dependencies = [ -+ "autocfg", -+ "cc", -+ "libc", -+ "pkg-config", -+ "vcpkg", -+] -+ -+[[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", -+] -+ -+[[package]] -+name = "parking_lot_core" -+version = "0.8.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "instant", -+ "libc", -+ "redox_syscall 0.2.16", -+ "smallvec", -+ "winapi 0.3.9", -+] -+ -+[[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.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" -+ -+[[package]] -+name = "pin-project" -+version = "1.0.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -+dependencies = [ -+ "pin-project-internal", -+] -+ -+[[package]] -+name = "pin-project-internal" -+version = "1.0.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "pin-project-lite" -+version = "0.1.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" -+ -+[[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.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" -+ -+[[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.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" -+dependencies = [ -+ "once_cell", -+ "thiserror", -+ "toml 0.5.9", -+] -+ -+[[package]] -+name = "proc-macro-hack" -+version = "0.5.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.47" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -+dependencies = [ -+ "unicode-ident", -+] -+ -+[[package]] -+name = "publicsuffix" -+version = "1.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" -+dependencies = [ -+ "idna 0.2.3", -+ "url", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "rand" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+dependencies = [ -+ "getrandom 0.1.16", -+ "libc", -+ "rand_chacha", -+ "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 0.1.16", -+] -+ -+[[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.1.57" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" -+ -+[[package]] -+name = "redox_syscall" -+version = "0.2.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -+dependencies = [ -+ "bitflags", -+] -+ -+[[package]] -+name = "redox_termios" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" -+dependencies = [ -+ "redox_syscall 0.2.16", -+] -+ -+[[package]] -+name = "redox_users" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -+dependencies = [ -+ "getrandom 0.2.8", -+ "redox_syscall 0.2.16", -+ "thiserror", -+] -+ -+[[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 = "remove_dir_all" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -+dependencies = [ -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "reqwest" -+version = "0.10.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" -+dependencies = [ -+ "async-compression", -+ "base64 0.13.1", -+ "bytes 0.5.6", -+ "cookie", -+ "cookie_store", -+ "encoding_rs", -+ "futures-core", -+ "futures-util", -+ "http", -+ "http-body", -+ "hyper", -+ "hyper-tls", -+ "ipnet", -+ "js-sys", -+ "lazy_static 1.4.0", -+ "log", -+ "mime", -+ "mime_guess", -+ "native-tls", -+ "percent-encoding", -+ "pin-project-lite 0.2.9", -+ "serde 1.0.147", -+ "serde_urlencoded 0.7.1", -+ "time 0.2.27", -+ "tokio", -+ "tokio-socks", -+ "tokio-tls", -+ "url", -+ "wasm-bindgen", -+ "wasm-bindgen-futures", -+ "web-sys", -+ "winreg", -+] -+ -+[[package]] -+name = "rodio" -+version = "0.15.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e" -+dependencies = [ -+ "claxon", -+ "cpal", -+ "hound", -+ "lewton", -+ "minimp3", -+] -+ -+[[package]] -+name = "rust-ini" -+version = "0.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" -+ -+[[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.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+dependencies = [ -+ "semver", -+] -+ -+[[package]] -+name = "ryu" -+version = "1.0.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" -+ -+[[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.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -+dependencies = [ -+ "lazy_static 1.4.0", -+ "windows-sys", -+] -+ -+[[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.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" -+ -+[[package]] -+name = "security-framework" -+version = "2.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -+dependencies = [ -+ "bitflags", -+ "core-foundation", -+ "core-foundation-sys", -+ "libc", -+ "security-framework-sys", -+] -+ -+[[package]] -+name = "security-framework-sys" -+version = "2.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ -+[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+dependencies = [ -+ "semver-parser", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+ -+[[package]] -+name = "serde" -+version = "0.8.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" -+ -+[[package]] -+name = "serde" -+version = "1.0.147" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde-hjson" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153" -+dependencies = [ -+ "lazy_static 0.2.11", -+ "linked-hash-map 0.3.0", -+ "num-traits 0.1.43", -+ "regex", -+ "serde 0.8.23", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.147" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.88" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" -+dependencies = [ -+ "itoa 1.0.4", -+ "ryu", -+ "serde 1.0.147", -+] -+ -+[[package]] -+name = "serde_test" -+version = "0.8.23" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5" -+dependencies = [ -+ "serde 0.8.23", -+] -+ -+[[package]] -+name = "serde_urlencoded" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -+dependencies = [ -+ "dtoa", -+ "itoa 0.4.8", -+ "serde 1.0.147", -+ "url", -+] -+ -+[[package]] -+name = "serde_urlencoded" -+version = "0.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -+dependencies = [ -+ "form_urlencoded", -+ "itoa 1.0.4", -+ "ryu", -+ "serde 1.0.147", -+] -+ -+[[package]] -+name = "sha1" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -+dependencies = [ -+ "sha1_smol", -+] -+ -+[[package]] -+name = "sha1_smol" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" -+ -+[[package]] -+name = "shlex" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" -+ -+[[package]] -+name = "simple-logging" -+version = "2.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b00d48e85675326bb182a2286ea7c1a0b264333ae10f27a937a72be08628b542" -+dependencies = [ -+ "lazy_static 1.4.0", -+ "log", -+ "thread-id", -+] -+ -+[[package]] -+name = "slab" -+version = "0.4.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -+dependencies = [ -+ "autocfg", -+] -+ -+[[package]] -+name = "slice-deque" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25" -+dependencies = [ -+ "libc", -+ "mach", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "smallvec" -+version = "1.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" -+ -+[[package]] -+name = "socket2" -+version = "0.3.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "libc", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "standback" -+version = "0.2.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -+dependencies = [ -+ "version_check 0.9.4", -+] -+ -+[[package]] -+name = "stdweb" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" -+ -+[[package]] -+name = "stdweb" -+version = "0.4.20" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -+dependencies = [ -+ "discard", -+ "rustc_version", -+ "stdweb-derive", -+ "stdweb-internal-macros", -+ "stdweb-internal-runtime", -+ "wasm-bindgen", -+] -+ -+[[package]] -+name = "stdweb-derive" -+version = "0.5.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "serde 1.0.147", -+ "serde_derive", -+ "syn", -+] -+ -+[[package]] -+name = "stdweb-internal-macros" -+version = "0.2.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -+dependencies = [ -+ "base-x", -+ "proc-macro2", -+ "quote", -+ "serde 1.0.147", -+ "serde_derive", -+ "serde_json", -+ "sha1", -+ "syn", -+] -+ -+[[package]] -+name = "stdweb-internal-runtime" -+version = "0.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" -+ -+[[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.103" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" -+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 = "tempfile" -+version = "3.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "fastrand", -+ "libc", -+ "redox_syscall 0.2.16", -+ "remove_dir_all", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "termcolor" -+version = "1.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -+dependencies = [ -+ "winapi-util", -+] -+ -+[[package]] -+name = "termion" -+version = "1.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" -+dependencies = [ -+ "libc", -+ "numtoa", -+ "redox_syscall 0.2.16", -+ "redox_termios", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.37" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.37" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "thread-id" -+version = "3.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" -+dependencies = [ -+ "libc", -+ "redox_syscall 0.1.57", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "time" -+version = "0.1.44" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -+dependencies = [ -+ "libc", -+ "wasi 0.10.0+wasi-snapshot-preview1", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "time" -+version = "0.2.27" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -+dependencies = [ -+ "const_fn", -+ "libc", -+ "standback", -+ "stdweb 0.4.20", -+ "time-macros", -+ "version_check 0.9.4", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "time-macros" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -+dependencies = [ -+ "proc-macro-hack", -+ "time-macros-impl", -+] -+ -+[[package]] -+name = "time-macros-impl" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -+dependencies = [ -+ "proc-macro-hack", -+ "proc-macro2", -+ "quote", -+ "standback", -+ "syn", -+] -+ -+[[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.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -+ -+[[package]] -+name = "tokio" -+version = "0.2.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" -+dependencies = [ -+ "bytes 0.5.6", -+ "fnv", -+ "futures-core", -+ "iovec", -+ "lazy_static 1.4.0", -+ "memchr", -+ "mio", -+ "num_cpus", -+ "pin-project-lite 0.1.12", -+ "slab", -+ "tokio-macros", -+] -+ -+[[package]] -+name = "tokio-macros" -+version = "0.2.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "tokio-socks" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539" -+dependencies = [ -+ "bytes 0.4.12", -+ "either", -+ "futures", -+ "thiserror", -+ "tokio", -+] -+ -+[[package]] -+name = "tokio-tls" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" -+dependencies = [ -+ "native-tls", -+ "tokio", -+] -+ -+[[package]] -+name = "tokio-util" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -+dependencies = [ -+ "bytes 0.5.6", -+ "futures-core", -+ "futures-sink", -+ "log", -+ "pin-project-lite 0.1.12", -+ "tokio", -+] -+ -+[[package]] -+name = "toml" -+version = "0.4.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -+dependencies = [ -+ "serde 1.0.147", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -+dependencies = [ -+ "serde 1.0.147", -+] -+ -+[[package]] -+name = "tower-service" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" -+ -+[[package]] -+name = "tracing" -+version = "0.1.37" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "log", -+ "pin-project-lite 0.2.9", -+ "tracing-core", -+] -+ -+[[package]] -+name = "tracing-core" -+version = "0.1.30" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -+dependencies = [ -+ "once_cell", -+] -+ -+[[package]] -+name = "tracing-futures" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -+dependencies = [ -+ "pin-project", -+ "tracing", -+] -+ -+[[package]] -+name = "try-lock" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -+ -+[[package]] -+name = "tui" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "73b422ff4986065d33272b587907654f918a3fe8702786a8110bf68dede0d8ee" -+dependencies = [ -+ "bitflags", -+ "cassowary", -+ "either", -+ "itertools", -+ "log", -+ "termion", -+ "unicode-segmentation", -+ "unicode-width", -+] -+ -+[[package]] -+name = "unicase" -+version = "2.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -+dependencies = [ -+ "version_check 0.9.4", -+] -+ -+[[package]] -+name = "unicode-bidi" -+version = "0.3.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" -+ -+[[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.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" -+ -+[[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 = "url" -+version = "2.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -+dependencies = [ -+ "form_urlencoded", -+ "idna 0.3.0", -+ "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.1.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -+ -+[[package]] -+name = "version_check" -+version = "0.9.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -+ -+[[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 = "want" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -+dependencies = [ -+ "log", -+ "try-lock", -+] -+ -+[[package]] -+name = "wasi" -+version = "0.9.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+ -+[[package]] -+name = "wasi" -+version = "0.10.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" -+ -+[[package]] -+name = "wasi" -+version = "0.11.0+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -+ -+[[package]] -+name = "wasm-bindgen" -+version = "0.2.83" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "serde 1.0.147", -+ "serde_json", -+ "wasm-bindgen-macro", -+] -+ -+[[package]] -+name = "wasm-bindgen-backend" -+version = "0.2.83" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -+dependencies = [ -+ "bumpalo", -+ "log", -+ "once_cell", -+ "proc-macro2", -+ "quote", -+ "syn", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-futures" -+version = "0.4.33" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro" -+version = "0.2.83" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -+dependencies = [ -+ "quote", -+ "wasm-bindgen-macro-support", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro-support" -+version = "0.2.83" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+ "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 = "web-sys" -+version = "0.3.60" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", -+] -+ -+[[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.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -+dependencies = [ -+ "windows_aarch64_msvc", -+ "windows_i686_gnu", -+ "windows_i686_msvc", -+ "windows_x86_64_gnu", -+ "windows_x86_64_msvc", -+] -+ -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" -+ -+[[package]] -+name = "windows_i686_gnu" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" -+ -+[[package]] -+name = "windows_i686_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" -+ -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" -+ -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.36.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" -+ -+[[package]] -+name = "winreg" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -+dependencies = [ -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "ws2_32-sys" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -+dependencies = [ -+ "winapi 0.2.8", -+ "winapi-build", -+] -+ -+[[package]] -+name = "yaml-rust" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -+dependencies = [ -+ "linked-hash-map 0.5.6", -+] diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix index 90d645804b77b..4449a8907a204 100644 --- a/pkgs/applications/audio/netease-music-tui/default.nix +++ b/pkgs/applications/audio/netease-music-tui/default.nix @@ -11,7 +11,13 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+zRXihWg65DtyX3yD04CsW8aXIvNph36PW2veeg36lg="; }; - cargoPatches = [ ./cargo-lock.patch ]; + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib openssl ]; diff --git a/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh b/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh index b7ca4216ace5f..dc8a1bf3e4682 100644..100755 --- a/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh +++ b/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh @@ -1,20 +1,17 @@ -#!nix-shell +#!/usr/bin/env nix-shell #!nix-shell -i bash -p coreutils gnugrep git cargo # This updates cargo-lock.patch for the netease-music-tui version listed in # default.nix. -set -eu -o verbose +set -euo pipefail -here=$PWD -version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2) +here=$(dirname "$0") +version=$(grep '^ version = "' "$here/default.nix" | cut -d '"' -f 2) checkout=$(mktemp -d) -git clone -b "$version" --depth=1 https://github.com/betta-cyber/netease-music-tui "$checkout" -cd "$checkout" +git clone -b "v$version" --depth=1 https://github.com/betta-cyber/netease-music-tui "$checkout" -cargo generate-lockfile -git add -f Cargo.lock -git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch +cargo generate-lockfile --manifest-path "$checkout/Cargo.toml" +cp "$checkout/Cargo.lock" "$here" -cd "$here" rm -rf "$checkout" diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/applications/audio/odin2/default.nix index beb1264679354..de89f9aedead4 100644 --- a/pkgs/applications/audio/odin2/default.nix +++ b/pkgs/applications/audio/odin2/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY="; }; + postPatch = '' + sed '1i#include <utility>' -i \ + libs/JUCELV2/modules/juce_gui_basics/windows/juce_ComponentPeer.h # gcc12 + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 3574dc2f5ac92..71fc1f103b9b5 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -1,14 +1,14 @@ -{ lib, buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, electron, python3 }: +{ lib, buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, electron, python3, nix-update-script }: buildNpmPackage rec { pname = "open-stage-control"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-6tRd8boVwWc8qGlklYqA/Kp76VOMvtUJlu/G/InvHkA="; + hash = "sha256-tfWimJ9eEFBUxPRVNjgbu8tQNokPbXOxOXO64mFuMfM="; }; # Remove some Electron stuff from package.json @@ -71,7 +71,7 @@ buildNpmPackage rec { }) ]; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Libre and modular OSC / MIDI controller"; diff --git a/pkgs/applications/audio/open-stage-control/update.sh b/pkgs/applications/audio/open-stage-control/update.sh deleted file mode 100755 index 30f1b4c293f16..0000000000000 --- a/pkgs/applications/audio/open-stage-control/update.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p common-updater-scripts jq nodejs -set -euo pipefail - -# Find nixpkgs repo -nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" - -stripwhitespace() { - sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' -} - -nixeval() { - nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r . -} - -vendorhash() { - (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in with pkgs.lib; (getAttrFromPath (splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true -} - -findpath() { - path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" - outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" - - if [ -n "$outpath" ]; then - path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" - fi - - echo "$path" -} - -attr="${UPDATE_NIX_ATTR_PATH:-open-stage-control}" -version="$(cd "$nixpkgs" && list-git-tags --pname="$(nixeval "$attr".pname)" --attr-path="$attr" | grep '^v' | sed -e 's|^v||' | sort -V | tail -n1)" - -pkgpath="$(findpath "$attr")" - -updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)" - -if [ "$updated" -eq 0 ]; then - echo 'update.sh: Package version not updated, nothing to do.' - exit 0 -fi - -# Update FOD hash -curhash="$(nixeval "$attr.npmDeps.outputHash")" -newhash="$(vendorhash "$attr.npmDeps")" - -if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then - sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" -else - echo 'update.sh: New npmDepsHash same as old npmDepsHash, nothing to do.' -fi diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index f86595361b659..47d7a64e3c20d 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus }: +{ lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus, fetchpatch }: stdenv.mkDerivation rec { pname = "opusfile"; @@ -12,7 +12,14 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libogg ]; propagatedBuildInputs = [ libopus ]; outputs = [ "out" "dev" ]; - patches = [ ./include-multistream.patch ] + patches = [ + ./include-multistream.patch + (fetchpatch { + name = "CVE-2022-47021.patch"; + url = "https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5.patch"; + sha256 = "sha256-XThI/ys5caB+OncFVfxm5IsvQPy1MbLQKwIlYjPvTJQ="; + }) + ] # fixes problem with openssl 1.1 dependency # see https://github.com/xiph/opusfile/issues/13 ++ lib.optionals stdenv.hostPlatform.isWindows [ ./disable-cert-store.patch ]; diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix index 357799a11226c..20fd355fa0bd3 100644 --- a/pkgs/applications/audio/opustags/default.nix +++ b/pkgs/applications/audio/opustags/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "opustags"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "fmang"; repo = "opustags"; rev = version; - sha256 = "1wsfw713rhi2gg5xc04cx5i31hlw0l3wdflj3r1y8w45bdk6ag1z"; + sha256 = "sha256-vGMRzw46X3DNRIvlI9XEKoDwiJsVL0v9Nfn8pbszRbw="; }; buildInputs = [ libogg ]; diff --git a/pkgs/applications/audio/osdlyrics/default.nix b/pkgs/applications/audio/osdlyrics/default.nix index ccac79763114a..3dd43fe3044ca 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.12"; + version = "0.5.13"; src = fetchFromGitHub { owner = "osdlyrics"; repo = "osdlyrics"; rev = version; - sha256 = "sha256-QGgwxmurdwo0xyq7p+1xditRebv64ewGTvNJI7MUnq4="; + sha256 = "sha256-E4pVXopqQYJW+a5nUf9dMabxJ9nYPu3C2ti8LlY470c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/oxefmsynth/default.nix b/pkgs/applications/audio/oxefmsynth/default.nix index 59ed1ce21f5f6..81cdc29be7a49 100644 --- a/pkgs/applications/audio/oxefmsynth/default.nix +++ b/pkgs/applications/audio/oxefmsynth/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { sha256 = "1rk71ls33a38wx8i22plsi7d89cqqxrfxknq5i4f9igsw1ipm4gn"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-narrowing" ]; buildFlags = [ "VSTSDK_PATH=${vst-sdk}/VST2_SDK" ]; diff --git a/pkgs/applications/audio/pbpctrl/default.nix b/pkgs/applications/audio/pbpctrl/default.nix new file mode 100644 index 0000000000000..071a4468434c3 --- /dev/null +++ b/pkgs/applications/audio/pbpctrl/default.nix @@ -0,0 +1,34 @@ +{ rustPlatform +, fetchFromGitHub +, pkg-config +, dbus +, protobuf +, lib +}: + +rustPlatform.buildRustPackage rec { + pname = "pbpctrl"; + + # https://github.com/qzed/pbpctrl/issues/4 + version = "unstable-2023-02-07"; + + src = fetchFromGitHub { + owner = "qzed"; + repo = "${pname}"; + rev = "9fef4bb88046a9f00719b189f8e378c8dbdb8ee6"; + hash = "sha256-8YbsBqqITJ9bKzbGX6d/CSBb8wzr6bDzy8vsyntL1CA="; + }; + + cargoHash = "sha256-ZxJjjaT/ZpEPxvO42UWBy3xW/V5dhXGsKn3KmuM89YA=="; + + nativeBuildInputs = [ pkg-config protobuf ]; + buildInputs = [ dbus ]; + + meta = with lib; { + description = "Control Google Pixel Buds Pro from the Linux command line."; + homepage = "https://github.com/qzed/pbpctrl"; + license = with licenses; [ asl20 mit ]; + maintainers = [ maintainers.vanilla ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 10362e04d5506..49ed6dfd98423 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MIDI controllable audio sampler"; longDescription = "a fork of Specimen"; - homepage = "http://petri-foo.sourceforge.net"; + homepage = "https://petri-foo.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 308d5b65f3e5a..55ab6261aa9e7 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -93,14 +93,11 @@ let fetchWithCurlScript { inherit name sha256; script = '' - "''${curl[@]}" --silent --request POST \ + "''${curl[@]}" --silent --request GET \ --cookie cookies \ - --header "modartt-json: request" \ - --header "origin: https://www.modartt.com" \ - --header "content-type: application/json; charset=UTF-8" \ - --header "accept: application/json, text/javascript, */*" \ - --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download -o /dev/null + --header "accept: */*" \ + https://www.modartt.com/ -o /dev/null + json=$( "''${curl[@]}" --silent --request POST \ --cookie cookies \ @@ -109,8 +106,9 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download + https://www.modartt.com/api/0/download ) + url=$(echo $json | ${jq}/bin/jq -r .url) "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" ''; @@ -140,7 +138,7 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data @login.json \ - https://www.modartt.com/json/session + https://www.modartt.com/api/0/session json=$( "''${curl[@]}" --silent --request POST \ @@ -150,10 +148,10 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download + https://www.modartt.com/api/0/download ) - url=$(echo $json | ${jq}/bin/jq -r .url) + url=$(echo $json | ${jq}/bin/jq -r .url) "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" ''; }; @@ -162,20 +160,20 @@ in { # TODO currently can't install more than one because `lame` clashes stage-trial = mkPianoteq rec { name = "stage-trial"; - version = "7.5.4"; + version = "8.0.5"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z"; - sha256 = "sha256-ybtq+hjnaQxpLxv2KE0ZcbQXtn5DJJsnMwCmh3rlrIc="; + sha256 = "sha256-9Lo4e1SM1gw2/+TmpDUdZCOQcHEpT/aaG6P80/GRPQY="; }; }; standard-trial = mkPianoteq rec { name = "standard-trial"; - version = "7.5.4"; + version = "8.0.5"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_linux_trial_v${versionForFile version}.7z"; - sha256 = "sha256-3a3+SKTEhvDtqK5Kg4E6KiLvn5+j6JN6ntIb72u2bdQ="; + sha256 = "sha256-qxViVIbld8zTMj1+TIfOsIOhmujOGJux2/u2J4hvsqw="; }; }; stage-6 = mkPianoteq rec { diff --git a/pkgs/applications/audio/pianotrans/default.nix b/pkgs/applications/audio/pianotrans/default.nix new file mode 100644 index 0000000000000..e5848de03dac3 --- /dev/null +++ b/pkgs/applications/audio/pianotrans/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, python3 +, ffmpeg +}: + +python3.pkgs.buildPythonApplication rec { + pname = "pianotrans"; + version = "1.0.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "azuwis"; + repo = pname; + rev = "v${version}"; + hash = "sha256-gRbyUQmPtGvx5QKAyrmeJl0stp7hwLBWwjSbJajihdE="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + piano-transcription-inference + torch + tkinter + ]; + + # Project has no tests + doCheck = false; + + makeWrapperArgs = [ + ''--prefix PATH : "${lib.makeBinPath [ ffmpeg ]}"'' + ]; + + meta = with lib; { + description = "Simple GUI for ByteDance's Piano Transcription with Pedals"; + homepage = "https://github.com/azuwis/pianotrans"; + license = licenses.mit; + maintainers = with maintainers; [ azuwis ]; + }; +} diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/applications/audio/picoloop/default.nix index bd956963a4682..8f11ec809c3a4 100644 --- a/pkgs/applications/audio/picoloop/default.nix +++ b/pkgs/applications/audio/picoloop/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "-f Makefile.PatternPlayer_debian_RtAudio_sdl20" ]; - NIX_CFLAGS_COMPILE = [ "-I${SDL2.dev}/include/SDL2" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${SDL2.dev}/include/SDL2" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index df008d1cfb33c..553ceb8be95a3 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.6.1"; + version = "4.6.2"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "9wkhSDn7kvj6pqCawTJDBO8HfYe8eEYtAR1Bi9/fxiOBXRYUUHEZzSGLF9QoTVYMuGGHeX35c+QvnA2VsdsWCw=="; + sha512 = "xGmE/ikL3ez0WTJKiOIcB5QtI7Ta9wq1Qedy9albWVpCS04FTnxQH5S0esTXw6j+iDTD8Lc2JbOhw8tYo/zRXg=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/48"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/49"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/applications/audio/pocket-casts/default.nix index 528cc18cbe46c..576124d968449 100644 --- a/pkgs/applications/audio/pocket-casts/default.nix +++ b/pkgs/applications/audio/pocket-casts/default.nix @@ -1,57 +1,59 @@ -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron -, alsa-lib, gtk3, libXScrnSaver, libXtst, mesa, nss }: +{ lib +, stdenv +, fetchFromGitHub +, electron +, copyDesktopItems +, makeDesktopItem +, makeWrapper +}: stdenv.mkDerivation rec { pname = "pocket-casts"; version = "0.6.0"; - src = fetchurl { - url = "https://github.com/felicianotech/pocket-casts-desktop-app/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-nHdF9RDOkM9HwwmK/axiIPM4nmKrWp/FHNC/EI1vTTc="; + src = fetchFromGitHub { + owner = "felicianotech"; + repo = "pocket-casts-desktop-app"; + rev = "v${version}"; + sha256 = "sha256-WMv2G4b7kYnWy0pz8YyI2eTdefs1mtWau+HQLiRygjE="; }; + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Pocket Casts"; + genericName = "Podcasts Listener"; + exec = "pocket-casts"; + icon = "pocket-casts"; + comment = meta.description; + }) + ]; + nativeBuildInputs = [ - dpkg - autoPatchelfHook + copyDesktopItems makeWrapper ]; - buildInputs = [ alsa-lib gtk3 libXScrnSaver libXtst mesa nss ]; - - unpackCmd = '' - # If unpacking using -x option, there is a permission error - dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner; - ''; - installPhase = '' runHook preInstall - mkdir -p $out - mv bin $out - mv lib $out - mv share $out + mkdir -p $out/bin $out/opt/pocket-casts $out/share/pixmaps - cp $out/lib/pocket-casts/resources/app/icon.png $out/share/pixmaps/pocket-casts.png + cp -r main.js tray-icon.png LICENSE $out/opt/pocket-casts + install -Dm644 icon.png $out/share/pixmaps/pocket-casts.png + install -Dm644 icon-x360.png $out/share/pixmaps/pocket-casts-x360.png - runHook postInstall - ''; + makeWrapper ${electron}/bin/electron $out/bin/pocket-casts \ + --add-flags $out/opt/pocket-casts/main.js - postFixup = '' - substituteInPlace $out/share/applications/pocket-casts.desktop \ - --replace Name=pocket-casts "Name=Pocket Casts" \ - --replace GenericName=pocket-casts "GenericName=Podcasts App" \ - --replace Exec=pocket-casts Exec=$out/bin/pocket-casts - makeWrapper ${electron}/bin/electron \ - $out/bin/pocket-casts \ - --add-flags $out/lib/pocket-casts/resources/app/main.js + runHook postInstall ''; meta = with lib; { description = "Pocket Casts webapp, packaged for the Linux Desktop"; homepage = "https://github.com/felicianotech/pocket-casts-desktop-app"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index fb8bd527aa22e..a00f60e732867 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.3.03"; + version = "6.3.08"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-Fb16sx+LVoXuiFASeiaYUMoNgZJXqKTBrUHFd2YXEJ0="; + sha256 = "sha256-65/RGUUuJDE2fvd3ltwdDR6rAWtQaRMIdlZzbh+/pfo="; }; configurePhase = '' diff --git a/pkgs/applications/audio/pragha/default.nix b/pkgs/applications/audio/pragha/default.nix index da5a64f708eb0..8e039f05927f5 100644 --- a/pkgs/applications/audio/pragha/default.nix +++ b/pkgs/applications/audio/pragha/default.nix @@ -83,7 +83,7 @@ mkDerivation rec { CFLAGS = [ "-DHAVE_PARANOIA_NEW_INCLUDES" ]; - NIX_CFLAGS_COMPILE = "-I${lib.getDev gst_all_1.gst-plugins-base}/include/gstreamer-1.0"; + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev gst_all_1.gst-plugins-base}/include/gstreamer-1.0"; postInstall = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix index 9e7795401aa3e..304585e2c0a0c 100644 --- a/pkgs/applications/audio/psst/default.nix +++ b/pkgs/applications/audio/psst/default.nix @@ -10,6 +10,7 @@ let categories = [ "Audio" "AudioVideo" ]; icon = "psst"; terminal = false; + startupWMClass = "psst-gui"; }; in diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 705820950b0da..128d5c59c78ea 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -62,6 +62,7 @@ python3.pkgs.buildPythonApplication rec { # the file should be executable but it isn't so our wrapper doesn't run preFixup = '' chmod 555 $out/bin/puddletag + wrapQtApp $out/bin/puddletag ''; doCheck = false; # there are no tests diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 2be471650a6ed..2fc911222da9e 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.36"; + version = "0.9.1"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xEFjyVly1VyDz9ALtVwxxrEs856joP+pe/mappyKrPU="; + hash = "sha256-tu/qlrbTcUCIRF15x9ATKHH+LDy1OsGJpo5x+CerTKg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix index cb190cabf54d5..5164692b30549 100644 --- a/pkgs/applications/audio/qmidiarp/default.nix +++ b/pkgs/applications/audio/qmidiarp/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { parallel. ''; - homepage = "http://qmidiarp.sourceforge.net"; + homepage = "https://qmidiarp.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ sjfloat ]; diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix index f013c338e7655..081b0c9288929 100644 --- a/pkgs/applications/audio/qtscrobbler/default.nix +++ b/pkgs/applications/audio/qtscrobbler/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It is able to gather this information from Apple iPods or DAPs running the Rockbox replacement firmware. ''; - homepage = "http://qtscrob.sourceforge.net"; + homepage = "https://qtscrob.sourceforge.net"; license = licenses.gpl2; maintainers = [ maintainers.vanzef ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index 6d5d1ca860d04..e78502eb23f75 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multi-effects processor emulating a guitar effects pedalboard"; - homepage = "http://rakarrack.sourceforge.net"; + homepage = "https://rakarrack.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 542e47cd16b70..72a0ac5209344 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -4,8 +4,10 @@ , makeWrapper , alsa-lib +, curl , gtk3 , lame +, libxml2 , ffmpeg , vlc , xdg-utils @@ -23,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "6.73"; + version = "6.75"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { - x86_64-linux = "sha256-omQ2XdL4C78BQRuYKy90QlMko2XYHoVhd4X0C+Zyp8E="; - aarch64-linux = "sha256-XHohznrfFMHHgif4iFrpXb0FNddYiBb0gB7ZznlU834="; + x86_64-linux = "sha256-wtXClHL+SeuLxMROaZKZOwYnLo6MXC7lAiwCj80X0Ck="; + aarch64-linux = "sha256-xCkAbKzXH7E1Ud6iGsnzgZT/2Sy6qpRItYUHFF6ggpQ="; }.${stdenv.hostPlatform.system}; }; @@ -69,8 +71,9 @@ stdenv.mkDerivation rec { # Setting the rpath of the plugin shared object files does not # seem to have an effect for some plugins. # We opt for wrapping the executable with LD_LIBRARY_PATH prefix. + # Note that libcurl and libxml2 are needed for ReaPack to run. wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ lame ffmpeg vlc xdotool ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl lame libxml2 ffmpeg vlc xdotool stdenv.cc.cc.lib ]}" mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch index fed5a2ea5e1da..0b2cab3975e58 100644 --- a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch +++ b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch @@ -1,5 +1,3 @@ -diff --git a/SConstruct b/SConstruct -index 3ad4d9a..fb02365 100644 --- a/SConstruct +++ b/SConstruct @@ -94,11 +94,8 @@ def CheckWiX(context): @@ -16,13 +14,15 @@ index 3ad4d9a..fb02365 100644 def validate_spd_version(key,val,env): m=re.match(r"^\d+\.\d+",val) -@@ -208,9 +205,9 @@ def create_base_env(user_vars): +@@ -207,10 +204,10 @@ def create_base_env(user_vars): + env_args["LIBS"]=[] env_args["package_name"]="RHVoice" env_args["CPPDEFINES"]=[("RHVOICE","1")] - env=Environment(**env_args) +- env=Environment(**env_args) - if env["dev"]: - env["prefix"]=os.path.abspath("local") - env["RPATH"]=env.Dir("$libdir").abspath ++ env=Environment(ENV = os.environ, **env_args) + env.PrependENVPath("PATH", os.environ["PATH"]) + env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"] + env["RPATH"]=env.Dir("$libdir").abspath diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix index d578a4f307840..e7efb7896be7c 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -56,7 +56,7 @@ mkDerivation rec { ]; # gstreamer cannot otherwise be found - NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; + env.NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; postInstall = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index 9fce777906bb0..807a27e67e1ad 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/pkgs/applications/audio/shortwave/default.nix @@ -23,20 +23,20 @@ stdenv.mkDerivation rec { pname = "shortwave"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Shortwave"; rev = version; - sha256 = "sha256-N0ftIq0+sxkpo56IGHZYAK6MgRNW7T6C2jWEiJsYy/Y="; + sha256 = "sha256-ESZ1yD1IuBar8bv83xMczZbtPtHbWRpe2yMVyr7K5gQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-90JBN3cJKqIJX6DRq5FtEpIr5Isxf+jb1SlxGMbBwMQ="; + hash = "sha256-8W46bGAitR2YbZbnsigAZMW5pSFTkDAe5JNaNOH5JfA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 558948ab4a0d9..aef561e692a61 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "sha256-CCifn9OEFM//Hk1PJj8T3MXIV8pXCTdBBXPsHuZwLyQ="; + sha256 = "sha256-dlK1xQQqst4VQjioC7MZzqXwMC+JfqtvnD5lrOqGhYI="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/sonixd/default.nix b/pkgs/applications/audio/sonixd/default.nix index 38110df291578..d7b15ba0482a9 100644 --- a/pkgs/applications/audio/sonixd/default.nix +++ b/pkgs/applications/audio/sonixd/default.nix @@ -3,17 +3,25 @@ , appimageTools }: -appimageTools.wrapType2 rec { +let pname = "sonixd"; version = "0.15.3"; - src = fetchurl { url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage"; sha256 = "sha256-+4L3XAuR7T/z5a58SXre6yUiVi7TvSAs8vPgEC7hcIw="; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 rec { + inherit pname version src; extraInstallCommands = '' - mv $out/bin/sonixd-${version} $out/bin/sonixd + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share ''; meta = with lib; { diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 3ec2cda4280be..7a6399ff3c666 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { # Without it doesn't find all of the boost libraries. BOOST_LIB_DIR = "${boost}/lib"; # uses the deprecated get_generic_category() in boost_system - NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; + env.NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix new file mode 100644 index 0000000000000..2330d9c279722 --- /dev/null +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -0,0 +1,53 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, cmake +, alsa-lib +, dbus +, fontconfig +}: + +rustPlatform.buildRustPackage rec { + pname = "spotify-player"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "aome510"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-nWXXaRHTzCXmu4eKw88pKuWXgdG9n7azPeBbXYz+Fio="; + }; + + cargoHash = "sha256-y/qHiwZes4nVtjbFN/jL2LFugGpRKnYij7+XXZbqguQ="; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + + buildInputs = [ + openssl + alsa-lib + dbus + fontconfig + ]; + + buildNoDefaultFeatures = true; + + buildFeatures = [ + "rodio-backend" + "media-control" + "image" + "lyric-finder" + ]; + + meta = with lib; { + description = "A command driven spotify player"; + homepage = "https://github.com/aome510/spotify-player"; + mainProgram = "spotify_player"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 2c821ec6b4c88..a0a17a93e1faa 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -134,8 +134,8 @@ stdenv.mkDerivation { ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so - ln -s ${ffmpeg.out}/lib/libavcodec.so* $libdir - ln -s ${ffmpeg.out}/lib/libavformat.so* $libdir + ln -s ${ffmpeg.lib}/lib/libavcodec.so* $libdir + ln -s ${ffmpeg.lib}/lib/libavformat.so* $libdir rpath="$out/share/spotify:$libdir" diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix index 84376a1bbe9e2..2b72664347e60 100644 --- a/pkgs/applications/audio/stochas/default.nix +++ b/pkgs/applications/audio/stochas/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + postPatch = '' + sed '1i#include <utility>' -i \ + lib/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h # gcc12 + ''; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index d6e56c98125f1..db7851d9e1547 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.4.7"; + version = "7.5.0"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-WUHMXsbnNaDlV/5bCOPMadJKWoF5i2UlFf9fcX6GCZ0="; + hash = "sha256-9/mzh8lRBjd7d9oEyG1XGWmOdgPEFCVjHZxDnAhYDwc="; }; postUnpack = '' diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index 525a743965c27..c27e3864d27f7 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" ''; - NIX_CFLAGS_COMPILE = "-D GIT_DESCRIBE=\"\""; + env.NIX_CFLAGS_COMPILE = "-D GIT_DESCRIBE=\"\""; # tenacity only looks for ffmpeg at runtime, so we need to link it in manually NIX_LDFLAGS = toString [ diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index c26ffd7e64af5..85d829f765ebe 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -1,23 +1,42 @@ { lib , stdenv -, fetchCrate , rustPlatform +, fetchCrate +, fetchpatch , pkg-config -, alsa-lib }: +, alsa-lib +, darwin +}: rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.7.8"; + version = "0.7.9"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1RlG1/2+NuMO9zqFHQaEkEX1YrYYMjnaNprjdl1ZnHQ="; + hash = "sha256-ytAKINcZwLyHWbzShxfxRKx4BepM0G2BYdLgwR48g7w="; }; - cargoHash = "sha256-SYk2SiFbp40/6Z0aBoX4MPnPLHjEfsJKCW4cErm0D78="; + cargoHash = "sha256-yxFF5Yqj+xTB3FAJUtgcIeAEHR44JA1xONxGFdG0yS0="; + + patches = [ + (fetchpatch { + name = "fix-panic-when-XDG_AUDIO_DIR-not-set.patch"; + url = "https://github.com/tramhao/termusic/commit/b6006b22901f1f865a2e3acf7490fd3fa520ca5e.patch"; + hash = "sha256-1ukQ0y5IRdOndsryuqXI9/zyhCDQ5NIeTan4KCynAv0="; + }) + ]; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib ]; + buildInputs = lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AudioUnit + ]; meta = with lib; { description = "Terminal Music Player TUI written in Rust"; diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 8905351da5333..93b8d3203534f 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { pname = "tidal-hifi"; - version = "4.3.1"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "sha256-Q+K8oF1VEsuhmhPH6K3as1+71vCfaKCdzRzCIxtiXvE="; + sha256 = "sha256-6KlcxBV/zHN+ZnvIu1PcKNeS0u7LqhDqAjbXawT5Vv8="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; @@ -109,13 +109,12 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ "''${gappsWrapperArgs[@]}" substituteInPlace $out/share/applications/tidal-hifi.desktop \ - --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" \ - --replace "/usr/share/icons/hicolor/0x0/apps/tidal-hifi.png" "tidal-hifi.png" + --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" for size in 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/ convert $out/share/icons/hicolor/0x0/apps/tidal-hifi.png \ - -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/tidal-hifi.png + -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/icon.png done ''; @@ -124,7 +123,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Mastermindzh/tidal-hifi"; changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ alternateved ]; + maintainers = with maintainers; [ qbit ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index da149db075379..55883a4f70e95 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: tcextract-extract_pcm.o:/build/transcode-1.1.7/import/extract_pcm.c:36: multiple definition of # `audio'; tcextract-extract_ac3.o:/build/transcode-1.1.7/import/extract_ac3.c:337: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { description = "Suite of command line utilities for transcoding video and audio codecs, and for converting between different container formats"; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 5c9f31b750027..93922313ddfd7 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -2,6 +2,8 @@ , fetchzip , lib , wrapGAppsHook +, xdg-utils +, which , alsa-lib , atk , cairo @@ -31,7 +33,11 @@ stdenv.mkDerivation rec { } else throw "Platform not supported"; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ + which + xdg-utils + wrapGAppsHook + ]; buildInputs = with gst_all_1; [ gst-plugins-base @@ -65,8 +71,13 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/libexec $out/share/doc cp transcribe $out/libexec cp xschelp.htb readme_gtk.html $out/share/doc - cp -r gtkicons $out/share/icons ln -s $out/share/doc/xschelp.htb $out/libexec + # The script normally installs to the home dir + sed -i -E 's!BIN_DST=.*!BIN_DST=$out!' install-linux.sh + sed -i -e 's!Exec=''${BIN_DST}/transcribe/transcribe!Exec=transcribe!' install-linux.sh + sed -i -e 's!''${BIN_DST}/transcribe!''${BIN_DST}/libexec!' install-linux.sh + rm -f xschelp.htb readme_gtk.html *.so + XDG_DATA_HOME=$out/share bash install-linux.sh -i patchelf \ --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ $out/libexec/transcribe @@ -97,6 +108,7 @@ stdenv.mkDerivation rec { homepage = "https://www.seventhstring.com/xscribe/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; + maintainers = with maintainers; [ iwanb ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix index ae96ea63cb0ba..71697ab38b981 100644 --- a/pkgs/applications/audio/wolf-shaper/default.nix +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolf-shaper"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "pdesaulniers"; repo = "wolf-shaper"; rev = "v${version}"; - sha256 = "sha256-BREv0nQVysWdx/sVd0cdFji49xtLmHEL8b2jLtgjDfI="; + sha256 = "sha256-xy6ZebabTRLo/Xk2OMoR4xtxmZsqYXaUHUebuDrHOvA="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix index 21313b9c05930..d300737ae6d8b 100644 --- a/pkgs/applications/audio/yasr/default.nix +++ b/pkgs/applications/audio/yasr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; # taken from the debian yasr package meta = { - homepage = "http://yasr.sourceforge.net"; + homepage = "https://yasr.sourceforge.net"; description = "A general-purpose console screen reader"; longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems."; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/yesplaymusic/default.nix b/pkgs/applications/audio/yesplaymusic/default.nix new file mode 100644 index 0000000000000..aee0d1d192fe7 --- /dev/null +++ b/pkgs/applications/audio/yesplaymusic/default.nix @@ -0,0 +1,120 @@ +{ lib +, stdenv +, fetchurl +, undmg +, dpkg +, autoPatchelfHook +, wrapGAppsHook +, makeWrapper +, alsa-lib +, at-spi2-atk +, cups +, nspr +, nss +, mesa # for libgbm +, xorg +, xdg-utils +, libdrm +, libnotify +, libsecret +, libuuid +, gtk3 +, systemd +}: +let + pname = "yesplaymusic"; + version = "0.4.7"; + + srcs = { + x86_64-linux = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_amd64.deb"; + hash = "sha256-nnnHE2OgIqoz3dC+G0219FVBhvnWivLW1BX6+NYo6Ng="; + }; + aarch64-linux = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_arm64.deb"; + hash = "sha256-+rrhY5iDDt/nYs0Vz5/Ef0sgpsdBKMtb1aVfCZLgRgg="; + }; + x86_64-darwin = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-x64.dmg"; + hash = "sha256-z8CASZRWKlj1g3mhxTMMeR4klTvQ2ReSrL7Rt18qQbM="; + }; + aarch64-darwin = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-arm64.dmg"; + hash = "sha256-McYLczudKG4tRNIw/Ws4rht0n4tiKA2M99yKtJbdlY8="; + }; + }; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + libraries = [ + alsa-lib + at-spi2-atk + cups + nspr + nss + mesa + xorg.libxshmfence + xorg.libXScrnSaver + xorg.libXtst + xdg-utils + libdrm + libnotify + libsecret + libuuid + gtk3 + ]; + + meta = with lib; { + description = "A good-looking third-party netease cloud music player"; + homepage = "https://github.com/qier222/YesPlayMusic/"; + license = licenses.mit; + maintainers = with maintainers; [ ChaosAttractor ]; + platforms = builtins.attrNames srcs; + }; +in +if stdenv.isDarwin +then stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; +} +else stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + makeWrapper + ]; + + buildInputs = libraries; + + runtimeDependencies = [ + (lib.getLib systemd) + ]; + + unpackPhase = '' + ${dpkg}/bin/dpkg-deb -x $src . + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r opt $out/opt + cp -r usr/share $out/share + substituteInPlace $out/share/applications/yesplaymusic.desktop \ + --replace "/opt/YesPlayMusic/yesplaymusic" "$out/bin/yesplaymusic" + makeWrapper $out/opt/YesPlayMusic/yesplaymusic $out/bin/yesplaymusic \ + --argv0 "yesplaymusic" \ + --add-flags "$out/opt/YesPlayMusic/resources/app.asar" + + runHook postInstall + ''; +} diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 218204d690a16..83ce36a595816 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # ld: CMakeFiles/ympd.dir/src/mpd_client.c.o:(.bss+0x0): multiple definition of `mpd'; # CMakeFiles/ympd.dir/src/ympd.c.o:(.bss+0x20): first defined here # Should be fixed by pending https://github.com/notandy/ympd/pull/191 (does not apply as is). - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libmpdclient openssl ]; diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix index 797b4624b966e..f490e452b51c0 100644 --- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # Force optimization to fix: # warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) - NIX_CFLAGS_COMPILE = "-O3"; + env.NIX_CFLAGS_COMPILE = "-O3"; # Remove pre-built y.tab.c to generate with nixpkgs bison preBuild = '' diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index fbe09b8aac0fe..88b7b9fa5c5ed 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -4,6 +4,7 @@ , rustPlatform , substituteAll , desktop-file-utils +, git , itstool , meson , ninja @@ -18,20 +19,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.4.2"; + version = "0.5.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-EiXu5xv42at4NBwpCbij0+YsxVlNvIYrnxmlB9ItqZc="; + hash = "sha256-d+VkKY14o1wwINSlVBsvWux8YhyXg77N9i2R61QLGqM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-2IDkVkzH5qQM+XiyxuST5p0y4N/Sz+4+Sj3Smotaf8M="; + hash = "sha256-3MNwX8kB+bjP9Dz+k+HYmCOI1Naa9tDBe0+GKsEmqnc="; }; patches = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils + git itstool meson ninja diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 0da9675d2503e..36bc0ebfb883d 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -34,11 +34,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "1hwfchwqvflfzpv8n9wvj567a68fa4bch0hi8vk4pzmwxsx4z7g1"; + sha256 = "0jisxzajsc4wfvxabvfzd0x9y1fxzg39fkhap1781q7wyi4ry9kd"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ]; diff --git a/pkgs/applications/blockchains/bisq-desktop/update.sh b/pkgs/applications/blockchains/bisq-desktop/update.sh index 393447834bba5..c65e04e3de409 100755 --- a/pkgs/applications/blockchains/bisq-desktop/update.sh +++ b/pkgs/applications/blockchains/bisq-desktop/update.sh @@ -7,14 +7,13 @@ version="$(curl -s https://api.github.com/repos/bisq-network/bisq/releases| jq ' depname="Bisq-64bit-$version.deb" src="https://github.com/bisq-network/bisq/releases/download/v$version/$depname" signature="$src.asc" -key="CB36 D7D2 EBB2 E35D 9B75 500B CD5D C1C5 29CD FD3B" pushd $(mktemp -d --suffix=-bisq-updater) export GNUPGHOME=$PWD/gnupg mkdir -m 700 -p "$GNUPGHOME" curl -L -o "$depname" -- "$src" curl -L -o signature.asc -- "$signature" -gpg --batch --recv-keys "$key" +curl https://bisq.network/pubkey/E222AA02.asc | gpg --import gpg --batch --verify signature.asc "$depname" sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$depname") popd diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 69004bb73c3fa..9b88cf9ab4ba6 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.7.5"; + version = "1.7.12"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-xycNt3jzZY2a4hNv3arWLt+EfMqpFVMDHMuzOWnL7aQ="; + sha256 = "sha256-NRmpKr0lqe2NUlpyzkdtn7nN0rFrZakryNR1WAOzx9Q="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 8a05f8276b3f0..3193a302d1a67 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -8,15 +8,15 @@ (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.18"; sha256 = "1w1h6za2mjk04njkw4hny3lx38h2m03gmvwrihj9h2rak7jf2gij"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.20"; sha256 = "1vnzmczd4z25vbf987p4vp6sxc09fp6mvhrvq41iwj1ks5zcprlf"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.24"; sha256 = "0i0lqpxx0gy9zbssjigz0vq0way88x0slyyfijsx4sasrhrbv5qs"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.25"; sha256 = "0172czzzlgsljgmhb5wh8cb1cl12ac54qyzmd3w18wbkxmr205qk"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.23"; sha256 = "036cggc386448i05s38pnhzs7qqbix6lml7j2zn84gcgk8w741gi"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.24"; sha256 = "0dah7q90x29rqhngxd9226pfn1k4bbhhfgnkpjpw64529m29cdks"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.14"; sha256 = "1gzqz34lgk42kf86ldi3z0k4m9x91hlkqh6d7rq93nphl57mwqar"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.16"; sha256 = "0l6pnjc6phsacwg145kwsakjpkd44jm1w53y0s166bwzpcdmljq0"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.18"; sha256 = "0vnnnm9c5w8ag3a25fzmsjax028ykb7xr4fp7saq4si3bmzkjswp"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) diff --git a/pkgs/applications/blockchains/cgminer/default.nix b/pkgs/applications/blockchains/cgminer/default.nix index 48a8d3ad93022..7d2dbe9208582 100644 --- a/pkgs/applications/blockchains/cgminer/default.nix +++ b/pkgs/applications/blockchains/cgminer/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # ld: cgminer-driver-modminer.o:/build/source/miner.h:285: # multiple definition of `bitforce_drv'; cgminer-cgminer.o:/build/source/miner.h:285: # first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { description = "CPU/GPU miner in c for bitcoin"; diff --git a/pkgs/applications/blockchains/chia-dev-tools/default.nix b/pkgs/applications/blockchains/chia-dev-tools/default.nix index d65eb37f3985f..59f927443b7b0 100644 --- a/pkgs/applications/blockchains/chia-dev-tools/default.nix +++ b/pkgs/applications/blockchains/chia-dev-tools/default.nix @@ -36,13 +36,15 @@ python3Packages.buildPythonApplication rec { SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; propagatedBuildInputs = with python3Packages; [ + anyio (toPythonModule chia) + pytest # required at runtime by the "test" command + pytest-asyncio pytimeparse ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook - pytest-asyncio ]; preCheck = '' diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 99fe1595def1c..a07a0ea1e2814 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,14 +6,14 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - hash = "sha256-BgUgTYpjFsKisfFni8TzSYQ8+S3P+7m78DuyjWF5xh8="; + hash = "sha256-hsh2HHpm103JfUTPwk+8zIkhVrglIP8xMovFIibn8+g="; }; postPatch = '' diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index a39cbc341e894..80fa1e94589f3 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.0.2"; + version = "22.1"; src = fetchFromGitHub { owner = "ElementsProject"; repo = "elements"; rev = "elements-${version}"; - sha256 = "sha256-20Tem6CD7XAt1EDfkl46Nxhb+Vq3sCk/UqnLCAm85FU="; + sha256 = "sha256-HDV06O9k+TpYR0ZwLas2hvDwxvnfoa8VUzgvkXv/WV8="; }; nativeBuildInputs = diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index e656843536429..ae1a60ec1db05 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.6"; + version = "5.0.7"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-UiPwvZcdkeFOTMVcUT1Xr5ByrJC+yzodCfi8Br61hjU="; + sha256 = "sha256-yxb8cMAokAv0tl9FSjjtdvHkJP/UKlZxLLu/+gx8kyQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index e81dc1813e524..e4823f1a66c3e 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.35.2"; + version = "2.39.0"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hGJ9SeUYACOuypTJmPnrv4f8ujjsUt3dZbwso+94g3M="; + sha256 = "sha256-HlAnuc6n/de6EzHTit3xGCFLrc2+S+H/o0gCxH8d0aU="; fetchSubmodules = true; }; - vendorSha256 = "sha256-lKzJLRCcyhQIV7y1XxqbvTINLlUwWFnflZgGQHYzBjY="; + vendorSha256 = "sha256-kKwaA6NjRdg97tTEzEI+TWMSx7izzFWcefR5B086cUY="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/ethabi/Cargo.lock b/pkgs/applications/blockchains/ethabi/Cargo.lock new file mode 100644 index 0000000000000..05e3f0fef1d92 --- /dev/null +++ b/pkgs/applications/blockchains/ethabi/Cargo.lock @@ -0,0 +1,677 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "bitvec" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" +dependencies = [ + "either", + "radium", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + +[[package]] +name = "byte-slice-cast" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "ethabi" +version = "13.0.0" +dependencies = [ + "anyhow", + "ethereum-types", + "hex", + "hex-literal", + "paste", + "serde", + "serde_json", + "sha3", + "thiserror", + "uint", +] + +[[package]] +name = "ethabi-cli" +version = "13.0.0" +dependencies = [ + "anyhow", + "ethabi", + "hex", + "itertools", + "sha3", + "structopt", +] + +[[package]] +name = "ethabi-contract" +version = "11.0.0" + +[[package]] +name = "ethabi-derive" +version = "13.0.0" +dependencies = [ + "anyhow", + "ethabi", + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "ethabi-tests" +version = "0.1.1" +dependencies = [ + "ethabi", + "ethabi-contract", + "ethabi-derive", + "hex", + "hex-literal", +] + +[[package]] +name = "ethbloom" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22a621dcebea74f2a6f2002d0a885c81ccf6cbdf86760183316a7722b5707ca4" +dependencies = [ + "crunchy", + "fixed-hash", + "impl-rlp", + "impl-serde", + "tiny-keccak", +] + +[[package]] +name = "ethereum-types" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05dc5f0df4915fa6dff7f975a8366ecfaaa8959c74235469495153e7bb1b280e" +dependencies = [ + "ethbloom", + "fixed-hash", + "impl-rlp", + "impl-serde", + "primitive-types", + "uint", +] + +[[package]] +name = "fixed-hash" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" +dependencies = [ + "byteorder", + "rand", + "rustc-hex", + "static_assertions", +] + +[[package]] +name = "generic-array" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "heck" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +dependencies = [ + "libc", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hex-literal" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8" + +[[package]] +name = "impl-codec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" +dependencies = [ + "parity-scale-codec", +] + +[[package]] +name = "impl-rlp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" +dependencies = [ + "rlp", +] + +[[package]] +name = "impl-serde" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f" +dependencies = [ + "serde", +] + +[[package]] +name = "itertools" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "keccak" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" + +[[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.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "parity-scale-codec" +version = "1.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d" +dependencies = [ + "arrayvec", + "bitvec", + "byte-slice-cast", + "serde", +] + +[[package]] +name = "paste" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "primitive-types" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8" +dependencies = [ + "fixed-hash", + "impl-codec", + "impl-rlp", + "impl-serde", + "uint", +] + +[[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.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" + +[[package]] +name = "rand" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rlp" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8" +dependencies = [ + "bytes", + "rustc-hex", +] + +[[package]] +name = "rustc-hex" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "serde" +version = "1.0.125" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.125" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha3" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" +dependencies = [ + "block-buffer", + "digest", + "keccak", + "opaque-debug", +] + +[[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.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "structopt" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" +dependencies = [ + "clap", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[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.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "typenum" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" + +[[package]] +name = "uint" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e" +dependencies = [ + "byteorder", + "crunchy", + "hex", + "static_assertions", +] + +[[package]] +name = "unicode-segmentation" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[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" diff --git a/pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch b/pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch deleted file mode 100644 index 57725d28288a3..0000000000000 --- a/pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch +++ /dev/null @@ -1,683 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..05e3f0f ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,677 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "ansi_term" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+dependencies = [ -+ "winapi", -+] -+ -+[[package]] -+name = "anyhow" -+version = "1.0.40" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" -+ -+[[package]] -+name = "arrayvec" -+version = "0.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "bitvec" -+version = "0.17.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" -+dependencies = [ -+ "either", -+ "radium", -+] -+ -+[[package]] -+name = "block-buffer" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -+dependencies = [ -+ "block-padding", -+ "generic-array", -+] -+ -+[[package]] -+name = "block-padding" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" -+ -+[[package]] -+name = "byte-slice-cast" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" -+ -+[[package]] -+name = "byteorder" -+version = "1.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -+ -+[[package]] -+name = "bytes" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "clap" -+version = "2.33.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -+dependencies = [ -+ "ansi_term", -+ "atty", -+ "bitflags", -+ "strsim", -+ "textwrap", -+ "unicode-width", -+ "vec_map", -+] -+ -+[[package]] -+name = "crunchy" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -+ -+[[package]] -+name = "digest" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -+dependencies = [ -+ "generic-array", -+] -+ -+[[package]] -+name = "either" -+version = "1.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -+ -+[[package]] -+name = "ethabi" -+version = "13.0.0" -+dependencies = [ -+ "anyhow", -+ "ethereum-types", -+ "hex", -+ "hex-literal", -+ "paste", -+ "serde", -+ "serde_json", -+ "sha3", -+ "thiserror", -+ "uint", -+] -+ -+[[package]] -+name = "ethabi-cli" -+version = "13.0.0" -+dependencies = [ -+ "anyhow", -+ "ethabi", -+ "hex", -+ "itertools", -+ "sha3", -+ "structopt", -+] -+ -+[[package]] -+name = "ethabi-contract" -+version = "11.0.0" -+ -+[[package]] -+name = "ethabi-derive" -+version = "13.0.0" -+dependencies = [ -+ "anyhow", -+ "ethabi", -+ "heck", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "ethabi-tests" -+version = "0.1.1" -+dependencies = [ -+ "ethabi", -+ "ethabi-contract", -+ "ethabi-derive", -+ "hex", -+ "hex-literal", -+] -+ -+[[package]] -+name = "ethbloom" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "22a621dcebea74f2a6f2002d0a885c81ccf6cbdf86760183316a7722b5707ca4" -+dependencies = [ -+ "crunchy", -+ "fixed-hash", -+ "impl-rlp", -+ "impl-serde", -+ "tiny-keccak", -+] -+ -+[[package]] -+name = "ethereum-types" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05dc5f0df4915fa6dff7f975a8366ecfaaa8959c74235469495153e7bb1b280e" -+dependencies = [ -+ "ethbloom", -+ "fixed-hash", -+ "impl-rlp", -+ "impl-serde", -+ "primitive-types", -+ "uint", -+] -+ -+[[package]] -+name = "fixed-hash" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" -+dependencies = [ -+ "byteorder", -+ "rand", -+ "rustc-hex", -+ "static_assertions", -+] -+ -+[[package]] -+name = "generic-array" -+version = "0.14.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" -+dependencies = [ -+ "typenum", -+ "version_check", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" -+dependencies = [ -+ "cfg-if", -+ "libc", -+ "wasi", -+] -+ -+[[package]] -+name = "heck" -+version = "0.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" -+dependencies = [ -+ "unicode-segmentation", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "hex" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -+ -+[[package]] -+name = "hex-literal" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8" -+ -+[[package]] -+name = "impl-codec" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" -+dependencies = [ -+ "parity-scale-codec", -+] -+ -+[[package]] -+name = "impl-rlp" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -+dependencies = [ -+ "rlp", -+] -+ -+[[package]] -+name = "impl-serde" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "itertools" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -+dependencies = [ -+ "either", -+] -+ -+[[package]] -+name = "itoa" -+version = "0.4.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" -+ -+[[package]] -+name = "keccak" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" -+ -+[[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.94" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" -+ -+[[package]] -+name = "opaque-debug" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -+ -+[[package]] -+name = "parity-scale-codec" -+version = "1.3.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d" -+dependencies = [ -+ "arrayvec", -+ "bitvec", -+ "byte-slice-cast", -+ "serde", -+] -+ -+[[package]] -+name = "paste" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" -+ -+[[package]] -+name = "ppv-lite86" -+version = "0.2.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" -+ -+[[package]] -+name = "primitive-types" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8" -+dependencies = [ -+ "fixed-hash", -+ "impl-codec", -+ "impl-rlp", -+ "impl-serde", -+ "uint", -+] -+ -+[[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.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" -+dependencies = [ -+ "unicode-xid", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "radium" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" -+ -+[[package]] -+name = "rand" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" -+dependencies = [ -+ "libc", -+ "rand_chacha", -+ "rand_core", -+] -+ -+[[package]] -+name = "rand_chacha" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" -+dependencies = [ -+ "ppv-lite86", -+ "rand_core", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" -+dependencies = [ -+ "getrandom", -+] -+ -+[[package]] -+name = "rlp" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8" -+dependencies = [ -+ "bytes", -+ "rustc-hex", -+] -+ -+[[package]] -+name = "rustc-hex" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" -+ -+[[package]] -+name = "ryu" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -+ -+[[package]] -+name = "serde" -+version = "1.0.125" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" -+dependencies = [ -+ "serde_derive", -+] -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.125" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "serde_json" -+version = "1.0.64" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" -+dependencies = [ -+ "itoa", -+ "ryu", -+ "serde", -+] -+ -+[[package]] -+name = "sha3" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -+dependencies = [ -+ "block-buffer", -+ "digest", -+ "keccak", -+ "opaque-debug", -+] -+ -+[[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.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+ -+[[package]] -+name = "structopt" -+version = "0.3.21" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" -+dependencies = [ -+ "clap", -+ "lazy_static", -+ "structopt-derive", -+] -+ -+[[package]] -+name = "structopt-derive" -+version = "0.4.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" -+dependencies = [ -+ "heck", -+ "proc-macro-error", -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "syn" -+version = "1.0.72" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-xid", -+] -+ -+[[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.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" -+dependencies = [ -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ -+[[package]] -+name = "tiny-keccak" -+version = "2.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -+dependencies = [ -+ "crunchy", -+] -+ -+[[package]] -+name = "typenum" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" -+ -+[[package]] -+name = "uint" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e" -+dependencies = [ -+ "byteorder", -+ "crunchy", -+ "hex", -+ "static_assertions", -+] -+ -+[[package]] -+name = "unicode-segmentation" -+version = "1.7.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -+ -+[[package]] -+name = "vec_map" -+version = "0.8.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -+ -+[[package]] -+name = "version_check" -+version = "0.9.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" -+ -+[[package]] -+name = "wasi" -+version = "0.10.2+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" -+ -+[[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" diff --git a/pkgs/applications/blockchains/ethabi/default.nix b/pkgs/applications/blockchains/ethabi/default.nix index 49f34a68bbacb..eea4d546f14ba 100644 --- a/pkgs/applications/blockchains/ethabi/default.nix +++ b/pkgs/applications/blockchains/ethabi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "ethabi"; @@ -11,11 +11,13 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bl46CSVP1MMYI3tkVAHFrjMFwTt8QoleZCV9pMIMZyc="; }; - cargoSha256 = "sha256-Jz0uEP2/ZjLS+GbCp7lNyJQdFDjTSFthjBdC/Z4tkTs="; - - cargoPatches = [ ./add-Cargo-lock.patch ]; + cargoLock = { + lockFile = ./Cargo.lock; + }; - buildInputs = lib.optional stdenv.isDarwin libiconv; + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; meta = with lib; { description = "Ethereum function call encoding (ABI) utility"; diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index 5b1d12634df5e..4f53eaf580ccb 100644 --- a/pkgs/applications/blockchains/haven-cli/default.nix +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "haven-cli"; - version = "3.0.3"; + version = "3.0.7"; src = fetchFromGitHub { owner = "haven-protocol-org"; repo = "haven-main"; rev = "v${version}"; - sha256 = "sha256-JbNk1TF0N3tRYGfZfSBFk+t/8GA4yjqP9G6S0ktdur8="; + sha256 = "sha256-HLZ9j75MtF7FkHA4uefkrYp07pVZe1Ac1wny7T0CMpA="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d64376aae18d9..5aee9eaee9feb 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.51.0"; + version = "2.53.2"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-qpgzGJsj7hrrK2i+xP0T+hcw7WMlGBILbHVJBHD5duo="; + hash = "sha256-RGeJWUMZagXM/8SHHOpTpcnsz+BShnGp2yvt31qo5lI="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index 7a5607d01c5e5..78c503e7ee5c9 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { pname = "lighthouse"; - version = "3.4.0"; + version = "3.5.0"; # lighthouse/common/deposit_contract/build.rs depositContractSpecVersion = "0.12.1"; @@ -30,10 +30,10 @@ rustPlatform.buildRustPackage rec { owner = "sigp"; repo = "lighthouse"; rev = "v${version}"; - hash = "sha256-4auiM5+kj/HjZKu2YP7JEnwDNxHuL39XCfmV/dc5jLE="; + hash = "sha256-09EQr/ghgdcnek0dih0+TXyIh5qwGWmg+nhI8d9n3Jc="; }; - cargoHash = "sha256-ihfGwdxL7Ttw86dhaVBp5meb0caXjzgbbP27Io8zv/c="; + cargoHash = "sha256-NWG3yIgxfD1GkiQ6TyZF4lNPy9s/i/9TaTujlOtx2NI="; buildFeatures = [ "modern" "gnosis" ]; @@ -41,8 +41,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - CoreFoundation SystemConfiguration + CoreFoundation + SystemConfiguration ]; depositContractSpec = fetchurl { diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix index 8cb8ed147aaca..35271cf232e5c 100644 --- a/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/pkgs/applications/blockchains/lndhub-go/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lndhub-go"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "getAlby"; repo = "lndhub.go"; rev = "${version}"; - sha256 = "sha256-bwwypqaqlO+T/8ppKIHqGSzVerhQVl7YHrORyrpaa2w="; + sha256 = "sha256-ZyqE6xFNsOwTBbLLn14jwNp9UkagTRgAQS+SEl+POaY="; }; - vendorSha256 = "sha256-AiRbUSgMoU8nTzis/7H9HRW2/xZxXFf39JipRbukeiA="; + vendorHash = "sha256-Wsejz/vYaT/maN7dYcrXPTXg30jZaldaslXbHcgHlRs="; doCheck = false; # tests require networking diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 08def5dd7917b..debf89c617c76 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.57"; + version = "2.3.62"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-oLkkGdzjyvgIXi0HZiFPCShzbBR8cOgMf1h1Nf1U6Rk="; + sha256 = "sha256-FpAMkVgvl0SxJ59FjL4H3Fvqb1LKsET2I+A01TQlvFA="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index 4931ec51078c0..b58c6bddafa01 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -4,7 +4,7 @@ }: rustPlatform.buildRustPackage rec { pname = "nearcore"; - version = "1.30.0"; + version = "1.30.1"; # https://github.com/near/nearcore/tags src = fetchFromGitHub { @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { # there is also a branch for this version number, so we need to be explicit rev = "refs/tags/${version}"; - sha256 = "sha256-Co8896RojUf/R8ZiRn7zSO1AWH7x5rYom6TbGohH1KM="; + sha256 = "sha256-VjvHCiWjsx5Y7xxqck/O9gSNrL8mxCTosLwLqC85ywY="; }; - cargoSha256 = "sha256-M+vhLBXsd+R97Sh5s6jFzon/47XohJeQKh//9QP6PXw="; + cargoHash = "sha256-5Gs1sAzjuUO3IkwMX1NeA/Sbax0qtwvulyT66AQaNjs="; cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ]; postPatch = '' diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 883514b7da5bb..7a7e461b1a217 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -12,13 +12,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.37"; + version = "0.9.38"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - hash = "sha256-/mgJNjliPUmMkhT/1oiX9+BJHfY3SMsKfFv9HCyWRQQ="; + hash = "sha256-qS9LZ9KBjOw7hEkUzu7eZFj6ZwbkCDxoqA7FPXb13o4="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-o+APFYKgA3zjQSGrkpnyf5LEBBqvZtcfWlzCk6nL02A="; + cargoHash = "sha256-4BOgG/NzSppTeEtoEVxqlYjV4FGkNFMeF+qCJwPz+7o="; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 8f3fd4b1c886c..9d984803d2196 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "19.6.0"; + version = "19.7.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lDefmPZM8ow6t5CpNBxef+9BoT773p5UgeMhgF+em2w="; + sha256 = "sha256-VfaP4EIVsu5JTAV7AX0Ymo44/TD8eUB61CViwf6Hfqw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix new file mode 100644 index 0000000000000..f333fcd05dc77 --- /dev/null +++ b/pkgs/applications/blockchains/ton/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, git +, gperf +, libmicrohttpd +, openssl +, readline +, zlib +}: + +stdenv.mkDerivation rec { + pname = "ton"; + version = "2023.01"; + + src = fetchFromGitHub { + owner = "ton-blockchain"; + repo = "ton"; + rev = "v${version}"; + sha256 = "sha256-wb96vh0YcTBFE8EzBItdTf88cvRMLW2XxcGJpNetOi8="; + fetchSubmodules = true; + }; + + postPatch = '' + # without this fails on aarch64-darwin with clang-11: error: the clang compiler does not support '-mcpu=apple-m1' + substituteInPlace CMakeLists.txt \ + --replace 'set(TON_ARCH "apple-m1")' "" + ''; + + nativeBuildInputs = [ + cmake + git + ]; + + buildInputs = [ + gperf + libmicrohttpd + openssl + readline + zlib + ]; + + meta = with lib; { + description = "A fully decentralized layer-1 blockchain designed by Telegram"; + homepage = "https://ton.org/"; + license = licenses.lgpl2Only; + platforms = platforms.all; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/applications/blockchains/torq/default.nix b/pkgs/applications/blockchains/torq/default.nix index 85041accbc4bf..657e5b0e3ffab 100644 --- a/pkgs/applications/blockchains/torq/default.nix +++ b/pkgs/applications/blockchains/torq/default.nix @@ -1,20 +1,42 @@ { lib , buildGoModule +, buildNpmPackage , fetchFromGitHub }: -buildGoModule rec { +let pname = "torq"; - version = "0.16.15"; + version = "0.18.17"; src = fetchFromGitHub { owner = "lncapital"; repo = pname; rev = "v${version}"; - hash = "sha256-ibrPq/EC61ssn4072gTNvJg9QO41+aTsU1Hhc6X6NPk="; + hash = "sha256-xiA66yGo8b1+zZ7jQ7SFOtNPmqbdna7fUCT21uibrIM="; }; - vendorHash = "sha256-HETN2IMnpxnTyg6bQDpoD0saJu+gKocdEf0VzEi12Gs="; + web = buildNpmPackage { + pname = "${pname}-frontend"; + inherit version; + src = "${src}/web"; + npmDepsHash = "sha256-/7x5RWYIB5BChYMnMuFVVaZd0pVkew4i4QrF7hSFnCM="; + + # copied from upstream Dockerfile + npmInstallFlags = [ "--legacy-peer-deps" ]; + TSX_COMPILE_ON_ERROR="true"; + ESLINT_NO_DEV_ERRORS="true"; + + # override npmInstallHook, we only care about the build/ directory + installPhase = '' + mkdir $out + cp -r build/* $out/ + ''; + }; +in +buildGoModule rec { + inherit pname version src; + + vendorHash = "sha256-bvisI589Gq9IdyJEqI+uzs3iDPOTUkq95P3n/KoFhF0="; subPackages = [ "cmd/torq" ]; @@ -24,6 +46,11 @@ buildGoModule rec { "-X github.com/lncapital/torq/build.version=v${version}" ]; + postInstall = '' + mkdir -p $out/web/build + cp -r ${web}/* $out/web/build/ + ''; + meta = with lib; { description = "Capital management tool for lightning network nodes"; license = licenses.mit; diff --git a/pkgs/applications/display-managers/emptty/default.nix b/pkgs/applications/display-managers/emptty/default.nix index d4224893ba487..61413a7bbcf1e 100644 --- a/pkgs/applications/display-managers/emptty/default.nix +++ b/pkgs/applications/display-managers/emptty/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "emptty"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "tvrzna"; repo = pname; rev = "v${version}"; - hash = "sha256-iT7wdxHC+/3fvBbSrHHuqNYWiqwL48NYzFmtmgVaFik="; + hash = "sha256-CbTPJgnKMWMXdG6Hr8xT9ae4Q9MxAfhITn5WSCzCmI4="; }; buildInputs = [ pam libX11 ]; diff --git a/pkgs/applications/display-managers/greetd/gtkgreet.nix b/pkgs/applications/display-managers/greetd/gtkgreet.nix index e0ebbb3bc4c26..77ddda9337102 100644 --- a/pkgs/applications/display-managers/greetd/gtkgreet.nix +++ b/pkgs/applications/display-managers/greetd/gtkgreet.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; # G_APPLICATION_FLAGS_NONE is deprecated in GLib 2.73.3+. - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; meta = with lib; { description = "GTK based greeter for greetd, to be run under cage or similar"; diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index 5c2a6d7c59b04..53f004c2a3671 100644 --- a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ lightdm gtk3 glib ]; - postUnpack = if conf != "" then '' + postUnpack = lib.optionalString (conf != "") '' cp ${builtins.toFile "config.h" conf} source/config.h - '' else ""; + ''; buildPhase = '' mkdir -p $out/bin $out/share/xgreeters diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index bc74edf5261d8..3d96ebd8deabe 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -79,7 +79,7 @@ let installPhase = '' cp -r . $out wrapProgram $out/bin/studio.sh \ - --set-default JAVA_HOME "$out/jre" \ + --set-default JAVA_HOME "$out/jbr" \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 494a02f3041fc..664199553ddf9 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,8 +10,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2022.1.1.19"; # "Android Studio Electric Eel (2022.1.1)" - sha256Hash = "luxE6a2C86JB28ezuIZV49TyE314S1RcNXQnCQamjUA="; + version = "2022.1.1.20"; # "Android Studio Electric Eel (2022.1.1) Patch 1" + sha256Hash = "sha256-UX7aOpTM23S7NBPNAz/fKEyK/dqWpok0NnpX9wck6p4="; }; betaVersion = { version = "2022.2.1.12"; # "Android Studio Flamingo (2022.2.1) Beta 1" diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index 22d15d54f1936..f56fe637f83f8 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ncurses based hex editor with a vim-like interface"; - homepage = "http://bviplus.sourceforge.net"; + homepage = "https://bviplus.sourceforge.net"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 7af47c46485a3..9d22963ebff6e 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.176.0"; + version = "1.186.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-7J/FAcmZYmgbmYEFm2V3+RBUcLE+8A+yOiJd/xp2Aww="; + hash = "sha256-CzCPz/Bny57nkxR21ACXjhAoplVVm4TVSbH6De+fKfI="; }; postPatch = '' @@ -66,8 +66,12 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; buildPhase = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: dep: '' - ln -s ${dep} ${name} + cp -r ${dep} ${name} '') deps) + '' + # See https://wiki.freepascal.org/CudaText#How_to_compile_CudaText + substituteInPlace ATSynEdit/atsynedit/atsynedit_package.lpk \ + --replace GTK2_IME_CODE _GTK2_IME_CODE + lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \ bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ EncConv/encconv/encconv_package.lpk \ diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 4ae432b946a7a..842d32b50306e 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -1,8 +1,8 @@ { "EncConv": { "owner": "Alexey-T", - "rev": "2022.06.19", - "hash": "sha256-M00rHH3dG6Vx6MEALxRNlnLLfX/rRI+rdTS7riOhgeg=" + "rev": "2023.01.02", + "hash": "sha256-4/ih4sBDel2wm+YFpNcwHoOrK8AgHe3Jbqxl+CYrQFM=" }, "ATBinHex-Lazarus": { "owner": "Alexey-T", @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2022.11.09", - "hash": "sha256-2Q1azfhThrk1t65Q+2aRr00V0UFrvR+z5oVMeW9c2ug=" + "rev": "2023.02.05", + "hash": "sha256-ZOnIhUnFd+7mBEz6YIhUOQkhBbCNeTFD0tfUILuC1x4=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.11.09", - "hash": "sha256-rgXVOWmmc1ap/fCiXCvn34rhUbNRoMHbTXXYtnxk2pQ=" + "rev": "2023.02.25", + "hash": "sha256-iTdb+eI1alS6chCn2rEbUAy9iVAgVvsNGURxds/2f7s=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,18 +26,18 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2022.08.22", - "hash": "sha256-o87V32HhFpCeSxhgkfKiL69oCcmpiReVmiNBPyv1kc4=" + "rev": "2023.02.25", + "hash": "sha256-09jTp0pFbiQ268xB/eDUj98t8WYjzGaTiHdFvWlmoR0=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.09.03", - "hash": "sha256-6xzYn9x5tZLUhLAT9mQ4+UmpEemg386tAjlWdK8j/Ew=" + "rev": "2023.01.18", + "hash": "sha256-SLZIDcrLwvhkJY92e/wtSsoY5SrjghcumbdpuVdK4iE=" }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2022.10.26", - "hash": "sha256-pVVO3PMazcGizN3RI4zO2tgLJLDOYIKhwnMLBJ5IiwY=" + "rev": "2023.01.02", + "hash": "sha256-NnPrQAqmKg3Lh16Qp/LZVS4JRtAxXi3qRovLTbzUyYQ=" }, "Emmet-Pascal": { "owner": "Alexey-T", @@ -51,7 +51,7 @@ }, "bgrabitmap": { "owner": "bgrabitmap", - "rev": "v11.5.2", - "hash": "sha256-aGNKkLDbGTeFgFEhuX7R2BXhnllsanJmk4k+1muiSD8=" + "rev": "v11.5.3", + "hash": "sha256-qjBD9TVZQy1tKWHFWkuu6vdLjASzQb3+HRy0FLdd9a8=" } } diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 3c3102370d0e8..7773c1e75f233 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { tar xfvz $src -C $out # Patch binaries. - interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2) + interpreter="$(cat $NIX_BINTOOLS/nix-support/dynamic-linker)" libCairo=$out/eclipse/libcairo-swt.so patchelf --set-interpreter $interpreter $out/eclipse/eclipse [ -f $libCairo ] && patchelf --set-rpath ${lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { homepage = "https://www.eclipse.org/"; inherit description; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index eadd27124281a..a0b0fa56de159 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -20,6 +20,11 @@ let buildmonth = "11"; #sometimes differs from release month timestamp = "${year}${buildmonth}231800"; gtk = gtk3; + arch = if stdenv.hostPlatform.isx86_64 then + "x86_64" + else if stdenv.hostPlatform.isAarch64 then + "aarch64" + else throw "don't know what platform suffix for ${stdenv.hostPlatform.system} will be"; in rec { buildEclipse = callPackage ./build-eclipse.nix { @@ -35,8 +40,11 @@ in rec { description = "Eclipse IDE for C/C++ Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-nqqY4dewq1bjeNoZdWvOez+cBti+f9qXshx1eqJ2lB7sGJva5mcR9e+CZTVD0+EtVJ/U+8viJ+E1Veht1ZnqOw=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-nqqY4dewq1bjeNoZdWvOez+cBti+f9qXshx1eqJ2lB7sGJva5mcR9e+CZTVD0+EtVJ/U+8viJ+E1Veht1ZnqOw=="; + aarch64 = "sha512-kmeNH6F8oK72LtrYtiJVLKhy6Q1HwnU+Bh+mpXdXSrfj9KtqzHQkJ0kTnnJkGYLtpi+zyXDwsxzyjh6pPyDRJA=="; + }.${arch}; }; }; @@ -47,8 +55,11 @@ in rec { description = "Eclipse Modeling Tools"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-WU2BJt6GL3ug3yOUOd5y6/AbGLcr2MkCg+QJiNIMkSXvoU9TF6R6oimoGVc3kPZmazRy6WYoes55T3bWrHnO8Q=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-WU2BJt6GL3ug3yOUOd5y6/AbGLcr2MkCg+QJiNIMkSXvoU9TF6R6oimoGVc3kPZmazRy6WYoes55T3bWrHnO8Q=="; + aarch64 = "sha512-F63f2o9u/p7hhrxI+Eu6NiL4sPccIYw876Nnj8mfSZ7bozs1OVNWftZj+xbdLLbr0bVz3WKnt4BHzcLUA6QG7g=="; + }.${arch}; }; }; @@ -59,15 +70,18 @@ in rec { description = "Eclipse Platform ${year}-${month}"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - hash = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw=="; + aarch64 = "sha512-BvUkOdCsjwtscPeuBXG7ZpitOr8EQK5JL8nSGpw/RhhBEFz46nsc7W18l0aYjdzRHh2ie55RylS2PEQELkS/hQ=="; + }.${arch}; }; }; ### Eclipse Scala SDK eclipse-scala-sdk = - buildEclipse.override { jdk = jdk8; gtk = gtk2; } { + (buildEclipse.override { jdk = jdk8; gtk = gtk2; } { name = "eclipse-scala-sdk-4.7.0"; description = "Eclipse IDE for Scala Developers"; src = @@ -75,7 +89,10 @@ in rec { url = "https://downloads.typesafe.com/scalaide-pack/4.7.0-vfinal-oxygen-212-20170929/scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz"; sha256 = "1n5w2a7mh9ajv6fxcas1gpgwb04pdxbr9v5dzr67gsz5bhahq4ya"; }; - }; + }).overrideAttrs(oa: { + # Only download for x86_64 + meta.platforms = [ "x86_64-linux" ]; + }); ### Eclipse SDK @@ -84,8 +101,11 @@ in rec { description = "Eclipse ${year}-${month} Classic"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - hash = "sha512-yH4/K9sBLCUc2EVYwPL0dLql/S3AfaV6fFh7ewAuIb7yHtcsOWMqy/h1hZUlFFg2ykfwDWDDHEK7qfTI0hM7BQ=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-yH4/K9sBLCUc2EVYwPL0dLql/S3AfaV6fFh7ewAuIb7yHtcsOWMqy/h1hZUlFFg2ykfwDWDDHEK7qfTI0hM7BQ=="; + aarch64 = "sha512-UYp8t7r2RrN3rKN180cWpJyhyO5LVXL8LrTRKJzttUgB7kM1nroTEI3DesBu+Hw4Ynl7eLiBK397rqcpOAfxJw=="; + }.${arch}; }; }; @@ -96,8 +116,11 @@ in rec { description = "Eclipse IDE for Java Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-71mXYVLVnyDjYZbJGBKc0aDPq8sbTxlVZRQq7GlSUDv2fsoNYWYgqYfK7RSED5yoasCfs3HUYr7QowRAKJOnfQ=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-71mXYVLVnyDjYZbJGBKc0aDPq8sbTxlVZRQq7GlSUDv2fsoNYWYgqYfK7RSED5yoasCfs3HUYr7QowRAKJOnfQ=="; + aarch64 = "sha512-KOQ6BZuQJeVpbMQVxF67M3F/KXMmDhmZQBNq0yWM+/8+d0DiBRkwJtqPYsnTqrax8FSunn2yy+CzlfyHSoNvpg=="; + }.${arch}; }; }; @@ -108,8 +131,11 @@ in rec { description = "Eclipse IDE for Enterprise Java and Web Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-55i9YVOa+vKHt72vHIqy9BmKMkg1KaLqMStjTtfaLTH5yP0ei+NTP2XL8IBHOgu0hCEJqYXTq+3I3RQy476etQ=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-55i9YVOa+vKHt72vHIqy9BmKMkg1KaLqMStjTtfaLTH5yP0ei+NTP2XL8IBHOgu0hCEJqYXTq+3I3RQy476etQ=="; + aarch64 = "sha512-iaoTB/Pinoj1weiGBBv0plQ4jGNdFs2JiBG7S/icUoAX5O6jTGAgJvOwh7Nzn+0N6YL6+HPWaV24a6lM43y8Og=="; + }.${arch}; }; }; @@ -120,8 +146,11 @@ in rec { description = "Eclipse IDE for Eclipse Committers and Eclipse Platform Plugin Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-zGeynifM0dn1214HEVS7OVtv7xa8asjLzOXh5riJK8c/DWvNrRduHn6o6PGnxYOYVIfC9BzNRAjG1STkWu9j+Q=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-zGeynifM0dn1214HEVS7OVtv7xa8asjLzOXh5riJK8c/DWvNrRduHn6o6PGnxYOYVIfC9BzNRAjG1STkWu9j+Q=="; + aarch64 = "sha512-B866dFJcsTkq+h0RZ61CxXE83TWvCf8ZAbGeIC385PpPR3i/gZnRjN2oRrDP22CNR5XXA+PfXKxqvERhJB5ebA=="; + }.${arch}; }; }; @@ -132,8 +161,11 @@ in rec { description = "Eclipse IDE for RCP and RAP Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha256-ml76ix0fHuR0KqYWQuTftEBAgq7iaOIyvr8V6WhuzeU="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha256-ml76ix0fHuR0KqYWQuTftEBAgq7iaOIyvr8V6WhuzeU="; + aarch64 = "sha256-sMB6a3f0fiL6ZentIjJTMi59ZOh7dizXrkMQuIRbds0="; + }.${arch}; }; }; diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index f5ed28cedf68d..b7b70eb501ea1 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (rec { pname = "ed"; - version = "1.18"; + version = "1.19"; src = fetchurl { url = "mirror://gnu/ed/${pname}-${version}.tar.lz"; - sha256 = "sha256-rKjvrZgAxYdySiC5eqj8R+a1pH34Fgb+q6gxsHRGK08="; + hash = "sha256-zi8uXEJHkKqW0J2suT2bv9wLfrYknJy3U4RS6Ox3zUg="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index f2acd4be8518e..41329ec143e04 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -33,18 +33,19 @@ ada-mode = callPackage ({ elpaBuild , emacs , fetchurl + , gnat-compiler , lib , uniquify-files , wisi }: elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "7.3.1"; + version = "8.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-7.3.1.tar"; - sha256 = "09ji22823w59nnqcjr5524ylxs93c5javsxcvmgbiqlvx9gfrdkk"; + url = "https://elpa.gnu.org/packages/ada-mode-8.0.5.tar"; + sha256 = "00baypl9bv2z42d6z2k531ai25yw2aj1dcv4pi1jhcp19c9kjg4l"; }; - packageRequires = [ emacs uniquify-files wisi ]; + packageRequires = [ emacs gnat-compiler uniquify-files wisi ]; meta = { homepage = "https://elpa.gnu.org/packages/ada-mode.html"; license = lib.licenses.free; @@ -185,6 +186,21 @@ license = lib.licenses.free; }; }) {}; + altcaps = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "altcaps"; + ename = "altcaps"; + version = "1.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/altcaps-1.1.0.tar"; + sha256 = "15jfhn9v74zi779a0m0v5dx8h135pbsxx0rh472sl13q2ark97bk"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/altcaps.html"; + license = lib.licenses.free; + }; + }) {}; ampc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ampc"; @@ -249,10 +265,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.1.6"; + version = "13.1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.1.6.tar"; - sha256 = "0pdinnhkv7vqib01a6vxq1iixs7sw72r0sxzryv78c9hxn2k4552"; + url = "https://elpa.gnu.org/packages/auctex-13.1.9.tar"; + sha256 = "0dvf7ajfpi68823qv9vav3r1k04gc9bfq2ys3g1rhga2glxn7q9r"; }; packageRequires = [ emacs ]; meta = { @@ -440,16 +456,16 @@ license = lib.licenses.free; }; }) {}; - brief = callPackage ({ elpaBuild, fetchurl, lib }: + brief = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: elpaBuild { pname = "brief"; ename = "brief"; - version = "5.87"; + version = "5.88.22.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/brief-5.87.tar"; - sha256 = "02z8fzzf1zsk2r0cnssz3i2nd4qwsnya4i2r4qi4ndc1xjlsvgwc"; + url = "https://elpa.gnu.org/packages/brief-5.88.22.2.tar"; + sha256 = "1i4sdm8kcrazzp22gb4hi1gd4lfq6hdh6pnldmi1zjjyhl1gbzn3"; }; - packageRequires = []; + packageRequires = [ cl-lib nadvice ]; meta = { homepage = "https://elpa.gnu.org/packages/brief.html"; license = lib.licenses.free; @@ -504,16 +520,16 @@ license = lib.licenses.free; }; }) {}; - cape = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + cape = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "cape"; ename = "cape"; - version = "0.10"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-0.10.tar"; - sha256 = "1ykr01wb0mgs1z181fk9m65lcrv60as5qzbnd0cnndva7p3078lc"; + url = "https://elpa.gnu.org/packages/cape-0.13.tar"; + sha256 = "1rd4ja5dlg9jnh75h24a475cfn8v6icxljya190yfp44vwl5q9v0"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/cape.html"; license = lib.licenses.free; @@ -598,10 +614,10 @@ elpaBuild { pname = "cl-lib"; ename = "cl-lib"; - version = "0.7"; + version = "0.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cl-lib-0.7.tar"; - sha256 = "0s1vkkj1yc5zn6bvc84sr726cm4v3jh2ymm7hc3rr00swwbz35lv"; + url = "https://elpa.gnu.org/packages/cl-lib-0.7.1.tar"; + sha256 = "1pnsm335wi1lkg7vi0lnqxajm12rvyakzd5iccxhipbk3gz3r6my"; }; packageRequires = []; meta = { @@ -722,10 +738,10 @@ elpaBuild { pname = "company-math"; ename = "company-math"; - version = "1.4"; + version = "1.5.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-math-1.4.tar"; - sha256 = "17p5ib65lg8lj2gwip5qgsznww96pch16pr16b41lls5dx4k6d6z"; + url = "https://elpa.gnu.org/packages/company-math-1.5.1.tar"; + sha256 = "1inib2ywb4ycr9hxgrzyffqi0jnrpjsn52bkwlsqyzgfxr5n4qsw"; }; packageRequires = [ company math-symbol-lists ]; meta = { @@ -752,16 +768,16 @@ license = lib.licenses.free; }; }) {}; - compat = callPackage ({ elpaBuild, emacs, fetchurl, lib, nadvice }: + compat = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "compat"; ename = "compat"; - version = "28.1.2.2"; + version = "29.1.3.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-28.1.2.2.tar"; - sha256 = "1jymfbadvnbjfyml6lri7hc7gz4f97nadn7a7ifpcncm9mhi13bp"; + url = "https://elpa.gnu.org/packages/compat-29.1.3.4.tar"; + sha256 = "16j7b18iwsdynb2w4x2hficz0g060r52lsg5ly9kb20zfrq2yvw0"; }; - packageRequires = [ emacs nadvice ]; + packageRequires = [ emacs seq ]; meta = { homepage = "https://elpa.gnu.org/packages/compat.html"; license = lib.licenses.free; @@ -771,10 +787,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.20"; + version = "0.32"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.20.tar"; - sha256 = "134yyjap69lm3j99q7719b3pgc71y0nl30v9gy0cycf7dp7p1ssx"; + url = "https://elpa.gnu.org/packages/consult-0.32.tar"; + sha256 = "1cbdy4ybc4l6wjqa41zqz66yh6kv2sfnkxaspzaghpjy99ykyagb"; }; packageRequires = [ compat emacs ]; meta = { @@ -812,16 +828,16 @@ license = lib.licenses.free; }; }) {}; - corfu = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + corfu = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.28"; + version = "0.35"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.28.tar"; - sha256 = "0gayzzxac42nxj1612isc4f5xishrr0bnvycpcfmkm5pf41kq50f"; + url = "https://elpa.gnu.org/packages/corfu-0.35.tar"; + sha256 = "0h5l4q77i2agnr5rcy0121pvs4yx4q84n2yf7fysd859g4gsm2vs"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/corfu.html"; license = lib.licenses.free; @@ -921,10 +937,10 @@ elpaBuild { pname = "csharp-mode"; ename = "csharp-mode"; - version = "1.1.1"; + version = "2.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csharp-mode-1.1.1.tar"; - sha256 = "096aj4np1ii60h1kxbff5lkfznd0l0x551x103m5i1ks82kxlv1l"; + url = "https://elpa.gnu.org/packages/csharp-mode-2.0.0.tar"; + sha256 = "16b9zp6psf32ds9kk7vwf57xppz2jvbk4wpr7mqbn75bx3qvl44m"; }; packageRequires = [ emacs ]; meta = { @@ -936,10 +952,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.21"; + version = "1.22"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.21.tar"; - sha256 = "11f01lyz6i133njigg53r890cic8y13kz7dswc8mj7m60a316dmv"; + url = "https://elpa.gnu.org/packages/csv-mode-1.22.tar"; + sha256 = "1f9pny1hkhdfmkmfpsk6ayjmb9p5hdpxpnmcprf51nfbvmi7ssig"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1026,10 +1042,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.34"; + version = "0.35"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.34.tar"; - sha256 = "06nxia4myhysiw12vsflgllrp9nyhmjnybrrcl1vyf4pw0fc6yrx"; + url = "https://elpa.gnu.org/packages/debbugs-0.35.tar"; + sha256 = "1w6y02ikjshfk12sdgbryfgj2z4yia2mpifa7g13ab7v9phpqpl1"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1056,10 +1072,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-1.1.0.tar"; - sha256 = "06fmxszw8y8r2sm1j45wx14zb22jg5k5l73k1znhx4gl4v3bl968"; + url = "https://elpa.gnu.org/packages/denote-1.2.0.tar"; + sha256 = "09xbyh22xll82ywqmlbsvqhxlqawfivaqydha0gs5qc4yn71kp0k"; }; packageRequires = [ emacs ]; meta = { @@ -1071,10 +1087,10 @@ elpaBuild { pname = "detached"; ename = "detached"; - version = "0.9.2"; + version = "0.10.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/detached-0.9.2.tar"; - sha256 = "00rbdcl56gqjqrlbmf5mfgakzl086bgs5xb15ic3jlm676j64gqh"; + url = "https://elpa.gnu.org/packages/detached-0.10.1.tar"; + sha256 = "1qfcxhzd3gc66kq58k77cvxy18cr371c40z3n4w4m4ngxmpk96hi"; }; packageRequires = [ emacs ]; meta = { @@ -1116,10 +1132,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.9.0"; + version = "1.9.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/diff-hl-1.9.0.tar"; - sha256 = "00mqknqyibbqyfcvdvk1m7nwipfpsw3afbvipqmghh5zm2n7wjr4"; + url = "https://elpa.gnu.org/packages/diff-hl-1.9.2.tar"; + sha256 = "1avpqwrxhbx8zxwghc8714rcdfhc15b5chq2ixb366ml8xdmvhck"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1311,10 +1327,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.16"; + version = "0.8.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.16.tar"; - sha256 = "0qldw0a346xbkq289mynvfz38n4yh2rfbvgs5f7ixfc014y3j3gw"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.17.tar"; + sha256 = "0d2csc7b4mhaqcj8g3v46j11f5xcvbvgx06wxxfq2w0p2nzz1sik"; }; packageRequires = [ emacs seq ]; meta = { @@ -1371,10 +1387,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20221108"; + version = "20230127"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20221108.tar"; - sha256 = "0va6jb57pyv21zvjaq99yi1275rl2bna7ci5zicqshiq2naxdqzr"; + url = "https://elpa.gnu.org/packages/eev-20230127.tar"; + sha256 = "12f8r1mymd73gjbha6w9fk1ar38yxgbnrr6asvr8aa9rhcwwgxqm"; }; packageRequires = [ emacs ]; meta = { @@ -1386,10 +1402,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-0.9.0.tar"; - sha256 = "1yhnpnnz3v4v54ha4sibdzp2af6jq5p55jm0g6k0viqv2qpjmh3l"; + url = "https://elpa.gnu.org/packages/ef-themes-0.10.0.tar"; + sha256 = "06af9hqal5j2wss9ndyfqnjk18fdwxmy1gsyrvkvd7bq2nsl6z3n"; }; packageRequires = [ emacs ]; meta = { @@ -1400,6 +1416,7 @@ eglot = callPackage ({ eldoc , elpaBuild , emacs + , external-completion , fetchurl , flymake ? null , jsonrpc @@ -1410,12 +1427,21 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.9"; + version = "1.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.9.tar"; - sha256 = "1v6pyk3c680xmsv6lrq5xcj9x771z87i3b92in87zg841mw3b6as"; + url = "https://elpa.gnu.org/packages/eglot-1.11.tar"; + sha256 = "1ifnk4bznykj34s4yh0gq5nyzja7mlv60krxa47j842grpndq2hp"; }; - packageRequires = [ eldoc emacs flymake jsonrpc project seq xref ]; + packageRequires = [ + eldoc + emacs + external-completion + flymake + jsonrpc + project + seq + xref + ]; meta = { homepage = "https://elpa.gnu.org/packages/eglot.html"; license = lib.licenses.free; @@ -1501,16 +1527,16 @@ license = lib.licenses.free; }; }) {}; - embark = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + embark = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "embark"; ename = "embark"; - version = "0.17"; + version = "0.21.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-0.17.tar"; - sha256 = "05r5z59sv0j4sawybd4353ziya87q6yzx4l8sjklybcn2mslpp1q"; + url = "https://elpa.gnu.org/packages/embark-0.21.1.tar"; + sha256 = "157km8r8lrvp81l90vqrhvisd794qf0rsqfazl5r47gg1ba7szv5"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/embark.html"; license = lib.licenses.free; @@ -1525,10 +1551,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-consult-0.6.tar"; - sha256 = "1c8rx9ikazbnap293ab6s26djikdy85i7z330wdwwrgmipkfawaj"; + url = "https://elpa.gnu.org/packages/embark-consult-0.7.tar"; + sha256 = "12b8p2f1bpy43jzjz3ask9h38z23hq4nxkid5dljnpmvf31d8x9c"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -1549,10 +1575,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.4.1"; + version = "0.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ement-0.4.1.tar"; - sha256 = "0hf1gdz5kgvy64652h33iph3lrnmiv98lhar421m0grbh326xn95"; + url = "https://elpa.gnu.org/packages/ement-0.5.2.tar"; + sha256 = "053gmhlyiy86q1qla4j5fy9kx11r986syn41q9022cs6iqpyf6hg"; }; packageRequires = [ emacs @@ -1577,10 +1603,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "12"; + version = "14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-12.tar"; - sha256 = "048ijrpw6s4k7zr78fzc3ksjjri6mnyp6c47h5lp5nw5gvm4np7a"; + url = "https://elpa.gnu.org/packages/emms-14.tar"; + sha256 = "0525vmi397q604z8i35zld3c4fkwbvxwir5lf4f1ji1bbvkzqavc"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1713,6 +1739,21 @@ license = lib.licenses.free; }; }) {}; + external-completion = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "external-completion"; + ename = "external-completion"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/external-completion-0.1.tar"; + sha256 = "12pddwp5jby2icshj77w4kwxv75zi00jdxw18f721d7zx3l7q668"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/external-completion.html"; + license = lib.licenses.free; + }; + }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; @@ -1807,10 +1848,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "0.4.1"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fontaine-0.4.1.tar"; - sha256 = "0szj9ys7bkj6cwg2bmb7sniyzjzdy3f7qm9r90grrgs5iir3k2qa"; + url = "https://elpa.gnu.org/packages/fontaine-1.0.0.tar"; + sha256 = "1p34d84z87s2zsfxdc18bjpif21fdixfzv2k4b9g4i0pcr94nc4v"; }; packageRequires = [ emacs ]; meta = { @@ -1867,10 +1908,10 @@ elpaBuild { pname = "ftable"; ename = "ftable"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ftable-1.0.tar"; - sha256 = "1qi0fxw94hb7p2s8n2dzbziialbjbjxgpwx2m4mvrmicrq375r5p"; + url = "https://elpa.gnu.org/packages/ftable-1.1.tar"; + sha256 = "0ww2kl5gb2dkkz0dxinjjnd3qafr31qjcqp1x10r3vcfbp9cfy4b"; }; packageRequires = [ emacs ]; meta = { @@ -1938,6 +1979,21 @@ license = lib.licenses.free; }; }) {}; + gnat-compiler = callPackage ({ elpaBuild, emacs, fetchurl, lib, wisi }: + elpaBuild { + pname = "gnat-compiler"; + ename = "gnat-compiler"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gnat-compiler-1.0.2.tar"; + sha256 = "1cwjv1ziw5hjnk493vwwg25bnvy98wcryy0c4gknl1xp5qr2qxdg"; + }; + packageRequires = [ emacs wisi ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gnat-compiler.html"; + license = lib.licenses.free; + }; + }) {}; gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnome-c-style"; @@ -1957,10 +2013,10 @@ elpaBuild { pname = "gnorb"; ename = "gnorb"; - version = "1.6.10"; + version = "1.6.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.6.10.tar"; - sha256 = "0kwgpyydnzphlw8rwyw9rim3j1awd0njxssm47db76nwwyxl1ry3"; + url = "https://elpa.gnu.org/packages/gnorb-1.6.11.tar"; + sha256 = "0724i8p1hywgbfk0czxvrcwlwigj8r7x6ww0ap3k2sg90531ymws"; }; packageRequires = [ cl-lib ]; meta = { @@ -1989,10 +2045,10 @@ elpaBuild { pname = "gnu-elpa-keyring-update"; ename = "gnu-elpa-keyring-update"; - version = "2019.3"; + version = "2022.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2019.3.tar"; - sha256 = "1zw65kag25abimg088m4h8vj2nd4y5nc4qal6fsda0dldckfv1w0"; + url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2022.12.tar"; + sha256 = "1kij50xw5km14x44zjsfc1cdkz4xq79nv7hgfjsz3pgypq672z5z"; }; packageRequires = []; meta = { @@ -2050,6 +2106,61 @@ license = lib.licenses.free; }; }) {}; + gpr-mode = callPackage ({ elpaBuild + , emacs + , fetchurl + , gnat-compiler + , lib + , wisi }: + elpaBuild { + pname = "gpr-mode"; + ename = "gpr-mode"; + version = "1.0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gpr-mode-1.0.3.tar"; + sha256 = "0m93szqyh9dd73z2pygvacg42n3siiy8pji3yzg1ynji859bc3b8"; + }; + packageRequires = [ emacs gnat-compiler wisi ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gpr-mode.html"; + license = lib.licenses.free; + }; + }) {}; + gpr-query = callPackage ({ elpaBuild + , emacs + , fetchurl + , gnat-compiler + , lib + , wisi }: + elpaBuild { + pname = "gpr-query"; + ename = "gpr-query"; + version = "1.0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gpr-query-1.0.3.tar"; + sha256 = "13h8hl2g55mbaz95k9jfcvz718rv4vli9wccr3rr7cb7yfvn4c5j"; + }; + packageRequires = [ emacs gnat-compiler wisi ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gpr-query.html"; + license = lib.licenses.free; + }; + }) {}; + graphql = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "graphql"; + ename = "graphql"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/graphql-0.1.2.tar"; + sha256 = "1mzgz4piszm0v18gdn63xb46zqd1r17fkh24rw863i0p1achl21m"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/graphql.html"; + license = lib.licenses.free; + }; + }) {}; greader = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "greader"; @@ -2256,10 +2367,10 @@ elpaBuild { pname = "inspector"; ename = "inspector"; - version = "0.8"; + version = "0.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/inspector-0.8.tar"; - sha256 = "0yrkm5bh2kczl5f642wx1xlnzry1xrw0yxhpm0hqwjrmgmbdb9m6"; + url = "https://elpa.gnu.org/packages/inspector-0.20.tar"; + sha256 = "1640zpxjylzcafr4957j7nxspqwmfwliac300lf7j5xsmchlwmgm"; }; packageRequires = [ emacs ]; meta = { @@ -2286,10 +2397,10 @@ elpaBuild { pname = "isearch-mb"; ename = "isearch-mb"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/isearch-mb-0.6.tar"; - sha256 = "1rbslnnwsikpnb07jhzyk0f83z8i581834hsq3i7gnz3a99wpkx7"; + url = "https://elpa.gnu.org/packages/isearch-mb-0.7.tar"; + sha256 = "1dfjh4ya9515vx0q2dv1brddw350gxd40h1g1vsa783ivvm0hm75"; }; packageRequires = [ emacs ]; meta = { @@ -2396,10 +2507,10 @@ elpaBuild { pname = "jarchive"; ename = "jarchive"; - version = "0.8.0"; + version = "0.10.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jarchive-0.8.0.tar"; - sha256 = "0xfl0gbfqjgbkd28r56j35kc8y6x8nd2zi8xqzxmqvcyv9sd731l"; + url = "https://elpa.gnu.org/packages/jarchive-0.10.0.tar"; + sha256 = "0hgxfz6kqammgbr6cx7l8bg9hmakamrkbzbsjycb4k0gbi4r567b"; }; packageRequires = [ emacs ]; meta = { @@ -2471,10 +2582,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.15"; + version = "1.0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.15.tar"; - sha256 = "0biwvkvd48xqvigzs00yz4mk847xzyzm7p0lkns58fxph9nkg4h5"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.16.tar"; + sha256 = "1fkbw20ghinj70dk2q58scqlrpr3fcqgvcbfh5jbg6mdf1m6svf9"; }; packageRequires = [ emacs ]; meta = { @@ -2501,10 +2612,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.1.7"; + version = "0.1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kind-icon-0.1.7.tar"; - sha256 = "02imi2qj329yrqvs23d4z7fv8bbaz0fvya6zdswb38blpdri4cn1"; + url = "https://elpa.gnu.org/packages/kind-icon-0.1.9.tar"; + sha256 = "0phssrcpmcidzlwy1577f3f02qwjs6hpavb416302y0n8kkhwvli"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -2651,10 +2762,10 @@ elpaBuild { pname = "load-relative"; ename = "load-relative"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/load-relative-1.3.1.el"; - sha256 = "1m37scr82lqqy954fchjxrmdh4lngrl4d1yzxhp3yfjhsydizhrj"; + url = "https://elpa.gnu.org/packages/load-relative-1.3.2.tar"; + sha256 = "1fwa51jp0sq5l69y98l2zyj0iq9s6rj1rnqrmvncif61smma8fd7"; }; packageRequires = []; meta = { @@ -2707,6 +2818,21 @@ license = lib.licenses.free; }; }) {}; + luwak = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "luwak"; + ename = "luwak"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/luwak-1.0.0.tar"; + sha256 = "10jcblm0q5948l3ar911dfj6y9p5bggwz9nmq9d3prlgz5zczv34"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/luwak.html"; + license = lib.licenses.free; + }; + }) {}; lv = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "lv"; @@ -2737,16 +2863,16 @@ license = lib.licenses.free; }; }) {}; - marginalia = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + marginalia = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.15"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.15.tar"; - sha256 = "0sadz4c44pld9aqn49a7l80lqgv2ncv7aw401d740n2ja2grg6vb"; + url = "https://elpa.gnu.org/packages/marginalia-1.1.tar"; + sha256 = "1pldbgsjs9xsrp3y9rp8yz8p67xbhb3gy80sv5q215f6mwhphjqm"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/marginalia.html"; license = lib.licenses.free; @@ -2996,10 +3122,10 @@ elpaBuild { pname = "nadvice"; ename = "nadvice"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nadvice-0.3.el"; - sha256 = "0gi3csnxbs8h7iy0scsl35sic3gv90swa89hhdjwb7qvpirfdcgw"; + url = "https://elpa.gnu.org/packages/nadvice-0.4.tar"; + sha256 = "0ac7zxi04gzcd5hz81lib1db3c6a7xmwkb381ljxvaha1mlzp1k0"; }; packageRequires = []; meta = { @@ -3275,10 +3401,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "0.7"; + version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/orderless-0.7.tar"; - sha256 = "0hvfqxpazan1djpn0qxh609r53jgddpcdih6chkn2zvx29mhdkgg"; + url = "https://elpa.gnu.org/packages/orderless-1.0.tar"; + sha256 = "0kslgrs857h3mm837hcb8v52ankbv0hm2pz0q136imckzj32m43s"; }; packageRequires = [ emacs ]; meta = { @@ -3290,10 +3416,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.5.5"; + version = "9.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.5.5.tar"; - sha256 = "13sykrkhb192vnmj5nlws5jc5a4fr7ynmyxpzanqlzx1gbdxv32p"; + url = "https://elpa.gnu.org/packages/org-9.6.1.tar"; + sha256 = "1kcv6aippv17az0dgikmx0w4dq2140ki3d19nvn01v0lk4kxpgri"; }; packageRequires = [ emacs ]; meta = { @@ -3335,10 +3461,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "0.5"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-modern-0.5.tar"; - sha256 = "0fd5inaq094xhlv4cnd7p47hishlxlhjb17srk4cm1jdgaar3pnp"; + url = "https://elpa.gnu.org/packages/org-modern-0.8.tar"; + sha256 = "0j9ilivy6iyqmml4sxy88c99vpg3v00pglb62lpxc4sywia06dzf"; }; packageRequires = [ emacs ]; meta = { @@ -3395,10 +3521,10 @@ elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-transclusion-1.3.1.tar"; - sha256 = "1v7i2i28500p4gvikcpp931qpks9zmvfpf6lfzrqdqppx2ix295q"; + url = "https://elpa.gnu.org/packages/org-transclusion-1.3.2.tar"; + sha256 = "02r48jzr5zivk11c3c3a9vj1cixfgf1wlmv1kjr5bxldayhg7aqb"; }; packageRequires = [ emacs org ]; meta = { @@ -3451,16 +3577,16 @@ license = lib.licenses.free; }; }) {}; - osm = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + osm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "osm"; ename = "osm"; - version = "0.8"; + version = "0.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osm-0.8.tar"; - sha256 = "1vvd149n4pa6jy7xk5dmhi0nfwcjd4rvxn283f1jxp5jvv47m202"; + url = "https://elpa.gnu.org/packages/osm-0.10.tar"; + sha256 = "1lpbc98ais0wrrpj9cmra3ha8jnja4d3pqzw1kdml91drhqifpmw"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/osm.html"; license = lib.licenses.free; @@ -3560,10 +3686,10 @@ elpaBuild { pname = "peg"; ename = "peg"; - version = "1.0"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/peg-1.0.tar"; - sha256 = "0skr5dz9k34r409hisnj37n1b7n62l3md0glnfx578xkbmxlpcxl"; + url = "https://elpa.gnu.org/packages/peg-1.0.1.tar"; + sha256 = "0yxfwwwc6fck1p9smcm1dwnva42868xvavhy7j749vlxrgb3v94x"; }; packageRequires = [ emacs ]; meta = { @@ -3605,10 +3731,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.30"; + version = "0.4.39"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.30.tar"; - sha256 = "0gwdcfvp3564zmiaw1p0vfyw46n6kn14nh8qx0jwzwygy22v1jdq"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.39.tar"; + sha256 = "0wixalji4c4hjqb41n1yvxfy3qfl2ipfsjawbgk9wdwb7jkhjr1i"; }; packageRequires = [ emacs ]; meta = { @@ -3635,10 +3761,10 @@ elpaBuild { pname = "plz"; ename = "plz"; - version = "0.2.1"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/plz-0.2.1.tar"; - sha256 = "01xa4vjbcdm37dya5d006k9p37kcm1g4yh4j7vh7hjfdz43j6y9s"; + url = "https://elpa.gnu.org/packages/plz-0.3.tar"; + sha256 = "19fzln4b6pp3c2as7a8wija120qykkxs27jrn637vqsvhi648xcd"; }; packageRequires = [ emacs ]; meta = { @@ -3646,6 +3772,36 @@ license = lib.licenses.free; }; }) {}; + poke = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "poke"; + ename = "poke"; + version = "3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/poke-3.0.tar"; + sha256 = "08ajbhwj4sdph9ay7wbd807slzxg6360kpqkyyvhdzl8kqh67wc7"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/poke.html"; + license = lib.licenses.free; + }; + }) {}; + poke-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "poke-mode"; + ename = "poke-mode"; + version = "3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/poke-mode-3.0.tar"; + sha256 = "0xw50x3fx3ai3rsykh371hwlgkmyx4h37ps2583l69f7id7h2103"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/poke-mode.html"; + license = lib.licenses.free; + }; + }) {}; poker = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "poker"; @@ -3665,10 +3821,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.2.0"; + version = "1.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.2.0.tar"; - sha256 = "06xk6z3b5mqgcskjiwkl9viccvzriflr8y51aclyfdamh5qb6kqb"; + url = "https://elpa.gnu.org/packages/posframe-1.3.3.tar"; + sha256 = "07hgbhvhwj6zfhlg6znavwrj3gp7cv4c758chrhkvk33a3slhw6b"; }; packageRequires = [ emacs ]; meta = { @@ -3680,10 +3836,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.8.3"; + version = "0.9.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.8.3.tar"; - sha256 = "15x6nbvyy592fwn36syxi9719sknvrm4bwnpyc16z9jn2xm62q3p"; + url = "https://elpa.gnu.org/packages/project-0.9.8.tar"; + sha256 = "0i1q9blvpj3bygjh98gv0kqn2rm01b8lqp9vra82sy3hzzj39pyx"; }; packageRequires = [ emacs xref ]; meta = { @@ -3695,10 +3851,10 @@ elpaBuild { pname = "psgml"; ename = "psgml"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/psgml-1.3.4.tar"; - sha256 = "1pgg9g040zsnvilvmwa73wyrvv9xh7gf6w1rkcx57qzg7yq4yaaj"; + url = "https://elpa.gnu.org/packages/psgml-1.3.5.tar"; + sha256 = "12ndv9xj4zg0k2vas4bmpf2iwy71hy203zxfd7sfwskdd96kzjjv"; }; packageRequires = []; meta = { @@ -3740,10 +3896,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "5.2.8"; + version = "5.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-5.2.8.tar"; - sha256 = "1klarzr5lfga09ysq3c7gkgmzl6r08gpl4519x5damxd82x4r3y2"; + url = "https://elpa.gnu.org/packages/pyim-5.3.0.tar"; + sha256 = "0q0h705k1yymp1pqyycmq1zqvzawzkl4q2ckvflbncgrqh306xmh"; }; packageRequires = [ async emacs xr ]; meta = { @@ -4020,10 +4176,10 @@ elpaBuild { pname = "rec-mode"; ename = "rec-mode"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rec-mode-1.9.0.tar"; - sha256 = "1w1q6kh567fd8xismq9i6wr1y893lypd30l452yvydi1qjiq1n6x"; + url = "https://elpa.gnu.org/packages/rec-mode-1.9.1.tar"; + sha256 = "0f60bw07l6kk1kkjjxsk30p6rxj9mpngaxqy8piyabnijfgjzd3s"; }; packageRequires = [ emacs ]; meta = { @@ -4050,10 +4206,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.20"; + version = "1.21"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.20.tar"; - sha256 = "0r20dim2r4a4bv0fmgbnq3graa7hhlai55h9qyknapqbr2j1v1h7"; + url = "https://elpa.gnu.org/packages/relint-1.21.tar"; + sha256 = "12453agy7y3ayqn32fi11ljlnk8ck3i1aljw5wzm0yyqp00m73x3"; }; packageRequires = [ emacs xr ]; meta = { @@ -4121,6 +4277,21 @@ license = lib.licenses.free; }; }) {}; + ruby-end = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "ruby-end"; + ename = "ruby-end"; + version = "0.4.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ruby-end-0.4.3.tar"; + sha256 = "0b6hh31vpyv6j86v97migw4if2i9m95075p0bf5ai61cqb42crg4"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/ruby-end.html"; + license = lib.licenses.free; + }; + }) {}; rudel = callPackage ({ cl-generic , cl-lib ? null , cl-print @@ -4371,10 +4542,10 @@ elpaBuild { pname = "sml-mode"; ename = "sml-mode"; - version = "6.10"; + version = "6.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sml-mode-6.10.el"; - sha256 = "01yf0s474r9xhj6nbs14ljn9ccxb5yy758i17c8nmgmqvm8fx7sb"; + url = "https://elpa.gnu.org/packages/sml-mode-6.11.tar"; + sha256 = "05vga709kphbx6jacqh57cq5gyicwrxxf81gask5lbq7vzfzlbfc"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -4525,10 +4696,10 @@ elpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "3.1.13"; + version = "3.1.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.13.tar"; - sha256 = "006jr8yc5qvxdfk0pn40604a2b7a1ah6l6hi6rhxm3p5b08d9i5w"; + url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.14.tar"; + sha256 = "079g5g3640hyqdikszkz8kmfqdnqdbkl8rwd6k3kkck39ng63zy6"; }; packageRequires = [ emacs ]; meta = { @@ -4536,6 +4707,21 @@ license = lib.licenses.free; }; }) {}; + standard-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "standard-themes"; + ename = "standard-themes"; + version = "1.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/standard-themes-1.2.0.tar"; + sha256 = "1prf89jk41cmd3bj51343jyz53k5bjbc871s54cqlhz3vvbgc4ww"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/standard-themes.html"; + license = lib.licenses.free; + }; + }) {}; stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "stream"; @@ -4551,6 +4737,21 @@ license = lib.licenses.free; }; }) {}; + substitute = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "substitute"; + ename = "substitute"; + version = "0.1.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/substitute-0.1.6.tar"; + sha256 = "0hdg6gv878bpb6yrav345a8479w50q48nmibvk4p04im7b7r1238"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/substitute.html"; + license = lib.licenses.free; + }; + }) {}; svg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "svg"; @@ -4626,6 +4827,21 @@ license = lib.licenses.free; }; }) {}; + sxhkdrc-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "sxhkdrc-mode"; + ename = "sxhkdrc-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sxhkdrc-mode-1.0.0.tar"; + sha256 = "1vzb7ijx61rq31xj0d13yidlirp038841fwdvlqlv88hi6hb2faq"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sxhkdrc-mode.html"; + license = lib.licenses.free; + }; + }) {}; system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "system-packages"; @@ -4706,16 +4922,16 @@ license = lib.licenses.free; }; }) {}; - tempel = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + tempel = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.5"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tempel-0.5.tar"; - sha256 = "0gx48p2kkwizxf30h8jq658ksp00ibf5azjxvcs1nj8hz2g3agjx"; + url = "https://elpa.gnu.org/packages/tempel-0.7.tar"; + sha256 = "05yhsrricaxlz67w1j0s1gbzpbsw4iqryfvks25v25pm95xrr7c4"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/tempel.html"; license = lib.licenses.free; @@ -4819,10 +5035,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.3.3"; + version = "2.6.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.3.3.tar"; - sha256 = "05w04qwk1lk50fzwl6fxyf6pb1jd2lx4as99zm1dpa858jab6w4a"; + url = "https://elpa.gnu.org/packages/tramp-2.6.0.1.tar"; + sha256 = "1mxkl8v40wdcyvsyjayw9yj7ghn5zrnzgaapwh1prxs42scw85x8"; }; packageRequires = [ emacs ]; meta = { @@ -4924,10 +5140,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.1"; + version = "0.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/triples-0.1.tar"; - sha256 = "1b1qrrg60wx4ikl9nd8gmawj0pc0yysxq901l29336gwpbwj81y7"; + url = "https://elpa.gnu.org/packages/triples-0.2.3.tar"; + sha256 = "1p6vijaab3a7h9lqlxxhyipwd9rkr15r3rm0iyxxanlcggi04a39"; }; packageRequires = [ emacs seq ]; meta = { @@ -5003,10 +5219,10 @@ elpaBuild { pname = "url-scgi"; ename = "url-scgi"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/url-scgi-0.8.tar"; - sha256 = "1837vyamwk5mp2nf3k477hyr5pq1xy6p7br7kl6h2k8jmxqy3mlj"; + url = "https://elpa.gnu.org/packages/url-scgi-0.9.tar"; + sha256 = "0mfbqr03302gk38aamlg1lgdznd6y3blcc3zizfb72ppb87j78mc"; }; packageRequires = [ emacs ]; meta = { @@ -5018,10 +5234,10 @@ elpaBuild { pname = "use-package"; ename = "use-package"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/use-package-2.4.4.tar"; - sha256 = "1hw73006l1xh0padqxyr0l3sjnr3fxyz619csz8ds6am86fdxvfp"; + url = "https://elpa.gnu.org/packages/use-package-2.4.5.tar"; + sha256 = "09aimbmkcpyffrq1qnavzx6c4ccfawz7ndz2ac8md7qxilxx58yc"; }; packageRequires = [ bind-key emacs ]; meta = { @@ -5160,10 +5376,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2021.10.14.127365406"; + version = "2022.12.18.181110314"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2021.10.14.127365406.tar"; - sha256 = "1v0ld310rs86vzmlw7phv1b5p59faqs9wg4p8jpbnb9ap9lwidnl"; + url = "https://elpa.gnu.org/packages/verilog-mode-2022.12.18.181110314.tar"; + sha256 = "0vy2lfscirj7as106m94yi88n8pwp4d2ngaclsf0axyrbcagzkjn"; }; packageRequires = []; meta = { @@ -5171,16 +5387,16 @@ license = lib.licenses.free; }; }) {}; - vertico = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + vertico = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.28"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.28.tar"; - sha256 = "0rkvfya674hy8g37hy40knwwppbygmx005cg04136kdlkmywb0l1"; + url = "https://elpa.gnu.org/packages/vertico-1.1.tar"; + sha256 = "0v5hpaysh7m7v2g77dyzy4hhnnv9v3wvpyfz6zi318sw96vmabhm"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/vertico.html"; license = lib.licenses.free; @@ -5195,10 +5411,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.5.4"; + version = "0.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.4.tar"; - sha256 = "19lx6p06wkwfivxgswdljdsh9bgcd1b9zkzx426w3pwicdk0cvgg"; + url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.1.tar"; + sha256 = "18a65hnacavy375ry5qmfj454b10h2yg9p6wbx1wdx30fwpi247a"; }; packageRequires = [ emacs posframe vertico ]; meta = { @@ -5348,10 +5564,10 @@ elpaBuild { pname = "websocket"; ename = "websocket"; - version = "1.13.1"; + version = "1.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/websocket-1.13.1.tar"; - sha256 = "1x664zswas0fpml7zaj59zy97avrm49zb80zd69rlkqzz1m45psc"; + url = "https://elpa.gnu.org/packages/websocket-1.14.tar"; + sha256 = "0g75kaw9bdk30apiyk09583amnw9458kkmgbbcl2myqfqspywnva"; }; packageRequires = [ cl-lib ]; meta = { @@ -5408,10 +5624,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "4.0.0"; + version = "4.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-4.0.0.tar"; - sha256 = "1w082nqzvzljm8m8gxja7va88g0lz264d4ir24ydak22rfr688bv"; + url = "https://elpa.gnu.org/packages/wisi-4.2.2.tar"; + sha256 = "041np2xssm4iv75wmwds25fwx0p2y3j6ph0j0pxmgcj9p028mbka"; }; packageRequires = [ emacs seq ]; meta = { @@ -5428,10 +5644,10 @@ elpaBuild { pname = "wisitoken-grammar-mode"; ename = "wisitoken-grammar-mode"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.2.0.tar"; - sha256 = "0isxmpwys148djjymszdm5nisqjp9xff8kad45l4cpb3c717vsjw"; + url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.3.0.tar"; + sha256 = "05g2zn3p9r7rha20wv8jy1dwvllfyjjpzr6agkcm523rj639jh2b"; }; packageRequires = [ emacs mmm-mode wisi ]; meta = { @@ -5469,6 +5685,21 @@ license = lib.licenses.free; }; }) {}; + xeft = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "xeft"; + ename = "xeft"; + version = "3.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xeft-3.3.tar"; + sha256 = "1jzas6qy0s686s0ghdrgcz2bfyp32s70qvkqw00sm3mm3jypiplm"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xeft.html"; + license = lib.licenses.free; + }; + }) {}; xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xelb"; @@ -5518,10 +5749,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.5.1"; + version = "1.6.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.5.1.tar"; - sha256 = "131jxsc1sl8q3r9drhylwyfig9qjjkj3hilv3npidp868pr7xdna"; + url = "https://elpa.gnu.org/packages/xref-1.6.2.tar"; + sha256 = "16vzjl2dv5nmb40xfw7mfrk8i64fac3cy4sf2d2hy832rwlg15q0"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index d3c3d58908585..7fbf06b9d114c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -177,6 +177,23 @@ let dune = dontConfigure super.dune; + emacsql = super.emacsql.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; + + postBuild = '' + cd source/sqlite + make + cd - + ''; + + postInstall = (old.postInstall or "") + "\n" + '' + install -m=755 -D source/sqlite/emacsql-sqlite \ + $out/share/emacs/site-lisp/elpa/emacsql-${old.version}/sqlite/emacsql-sqlite + ''; + + stripDebugList = [ "share" ]; + }); + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; @@ -194,6 +211,13 @@ let stripDebugList = [ "share" ]; }); + epkg = super.epkg.overrideAttrs (old: { + postPatch = '' + substituteInPlace lisp/epkg.el \ + --replace '(call-process "sqlite3"' '(call-process "${pkgs.sqlite}/bin/sqlite3"' + ''; + }); + erlang = super.erlang.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ pkgs.perl @@ -259,7 +283,7 @@ let irony = super.irony.overrideAttrs (old: { cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; - NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; + env.NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; preConfigure = '' cd server ''; diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 58d425a825076..801148d32fe95 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -49,10 +49,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "1.8.1"; + version = "1.8.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-1.8.1.tar"; - sha256 = "00rpaki0vf6aiwa4by1v3hba79jmx1g7c283q1gibp4ka7grxzc2"; + url = "https://elpa.nongnu.org/nongnu/annotate-1.8.5.tar"; + sha256 = "0f5h9ymcg4n0zn3yaq1s0h5sfrq3pbcswda9875yhlcprzbrgyq7"; }; packageRequires = []; meta = { @@ -135,6 +135,23 @@ license = lib.licenses.free; }; }) {}; + auto-dim-other-buffers = callPackage ({ elpaBuild + , fetchurl + , lib }: + elpaBuild { + pname = "auto-dim-other-buffers"; + ename = "auto-dim-other-buffers"; + version = "2.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.1.1.tar"; + sha256 = "0a7xdp25bny5ykf7808jwmziad8myf8yp01p07f20bsrl4m0bzz6"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/auto-dim-other-buffers.html"; + license = lib.licenses.free; + }; + }) {}; autothemer = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "autothemer"; @@ -150,6 +167,21 @@ license = lib.licenses.free; }; }) {}; + bash-completion = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "bash-completion"; + ename = "bash-completion"; + version = "3.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/bash-completion-3.1.1.tar"; + sha256 = "19vs0rflqm1z4r17pv1qx6v60g03x4n2b7503rjr2d0ljrwkbpcp"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bash-completion.html"; + license = lib.licenses.free; + }; + }) {}; better-jumper = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "better-jumper"; @@ -195,6 +227,21 @@ license = lib.licenses.free; }; }) {}; + blow = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "blow"; + ename = "blow"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/blow-1.0.tar"; + sha256 = "0z2y3vq8m4x9ihn84x7p2vgkxprrrvhavcgwll897gsc9khp1xda"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/blow.html"; + license = lib.licenses.free; + }; + }) {}; boxquote = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "boxquote"; @@ -214,10 +261,10 @@ elpaBuild { pname = "buttercup"; ename = "buttercup"; - version = "1.28"; + version = "1.29"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/buttercup-1.28.tar"; - sha256 = "0gli1cxqiqg4adln7svplcc6rk718q4gn6idwxbzx8mgcwhmw75f"; + url = "https://elpa.nongnu.org/nongnu/buttercup-1.29.tar"; + sha256 = "0k9canfnxzhbk5m33z3bfxw7l2bvvhdiv9x357lf6gs8vg19158p"; }; packageRequires = [ emacs ]; meta = { @@ -225,6 +272,21 @@ license = lib.licenses.free; }; }) {}; + camera = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "camera"; + ename = "camera"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/camera-0.2.tar"; + sha256 = "1hdq24xy685wzjz3hfxwqmcmsvajcrkr4va4lmvgvdmkvmfk92cj"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/camera.html"; + license = lib.licenses.free; + }; + }) {}; caml = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "caml"; @@ -268,10 +330,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.5.0.tar"; - sha256 = "0vggh2l92m8hm2wqzcyka439fs0kzbbfknfgyn79hf2f2f405534"; + url = "https://elpa.nongnu.org/nongnu/cider-1.6.0.tar"; + sha256 = "038wzwi4y0240wb5i03v89x308c07nzflfv3804zyldr44yk9qky"; }; packageRequires = [ clojure-mode @@ -291,10 +353,10 @@ elpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.15.1"; + version = "5.16.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.15.1.tar"; - sha256 = "14j6v32cbj52n91f7ckbjlam60rszh05r09bwv579p1xs2m7s7q3"; + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.16.0.tar"; + sha256 = "1m0g7sqjs6phkkf3mx2dyxr62a48rqq69lp6r5bfa6kcbr2n4g2m"; }; packageRequires = [ emacs ]; meta = { @@ -434,6 +496,36 @@ license = lib.licenses.free; }; }) {}; + denote-refs = callPackage ({ denote, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "denote-refs"; + ename = "denote-refs"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/denote-refs-0.1.2.tar"; + sha256 = "1s2q9j2xg2g293ip7w2bq2kjk6pasaf6cmvzcbh0k00yx8aa2alp"; + }; + packageRequires = [ denote emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/denote-refs.html"; + license = lib.licenses.free; + }; + }) {}; + devhelp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "devhelp"; + ename = "devhelp"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/devhelp-1.0.tar"; + sha256 = "16zx748n24diqqk3jhgyz74s71kqzl7h7l6j9nkz40cpcn18ddiz"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/devhelp.html"; + license = lib.licenses.free; + }; + }) {}; diff-ansi = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "diff-ansi"; @@ -509,6 +601,21 @@ license = lib.licenses.free; }; }) {}; + eat = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "eat"; + ename = "eat"; + version = "0.6"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/eat-0.6.tar"; + sha256 = "14174hra9x3l98nrpg0x9g499lwhlxr8qg51zdrlyky0k4v0x3iw"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/eat.html"; + license = lib.licenses.free; + }; + }) {}; edit-indirect = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "edit-indirect"; @@ -574,6 +681,21 @@ license = lib.licenses.free; }; }) {}; + engine-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "engine-mode"; + ename = "engine-mode"; + version = "2.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/engine-mode-2.2.1.tar"; + sha256 = "1m5i3pyi4y90jvwgypxzl3qwhq5j6gazwijalhjcgb6gnpsm81kv"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/engine-mode.html"; + license = lib.licenses.free; + }; + }) {}; evil = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "evil"; @@ -653,6 +775,21 @@ license = lib.licenses.free; }; }) {}; + evil-iedit-state = callPackage ({ elpaBuild, evil, fetchurl, iedit, lib }: + elpaBuild { + pname = "evil-iedit-state"; + ename = "evil-iedit-state"; + version = "1.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-iedit-state-1.3.tar"; + sha256 = "1dsdlhi58xsdsgkdhpnlkx1gkwc4m5sks99ph8lbj179vd1gszn6"; + }; + packageRequires = [ evil iedit ]; + meta = { + homepage = "https://elpa.gnu.org/packages/evil-iedit-state.html"; + license = lib.licenses.free; + }; + }) {}; evil-indent-plus = callPackage ({ cl-lib ? null , elpaBuild , evil @@ -711,10 +848,10 @@ elpaBuild { pname = "evil-nerd-commenter"; ename = "evil-nerd-commenter"; - version = "3.5.8"; + version = "3.6.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.5.8.tar"; - sha256 = "0hrzwca24dy4g9h7v5csqpwvsfj1ns4gqlnlf1q5i0jqvhvklnj5"; + url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.0.tar"; + sha256 = "0709qlxhvmapdnl8bhqvg39cm6x4659mg0jzz5b9hmis5bpj1kiq"; }; packageRequires = [ emacs ]; meta = { @@ -752,6 +889,36 @@ license = lib.licenses.free; }; }) {}; + flx = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "flx"; + ename = "flx"; + version = "0.6.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flx-0.6.2.tar"; + sha256 = "0xmxin1k758nskrxhmvi4m5vbcfi2ncfp5n9q18mlc1j45vwawpx"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flx.html"; + license = lib.licenses.free; + }; + }) {}; + flx-ido = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, flx, lib }: + elpaBuild { + pname = "flx-ido"; + ename = "flx-ido"; + version = "0.6.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flx-ido-0.6.2.tar"; + sha256 = "1jdk87v605m4brvf0pxfd6bz0j2r217cw9pmrpl38nrszbngh67l"; + }; + packageRequires = [ cl-lib flx ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flx-ido.html"; + license = lib.licenses.free; + }; + }) {}; flymake-kondor = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "flymake-kondor"; @@ -777,10 +944,10 @@ elpaBuild { pname = "flymake-popon"; ename = "flymake-popon"; - version = "0.5"; + version = "0.5.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.5.tar"; - sha256 = "1q1adxsrx8sjw6pffwxvk0yrgbz0rbrzi1g7g7zq5952vnz4dnn0"; + url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.5.1.tar"; + sha256 = "0vk20affwb7qcg7nm6n2ssrrgljisqn45a8jagrf947l2kgaccvd"; }; packageRequires = [ emacs flymake popon posframe ]; meta = { @@ -833,14 +1000,29 @@ license = lib.licenses.free; }; }) {}; + gc-buffers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "gc-buffers"; + ename = "gc-buffers"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gc-buffers-1.0.tar"; + sha256 = "15zpg4j25bk7y2wgqsd57c4c6h3xvigf39hjnzh3g1hlrqk2lv0g"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gc-buffers.html"; + license = lib.licenses.free; + }; + }) {}; geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.28"; + version = "0.28.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.28.tar"; - sha256 = "0qp732j16cdmkpqv4vjplh9kcdbb1s4gfwff2d7k1sg4wqi8sa95"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.28.2.tar"; + sha256 = "1d2g673zn59ggcr2sx9dsxibaqh6b456v4wbpg3wb5ph63rzrh8m"; }; packageRequires = [ emacs project ]; meta = { @@ -932,10 +1114,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.28.0"; + version = "0.28.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.0.tar"; - sha256 = "0nw77psyvl9lackyq5l60k84f1dyddn8y2sxm5b1z71gjkp481zi"; + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.1.tar"; + sha256 = "0imh2vdc757vimwxi7pjdv09f83js76nbk7dg861qg0bcqf21g3i"; }; packageRequires = [ emacs geiser transient ]; meta = { @@ -1054,14 +1236,29 @@ license = lib.licenses.free; }; }) {}; + gnu-indent = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "gnu-indent"; + ename = "gnu-indent"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gnu-indent-1.0.tar"; + sha256 = "0h2kj19k3b9sw1bp0fk37kmc4xwvd3ajlgfa8s13jnvggx77nn8a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gnu-indent.html"; + license = lib.licenses.free; + }; + }) {}; gnuplot = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gnuplot"; ename = "gnuplot"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.0.tar"; - sha256 = "1f27y18ivcdwlkgr3ql4qcbgzdp6vk1bkw2wlryrclpydbb1nya3"; + url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.1.tar"; + sha256 = "015b8ly4wmz03bcysbwy4d63r42sicwqa0j2j4aiis1kpy4lj3xw"; }; packageRequires = [ emacs ]; meta = { @@ -1129,6 +1326,21 @@ license = lib.licenses.free; }; }) {}; + gruber-darker-theme = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "gruber-darker-theme"; + ename = "gruber-darker-theme"; + version = "0.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gruber-darker-theme-0.7.tar"; + sha256 = "0k2njsg7bwy4i7ll5d9dpqawylgkfvp74bany8g487xvspjscrji"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/gruber-darker-theme.html"; + license = lib.licenses.free; + }; + }) {}; gruvbox-theme = callPackage ({ autothemer, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gruvbox-theme"; @@ -1256,10 +1468,10 @@ elpaBuild { pname = "hl-block-mode"; ename = "hl-block-mode"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.1.tar"; - sha256 = "08b2n8i0qmjp5r6ijlg66g0j8aiwhrczxyf0ssr9jbga43k4swzq"; + url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.2.tar"; + sha256 = "1qrq238arblk8v8nf98kcdckfhwzi27w5zbl31yvf36xz69l9y8n"; }; packageRequires = [ emacs ]; meta = { @@ -1267,6 +1479,21 @@ license = lib.licenses.free; }; }) {}; + hl-column = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "hl-column"; + ename = "hl-column"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/hl-column-1.0.tar"; + sha256 = "00y4g912s341p30xnb0qgj0gmzsqm696v06kjgy9yva5qgw51f03"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hl-column.html"; + license = lib.licenses.free; + }; + }) {}; htmlize = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "htmlize"; @@ -1286,10 +1513,10 @@ elpaBuild { pname = "idle-highlight-mode"; ename = "idle-highlight-mode"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.3.tar"; - sha256 = "05w2rqc71h1f13ysdfjma90s35kj5d5i2szcw54cqyky8rymx5dp"; + url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.4.tar"; + sha256 = "1j7y03b90gf3pl0xbfirm973k31l7nx90is69m3jrfai2f9qnflr"; }; packageRequires = [ emacs ]; meta = { @@ -1355,10 +1582,10 @@ elpaBuild { pname = "inf-ruby"; ename = "inf-ruby"; - version = "2.6.2"; + version = "2.7.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.6.2.tar"; - sha256 = "09p9pny4p0bfw6lw5pf17spyd77jb0pliapp3mfn7r3w8l8wi8xc"; + url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.7.0.tar"; + sha256 = "0wzzhr10q8mnai024g5nprsnl0bcdlqfrh4nxf8qq43paah28i6f"; }; packageRequires = [ emacs ]; meta = { @@ -1381,6 +1608,21 @@ license = lib.licenses.free; }; }) {}; + iwindow = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }: + elpaBuild { + pname = "iwindow"; + ename = "iwindow"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/iwindow-1.0.tar"; + sha256 = "076i0p9kq48hxkkwzzapnni6cpdr25hdrw9bs2cly8w4v5rmd6rj"; + }; + packageRequires = [ compat emacs seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/iwindow.html"; + license = lib.licenses.free; + }; + }) {}; j-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "j-mode"; @@ -1471,14 +1713,29 @@ license = lib.licenses.free; }; }) {}; + lorem-ipsum = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "lorem-ipsum"; + ename = "lorem-ipsum"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/lorem-ipsum-0.4.tar"; + sha256 = "05zk11g0w3bnabxf5937hrkc3k58vlrh1bk61dar9gfbfdq3ijyg"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/lorem-ipsum.html"; + license = lib.licenses.free; + }; + }) {}; lua-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "lua-mode"; ename = "lua-mode"; - version = "20210802"; + version = "20221027"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/lua-mode-20210802.tar"; - sha256 = "1yarwai9a0w4yywd0ajdkif4g26z98zw91lg1z78qw0k61qjmnh6"; + url = "https://elpa.nongnu.org/nongnu/lua-mode-20221027.tar"; + sha256 = "1irdlw77ny0a28msrbn4lm66ixrlf2grsj4izhpdm1n0yv66xvfc"; }; packageRequires = [ emacs ]; meta = { @@ -1598,6 +1855,36 @@ license = lib.licenses.free; }; }) {}; + meow = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "meow"; + ename = "meow"; + version = "1.4.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/meow-1.4.2.tar"; + sha256 = "1iwysqxmaw85k7g742nx8z9vr3nnmwaidwjmx5n96cyssf64hgkv"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/meow.html"; + license = lib.licenses.free; + }; + }) {}; + minibar = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "minibar"; + ename = "minibar"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/minibar-0.2.tar"; + sha256 = "0idb91vp0pbichv2gfs314av6cgx5mkrn9w3yxwj81if1bvsmw0h"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/minibar.html"; + license = lib.licenses.free; + }; + }) {}; moe-theme = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "moe-theme"; @@ -1703,10 +1990,10 @@ elpaBuild { pname = "nix-mode"; ename = "nix-mode"; - version = "1.4.4"; + version = "1.5.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/nix-mode-1.4.4.tar"; - sha256 = "1nn74671273s5mjxzbdqvpwqx6w12zya21sxhzw51k2fs68vwh23"; + url = "https://elpa.nongnu.org/nongnu/nix-mode-1.5.0.tar"; + sha256 = "0zi7xmh777pqzgcv18jqwywvidpa984p0m705p6a9fns7dvv53j7"; }; packageRequires = [ emacs magit-section transient ]; meta = { @@ -1748,10 +2035,10 @@ elpaBuild { pname = "org-contrib"; ename = "org-contrib"; - version = "0.4"; + version = "0.4.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.tar"; - sha256 = "05r7w0h9v1vfhv1dd2vaabq2gm8ra70s1cirlp75s343b0z28ca6"; + url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.1.tar"; + sha256 = "0xhlsbqjj1zivlz44hdlkcwqalfjwds5fv2pcwn0rskfhr73xp9a"; }; packageRequires = [ emacs org ]; meta = { @@ -1885,6 +2172,21 @@ license = lib.licenses.free; }; }) {}; + paredit = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "paredit"; + ename = "paredit"; + version = "26"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/paredit-26.tar"; + sha256 = "08f8nm3qyk0b4x7mkgra0zjpn9mmfnpr5g7yrvdzvms38y919qlh"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/paredit.html"; + license = lib.licenses.free; + }; + }) {}; parseclj = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "parseclj"; @@ -1954,10 +2256,10 @@ elpaBuild { pname = "pdf-tools"; ename = "pdf-tools"; - version = "1.0"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/pdf-tools-1.0.tar"; - sha256 = "0cjr7y2ikf2al43wrzlqdpbksj0ww6m0nvmlz97slx8nk94k2qyf"; + url = "https://elpa.nongnu.org/nongnu/pdf-tools-1.0.0.tar"; + sha256 = "0p9q9a11s68s95z8n0i45x1w8mg476bpnrvijg6i83779dmrpxh0"; }; packageRequires = [ emacs let-alist tablist ]; meta = { @@ -2014,10 +2316,10 @@ elpaBuild { pname = "projectile"; ename = "projectile"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/projectile-2.6.0.tar"; - sha256 = "0r0ylllx7vr903sjci1i6yf4xzn7k4azaw9l3azvc3mzrrjagvvj"; + url = "https://elpa.nongnu.org/nongnu/projectile-2.7.0.tar"; + sha256 = "1ibxsa1lv9aiplkfplamyn2wc2c6vfwfszyaicfx79aq2w9427bg"; }; packageRequires = [ emacs ]; meta = { @@ -2062,10 +2364,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20221118.122133"; + version = "1.0.20230209.92406"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20221118.122133.tar"; - sha256 = "0a2lpvkarcw5rlydm3va7ajjsyhfbj023h93n6n94pjvllhn2rp2"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230209.92406.tar"; + sha256 = "1gs70pba6jjix6hnph6z2a2yjs9ka6xnhjl6qi8jcwyamkbpjiry"; }; packageRequires = [ emacs ]; meta = { @@ -2137,10 +2439,10 @@ elpaBuild { pname = "rfc-mode"; ename = "rfc-mode"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.3.0.tar"; - sha256 = "1wdqp03rrx7ar21nvbnrb7518c3vgf41z00bav00pw8cdx5c4m10"; + url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.0.tar"; + sha256 = "0036ypsjm35x8vwrlm346wcqmh85kbjmw0813q65z6k0gvmnwldj"; }; packageRequires = [ emacs ]; meta = { @@ -2201,10 +2503,10 @@ elpaBuild { pname = "scad-mode"; ename = "scad-mode"; - version = "93.1"; + version = "93.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/scad-mode-93.1.tar"; - sha256 = "0k9wqz2nd4j0wz2y300nn6rs8a9vpshnaa2hx6f8649k4y87bblp"; + url = "https://elpa.nongnu.org/nongnu/scad-mode-93.2.tar"; + sha256 = "0gp7ghmch5wkbby0avmlgj5kajiccbarjrx1szh9r3f3gi1ahawj"; }; packageRequires = [ emacs ]; meta = { @@ -2246,10 +2548,10 @@ elpaBuild { pname = "scroll-on-jump"; ename = "scroll-on-jump"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.1.tar"; - sha256 = "0y6r0aa14sv8yh56w46s840bdkgq6y234qz1jbbsgklx42cw6zgg"; + url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.2.tar"; + sha256 = "09yndis96ps18i252h66ins1hi3zn27410s5hahkj2989q4cqi1s"; }; packageRequires = [ emacs ]; meta = { @@ -2411,10 +2713,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.0.24"; + version = "1.0.29"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.0.24.tar"; - sha256 = "1x9w858pgyhd7hlvn85h379f8sfvf8ly3a9596q4jkqbcp9riymq"; + url = "https://elpa.nongnu.org/nongnu/subed-1.0.29.tar"; + sha256 = "0q2sfdypj929y4fllk97rsb2bxm9a1izjy1f0z2viz5hz0hpqp26"; }; packageRequires = [ emacs ]; meta = { @@ -2426,10 +2728,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.8.8"; + version = "0.17.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.8.8.tar"; - sha256 = "0h9vn4kc1f1vxvzxv14hbv24skjmishg408s4d8g39bylhj5c5s4"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.17.0.tar"; + sha256 = "0k51k77g1mivs3ijnkl0i51v9bfjmivwnbkqwza9kclxd4dwlvyy"; }; packageRequires = [ emacs ]; meta = { @@ -2486,10 +2788,10 @@ elpaBuild { pname = "systemd"; ename = "systemd"; - version = "1.6"; + version = "1.6.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/systemd-1.6.tar"; - sha256 = "1khfnx2qmg1i4m6axyya0xbzr3c9j136b8pzmqdnd6jamxh43wcg"; + url = "https://elpa.nongnu.org/nongnu/systemd-1.6.1.tar"; + sha256 = "0h6iwdi3j2ypgcwnyjs8rdlz5f8j25cya6z4v3n2phnkqbncmgx6"; }; packageRequires = [ emacs ]; meta = { @@ -2548,6 +2850,21 @@ license = lib.licenses.free; }; }) {}; + testcover-mark-line = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "testcover-mark-line"; + ename = "testcover-mark-line"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/testcover-mark-line-0.3.tar"; + sha256 = "18nlkm7p6fmaziqqbb4jmhpypn0b6233qd0c19xp16kjbxpg7ifh"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/testcover-mark-line.html"; + license = lib.licenses.free; + }; + }) {}; textile-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "textile-mode"; @@ -2642,10 +2959,10 @@ elpaBuild { pname = "undo-fu"; ename = "undo-fu"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/undo-fu-0.4.tar"; - sha256 = "15r0lkzbxgvnwdmaxgiwnik2z8622gdzmpxllv8pfr36y6jmsgs8"; + url = "https://elpa.nongnu.org/nongnu/undo-fu-0.5.tar"; + sha256 = "0akn8gw3wavsfhxa9m426jkjacsw3k8vaxymhqrzy18lpvg5hysw"; }; packageRequires = [ emacs ]; meta = { @@ -2657,10 +2974,10 @@ elpaBuild { pname = "undo-fu-session"; ename = "undo-fu-session"; - version = "0.2"; + version = "0.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.2.tar"; - sha256 = "1vxyazcxw2gxvxh96grsff1lijsd5fh3pjzkbkj7axn3myavp374"; + url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.4.tar"; + sha256 = "1p9qr9hzqiv1kgnglskny7m7lh2f8r4l0cf53431nf8hrp806qah"; }; packageRequires = [ emacs ]; meta = { @@ -2672,10 +2989,10 @@ elpaBuild { pname = "vc-fossil"; ename = "vc-fossil"; - version = "20220707"; + version = "20221120"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/vc-fossil-20220707.tar"; - sha256 = "0l33y8mij6rw4h47ryqpjxr1i2xzis98rbi230izkvsc6w7qf89q"; + url = "https://elpa.nongnu.org/nongnu/vc-fossil-20221120.tar"; + sha256 = "0ygacnq1w64iw8al2gcyjjwgvbnm2l97sw4lf5a2x6ms0fgnbdgk"; }; packageRequires = []; meta = { @@ -2702,10 +3019,10 @@ elpaBuild { pname = "visual-fill-column"; ename = "visual-fill-column"; - version = "2.5"; + version = "2.5.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.5.tar"; - sha256 = "0mqhm7xkxpzjk96n6qybqg2780kbjg1w7ash88zhnbp8kvy0rrwi"; + url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.5.1.tar"; + sha256 = "1q2cimrcr4knh716cdnhs8nspk08w8x7bsbhx69s9hpzgr7mjq58"; }; packageRequires = [ emacs ]; meta = { @@ -2717,10 +3034,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.3.3"; + version = "17.3.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.3.tar"; - sha256 = "1ci28dfg6k4hwiqz85v9c24n7s52z29ghfyfjg971lq4mfqbx4yy"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.8.tar"; + sha256 = "0g163mgf1kc2bfkh8b2s9jl5cmzgcni2g25hxmyxb4rz3v30z4ca"; }; packageRequires = [ emacs ]; meta = { @@ -2748,21 +3065,36 @@ license = lib.licenses.free; }; }) {}; - wgrep = callPackage ({ elpaBuild, fetchurl, lib }: + wgrep = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "wgrep"; ename = "wgrep"; - version = "2.3.3"; + version = "3.0.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/wgrep-2.3.3.tar"; - sha256 = "12w9vsawqnd0rvsahx8vdiabds8rl1zkpmspmcqn28jprbql734r"; + url = "https://elpa.nongnu.org/nongnu/wgrep-3.0.0.tar"; + sha256 = "0vg23ydwkqrmhlll45gf2fjdxj9chx9bl9m0pgwrlkjw0ncxj3qp"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/wgrep.html"; license = lib.licenses.free; }; }) {}; + why-this = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "why-this"; + ename = "why-this"; + version = "2.0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/why-this-2.0.4.tar"; + sha256 = "0hqvqix9hqaki23vw3xilkcr84ak2vz4lwczr54s87x13idrg4px"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/why-this.html"; + license = lib.licenses.free; + }; + }) {}; with-editor = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "with-editor"; @@ -2793,6 +3125,41 @@ license = lib.licenses.free; }; }) {}; + workroom = callPackage ({ compat + , elpaBuild + , emacs + , fetchurl + , lib + , project }: + elpaBuild { + pname = "workroom"; + ename = "workroom"; + version = "2.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/workroom-2.3.tar"; + sha256 = "0c05pbxkrcgsjk7zcyxiacxrpxyvf85rf38nhaqhxbywh4j071fg"; + }; + packageRequires = [ compat emacs project ]; + meta = { + homepage = "https://elpa.gnu.org/packages/workroom.html"; + license = lib.licenses.free; + }; + }) {}; + writegood-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "writegood-mode"; + ename = "writegood-mode"; + version = "2.2.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/writegood-mode-2.2.0.tar"; + sha256 = "08b1650v6qsb3x1s5k4n5m2aqx1n26gc4wj822fm9s49k8vcpzl8"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/writegood-mode.html"; + license = lib.licenses.free; + }; + }) {}; ws-butler = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ws-butler"; @@ -2815,10 +3182,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "22.0.20221031102959"; + version = "22.9.20230207171612"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.0.20221031102959.tar"; - sha256 = "08i6y3ry0sp597vz0zl7c50lnp04fszydw6m1093sb5nlifbhrb8"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.9.20230207171612.tar"; + sha256 = "0m633k8rx2k3gwbh3hndkmn3k804pg7j7xmqw6yf8j2a2ym4893b"; }; packageRequires = [ emacs ]; meta = { @@ -2826,6 +3193,21 @@ license = lib.licenses.free; }; }) {}; + xkcd = callPackage ({ elpaBuild, fetchurl, json ? null, lib }: + elpaBuild { + pname = "xkcd"; + ename = "xkcd"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/xkcd-1.1.tar"; + sha256 = "1yszrba4cvisiy7m16rzpj7plbnafj4c7bdgxvqwxwhsasfmh6ag"; + }; + packageRequires = [ json ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xkcd.html"; + license = lib.licenses.free; + }; + }) {}; xml-rpc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "xml-rpc"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index b7f0666e20056..61557a95e1c74 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -474,8 +474,8 @@ }, { "ename": "ac-clang", - "commit": "ffe0485048b85825f5e8ba95917d8c9dc64fe5de", - "sha256": "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "08yaaiva6j98rqn9d4wfc0yrjh1nifbnj2rz342q863n76fybbxv", "fetcher": "github", "repo": "yaruopooner/ac-clang", "unstable": { @@ -1027,16 +1027,16 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20200916, - 751 + 20210820, + 1000 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "7c023b9ced156cee03171e16c3dac6d26923042f", - "sha256": "0vaxha2f37bs634bl0122c09mkp1yyy2444pkikdavhjx9gzc55j" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" }, "stable": { "version": [ @@ -1055,8 +1055,8 @@ }, { "ename": "ac-php-core", - "commit": "ac283f1b65c3ba6278e9d3236e5a19734e42b123", - "sha256": "0vk3jsxb7dgk5a6pap3bdqkqwpszil0rck1c3y0wyxrlj2y1jcvn", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1589493bf371gwdljnk01q57qffn8y6xb55i7dl05jgdrl2vz54l", "fetcher": "github", "repo": "xcwen/ac-php", "unstable": { @@ -1251,10 +1251,10 @@ }, { "ename": "accent", - "commit": "86fe3baa514cf81f4b031ab55d94555fba2c1a55", - "sha256": "191mhb57gj7zcgcb4h99jv8ac08l90wzsmy4aq22pz8sw56bvzpa", + "commit": "f40f30810167b6851d17f7d400d2bd527871b29d", + "sha256": "17mhq2ba7ay986zz5cwg26d6v3j97m3vbl06l32jq8f5j9xss308", "fetcher": "github", - "repo": "elias94/accent", + "repo": "eliascotto/accent", "unstable": { "version": [ 20220202, @@ -1863,6 +1863,30 @@ } }, { + "ename": "adwaita-dark-theme", + "commit": "ae0fd31f1453e18ae4f5ff1da8b5719d30235d2a", + "sha256": "08vqjn7hgzxk0bfq5j3zgvg90b6gvfl8m2m4bv1042944i3pgspp", + "fetcher": "gitlab", + "repo": "jessieh/adwaita-dark-theme", + "unstable": { + "version": [ + 20230215, + 2027 + ], + "commit": "4792fed63a44a2337832644db909c1663100605e", + "sha256": "0nrvdx3lzkdaiy99mq9ramp4zd7fp4bhksbjb1mk3al6f9026kvg" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "40a375c8b86b58dddcd95e8dc654f127a6a3b910", + "sha256": "1gasg7dqz7vg544bnfnfzdfq50xq7jqwcigkmg2a6n8cm9wrjlh0" + } + }, + { "ename": "aes", "commit": "33ca3106852f82624b36c7e3f03f5c0c620f304f", "sha256": "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v", @@ -1893,25 +1917,25 @@ "repo": "minad/affe", "unstable": { "version": [ - 20221109, - 841 + 20230215, + 715 ], "deps": [ "consult" ], - "commit": "ff75fbe6f6b280815c33ed2d6694bf0ee74dd1fe", - "sha256": "01cza8ffx6djh1mign5bzkdvmcjrd69g3hwc3s0grpcidbqi0qic" + "commit": "69d9d05200dbf9058b3ae14e37f52944718374d7", + "sha256": "1p5hqlkhl1vi2m1wpjhzv38jbs5b1c4ji4nqsiyc37h3mp05nbbc" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "consult" ], - "commit": "ff75fbe6f6b280815c33ed2d6694bf0ee74dd1fe", - "sha256": "01cza8ffx6djh1mign5bzkdvmcjrd69g3hwc3s0grpcidbqi0qic" + "commit": "69d9d05200dbf9058b3ae14e37f52944718374d7", + "sha256": "1p5hqlkhl1vi2m1wpjhzv38jbs5b1c4ji4nqsiyc37h3mp05nbbc" } }, { @@ -1983,6 +2007,30 @@ } }, { + "ename": "age", + "commit": "50eee72024c2c915022c12c713cab3ac7e2c68f0", + "sha256": "1h3qc46z9lw62h2n501drx18kx2zm437vrfn33vg9la4fd3phl59", + "fetcher": "github", + "repo": "anticomputer/age.el", + "unstable": { + "version": [ + 20230115, + 1155 + ], + "commit": "9e82487234c53e0fab2314aeab6479e62c68f0c7", + "sha256": "1x1f224xbwaan4rc1589gipl5a7llr3rxxf85i4y8zz2vfl478dp" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "commit": "0c94618fc10105da751007f90b44075f6e5d61ba", + "sha256": "1dvpa4p1rbpnxh4bcg2zz5y3df40k7r16m9lj4grv926cf1i4hl9" + } + }, + { "ename": "aggressive-fill-paragraph", "commit": "982f5936f2d83222263df2886ca0b629076366bb", "sha256": "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja", @@ -2008,11 +2056,11 @@ "repo": "Malabarba/aggressive-indent-mode", "unstable": { "version": [ - 20221009, - 1158 + 20230112, + 1300 ], - "commit": "f376cdc25de5c0f8c330f1e053557d95ca47a540", - "sha256": "1j2hgg7k1nhcwf5mrncmyc6babrlhks2wkcdhz8d1q8rpymiqq38" + "commit": "a437a45868f94b77362c6b913c5ee8e67b273c42", + "sha256": "0kaxwwnwj47j69zdiamxwlinvnbzw1ya62j91zg26ig2lj8082l7" }, "stable": { "version": [ @@ -2197,15 +2245,15 @@ "repo": "alan-platform/AlanForEmacs", "unstable": { "version": [ - 20220928, - 1229 + 20230216, + 857 ], "deps": [ "flycheck", "s" ], - "commit": "8856871633ef961a0dd7cf019be44212cfe1add1", - "sha256": "1pmgp69w0vi14rzrrkxn8gwhvb1yfczcw73h5jfsawhislg2vq8a" + "commit": "723cf8e8d7e00c1498935553c46f459aa1d26135", + "sha256": "0634gsbbf6fwsh44lk6nblksl402yvy2cf9pcjvlbhrz7mkp2m8j" }, "stable": { "version": [ @@ -2228,20 +2276,20 @@ "repo": "wlemuel/alarm-clock", "unstable": { "version": [ - 20221106, - 1409 + 20230216, + 1337 ], - "commit": "01f43a74591c4b0de34804e126b671990c7360b4", - "sha256": "167q6s32d78b6xywycfahpilpgp64bhcc6ydrjb07fbrbfjk96m7" + "commit": "3e43ca49804afb06477dbf7ff3d6e9824522be4b", + "sha256": "0vdwvrbj79ylaz5ffa2bpfy4kzi1s6hf6bxijvyw7h8y6bd196av" }, "stable": { "version": [ 1, 0, - 3 + 4 ], - "commit": "54a5557c05c63053fe31072905ba80d8231ce2f3", - "sha256": "02gr5scf50js00xa1chvd0j7agr8bys5madzk96fwg0s4gfdmyqa" + "commit": "3e43ca49804afb06477dbf7ff3d6e9824522be4b", + "sha256": "0vdwvrbj79ylaz5ffa2bpfy4kzi1s6hf6bxijvyw7h8y6bd196av" } }, { @@ -2330,8 +2378,8 @@ }, { "ename": "alectryon", - "commit": "4f7b6099b9167840602515f10ab02e70defbee1e", - "sha256": "0q1dsnrjak49dlmwkns79n996ip6zsdsv4k2ifgd9r8fd9yxki22", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0x0n8g6dx622drp591z8dp0dkbhdbdq0039zb4x1lni316gg81il", "fetcher": "github", "repo": "cpitclaudel/alectryon", "unstable": { @@ -2366,16 +2414,16 @@ "repo": "jwiegley/alert", "unstable": { "version": [ - 20221110, - 1614 + 20221213, + 1619 ], "deps": [ "cl-lib", "gntp", "log4e" ], - "commit": "730184b7923a65241fdff695485a3ad432caf201", - "sha256": "0xvb7rbfpwpkdqrbnnv0dy4q1gpy25lm849rf2gqqlrgdmywxafk" + "commit": "c762380ff71c429faf47552a83605b2578656380", + "sha256": "0c3x54svfal236jwmz2a2jl933av2p1wm83g2vapmqzifz2c0ziw" }, "stable": { "version": [ @@ -2508,14 +2556,14 @@ "repo": "iyefrat/all-the-icons-completion", "unstable": { "version": [ - 20221026, - 616 + 20221130, + 2354 ], "deps": [ "all-the-icons" ], - "commit": "4d8ae544ecf5414c7ddefcf15ca6c3de4f627ef5", - "sha256": "1cp5i01ln4j71gng38d03p2mdrvjgfcm29k4qjn5gzq6g4713wic" + "commit": "4da28584a1b36b222e0e78d46fd8d46bbd9116c7", + "sha256": "0b5m1djwhfbjakfda72ybqrw3rzmrq154yfpv4p8wgxknc5xjxfr" } }, { @@ -2636,15 +2684,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220914, - 934 + 20230129, + 1522 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "f5d27ebd729837daec1311e353dcfc850202a945", - "sha256": "144jjv75f82r4rnmpc93k0inv48qh184b1knn30k80czanak8bjk" + "commit": "bc10c105f07c752d82ec7dfd929e5182d3b4a18f", + "sha256": "141cxi9rhp2sa5pk1hq655f897hi893jvv2364h67amq6701l1yi" }, "stable": { "version": [ @@ -2841,15 +2889,15 @@ "url": "https://repo.or.cz/amread-mode.git", "unstable": { "version": [ - 20221111, - 845 + 20230107, + 1433 ], "deps": [ "cl-lib", "pyim" ], - "commit": "3ff235a6204e224d47cb0c99368e6a0f21bf8dce", - "sha256": "03q5rndj0ywkg3gq91rhmzwb71y2qd4yc4x5x6vsi8kfxmbv73bs" + "commit": "4746c6adf81bedf8933faf912c4c65dafea9bb62", + "sha256": "15dr7l2zcs57hm0d2a8gs0pf5px4ibir3nf4ddxaj6aiz456sndm" } }, { @@ -3071,8 +3119,8 @@ }, { "ename": "angular-snippets", - "commit": "96a0ad5fdbc52f803846e580856fb9c58181c020", - "sha256": "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0wpy5vf0l3mnsxv8521cdhx269853z83pms8hhri256p5b54lxk5", "fetcher": "github", "repo": "magnars/angular-snippets.el", "unstable": { @@ -3228,11 +3276,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20221024, - 1829 + 20230203, + 1756 ], - "commit": "479aa90fd6a4db69361339c0058190423fe839e7", - "sha256": "1rsb6chgcn3qyzdrajvmidax1gx13v5ngkp24fl1avrsf4kgbmjw" + "commit": "e433ec6803d773ad2fd92f88b1ffce41ee999c65", + "sha256": "0dr0y1arv0wjhv0rvyln7v9r0bnqb2m1mz8qqi83fgj4ald67a9n" }, "stable": { "version": [ @@ -3277,12 +3325,10 @@ "version": [ 2, 6, - 2, - 2, - 20221106 + 3 ], - "commit": "b00db9d927d8951c44ef2e80fd4941180e9f40e7", - "sha256": "17f1w71r4pbmssg40xx3nx2chk28f0nc8adhr4vnq3ijkw69v1c7" + "commit": "b499d12412bac32ab1af9f470463ed9dc54f8907", + "sha256": "1s7zd01i8pmvi90ywx497kc07z50nah7h0fc2dn6jzb132k5sh1q" } }, { @@ -3345,8 +3391,8 @@ }, { "ename": "ansible", - "commit": "8e45bf58b980ff542a5e887707a6361eb5ac0492", - "sha256": "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "17pfdyfv5z7bw0xhh8apqww8wsmvb5p5y0xs8048gh427mgw5yrf", "fetcher": "github", "repo": "k1LoW/emacs-ansible", "unstable": { @@ -3430,20 +3476,20 @@ "repo": "xgqt/emacs-ansilove", "unstable": { "version": [ - 20220629, - 2339 + 20230210, + 1338 ], - "commit": "3e3f6e8baa2135b072855567e4a1fc599a2fc800", - "sha256": "18p448arf6b6hbqvcxfvw6p45zijfzi2rg91dh26xbzaa398p9bj" + "commit": "abd64819dc67e1ababd38d39c7c7f6a2459987c0", + "sha256": "05q548dyb620kg12mgkmw6jpwbr2y2aqs5p7314y2c37khvw5irg" }, "stable": { "version": [ - 1, + 2, 0, 0 ], - "commit": "7841c01c56026f2b4405228803f8a9d4746a5680", - "sha256": "18p448arf6b6hbqvcxfvw6p45zijfzi2rg91dh26xbzaa398p9bj" + "commit": "785f0bad0c73069e6c41ca543c29675785b614a8", + "sha256": "05q548dyb620kg12mgkmw6jpwbr2y2aqs5p7314y2c37khvw5irg" } }, { @@ -3564,8 +3610,8 @@ }, { "ename": "aozora-view", - "commit": "c6c13f8a0dd90c1c1f39711a5de69c1e0b785601", - "sha256": "0pd2574a6dkhrfr0jf5gvv34ganp6ddylyb6cfpg2d4znwbc2r2w", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0y1gag2r10q1l8nznl78al9wwsw0r01wwzlxmpypa3n5ad9pab3n", "fetcher": "github", "repo": "kawabata/aozora-view", "unstable": { @@ -3648,11 +3694,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20221112, - 350 + 20230219, + 100 ], - "commit": "33d4542b58476d50f01464576664de1acea1f62f", - "sha256": "1gcsw3sfm4ixasfcmq2gjd878ap94sigkhis41l62y6kwzp9z63b" + "commit": "972b9906bf6d23f5a8e92129a4572a906bdfe45e", + "sha256": "1zjnhgkjhgg58c486k6a0p3kns9kap0lfk538059r65nrv4mkbzp" }, "stable": { "version": [ @@ -3723,17 +3769,17 @@ "repo": "alexmurray/apparmor-mode", "unstable": { "version": [ - 20220930, - 1134 + 20230209, + 2325 ], - "commit": "9b0ba33995172044068fa2609d97b1015f9fb513", - "sha256": "0ncp3aq5b2xmr3khy2c6hz8492k56j8v8lfkqqky7n028zy90nv5" + "commit": "3b641de4e34fb4a0594a461254f1454973b6b7aa", + "sha256": "166xs9m66s593p3wvkd6v81ib7rwwd1rhb59zkyz0jsprv70ki6h" } }, { "ename": "apples-mode", - "commit": "5ca765a6a2f312f585624ec8b82dc9eb6b9bbc0c", - "sha256": "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0b3kiz3k9bdx2am1s5jb9dpwy8fxrh238yigwq7w44yswlb15mfk", "fetcher": "github", "repo": "tequilasunset/apples-mode", "unstable": { @@ -3808,11 +3854,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20221016, - 2248 + 20230117, + 2123 ], - "commit": "b7f0cfc44f53f61ff6494dfad84d685aac995ac6", - "sha256": "0qj06f4wngqnw08idx74l1wk1rr0lndwx2xzpr6411qf3rblriy9" + "commit": "1257880637e03efb885893afbcb88b7a8b20965a", + "sha256": "0z8gigwpz3ijqhqiclpaw8gmljbk01myay74c9afws2087s743fy" }, "stable": { "version": [ @@ -3970,17 +4016,17 @@ }, { "ename": "aria2", - "commit": "89a55e7c313066ae1bc0db0af5c289814c85fcb1", - "sha256": "1gsqdqs3q86k7q88rf7qamc0sp5ca00xn9kr1r717vf6qq6a0c3c", - "fetcher": "gitlab", + "commit": "d27e2275bb2fa1ff5e54898412b167cae2002c53", + "sha256": "0vwdrbwn8rda0zsi1n1i7pjwbpnvsxrw1hyq8xdx0346kvprl6fn", + "fetcher": "github", "repo": "ukaszg/aria2", "unstable": { "version": [ - 20190816, - 25 + 20230205, + 1008 ], - "commit": "90aeb73bedba63ac9efb9cad8e7444feb8b40261", - "sha256": "00135gq4xfblv50dwxq02dd1y18xv29lrl7iir3caq4pr3nhrshg" + "commit": "cc1661525bdf5c908c94a9d891a62d9b2e313670", + "sha256": "1sz6ixhw4x6cqs43nfld0156gwx4xjyh2pzbhg3ai1mc2nnmlkif" } }, { @@ -4090,14 +4136,14 @@ "repo": "fizban007/arxiv-mode", "unstable": { "version": [ - 20220128, - 920 + 20230121, + 842 ], "deps": [ "hydra" ], - "commit": "f550583d2da8bd9600bd26bb4028fe22a9744da2", - "sha256": "1hrrpll7yhqdf4jin28dnbv2a1yccn0f1a4hmay7f8yxmp42r1ln" + "commit": "06000ceb5a12b0f95bc7e89de03685f7ada4e8c3", + "sha256": "0dwgcwm0k4pbzbi2ab9607yxn41riqjpixy8fm2yalqh9l0sbasv" }, "stable": { "version": [ @@ -4120,14 +4166,11 @@ "repo": "lassik/emacs-ascii-table", "unstable": { "version": [ - 20201019, - 700 - ], - "deps": [ - "cl-lib" + 20221230, + 1244 ], - "commit": "4f68ad0b36c365c0652756691ab1703d0d46b4b4", - "sha256": "0f0ghwglxv2yil2cbzbhrvgk1p37jldfb974kpfwy6dg8m933rjf" + "commit": "c71f54b85edc6bd42abdc79dd82248958c8a24f9", + "sha256": "1hifgyadzsp4xl0w5fpsfshnf5605i475nbgaf43f3j0mx5q1lgx" } }, { @@ -4168,26 +4211,26 @@ "repo": "zkry/asm-blox", "unstable": { "version": [ - 20221112, - 2256 + 20221220, + 1716 ], "deps": [ "yaml" ], - "commit": "0234a9fe3e4bea7717e857f516209fcc00cf85c0", - "sha256": "184v0773cxggidk06wnsziib3kxkdhfr1j8hizmi75hnsrn1g2ya" + "commit": "5517efb1e186139197a2d348b7339a72dd379af8", + "sha256": "0f4nymkxk2x3jvkxfbgp5v8ap38j9sz1g6vnw6lrpvbgrdzazx6g" }, "stable": { "version": [ 0, 4, - 0 + 1 ], "deps": [ "yaml" ], - "commit": "374d9703afd2976736abe6a73c4d4561a3238211", - "sha256": "1lgy0yrvf5cx9cw95kg8w3xdy3fniagny9pv7an1lydhbfh8nn9w" + "commit": "5517efb1e186139197a2d348b7339a72dd379af8", + "sha256": "0f4nymkxk2x3jvkxfbgp5v8ap38j9sz1g6vnw6lrpvbgrdzazx6g" } }, { @@ -4278,11 +4321,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20221103, - 638 + 20230216, + 559 ], - "commit": "10cedd8ac7173e92a6822317f1782550199d2d6d", - "sha256": "0pjfnza5iha7amy6wdd0zg0h02mfaj6xzimqhjrhi05hh6kakccb" + "commit": "71cc50f27ffc598a89aeaa593488d87818647d02", + "sha256": "1yl4bn62jfplb6a06lh9m65ync32p8fddpwn0s14p3951a0xmdv7" }, "stable": { "version": [ @@ -4499,16 +4542,16 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20221107, - 1434 + 20221204, + 803 ], "deps": [ "dash", "f", "s" ], - "commit": "7cf39d3227d2e99bb2d627bb47fdd90c10a7675a", - "sha256": "0b8pi351k8i7grwpj1h94ym49gq2kgi2bc50cji1f7cimwci3qim" + "commit": "c00f4cc9409dc2fa8c0924f425b2840534b09221", + "sha256": "041f1gdh972y514zdcrlprnpq26kvip81q94768d3ydwlidymky5" }, "stable": { "version": [ @@ -4694,6 +4737,30 @@ } }, { + "ename": "auth-source-gopass", + "commit": "317d42fb608f8fad137f582cf60667089c313ea4", + "sha256": "0awy5cpwclrsk1w31gv6yl8qml1gjdqga8mdcdda852i2zp5k938", + "fetcher": "github", + "repo": "triplem/auth-source-gopass", + "unstable": { + "version": [ + 20230109, + 1213 + ], + "commit": "6f7f0cc0d682f66d11f7fac4fa5c1e79904232da", + "sha256": "07n4bq64aja0f15mz18x45ncq0400fdxjlpc98hzycligihhz4fb" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], + "commit": "6f7f0cc0d682f66d11f7fac4fa5c1e79904232da", + "sha256": "07n4bq64aja0f15mz18x45ncq0400fdxjlpc98hzycligihhz4fb" + } + }, + { "ename": "auth-source-keytar", "commit": "4ba6f96ca2e20dcd75cf239370243bd8e484f851", "sha256": "1wizylkfzsbkavqr7m88vnwgrikj8hd6v01x06k1c5kpwdggvyqv", @@ -4701,15 +4768,15 @@ "repo": "emacs-grammarly/auth-source-keytar", "unstable": { "version": [ - 20220704, - 626 + 20221231, + 1654 ], "deps": [ "keytar", "s" ], - "commit": "fc6e221606e906a040c9df28e269bdc46dbfc9b3", - "sha256": "047zcr8m45y80hzggc0nw59a0wfv49nm8sndpw66mk4klz7w2mij" + "commit": "8fcd935ee131174a1ed7f132614257411ed441bc", + "sha256": "1xlg9zm59dymnwqqs4rcn5xiwvvz8345gcnbr7c2x3zxc75vkn1x" }, "stable": { "version": [ @@ -4814,46 +4881,43 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20220517, - 1501 - ], - "deps": [ - "compat", - "packed" + 20230117, + 1612 ], - "commit": "b204e2f85aaa4d41af4eb1819633c9613f5172bf", - "sha256": "0wqiypznwg7pcqb1qvf4ba2kx4f8x01ms8zxbxy134j9idm4g39f" + "commit": "4cbd304698a897baf438400c9a2b31d3dfb3a7f9", + "sha256": "16jjcd2qndfzp4zkscza1cayv1af41w8bvqmqb4127zim90jrs64" }, "stable": { "version": [ 1, 7, - 1 + 2 ], "deps": [ + "compat", "packed" ], - "commit": "3b4d94b020a2557e439233dbaa9d83fdea68f05a", - "sha256": "1zymk8kzw1mvkasf0dryy2sbwxdr8ppr0a4j5r69y108dmvplqwn" + "commit": "b31a175002e8a7f242c5ad4e971b6046f6217814", + "sha256": "1njnyilv6lxnbvi6yrgzg6qjhf6vgh4fpag4hav1j45718y6kd31" } }, { "ename": "auto-complete", - "commit": "083fb071191bccd6feb3fb84569373a597440fb1", - "sha256": "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "043igws6i97p9sc7rlrhvn7pqgz5daf6a6h3z76qmfhsxmqc7dyf", "fetcher": "github", "repo": "auto-complete/auto-complete", "unstable": { "version": [ - 20220105, - 439 + 20221231, + 1633 ], "deps": [ "cl-lib", "popup" ], - "commit": "57cb8f2ee32dff17ea1b4431fe5920272aa38d72", - "sha256": "185q90ibw17dh2nwdljapdw2747hzv32n4hkjfcfsgw5asy58r8z" + "commit": "59c11c453bfa0794302848a004d1be3b1684f17b", + "sha256": "1psd8i1s507kp4km8izqv244xqzmgffxmnbv1zds5mql6hmpfr3r" }, "stable": { "version": [ @@ -4951,10 +5015,10 @@ "unstable": { "version": [ 20130526, - 1514 + 1527 ], - "commit": "5eb63c8a1e4ca3af124baf0f8f801b949888f9b8", - "sha256": "09f8hqs9n13lkb7b352ig07b9xm1w0mbbnqfy2s5cw4cppmakf2n" + "commit": "a5114e3477793ccb9420acc5cd6a1cb26be65964", + "sha256": "1kp2l1cgzlg2g3wllz4gl1ssn4lnx2sn26xqigfrpr8y5rj2bsfj" }, "stable": { "version": [ @@ -5052,16 +5116,16 @@ "repo": "aki2o/auto-complete-pcmp", "unstable": { "version": [ - 20140227, - 651 + 20140303, + 255 ], "deps": [ "auto-complete", "log4e", "yaxception" ], - "commit": "dc5c0af834d327dd686d74a4171e5d9170007a6c", - "sha256": "0ygak7hypc27d0wvciksnmg8c5njw2skf1ml60vs63a1krkax63i" + "commit": "2595d3dab1ef3549271ca922f212928e9d830eec", + "sha256": "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26" }, "stable": { "version": [ @@ -5080,8 +5144,8 @@ }, { "ename": "auto-complete-rst", - "commit": "4c948dc47f67aa47a1607cbdacdc95241d1a658f", - "sha256": "0dazkpnzzr0imb2a01qq8l60jxhhlknzjx7wccnbm7d2rk3338m6", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0fp3ma17dinb1jxrdslx803bqsx5pwvf26gqsb582dkn44flmla4", "fetcher": "github", "repo": "tkf/auto-complete-rst", "unstable": { @@ -5136,11 +5200,11 @@ "repo": "LionyxML/auto-dark-emacs", "unstable": { "version": [ - 20221114, - 343 + 20230204, + 129 ], - "commit": "10a42b015e35e8c6a99a3fb5ceeb1db0f5893cee", - "sha256": "0gdmjmdzb1p21mrrsl6kv3fvzwmvmbkx9yydn7rylv19zfgj4iwh" + "commit": "ca90fc638cfaf70d5e0b82657d3d26cd0b289059", + "sha256": "1shjl1pck2m7ncpwjfz77ibddx3pz68gma1icccad7piz2c67zrj" } }, { @@ -5189,14 +5253,14 @@ "repo": "elp-revive/auto-highlight-symbol", "unstable": { "version": [ - 20220919, - 548 + 20221231, + 1631 ], "deps": [ "ht" ], - "commit": "e10e4952fd23025f3f46edfde66e3ac2d7bdf069", - "sha256": "0yx8yx6vjqknrxrn24pggr4pzvb9k5is1iy2aisc7wrr5bndb8ly" + "commit": "ece5e2c722efa5c9ea32a809b484afc222ebebe5", + "sha256": "13v21zmcvnrc5a7ig08xs6nf2irdkah3nwgfjk4933ym8rff4sy9" }, "stable": { "version": [ @@ -5483,14 +5547,14 @@ "repo": "abo-abo/auto-yasnippet", "unstable": { "version": [ - 20220927, - 857 + 20230208, + 331 ], "deps": [ "yasnippet" ], - "commit": "7ef65b8e128bcf8afc52a702402c7943839abfb9", - "sha256": "01mdijgngh4bjngxcs81d7v8f6r28ly355gz4f87dbqaxvsdj92f" + "commit": "6a9e406d0d7f9dfd6dff7647f358cb05a0b1637e", + "sha256": "0ifzbwnm2axb8kmfp3jvg05wq02j121iwp2m64pi70c7mza0i886" }, "stable": { "version": [ @@ -5550,11 +5614,11 @@ "repo": "pkal/autocrypt", "unstable": { "version": [ - 20220827, - 1746 + 20221220, + 2359 ], - "commit": "9e393f869a276c7d7d52b89f0bab79a70455fefa", - "sha256": "15psbz4cwin3gxc0xj8hj4h3s6f1pjsdyx5d7sskzvf7kh0rg17l" + "commit": "1444f1861fd13367bdf75ec60a83a94dd1802a49", + "sha256": "1aqjl3l8ppv2z2k6fvza5idfr3bv1n680hf4z2ia3dq6xqy18fpn" } }, { @@ -5734,27 +5798,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220221, - 1638 + 20230130, + 1454 ], "deps": [ "avy", "embark" ], - "commit": "472586b9d40976efe9827399deff3954f1570c71", - "sha256": "09imcbj3g6jvvr43kglwdk85kbp3jngsf8nji0zb832wqkc67zbq" + "commit": "784ce24a1ad37459041418182af49565cad4974b", + "sha256": "17ij5w1mv80j0rr3byahnldsbds8z1q2d61p9gsm0k8jdqxd4rrk" }, "stable": { "version": [ 0, - 17 + 21 ], "deps": [ "avy", "embark" ], - "commit": "97270d725761ee02db461b45b18ec16ae31f203e", - "sha256": "1s0ssf4q9kg4c5w87h2ypyvrhi31mz3s6k4h7pxi9a47lkccq8n1" + "commit": "784ce24a1ad37459041418182af49565cad4974b", + "sha256": "17ij5w1mv80j0rr3byahnldsbds8z1q2d61p9gsm0k8jdqxd4rrk" } }, { @@ -5929,8 +5993,8 @@ "repo": "cniles/axe", "unstable": { "version": [ - 20210816, - 1530 + 20230120, + 1915 ], "deps": [ "dash", @@ -5940,8 +6004,8 @@ "s", "xmlgen" ], - "commit": "3be04d03c1be88b3fb71f95164fb1971c2472c25", - "sha256": "0fy5lr7hvylf0h3vqnarcixvn6bca2dwyb96nkf86skm1hpjvh6i" + "commit": "5168d4f4c33861a071285df34f17fce92137d497", + "sha256": "1469w6rlnkf1wh5a4ar14snamrx61w6mvq6fwpkfmhpgc0fnwdg7" } }, { @@ -6073,15 +6137,15 @@ "repo": "tarsius/backline", "unstable": { "version": [ - 20220424, - 2212 + 20230212, + 2020 ], "deps": [ "compat", "outline-minor-faces" ], - "commit": "0d44408262080cdf998de5a52516f220e7e7c99a", - "sha256": "1l818vv2wh07jxc7wxmnidr8rcbj8526245fsflxp051hpilvan8" + "commit": "f6c235259052a69b70a1410d06f2f400eeb26a8d", + "sha256": "0631hqd877nfdmwys23rfybcwwzjwq8p2b4vm394p2w16g1km592" }, "stable": { "version": [ @@ -6306,11 +6370,11 @@ "repo": "tinted-theming/base16-emacs", "unstable": { "version": [ - 20221014, - 2302 + 20221218, + 105 ], - "commit": "29c469afa822ef24b38e4a4de33b1a638c5bcb5f", - "sha256": "1yja2j22z87nrb35k2d3hq32czwm93wm1vdklxjhv32w4qsvcghw" + "commit": "d113012e4b76bb3ced331480bce33d03241e56bc", + "sha256": "17vhmz5gy2m8m57mvpb9h2mgbci7iqyf2x8yvhxgb5sr4qfmcmbf" }, "stable": { "version": [ @@ -6329,20 +6393,20 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20220531, - 1104 + 20230208, + 1903 ], - "commit": "8e9c20dbfe01d8bf6c61db231593623a201c75c6", - "sha256": "1jq6nx5kpln15yv0k9njql8xl7id7yswdl7hkkbwha99i1cn0nqd" + "commit": "25611eed1e086c4e8cdd335dbd38b1d796be5b8d", + "sha256": "0hqqb7dprwbyhjmymknxcixwqk13fm6aninbjhlaxgwv93i2ghfb" }, "stable": { "version": [ 3, 1, - 0 + 1 ], - "commit": "d47edb9d4142a22746009c1f680df93a4fefd107", - "sha256": "11j2k3irixp47r2iglxdmjphahqhgnxg98n2xwagwzyq99lsamj4" + "commit": "a021468eec8ff8cacb74a9ea595d3587186e29ea", + "sha256": "0cly0m6msn8xv9857nv4syw8fldqzvsa4kciq7av40y26a61hvrh" } }, { @@ -6372,8 +6436,8 @@ "repo": "sasanidas/emacs-c64-basic-ide", "unstable": { "version": [ - 20200429, - 1104 + 20230118, + 1040 ], "deps": [ "basic-mode", @@ -6382,8 +6446,8 @@ "f", "flycheck" ], - "commit": "d1d25c35cf899d58ead9377bf678a553c835c719", - "sha256": "0mb85g7bydd0nv3hjzvqb3d01cs4hg5846ibcznaqhsqk93pgm2h" + "commit": "e33036f838e61b647927165e81be5d5b855e0518", + "sha256": "1mfdkxwsj2mmpsxz0q68z7rs56qpd3dkvl2dkx1dp8n42zvifcxw" }, "stable": { "version": [ @@ -6410,26 +6474,26 @@ "repo": "dykstrom/basic-mode", "unstable": { "version": [ - 20221112, - 1533 + 20230213, + 1822 ], "deps": [ "seq" ], - "commit": "1d6cd9a3c400a3609ea2464103bb814b51d3d560", - "sha256": "177z5rmh4306zkadnpp0as3w51n972hnzsb15sxc4iccfb3zjap9" + "commit": "361dc1ea54bca3ab7a9ff36b64874dbe5c383382", + "sha256": "0lnj6vfg07yvlac7i4v6w7q86zbgqn10dblq992lhfidf6q909jd" }, "stable": { "version": [ + 1, 0, - 6, - 2 + 3 ], "deps": [ "seq" ], - "commit": "1d6cd9a3c400a3609ea2464103bb814b51d3d560", - "sha256": "177z5rmh4306zkadnpp0as3w51n972hnzsb15sxc4iccfb3zjap9" + "commit": "361dc1ea54bca3ab7a9ff36b64874dbe5c383382", + "sha256": "0lnj6vfg07yvlac7i4v6w7q86zbgqn10dblq992lhfidf6q909jd" } }, { @@ -6692,8 +6756,8 @@ }, { "ename": "bbdb2erc", - "commit": "04867a574773e8794335a2664d4f5e8b243f3ec9", - "sha256": "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "012vz1wq06yrrzzbyrk19jlscgb72q035nswkwjwdn42kphb22am", "fetcher": "github", "repo": "unhammer/bbdb2erc", "unstable": { @@ -6768,10 +6832,10 @@ }, { "ename": "beans", - "commit": "c458bd38ec9ec1de6717ea634b2d53f9083e3b23", - "sha256": "1sp43p1ajjh8zwrwkl09rhkkmxf01cw3i74ibqxn6m3hbdb3ry56", + "commit": "3d6b6320e55f2c38056e1d851eaeaa4d3e558bc7", + "sha256": "1zxb5rffdz8g0737rvc47fh6wikhppg591q066hm596kpk6lqzm4", "fetcher": "github", - "repo": "TheBlackBeans/emacs-beans", + "repo": "jthulhu/emacs-beans", "unstable": { "version": [ 20221114, @@ -6789,11 +6853,26 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220810, - 1529 + 20221210, + 1154 ], - "commit": "2a0b54afd9e8fe586d64f7c4977c36d22d3fa6e2", - "sha256": "0da4rf5d1snh2ni1pjp67qyl456wy9jv1sc4mi8850m08hnb33xh" + "commit": "badbf267fa488df1cb87809ed234ebd67786f2f8", + "sha256": "0l4vzzzx50sq4hvv76ng3mywz0715rdqdfv2ivr92zzb1kjdp5a6" + } + }, + { + "ename": "beef-mode", + "commit": "455133bb8d6d1c18400064961b8f6c65941bc879", + "sha256": "067dlbbzvrdd3zrmm5lqqkavm5qhwn0h4aq8lazk695bdjqaj3zc", + "fetcher": "github", + "repo": "thechampagne/beef-mode", + "unstable": { + "version": [ + 20221227, + 203 + ], + "commit": "20906b41630d74eba56504fbb9fabb79562e0d6e", + "sha256": "1mqwamw9rhz8sm8jwv6m70bllrglqgl5qknj08z4zchbr72ik8ah" } }, { @@ -6805,14 +6884,14 @@ "unstable": { "version": [ 20201227, - 1533 + 2024 ], "deps": [ "org", "seq" ], - "commit": "1f085b6bdf9138db8deb7cd3afd269e34a87e8cc", - "sha256": "14b9vzzfwrl49nxv5kk975jzddgx8zzqspr00myxxq110sa628ya" + "commit": "161d9c94c594614a01cb08219693d9e000af4f69", + "sha256": "0cfjrn4hkpxhmg07kdff6ifvv1aqaq6dah5bvdc0xhzlqznx72j4" }, "stable": { "version": [ @@ -6884,10 +6963,10 @@ "stable": { "version": [ 1, - 0 + 1 ], - "commit": "7a0f263282bbc86b01b662636306f22813082647", - "sha256": "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94" + "commit": "02435560415bbadbcf5051fb7042880549170e7e", + "sha256": "19375vamhld4xm2qrdmhlp2nczfvalmz9x6ahl23zwkilr8n1nbw" } }, { @@ -6967,11 +7046,11 @@ "repo": "technomancy/better-defaults", "unstable": { "version": [ - 20220116, - 2220 + 20221125, + 1725 ], - "commit": "db2d945c44e26f32a658e9e743dd4b7a0d84b2fd", - "sha256": "0mlga8kk09ir66lqs5xx0bkr51vcc89hxq3ax2vaq1zsvlddl5h2" + "commit": "a45aecec0cf223984bc8649cd1dc81a5004932b4", + "sha256": "04b1k057j3ydfsla4jj15j600xyf4p3ha3n3vpf9fj313ryx8b1p" } }, { @@ -7108,25 +7187,25 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20210418, - 406 + 20230202, + 1721 ], "deps": [ "biblio-core" ], - "commit": "368f45bf9a64450705a63598224c5af96160af76", - "sha256": "034vx4x0cj79n9gdxnwvmdz9ljdfsn9isda20x6gghjncb1dzsj5" + "commit": "ee52f6cda82ea6fbc3b400e7b12132595cc0374c", + "sha256": "0iya5ybc54kia5vnb3bfr8yilykhbn2xvp157vya06cw4af2cw65" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "biblio-core" ], - "commit": "a5a68fcf677f286f205f32dc7486f6c9f66aa6af", - "sha256": "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz" + "commit": "ee52f6cda82ea6fbc3b400e7b12132595cc0374c", + "sha256": "0iya5ybc54kia5vnb3bfr8yilykhbn2xvp157vya06cw4af2cw65" } }, { @@ -7155,29 +7234,29 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20210418, - 406 + 20230202, + 1721 ], "deps": [ "dash", "let-alist", "seq" ], - "commit": "517ec18f00f91b61481214b178f7ae0b8fbc499b", - "sha256": "0m5vpyj6312rc3xq8lrr1g2hyl26adzwvjxb3jqrm7bvqvs4i5zp" + "commit": "ee52f6cda82ea6fbc3b400e7b12132595cc0374c", + "sha256": "0iya5ybc54kia5vnb3bfr8yilykhbn2xvp157vya06cw4af2cw65" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "dash", "let-alist", "seq" ], - "commit": "a5a68fcf677f286f205f32dc7486f6c9f66aa6af", - "sha256": "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz" + "commit": "ee52f6cda82ea6fbc3b400e7b12132595cc0374c", + "sha256": "0iya5ybc54kia5vnb3bfr8yilykhbn2xvp157vya06cw4af2cw65" } }, { @@ -7298,14 +7377,14 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20220422, - 1600 + 20230212, + 2019 ], "deps": [ "compat" ], - "commit": "298e33b4b02e499a61a68bb61ebef64cb7640b59", - "sha256": "0gv3hrwlns59jnxh2xzn2vf3a4jb2mm7gvq4jj77zr4di823r6qj" + "commit": "20f0637365a9bf0a899a7663b1f8caec609de19a", + "sha256": "074npqx189paal46g9dcr28i3lzm2gx8lyrk7v4v1hjhgmzhl1dn" }, "stable": { "version": [ @@ -7410,11 +7489,11 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20221117, - 1610 + 20230203, + 2004 ], - "commit": "9090080b15486c3e337be254226efe7e5fde4c99", - "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" + "commit": "77945e002f11440eae72d8730d3de218163d551e", + "sha256": "1irr8a8r28n8c0c2x5w1flgv1f3z5jy2i5r5dknddiqa93b3rm84" }, "stable": { "version": [ @@ -7458,14 +7537,14 @@ "repo": "rnkn/binder", "unstable": { "version": [ - 20220429, - 2055 + 20221224, + 1132 ], "deps": [ "seq" ], - "commit": "5e11bc279850b623ebfde9a2278ea7c3ec2d7ac2", - "sha256": "0g0j4ccry7iyniiyiyhjyydknilhk01vsfidjjgv5c198yn8x1gp" + "commit": "828f2fd079769e5a2c50f8998e84d63a9a95e797", + "sha256": "1pa63y6ldm8gbzpx365i3hd147qglkyi10vlj52rcd3p8qvrg9gq" }, "stable": { "version": [ @@ -7505,6 +7584,30 @@ } }, { + "ename": "binky-mode", + "commit": "c83e9c76261a7de6a41ba93782a52f912120ea75", + "sha256": "0b6p43blrdb28czqxj4ykj8zbq6jix49g7rsig3c6dn7cj4rqzxv", + "fetcher": "github", + "repo": "liuyinz/binky-mode", + "unstable": { + "version": [ + 20230120, + 1708 + ], + "commit": "04f1132ea1945861da0081cb2ad08076d20cea57", + "sha256": "010yyhgn049nfmx3rbc3h4a0ypi6vgkn340rqfvsmml48ax75chn" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "e35a477e28e5ace70bbdb2a5d0c503639528fb5c", + "sha256": "1kvqrkm21g06q068jvf3a95299n0xd550lba1wlf0h6pc1jrg1fn" + } + }, + { "ename": "birds-of-paradise-plus-theme", "commit": "3932853232c269f158806aebe416b456c752a9bb", "sha256": "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m", @@ -7701,26 +7804,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20220531, - 1900 + 20230113, + 2009 ], "deps": [ "posframe" ], - "commit": "330c0ac2e3bbc242c2e769655bb6b68555aada70", - "sha256": "1wmz3kp5k7n5xj2yx4rz7f7a5khvhll1jvda40b3c8x6mx9n416f" + "commit": "d1d5f2dc4d9cd5a47c47b55abb1f3b38911cc2d0", + "sha256": "1djp0bdgbzlhxcajvw7znj68i64finilch24kzrxh96panaami3c" }, "stable": { "version": [ 0, 5, - 0 + 1 ], "deps": [ "posframe" ], - "commit": "330c0ac2e3bbc242c2e769655bb6b68555aada70", - "sha256": "1wmz3kp5k7n5xj2yx4rz7f7a5khvhll1jvda40b3c8x6mx9n416f" + "commit": "d1d5f2dc4d9cd5a47c47b55abb1f3b38911cc2d0", + "sha256": "1djp0bdgbzlhxcajvw7znj68i64finilch24kzrxh96panaami3c" } }, { @@ -7985,26 +8088,26 @@ "repo": "sergeyklay/bnf-mode", "unstable": { "version": [ - 20200323, - 1348 + 20221205, + 1451 ], "deps": [ "cl-lib" ], - "commit": "d88eef69ae66ea1ffa21a65317afe84c9ddb0814", - "sha256": "13178vnd8jscjqhdjvr06xxq00ymbjkaxpg2vvxb44gsyg75jg9n" + "commit": "dcdb422e219b29d53a9385e19083441c57f0beb3", + "sha256": "18fmka9hvdrz402kvjzz25437x3y36007d3vd439i1r6rj3axmg4" }, "stable": { "version": [ 0, 4, - 4 + 5 ], "deps": [ "cl-lib" ], - "commit": "4a7aff6a3a691826ea4add9f519c854b9611d780", - "sha256": "1hnkvwl0as2s4aayqahclqclsriigqv51h8yafx0za1xfh4snfzv" + "commit": "a4fe013fc945d8396930bc6d0dcc1cf9d7102f41", + "sha256": "04n8aganyz44i1lhnlqraa4yk7i5dxjmskq8pp009ay33mjanj5l" } }, { @@ -8077,8 +8180,8 @@ }, { "ename": "bongo", - "commit": "692428769cd792dc0644641682c2793103dd00c6", - "sha256": "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0bswl59wmbvpkar6nk9qgjchv0gblwx732gxbrfpmq06fj0ia8pn", "fetcher": "github", "repo": "dbrock/bongo", "unstable": { @@ -8149,11 +8252,11 @@ "repo": "ideasman42/emacs-bookmark-in-project", "unstable": { "version": [ - 20220708, - 211 + 20230116, + 1206 ], - "commit": "ccffde03b57d9b16fff59188d8e4090bf64d46d6", - "sha256": "1d4kbzgjdfkpjadbg070slir2v6sqlfw4jqlmpdg7pwc1c4j32rj" + "commit": "a1630443887c7fa190411c45269bde575f0807c5", + "sha256": "1va02c3mdaj04xx7r9h42ldiddl4i3ca68kywk66v59kxphdpzqq" } }, { @@ -8211,16 +8314,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20221106, - 2025 + 20230214, + 2035 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "106f842df7f68cbffbb2bb63f7f99f34fe7d3edf", - "sha256": "0pw2ig0hn9m62yv6j7snllzb9aanyjjfx3xzaif4bl0ili2zd78c" + "commit": "786cf085a9af60083279297c599d5ea0f744efba", + "sha256": "142gj7mxr8kg412y6xkicwicsy9y7jc3pjsmmnx3x4c7msh3hkqi" }, "stable": { "version": [ @@ -8244,15 +8347,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20221106, - 2238 + 20230215, + 1517 ], "deps": [ "epkg", "magit" ], - "commit": "032ddf33799dd0a2c89d1a3e9e04dc3cdc13320c", - "sha256": "19y7sc7d9qb926b5jv2l2jwhsgl3wm6php30w2r9jh5gspmh0ck7" + "commit": "15a89056ceccb611c28aed8943faabec0539494a", + "sha256": "1n32wiclnlqj8xr5rbzywqrras551hjcdk2mcc21xnqk22zf7mmb" }, "stable": { "version": [ @@ -8299,6 +8402,30 @@ } }, { + "ename": "boxes", + "commit": "525c1c64ccaeda21f8e30d8d7edcde318ba80ffa", + "sha256": "0sp9mpn0x7cljiaipvfh14sdk7jpmzi9pvvsxci7hz6mb2lskw0a", + "fetcher": "github", + "repo": "ascii-boxes/boxes", + "unstable": { + "version": [ + 20221213, + 2047 + ], + "commit": "380e7814acb7de490a3b5729c3b943f875bc6a73", + "sha256": "1qz31wq16p5lzk0bwnz0nbgp9v7ai94wbmafi9wlyi9sc1b9dp9y" + }, + "stable": { + "version": [ + 2, + 2, + 0 + ], + "commit": "7113961cbd139bd0c2122a92cc41331dbabf45a8", + "sha256": "0vv2gaav1m4z2xdk0k3ragmv4kcnzv7p3v97lkjl1wbfmk5nhz07" + } + }, + { "ename": "boxquote", "commit": "d2148f8f17b16154bfc337df69a5ad31e25a9b05", "sha256": "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s", @@ -8373,6 +8500,21 @@ } }, { + "ename": "bqn-mode", + "commit": "17711a1d747932e9be1ccd1d0a3adb64fa6cf1ef", + "sha256": "1hbwdd75dbbrgqnlj3mpx25nq2pb59xv5241dn55vzwd36a7434m", + "fetcher": "github", + "repo": "museoa/bqn-mode", + "unstable": { + "version": [ + 20230215, + 309 + ], + "commit": "6089e141dd693f809673c518fa07283ffeadb734", + "sha256": "0npbl9gph5g80r69g8vc9g23h867dwnny2g40yj85la9c28rg7fd" + } + }, + { "ename": "bracketed-paste", "commit": "6446db573d97ceb21cd39ce05fb39627113bbd74", "sha256": "1v7zwi29as0218vy6ch21iqqcxfhyh373m3dbcdzm2pb8bpcg58j", @@ -8437,25 +8579,25 @@ "url": "https://bitbucket.org/MikeWoolley/brf-mode", "unstable": { "version": [ - 20220807, - 1438 + 20230217, + 1851 ], "deps": [ "fringe-helper" ], - "commit": "8f86b980d450e44cd29d24e66c30ff079c6b9982", - "sha256": "13jl2ppc8yn8nkwg0xix7cfmgfy34grw4rlask39mdis0jkwazk6" + "commit": "3f31b81204dc919cb178df556feed497f3a2a4f5", + "sha256": "1h2sgr4vck1x4p2clx2dcyd0g2l9s2bj1lfhx0xb09i17r80fk69" }, "stable": { "version": [ 1, - 23 + 24 ], "deps": [ "fringe-helper" ], - "commit": "8f86b980d450e44cd29d24e66c30ff079c6b9982", - "sha256": "13jl2ppc8yn8nkwg0xix7cfmgfy34grw4rlask39mdis0jkwazk6" + "commit": "3f31b81204dc919cb178df556feed497f3a2a4f5", + "sha256": "1h2sgr4vck1x4p2clx2dcyd0g2l9s2bj1lfhx0xb09i17r80fk69" } }, { @@ -8505,16 +8647,16 @@ "repo": "rmuslimov/browse-at-remote", "unstable": { "version": [ - 20220908, - 1736 + 20230118, + 407 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "010639fc6bd6c710b56e0f095352da60c92473a3", - "sha256": "0ihbapxi99drdn191g7brx4pa5f1w0mskhb3yz7w3qsf0g9y9kn8" + "commit": "c020975a891438e278ad1855213d4f3d62c9fccb", + "sha256": "0g78l8jkwxmnpiwjk3yjbd7528mywwh26i3zzgy9a3904fv37rcw" }, "stable": { "version": [ @@ -8876,25 +9018,26 @@ "repo": "swflint/buffer-sets", "unstable": { "version": [ - 20221102, - 1813 + 20230220, + 2122 ], "deps": [ "cl-lib" ], - "commit": "e14026496655562ebd191ba25fad59ca8948c9bb", - "sha256": "0ljbb3zbm8kwasd4jxnq2mmw8ad7p6zxdpz8jz4wmjpskgya7nbn" + "commit": "ac40dc72ffd9073f8425e833fda7d29cbce581c4", + "sha256": "1wjzyj2hd63s575iirag04sa32sq9z9l50ik2zazggs81xlnw6ml" }, "stable": { "version": [ 3, - 5 + 7, + 2 ], "deps": [ "cl-lib" ], - "commit": "e14026496655562ebd191ba25fad59ca8948c9bb", - "sha256": "0ljbb3zbm8kwasd4jxnq2mmw8ad7p6zxdpz8jz4wmjpskgya7nbn" + "commit": "cdc66804b8a1ec7ddf94d99c7f24b801148b64df", + "sha256": "0lz7bjmxzxkri6mvqk6lrl6dp58as6py3i41hkfkj9zjmjvsl589" } }, { @@ -9290,8 +9433,8 @@ }, { "ename": "buster-snippets", - "commit": "67dabf33096113e68fe282309246094711751e1f", - "sha256": "0k36c2k7wwix10rgmjxipc77fkn9jahjyvl191af6w41wla47x4x", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "17b9752lxmscrnvjdirm0ws33c0a9rkgj369bx44i6w0cbqds8lg", "fetcher": "github", "repo": "magnars/buster-snippets.el", "unstable": { @@ -9361,19 +9504,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20221026, - 2006 + 20230119, + 2337 ], - "commit": "eaa4b3ccd115a2bb25be98dc637950645d3adbae", - "sha256": "1dc8m5w26gi698d31xvh1q8mwf4a3wa1xrnyhqqxrmfr8b71clpk" + "commit": "07a52c99695845a0089e828d43da154c0ba0c178", + "sha256": "0xq92f5han0830h2fpqh49qxp2x7rqmq7743d2nfw49rhrns542i" }, "stable": { "version": [ 1, - 28 + 29 ], - "commit": "eaa4b3ccd115a2bb25be98dc637950645d3adbae", - "sha256": "1dc8m5w26gi698d31xvh1q8mwf4a3wa1xrnyhqqxrmfr8b71clpk" + "commit": "b3ea11826e2ca5d648d677c4ae27974ce8e7c7e3", + "sha256": "0a5wvm7nh4748wzvp2b9jll74ifqz22bicxkl5fwp4di4vrqpd47" } }, { @@ -9450,8 +9593,8 @@ }, { "ename": "c-c-combo", - "commit": "da105eab0e7a5a3a1fc562973d99cbbbe9019b5f", - "sha256": "09rvh6n2hqls7qki5dc34s2hmcmlvdsbgzcxgglhcmrhwx5w4vxn", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0z7qix1ir02rhpqsgz48wixncpyf375xf5767f971sxm8n46mdig", "fetcher": "github", "repo": "CestDiego/c-c-combo.el", "unstable": { @@ -9772,11 +9915,11 @@ "repo": "kiwanami/emacs-calfw", "unstable": { "version": [ - 20170320, - 1206 + 20170411, + 220 ], - "commit": "136dce009a26e7d8a8064af422c2cf8170e852c5", - "sha256": "1hiip8hfl7myimgba7ggs1ki1pk3ag7nyfa8j2zzm87n93g5xia4" + "commit": "c538d3746449b4f0e16b16aad3073d4f7379d805", + "sha256": "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa" }, "stable": { "version": [ @@ -9833,11 +9976,11 @@ "repo": "kiwanami/emacs-calfw", "unstable": { "version": [ - 20150703, - 819 + 20170411, + 220 ], - "commit": "a67fa1023b3fddc1d1f38114c1d207376c8e6289", - "sha256": "0g8s3pgivqk1vqdgkndznkl48c4m5yiahkjxyqyv2781hdb4f6xa" + "commit": "c538d3746449b4f0e16b16aad3073d4f7379d805", + "sha256": "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa" }, "stable": { "version": [ @@ -9856,11 +9999,11 @@ "repo": "kiwanami/emacs-calfw", "unstable": { "version": [ - 20160303, - 258 + 20170411, + 220 ], - "commit": "e03ae470788778e7714b73520014eadc03a88abd", - "sha256": "0rhasr818qijd2pcgifi0j3q4fkbiw2ck1nivajk7m810p53bxbj" + "commit": "c538d3746449b4f0e16b16aad3073d4f7379d805", + "sha256": "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa" }, "stable": { "version": [ @@ -9879,8 +10022,8 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20220612, - 1131 + 20230118, + 954 ], "deps": [ "dash", @@ -9890,8 +10033,8 @@ "s", "transient" ], - "commit": "2f2cfc38f2d1c705134b692127c3008ac1382482", - "sha256": "11y8hiihs1jdf44pdxmylriqngwsxwsny29l6y3jp4mmhrrgz1m7" + "commit": "0ea8ccc41bbf4c6d105d9d2eddffa25d040f0e8d", + "sha256": "1dha52nv0gscy4bp1z5z40l15nzqbpl0frgjx08i7mbzf55a3nlv" }, "stable": { "version": [ @@ -9919,16 +10062,16 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20221103, - 240 + 20230220, + 226 ], "deps": [ "hierarchy", "ivy", "tree-mode" ], - "commit": "4a8206e0b8b8ffa073d35d132e0654068a3d425f", - "sha256": "0gb4m3jz7sm3iy2ipa1ijvkxbp1hwd3ka6p5i7jrhbs29hf1zamv" + "commit": "18a96dbabbedcd9e55817af7b6a0f303aea09faa", + "sha256": "1xdb2fiyavhxn7m5gg5b7vr8fydlzdriz0ckhsr95v19vjylkwg4" }, "stable": { "version": [ @@ -10000,11 +10143,11 @@ "repo": "ocaml/caml-mode", "unstable": { "version": [ - 20220928, - 835 + 20230129, + 1145 ], - "commit": "a970f303065fe176a920db0466dacf3e2a20b56b", - "sha256": "1bd21fhcjgz7iadbz66yyzb7d88mlan7mkxm8zm0jnlkhdmixc9v" + "commit": "959a5a27bfdbaa43a9ff99be136d62e0798f5e01", + "sha256": "145y73lrrwwcl7xg12aq42a1zc1cwgvm7kg3gk18j5k40cy9x696" }, "stable": { "version": [ @@ -10023,16 +10166,16 @@ "repo": "kisaragi-hiu/cangjie.el", "unstable": { "version": [ - 20211201, - 2307 + 20230219, + 1150 ], "deps": [ "dash", "f", "s" ], - "commit": "87408d79b73a69194842a8848de6d7708e98c3a4", - "sha256": "1pafp5sqr1zb0fkci6i542s683vx4x14955rv51311s2y8xzgyqf" + "commit": "d6882e15f47fdde37e9f739dde604d77d25f11db", + "sha256": "0adi56w8lyxasry9z56pgxkz29my54q66rgyrzqbwba1qaky375g" }, "stable": { "version": [ @@ -10057,19 +10200,25 @@ "repo": "minad/cape", "unstable": { "version": [ - 20221109, - 839 + 20230215, + 717 ], - "commit": "4b32036a6c667b445dcc001fd70a01eee8baa924", - "sha256": "0kcnyzksj8yglk67g1130wxzscgipm7cz2hs8mvdqpcbz4i38jny" + "deps": [ + "compat" + ], + "commit": "3e796a862d42743d33cd56fca041b6f2194db095", + "sha256": "0nvmqfp9rv2mrisyvwfr285yww22c6wb5by3s25c83ay2ivpi8ya" }, "stable": { "version": [ 0, - 10 + 13 ], - "commit": "4b32036a6c667b445dcc001fd70a01eee8baa924", - "sha256": "0kcnyzksj8yglk67g1130wxzscgipm7cz2hs8mvdqpcbz4i38jny" + "deps": [ + "compat" + ], + "commit": "3e796a862d42743d33cd56fca041b6f2194db095", + "sha256": "0nvmqfp9rv2mrisyvwfr285yww22c6wb5by3s25c83ay2ivpi8ya" } }, { @@ -10090,16 +10239,16 @@ "version": [ 0, 10, - 2 + 3 ], - "commit": "2e88221d3dde22266bfccf40eaee6ff9b40d113d", - "sha256": "0dq23gghvsp71j75xiypbcafsf1if68fr96ihpzxx9fg0w47h6mw" + "commit": "a16468f296a9584f4068072efecdee8a9eb9c2ed", + "sha256": "0nj0s1n7a98kn1597lskv32piba6cy5ifgw102y52mphl0h55c22" } }, { "ename": "capture", - "commit": "bdfe43be6c5f77845e82745534a1b1a9eb190466", - "sha256": "1hxrvyq8my5886q7wj5w3mhyja7d6cf19gyclap492ci7kmrkdk2", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1zp9zcrj8jabvc3699azixfziqnvcj3skv1zp1787d41wzc1g5bv", "fetcher": "github", "repo": "pashinin/capture.el", "unstable": { @@ -10134,14 +10283,14 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20221002, - 1553 + 20230105, + 11 ], "deps": [ "bech32", "cbor", "emacsql", - "emacsql-sqlite3", + "emacsql-sqlite", "f", "helm", "readable-numbers", @@ -10149,8 +10298,8 @@ "yaml-mode", "yasnippet" ], - "commit": "5654cd04cf0ab482a7f92a206abf43762ef653f3", - "sha256": "1pw73csxkfr71piq5mjy54njd1s3vk5j9a1bfwvna33kqwcqjcic" + "commit": "6ce650972d949228b17dc03c6ff809f67f22f35a", + "sha256": "0j82a1267cgkj2kd2m3fb05hk7s4nlwxbfxa9r8hs9kzx48lkli2" } }, { @@ -10161,8 +10310,8 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220718, - 1434 + 20230105, + 11 ], "deps": [ "cardano-tx", @@ -10171,8 +10320,8 @@ "yaml", "yaml-mode" ], - "commit": "4250104458df65c69a8c4287be29840975addbf2", - "sha256": "1mb5a8jkww579y0nhyn2089g1hbws1q69iq4dyrsqmhgflc2bg01" + "commit": "6ce650972d949228b17dc03c6ff809f67f22f35a", + "sha256": "0j82a1267cgkj2kd2m3fb05hk7s4nlwxbfxa9r8hs9kzx48lkli2" } }, { @@ -10183,14 +10332,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20221025, - 810 + 20230125, + 1253 ], "deps": [ "markdown-mode" ], - "commit": "d2720c8dc7ac3b18ce112a886d3b8696797d01cb", - "sha256": "1qsva3ba3r883c8kr8ffsnzrd8fqf02yx4dxml3qzwhi74s1n5wq" + "commit": "225fdb846c702a193e58a98c1585bb3586a9aa86", + "sha256": "03wm1wq6jax1a30ix5hn3n8d95nn0hkc6l9mipy77ayfcawkd31h" }, "stable": { "version": [ @@ -10213,11 +10362,11 @@ "repo": "ayrat555/cargo-mode", "unstable": { "version": [ - 20210605, - 1003 + 20230213, + 401 ], - "commit": "96407fccbde5f2ccb02682f421910a6f4a17e30a", - "sha256": "0bagdch1n7lqr7vrc34gh1qkngqlg6jpgcypcckbs9sn0qngh9mc" + "commit": "6e128f08692aae5723122e039e8871a57141e868", + "sha256": "044bc09bmkzzrrd24niwsz5cr52kg3wbhs7qfmxmypyqzzdj3kcd" } }, { @@ -10228,11 +10377,11 @@ "repo": "peterstuart/cargo-transient", "unstable": { "version": [ - 20220730, - 154 + 20230120, + 1431 ], - "commit": "1755da9c1cedde6026a0a9e7fd0fe98ed2d30dbb", - "sha256": "1bidbpak7w16dw78sgwx8kb75kvib6s15cnl8akzxsdx69r9k207" + "commit": "f0295aee41404ffb2e8532948becf78d405e4ee9", + "sha256": "1x1nkcsc41niljpm9mf84r1lyiavy3nybpgzglhw8f7xwvr7b6x5" } }, { @@ -10428,11 +10577,21 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20221023, - 2331 + 20230221, + 737 ], - "commit": "b4be30de73aa295ab56a20c21dff07fba3dec05e", - "sha256": "15wdl02r6yjkqmzh5xg60hgcdvwr32vv6sw2mzjyh6g1wi6x134q" + "commit": "046358639b3b6948f0779a16bef51cec44c606c3", + "sha256": "01r3xpx55i4wwk2xzrl3y7ajckkwzpxlyx4ccpzn0l3rl8dbsw9c" + }, + "stable": { + "version": [ + 0, + 2, + 0, + -3 + ], + "commit": "785c9f57a43c4c90041290556d999db3d9da5be9", + "sha256": "1dzfashhjig06m9zs4w2ns64h3hzck93p4ddfwnr9zaxz0gmkp4s" } }, { @@ -10472,14 +10631,11 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220810, - 1600 - ], - "deps": [ - "dash" + 20221225, + 1909 ], - "commit": "5282753b9f4509468d391357147e13129859ccbe", - "sha256": "12qmbrkr16hh81hqjn3h4v4ypj08ii3yg9zibky9hpld5jidqx26" + "commit": "b369e8ac68c4cbabeb3a57f7db6bd44341523d72", + "sha256": "0ppzjha1cav84jgp2lvm60m4qxxa3cd9mbp66jdgzyjx3k7mi0l3" } }, { @@ -10520,15 +10676,15 @@ "repo": "emacs-lsp/emacs-ccls", "unstable": { "version": [ - 20200820, - 308 + 20230111, + 1754 ], "deps": [ "dash", "lsp-mode" ], - "commit": "675a5704c14a27931e835a431beea3631d92e8e6", - "sha256": "0l4bhyr9d8ljz1f0cfg1s2cjcmh6fiwbk5mdlvc7rrwz5hxc21is" + "commit": "29d231590fad39b4d658d9262859e60669edb9b0", + "sha256": "09a4hs80577mliqlb9ahgz3kc3xvr9kpw9qvlv7cycd4x56ngy0k" } }, { @@ -10692,15 +10848,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20220926, - 1247 + 20230109, + 457 ], "deps": [ "cl-lib", "powerline" ], - "commit": "7d9fad0daa44ffb2acecf6525759e46e08e35f2c", - "sha256": "0la8fmwirspg7m453qhfb64sqryl59dxc1lfmjkh6mzf85nqbl1i" + "commit": "a2890d968d877b269a814a691356fc5877833c39", + "sha256": "1naimz0xazxlms20kz6v82vpmriinswq51bbqxcl6m8ic7wgii0w" }, "stable": { "version": [ @@ -11028,11 +11184,11 @@ "repo": "GrammarSoft/cg3", "unstable": { "version": [ - 20220930, - 907 + 20221007, + 1727 ], - "commit": "4d0fcdd3f9f33832af357928762d785d88b3d494", - "sha256": "0nh6lgwrd776n3chk3wyla95hf5jhkcmbmnz25d5lsk35nb2fwb8" + "commit": "a8a369f77d798bf65f65271256980a498fa43564", + "sha256": "0q6gac1ykkc332z4x88d1wn2mvkz92lwjy36dji93hvl9y3228af" }, "stable": { "version": [ @@ -11245,8 +11401,8 @@ }, { "ename": "chee", - "commit": "25b445a1dea5e8f1042bed6b5372471c25129fd8", - "sha256": "1sw84qaca2cwgrw332wfqjp3kg3axgi9n6wx5a6h2n3liq5yr1wj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0dk30kadpagz1in8jnj7550865hxa7wmyl15pb8ivz1llm3v85bf", "fetcher": "github", "repo": "eikek/chee", "unstable": { @@ -11363,11 +11519,11 @@ "repo": "tuh8888/chezmoi.el", "unstable": { "version": [ - 20220310, - 2014 + 20230106, + 1716 ], - "commit": "781783c483bc8fcdba3a230bb774c3a8a5ebe396", - "sha256": "0il36mnf4c13336sa4hpbfypdc983va5fcd5shcsp7slb9zwm69m" + "commit": "0578f81ab01f5280e6c68d7a8a70ae4b4ba29755", + "sha256": "09qjp6030xfj27aswpi224czjq28ac32267k1y4gfp16gg4iimdd" }, "stable": { "version": [ @@ -11546,16 +11702,16 @@ "repo": "contrapunctus/chronometrist", "unstable": { "version": [ - 20220604, - 344 + 20230203, + 557 ], "deps": [ "dash", "seq", "ts" ], - "commit": "dd2ffea506531ca621685bda5a4c30dfb43f5fa2", - "sha256": "1fqijm6gnmsljg6a5pswcnrclv0kan1y947lhl9j5sqk31dcpbp2" + "commit": "f131e996320715238e8403439a18dbc016b09520", + "sha256": "1p25way281k6ygkws1fmkz2z9imcj7p82n6zlrlfjz37192d8saq" }, "stable": { "version": [ @@ -11694,11 +11850,11 @@ "repo": "chyla/ChylaThemeForEmacs", "unstable": { "version": [ - 20180302, - 1658 + 20221213, + 1012 ], - "commit": "ae5e7ecace2ab474151eb0ac5ef07fba2dc32f8a", - "sha256": "1gqzwwr3fnhd9iqn7zmqpxgxvmrhq7g849ndjwizksk0bfj3b596" + "commit": "b24d0379516857ccf75caff9ae1d00b820c9a6f6", + "sha256": "1rr33vxl3rihcygmd76ga4cg22kwfdld50firg0j5fgyg3kscj4f" } }, { @@ -11709,8 +11865,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20221109, - 2212 + 20230218, + 915 ], "deps": [ "clojure-mode", @@ -11720,13 +11876,13 @@ "sesman", "spinner" ], - "commit": "5064287ba71c4c8ede169b0f561d707f4a365c55", - "sha256": "01r53aclh5wf70l6kpzmnx64jm6ixx6x9c390hbdvjbif6mp8xbv" + "commit": "1ed5163433c991c00ea83fdd4447e8daf4aeccbe", + "sha256": "1r8arjpzl12fzd5j27xdgvqk33srs0cl0nrp9lm54zhqzxc7gbw2" }, "stable": { "version": [ 1, - 5, + 6, 0 ], "deps": [ @@ -11737,8 +11893,8 @@ "sesman", "spinner" ], - "commit": "700ded1d6c245e01fca7f364db1561ad1e1bb595", - "sha256": "1ih902n8p3pl1apprprkyrlnrp2dxli86y5k09zahy9mglfz2z5n" + "commit": "80408364f8e6870d8f5a33e0e096b86f1a7ef144", + "sha256": "1a3xbfn1id8dcy3178kmdnzcvh7lq2pdwwg4axhncw6jq9hqiqja" } }, { @@ -11845,9 +12001,9 @@ "unstable": { "version": [ 20160622, - 1430 + 1431 ], - "commit": "8023b45ec60961bf4c3a3d8a564727c463ed09d1", + "commit": "a78a88ca9a66a82f069329a96e34b67478ae2d9b", "sha256": "06p6hz6jrnvnlbxdr1pjgf5wh4n34kf6al4589qg1s88r2lf86bl" }, "stable": { @@ -11917,20 +12073,20 @@ "repo": "guidoschmidt/circadian.el", "unstable": { "version": [ - 20181024, - 1256 + 20221223, + 1734 ], - "commit": "e0547c1779f2653dac09192951a0756ce2e2ea89", - "sha256": "120b6wr2b4dmgaz5y3vpc5f68nqm1lfkgwpcxwxncspds7qb987j" + "commit": "9959e4b9d2ed9920b668fc229aab1f5fa5bd8584", + "sha256": "1hydxhmcchaprfmp08xr6nlksz6y97jbf4mswj69bgdfjfbf22km" }, "stable": { "version": [ 0, 3, - 2 + 3 ], - "commit": "9894361dcd6ffb6d4629b4cbbabda2153699eb8e", - "sha256": "0wpsykmai3idz0bgfl07hwl9nr4x9sgprvqgw8jln4dz2wf5gdic" + "commit": "9959e4b9d2ed9920b668fc229aab1f5fa5bd8584", + "sha256": "1hydxhmcchaprfmp08xr6nlksz6y97jbf4mswj69bgdfjfbf22km" } }, { @@ -11941,14 +12097,14 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20221022, - 2222 + 20221126, + 1508 ], "deps": [ "cl-lib" ], - "commit": "d0bd8113c23affe4f7bd9e19c498cee99e436f0a", - "sha256": "11hy7izabnngmbly279lhylznrjw1fmpkxrxbrr6lx53ybck0knr" + "commit": "57fe189d7c0b98b9b1b5a59767cea1c7e2c22b13", + "sha256": "1hnfbzf4inx541mw1gnb5hxv6igdcwnlhpm8qs6z630appf3yxnc" }, "stable": { "version": [ @@ -12019,29 +12175,61 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20221030, - 1200 + 20230218, + 2016 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "c37a4827d019eac76a297ebd2d6af04ffce42afb", - "sha256": "1zlw1na4i4gq9b1zdh4pzyvwrn2dzrjzx1a0541211i5c1h79xd9" + "commit": "5dac3d5bf287566f049b44465e415afb42f30ec3", + "sha256": "03ypp4kb6h0x2i3g22mq2vynybmd39qzfg0s31k9bx3dbxxf2j1b" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "9d7088c1fe82e9cfa508ead7ef7738c732556644", - "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" + "commit": "a5c769011288d0b1656784931de6ba06e64b2dd1", + "sha256": "1d7qp580b9svgykpmcdyij8lja23b20sprc7653dbl4zj7ncxxry" + } + }, + { + "ename": "citar-denote", + "commit": "ebd380e47429788e990f8554adb3b8e146cc5685", + "sha256": "04vy8y8mhwnddjjv0wfcccflfgg83pb189qksm0jcgxh5wbkzv5n", + "fetcher": "github", + "repo": "pprevos/citar-denote", + "unstable": { + "version": [ + 20230211, + 528 + ], + "deps": [ + "citar", + "denote" + ], + "commit": "3f8082fa68effced61a364a1ced333ed4fe33060", + "sha256": "00zmhrj9hy84gq5vbjn25xmlax7ksfp7gghqv62rgl493vcvs5va" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "deps": [ + "citar", + "denote" + ], + "commit": "15b4ba4feae7659615a7478987831a681ae8b287", + "sha256": "1v8v01d6ywq20h4z7wniqqszgbz3n8wz4x7ca26cf52c1w11469z" } }, { @@ -12052,27 +12240,27 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20220724, - 2250 + 20230216, + 1954 ], "deps": [ "citar", "embark" ], - "commit": "8475c1fd2b8d2171b7c9dd4318aa67d09c62b820", - "sha256": "1sh0hxx2a983czpnpihpr9zhi0321g7riv98lk2knz06xhqai0cy" + "commit": "a5c769011288d0b1656784931de6ba06e64b2dd1", + "sha256": "1d7qp580b9svgykpmcdyij8lja23b20sprc7653dbl4zj7ncxxry" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "citar", "embark" ], - "commit": "9d7088c1fe82e9cfa508ead7ef7738c732556644", - "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" + "commit": "a5c769011288d0b1656784931de6ba06e64b2dd1", + "sha256": "1d7qp580b9svgykpmcdyij8lja23b20sprc7653dbl4zj7ncxxry" } }, { @@ -12083,15 +12271,15 @@ "repo": "emacs-citar/citar-org-roam", "unstable": { "version": [ - 20220927, - 1834 + 20230211, + 117 ], "deps": [ "citar", "org-roam" ], - "commit": "27105d0a9578279560cd79cfad5871e7e603bc58", - "sha256": "192p4bfa49mj5iq70lazi828gzwd1z7dfmckg4xfmdsd58crygh3" + "commit": "0690a34c84f3f483c723a69cc54e6a141e199c99", + "sha256": "0k7ck0smvj57d1lvj5hx0x7m6x7hagkiqllipylaiixq3asd02bm" }, "stable": { "version": [ @@ -12114,8 +12302,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20221105, - 1054 + 20230125, + 1818 ], "deps": [ "dash", @@ -12126,14 +12314,14 @@ "s", "string-inflection" ], - "commit": "69536c8776dea383951538fd197333bee766d7c7", - "sha256": "1x95hr3w8ck3dhhnpj4yfrqfrh3mmfld8lqaqpijwmgjgf2gfivh" + "commit": "2623043b2546ee09a4bd86641870ca86332c0bcf", + "sha256": "1f2bcshnccfbvbnkhnynkdpszrs4zb3z82hqrrdp9hf3ig3h5750" }, "stable": { "version": [ 0, 9, - 1 + 3 ], "deps": [ "dash", @@ -12144,8 +12332,8 @@ "s", "string-inflection" ], - "commit": "406bd9964f1ce531fc45beddcf9ccc44d3456129", - "sha256": "0rkwqn9pcimfcyq19wlrcij0kcjyhbwisla7vwbhjj8ang0bq9rm" + "commit": "121efe540303ded2ebf486281e6fd472966e7cbe", + "sha256": "0md8pfmd0v9ipnxj1q13vv81hl90wf4rm46czbk1fdzkyf9js08m" } }, { @@ -12194,11 +12382,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20221111, - 1230 + 20230217, + 1202 ], - "commit": "244501472ddf31c91cc374231849a05c86dfb1fb", - "sha256": "1051lqy1wbcmzdwmyqx0320mqrq64wrafk70dymyki2q9y291782" + "commit": "4626ada80fabea6b62935567acc1cb8dad607016", + "sha256": "1bs66lk094g1bgk09zamv184j1nl64z8hvwjvf4w28kbjpvnxvsn" }, "stable": { "version": [ @@ -12350,6 +12538,21 @@ } }, { + "ename": "clean-kill-ring", + "commit": "a0df99a537f71b4b08bccdbc8272cc1cd7448c9e", + "sha256": "0kpjnaq6s4labn4avzih1xcsfrhr2ng6fvw0vk1d5fd8mjcfq3jg", + "fetcher": "github", + "repo": "NicholasBHubbard/clean-kill-ring.el", + "unstable": { + "version": [ + 20230115, + 2153 + ], + "commit": "d05fa7ee97e760d21d533261c7b63eecf223f612", + "sha256": "0s0r65byg66fq4q9jqral4m2d616sfxla5k75zrmyxx3h5152n4r" + } + }, + { "ename": "clear-text", "commit": "d2ae86a3001587ba753fcd0ca5137cb65d38910d", "sha256": "1cx2lbcbhd024pq9njan7xrlvj3k4c3wdsvgbz5qyna0k06ix8dv", @@ -12512,14 +12715,14 @@ "repo": "Fuco1/clippy.el", "unstable": { "version": [ - 20161028, - 1954 + 20230118, + 1924 ], "deps": [ "pos-tip" ], - "commit": "ad4b5dba4cede6d4b21533186303d3d3e9a2510f", - "sha256": "0rnqwzbr5hdap276ana0iz3lk2ih8kkj1m9cydavqqdrwzk4ldrm" + "commit": "85aec3129ff17f71ea4541cfadbb7b56b31a7474", + "sha256": "0zx45rlsj184v4gshnzpqzdmyl9g541z70jhhw0rj8im62pnnrbi" } }, { @@ -12590,8 +12793,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20221023, - 1644 + 20230202, + 637 ], "deps": [ "cider", @@ -12604,8 +12807,8 @@ "seq", "yasnippet" ], - "commit": "8300d5cab861668f313fbbbb3e2926e3e5130e86", - "sha256": "15ya7hp5d2kwh1ig55d75vlghm1vsq99jh44i8q8v25vfmzjp7gp" + "commit": "b5abe655e572a6ecfed02bb8164b64716ef76b8e", + "sha256": "1kkkfb8ixyh3yca1rgdi636xizq7c07k174d243ys3826730wz9w" }, "stable": { "version": [ @@ -12737,11 +12940,11 @@ "repo": "erickgnavar/cloak-mode", "unstable": { "version": [ - 20221031, - 431 + 20230130, + 613 ], - "commit": "e182ec462f486bb84d66780c9d27051e6921f9c7", - "sha256": "19xwhiiyjmlcwamzg562x2gd5hj7csnmdzc969d137ira03v40qa" + "commit": "ca0896dfd0a0ee549150233ebd96aa0f65b56afb", + "sha256": "1ih51q5sc2gri2lyy2qi3w6jijr5khcr4whnv8g34v8xq6pyrxys" } }, { @@ -12855,14 +13058,14 @@ "repo": "p3r7/clojure-essential-ref", "unstable": { "version": [ - 20200619, - 1653 + 20221215, + 1427 ], "deps": [ "cider" ], - "commit": "554594dc7ebb976e45632b8738b103ad048bf879", - "sha256": "1qjbf3w2j074b2kvrn2jkhlgzrcjd2g84xii83gz7v5darlni92y" + "commit": "6741bf65cf9b9bc896ab1cc3c384573e8ffe5f96", + "sha256": "0dib6krb49gi253vs3zqh83r9s3wdmlvbqwcq7gq28dbjsbpljcn" }, "stable": { "version": [ @@ -12885,16 +13088,16 @@ "repo": "p3r7/clojure-essential-ref", "unstable": { "version": [ - 20200719, - 608 + 20221215, + 1427 ], "deps": [ "clojure-essential-ref", "dash", "nov" ], - "commit": "e05d61b96f6469a93f52015b7ad5deadf616139e", - "sha256": "118zkdx118p1mzgq1szschl40qmb2cb5vw9jb9fhpimqdrlq53md" + "commit": "6741bf65cf9b9bc896ab1cc3c384573e8ffe5f96", + "sha256": "0dib6krb49gi253vs3zqh83r9s3wdmlvbqwcq7gq28dbjsbpljcn" }, "stable": { "version": [ @@ -12919,20 +13122,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220928, - 557 + 20221214, + 915 ], - "commit": "414157c3e523e80cc44dca8f86f1853122ee5f6b", - "sha256": "1ldzbc7zrkqnkf3gm69q94ys4my984zps1gymw5sdx6gn9qc96iv" + "commit": "3453cd229b412227aaffd1dc2870fa8fa213c5b1", + "sha256": "0s09b9gbmjmk56jm9hcbk06zfa96kqhgx58d98w13yy01yx0pych" }, "stable": { "version": [ 5, - 15, - 1 + 16, + 0 ], - "commit": "ad322e989e56c10c05bb286e5b55a82b1e031d62", - "sha256": "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd" + "commit": "3453cd229b412227aaffd1dc2870fa8fa213c5b1", + "sha256": "0s09b9gbmjmk56jm9hcbk06zfa96kqhgx58d98w13yy01yx0pych" } }, { @@ -12943,26 +13146,26 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220715, - 1509 + 20221214, + 915 ], "deps": [ "clojure-mode" ], - "commit": "fee38d780f7d0b2a42a441e4d8bcfaa4fa672983", - "sha256": "1ck9d8jzs6m5qvg5bnx9i7d94icsfl4698p66vxsn3yqclhc8yzz" + "commit": "3453cd229b412227aaffd1dc2870fa8fa213c5b1", + "sha256": "0s09b9gbmjmk56jm9hcbk06zfa96kqhgx58d98w13yy01yx0pych" }, "stable": { "version": [ 5, - 15, - 1 + 16, + 0 ], "deps": [ "clojure-mode" ], - "commit": "ad322e989e56c10c05bb286e5b55a82b1e031d62", - "sha256": "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd" + "commit": "3453cd229b412227aaffd1dc2870fa8fa213c5b1", + "sha256": "0s09b9gbmjmk56jm9hcbk06zfa96kqhgx58d98w13yy01yx0pych" } }, { @@ -12999,8 +13202,8 @@ }, { "ename": "clojure-snippets", - "commit": "4898fc6746b30b0d0453b3b56d02479bfb0f70b9", - "sha256": "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "13v1xhagyzqdmvi2j1rqdwn13sa5w4bx58b1l00p0g5clprn4fi6", "fetcher": "github", "repo": "mpenet/clojure-snippets", "unstable": { @@ -13029,8 +13232,8 @@ }, { "ename": "clomacs", - "commit": "345f9797e87e3f5f957c167a5e3d33d1e31b50a3", - "sha256": "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1gl3zxhi0nm4y5ykr1qjs6k9hyij8q565pckj5h9x3jn3wgya9f8", "fetcher": "github", "repo": "clojure-emacs/clomacs", "unstable": { @@ -13070,15 +13273,15 @@ "repo": "magit/closql", "unstable": { "version": [ - 20221017, - 952 + 20230220, + 1944 ], "deps": [ "compat", - "emacsql-sqlite" + "emacsql" ], - "commit": "463b0f4d4c3e66acd5d30c6572cc45eaecc25633", - "sha256": "0kzi6h41iyz2rhz64f671p7swjnqrg9swlmfm7hr03z3hsghpz3w" + "commit": "b670b88c6f2785ddfdff91439ceb332b1bf8a8ce", + "sha256": "0hffljz4353id5y7ps2saw9gsclyj1ishpvfa4vclpc9kg7mw58n" }, "stable": { "version": [ @@ -13251,20 +13454,22 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20220823, - 1201 + 20230215, + 1434 ], - "commit": "5936d4f2adeec64e0ff748b2c6c34f0436b19a97", - "sha256": "1rjk2rhdg1wcga5iagaafghj15gy5h45aw0llkpxpnpvvwrh7g59" + "commit": "037975ef69a0e889f9c17e5e6e6fb87111dfd9df", + "sha256": "18gwgqr71rn2klfw7b1bcbsisbrsk40pr3x832k84x9wyx6vb0ip" }, "stable": { "version": [ 3, - 25, - 0 + 26, + 0, + -1, + 3 ], - "commit": "13e46189c7f3b39a26e9ca689bc029b7061d26a7", - "sha256": "0h6fvq4xbb717p0n67afhiwih1zgjphl0wcl3y1wg8bg2cv8zvll" + "commit": "037975ef69a0e889f9c17e5e6e6fb87111dfd9df", + "sha256": "18gwgqr71rn2klfw7b1bcbsisbrsk40pr3x832k84x9wyx6vb0ip" } }, { @@ -13332,20 +13537,20 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20221019, - 159 + 20230216, + 803 ], - "commit": "102f808e500715e0cfb80905110d1f42aa7b6069", - "sha256": "1vim429ikgsh7zvh521af39xgmm6qb3fc3pwb51458fj010gf8pj" + "commit": "4b1bbf854009992858e86a19de49b8dc91e924eb", + "sha256": "1sab7az9rqzylvay5ai8k2rg656hqd0ga4qwsy2plnmn0fx9iv24" }, "stable": { "version": [ + 1, 0, - 9, - 1 + 0 ], - "commit": "cbe1ddd49e33b790a568c55351146aa5b909f173", - "sha256": "11d44lf0m0kbzq1mvyqkl4aprys0xqaarp08nij57xnynin1rynx" + "commit": "102f808e500715e0cfb80905110d1f42aa7b6069", + "sha256": "1vim429ikgsh7zvh521af39xgmm6qb3fc3pwb51458fj010gf8pj" } }, { @@ -13449,8 +13654,8 @@ "repo": "wandersoncferreira/code-review", "unstable": { "version": [ - 20221111, - 1212 + 20221206, + 113 ], "deps": [ "a", @@ -13464,8 +13669,8 @@ "transient", "uuidgen" ], - "commit": "182c1cc6ebced5c161aa37d01142dfab7eb8e7b3", - "sha256": "0yi6i1ayfax5c1qmxx9xx318wg2ajp98k6r2rb8fwr8183flc993" + "commit": "a8bb63b53f2a1fd31302c110e668ad7b5c871b34", + "sha256": "1ks1s3vq8rwc14863dk929r42x52p9dqcd3qyjbkc9km2nkc1z5n" }, "stable": { "version": [ @@ -13688,14 +13893,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20220629, - 1800 + 20230210, + 2047 ], "deps": [ "dash" ], - "commit": "caed36cc21b6a7f659dda8a3ace1a607daa30f6f", - "sha256": "1s8qi4mbgmyqmmgwa6qdc40dvls0jy51wgpz8mz4rh7msmwxf17v" + "commit": "9fd09481bbcdb35712d974d5bc3667f5a5900ddb", + "sha256": "0rj860ypsr9w9i1bq8wf8ssj54yxb3kp0q5wp0b67nh27qycywx5" }, "stable": { "version": [ @@ -14269,17 +14474,17 @@ }, { "ename": "company", - "commit": "7eadfd36ae9b7bd241c38d09a7203873538983fb", - "sha256": "1wxadzsf7vrnxj7zhnwrz0vva9zgr99s0lb677dllrj1zdryixwx", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0imik54s3y0xwr4l207rrwc4v77m0hmfvmvk0qx98mpn65g4l1v4", "fetcher": "github", "repo": "company-mode/company-mode", "unstable": { "version": [ - 20221007, - 2145 + 20230209, + 134 ], - "commit": "48fea7a905b3bcc6d97609316beced666da89b1f", - "sha256": "17w9irn5aaxadsm5smz5cm1dxy0xb1hh0dnhwqclq3y5llrb21lx" + "commit": "2ca3e29abf87392714bc2b26e50e1c0f4b9f4e2c", + "sha256": "1z73yn7jyjxm4lf3d3r65rb549w8npjdba6iaxqawf2a8hkwjgy2" }, "stable": { "version": [ @@ -14449,16 +14654,16 @@ "repo": "sebastiencs/company-box", "unstable": { "version": [ - 20220910, - 1354 + 20221230, + 1603 ], "deps": [ "company", "dash", "frame-local" ], - "commit": "79abd77f3357279c2726b74f8b20df27b71aa867", - "sha256": "0p60h0l62b1pdnc444j9nzya6c61dxwf8d6i76qh7h9bzzn6ikf4" + "commit": "766546b2668b5ef4eb4abbde632c9acd370c7788", + "sha256": "1ypk5lxgcmk4v0y2ch23267zg3acnafw7441a4zg26zvg68x7mx9" } }, { @@ -14519,8 +14724,8 @@ "repo": "cpitclaudel/company-coq", "unstable": { "version": [ - 20220314, - 526 + 20221130, + 536 ], "deps": [ "cl-lib", @@ -14529,8 +14734,8 @@ "dash", "yasnippet" ], - "commit": "a6e349e0131f676a885bd14c908fd26054b2df42", - "sha256": "1qws0a0ia039d6bv2sbjsdl1ry28y9jrv98qnp5jcm7jfb2jmvsp" + "commit": "5affe7a96a25df9101f9e44bac8a828d8292c2fa", + "sha256": "1i18w7byz0x9l7cka6cs7bk0d3wcy7r0gw34zz45np4r84arwsjd" }, "stable": { "version": [ @@ -14693,28 +14898,28 @@ "repo": "dunn/company-emoji", "unstable": { "version": [ - 20210427, - 2151 + 20221208, + 2344 ], "deps": [ "cl-lib", "company" ], - "commit": "90594eb58b20fb937cfd4e946efcc446ee630e6f", - "sha256": "08dx812vg92bkwp0ham40rv3x9648x7y5bmbvphcc71s9knfgxcz" + "commit": "9e2816ce9b5795bd0066f92d4f80d15ccf94ef36", + "sha256": "1prcjdqm4djp5nr93m2axddhhdmn1s0y157px9zsk7g5yi36dn6q" }, "stable": { "version": [ 2, - 6, - 1 + 7, + 0 ], "deps": [ "cl-lib", "company" ], - "commit": "4ba7dc60ba67f736e698a5fa0b754b866f36a646", - "sha256": "1rhf2hr345953mkn52i58aiq8j16ps2ckapd5f7jxmhkcpzxxfhk" + "commit": "9e2816ce9b5795bd0066f92d4f80d15ccf94ef36", + "sha256": "1prcjdqm4djp5nr93m2axddhhdmn1s0y157px9zsk7g5yi36dn6q" } }, { @@ -14725,16 +14930,16 @@ "repo": "jcs-elpa/company-emojify", "unstable": { "version": [ - 20221006, - 557 + 20221231, + 1708 ], "deps": [ "company", "emojify", "ht" ], - "commit": "6856bdb187bf6f8c31965058e4408827f6ae178f", - "sha256": "0751hs1gdmn5f2nv607lh7pn01xnpczkkvivqn1nl5n2l45s0i8i" + "commit": "89652ee1a5488fbbe7b73c03ac316b895bb3fc19", + "sha256": "1kfy1jqsh90393yj2wvp2ccr0mvr7idq39033058i90f7md7gsmi" }, "stable": { "version": [ @@ -14829,16 +15034,17 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20221025, - 1115 + 20221231, + 1708 ], "deps": [ "company", "ht", + "list-utils", "s" ], - "commit": "3c8c960b4e5341f6806cf43aa794c0798051222d", - "sha256": "04gfcsj9fr989xgm2gagb61iiq9jgx5l8xxixs4ps524a7igl21v" + "commit": "eff3b5429d7e8d0eb2d62fb352ae843fe1a99ac2", + "sha256": "05f2lfn5ivg3pp1avllfy8z5j6q7i9mb143p5299kqwlfk83fcq2" }, "stable": { "version": [ @@ -15119,15 +15325,15 @@ "repo": "yanghaoxie/company-manually", "unstable": { "version": [ - 20200709, - 913 + 20200721, + 1903 ], "deps": [ "company", "ivy" ], - "commit": "0b696c268fc7ba3ef70c1b2c9ebe5dad0f4ec4a0", - "sha256": "0lzz36ifwxb30h0s5ihy85fvjys2ghi8y6gg0w0sd3mwfz1zjyn5" + "commit": "b922318da821fc3cf1d3155f21d543ea8470c881", + "sha256": "1s2bv040gg22qzjca39r32cz3qhairnvppk9wdp1hl52i6by57v9" }, "stable": { "version": [ @@ -15151,27 +15357,28 @@ "repo": "vspinu/company-math", "unstable": { "version": [ - 20210731, - 2019 + 20221227, + 1329 ], "deps": [ "company", "math-symbol-lists" ], - "commit": "45778f5731c97a21a83e3b965cbde42018709afd", - "sha256": "0s3jnslsd2licgav26s0nawwhhs4yrmz9chl0ghkngplichnp9mk" + "commit": "3eb006874e309ff4076d947fcbd61bb6806aa508", + "sha256": "1pj10i7ml5d2spcmf8035ngcq5zc6rs3lqx09d0qj6bsghglr6j3" }, "stable": { "version": [ 1, - 4 + 5, + 1 ], "deps": [ "company", "math-symbol-lists" ], - "commit": "a796053590012e6a15c8b527b521ffc15d137bd0", - "sha256": "1y1fw926insgdl7ib9ynxjrxf3p6wfjkfxvf5vgdca7267cvcll1" + "commit": "3eb006874e309ff4076d947fcbd61bb6806aa508", + "sha256": "1pj10i7ml5d2spcmf8035ngcq5zc6rs3lqx09d0qj6bsghglr6j3" } }, { @@ -15182,15 +15389,15 @@ "repo": "sasanidas/maxima", "unstable": { "version": [ - 20210520, - 2034 + 20220531, + 1847 ], "deps": [ "company", "maxima", "seq" ], - "commit": "f92eafd716ae6e36665bbf027309477c2efa336d", + "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" }, "stable": { @@ -15205,7 +15412,7 @@ "seq" ], "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", - "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" + "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" } }, { @@ -15340,15 +15547,15 @@ "repo": "xenodium/company-org-block", "unstable": { "version": [ - 20220809, - 2027 + 20230115, + 1202 ], "deps": [ "company", "org" ], - "commit": "29a2edb35e18c2627dcfa0641852a55d9639263c", - "sha256": "14qvxypgc1cj6ijvkkybl7x5p00435v4rdaw7pvvlf58lc422492" + "commit": "aee601a2bfcc86d26e762eeb84e5e42573f8c5ca", + "sha256": "0zghjkny222wxkyr48njpwjkwk7gfrjm6n70drkwmjhhh88646fv" } }, { @@ -15501,28 +15708,28 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20221118, - 824 + 20230104, + 1229 ], "deps": [ "company", "posframe" ], - "commit": "ab58972c2cebc5ecf68c4cdd140c3aed2c68f42b", - "sha256": "0nqcqs3ngxmb946mg11b2im9sycwdykghzbv3sp4aans8q62ig6k" + "commit": "18d6641bba72cba3c00018cee737ea8b454f64a8", + "sha256": "03kj8yxd4y9aw86b6y6z5l9y76q5gjyiyhi5120nx1a8cwbd9g4a" }, "stable": { "version": [ 0, - 5, + 7, 0 ], "deps": [ "company", "posframe" ], - "commit": "86428bf9ce50a14326f38942b9f1467dd5b483df", - "sha256": "05ays6xkqbxcfplvx7wfc2slflmwc3aw7vkixvabk0ilvisndvgm" + "commit": "18d6641bba72cba3c00018cee737ea8b454f64a8", + "sha256": "03kj8yxd4y9aw86b6y6z5l9y76q5gjyiyhi5120nx1a8cwbd9g4a" } }, { @@ -15533,27 +15740,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221112, - 344 + 20221216, + 112 ], "deps": [ "company", "prescient" ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" }, "stable": { "version": [ 6, - 0 + 1 ], "deps": [ "company", "prescient" ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" } }, { @@ -15583,15 +15790,15 @@ "repo": "company-mode/company-quickhelp", "unstable": { "version": [ - 20220825, - 1037 + 20221212, + 534 ], "deps": [ "company", "pos-tip" ], - "commit": "6660a1b380b9599af9ef1cc617168db83f24b9b7", - "sha256": "175zw6jnkr6cf3nl9gvyjj69pzv4w1p19gjid9dkhqy38wyslkr9" + "commit": "9505fb09d064581da142d75c139d48b5cf695bd5", + "sha256": "14sm431636k72pc9iz2kmxxrk0q0ijbwy4gnl0qxqh41p9pqm148" }, "stable": { "version": [ @@ -15609,10 +15816,10 @@ }, { "ename": "company-quickhelp-terminal", - "commit": "f5fa4121cd4e2a49adfd23929c73f385cf7d1264", - "sha256": "13pig4bkfhwvpak78v85dzmrv7hwqd3pz4s5y8cb7xa033i1v78s", + "commit": "ad9811a64dbb3196b5357be8ac31ca0fd165e5e8", + "sha256": "0hxdf6vwswq2ac3w43v801wp21rqd57bgqcj3jrqgkj330a5yxaj", "fetcher": "github", - "repo": "jcs-elpa/company-quickhelp-terminal", + "repo": "jcs-legacy/company-quickhelp-terminal", "unstable": { "version": [ 20220704, @@ -15753,29 +15960,30 @@ "repo": "Alexander-Miller/company-shell", "unstable": { "version": [ - 20221103, - 2107 + 20230106, + 1532 ], "deps": [ "cl-lib", "company", "dash" ], - "commit": "e55b9000192f82e96fdc0f7ca1e8a868e67762a8", - "sha256": "113h10n3yb3gb4qpmg1ji7fmzy912qcysq4c2v80gx4qqbn1qq5h" + "commit": "5f959a63a6e66eb0cbdac3168cad523a62cc2ccd", + "sha256": "0lrkvfg0z9gwfcj90yihanysg8icxpbqq3wqyb734bi5fpmgmzr4" }, "stable": { "version": [ 1, - 3 + 3, + 1 ], "deps": [ "cl-lib", "company", "dash" ], - "commit": "024c2172a0cc8f1b35f173e42fff5f2d938920fc", - "sha256": "06nfq2va9vwf5wiqdfrjziv3hjkj36w8p91bicfb92ggv1afg9ra" + "commit": "5f959a63a6e66eb0cbdac3168cad523a62cc2ccd", + "sha256": "0lrkvfg0z9gwfcj90yihanysg8icxpbqq3wqyb734bi5fpmgmzr4" } }, { @@ -15786,16 +15994,16 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20181117, - 1518 + 20200113, + 1721 ], "deps": [ "cl-lib", "company", "solidity-mode" ], - "commit": "d6c48a1cb64d3c8a825dc0d06c839f2cacd4d289", - "sha256": "14v71xf3z60s1fhpsz8b3l1v4na2ds0ddcp41y412fnrg4scbrhr" + "commit": "93412f211fad7dfc3b02aa226856fc52b6a15c22", + "sha256": "06zqs7p22h1jkm3zs1i16wvch6rnzzb3m8d5r9r51clzpasf6zy8" }, "stable": { "version": [ @@ -15935,18 +16143,17 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20210310, - 2247 + 20230216, + 817 ], "deps": [ "cl-lib", "company", "dash", - "s", - "unicode-escape" + "s" ], - "commit": "98e9e8b38b6ca289fbe265b0a7b62c7fe38ed0e2", - "sha256": "162ca70xwmdd8lsdawzpykd6kaqfljflaxy2nwjn8f89f80ih3fg" + "commit": "96d0c2c05450359ce90ee99a474991391988d2e6", + "sha256": "185c5s3ww3jdmahszmq7vfsyij9vf6jjjkq2a0y7jq45d9r61wzp" } }, { @@ -16230,17 +16437,15 @@ "repo": "emacs-php/composer.el", "unstable": { "version": [ - 20221111, - 1808 + 20221120, + 202 ], "deps": [ - "f", "php-runtime", - "s", "seq" ], - "commit": "6a6e3eb46b4ae380f9f56362d6525d6725fc1b0a", - "sha256": "0qf73cgy7jmchk8hvabg7v07wq0scfdm06vsbf1m2ds5zq8lcbnb" + "commit": "2299cd731205906350d615021f99a66d7a8905c2", + "sha256": "1s1wmvav83djcg6jgf5cjvwjm045y5fbwf0sqwgkfk8m4ka4473a" }, "stable": { "version": [ @@ -16266,14 +16471,14 @@ "repo": "daviderestivo/comware-router-mode", "unstable": { "version": [ - 20220108, - 2111 + 20230107, + 1624 ], "deps": [ "dash" ], - "commit": "cd8c74653c0e221e3dd1ca540496c4b4c7ee4617", - "sha256": "0k8i6b0z1y90z68qf8w00rkbr5znnvwkblqfrd7vfm407dz1b844" + "commit": "cc0c1937e02f84ca8182b2de3ce5cc0982308ab8", + "sha256": "0aig2bjfygk3zckfx361r0miz7v3gg0s9aln7m15vprc4xsryj39" } }, { @@ -16284,14 +16489,14 @@ "repo": "kiwanami/emacs-deferred", "unstable": { "version": [ - 20161229, - 330 + 20170601, + 435 ], "deps": [ "deferred" ], - "commit": "9668749635472a63e7a9282e2124325405199b79", - "sha256": "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq" + "commit": "d012a1ab50edcc2c44e3e49006f054dbff47cb6c", + "sha256": "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h" }, "stable": { "version": [ @@ -16314,8 +16519,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20221107, - 1742 + 20230221, + 1603 ], "deps": [ "dash", @@ -16323,8 +16528,8 @@ "pythonic", "s" ], - "commit": "2af92fead0e24b9cae7d0c5b446177694fc8a77e", - "sha256": "1khb36k2pqd9ych73lxwbg6r7r1h7krcybb6gx0m8h6lj1wzmkrz" + "commit": "28f51e49fd25abff14c1b46dea196a90a77ced64", + "sha256": "1wvlpsz68m4nq499nhyspg5xls2ib5sxcha3mf7vn13kyl994si6" }, "stable": { "version": [ @@ -16478,25 +16683,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20221117, - 807 + 20230218, + 1212 ], "deps": [ "compat" ], - "commit": "35b57c1996b0887d4940960f1cd7deb7a5f4a2d9", - "sha256": "13i6r3910w9i6zaawhxwmkrnck43qxl8j6acrqn6qjd9cyh2j8n5" + "commit": "ffaaf6da909dc9ff766e5a5f16eb265635aa6149", + "sha256": "16id9w0fiavr08g9lq5am0ary7ba7p900ilf4gnkizabgji0padi" }, "stable": { "version": [ 0, - 20 + 32 ], "deps": [ "compat" ], - "commit": "d5b328637255ad6e7da4190ca15f3da040bbb606", - "sha256": "1rm53sqfl8hnb1l1fr0s8kxgp03prc2ggywqs5ssiqx87vhyn70w" + "commit": "0759dd12bb2290480644a7ec34118f67718074ad", + "sha256": "00cgc3bzj37319ds027rpj60wfk0c10cgp5xish2g1cq5ny74q32" } }, { @@ -16530,6 +16735,38 @@ } }, { + "ename": "consult-codesearch", + "commit": "cfabc90cc2462f03126c367b482ff43658790e4d", + "sha256": "1zjfjwb2f97s4985hy2qx4i66nkk1zgnzhk4p6i9237scysdyfs0", + "fetcher": "github", + "repo": "youngker/consult-codesearch.el", + "unstable": { + "version": [ + 20230129, + 415 + ], + "deps": [ + "codesearch", + "consult" + ], + "commit": "7b666ab50d120b25272183d921d581e01e77789a", + "sha256": "08qrq565xpbwx4gc1ny2i6fw4i0pjzmfhr3fvaidcq9vsw8vwsc1" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "codesearch", + "consult" + ], + "commit": "7b666ab50d120b25272183d921d581e01e77789a", + "sha256": "08qrq565xpbwx4gc1ny2i6fw4i0pjzmfhr3fvaidcq9vsw8vwsc1" + } + }, + { "ename": "consult-company", "commit": "4d458d8e66f2ad14af59ad238505dbc0729058c8", "sha256": "1i7zah2lrmd95y8aqg3lv45z45br4bcgfghnwy02ak489xw1ylnv", @@ -16606,16 +16843,16 @@ "repo": "mohkale/consult-eglot", "unstable": { "version": [ - 20220409, - 1238 + 20230213, + 1359 ], "deps": [ "consult", "eglot", "project" ], - "commit": "0da8801dd8435160ce1f62ad8066bd52e38f5cbd", - "sha256": "1qxk1npxbf8m3g9spikgdxcf6mzjx6cwy3f5vn6zz5ksh14xw3sd" + "commit": "6504ccd2b7555452c61cc24a45965f7e2a37c44d", + "sha256": "1ynx1hvlkp1npi5pbbh38dpj77i95nxhlll35hhqw1jbf9w4kygq" }, "stable": { "version": [ @@ -16640,15 +16877,15 @@ "repo": "minad/consult-flycheck", "unstable": { "version": [ - 20221109, - 842 + 20230212, + 26 ], "deps": [ "consult", "flycheck" ], - "commit": "7a10be316d728d3384fa25574a30857c53fb3655", - "sha256": "1xg46wynfabk4pd7z7lk7d8x8rwlqk8dxjg4aki5dv6il1swg4cs" + "commit": "c371996c571b7139ef4d9a8db142bf37a7ee826b", + "sha256": "0i8ihvj64vdgf4lrna09nys65srpg87fg3y45qpg89g6962m0wr8" }, "stable": { "version": [ @@ -16714,6 +16951,56 @@ } }, { + "ename": "consult-git-log-grep", + "commit": "331c40402b02dd11d84f76b041728c6a7556aa8a", + "sha256": "1q8sy39a5jh3abbzxp1h9q59zhbfyffff3mcw9wi491gkacx4p8m", + "fetcher": "github", + "repo": "ghosty141/consult-git-log-grep", + "unstable": { + "version": [ + 20230204, + 1753 + ], + "deps": [ + "consult" + ], + "commit": "30dfcad5745a6b9882d94fec75d38c345a1eff89", + "sha256": "144sz49k1jqbfmyg76pmmi9j5c77pfzn6mxamkl5vkvxqcs8z3ai" + } + }, + { + "ename": "consult-hatena-bookmark", + "commit": "7a14748b58bba3d89324fd3e3ed7e50963fffa52", + "sha256": "1km2wqy8jard8017a5qahrr5ghxgl0xshbycggfxdd2z6n6pxbyg", + "fetcher": "github", + "repo": "Nyoho/consult-hatena-bookmark", + "unstable": { + "version": [ + 20221125, + 109 + ], + "deps": [ + "async-await", + "consult" + ], + "commit": "b85484b11705ebd896878d3ac7fdb12bc8c9637a", + "sha256": "1xvi28wvagcabk1q6ckw4f97knm59rl86jd3pndz2ljv842rzbix" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "deps": [ + "async-await", + "consult" + ], + "commit": "b85484b11705ebd896878d3ac7fdb12bc8c9637a", + "sha256": "1xvi28wvagcabk1q6ckw4f97knm59rl86jd3pndz2ljv842rzbix" + } + }, + { "ename": "consult-ls-git", "commit": "af90413953b4b6a4d6c1b9919835703035b565d7", "sha256": "0vrvcjyjq3f4zs2jdyfk82xhr4n8yw5mxhrsmmd0ljhcqp6zxbmf", @@ -16721,14 +17008,14 @@ "repo": "rcj/consult-ls-git", "unstable": { "version": [ - 20220501, - 1823 + 20230120, + 1500 ], "deps": [ "consult" ], - "commit": "f2398b354994e583ad22af324a129cf94d06009e", - "sha256": "1brvhnlw72vhxjf6d984pjf5sq6l7d6vpnhzq2swp3zz4a5sfqvx" + "commit": "7ba583abc16f70c497d038bfcbddbadd6894bd3d", + "sha256": "15v025rjd15rr0zm1m3vjw9q1hfvfaq1yxknpba782if7fa7j2gg" } }, { @@ -16739,16 +17026,16 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20221102, - 844 + 20230209, + 714 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "f6fff70edb3a27726f9c61d3d81849df85f7ccbe", - "sha256": "0jfwnzjpbk9bhrr7yifv650cq2i4z3j4dzw5kc34j192d05b90q7" + "commit": "f8db3252c0daa41225ba4ed1c0d178b281cd3e90", + "sha256": "0hbavrwxa8mhgijh0wn517fns07ng84q6vya9bvblcx8pq9qw6z0" }, "stable": { "version": [ @@ -16772,16 +17059,16 @@ "repo": "mclear-tools/consult-notes", "unstable": { "version": [ - 20221108, - 1835 + 20230112, + 312 ], "deps": [ "consult", "dash", "s" ], - "commit": "92f54a5fe345d390a11acf9008661fe73ae28539", - "sha256": "0rc5cj6x4basnlvrndnwph0bk6drk07mh8chhrrh4pqlw9nv089f" + "commit": "4d92996f676cecfebea6519dadf8cf185621a18a", + "sha256": "0jkvv975ydcrr9k390zllrnbwzb6g0mnkjzvcajzwkhpayi8i0ka" } }, { @@ -16792,27 +17079,28 @@ "repo": "jao/consult-notmuch", "unstable": { "version": [ - 20220929, - 2111 + 20221216, + 1701 ], "deps": [ "consult", "notmuch" ], - "commit": "29e9a3d0d4ed2e8bcefbf009103f7e5665b6c260", - "sha256": "18r47cj89qli534irah3lwwzsnik5bcf61clnrkhafqv9y51m67z" + "commit": "d0d4129d45ccceddaeeaa3631eb42d5dd09a758b", + "sha256": "0gcd69i99prnskh1na7clydqgh1y9rbzkdc6dy9zmin9hfdrw1yd" }, "stable": { "version": [ 0, - 8 + 8, + 1 ], "deps": [ "consult", "notmuch" ], - "commit": "29e9a3d0d4ed2e8bcefbf009103f7e5665b6c260", - "sha256": "18r47cj89qli534irah3lwwzsnik5bcf61clnrkhafqv9y51m67z" + "commit": "d0d4129d45ccceddaeeaa3631eb42d5dd09a758b", + "sha256": "0gcd69i99prnskh1na7clydqgh1y9rbzkdc6dy9zmin9hfdrw1yd" } }, { @@ -16823,15 +17111,15 @@ "repo": "jgru/consult-org-roam", "unstable": { "version": [ - 20221119, - 811 + 20230209, + 833 ], "deps": [ "consult", "org-roam" ], - "commit": "4f5e77d36fb8256818df9042ee699954566d81d5", - "sha256": "06xd014f03z8mzg2a7gln2bhv260rgq4zpcwxmkwn6kg5kcn5x0l" + "commit": "8f9f122627a6b4e1613401b06d707e3efdb3c2d0", + "sha256": "1wni3lsjlkhs76wx27np74qhs3k8hwq98yn6vfnkb9h4dg7d8ll0" } }, { @@ -17047,14 +17335,14 @@ "repo": "liuyinz/emacs-conventional-changelog", "unstable": { "version": [ - 20211212, - 1158 + 20230101, + 1656 ], "deps": [ "transient" ], - "commit": "40c2ee58364422b776e81dc153918205bfbeda86", - "sha256": "1zxs0sgrdhzlfixahss4m3a7jx2qdkaccqkg9jbyf4vsdm17im48" + "commit": "56f0e134f0edc1964965575dea259b186d34155a", + "sha256": "0jhn41p0fxg14c6jhi4kcfv3ws1pv1kkjx1glq26w854gzmf7z1q" }, "stable": { "version": [ @@ -17238,14 +17526,14 @@ "repo": "galeo/corfu-doc", "unstable": { "version": [ - 20220621, - 1554 + 20221128, + 1533 ], "deps": [ "corfu" ], - "commit": "da931367802d01e87e1e496ba5b51aa9126a705d", - "sha256": "08ql4fi06w1v4f2xx24ajym513pi8pzxhd7y5zwrnk0kq2p8dr4p" + "commit": "0e6125cd042506a048feb7b6446a5653eccfcff5", + "sha256": "1cpx9flv6m10h1rganjmbccc289c4hzss9kd9mw6krsxiik65xl7" } }, { @@ -17256,15 +17544,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221118, - 1427 + 20221216, + 112 ], "deps": [ "corfu", "prescient" ], - "commit": "680fefa4601586dd87d549d33f5ae6fda3212c35", - "sha256": "16k34jp07snzknyp2lg0g6vsb7pk96s0fplb9hdjq8w3n4kyirb1" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" + }, + "stable": { + "version": [ + 6, + 1 + ], + "deps": [ + "corfu", + "prescient" + ], + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" } }, { @@ -17276,10 +17576,10 @@ "unstable": { "version": [ 20160502, - 701 + 948 ], - "commit": "8813288de240956641b37deafaaa4811548246df", - "sha256": "06l2imhxm6dijkqlhk9s0vsa5a0ghybpy7qk7wpkgv0dlm3k3w7n" + "commit": "e7ab6aa118e46b93d4933d1364bc273f57cd6911", + "sha256": "00055gzv032xxzqm1hffipljy8fzgsm58cbv8dzajh035jvdgpv7" }, "stable": { "version": [ @@ -17396,14 +17696,14 @@ "repo": "ideasman42/emacs-counsel-at-point", "unstable": { "version": [ - 20220731, - 2354 + 20230116, + 951 ], "deps": [ "counsel" ], - "commit": "65a7244ad6342ac79c612fbc6e5ca54759ebaf03", - "sha256": "1vwn977gjjvk1jhcyzncv2ycr6dbyh64if0f2f87bwl1yf7hsf41" + "commit": "a84cc0e409325d051208c43dfcabcebaa0d98ba3", + "sha256": "1zycq0hvvi466rzfk240jzsi3gydgd8pgilsa49qnmrqf19fhb51" } }, { @@ -17514,16 +17814,16 @@ "repo": "dash-docs-el/counsel-dash", "unstable": { "version": [ - 20200103, - 1411 + 20221217, + 419 ], "deps": [ "cl-lib", "counsel", "dash-docs" ], - "commit": "370d5f6f14b5294d0eb717f7b2a6a8e93df1ed24", - "sha256": "1fn38vbz46ijarjvhgw7iy7dj9s2a2miy95fyy9f8b5sj8nrdfvz" + "commit": "04117bffc8badd85c9f4fdb17648fd56e83fe832", + "sha256": "1miajhrd4x15jvcw60rwndp427his1012009ims70ajc7xn1ggsx" }, "stable": { "version": [ @@ -17583,14 +17883,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20220825, - 259 + 20221213, + 209 ], "deps": [ "counsel" ], - "commit": "e38b12771183fd43fb94c9fa562b20b5efeefc1b", - "sha256": "0r4mq4kxbj2kfg3nwni0canp1nvzl7j9jvpi523bj0apfrab1p9v" + "commit": "a65c03d2a82bae2571993b77b980f2f27c138ecb", + "sha256": "05wwy9rphwm753xxiab25dl3v9f4h59g9zydzpnrh7wpi3yldi68" }, "stable": { "version": [ @@ -17866,8 +18166,8 @@ }, { "ename": "counsel-test", - "commit": "5b21ac3eaacfff27ca4def04f6cf7b4888b7fcf4", - "sha256": "0604kmj0ydfps2si0wvgjw41x2ds7dmsd53x50219f65d4w44nqr", + "commit": "5d8c2c6662dc3cd0140bc039a1dca9c3e38673f4", + "sha256": "04zn7jds36dwhwqaxfqzc54i63ircvihj83ap3g3n1kzs7nr70bb", "fetcher": "github", "repo": "xmagpie/counsel-test", "unstable": { @@ -17891,26 +18191,26 @@ "repo": "masasam/emacs-counsel-tramp", "unstable": { "version": [ - 20210518, - 1153 + 20221228, + 1403 ], "deps": [ "counsel" ], - "commit": "76719eebb791920272c69e75e234f05a815bb5c2", - "sha256": "0pcymxi54b2jmr2k2cibak0nmcnr42spjwsavwr8598kgvkfk488" + "commit": "f63bf0bc765480676094102013218254ea17727f", + "sha256": "1ni6yhxzg945akjmqww6h31jqxydgjpf16i8g9jar3wa5wx6jnpl" }, "stable": { "version": [ 0, 7, - 5 + 6 ], "deps": [ "counsel" ], - "commit": "da451df4c5f0ba32056ec600e8eb6a2c7ca4df08", - "sha256": "18qlwyjqxap2qfbz14ma6yqp4p3v4q2y8idc355s4szjdd2as2lr" + "commit": "aa5acfc95cdfcfc2005bee31d8003fd4ae1d319c", + "sha256": "02dhchmyaqv6855mafjxizzgpl32rmnwdmw0nbm6rkckr13cgjl1" } }, { @@ -18447,14 +18747,14 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20210811, - 436 + 20221121, + 859 ], "deps": [ "seq" ], - "commit": "6bfd212a7f7ae32e455802fde1f9e3f4fba932a0", - "sha256": "01727k1fxiq1v2q6slp23gc98yqhflp6dcy3yr0yn9ibqx3pi93q" + "commit": "f8789f67a9d2e1eb31a0e4531aec9bb6d6ec1282", + "sha256": "0bsyrp0xmsi1vdpgpx6n3vfrmh75bpp8ncync8srzx6clbl71ch4" }, "stable": { "version": [ @@ -18558,20 +18858,20 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20220819, - 1351 + 20221126, + 2005 ], - "commit": "6e9d1f6b9900d3b8aa4106abf84a89311dfed85f", - "sha256": "1shyv3lkilbglqlg0mzaz9aslx3xg9gjp63phdvhsgafvwzpi254" + "commit": "d8b058c9e9d0429ea7e81d121ce19b064bd7e0f5", + "sha256": "1d0pf236xi4c7fazv67a53yrac24lilnkzp9pb55xm88gig7rfmz" }, "stable": { "version": [ - 1, - 1, - 1 + 2, + 0, + 0 ], - "commit": "9917e1b97d6a374c8043124817142ea3419a649b", - "sha256": "0wfd4jdjsq8qp6pavf25y87dxvlnsqapfi4c4m3xj24baalr2dpq" + "commit": "d8b058c9e9d0429ea7e81d121ce19b064bd7e0f5", + "sha256": "1d0pf236xi4c7fazv67a53yrac24lilnkzp9pb55xm88gig7rfmz" } }, { @@ -18582,8 +18882,8 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20221002, - 1512 + 20230217, + 853 ], "deps": [ "dash", @@ -18591,8 +18891,8 @@ "multi", "shut-up" ], - "commit": "ceb29955f36e01b02effc66a5b13a23224e41b67", - "sha256": "0q7vmnw1liv2jcmjynvwm54j2wsmvsv7fak1bxib13l8jhvwn88z" + "commit": "a4dceb1febd3e7587e89158caf207d5da5624f51", + "sha256": "06z44mv9sg6nsi39yh9363nvzifj06ssdiimc79r0s1sd2fc7mb0" }, "stable": { "version": [ @@ -18931,11 +19231,11 @@ "repo": "cubicle-model-checker/cubicle", "unstable": { "version": [ - 20171009, - 1957 + 20221031, + 2122 ], - "commit": "9d108b900e0123236b4991c2d06b5061f34feee8", - "sha256": "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr" + "commit": "7679c8452051ed5c89f891c72c6ada76757fc935", + "sha256": "1lkf849g6zqkshzj2845n1w58q1bxgqb85lh6w7ssi1m653mxhd1" }, "stable": { "version": [ @@ -19233,14 +19533,14 @@ "repo": "ideasman42/emacs-cycle-at-point", "unstable": { "version": [ - 20221017, - 149 + 20230116, + 951 ], "deps": [ "recomplete" ], - "commit": "ef2c2dbbf6c7682d9a80eebc2ae721d5d93b1698", - "sha256": "0j6gphh61snmg8vhbs8rynw08llh67s91hzy1bcyqccn8wcwbqrx" + "commit": "3c1471362d6cb947daf6373e8def8169c21222fc", + "sha256": "0hc6x4s4sr8pi5w3ywfzfhp0m6mf0bxdb8j894r76mmksysmrak2" } }, { @@ -19317,17 +19617,17 @@ }, { "ename": "cython-mode", - "commit": "be9bfabe3f79153cb859efc7c3051db244a63879", - "sha256": "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i", + "commit": "85c1dbaebf1f21d2ac66633b73112e96cd0b2128", + "sha256": "00yi8crjvx71j5zcdd23g73rnf13qna0nk5zbwzga3lfhqrmlfn2", "fetcher": "github", - "repo": "cython/cython", + "repo": "cython/emacs-cython-mode", "unstable": { "version": [ - 20211111, - 1407 + 20221130, + 1257 ], - "commit": "b75af38ce5c309cd84c1835220932e53e9a9adb6", - "sha256": "1ry8axsxd8n55vvq015s6285fhjq03rd927m3yg74850xaa8grq7" + "commit": "3e4790559d3168fe992cf2aa62f01423038cedb5", + "sha256": "03kilbl9mp1hs7mpqb6vs6sbmhplpm4qg93sn1vhn34q710iccb0" }, "stable": { "version": [ @@ -19362,11 +19662,11 @@ "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode", "unstable": { "version": [ - 20220601, - 1949 + 20220602, + 649 ], - "commit": "183af81eb534280d844405e8e7a6cc1deb3e6378", - "sha256": "19dwh92as70p7iv88li6h26mada115lcrmimxhrf6573082264dd" + "commit": "024aca97d07e72bf3500fb6bf0cdf50c4992a741", + "sha256": "0mwd412d2kha8avkyhvvkh8r7an859xk18f7phgx7kj989pr3xkr" }, "stable": { "version": [ @@ -19379,6 +19679,30 @@ } }, { + "ename": "d2-mode", + "commit": "79abbec271b1a148ab2c4a45e8a44eb776c60e35", + "sha256": "09gvyszpycar32j4pyq8nwkwmx0x225pvy8my12vym3jlw2rl19b", + "fetcher": "github", + "repo": "andorsk/d2-mode", + "unstable": { + "version": [ + 20230210, + 1130 + ], + "commit": "cbe7b16141bd80fe4344f0403e61fd7ee4e0fd89", + "sha256": "1mdiafxbfz31blp7c86m6sp0dmn4yhnbs2mhzh75mczsg0gzqc4v" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "ec3faea2deff52c2265e41a8a0674bffe2b7ab46", + "sha256": "0b551lji4mky1jgczg7mq8g12yy1d1r400p7m5nz4z8kwq7g0mhb" + } + }, + { "ename": "dactyl-mode", "commit": "72d503380511d2d6580b9522b6e0bd2d800bdebe", "sha256": "0ppcabddcpwshfd04x42nbrbkagbyi1bg4vslysnlxn4kaxjs7pm", @@ -19478,11 +19802,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20220316, - 1101 + 20221121, + 634 ], - "commit": "054c0b9bc9cefb53a4065096e66707d20885c461", - "sha256": "1bw9ng01d0y6ri67w42z8ql37kxxra59v4cnra94s00abc212lja" + "commit": "39ff00f8a40bcab96afd9450195124b57becd625", + "sha256": "0iqljbvl4rliaj2lkmwl7ls94kx5ig6gi9c8gddk8l61b7chrqyl" } }, { @@ -19534,8 +19858,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20221118, - 1707 + 20230220, + 1618 ], "deps": [ "bui", @@ -19548,8 +19872,8 @@ "posframe", "s" ], - "commit": "461f15f920c37ed06a53c1082287c5801a317b52", - "sha256": "1ny1agamc5iyh340gwrf59qyl9sp58nn62p6y8z6jsrxl08z4ipy" + "commit": "f5a8f240d85ec4cfe87314a5ac0c245b60a7dfe0", + "sha256": "08d815lfx89wd9dligy3q9j89jhjzkcy4fffmnq0xpjdfnvmjd5n" }, "stable": { "version": [ @@ -19854,14 +20178,14 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210210, - 1449 + 20210826, + 1149 ], "deps": [ "dash" ], - "commit": "0e975782086020aa12863fdb658d6a3cc748a10c", - "sha256": "190v264wj5cdm109ippzx2vc64hvfzmh5nbx4f2w09hn0hwfqipm" + "commit": "39d067b9fbb2db65fc7a6938bfb21489ad990cb4", + "sha256": "0z6f8y1m9amhg427iz1d4xcyr6n0kj5w7kmiz134p320ixsdnzd8" }, "stable": { "version": [ @@ -19884,11 +20208,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20221118, - 1318 + 20230220, + 1916 ], - "commit": "92106c5a39e703bf18efa67a9c7dc92260845788", - "sha256": "0vfkm1x8x0azifyafnj7pg6lalvhrhhsizwm9vjb500fkjjhkazr" + "commit": "221ee4b77db77199380c519c4ba52c06abc725e9", + "sha256": "19qkly4k0j326kd4979cn1z35jpjnnbbmycxdp4v2i5h7hp76954" }, "stable": { "version": [ @@ -19930,14 +20254,14 @@ "repo": "emacs-dashboard/dashboard-ls", "unstable": { "version": [ - 20220704, - 633 + 20221231, + 1629 ], "deps": [ "dashboard" ], - "commit": "5ff42002b501cfb9b76b975d37c7a899f013292c", - "sha256": "0v3vcdg45dq1nwspyr8r1xdh30pzb2lqy24x7jhn4v2j5apxywnk" + "commit": "b24e0bcb87e20ffcc71efb83a97f9516255fa8e4", + "sha256": "0rmdfm2smk4cji9dljnrxlmpvx2pv96lljdlwqblk5z3klm0wjkx" }, "stable": { "version": [ @@ -20016,15 +20340,15 @@ "unstable": { "version": [ 20141129, - 105 + 1539 ], "deps": [ "dash", "log4e", "yaxception" ], - "commit": "3b0af9c49293fc4346078ed2e13a6ebf41bbe54e", - "sha256": "1skvkbbqvwbw58ahdbf2m1z7s0kfi5v7c0lavc9ifrs91pqpqx9z" + "commit": "11c9170d1f7b343233f7716d4c0a62be024c1654", + "sha256": "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w" }, "stable": { "version": [ @@ -20058,8 +20382,8 @@ }, { "ename": "datetime", - "commit": "91ef4352603cc69930ab3d63f0a90eee63f5f328", - "sha256": "0c000fnqg936dhjw5qij4lydzllw1x1jgnyy960zh6r61pk062xj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1qqfs13ja60hnppwcfv5h58zd9idd3dl91ycycnx0igy7xlfizid", "fetcher": "github", "repo": "doublep/datetime", "unstable": { @@ -20103,8 +20427,8 @@ }, { "ename": "datomic-snippets", - "commit": "4da8ec133ec5e1204966c1b12c9bc0ca1b50d643", - "sha256": "0lax0pj4k9c9n0gmrvil240pc9p25535q3n5m8nb2ar4sli8dn8r", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0wwh3hgz2iilcs7460knwmspn3k8pwlfplbavhs4rx0shg7xvf20", "fetcher": "github", "repo": "magnars/datomic-snippets", "unstable": { @@ -20123,8 +20447,8 @@ }, { "ename": "dayone", - "commit": "a7c34ae046b75994cf04d16642bf28d4645d1821", - "sha256": "0hi09dj00h6g5r84jxglwkgbijhfxknx4mq5gcl5jzjis5affk8l", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1zkdn9j88ankb4cdaql9vip93illwn1mhpj2b9zlvmdpfqi048p0", "fetcher": "github", "repo": "mori-dev/emacs-dayone", "unstable": { @@ -20226,8 +20550,8 @@ }, { "ename": "ddskk", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "1bgjpr7dikl360famf7fnd610z8wgj00pg3s5z632wra0yg331yy", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0gw3k5hw2ndhjjvf86cpz8p2ww1pq3dg6xk2g4prnq5csv2dzhgh", "fetcher": "github", "repo": "skk-dev/ddskk", "unstable": { @@ -20282,16 +20606,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20221101, - 2055 + 20230201, + 2329 ], "deps": [ "dash", "s", "spinner" ], - "commit": "f687ca31f8d3bd8ebf05165b080b50ba724ce9bf", - "sha256": "0xvzchpwmiznfbrjqi5v3kxz625n117j4aa6ix8r6s9fhk8bm5j0" + "commit": "0d3e0725a7fe605978692076ab1d8f1870d8a269", + "sha256": "07n6f4axckxvl59ccmfsbzcn1qkaxw145274bs4izscc9x27ss07" }, "stable": { "version": [ @@ -20338,14 +20662,14 @@ "repo": "alezost/debpaste.el", "unstable": { "version": [ - 20160113, - 2347 + 20161214, + 2023 ], "deps": [ "xml-rpc" ], - "commit": "038f0ff7824f4e3dd455e2232eeca70fa8abcec5", - "sha256": "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb" + "commit": "6f2a400665062468ebd03a2ce1de2a73d9084958", + "sha256": "1wi70r56pd5z0x4dp4m58p9asq03j74kdm4fi9vai83vsl2z9amq" }, "stable": { "version": [ @@ -20384,10 +20708,10 @@ "unstable": { "version": [ 20220718, - 1352 + 1357 ], - "commit": "7bd79983805a91fff00cfb9bc96df8cc98e358d3", - "sha256": "1pqs47xackh8vf7rsrx4vck5li8c26jqfh636if5dzk187jraj9a" + "commit": "cc67cd24791accd17a2656512d863e24ca3fd578", + "sha256": "0i28pgqw3rv4ak1rrf8zv5cbqil7gmdaycyir85lmry4axhcbmsc" }, "stable": { "version": [ @@ -20489,11 +20813,11 @@ "repo": "ideasman42/emacs-default-font-presets", "unstable": { "version": [ - 20220731, - 2219 + 20230116, + 951 ], - "commit": "80380aa053c78b7126275e269e80d8988ba3f1e3", - "sha256": "07bvlb7n8gryjc205bfpx7k0liibx4cakv9aisc5nfifxqygmv1n" + "commit": "d52a31ba0860188ab27c58d1a3e2de62346700d5", + "sha256": "168rbyi3f5gp68qmlz4j57ly9f67wvfmjsw0r067k2vlgswqxcmq" } }, { @@ -20552,7 +20876,7 @@ "unstable": { "version": [ 20220713, - 744 + 750 ], "deps": [ "define-word", @@ -20563,8 +20887,8 @@ "s", "wiki-summary" ], - "commit": "82a3813097774289d68199fb47662af9f90f1741", - "sha256": "1gxvm99579lr91fc9sp145c1x0arh4i84libqz5xk7n8knlphbky" + "commit": "de026f399d5b7fa9286f7733b2e3416c6f234372", + "sha256": "1dhf64sb0ja5bs7zfbzkwk40ccqmb35kv3cdhshlmdf9d9fj9jv0" }, "stable": { "version": [ @@ -20586,6 +20910,21 @@ } }, { + "ename": "define-scratch", + "commit": "668ea73da74aad4cf024995850314d99fe2d0c5b", + "sha256": "1crphgs7rmkpaa2fl8mn2b62sv56pz6dx0xy5qbjs2gpy6rcmsbf", + "fetcher": "github", + "repo": "lassik/emacs-define-scratch", + "unstable": { + "version": [ + 20221220, + 946 + ], + "commit": "26cf11f801c2b5df0fbd56d2c4f7ac41b3ccd1c6", + "sha256": "1lanr3q1fbw1ivsssnykskviwnnpah2lpj9q32brgf1vqmm1z7g8" + } + }, + { "ename": "define-word", "commit": "e318b30d8b2b89981f4b89d78e5a46e77d3de412", "sha256": "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a", @@ -20756,20 +21095,20 @@ "repo": "rclarey/deno-emacs", "unstable": { "version": [ - 20200520, - 1838 + 20230117, + 1117 ], - "commit": "c375eae3e046d1487a45203511a6870e9dd5d2da", - "sha256": "10q7g9vdi0jwb2b28mdmb5lrhdk5h9ybl5si2xi1m6j7vhh1bi9l" + "commit": "6378966f448a3b9b5ae98af58cd13a031bd26702", + "sha256": "0qc8y4z7z9x5ig71jxjsh3pnar8kgm73anxg7p0d31g1ndf62jqj" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], - "commit": "ccae334361b9f83b687f040bcdfdc2a58c78059f", - "sha256": "1fm2ym36gv4p4i27hln706dnwr6rvrkkfgggbcz9rqfbphrsfqyx" + "commit": "6378966f448a3b9b5ae98af58cd13a031bd26702", + "sha256": "0qc8y4z7z9x5ig71jxjsh3pnar8kgm73anxg7p0d31g1ndf62jqj" } }, { @@ -20865,11 +21204,11 @@ "repo": "DamienCassou/desktop-environment", "unstable": { "version": [ - 20220425, - 1834 + 20230118, + 820 ], - "commit": "2863dc3d66aed9052c8af39cc8c8c264be300560", - "sha256": "1cn17igd9dwbqrds7k3p8lkfg4gq5vh6rqkmmjyagnaklj793van" + "commit": "3b1fe3816ffaef16d210939dc74bd19e0024ff64", + "sha256": "06zkgm638gy3cpp5b40cjvws09lkyqdsqxjpj2yscdrmw45r623h" }, "stable": { "version": [ @@ -20936,20 +21275,20 @@ "repo": "niklaseklund/detached.el", "unstable": { "version": [ - 20221118, - 1226 + 20221129, + 1430 ], - "commit": "8c7a2e1129b254946d86a7b7ae1c8378afab7b69", - "sha256": "0fcvx4x9yzzl3qac8gh565jzb52w9j2xdbiw60xyqdxihljpqv6m" + "commit": "6b64d4d8064cee781e071e825857b442ea96c3d9", + "sha256": "1mlkpzxp58imwjmn50aslybj6clljjm7pji0ql4dj52kwv2zcvvh" }, "stable": { "version": [ 0, - 9, - 2 + 10, + 1 ], - "commit": "6415d90f8260b6c5f1da00e0028acf4be5b4053e", - "sha256": "0bcrqqim6is75d4zadswxp162m9gd34xmb2wxsx9rhvkwq0ln35k" + "commit": "fedb0df5b0fbba13c662107855fb07a922793096", + "sha256": "0dvvyqc0nw9has54vps10f5iv831cb29vqvbvx0m2djv9pacqp17" } }, { @@ -20975,11 +21314,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20220811, - 703 + 20230220, + 2042 ], - "commit": "61ce83b79dc64e2f99d7f016a09b97e14b331459", - "sha256": "1dbffni30h8bx04j4hmia3a6xhzrgxx53yhhvymrrr7144x6i3ap" + "commit": "2988d4d201df16d72c3bea465d2b93b554dbddfc", + "sha256": "04ghf38mdb6829b81fb0j2l8z8i5d14m72x1h3sx1m1fihr7nlxv" } }, { @@ -20990,11 +21329,11 @@ "repo": "blahgeek/emacs-devdocs-browser", "unstable": { "version": [ - 20220917, - 1403 + 20230112, + 1554 ], - "commit": "badbb9cb57522cc0e002a32fe385f7ad1e929665", - "sha256": "0ny46r6cjq2ps2b67cmdbpxa4v762kajjnimq7ql9lhm58rqj6d5" + "commit": "c316c93306527fcb4069adde94402a48605d42d5", + "sha256": "0532pg1kz373n8g06bhlwwp7j9vkfyr26qcfk0bqf4cpa01vg3hf" } }, { @@ -21105,15 +21444,14 @@ "repo": "martenlienen/dictcc.el", "unstable": { "version": [ - 20220219, - 1302 + 20221231, + 1703 ], "deps": [ - "cl-lib", - "ivy" + "cl-lib" ], - "commit": "a938d4771e34a9e913262176a02498b8ac92373a", - "sha256": "0s3d7g2cxr07dzqzr1xci4hcxqgcmld2lm45r5a3w315msps2ck4" + "commit": "30b505759e5a97c2aaa8b0e8ea5e187fdf625c65", + "sha256": "0wwmmfyzdqaixsg75jlhwjy09cld0gvvdmnnl0951ivzsm0g0dy0" }, "stable": { "version": [ @@ -21192,11 +21530,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20220731, - 2329 + 20230201, + 134 ], - "commit": "c4f350da4302cd7d33343d83d5faaeae6795768f", - "sha256": "06k3ppgwng3b0234qpvpq7cvfcdc3fkwm813qpmddcwbg9b8m7fn" + "commit": "84446e315a163cecb7259858c9b01d2e6726775e", + "sha256": "0c1zkwqpv9qwfjhisci05ra3456wv08a3f8s2xdzmm6zk4va273h" } }, { @@ -21207,11 +21545,11 @@ "repo": "ideasman42/emacs-diff-at-point", "unstable": { "version": [ - 20220708, - 211 + 20230116, + 951 ], - "commit": "b32a741d5967b38749039ceafec85062a45e6bcd", - "sha256": "17mivblmnnm2yy1154fvy5lf36rxn0vmcl2c94pn5rnrbndxpdrd" + "commit": "72079cd8143b949228a51529f897076ead61ff43", + "sha256": "1jqdg6v0pkzs8qmjg9fwh3b4zblql5rlg01k756kchwi9nscj95q" } }, { @@ -21222,26 +21560,41 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20221007, - 2147 + 20230218, + 2323 ], "deps": [ "cl-lib" ], - "commit": "68fb280b300c5d8460cc7b9183e29fb3ec604136", - "sha256": "1948r26zwk0aaw5n8rvl7frj3cjncwcbw64scfggb5s91m4isd7j" + "commit": "d20f16bf5eadd66e775f215e800f25caddae8cb5", + "sha256": "0nh3rrvjjddyng5j7wjrk4ls7l6cjx3fpf8ksg4kjq7wzw4abf1s" }, "stable": { "version": [ 1, - 8, - 8 + 9, + 2 ], "deps": [ "cl-lib" ], - "commit": "b8b4f43af73f109bf1af0453a076c274164488cf", - "sha256": "075klzf66z1rvhpxv4j694pdkmi7f4fpw6c8q4ncz0h4y5wdbl8w" + "commit": "d20f16bf5eadd66e775f215e800f25caddae8cb5", + "sha256": "0nh3rrvjjddyng5j7wjrk4ls7l6cjx3fpf8ksg4kjq7wzw4abf1s" + } + }, + { + "ename": "diffed", + "commit": "1f753648be0e01a962297b088ffe349f5a1da29b", + "sha256": "1dd5vdw2qgfykgr67kcx0qa786zgqw6rf1gfh43zrlpnkjr1zkd8", + "fetcher": "github", + "repo": "ber-ro/diffed", + "unstable": { + "version": [ + 20230208, + 1546 + ], + "commit": "f7dc37f13a4f1660212c41a6e9faba61eb8cc078", + "sha256": "0g1xjwby2sljmkf4nl0das45464162hwlsrjhbwzf4bp4i1c8gi9" } }, { @@ -21323,21 +21676,6 @@ } }, { - "ename": "diffsync", - "commit": "581413a6c017265568a89b08ad608bb0b4563123", - "sha256": "1kny243c3gy9wkyhc06mw12wwbmigsidicrhl7bzhrpbam7an4w4", - "fetcher": "github", - "repo": "ber-ro/diffsync", - "unstable": { - "version": [ - 20220502, - 1513 - ], - "commit": "3f8540ef0a677ea8c2b57aaf4a07937512bb148c", - "sha256": "0hgyi8s7f5r87y48a6x427xm8nkr2rms6fzsdjp840ma39pj7n2f" - } - }, - { "ename": "diffview", "commit": "0ea5dd4c9c114618ac20f565c878f509ce8d9872", "sha256": "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k", @@ -21368,20 +21706,20 @@ "repo": "retroj/digistar-mode", "unstable": { "version": [ - 20210129, - 1719 + 20221201, + 2332 ], - "commit": "e12b128023b7696a23545f812877e8c6531d261c", - "sha256": "17ja51xcwmiy66000k08z8c7za4rivsi1w8w650s8byd4v9nkc75" + "commit": "06795403c30f3b3c7b72d7cb5ca33c32d0aaee49", + "sha256": "13zri0mf1gn97nn8h79j82i7975dnzyvpbvw5kj69wn4mw2jf1y8" }, "stable": { "version": [ 0, 9, - 2 + 4 ], - "commit": "e12b128023b7696a23545f812877e8c6531d261c", - "sha256": "17ja51xcwmiy66000k08z8c7za4rivsi1w8w650s8byd4v9nkc75" + "commit": "06795403c30f3b3c7b72d7cb5ca33c32d0aaee49", + "sha256": "13zri0mf1gn97nn8h79j82i7975dnzyvpbvw5kj69wn4mw2jf1y8" } }, { @@ -21501,14 +21839,14 @@ "repo": "tarsius/dim-autoload", "unstable": { "version": [ - 20220422, - 1601 + 20230212, + 2019 ], "deps": [ "compat" ], - "commit": "f1a489414dd7d344ef791c30e43e4f4e61db7582", - "sha256": "1sawhg1x4rjwk1k3521x0i0plq727fjhv2x6mcq5cs6dy7j3dzsf" + "commit": "d9c2b592cef9dfbbebe066919a79d4ef9c31db80", + "sha256": "1da0wxva0kwa9nhj77fhrwkqhq2s8yr31iiqain7ba3fphcgh3aq" }, "stable": { "version": [ @@ -21528,14 +21866,14 @@ "repo": "dylan-lang/dylan-emacs-support", "unstable": { "version": [ - 20210329, - 604 + 20210613, + 1431 ], "deps": [ "dylan" ], - "commit": "040c8ebc884305fd4ff980d21c68946fa74b095a", - "sha256": "1f99wn0lgknvnplp7nk2lylf17yak2hw53n9a0vkxng01xhf50d2" + "commit": "d85409dc3cba57a390ca85da95822f8078ecbfa2", + "sha256": "1cm4l2ycaw47mfgc6ms021zxkas1jajgwpnykqlkcwcbakbczxjl" }, "stable": { "version": [ @@ -21687,14 +22025,14 @@ "repo": "tilmanrassy/emacs-dir-treeview-themes", "unstable": { "version": [ - 20221106, - 2133 + 20230112, + 134 ], "deps": [ "dir-treeview" ], - "commit": "1d2e19c1df9f68186d7d0fe4529c92f7112136a2", - "sha256": "1h8kbr1swad0d84bqblg4c4gvm2pnq72n5hrbxjwahr45j8xrp1l" + "commit": "8e28c2501a978e6ff733fc9cf43a826fd8e7b87e", + "sha256": "16hmp0wp8a1ahhsqy2s7wkbz9fkjfdi5wa0hjrwc2rfg3xprf449" } }, { @@ -21713,6 +22051,21 @@ } }, { + "ename": "director", + "commit": "8a4158931df97d1e8bb65ca9468c52253fc8f025", + "sha256": "0w98xzqv246a6adwbjkpc3rrbsr046lqxmi541f7rc673dwnncv6", + "fetcher": "github", + "repo": "bard/emacs-director", + "unstable": { + "version": [ + 20230213, + 1201 + ], + "commit": "16afdbbd91b451fab44c68c8f7d0b810f5283f28", + "sha256": "14zgkzwjydahrpz2rz5iww13r4x4fdpf8im4g0nffvb3pqvsbz7f" + } + }, + { "ename": "dired-atool", "commit": "0fe7b0857828a041ee06b30edd2cd488cc3394c7", "sha256": "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w", @@ -21744,15 +22097,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20161012, - 1104 + 20221127, + 1247 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "bef0c7eb03474defa02bbba5c15401a766c8ff7c", - "sha256": "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -21763,16 +22116,16 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20210403, - 1230 + 20221127, + 1247 ], "deps": [ "dash", "dired-hacks-utils", "f" ], - "commit": "7c0ef09d57a80068a11edc74c3568e5ead5cc15a", - "sha256": "0qqj16r7p6pidlyj7fi0s3xhi13065642j20hlnply8nrq782vpj" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -21905,8 +22258,8 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20191105, - 1404 + 20221127, + 1247 ], "deps": [ "cl-lib", @@ -21914,8 +22267,8 @@ "dired-hacks-utils", "f" ], - "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46", - "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -21947,14 +22300,14 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20201005, - 2318 + 20221127, + 1247 ], "deps": [ "dash" ], - "commit": "d6d4d1930969bbc22fd0551d5195887bf92cab3e", - "sha256": "0nhd2f6ybdcb4nb6klallvjfdfkfn1vp2j29zi1d7spi7ksv6l4f" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -22097,15 +22450,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20181114, - 1723 + 20221127, + 1247 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "c7184dc8f6ed3f2330db8d8f21f01c4b08056dd3", - "sha256": "1i5a6srd3fpqdvvhyv0swybznimx9ilpm3sd76ha3shispyij1x5" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -22116,15 +22469,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20180922, - 1113 + 20221127, + 1247 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "a45737d3a5aaac6928ebd7af041e5603dffaca64", - "sha256": "1bhz0x7sa4a56f5ha8h9w36y5pirvzhkhczyfwf4z74j4z5z44sm" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -22194,15 +22547,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20190722, - 1109 + 20221127, + 1247 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "886befe113fae397407c804f72c45613d1d43535", - "sha256": "1cvibg90ggyrivpjmcfprpi2fx7dpa68f8kzg08s88gw5ib75djl" + "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", + "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" } }, { @@ -22213,15 +22566,14 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20180401, - 2206 + 20230118, + 1948 ], "deps": [ - "dash", - "dired-hacks-utils" + "dash" ], - "commit": "89af4f12ce4a0692c9c9824eacf56875ca86cb36", - "sha256": "0nyc17b029ksa6aai5890g6ainncixgig9cnjjp7khcifmrrpw9s" + "commit": "69185bc355c1a8968b8a2851304707e081402458", + "sha256": "1sgw0hpkr5wczi1l24gw3ldvmlwgvcagsa26qr7p5r2wmypchzsp" } }, { @@ -22279,21 +22631,21 @@ }, { "ename": "dired-rsync", - "commit": "ce9f41ad832cef527dde97f829a8b8339e6ac48b", - "sha256": "0lykj7nfpaspwn90macvr7iir4jlrx88i0s9spii7iic2fnm51ql", + "commit": "ec3a3b4d5f82d56a3fccb1f996081079c2771a1a", + "sha256": "0mz0yhns5dr5d1ha63p5gig8mckkvyql77miyvpzms597pvqffj2", "fetcher": "github", "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20220729, - 1031 + 20230126, + 1144 ], "deps": [ "dash", "s" ], - "commit": "7bdc1dd7c9e1217a20a4e1f26c3d1a3ed35f4a14", - "sha256": "1qwdc92rzqdzv96rz4q9davzs0myirmf1cyr0cly2wqxg4zmms18" + "commit": "5496bc00f7a32a9d3e54e395f29d44e9df771567", + "sha256": "1qzzpcrvgg7m3b8gdg9mpvhhjjzhmcrzaf72hvmdihs8n0x36nvf" }, "stable": { "version": [ @@ -22309,6 +22661,25 @@ } }, { + "ename": "dired-rsync-transient", + "commit": "ec3a3b4d5f82d56a3fccb1f996081079c2771a1a", + "sha256": "12k9zm6l1c9bk15zi01rcn8rjl7p7vixfy8g1y4y8dw1552dwpym", + "fetcher": "github", + "repo": "stsquad/dired-rsync", + "unstable": { + "version": [ + 20221214, + 1215 + ], + "deps": [ + "dired-rsync", + "transient" + ], + "commit": "c0e2168b80df00116ab9071bb214cf05ed943d73", + "sha256": "1bkq5n7ivvfjcry7iaq9gv9fjx62brq6bs73j989b6jm32l6w3ns" + } + }, + { "ename": "dired-sidebar", "commit": "30e15c8361b01195f198197e704828fbcac0e8d6", "sha256": "19a4gsx9wmpc94jd992c7dj5mxfnnij2nc6qnb2lhk8ad69h1lmc", @@ -22316,14 +22687,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20220618, - 237 + 20230216, + 432 ], "deps": [ "dired-subtree" ], - "commit": "f08bf15cb6cb3c44102731f50ffd812d8d68316c", - "sha256": "0f39j8d47ids6yr427hvvqk6wlsw9qz3knm4fdf478v0lkxmpxdc" + "commit": "5569d3b53585f5413cf87a694650d0fd6e040803", + "sha256": "1vkdaw09vdjm583b0cdql991d76cqb1wkis3vzfhdy22hmy38wh7" }, "stable": { "version": [ @@ -22370,15 +22741,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20210105, - 1127 + 20230118, + 1953 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "1f19e249bdc66163b10028271943fc7b87e936ae", - "sha256": "1hwscganzprihp7820j1dw758pv0nili1gzqdin5p64fcgm54av0" + "commit": "1382acb219c5e3b179662bcacd9c57463802718a", + "sha256": "0zpb8hj9qmsh09kkqx90fan2qqsnqzk9wdy6ryl76pycjghb0bn2" } }, { @@ -22661,14 +23032,14 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20221014, - 1236 + 20230123, + 1201 ], "deps": [ "transient" ], - "commit": "ec4100612b2e93d9e188e7eab4c144b45f3547ee", - "sha256": "0jqsg91qzbd1n7cg7y1484js8ykrysmxs17c0f4lvx7vxwkjhpyg" + "commit": "65954585a9e16a06f6ec1f0dec475b27ec4c218c", + "sha256": "1s1n1y3vgqhqbfrdhgkv24l36791p9823ijlbv6gg3hflsiqvgl2" }, "stable": { "version": [ @@ -23021,14 +23392,14 @@ "repo": "unhammer/dix", "unstable": { "version": [ - 20220323, - 1046 + 20230126, + 1017 ], "deps": [ "cl-lib" ], - "commit": "5230c18456ab034f2fb69acdbef62c1abae6a8cf", - "sha256": "161ykw5p6wxy3dlx7f6zxg1cwl8hh411b7clzc5zhdpmq1wnqy0b" + "commit": "5eeed9362fbeaf5a032bccd69b861b8a36877516", + "sha256": "0w23qcmlpy23v481nqikjpd3kgwpjapihlwhxdxmpd5h90khkj9j" }, "stable": { "version": [ @@ -23051,15 +23422,15 @@ "repo": "unhammer/dix", "unstable": { "version": [ - 20170105, - 1423 + 20181210, + 1200 ], "deps": [ "dix", "evil" ], - "commit": "1cfef0d3376a18c78dd1dfc1ac9ac3ad0e8c4475", - "sha256": "0p2cvr7mjpag86wacxm6s39y7p118gh2ccqw02jzabwxlfasfbw3" + "commit": "b973de948deb7aa2995b1895e1e62bbe3129b5a5", + "sha256": "1bjxyidcp7y309asbk4pfb4mzgb8j62fmp3w3zl2nahdgv1rja45" }, "stable": { "version": [ @@ -23223,8 +23594,8 @@ }, { "ename": "dkdo", - "commit": "2d4f75f6f6349b81ddbaaf35fb5d7ddeb4cde622", - "sha256": "0p7ybgldjs046jrkkbpli1iicfmblpxfz9lql8m8sz7lpjn7h300", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "18szxqhn2jzy3y2x5f89nczvwq8m7z3sbr4xjywwvzi4x1p552sy", "fetcher": "github", "repo": "davidkeegan/dkdo", "unstable": { @@ -23347,11 +23718,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20220731, - 2330 + 20230116, + 2310 ], - "commit": "02f2187d815b480e316238e2b8568bccc5e38fdd", - "sha256": "1i4lzq60d5i3yiibgf8nx97xfr477gkp4pyd5r2q1sykv9hjlr51" + "commit": "641c2c8bf55ec4a0f9da8dd99b95cd1464997a66", + "sha256": "0ihxhsnhlqjpnyy53vbxs089sanf3acxy5jbfl005lkv453jnz1d" } }, { @@ -23568,8 +23939,8 @@ "repo": "r0man/docopt.el", "unstable": { "version": [ - 20220319, - 1912 + 20230216, + 957 ], "deps": [ "dash", @@ -23578,14 +23949,14 @@ "s", "transient" ], - "commit": "a7f5b4a8b1a43552067ce27bce6080a509c92cff", - "sha256": "0dr0m5rrk0vhz1sq3d28pxijlkj030ckxc5mhqv3jpq2xfjwd2gv" + "commit": "21c575db68d4ccadb3125241a62136a0f8b76f63", + "sha256": "1g3q6ymw5cxlm91zmwf8rilsz38rcgp2kki29ynk37vxc84bij13" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "dash", @@ -23594,26 +23965,26 @@ "s", "transient" ], - "commit": "a7f5b4a8b1a43552067ce27bce6080a509c92cff", - "sha256": "0dr0m5rrk0vhz1sq3d28pxijlkj030ckxc5mhqv3jpq2xfjwd2gv" + "commit": "21c575db68d4ccadb3125241a62136a0f8b76f63", + "sha256": "1g3q6ymw5cxlm91zmwf8rilsz38rcgp2kki29ynk37vxc84bij13" } }, { "ename": "docstr", - "commit": "97d68e8842fdfcda9c8865ccc53b1d0d7c42a7e7", - "sha256": "0zq6pm84l6cqa57198hn5pk596wlkcnk46g01q1072650i8bp58x", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1jyhs8gdy82jiz9p38wgarm7s7c24r1lgcdz2mdxwfvfnb72pwxl", "fetcher": "github", "repo": "emacs-vs/docstr", "unstable": { "version": [ - 20220704, - 630 + 20221231, + 1701 ], "deps": [ "s" ], - "commit": "8242fcb2798dedf15b935845b8d6fa16c8e15798", - "sha256": "1jsl6yyamc74rxfphv0j3l1ri7nkm5hxvkq04zz0yanyci3h4g3p" + "commit": "68a72e8a9abac28d8451769cab3846c342f657bc", + "sha256": "1rdl0hqif6awkyv6wsmpdk08hx7g851n19rzqchcpksdfq8dk7nr" }, "stable": { "version": [ @@ -23636,11 +24007,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20220812, - 443 + 20230108, + 1507 ], - "commit": "506c22f365b75f5423810c4933856802554df464", - "sha256": "03a8z9cwfg87144b0g4ggilr925l561hgmgra9wchxwydixrlnml" + "commit": "69bfe30317c7fa7a5a51f2763515dfe9c989ebf1", + "sha256": "11a9lyhnwhza3my9hg5x7116y2v5s3d1z6207b7hhwky1b7m4pfj" } }, { @@ -23758,15 +24129,15 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20221111, - 711 + 20230219, + 1605 ], "deps": [ "compat", "shrink-path" ], - "commit": "440fd160b4dff530465938bed40094a0d413fc11", - "sha256": "0ablv6fyqb6mzzk7iyx24nj5xmmmhw7kqmi2xldjv0a7aplmxbqr" + "commit": "6125309c2caa3c98591a4c802e9b4dd2f7ea83e9", + "sha256": "1klyfazdqxy2kdb72mbaxy0ravpfikw030q61rbbhl47sp41yxrv" }, "stable": { "version": [ @@ -23809,14 +24180,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20221112, - 2247 + 20230221, + 610 ], "deps": [ "cl-lib" ], - "commit": "b5ff201f4bea4286e9ed015a2043cf2394182232", - "sha256": "04xq0v50rhikwfkzhwx2rzismipb2b57niks7s1svfp4jl1sg5fm" + "commit": "4c239dbe42232e81c28901000f435746de2a55ab", + "sha256": "1d4hi0gpal589gv2mhq73g928xwrykx075ivfqm2i875vb6yhy3m" }, "stable": { "version": [ @@ -24006,14 +24377,14 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20190824, - 2314 + 20230220, + 1635 ], "deps": [ "debian-el" ], - "commit": "b0de196d11a6730c21bb4be308fd8924d4a0eb7c", - "sha256": "182lp5f8qv1avvfz1gb6isbg7pf9qasl0z0rcyj6kvnsjy8c1fnv" + "commit": "af9aad721cb263e495e2f77df458e9496549c04b", + "sha256": "1vqmi32n3yz4chrbi0473hhh4klxsh63qbydcl44xa91g3ly3vp5" }, "stable": { "version": [ @@ -24059,11 +24430,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20220821, - 1717 + 20230118, + 1201 ], - "commit": "fdf057f5e80037814098dc8bb67888886c89a761", - "sha256": "1v9p120aaa71x30xixxwglvgfwp7pf5y4503zd6rlj98rmidj96w" + "commit": "be1dd97ef3968bef25b9de89e7dc1251f5aaee10", + "sha256": "0y8qr8rcsqmlr48z3qn50im1vr6qnpqxa6yxdc349gq552mja2l0" }, "stable": { "version": [ @@ -24083,10 +24454,10 @@ "repo": "gaudecker/draft-mode", "unstable": { "version": [ - 20140609, - 1456 + 20160106, + 859 ], - "commit": "f059c04b044f62aec764c7698adddad301bfe89c", + "commit": "4779fb32daf53746459da2def7e08004492d4f18", "sha256": "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y" }, "stable": { @@ -24241,8 +24612,8 @@ }, { "ename": "drupal-spell", - "commit": "bb859d9755bde3fd852bc7d08f2fab2429ba31b3", - "sha256": "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0fj741608g9d98x3dg0hmx9z34qr2q8s4ypyrhyqzqcz5qzn938y", "fetcher": "github", "repo": "arnested/drupal-spell", "unstable": { @@ -24369,8 +24740,8 @@ }, { "ename": "ducpel", - "commit": "2d64adac965e1dac0f29dab9a587cd6ce9c3bb3a", - "sha256": "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1jppm79d6b961ikm0w1hs4yj27dbqxd12581524pq2571hs2wcmw", "fetcher": "github", "repo": "alezost/ducpel", "unstable": { @@ -24468,20 +24839,20 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20220805, - 1652 + 20230217, + 1444 ], - "commit": "3df932f7f91ea68c3fee789f133b4aa8f9bea807", - "sha256": "19b71sg9q9yj00dkqdkq2q0j3ibvvgvf53qyjr8f3j60c5mc6hcv" + "commit": "d3d628f2eda2278bd2df6e37452d8693f367fcfd", + "sha256": "07gs70d46fg8dxm2fqwpgl1zi91smj0d9wxa3y3yax0vih5csyb8" }, "stable": { "version": [ 3, - 6, + 7, 0 ], - "commit": "c3b75bdfd3763b39aaac8baa5104312ac701d501", - "sha256": "0kgg5a2y1zxc6av2vmlh4vy46lsgnq2xvxjpv3m5i8pzgv0angsg" + "commit": "d3d628f2eda2278bd2df6e37452d8693f367fcfd", + "sha256": "07gs70d46fg8dxm2fqwpgl1zi91smj0d9wxa3y3yax0vih5csyb8" } }, { @@ -24552,10 +24923,10 @@ "unstable": { "version": [ 20210331, - 2246 + 2311 ], - "commit": "8a564b2e2f052830bfa5f59fc24220b43cb223ed", - "sha256": "0b3g69jl0mpsh35p1pnx1cv3z5m1ahpfjb2rfhgc9k8yzfxvr9vm" + "commit": "61c5718ba64ace4c9e29de18aa2690ecc3f0f258", + "sha256": "14nd544ispfj165ys6lv9bpy41p9j8kf4lwy73qigr4c7qlf43by" }, "stable": { "version": [ @@ -24575,11 +24946,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20221115, - 2354 + 20230209, + 2234 ], - "commit": "c6a84a93c687b6ada6ea297135125cff232520d9", - "sha256": "1krm1pn73wk1s3gvif4vk7q281nx0syh5dfai3lmkd6jwphwhzxj" + "commit": "078fb50b15cd024a9ce252ef69b58794df392be0", + "sha256": "1f49lhpmlz00pia4cs5i0hsijckc5ya39ibqnxlgmw9warcz1j9i" } }, { @@ -24590,14 +24961,14 @@ "repo": "harsman/dyalog-mode", "unstable": { "version": [ - 20221102, - 913 + 20230214, + 1027 ], "deps": [ "cl-lib" ], - "commit": "1fe61fa2e0145af434f3fa1c5077b973389d8651", - "sha256": "1swvwnbzp848ih41xmgvrvzii2s9qdxd7lfkcik4pm5br0njmx2m" + "commit": "13c0d391aa878a1609259a89fe3e6db8d21935e8", + "sha256": "04dpr4ayz5kcjfg9rfi4kwrw3qdkx422bwxwlxyfp60amf4ilib6" } }, { @@ -24890,14 +25261,14 @@ "unstable": { "version": [ 20140525, - 1047 + 2211 ], "deps": [ "e2wm", "plsense-direx" ], - "commit": "b72561b75e98961f05544a2159d83592c964ba1e", - "sha256": "1cx6kdxhq9ybwwvc1vpwcfy08yf1h4xacgimm36kp9xayvxsmq2j" + "commit": "7ea994450727190c4f3cb46cb429ba41b692ecc0", + "sha256": "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d" }, "stable": { "version": [ @@ -25253,14 +25624,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20221113, - 1408 + 20230211, + 2228 ], "deps": [ "parsebib" ], - "commit": "374400c99f600cfda703da4fb8d16898be48cb74", - "sha256": "1azgsjf5j8k6llq74brykidcb2mnq6fghk8jyq7qad5afh7n0mrc" + "commit": "abe6ed461b334673001b930f7e30752aa8aff526", + "sha256": "03vn16nrsap8sdy4bindjr3sr1xqy8w9vffy5a970ksygfdv2j14" }, "stable": { "version": [ @@ -25298,17 +25669,17 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20220725, - 832 + 20221122, + 427 ], - "commit": "5b8bf34b8ea5d05f0b8dfc12bfea825f9cffbeda", - "sha256": "04733lqa6z3kmdjcgdi58q3wrqan2qib43rvjw51qc739fwmwb5y" + "commit": "0c6cf404a49bd68800221446df186fffa0139325", + "sha256": "09fkzmcvzdbdjaa167wiybj0kir7y12pcq2varjywshvq2l7niz4" } }, { "ename": "ecb", - "commit": "4db5183f35bedbc459843ad9f442f9cb6608c5fc", - "sha256": "0z61p9zgv7gcx04m4jv16a3mn9kjvnw0rdd65kpvbmzkgls0nk8d", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1vb66hangxa8p7khjxsk6if2n8hagl0zk6k20lr4qm41r8bl7iqf", "fetcher": "github", "repo": "ecb-home/ecb", "unstable": { @@ -25322,17 +25693,17 @@ }, { "ename": "echo-bar", - "commit": "86a702ef21febcfc227c1f2b64a7e795403a81c6", - "sha256": "1zi6qnqmbscl36iafblhshz5hrm5z1phzzb6swz1ryw23808skyr", + "commit": "dd401c96b14d281287df81decce60b11f745fd69", + "sha256": "09bnd9z053l4239ylv9f7hg18sad4mbd3r48aih61adwzl6zwb2p", "fetcher": "github", - "repo": "qaiviq/echo-bar.el", + "repo": "benzanol/echo-bar.el", "unstable": { "version": [ - 20221101, - 2254 + 20230209, + 1350 ], - "commit": "d0a24635da51502bdda9f5451793966fffef92a8", - "sha256": "13j9hdlx2f5fvbghibkv43i7x7hih778fn8ybi8g4y1l350kr68m" + "commit": "03cae6d045636948d8b47979d85774e39556f9e1", + "sha256": "1431xpklnb5894mq3gxc7kvp2q5qa04bnlx8qcxv5l9g2rs0jiih" } }, { @@ -25391,14 +25762,14 @@ }, { "ename": "ecukes", - "commit": "14cf66e6929db2a0f377612e786aaed9eb12b799", - "sha256": "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "15z6ibcrgk5jaipg9xj5vyfkdyhh570mwn805nglyjj3rnvncqqr", "fetcher": "github", "repo": "ecukes/ecukes", "unstable": { "version": [ - 20220802, - 1502 + 20230220, + 456 ], "deps": [ "ansi", @@ -25408,8 +25779,8 @@ "f", "s" ], - "commit": "90e4c1d11b69e937f057864080f6dcc3f6acd2f4", - "sha256": "1dr084ksy2454r39g205yg7wvv9nfcykpx1nj0zwk4201df1vfyk" + "commit": "6bc1feb33d44bda7a7ccf06f8748050ffa1dc23c", + "sha256": "0wcc2rygz6l496fbh6azlbphdk3qn9hfdmcnq7wrcjy35b5f0cbw" }, "stable": { "version": [ @@ -25431,8 +25802,8 @@ }, { "ename": "edbi", - "commit": "238a11afa52d2c01d69eb16ffd7d07ccd6dff403", - "sha256": "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0m325rcwm6n2pi1gki780hbwlnfiqwffy8jxp9fs1dj0n3wzjp6q", "fetcher": "github", "repo": "kiwanami/emacs-edbi", "unstable": { @@ -25658,8 +26029,8 @@ }, { "ename": "edit-color-stamp", - "commit": "2ad2ea105b895cb958ce0ab2bf2fad2b40d41b2f", - "sha256": "1f8v8w3w7vb8jv29w06mplah8yfcs5qfjz2w4irv0rg7dwzy3zk8", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1a7bjp0x024xd9h4lhdn7kzrga9n5g8msmfw97qfp8idgd1xhr11", "fetcher": "github", "repo": "sabof/edit-color-stamp", "unstable": { @@ -25790,15 +26161,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20221107, - 300 + 20230212, + 617 ], "deps": [ - "cl-lib", "nadvice" ], - "commit": "3352e487809dda4a0366314e30c9efa431b61f79", - "sha256": "1v8x649r9b0ihnhddkkfb8ck21z2hr3swgczwgzwdk0ys6pl89my" + "commit": "2d13945c8d4c0ceee1c9310a2c1c4375f88a3b1e", + "sha256": "12v6jj6nlql00xn76x080y3cb3331zr7k83pk04v67l6wlh9l813" }, "stable": { "version": [ @@ -25938,17 +26308,17 @@ "repo": "sinic/ednc", "unstable": { "version": [ - 20220404, - 2105 + 20221201, + 1624 ], - "commit": "d1a3c37235dd87e0bce6ffc75f5568218d6d83b4", - "sha256": "19k9mi6phdny1ihxf5apkxfv67cvyihl0za7al29dvim6172km4y" + "commit": "bf17d22fa9bd1711709d84bb75ad49f746bfc9b7", + "sha256": "1gwffd5c25vh1h7fjj79gpmqvlb3b664zh8pwp530hprk9sb89hr" } }, { "ename": "edts", - "commit": "2932e874ab3adbb022fa4793ea18376c34c9405e", - "sha256": "1gas7y5f94y1b5z9dgl8wpv1q8sf5341hlynmvpskmg0g1y1yy4s", + "commit": "949da8f16687bad96f53714ccbde895587d439ff", + "sha256": "0nabh5xfpskxjm2fvhg5blvh8xlnalfvq0qs57lraqc42699f8pk", "fetcher": "github", "repo": "sebastiw/edts", "unstable": { @@ -25971,17 +26341,17 @@ }, { "ename": "edwina", - "commit": "050188e81b045bdadf722db552a42864121d9b81", - "sha256": "1581cwgfnrlcmbmrnfj57w9hb9jx9sinz6zw6zy2yk7g1r9vgbzl", - "fetcher": "github", + "commit": "cb6cf7e2af2800ad0e295db6116a63009ba8eea0", + "sha256": "0aqbf4xw5v5c32f9wmhvzfxrcvxpj0fwkwxlvf0s7qj29dp01lh1", + "fetcher": "gitlab", "repo": "ajgrf/edwina", "unstable": { "version": [ - 20200113, - 1714 + 20221206, + 1610 ], - "commit": "c5368716a504c93407fd8cb4ef925a8d8eb62698", - "sha256": "0rsi1v9rr76crbgb7f13g31rfq5bjk0hchqr356h97xlqr39168y" + "commit": "f95c31b1de95df7e83338a5d4daf3363df325862", + "sha256": "196lsw2kygxb5bli9f87mc5hghv45kcqlv6y686lq9ryvnb5ksbr" }, "stable": { "version": [ @@ -26001,11 +26371,11 @@ "repo": "suntsov/efar", "unstable": { "version": [ - 20220530, - 1412 + 20230216, + 1213 ], - "commit": "bcf74e57031bb700c0e8b0a49c6e4583112b7eda", - "sha256": "1mfv5v120d49gsxf01imj4m71d7ijrvzi0h9nsfpd9yn93i8sraf" + "commit": "78618a6cd9fe7d46c3728db3589d1fe50f7c1c6b", + "sha256": "1dl7nfsg6ya1lvn1mjvask75x73vinxbpg5hxiqmif27gdi68qc1" }, "stable": { "version": [ @@ -26137,11 +26507,11 @@ "repo": "egison/egison", "unstable": { "version": [ - 20200107, - 2333 + 20211218, + 1115 ], - "commit": "1ec6e8fedcda1bc2a6517cdbd8b1a85a1401a8f1", - "sha256": "1flj67z99mfgvxwwp4614cackfv4nmb8rvy2bw5pfis1qrphk81g" + "commit": "dbb395b41a4e4eb69f3f045cbfbe95a1575ac45b", + "sha256": "14g0dpn8j7kh3iiq7qlhaa1wdk6xvl60hkl3j87ncjwkh6h4imcg" }, "stable": { "version": [ @@ -26200,16 +26570,16 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20221027, - 1923 + 20230219, + 1511 ], "deps": [ "eglot", "fsharp-mode", "jsonrpc" ], - "commit": "f8873096d24cac7b30419854347220f37345e780", - "sha256": "1mny0dr231bm2pz0rnkzr8kbv1f7sk34qdxxd6q7wssgif5rcxvq" + "commit": "09fec6c91f9c18173f145e28c55d6f21be678231", + "sha256": "0p1y1y3g9qxkgn38fd34wkjkxplg3aphdqgisx556maig69ki789" }, "stable": { "version": [ @@ -26233,15 +26603,15 @@ "repo": "yveszoundi/eglot-java", "unstable": { "version": [ - 20221102, - 2300 + 20230213, + 218 ], "deps": [ "eglot", "jsonrpc" ], - "commit": "10d0b3b65adf83fbd939f973cafc5b5122536bb4", - "sha256": "0f3vclq7hhim46njd5lw78g6v60aa3f3jvvmml99vxmxmd36a7gf" + "commit": "ff0f9515d78f94b8dfe158bf9a2c4f52216504c0", + "sha256": "1m64ddix0h4s22mfbagwkn0q69ck12hvzzpmdr134k7k8ryals6c" } }, { @@ -26252,28 +26622,30 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20211208, - 359 + 20230117, + 1243 ], "deps": [ + "cl-generic", "eglot", - "julia-mode" + "project" ], - "commit": "2e35cf9768d97a0429a72deddbe30d6d7722d454", - "sha256": "15d4pym6dv08jp6iki00xpf1i4vc92yd2rcjv21k64h6fc862gps" + "commit": "2e04597223553a369dd5b6520b6365b41e6ea508", + "sha256": "1zr5f5hvrj2i7a2yzrgbhdhzfwf6fxhj3p4ws85r0mgvk2kwwlll" }, "stable": { "version": [ 2, - 1, - 2 + 2, + 1 ], "deps": [ + "cl-generic", "eglot", - "julia-mode" + "project" ], - "commit": "2e35cf9768d97a0429a72deddbe30d6d7722d454", - "sha256": "15d4pym6dv08jp6iki00xpf1i4vc92yd2rcjv21k64h6fc862gps" + "commit": "3e66d604b66a35290c686194de7cb39b113ab20a", + "sha256": "0n9cf3cpf55f4n4nmfl4m2pai1b8hznyivr0vzvf9p56iyfnx98g" } }, { @@ -26300,17 +26672,17 @@ }, { "ename": "eide", - "commit": "aaf337a7843c79b463b66b1e96a3a044c8cea4f6", - "sha256": "0ir02p1qrkxsh6b2v2aagkxzzzbd8hysxhr5zpbp11gv6sw4harj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1fpi389bylw9f5v1b0qn71gnnjv4yvhwzz8j7dk5xix9yxiksnjl", "fetcher": "git", "url": "https://forge.tedomum.net/hjuvi/eide.git", "unstable": { "version": [ - 20221101, - 2045 + 20221204, + 2104 ], - "commit": "e0a5deb627da9cf70f02229601a1ebe6d78cabc8", - "sha256": "03yj94kw9n32bsjb7mxsq7acb8x915cgw5c11112mb56qjsz6203" + "commit": "ccddbb7b893c9b2439c19832aeb2c4d7dd8f5d90", + "sha256": "1wgdjrzz53y8gchp9vayb177y42w1ih8abq2rk1l9injhj8y0q4j" }, "stable": { "version": [ @@ -26393,17 +26765,16 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20221101, - 922 + 20230219, + 605 ], "deps": [ "clomacs", "dash", - "direx", "spinner" ], - "commit": "83f39df28f9812773bf89d7af1caf5e7950fb84e", - "sha256": "1yfb0lv1p5l8c3idr8ya1c26zbl781f61358k9y301mn8hf8j090" + "commit": "c9a602efd4b3a1b607c630e55e3124d4a63048fb", + "sha256": "0pnkg8m4ba8nmxc77lcb316hnjhl205jsdfr29gls8qidlfhxwwn" }, "stable": { "version": [ @@ -26437,6 +26808,24 @@ } }, { + "ename": "ekg", + "commit": "88d93c97bc861885f5fd4bf4dd169b1914bb643f", + "sha256": "16cwh8ry4gka5f808jvm0xwii7m100kfpdlaw2fmabqv425pipnm", + "fetcher": "github", + "repo": "ahyatt/ekg", + "unstable": { + "version": [ + 20230221, + 602 + ], + "deps": [ + "triples" + ], + "commit": "cb3dfbf8c6faa0aa95f603b855eb37260acdc89d", + "sha256": "1za8smby0sshl0icfjqwh6rlwvjzj0mflhf4pwnhynf5n7p3jdjg" + } + }, + { "ename": "el-autoyas", "commit": "cc4845343dbb8f8294394f6850788e4f1fe6b99b", "sha256": "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c", @@ -26461,26 +26850,26 @@ }, { "ename": "el-fetch", - "commit": "97761f51eec22d45a64f6fcc9765b7ac924e56ef", - "sha256": "0mk9zyrx1bs9mii748vjvsj1h4frhqac7hda7jp6xyxlr6n4ys88", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0dkynd8wp687vddjdggsafqfxmpm51gwhr92v9n6w9zqgvhcn2k7", "fetcher": "gitlab", "repo": "xgqt/emacs-el-fetch", "unstable": { "version": [ - 20220622, - 2008 + 20230210, + 1311 ], - "commit": "15f6af6035ad1f159ac931268ec3431ce4cdf2ec", - "sha256": "0d8w9m8rm6b2m86m6mq2sz5nfh9m3dizxcryn5qwwlv8hrlpir14" + "commit": "0142f58f075ea39aa6cc7ed35dd599afc4b6b450", + "sha256": "0d15zpbymi8k5bacgl6iyy60vzx2783qqn72cd7gszyxf6kz2695" }, "stable": { "version": [ 3, - 1, + 3, 0 ], - "commit": "7dea7aeffa68ede2cb34678ac2734502309ccbe5", - "sha256": "0fk48py9vx1mamwix2p3b20s3l7bfn9n4adqxrzli3810q3xd1mv" + "commit": "0142f58f075ea39aa6cc7ed35dd599afc4b6b450", + "sha256": "0d15zpbymi8k5bacgl6iyy60vzx2783qqn72cd7gszyxf6kz2695" } }, { @@ -26500,17 +26889,17 @@ }, { "ename": "el-get", - "commit": "1c61197a2b616d6d3c6b652248cb166196846b44", - "sha256": "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0vfimgla3bfxy3hc08a1ia711wz81d5cpgwipdj4i7gvqbpjxima", "fetcher": "github", "repo": "dimitri/el-get", "unstable": { "version": [ - 20211224, - 959 + 20230101, + 1231 ], - "commit": "24d73f555cb4d557182b1e8488477ada4d9bf0e3", - "sha256": "1y30gdhr1iz2s9255bg1nrpwnjr8z2nlz15v13yc484fxibpcwdj" + "commit": "3969e02b2755d11224b80d2db9d2b8fc5ae73711", + "sha256": "06dg7yfnqfs96702p61015988jcsmfvixfv8kwkj0r0jjmn7l24g" }, "stable": { "version": [ @@ -26623,11 +27012,11 @@ "repo": "radian-software/el-patch", "unstable": { "version": [ - 20220509, - 2253 + 20230219, + 214 ], - "commit": "156c61b72c1c9c61bd886b5931b8a382153f52fa", - "sha256": "043m4lpm7m7mbprnb5igx0rz2r6c425vl33m7is5j47pm1ysvp31" + "commit": "ad8b18578d224cf8ebb1cce9a3b1b5a3d93a0e69", + "sha256": "0w97dqmn5imqpnwrsp442k23bssx07s5r29xspp00rwp4kjdggwa" }, "stable": { "version": [ @@ -26646,15 +27035,15 @@ "repo": "zetagon/el-secretario", "unstable": { "version": [ - 20220422, - 2005 + 20220426, + 1905 ], "deps": [ "hercules", "org-ql" ], - "commit": "cc63663ff77b30c0eaf7b2724ddcd035a6b29d16", - "sha256": "1l86442xwjc9ahlm1hfdjc3817x7panprb8jccw5ggs3ffjdd049" + "commit": "575396ca689065188ad0f90c379d9bcf7ff6fc0b", + "sha256": "07kdwl4wr777ncidlv1v3jllfhimbkkhhimz9zgskmbfgrxw5sxn" } }, { @@ -26703,15 +27092,15 @@ "repo": "zetagon/el-secretario", "unstable": { "version": [ - 20220426, - 1905 + 20220428, + 1058 ], "deps": [ "el-secretario", "notmuch" ], - "commit": "c28a4f42829ed1f96a17abb63a8616216db913a5", - "sha256": "0s4smf6ldwivardvwnilg0p109dh51s04hqn6dna5qr9gal3ff26" + "commit": "c4e21ac5a9be2b2ea6cf7c153a6fae48c78a61b9", + "sha256": "0jnr75fzhi2m1b65z72q2m970nk52rkvzwkkv27rzbprd43hxnzd" } }, { @@ -26905,11 +27294,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20221031, - 1726 + 20230203, + 101 ], - "commit": "d0c9ace493d088bc70f7422705ff27dfcf162cca", - "sha256": "0czilbq6cwwxd1hbrjh5jb7jlxz6rz8kzx2n7g26rbr16sk0mdl4" + "commit": "43ae6c375811754e640b0bae4678bf33e72988e9", + "sha256": "03ljcpy7bf08l0zdrq27h2h2mf92rwc8yv26w8bl4gam83ypkk1c" } }, { @@ -26948,26 +27337,26 @@ }, { "ename": "eldev", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "1rhaldvfjz6ai3574yigidnlnbjy5xmv35kwaf87dbcwv8bpydz6", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1grpz4nf77bhxbzfl7b14wj1kxj759y0qbs6kwqpjgyzadfgar88", "fetcher": "github", "repo": "doublep/eldev", "unstable": { "version": [ - 20221117, - 2048 + 20230121, + 1404 ], - "commit": "2ddf8cbe9bb4f973ecfa6012870af23b030ad6f6", - "sha256": "1f649vm59kkwiwc3pwzvw6phnc9id8vm6jfyg05j716k2pa4q0n4" + "commit": "a1ea1a3df7602ffab30c15348365d2e6a75063b7", + "sha256": "0l5i1wylprwag087c21m51k0xwjna8y4hv7dwc9i3cy3f541jmp8" }, "stable": { "version": [ 1, - 2, - 2 + 3, + 1 ], - "commit": "659f4d9c97a44cf29ded5594b3f5de8da99ec973", - "sha256": "0d6wbfim0q81sm5m45fjc6n0v6nk32qrgas5nzrs0vslym4bfxna" + "commit": "870ca147d26a4da76828c50b5f4a3d82b51fe43f", + "sha256": "14rrh5ycwd3r5k3df8aif4jii645m5jgplxky3hrjgr8vxd951h8" } }, { @@ -26978,11 +27367,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20221117, - 2216 + 20221205, + 638 ], - "commit": "3021dcd85764b6a918e1689bf649c16918c339da", - "sha256": "14blf7as7j6k7g8ry8a45c5zpgjca79axwr4b3yk3hcp9q9rvzfk" + "commit": "5c067f5c195198ffd16df2f455da95e46cc8ce02", + "sha256": "12vl8a5xqz1cbi9bg3i7h7rjb1kgwdbfin6pn7zvzajfmg0pi2qf" }, "stable": { "version": [ @@ -27119,11 +27508,11 @@ "repo": "acdw/electric-cursor.el", "unstable": { "version": [ - 20220108, - 2052 + 20221221, + 438 ], - "commit": "92f77b05fec80c5440a8b800b33345dabca13872", - "sha256": "1f1z672z21yd2zwldrb95v739kgsgiq5ckh2ffskqcrh1k5dya8j" + "commit": "bc09aa8c5d3cc32e3e6452cbf8018fc1ea772b73", + "sha256": "15v62nqncs85pxvh96gmn5nsyxqc7s2c2gac08zy511d39ysqq2f" }, "stable": { "version": [ @@ -27461,15 +27850,15 @@ "repo": "SqrtMinusOne/elfeed-summary", "unstable": { "version": [ - 20221117, - 841 + 20221210, + 1349 ], "deps": [ "elfeed", "magit-section" ], - "commit": "125e0f059d9f186efa2a04e317b59245963d6f11", - "sha256": "1lrzrf759qqa329yi7hx81b12lli530ih10p2jghxbhqgzqndssz" + "commit": "ccbaf85d9ea442203027e784a42b21686f3a87d8", + "sha256": "124cadn3b0l5lyc0vv3wz581nhad0pa0fn82wcnjvihx5p7fg7j1" }, "stable": { "version": [ @@ -27524,15 +27913,15 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20220814, - 42 + 20220816, + 2223 ], "deps": [ "elfeed-tube", "mpv" ], - "commit": "d0140f24c7274fca6a357a33ba77dddf70837ba7", - "sha256": "1gg4lnh54yhxa3hshknfgljjc04p8nx0bbf1f9ygp2f9smw19vf8" + "commit": "7e1409e41628d61d8197ca248d910182ae4fc520", + "sha256": "1vsrsnvz0ysd36a99zk7n2giv0gxznlnls8zq6lcc0hwqw78i5cq" }, "stable": { "version": [ @@ -27640,6 +28029,21 @@ } }, { + "ename": "elisp-autofmt", + "commit": "6d5d559e92ade81b24d313da12520896de964a46", + "sha256": "1cij8nh8lldpm46v7m3pc2x2z9gkh1g26qk7in9hn3lx0nwdxavc", + "fetcher": "codeberg", + "repo": "ideasman42/emacs-elisp-autofmt", + "unstable": { + "version": [ + 20230221, + 1124 + ], + "commit": "153785d7e7d392ae07fe0f91a8ba3af6dd6d7df6", + "sha256": "1q1xbgwbsd2ma7axlajhkq20z446wk5x9an60wynsxshnsjxrlfy" + } + }, + { "ename": "elisp-def", "commit": "1f027b844efdc5946d2ad80d7052a8f3b96aac3d", "sha256": "1y29nsgjv9nb03g0jc5hb1a8k23r54ivdlv9h0a384cig8i91hsz", @@ -27894,6 +28298,24 @@ } }, { + "ename": "elixir-ts-mode", + "commit": "dbc1afa79eb2b9b50c9aed1a33f7eacd8cc5754d", + "sha256": "1fkm5f8hflfajgfn412pr94g82ml4y8pnkljxgnjxhyx8fm8xs35", + "fetcher": "github", + "repo": "wkirschbaum/elixir-ts-mode", + "unstable": { + "version": [ + 20230219, + 1338 + ], + "deps": [ + "heex-ts-mode" + ], + "commit": "9a397f8135468a9ec853a869033946a08d57a1c0", + "sha256": "05rdxs363fxcfiaxqfijxcz2mxvm2amd7dwnygz3zjqp8v48wbzk" + } + }, + { "ename": "elixir-yasnippets", "commit": "6c37a13d56e9a0a4e7e2c11349ed87610a0f6b2c", "sha256": "0vmkcd88wfafv31lyw0983p4qjj387qf258q7py1ij47fcmfp579", @@ -27950,8 +28372,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20221025, - 1514 + 20230102, + 1737 ], "deps": [ "f", @@ -27959,8 +28381,8 @@ "s", "seq" ], - "commit": "2c5184beea35ef92485710647b378bd8c881745b", - "sha256": "056a7xzv7pv6hhqjqcrxra2kpr5r715wj2jrivbcqvmmxrq1vs2v" + "commit": "5797500d74dd8544a89938c09d3cd5cdf7b5d7bc", + "sha256": "06dh14frkh3fnw3xb04z7cjxckrwz13prqyc0m2kwy96pcmnz8rk" }, "stable": { "version": [ @@ -28078,10 +28500,10 @@ "unstable": { "version": [ 20210904, - 7 + 1340 ], - "commit": "7cfc932d590287a80278f330e4ca71cb5702ef80", - "sha256": "01336d4h2pmjcbr3jd4749464rqhwak8ag3bpx28a43mfppph97j" + "commit": "4b42a90610fdb05ac1a2811da5acd55493715795", + "sha256": "1nj310mnckf5mpqici67jzdydbby50la6g6vq7qdaji0c98c335b" }, "stable": { "version": [ @@ -28095,8 +28517,8 @@ }, { "ename": "elnode", - "commit": "987a93afa134fdda466fbdc6dd9c48a572b0be61", - "sha256": "11avrs18cjlk6v2y4y202ay38375pdzh49lizy7w1w2mwy0q40am", + "commit": "a560fc2dbcfd37485890faf5243fbdb653ecaf99", + "sha256": "0g4awkf4akvbxh3f50mkcbsqs1m6031hlkidy8h6w9grrvypywn6", "fetcher": "github", "repo": "jcaw/elnode", "unstable": { @@ -28126,14 +28548,14 @@ "repo": "lujun9972/elog", "unstable": { "version": [ - 20160724, - 2255 + 20221207, + 643 ], "deps": [ "eieio" ], - "commit": "a67237d9813c7591614d95e2ef31cc5e5ed3f31b", - "sha256": "0alg5nbmq56zsc032pvah92h5fw155fbfjc275k9vbh915hs6y0w" + "commit": "e171d0ff0a21011124204d77111e5992b50b7007", + "sha256": "0ikaf8cak6m9rm78hnfd4bh3hx6vrm1307dggxxsz3862kcwj5aw" } }, { @@ -28144,15 +28566,28 @@ "repo": "youngker/elogcat.el", "unstable": { "version": [ - 20151121, - 41 + 20230121, + 459 ], "deps": [ "dash", "s" ], - "commit": "cafe9bd5c0d6561d72066c70a55c246453693efd", - "sha256": "117vb19z006hjs0717r5l90h4rv6rciw3cijlgg006f4qqj3g9s5" + "commit": "f2f19d7ab6b77b8fec55cb67524df629fe967891", + "sha256": "0fwl14xqnxq5d4a9wk0p1xvfkmff5inwmz2v1s8n7w1sy29zslrn" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "dash", + "s" + ], + "commit": "f2f19d7ab6b77b8fec55cb67524df629fe967891", + "sha256": "0fwl14xqnxq5d4a9wk0p1xvfkmff5inwmz2v1s8n7w1sy29zslrn" } }, { @@ -28201,20 +28636,20 @@ "repo": "dochang/elpa-clone", "unstable": { "version": [ - 20211205, - 1237 + 20221201, + 1227 ], - "commit": "03d8e2af55dfb34ab9da1f9385079a995383b2ea", - "sha256": "19rlqr4w9hkxxwwyfz02vvs96dx92c1gxy5cn1m1v2a5sdfdz1yq" + "commit": "1d130c251690f24c23b77a4e4570157fca881d8f", + "sha256": "0swcpvlh08mrw27yv7a5wbsvlxv72yr5gbzzap9x2bjd839d3ndf" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "03d8e2af55dfb34ab9da1f9385079a995383b2ea", - "sha256": "19rlqr4w9hkxxwwyfz02vvs96dx92c1gxy5cn1m1v2a5sdfdz1yq" + "commit": "1d130c251690f24c23b77a4e4570157fca881d8f", + "sha256": "0swcpvlh08mrw27yv7a5wbsvlxv72yr5gbzzap9x2bjd839d3ndf" } }, { @@ -28243,20 +28678,20 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20220526, - 1512 + 20230208, + 1148 ], - "commit": "fecb74e8b5ce1562df2951dbbed158d75a21aa7f", - "sha256": "1kalmp2gm0blgyd0mn2iq2nykvb0ix651by7by1zv2yirpqszmbr" + "commit": "9d7cfbf72ef8c7cd014c91e5bb3d8fbebda56140", + "sha256": "0lw018bn5a6z8pxzqscs196l8k18m1m9p0p6amr3n27qmf6fp3vw" }, "stable": { "version": [ 2, 2, - 0 + 2 ], - "commit": "3e0fe0f91d1c5798752c255b89950617f88b8d9e", - "sha256": "1vfhxbn9m3412hpgpnpf523lm9cl4lkbk1fgjvqldlknwks376jh" + "commit": "9d7cfbf72ef8c7cd014c91e5bb3d8fbebda56140", + "sha256": "0lw018bn5a6z8pxzqscs196l8k18m1m9p0p6amr3n27qmf6fp3vw" } }, { @@ -28392,18 +28827,18 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20220223, - 2021 + 20230220, + 2011 ], "deps": [ "cl-lib", "dash", "f", - "seq", + "lsp-mode", "trinary" ], - "commit": "21ed4f46e2d02ffb48b3ae377b0c93732ccf3f4f", - "sha256": "0pfwi4xddxphanh83xzvbj3a04wv7x55xjs796i1h820hm7zhidq" + "commit": "2776cd0c0617f99cac2da3da764d2f221f62ff2a", + "sha256": "12f7svl0nikgqja87xwqhm5xw47sqwmx86f9lx90yadacw8v71qw" } }, { @@ -28631,14 +29066,15 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20221013, - 1037 + 20230212, + 2019 ], "deps": [ - "compat" + "compat", + "llama" ], - "commit": "6f8894a7c7dde11679d38526f8d5717d009a1bd3", - "sha256": "1nk4f0161zzgg4v278x9p3hgyzggmzda1f0s9qs2r0vj5964yvvp" + "commit": "9daf56b1b11ca267f263f70823ade6f1a92d307c", + "sha256": "1yz8vkjbdlqgx1rnad9rr3mavcf8gn9c2wx9khjwf499yl7i3ln9" }, "stable": { "version": [ @@ -28706,17 +29142,17 @@ }, { "ename": "emacsql", - "commit": "f7e6b437ceaaba30f84580656fcaee728332bece", - "sha256": "02f0667nhs4prl2zyzy2x9nz6n30g5kxmkv92zkpirxy3bh95f0h", + "commit": "4872ef038dbbf67008bfa7951574ee372d6ff68d", + "sha256": "0mip1v0mrp7b538i949q9jrqlk9sl3i0qxa4jmm99llrs82mmdj0", "fetcher": "github", "repo": "magit/emacsql", "unstable": { "version": [ - 20221024, - 1455 + 20230221, + 1532 ], - "commit": "e318a6c8f65371e2ab667d811205a0d9a98dacbb", - "sha256": "1p8ianzpkr6yra7va4pb9c4l9j8dm1l769wzsap5cdqgg7k45inw" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -28736,14 +29172,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20221013, - 1512 + 20230221, + 1532 ], "deps": [ "emacsql" ], - "commit": "ec4f3d091b8e2c60ee305a63a6f45f0ea5996ed6", - "sha256": "0wl3zs33lk61dnk2km7qyp5vzl973iq1zlriqy7qf40pxykmzbbv" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -28766,15 +29202,15 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20221013, - 1512 + 20230221, + 1532 ], "deps": [ "emacsql", "pg" ], - "commit": "ec4f3d091b8e2c60ee305a63a6f45f0ea5996ed6", - "sha256": "0wl3zs33lk61dnk2km7qyp5vzl973iq1zlriqy7qf40pxykmzbbv" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -28798,14 +29234,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20221013, - 1512 + 20230221, + 1532 ], "deps": [ "emacsql" ], - "commit": "ec4f3d091b8e2c60ee305a63a6f45f0ea5996ed6", - "sha256": "0wl3zs33lk61dnk2km7qyp5vzl973iq1zlriqy7qf40pxykmzbbv" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -28828,14 +29264,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20221024, - 1455 + 20230221, + 1532 ], "deps": [ "emacsql" ], - "commit": "e318a6c8f65371e2ab667d811205a0d9a98dacbb", - "sha256": "1p8ianzpkr6yra7va4pb9c4l9j8dm1l769wzsap5cdqgg7k45inw" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" }, "stable": { "version": [ @@ -28858,14 +29294,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20221024, - 1455 + 20230221, + 1532 ], "deps": [ "emacsql" ], - "commit": "e318a6c8f65371e2ab667d811205a0d9a98dacbb", - "sha256": "1p8ianzpkr6yra7va4pb9c4l9j8dm1l769wzsap5cdqgg7k45inw" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" } }, { @@ -28876,15 +29312,15 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20221024, - 1455 + 20230221, + 1532 ], "deps": [ "emacsql", "sqlite3" ], - "commit": "e318a6c8f65371e2ab667d811205a0d9a98dacbb", - "sha256": "1p8ianzpkr6yra7va4pb9c4l9j8dm1l769wzsap5cdqgg7k45inw" + "commit": "f0249f655fd1a2c066c5a1b3daa93c80c5ed9865", + "sha256": "1hic3rq48l7yvn8sgri66risnlbnjvg86wwmfihhx3xdxh5hgyyg" } }, { @@ -29015,25 +29451,31 @@ }, { "ename": "embark", - "commit": "a33cbf1d5cb58d2bb7dc535391bb1e1b0e718261", - "sha256": "1pwcgxgmf1pzq76gi4nhb3pq93v0bv48qnn0djdsxkk1snh3v5ni", + "commit": "9468051dcf3ef5b5eb7370168a84b3b9141233f0", + "sha256": "0ylnrfbyy66cx5vny21xxjpkd832pxinb5zh3qfqjm0nr121sw3b", "fetcher": "github", "repo": "oantolin/embark", "unstable": { "version": [ - 20221111, - 143 + 20230219, + 1700 + ], + "deps": [ + "compat" ], - "commit": "2aba953bf11f01b8ac9b2f44d151335eaf09802f", - "sha256": "0fd3x4f5dbm4bhqq3g2z03w6fb2zrrlvw6zxl39ldmq5gmparfbn" + "commit": "8e7c53a8ec6969a8d54a22c7cb76f15e2e7fa3f9", + "sha256": "0dj0qds3mqc7bi4z945519q260mc0jrkmwjh6cz74dlw4csd0c1a" }, "stable": { "version": [ 0, - 17 + 21 ], - "commit": "97270d725761ee02db461b45b18ec16ae31f203e", - "sha256": "1s0ssf4q9kg4c5w87h2ypyvrhi31mz3s6k4h7pxi9a47lkccq8n1" + "deps": [ + "compat" + ], + "commit": "784ce24a1ad37459041418182af49565cad4974b", + "sha256": "17ij5w1mv80j0rr3byahnldsbds8z1q2d61p9gsm0k8jdqxd4rrk" } }, { @@ -29044,27 +29486,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20221023, - 1636 + 20230218, + 2048 ], "deps": [ "consult", "embark" ], - "commit": "f2a83a6db4fbbf171692ca751ff7175daec62cff", - "sha256": "0gi2bin3kx2hf6v5lj6ijnwna0s9h6xpq1pmyjn5rdg331r408di" + "commit": "0cc29e67784cff6315ac068bc97b28dc30e6409e", + "sha256": "00hrajfmq2c8xhwzl2y09bcp891cz6mv2lj99yi71dpbmnrir9hv" }, "stable": { "version": [ 0, - 17 + 21 ], "deps": [ "consult", "embark" ], - "commit": "97270d725761ee02db461b45b18ec16ae31f203e", - "sha256": "1s0ssf4q9kg4c5w87h2ypyvrhi31mz3s6k4h7pxi9a47lkccq8n1" + "commit": "784ce24a1ad37459041418182af49565cad4974b", + "sha256": "17ij5w1mv80j0rr3byahnldsbds8z1q2d61p9gsm0k8jdqxd4rrk" } }, { @@ -29075,16 +29517,16 @@ "repo": "elken/embark-vc", "unstable": { "version": [ - 20220913, - 914 + 20230212, + 1920 ], "deps": [ + "compat", "embark", - "forge", - "s" + "forge" ], - "commit": "316ed8d6c9e3ec7af069efbf2391a977852f067d", - "sha256": "1d2d5sjpaqi3l911b66idjw1nsr4wl626ivr97fvn4lxlqqlhsy4" + "commit": "070666b0de8fc2832aa2510b9ba492565cb5e35e", + "sha256": "17hlwxxp5waz0n2bgn4755jc5c8z8xkx0y0ln9hkg565d35ms5wc" } }, { @@ -29220,28 +29662,28 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20221006, - 1511 + 20230206, + 1841 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "d9f67eeb1ce68c228fcbe02596318c6452b6292a", - "sha256": "0mafdjgyn7f6yzzl8pxasmanrz57xr385n00xyzg0p9dl7xrb2rd" + "commit": "43c61412492229eb641fe572c89c826d8fcf64d9", + "sha256": "1v6hvfhzz8vxm25w5kk4dfkml1mkq6h849qw9qffhd7v6abyfvl9" }, "stable": { "version": [ - 12 + 14 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "88cbd8c8fae985f077418647a5cb1b69f8b6d18b", - "sha256": "1kk4fqhj1rsahd5zn7ngs7si9blx1cvp75ch651r4a549mjbad83" + "commit": "ecd49294fdec8c7741a342acaf89cd408f0abf13", + "sha256": "08wlrylv486pr8jyc3837qhlxck2hrjrywmlacmhshgha4w8sdxc" } }, { @@ -29330,8 +29772,8 @@ }, { "ename": "emms-player-mpv-jp-radios", - "commit": "09ba6da5057061f055d4a3212d167f9666618d4f", - "sha256": "0gdap5cv08pz370fl92v9lyvgkbbyjhp9wsc4kyjm4f4pwx9fybv", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1i11jbzpr9r8sz1dn2lrdr4rkfwqncwg95h5xqj3bmgbcaqz3hpn", "fetcher": "github", "repo": "momomo5717/emms-player-mpv-jp-radios", "unstable": { @@ -29437,13 +29879,13 @@ "unstable": { "version": [ 20200202, - 1404 + 1412 ], "deps": [ "helm" ], - "commit": "d445e9cf907e2d1dd3b4dd98c98cfc00626e4ac8", - "sha256": "0yl98qa74ajrnwi85vac5hv08x9bn4njd7c5w1hdg06ncdfrnd51" + "commit": "ffcc84d7060dfa000148e7f8be4fd6701593a74f", + "sha256": "1na7mn9pgnwf9a1fbpb5k36aczzc7506ld5xm7mqpqgwshdxk0hq" }, "stable": { "version": [ @@ -29531,8 +29973,8 @@ }, { "ename": "emoji-recall", - "commit": "8f03b34d3e8e5edf9888c71b6e4bd2e1a5aec016", - "sha256": "06cahk2h6q3vlw2p4jmjrpzycxpm884p31yhbp77lagkqhs2fzbk", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1ahkzyqnyyci634sq1al7b8a9v7lihlkymyy4imsr14ab43wjr8k", "fetcher": "github", "repo": "lujun9972/emoji-recall.el", "unstable": { @@ -29609,6 +30051,30 @@ } }, { + "ename": "empv", + "commit": "34c97584afc6a2acb35a037f9594494fd7ee11b6", + "sha256": "0lxmggxpdzqq4pcyzwwzfbjkmpx1na07sky0dfh8g9iw7r061c90", + "fetcher": "github", + "repo": "isamert/empv.el", + "unstable": { + "version": [ + 20230203, + 2159 + ], + "commit": "a45a2a01a7e629c9126b444d952fe71bcc9a262f", + "sha256": "04hndxiq5k3zgh0wq8xcn8dzf65fg9zjqb9gav9w53dq3l236h81" + }, + "stable": { + "version": [ + 2, + 1, + 0 + ], + "commit": "5f06e038a98aeadf5e309b95c2bc0ec94355e7e3", + "sha256": "15svjgilmzlk2dpb81mm9w7226hzzz96k8ajrg1bdg1p1s3b8vb4" + } + }, + { "ename": "emr", "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", "sha256": "02a7yzv6vxdazi26wk1ijadrjffd4iaf1abhpv642xib86pgpfd6", @@ -29723,32 +30189,32 @@ "repo": "hrs/engine-mode", "unstable": { "version": [ - 20220519, - 1916 + 20221217, + 2101 ], "deps": [ "cl-lib" ], - "commit": "d99f9b4ab266b2b777f3f323f766687970456fa9", - "sha256": "1rmfdjg35an5s1grhja7vms10ngk3b980s4zhiszkayvyy61kpx0" + "commit": "a5f1ae2b087109f37a704c496942cec9d9f48698", + "sha256": "11ls3wrvfmcz61pps438x772nk06rqff91s3xi5rzc3n2hkl1ayb" }, "stable": { "version": [ 2, - 1, + 2, 1 ], "deps": [ "cl-lib" ], - "commit": "96b3488a6de2f50b8ba3a101e04ebcbe9821a989", - "sha256": "1xka8i4cdvp5r2v2mkli1zz17x1sdsnmszbhqav2rf94v656d91i" + "commit": "a5f1ae2b087109f37a704c496942cec9d9f48698", + "sha256": "11ls3wrvfmcz61pps438x772nk06rqff91s3xi5rzc3n2hkl1ayb" } }, { "ename": "enh-ruby-mode", - "commit": "cd1ac1ce69b77b11f34c4175611a852e7ec0806c", - "sha256": "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "07l7i1q08pixd215vq2qgwbsndvvvf13igw3mp7nkq77bnygsifk", "fetcher": "github", "repo": "zenspider/enhanced-ruby-mode", "unstable": { @@ -29857,15 +30323,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20221118, - 1647 + 20230105, + 719 ], "deps": [ "inheritenv", "seq" ], - "commit": "c54bf9e6972c563d345e20571ffd44d7bfb56974", - "sha256": "0nfk85qai1nfr7ls2vhrwnvqfrvf69gsfj4py2rk503wgxabchbx" + "commit": "1954e8c0b5c8440ea9852eeb7c046a677fa544f6", + "sha256": "0vjk8k5k9xsngk50nf611c4j0bikqn9l1y3m35s8y3knwqw22ii0" }, "stable": { "version": [ @@ -29888,8 +30354,8 @@ "repo": "youngker/eopengrok.el", "unstable": { "version": [ - 20200205, - 624 + 20230114, + 1413 ], "deps": [ "cl-lib", @@ -29897,14 +30363,14 @@ "magit", "s" ], - "commit": "6fa16c4ccaaebaef64dca0d3d29904c45fd6597d", - "sha256": "1y6n5b9pk4c3badzhwm7qv1jw60p34z55ljwhaaqlnmv7nq1qnj3" + "commit": "83b1695774f8bdc322e528ade9dffe9b2e93f32a", + "sha256": "16q6la89xmd084h520nf9f7306x28n60yfsngcb6pg6nz62qwvfk" }, "stable": { "version": [ - 0, - 6, - 0 + 1, + 7, + 42 ], "deps": [ "cl-lib", @@ -29912,8 +30378,8 @@ "magit", "s" ], - "commit": "6fa16c4ccaaebaef64dca0d3d29904c45fd6597d", - "sha256": "1y6n5b9pk4c3badzhwm7qv1jw60p34z55ljwhaaqlnmv7nq1qnj3" + "commit": "83b1695774f8bdc322e528ade9dffe9b2e93f32a", + "sha256": "16q6la89xmd084h520nf9f7306x28n60yfsngcb6pg6nz62qwvfk" } }, { @@ -30002,15 +30468,17 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20221118, - 2249 + 20230220, + 1945 ], "deps": [ "closql", - "compat" + "compat", + "emacsql", + "llama" ], - "commit": "40bb1f5e0c4fe155d34dc6f7b002fd2560c51013", - "sha256": "1lrpg2xwk8rs8zk125fs78w5nfs210r1qq1gbmi0zvyy2xz4jfrv" + "commit": "576ba9fedc360d2f7dfb724f9f767cc4688e5b7f", + "sha256": "1ghx8y814wi09zi3fa19nmxw7b0v6fp4mb49ibf46608k0vndq0y" }, "stable": { "version": [ @@ -30033,16 +30501,17 @@ "repo": "emacscollective/epkg-marginalia", "unstable": { "version": [ - 20220511, - 1942 + 20230212, + 2018 ], "deps": [ "compat", "epkg", + "llama", "marginalia" ], - "commit": "ee784211346c7c374accec2bda78788cc68fa641", - "sha256": "0pl4qwh3fhrj306qrhkfgp8w3yv2hbz2y88gsx1ifsipq22n2343" + "commit": "4f3a66946b1be11c40d1635b60ea21941c882e8f", + "sha256": "1kj720jfbrcss8p1rcinxa4rkqgjdh6xp9m5b754l1n73vx9gkin" }, "stable": { "version": [ @@ -30137,8 +30606,8 @@ }, { "ename": "eproject", - "commit": "d7e82668617a9b599f8994c720f3f123ba1e008a", - "sha256": "0kpg4r57khbyinc73v9kj32b9m3b4nb5014r5fkl5mzzpzmd85b4", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1fjiw0lhxgzgd4xag48ispwc5vxyj2nii8qyd6apwhzm3q8922py", "fetcher": "github", "repo": "jrockway/eproject", "unstable": { @@ -30597,20 +31066,21 @@ }, { "ename": "ergoemacs-mode", - "commit": "02920517987c7fc698de9952cbb09dfd41517c40", - "sha256": "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0lsbf3bk4v99zdns9kdvsn6d4rkrcfcd6sw2cvdl02gfxa1id296", "fetcher": "github", "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20220411, - 338 + 20230207, + 1551 ], "deps": [ - "cl-lib" + "cl-lib", + "nadvice" ], - "commit": "9cd89eef490f6c9f4af273bb3dd2c68d5ed2de61", - "sha256": "10p8pi5hlaka2pbrrzfcxjsrv142394k17z8hdx1fq0gvjcycrpl" + "commit": "c2a918c6ab13e29dba2caf2bd06496babd0dfca6", + "sha256": "0lbdxc1gwn7lgphkvwfr6jqzs1nwf60wly3n4xiyzjlw6v0ilxd4" }, "stable": { "version": [ @@ -30663,36 +31133,67 @@ "version": [ 2, 6, - 2, - 2, - 20221106 + 3 ], - "commit": "b00db9d927d8951c44ef2e80fd4941180e9f40e7", - "sha256": "17f1w71r4pbmssg40xx3nx2chk28f0nc8adhr4vnq3ijkw69v1c7" + "commit": "b499d12412bac32ab1af9f470463ed9dc54f8907", + "sha256": "1s7zd01i8pmvi90ywx497kc07z50nah7h0fc2dn6jzb132k5sh1q" + } + }, + { + "ename": "erk", + "commit": "4bcf4535681f284b16b6e80bd3c31fab4376085b", + "sha256": "0pk0yfn3d86x26j0lia1b2k81al7h64p312b4k5jxapavjnm19jf", + "fetcher": "github", + "repo": "positron-solutions/elisp-repo-kit", + "unstable": { + "version": [ + 20230120, + 622 + ], + "deps": [ + "auto-compile", + "dash" + ], + "commit": "6ca1aabc6c60c8722bc5dca4aedbc033b1d9fff5", + "sha256": "1rmynn992wd1138zy9dd5m4qi69hz1k7k27lgv19nawjyrf4ny2l" + }, + "stable": { + "version": [ + 0, + 3, + 2 + ], + "deps": [ + "auto-compile", + "dash" + ], + "commit": "008494af28ef37ecc60571e7b2212e44767db862", + "sha256": "0z5h709w01sss69g97608hrjf5zkqvijqafgq8v2p6a9nf6k3ymc" } }, { "ename": "erlang", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "1v3iq8wg71g5qf0ypz9h89pq1z02v5clp4sfpcsqppz0x5wp7dr2", + "commit": "4eda604708e52f417e30d284538aa02847de7f19", + "sha256": "1bmqwjq6lkj3a6szc2x0f25674a43674gfz8xg5r07d7z9xks5xa", "fetcher": "github", "repo": "erlang/otp", "unstable": { "version": [ - 20221019, - 643 + 20230215, + 909 ], - "commit": "1da7d9bc5ec5c30c34435aee72601f44c4e7e38d", - "sha256": "1vj3g17mgh8brfy7j0c76yn7s0hcd9hgmilnyhcplz8x76w96w4l" + "commit": "127026003180a834e9fa5d5919c824a184faeb92", + "sha256": "19ziz87sny9sck7ydp54mbp831r0g8sp8pznj9ak64rhbkc1nacq" }, "stable": { "version": [ - 25, - 1, - 2 + 26, + 0, + -1, + 1 ], - "commit": "38ad8e28421c745c06ef9bd55f6e6204cd1f15ef", - "sha256": "0fn6zyqrgyiznyghkhygak524f3clc3kz91rarq8cqn3r920dmg9" + "commit": "127026003180a834e9fa5d5919c824a184faeb92", + "sha256": "19ziz87sny9sck7ydp54mbp831r0g8sp8pznj9ak64rhbkc1nacq" } }, { @@ -30703,14 +31204,14 @@ "repo": "k32/erlstack-mode", "unstable": { "version": [ - 20220617, - 2049 + 20230202, + 1955 ], "deps": [ "dash" ], - "commit": "a4a30f74e48894ccfdefc073a9e1b005ee632017", - "sha256": "132w9xbdc6r7sa03wpyd0vpn0z12pgawv4r21ihpgqpqmk4srrj3" + "commit": "b0fa450da826b7b9fcfe9b0b209955735830eb38", + "sha256": "03p9cdmagr0ifvlq2z2c3c09s1airhgnpr2f9zr8q405r6l3ds61" }, "stable": { "version": [ @@ -31359,14 +31860,14 @@ "repo": "iostapyshyn/eshell-vterm", "unstable": { "version": [ - 20220506, - 1212 + 20221229, + 1328 ], "deps": [ "vterm" ], - "commit": "4e8589fcaf6243011a76b4816e7689d913927aab", - "sha256": "0hsby6ardi9g37agh181sgvsdvjmvi1n6jsqp34mwslwx7xxjvbv" + "commit": "e96c30ad5e7d63b778fc3232e81b090b63b13277", + "sha256": "0zgf2yv85awlxc44cqbnyrzbkygxqp6hdqfskyg8qqjbm56cycvy" } }, { @@ -31551,16 +32052,16 @@ "repo": "ecukes/espuds", "unstable": { "version": [ - 20160905, - 1300 + 20230218, + 910 ], "deps": [ "dash", "f", "s" ], - "commit": "ef854367d469c6eff459d24a544addd21a4fbd23", - "sha256": "024msmnwlnsgqa523s3phxj1g77pyw917gz1fhz56062576nv22q" + "commit": "57c18a48f1a01d8174298eaab4fcf3b2c6549291", + "sha256": "00m4v31ig5nvnnfl2ahz3dw40njvrxzfnch3ly6asvf2b17spa9i" }, "stable": { "version": [ @@ -31631,17 +32132,17 @@ }, { "ename": "ess", - "commit": "30182a89f9f9396f4b3ab8ee0722d99f2fedb221", - "sha256": "0flvvnyrym5dl095sm9r0cj5lgqrb4whl4zrzg0l124kwk5v9h50", + "commit": "c1cca9d0b5a701d542f37f21748eb4be00af3b4a", + "sha256": "1caxv38inm5sgd39162c3jc0d5myaimn7wx044r1krj687as5lx6", "fetcher": "github", "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20221108, - 1714 + 20221204, + 1348 ], - "commit": "7ec23bf341c23445c98f5e1faf6a1369b92f2e9f", - "sha256": "0g0gp2f5a1p4vh60yispyq4ilq744j5qa3bds362f9cwcf32q7cw" + "commit": "b6aefb9ca231c3cbb1a6532b8afa4022c2678f81", + "sha256": "0xjj842cxqg6lka9h4a0qamdjc0iifnhcddpdafarbssh2qaxiys" }, "stable": { "version": [ @@ -32010,8 +32511,8 @@ }, { "ename": "eterm-fn", - "commit": "a1955059915511fd16c2d671c262dde47adf724a", - "sha256": "1v4kpix16a07i95lcryj65ln0l31vs9k7jfnmdyrpsf7q2mw7z0j", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "18rn0mhq9fmpj2cdr6i499n9p8r51pj6h5k0wa8kz52fjgf07l73", "fetcher": "github", "repo": "oitofelix/eterm-fn", "unstable": { @@ -32247,11 +32748,11 @@ "repo": "beacoder/everlasting-scratch", "unstable": { "version": [ - 20220412, - 921 + 20230105, + 507 ], - "commit": "b3f8339f9564a1926bd8b71c163fa7660cc3b1f4", - "sha256": "17lbrcgddrxw111a8al3i5cgnksmkv1qi0wzqzmvvggq073mvmqr" + "commit": "1b7dac779501dcd988552aa6455a5be89e8b0562", + "sha256": "0hpv7a7jjs0shs7cda8q1bigwjb31miqbf8f4wr2swmjhh15w7h8" }, "stable": { "version": [ @@ -32270,15 +32771,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20221115, - 1255 + 20230220, + 1805 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "5ce46a1fc175a8f13507ce2b6ec4c3618923f093", - "sha256": "19mkwjnsq04mldc70mimkl7bc9mqigc619rpzc9dl7z65z7fgk8c" + "commit": "22d76a4080e40381aae194c94f3bc16ba67a330a", + "sha256": "110gdl73jfy0r28vs34bipyq692h2v1wfinrgkpak1s09zwcmnd3" }, "stable": { "version": [ @@ -32394,14 +32895,14 @@ }, { "ename": "evil-cleverparens", - "commit": "e3b3637d6527b16ea0d606fd87b01004be446b09", - "sha256": "10zkyaxy52ixh26hzm9v1y0gakcn5sdwz4ny8v1vcmjqjphnk799", + "commit": "e00f4c64711143d30e754f48b1f38937aec9a5ef", + "sha256": "0wwav0094drn3wx2rdpafvjqb2458ni5nzw9c4aigsrih9qghhzq", "fetcher": "github", - "repo": "luxbock/evil-cleverparens", + "repo": "emacs-evil/evil-cleverparens", "unstable": { "version": [ - 20170718, - 413 + 20230216, + 2148 ], "deps": [ "dash", @@ -32409,8 +32910,8 @@ "paredit", "smartparens" ], - "commit": "9bce7cc5e2ab80adeafb0f1a579eb27bdb7a8d2f", - "sha256": "1wplh9lk0cplkpik088lk5am5b8ks0rs8bp3b6wn0bn1r0l3jcxg" + "commit": "8d92bd47f07ca2dcf15835cfc3cb6e3a29c6146d", + "sha256": "1kp1n8x9xbqxjba2aizpnvv2236mv8831ahf2a7wah269i0z2fpv" } }, { @@ -32421,15 +32922,15 @@ "repo": "wbolster/emacs-evil-colemak-basics", "unstable": { "version": [ - 20220222, - 1856 + 20221230, + 1443 ], "deps": [ "evil", "evil-snipe" ], - "commit": "66648de206a7368013f28c0d053b1b32c3efe6c6", - "sha256": "1h9d9jicvc8kdw8yfpsasl038h7s6zpfh1gjfcxn3lwgfmfnjkh1" + "commit": "ea519b962f051cabced8aadaf6ed0134b861225c", + "sha256": "10gk3gi1g35xjkg6qfs3k83p9z8bz5pbi4av7g4ibj5f8h70gxzi" }, "stable": { "version": [ @@ -32471,15 +32972,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20221031, - 1942 + 20230214, + 1800 ], "deps": [ "annalist", "evil" ], - "commit": "c3611aefc36d2236de1f085720c4c017ac0eb4cf", - "sha256": "0hbrvvb4h34w5fh4hplg3z3if13jqzll0lbsfg8ic1l61nicky4q" + "commit": "aaf3e0038e9255659fe0455729239c08498c4c0b", + "sha256": "1791240px7n98k18cxsi2shdbjiayn80r20y86qdmb8j82rpdqcn" }, "stable": { "version": [ @@ -33019,11 +33520,11 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20220927, - 220 + 20230205, + 420 ], - "commit": "ec3dd819983b2d824142efddd46ef29b46a7c454", - "sha256": "00yclv8fky3czwnp3qfvcbbadqagqzyf6cxq50vyhmvjhnf9xspi" + "commit": "2218356f05ad19efc9476d0bd10051843d2306da", + "sha256": "06vwfb7qn488i7mai30g5x9wa5yjwi7725i6ngnz5i7j9xn4hx93" }, "stable": { "version": [ @@ -33148,20 +33649,20 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20221015, - 245 + 20221207, + 1245 ], - "commit": "9609fb170da00aeca1716b022d93e1cb68464a34", - "sha256": "0xrbmz9mx4aclqgjyjaq7vj9xf4291rw4nxaz2nvqblv8yylqbr0" + "commit": "8c0f23d46a3927b9f83c1c2c4590be53d0b740db", + "sha256": "1v2iwci0yc1sld1sidrwdnqriyhs78ba3gp4d9az0af48grl7x1w" }, "stable": { "version": [ 3, - 5, - 8 + 6, + 0 ], - "commit": "9609fb170da00aeca1716b022d93e1cb68464a34", - "sha256": "0xrbmz9mx4aclqgjyjaq7vj9xf4291rw4nxaz2nvqblv8yylqbr0" + "commit": "8c0f23d46a3927b9f83c1c2c4590be53d0b740db", + "sha256": "1v2iwci0yc1sld1sidrwdnqriyhs78ba3gp4d9az0af48grl7x1w" } }, { @@ -33187,14 +33688,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20220731, - 2346 + 20230117, + 53 ], "deps": [ "evil" ], - "commit": "7bd9bb0bce2ed61fa256952fbf37fc5259928925", - "sha256": "0z8rma0h615lybvbx67apcddy7jfm4lbrg6hr5k4hmll3q7b594r" + "commit": "8724645c84dc310f6155eec452913bb79c0c44b3", + "sha256": "0dxw2d85zxnh7rgfq1vn9b71nrn48j5c7fwbzb02m74qddcjnjg0" }, "stable": { "version": [ @@ -33491,14 +33992,14 @@ "repo": "porras/evil-ruby-text-objects", "unstable": { "version": [ - 20200323, - 1552 + 20221130, + 1832 ], "deps": [ "evil" ], - "commit": "8f8085b3088b2d17e4f2ed1a61a97dbb27a19c3d", - "sha256": "1y8gji67drk45h05ijjcqsjr9hbwj8fnfbhrgdmvmfv80b6f8khj" + "commit": "41c8b3eddb610206626a8a03e69857f903209e86", + "sha256": "1gakixp64ds35vfykp0niy9gdxymr1rlx2hphlbic1952dinvx9c" }, "stable": { "version": [ @@ -33644,15 +34145,15 @@ "repo": "ninrod/evil-string-inflection", "unstable": { "version": [ - 20180313, - 1755 + 20200524, + 1402 ], "deps": [ "evil", "string-inflection" ], - "commit": "5512db7e0e5fd28c881cc278add50ffae1f121f0", - "sha256": "1114yacpb0a0lp7kz0lb1mb7s1adhk370i3kj78a911i72c9szi1" + "commit": "d22a90ab807afa7f27f3815b5b5ea47d52d05218", + "sha256": "1vwch4kwwh82k1rlc9qsg74zbghn6vkgch5xb1wz0dmbv4id06l5" }, "stable": { "version": [ @@ -33676,14 +34177,14 @@ "repo": "emacs-evil/evil-surround", "unstable": { "version": [ - 20220504, - 802 + 20221229, + 1650 ], "deps": [ "evil" ], - "commit": "c9e1449bf3f740b5e9b99e7820df4eca7fc7cf02", - "sha256": "1ghc10rsrfvmd7m5qf7695gz241v9m5c2fg2mflwy8pw0h2l9nki" + "commit": "f273821f575ace519066fb106ee45a5b8577475f", + "sha256": "10d6q25m5wly4iysyybkha9y8mlfikqb2smra1zy6xvkxyx5mclr" }, "stable": { "version": [ @@ -33794,15 +34295,15 @@ "repo": "iyefrat/evil-tex", "unstable": { "version": [ - 20221021, - 1344 + 20221127, + 2033 ], "deps": [ "auctex", "evil" ], - "commit": "97616a81fb88ad558051b57d899fdaba56d8d7fa", - "sha256": "1v80bx3gq7ld03gzafbnsj2nkzc6zd7v7lsmdcp9qdpnnz88i3ky" + "commit": "3e0a26b91a1a56b0f35cbd450d01431057551750", + "sha256": "0bkr7hgwf0zi359l77r79dns2zx8xnb8l9h79hk20bn00d0dlg7v" }, "stable": { "version": [ @@ -33973,15 +34474,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20221024, - 351 + 20230219, + 400 ], "deps": [ "evil", "tree-sitter" ], - "commit": "087c3c3ce249515446d01f4a98d9fadc2bc41666", - "sha256": "0jds213935jf84fq6ks0fcd6ilc14xzfs1rdmhr4kajalkl8127w" + "commit": "02f8253034042d8f171bc0ef93e3538b71a29153", + "sha256": "0r2wfs1762jnh1svypyzgc00f8la4vjlaxz1bifbds11ac6g4726" } }, { @@ -34033,13 +34534,13 @@ "unstable": { "version": [ 20150103, - 650 + 653 ], "deps": [ "evil" ], - "commit": "79b47a9f444ddaa289c66e8995ee116941429c24", - "sha256": "11hiaxiqc2f522y7rgfr6bjnmx4nrssq1q9g96w4rsb10627qvsf" + "commit": "909273bac88b98a565f1b89bbb13d523b7edce2b", + "sha256": "1rskvkmz30xyy8xfjf2i35f3dxh663gb3plfy3f0j6z17i086jl2" }, "stable": { "version": [ @@ -34099,15 +34600,15 @@ "repo": "roman/evil-visual-mark-mode", "unstable": { "version": [ - 20190116, - 1557 + 20230202, + 318 ], "deps": [ "dash", "evil" ], - "commit": "ac5997971972a9251f140b5542d82790ca4a43b4", - "sha256": "1gh5614l4zf15109zc64pnnc5rp5ilah9mavgr2rbv2874k3vs4n" + "commit": "2bbaaae56ae53e68a8bcc7bc2cfe830a14843b4d", + "sha256": "1ggxifiz2qm26v2fw8m9ccjp3jbmhyhb8wv93m8k1pnyh8b7la2m" }, "stable": { "version": [ @@ -34294,14 +34795,14 @@ "repo": "cyruseuros/ewal", "unstable": { "version": [ - 20190911, - 1315 + 20200301, + 839 ], "deps": [ "ewal" ], - "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61", - "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar" + "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", + "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" }, "stable": { "version": [ @@ -34324,15 +34825,15 @@ "repo": "cyruseuros/ewal", "unstable": { "version": [ - 20190911, - 1305 + 20200301, + 839 ], "deps": [ "ewal", "spacemacs-theme" ], - "commit": "7b3d4160413f9649866f5cac033b5f932ca436f3", - "sha256": "1mx3zb0iajrhnph62m9q5dbdwnbhrpafbf5mcpyyd75p933qlhra" + "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", + "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" }, "stable": { "version": [ @@ -34403,14 +34904,14 @@ "repo": "ninrod/exato", "unstable": { "version": [ - 20180305, - 1042 + 20200524, + 1319 ], "deps": [ "evil" ], - "commit": "39c08f56483243c28a39886a7218039a138e5f63", - "sha256": "1q0jjaw5k9bql7bk5idin724vbcgx0iwn2dm4mg1c51cczqsd2rg" + "commit": "5e7b5721bf48aa49c6cdb5d41b908ef7d513b2a8", + "sha256": "0xia8dvpz294pqc3zdr0knhdlw251dhkdm69v1005674kd15259w" }, "stable": { "version": [ @@ -34488,8 +34989,8 @@ "repo": "anonimitoraf/exercism.el", "unstable": { "version": [ - 20221030, - 2058 + 20221220, + 2047 ], "deps": [ "a", @@ -34501,8 +35002,8 @@ "s", "transient" ], - "commit": "22b270047541a8173467d0e929e318b9f8606c3c", - "sha256": "1z0plm622dn5ybqlmagiy91wqj956qrlyys6557yw1l1rqvjc3ds" + "commit": "a8248e1afdae9155992227611cf134ec49fdd489", + "sha256": "1zh00fk9s9xbrm6h6d3jz3qj0vccyhibghibb4lxv56c0mvav0bj" } }, { @@ -34721,11 +35222,11 @@ "url": "https://repo.or.cz/external-dict.el.git", "unstable": { "version": [ - 20221113, - 1021 + 20221210, + 407 ], - "commit": "c790489635a497cdb8f4277a982677c95479ffb0", - "sha256": "08sh4j4hd09r9ahrr19g1lky14s7sqqpyjhjwn3lv0mbs971zhgn" + "commit": "a9ceb6c2e12df460ce1686d47cafd88f212d0291", + "sha256": "1sdnzdph6gck2ghmafad10xc99avj7i01ad2r9r6iixhpa5qbpb9" } }, { @@ -34925,16 +35426,16 @@ "repo": "tumashu/exwm-x", "unstable": { "version": [ - 20210419, - 950 + 20230119, + 624 ], "deps": [ "async", "cl-lib", "exwm" ], - "commit": "2ab026f407b011a8e8380c889990e85e69cb3a4e", - "sha256": "05jilbhpbbqbgpxhy11yadmal4gsh8bh1fffxkz8b5k8dpajc634" + "commit": "1e2bbfca872ad76eaa8f1c00d17762bed256881a", + "sha256": "1cwbdik88qw365avw2977snlj9wajyixhidlbncj2y022s5f9y2m" }, "stable": { "version": [ @@ -34970,6 +35471,26 @@ } }, { + "ename": "eyebrowse-restore", + "commit": "57869beea37deae6869554a8e4f8a17d8e20238b", + "sha256": "11whdav4wpmvqy29zpl8s9wq8jvjca06qr2qz8331w9flbxmzzz9", + "fetcher": "github", + "repo": "FrostyX/eyebrowse-restore", + "unstable": { + "version": [ + 20230122, + 1510 + ], + "deps": [ + "dash", + "eyebrowse", + "s" + ], + "commit": "77f171de019586a66481bcde6ab11f3689e97bc6", + "sha256": "1klsdbx7063p46ipq8k7z37vd4x6kg46lrjic7qdz4x7qi35ipp3" + } + }, + { "ename": "eyuml", "commit": "b09a8d723e357da67441e65047759ccfa9cb7ef6", "sha256": "0ada2gcl8bw9nn0fz8g9lbqy8a8w1554q03fzd7lv8qla33ri3wx", @@ -35020,25 +35541,18 @@ } }, { - "ename": "eziam-theme", - "commit": "4e0411583bd4fdbe425eb07de98851136fa1eeb0", - "sha256": "0iz3r4r54ai8y4qhnix291ra7qfmk8dbr06f52pgmz3gzin1cqpb", + "ename": "eziam-themes", + "commit": "d63e2c2812b3b0932d16bb945da13d4498cc59fe", + "sha256": "1f0wakas4fqf9bmx9w17i0a3k5w698jrx13faydd12kdz7kwbwdr", "fetcher": "github", "repo": "thblt/eziam-theme-emacs", "unstable": { "version": [ - 20221003, - 1256 - ], - "commit": "5bec687a692331f7d8e1fe012817d66c40234bad", - "sha256": "1br74wkzvq51wqhimsf0c7pzvfpcb80hb47dqjahh938y7x0fkdc" - }, - "stable": { - "version": [ - 5 + 20221121, + 1609 ], - "commit": "5bec687a692331f7d8e1fe012817d66c40234bad", - "sha256": "1br74wkzvq51wqhimsf0c7pzvfpcb80hb47dqjahh938y7x0fkdc" + "commit": "7fba717293072d0afdbd1c45351ddf47b26b3064", + "sha256": "14v23aqyl971yaw00xmqymlmw6abkx1biflqy1q0908q6fzg170n" } }, { @@ -35049,15 +35563,15 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20220911, - 711 + 20230116, + 1032 ], "deps": [ "dash", "s" ], - "commit": "d50dca48929575642912bb5bbb2585709ba38f82", - "sha256": "0mr0i823m9fs8n0qf1cj7lvlbyjspk8kblhk9br2hk7hnxk470xz" + "commit": "8a70ba3002197e3c6421181492b60b37d4d4af7b", + "sha256": "1lg0mkcvr4x399m2cp8ryzwv9vqwv0bgkc59af43xz6ry26mpgbh" }, "stable": { "version": [ @@ -35286,11 +35800,11 @@ "repo": "ideasman42/emacs-fancy-compilation", "unstable": { "version": [ - 20220725, - 2313 + 20230109, + 536 ], - "commit": "6d98cf908b0bbd6286a55e6bf11905010468a006", - "sha256": "0b4c8wr8r1ch0g8s7whpxxfj3gsysaay4n1xznas36157v9d4135" + "commit": "889e77c899cbf28673915b7b0161d45734bfdcb7", + "sha256": "1zxynjsa6h0nvlkrvbdrzvqkxq10sggsg62lpaf1gzx1wqshhfq4" } }, { @@ -35743,11 +36257,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20221025, - 1830 + 20230215, + 1641 ], - "commit": "da958db7a6fdeeaf202cd8fdca630e85dbf6a455", - "sha256": "13ycnl5js9j8208cawm3vpkcqzw6nfjf097hihy3nsn9x1wszlkl" + "commit": "52da9715b0d046597cb322d3a98cb27ae6e5719e", + "sha256": "1vkzgmxmghbsb7mk0dc3cl07f7isvbgc36vw7v16rmfr1av3z1lz" }, "stable": { "version": [ @@ -35807,6 +36321,25 @@ } }, { + "ename": "ffmpeg-utils", + "commit": "b96e8296708e27ec51b5a084a924bdb86d07ae5d", + "sha256": "1b58yf8q8sflsyxxjklxarb5xs337577h01kv03hgap1s4cxwm84", + "fetcher": "git", + "url": "https://repo.or.cz/ffmpeg-utils.git", + "unstable": { + "version": [ + 20230212, + 55 + ], + "deps": [ + "alert", + "transient" + ], + "commit": "7ae311d235514b7b5bf12dc2c214856856c2c411", + "sha256": "002f7s6dncmlzv40v2ngp7165fkxyb1rc5malfx57jf4y5cs9vp6" + } + }, + { "ename": "fic-mode", "commit": "0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f", "sha256": "0yy1zw0b0s93qkzyq0n17gzn33ma5h56mh40ysz6adwsi68af84c", @@ -35852,6 +36385,37 @@ } }, { + "ename": "file-info", + "commit": "85c92093f85d5545fab608b5eff1adef190c95a1", + "sha256": "0ig5qjnz03v37xci361sygb1ysq09gwq1gp40fcnrn78x05m9b94", + "fetcher": "github", + "repo": "Artawower/file-info.el", + "unstable": { + "version": [ + 20230214, + 1955 + ], + "deps": [ + "browse-at-remote", + "hydra" + ], + "commit": "0c7717796ed84629145387b4b9ef60b600c3efc0", + "sha256": "1xs5y96adwg2b0qdm7icgw5ma9nn51ikzchwy7kwswhx054ad9pa" + }, + "stable": { + "version": [ + 0, + 5 + ], + "deps": [ + "browse-at-remote", + "hydra" + ], + "commit": "d598b5cf6d9cb14e83c3a406eb48d262e12b6c0d", + "sha256": "0hlap2an8s6qiy504vy4bgksf1dc2g9q1z6mq05349yya5kni46f" + } + }, + { "ename": "filelock", "commit": "bda76dfbf37eaa17bebb4b8c34006704862db433", "sha256": "13ra697y0fhkjwsaqqlphcyfqkaiix5z59qw4q6rgix4k8ypj8db", @@ -36172,11 +36736,11 @@ "repo": "thisirs/find-temp-file", "unstable": { "version": [ - 20200117, - 2254 + 20221119, + 1350 ], - "commit": "2bfcdba0d6a8a0e6faa080cb04ff0f7ed06491ba", - "sha256": "1fr48mkrwxmpjk5lrznrr6nhnj8h6d3v984261nm44c0rzziq7vj" + "commit": "601e39b052c66df4cd928cf7e308dd6a54769a99", + "sha256": "0mlzrwiv9m8404lx576gkig8icmp7v2fk36x7z1zw2r4vi6r0qc1" } }, { @@ -36232,8 +36796,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20220722, - 1932 + 20230116, + 1124 ], "deps": [ "async", @@ -36244,13 +36808,13 @@ "s", "transient" ], - "commit": "cb4ed363d2ada2bff621c6b6586fe0c3342331b6", - "sha256": "0600b0f5m6s38r1m5z21gzl1pp29sircm89y5rf6imqgwasnx9gd" + "commit": "286bea5b4f27d906aa7fe71baa35c8f2bf55c286", + "sha256": "0g8sg0d1d6p9lwxnb0agj3cjnhqwyxgddqpvpi271l2hvvdaq7y0" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ @@ -36262,8 +36826,8 @@ "s", "transient" ], - "commit": "a0fe025086046aecf5490c993afe9e716324f7e5", - "sha256": "0g5pv08mv4c9jscsp1cyldwi3xdyppys6m1bsq293v5kk38agmdf" + "commit": "5e20777922aafb6afc2ddac8f4a62cd0c1ed987d", + "sha256": "1hpp2raw4ga0z8ydjg1j8pmkzks2j5qp2p8wxzcr6bnisgh1k5b8" } }, { @@ -36660,11 +37224,11 @@ "repo": "seblemaguer/flatfluc-theme", "unstable": { "version": [ - 20220522, - 1657 + 20221204, + 939 ], - "commit": "1679983d22a3b213262e09b3b25db75818a9d37a", - "sha256": "1ikkr45bdkajg1s3slq00wwrk06iyly2rnrigzm5vnbw6b5ildn4" + "commit": "553167d27725d078f5c66ed7a31ca8ec9376dfd0", + "sha256": "1d7ffaa90r9n89xx79f0mkmg40p96f415n1lg603vfy6dls1dfmb" } }, { @@ -36759,27 +37323,27 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20220729, - 145 + 20230116, + 1638 ], "deps": [ "buffer-manage", "dash" ], - "commit": "07d0e124712f50dfe86a597cf4c7c794e7cdc69e", - "sha256": "03la8jd4n15gx92xl7z5b29xjly2if0pva2bfzqvsm88njp4wgaw" + "commit": "791e297048e02ef1649ad17a5a2bd9d78e766c03", + "sha256": "0dn0jqx3wrkh0hbqdxvaw6nbr37snxbaf3hgam4fgb8s25m7d0a8" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "buffer-manage", "dash" ], - "commit": "c1c696433a650b0273f28da4f57bde7960395386", - "sha256": "0ls1ghh7j0lmp3l03d5pmczqs54rxwd8p5wpf28mvy0w28vw2m33" + "commit": "791e297048e02ef1649ad17a5a2bd9d78e766c03", + "sha256": "0dn0jqx3wrkh0hbqdxvaw6nbr37snxbaf3hgam4fgb8s25m7d0a8" } }, { @@ -36799,21 +37363,21 @@ }, { "ename": "flim", - "commit": "94faf56ff9bf94f51ef5253e4c4244faec5eecfd", - "sha256": "1gkaq549svflx8qyqrk0ccb52b7wp17wmd5jgzkw1109bpc4k6jc", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0s1xjvizn3jwn9h5iq83vdmw6lgmpfk7dhvlj2ayb59q7bmf4xla", "fetcher": "github", "repo": "wanderlust/flim", "unstable": { "version": [ - 20221103, - 353 + 20230205, + 1423 ], "deps": [ "apel", "oauth2" ], - "commit": "57c6b868aa314717f40a520daed7249665e8d992", - "sha256": "1mf8r5mf3bd0719fnhifb6lfvl7n4m552crcdhkbkkif8srrl6df" + "commit": "2cf5a7891090faca8de725b1d3743dcedf233ea2", + "sha256": "1wsnipyl3blldcl8ynmpj1mxfvl7kjmxd8gapl83vqd3r0l9cr6q" } }, { @@ -36973,11 +37537,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20220526, - 1214 + 20221225, + 944 ], - "commit": "49506681cd2d80713af5a04a2d33b8e6d89e3b96", - "sha256": "0hpq7yxk6wvnhfrbxs90wkncgyvygr7yfjzfqv719q5dag5mk5b4" + "commit": "684f15ea19c4a7947eda945cb6e58a67baec8e90", + "sha256": "0nqzy8b27nxfpg7gh5wdh1h3dbsapa4nh4gs0yx2x1a4r3v2lh0v" } }, { @@ -37025,14 +37589,14 @@ "repo": "lewang/flx", "unstable": { "version": [ - 20211101, - 146 + 20221213, + 542 ], "deps": [ "cl-lib" ], - "commit": "e3b3f0533e44c5250ce73d728b59a7e96c692b5d", - "sha256": "0sgs83gn6ms90yk68ygvcib8k5k94ql6s23qzllas07qzmx0cn48" + "commit": "7b44a5abb254bbfbeca7a29336f7f4ebd8aabbf2", + "sha256": "18vzjsscm9hsxxnacqfaskwayxhlg258rj8m7m8kim12nndgkzcy" }, "stable": { "version": [ @@ -37055,15 +37619,15 @@ "repo": "lewang/flx", "unstable": { "version": [ - 20180117, - 1519 + 20221213, + 542 ], "deps": [ "cl-lib", "flx" ], - "commit": "9c5cb5de0202b4eaac9359c84ca7ce9cbd7ee835", - "sha256": "0i7pj4l0ilihvkgal8d71idy5jr9zwanzxch350pg4myr6j1hnad" + "commit": "7b44a5abb254bbfbeca7a29336f7f4ebd8aabbf2", + "sha256": "18vzjsscm9hsxxnacqfaskwayxhlg258rj8m7m8kim12nndgkzcy" }, "stable": { "version": [ @@ -37106,8 +37670,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20221112, - 1552 + 20230218, + 2135 ], "deps": [ "dash", @@ -37115,8 +37679,8 @@ "pkg-info", "seq" ], - "commit": "ab93e2db1dd8333e86f8aeeafbf1e2a0e5f0be38", - "sha256": "10q5jlkbg0hvm96n2xr8k16ykwdvchb04h79bzhhm4x3zd99q4p7" + "commit": "55614401a955e73f5c0f05c0e098d9e717e3116d", + "sha256": "1ywsdyzagwzrj0mjifn4yzyv5xxgaxrr865rxrp6dj474h054dnj" }, "stable": { "version": [ @@ -37465,8 +38029,8 @@ }, { "ename": "flycheck-clojure", - "commit": "c9c642a234f93ed4cf5edcf27a552a8916984946", - "sha256": "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0xfhgnn6ixypvaqysr2zc3lcqz5j6xsm2s5kb4id2xnl7s1pp0b3", "fetcher": "github", "repo": "clojure-emacs/squiggly-clojure", "unstable": { @@ -37523,15 +38087,14 @@ "repo": "flycheck/flycheck-color-mode-line", "unstable": { "version": [ - 20200528, - 416 + 20230106, + 1829 ], "deps": [ - "dash", "flycheck" ], - "commit": "575b604cfe21f65fb07c134392c382c163c87739", - "sha256": "04wc61my2p6zbq22nh6yvap5aww9lfr5zgd7mf0l1chbvi9scdn0" + "commit": "df9be4c5bf26c4dc5ddaeed8179c4d66bdaa91f5", + "sha256": "0hrpljkq5djgpz9llk7hmqfym9svq3l8nhlbd27bhpv95bdp58w9" }, "stable": { "version": [ @@ -37706,6 +38269,36 @@ } }, { + "ename": "flycheck-deno", + "commit": "cbf839b7120e52fdd09f9f8ccbcaa7d8a4c590c2", + "sha256": "1bsnms8ccf4qh9g0gzr8cs82azbq1c2ajk2ahdyrsv8ngr8c2r4b", + "fetcher": "github", + "repo": "flycheck/flycheck-deno", + "unstable": { + "version": [ + 20230212, + 1754 + ], + "deps": [ + "flycheck" + ], + "commit": "e7cd15a6a05be73d1f83a16d2efa6b49a105a9cd", + "sha256": "12xy90xlzgrcb4kwh9xlnav7c8kdszf9i4qrk0klkj3p0xbpj0qd" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "flycheck" + ], + "commit": "ea7a5330535bdb25edb1c147f4d6d426abb1e097", + "sha256": "1vvhzidnpzf25z5qn85zx7cpwaavd22vsds4q9y5mpmf8hi526l6" + } + }, + { "ename": "flycheck-dialyxir", "commit": "fa49551b8f726c235e03ea377bb09a8be37b9f32", "sha256": "0pacxidpgwp7wij17c5r0fm5w3nga3lp4mcim365k3y5r4ralc0c", @@ -37828,6 +38421,25 @@ } }, { + "ename": "flycheck-eglot", + "commit": "ead6dfff6183385b6792bae4637bcaec76d87428", + "sha256": "0awm312r8my2fy7b2zchhfsf12mv7ad24d4wx85f9p5dalgi2340", + "fetcher": "github", + "repo": "intramurz/flycheck-eglot", + "unstable": { + "version": [ + 20230202, + 1844 + ], + "deps": [ + "eglot", + "flycheck" + ], + "commit": "31905ad676d67fb2967a3b6d907312380696615f", + "sha256": "1zkwb0w5rp0b53r4plvckwild717crv51ymfmhcdqdrjlv9qpzca" + } + }, + { "ename": "flycheck-eldev", "commit": "170b59e0f97ea8a27910efc1de3c82ee188a3fe5", "sha256": "0z83w4gd34g4kgdfc46c5zkhm0awa1hhi9p600k3sd4n8ac2ms4m", @@ -37904,14 +38516,47 @@ "repo": "emacs-elsa/flycheck-elsa", "unstable": { "version": [ - 20220523, - 1105 + 20230217, + 1640 ], "deps": [ + "flycheck", "seq" ], - "commit": "39c486096d76344f3045e69620b277ee34b6e5e8", - "sha256": "1i7r9k28d0x4gsr4if2xx6karny8f5jrbxvi5529sh8sacl6dyfh" + "commit": "d60db9544d0c4213f2478bcea0fd0e668e31cf34", + "sha256": "1ig9dc7ch3cdxp4p24v21h7hrdph9y5jy9421bfww6agymbj8i85" + } + }, + { + "ename": "flycheck-falco-rules", + "commit": "17600e84166aea88b8447b8dfffecdda6d8723f8", + "sha256": "137svv88rha39pp5k68bf3rkm4fh9vgn48b5pi2ykkrcs29vj5gz", + "fetcher": "github", + "repo": "falcosecurity/flycheck-falco-rules", + "unstable": { + "version": [ + 20230213, + 1603 + ], + "deps": [ + "flycheck", + "let-alist" + ], + "commit": "ba359f2d5968df47a100e78758f280fe0c965f07", + "sha256": "03w6alsvp7bcb2qpgva9w67c1xdbcgfgan6kfzmf6shrni93gldk" + }, + "stable": { + "version": [ + 0, + 9, + 1 + ], + "deps": [ + "flycheck", + "let-alist" + ], + "commit": "ba359f2d5968df47a100e78758f280fe0c965f07", + "sha256": "03w6alsvp7bcb2qpgva9w67c1xdbcgfgan6kfzmf6shrni93gldk" } }, { @@ -38074,25 +38719,25 @@ "url": "https://git.umaneti.net/flycheck-grammalecte/", "unstable": { "version": [ - 20220822, - 2307 + 20221216, + 1904 ], "deps": [ "flycheck" ], - "commit": "314de13247710410f11d060a214ac4f400c02a71", - "sha256": "0xxg98mny4f5x9j9s05an668v0b4d6r6f87nmsfni8wjf3f404zy" + "commit": "68c5087c8b31cf10fb9df77478edd24200fb4108", + "sha256": "0m9bf2hflnf9z2iphzq0hgvyk204gpq6bzc1kjds1bwbx468jabi" }, "stable": { "version": [ 2, - 1 + 3 ], "deps": [ "flycheck" ], - "commit": "314de13247710410f11d060a214ac4f400c02a71", - "sha256": "0xxg98mny4f5x9j9s05an668v0b4d6r6f87nmsfni8wjf3f404zy" + "commit": "68c5087c8b31cf10fb9df77478edd24200fb4108", + "sha256": "0m9bf2hflnf9z2iphzq0hgvyk204gpq6bzc1kjds1bwbx468jabi" } }, { @@ -38103,16 +38748,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20221116, - 1127 + 20221231, + 1654 ], "deps": [ "flycheck", "grammarly", "s" ], - "commit": "c9ed648745cb94dc3420d622f84456decd0d0aeb", - "sha256": "0mggj1jma9r3sg6qc9zjbll7a9yklsyjf8kyg3g2vha7qchwaml3" + "commit": "d4a788acc3875a1ffdd7460ab3377a887413c582", + "sha256": "1mg6x85dmawfjmxc5vcq546ykz3m3qby2l3hnaagh7srwvvz09cy" }, "stable": { "version": [ @@ -38161,8 +38806,8 @@ }, { "ename": "flycheck-haskell", - "commit": "6ca601613788ae830655e148a222625035195f55", - "sha256": "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1pnggwx7b9rqg3rap8lck3cdqwn7lymrdyyfgmbsrlbw5fnldip8", "fetcher": "github", "repo": "flycheck/flycheck-haskell", "unstable": { @@ -38502,14 +39147,14 @@ "repo": "whirm/flycheck-kotlin", "unstable": { "version": [ - 20210406, - 1148 + 20230111, + 1907 ], "deps": [ "flycheck" ], - "commit": "bf1b398bdde128806a0a7479ebbe369bbaa40dae", - "sha256": "1dr2y8imd6blxkpwbpds7mzn5abqpfzl8nh5zrxykrkalq2px7f2" + "commit": "a2a6abb9a7f85c6fb15ce327459ec3c8ff780188", + "sha256": "1cpcxh40ia52bmz5jv38lk55g9rwb65wqvbr2gc4p8xapvp1g6nw" }, "stable": { "version": [ @@ -38531,26 +39176,26 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20220731, - 2301 + 20221231, + 1658 ], "deps": [ "flycheck" ], - "commit": "53b3e46d47a0e70fd2e5c49fea9134ee9aa41793", - "sha256": "1di51jp20ymqkp777rsvwkqzr9vpnpi90b8bd4db5v2ji46xrkjf" + "commit": "1fe838c8678a9a101935ce4a4f3183a731e38f01", + "sha256": "0jlb3l49l555av869khf80z9y8jfab8anzag5578macwwxrl3ism" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "flycheck" ], - "commit": "b6d0b1515418e5821241ac04143a12997c3bb240", - "sha256": "1klwi2ssjnjc5cirq201wl643w8cb32r42nmjhvxv4dgad14i659" + "commit": "8f488c0d765c3d42e84612561530c5ba925e8c9b", + "sha256": "0zynqp7r1k3ycgrk93mkwg3ycl14gny1sspgaxb1z3gsc54ya7sv" } }, { @@ -38809,14 +39454,14 @@ "unstable": { "version": [ 20210509, - 2323 + 2325 ], "deps": [ "flycheck", "package-lint" ], - "commit": "30362dddca2a5f02d5e611e8fe802b528c610e10", - "sha256": "09d7ryjxnjk3ym6hblf3pjp8ycblfwkb3liljg2j1dw5mq07ng8m" + "commit": "ecd03f83790611888d693c684d719e033f69cb40", + "sha256": "00py39n1383761wq6wp194pvyk94ydqdbxj9kl64g9jnipkp7849" }, "stable": { "version": [ @@ -38858,15 +39503,15 @@ "repo": "ksqsf/pest-mode", "unstable": { "version": [ - 20200317, - 1503 + 20200710, + 2327 ], "deps": [ "flycheck", "pest-mode" ], - "commit": "fc575223d1e4de00e03c80258c7359cb4c415517", - "sha256": "10gwd9d1c32mbi0ds5rb88ip2flgznq1lcw9mv549xcvp7zphjgj" + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" }, "stable": { "version": [ @@ -38940,16 +39585,16 @@ "repo": "Wilfred/flycheck-pkg-config", "unstable": { "version": [ - 20200409, - 501 + 20230119, + 1721 ], "deps": [ "dash", "flycheck", "s" ], - "commit": "b76b24ea1f4800f5fb96ce9c6c4788e0e63133d3", - "sha256": "01wzzrpfgh3z28qsynxvkfm92xy98vyvkkv31qh53kxxdicnzlh0" + "commit": "c4e4028f6621187365b7362566ac2786206765a1", + "sha256": "1i0pk4nzw5jl3d67k71h6iwiw5xmqa6qns3q2x0mwdk5kylb91n9" } }, { @@ -38980,13 +39625,13 @@ "unstable": { "version": [ 20210118, - 1326 + 1327 ], "deps": [ "flycheck" ], - "commit": "5d804b08c89ec492a220d3aa8a43801431f0fa09", - "sha256": "1kc8nhd5s52mv9prp7gw24caddl257y3pw27bjymmmz84vy6pl6n" + "commit": "22787cf8223ca9ec309e30a42c20a8e706d8bfbe", + "sha256": "1dpxhljgw0k6y7973ssqfnmc7vp4fv87ajsq1bm8g4m04vj4127q" }, "stable": { "version": [ @@ -39386,16 +40031,16 @@ "repo": "liblit/flycheck-status-emoji", "unstable": { "version": [ - 20180330, - 2325 + 20180516, + 229 ], "deps": [ "cl-lib", "flycheck", "let-alist" ], - "commit": "61e93ac41847d27b8eea3a334ced2d1783687b77", - "sha256": "104zz9fihvd5klzdcaxsdmmfp0q5qisq5bbff48rfwdxnlp8dskr" + "commit": "4bd113ab42dec9544b66e0a27ed9008ce8148433", + "sha256": "0ldy9lhh6mirjz02pnrf7z235jz55k4sdysbqxjhfidsszvp9v6w" }, "stable": { "version": [ @@ -39448,26 +40093,26 @@ "repo": "GyazSquare/flycheck-swift3", "unstable": { "version": [ - 20210910, - 1244 + 20221227, + 1307 ], "deps": [ "flycheck" ], - "commit": "54193175c87a4c0bbf7ed16a3e76d6daff35c76f", - "sha256": "000fp4qzmc4kbjji03lxwafyvv32r4i7adf29j9s7v7dmdljpndl" + "commit": "14cb83c71a03bb7ae0952ee1707783219fda980e", + "sha256": "1yg1sfzp4w164rfkqvdw7qfkixmb5bdq0pidncznfa9rdxz0i9j3" }, "stable": { "version": [ 3, - 1, - 2 + 2, + 0 ], "deps": [ "flycheck" ], - "commit": "54193175c87a4c0bbf7ed16a3e76d6daff35c76f", - "sha256": "000fp4qzmc4kbjji03lxwafyvv32r4i7adf29j9s7v7dmdljpndl" + "commit": "14cb83c71a03bb7ae0952ee1707783219fda980e", + "sha256": "1yg1sfzp4w164rfkqvdw7qfkixmb5bdq0pidncznfa9rdxz0i9j3" } }, { @@ -39663,14 +40308,14 @@ "repo": "krzysztof-magosa/flycheck-yamllint", "unstable": { "version": [ - 20170325, - 1735 + 20170326, + 1309 ], "deps": [ "flycheck" ], - "commit": "110d310fae409e1869b82c34e60936bd3783dc69", - "sha256": "0xfmnwmc26wzfw1r4q70yxzm9qqvcpxx953pvssavrxfyg3bdgf4" + "commit": "aa211b1243168a4f752888c0014c5b9d2da178b1", + "sha256": "1dg2lymb53vp16isdc6k0gq1a43h7vjpksbacskyd4nwmsxaf2bm" }, "stable": { "version": [ @@ -39747,11 +40392,11 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20221025, - 1844 + 20230107, + 748 ], - "commit": "6efe0ae2d82ba83c563e117b290cb22ae91d2f58", - "sha256": "1y0skf7vnym6qn3q9gkzb0pzalpcsqzaa6vprr6alr73yh59vz2n" + "commit": "1c7fb66f6cb325ee1123094263a8def9bc071768", + "sha256": "0wh2n3bb4l13qqbrdihrwrwlcil80kv0nkpripj1jw89gnvgrnfz" } }, { @@ -39791,15 +40436,15 @@ "repo": "mohkale/flymake-collection", "unstable": { "version": [ - 20221113, - 1 + 20221231, + 1240 ], "deps": [ "flymake", "let-alist" ], - "commit": "274e5ec3e614e73fd0d7c3e1ffc652461bf5b5f3", - "sha256": "18mwz6i84y1wdw8zq13rmx8jsax6fkiqvlbngix7sp2vy8mqgv5c" + "commit": "a030c282e95d709bbb67a7fc115dde1f0d500ae9", + "sha256": "0pin1z7g2yw45lwp77nn3vns8xrcqyqn1hxik4spg0rxfhan7afs" }, "stable": { "version": [ @@ -39816,6 +40461,21 @@ } }, { + "ename": "flymake-cspell", + "commit": "21be553488cfe36423a7d15d1c7a90ccd934d4ea", + "sha256": "03i1kfmlswypzsfam1liwnhpwy2mvwm31lz9d4gwg9ka6q067k8m", + "fetcher": "github", + "repo": "fritzgrabo/flymake-cspell", + "unstable": { + "version": [ + 20230208, + 2155 + ], + "commit": "c68bf7eef99ddb2fbd780f175e869df2db5d768f", + "sha256": "05k8aiiik2ws3hdppg6kv8avq2dc7mvn08hs28brrzm3d8h6ma65" + } + }, + { "ename": "flymake-css", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5", @@ -39912,11 +40572,11 @@ "repo": "purcell/flymake-easy", "unstable": { "version": [ - 20140818, - 755 + 20141022, + 1828 ], - "commit": "09deafbcb5f094de8465c2bbfe270ba0f517f515", - "sha256": "1ld0g3hrbplmw3xgg6jg032hncnlxyc3hid4vn38lkcj3y7ls61b" + "commit": "2a24f260cdc3b9c8f9263b653a475d90efa1d392", + "sha256": "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c" }, "stable": { "version": [ @@ -40103,15 +40763,15 @@ "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20221116, - 1127 + 20221231, + 1655 ], "deps": [ "grammarly", "s" ], - "commit": "e3ed1a8bcb80a002a29fcc82e205d010bd9f3505", - "sha256": "0nf7y37livrhj3dapwzbpal5jclc0arr2hwvhhzyck5mg1q6vi5r" + "commit": "078edd6e083067f2ad3b3beaa0098c16cebe3994", + "sha256": "1496hmwbp2jyy7mn4yrjrxsr3r662s8815vh6w6dj730d9kqr2mq" }, "stable": { "version": [ @@ -40366,14 +41026,11 @@ "repo": "emacs-languagetool/flymake-languagetool", "unstable": { "version": [ - 20221116, - 1917 - ], - "deps": [ - "s" + 20230122, + 1609 ], - "commit": "b4b4d9f041dbc887f3adfb61600e9df4e51f9917", - "sha256": "0vyqh5h5rc12hk8w801wqi1nrcq5m6r5swak9vca7fh0rihjimz6" + "commit": "ad8c724147d5a3a9f6ee59e0c7581e68fba4a2f8", + "sha256": "1h1c0anbch18i66qr6vjb0lf1ygx7y06inqy9r6wss51261l2cly" }, "stable": { "version": [ @@ -40477,8 +41134,8 @@ }, { "ename": "flymake-perlcritic", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "1i0bc81cby2nsala2mhghzv7clhbf1gpp54vdxiq2wdanqy25vmk", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1h19mnx91g0jy6mpkzqx9szix8vibqvxy3s7q7sp9i5xpyjk21l4", "fetcher": "github", "repo": "flymake/emacs-flymake-perlcritic", "unstable": { @@ -40513,14 +41170,14 @@ "repo": "ksqsf/pest-mode", "unstable": { "version": [ - 20200317, - 1503 + 20200710, + 2327 ], "deps": [ "pest-mode" ], - "commit": "fc575223d1e4de00e03c80258c7359cb4c415517", - "sha256": "10gwd9d1c32mbi0ds5rb88ip2flgznq1lcw9mv549xcvp7zphjgj" + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" }, "stable": { "version": [ @@ -40572,14 +41229,14 @@ "repo": "flymake/flymake-phpcs", "unstable": { "version": [ - 20140713, - 631 + 20210213, + 732 ], "deps": [ "flymake-easy" ], - "commit": "a4d383474e055e554aaf1cd617055d5d7181aa50", - "sha256": "140rlp6m0aqibwa0bhv8w6l3giziybqdw7x271nq8f3r60ch13bi" + "commit": "f947ba3066c1fa903d2ec69d67bf84413f51eb3f", + "sha256": "10qaw7dhklxqzimfsj87clb297y7rnd3bpn061bh04cwnayjn2hr" }, "stable": { "version": [ @@ -40771,6 +41428,21 @@ } }, { + "ename": "flymake-ruff", + "commit": "6a2eeb6245f91c35a7f0671f5fd43cdd562b57ac", + "sha256": "143c035vd6xrbx77rccs564s8mwmn5a6a6wr3wb8hgw6xc4kw3ms", + "fetcher": "github", + "repo": "erickgnavar/flymake-ruff", + "unstable": { + "version": [ + 20230128, + 1739 + ], + "commit": "1567685414c81a24303058631d6ee81fb78eee73", + "sha256": "10lhdxxphjryr8dqqx6njmb0hv3a9bhkfzrajnqfgk1zwhpnvykg" + } + }, + { "ename": "flymake-sass", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d", @@ -40869,11 +41541,11 @@ "repo": "erickgnavar/flymake-sqlfluff", "unstable": { "version": [ - 20221116, - 729 + 20230129, + 2035 ], - "commit": "8ce6b40ebcb3a90e23621e2e1b85e3d06bed5e76", - "sha256": "1jfhwr4a3imi1n8akarxakdxv90d4icx1r1yjfsjj9hvlgxads4s" + "commit": "f7921a5b762eb0675b8fca7cfb00273a76eaee5b", + "sha256": "0yvf3bq04aljx93p9c3l8jgiwpmbwvkknx06zzscd1fn5n3kfava" } }, { @@ -41570,11 +42242,11 @@ "repo": "usaoc/elisp-for", "unstable": { "version": [ - 20221017, - 634 + 20221218, + 1023 ], - "commit": "7b5d13eae258c5299a6525cb32a3bb69fb7f652c", - "sha256": "1ax6wpawa6zlizbdcvgklyq7nz6jiwdmlz7ln9aq81m4qzap44ql" + "commit": "3556d3693288a552a0962ee01ad7ec71caeb0dc8", + "sha256": "1ghq4h1yk57q2rggkawiglk8ryrdqjdmjwd99j17yqzg5mnijlid" }, "stable": { "version": [ @@ -41602,8 +42274,8 @@ }, { "ename": "foreign-regexp", - "commit": "d05514013948a520cf0dcaf1dc2ef2300dd55e98", - "sha256": "189cq8n759f28nx10fn3w4qbq7q49bb788kp9l70pj38jgnjn7n7", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "15mjvw177n8f6xxs7cg4xb7xwaagmh36isr849296mnk8mbl084i", "fetcher": "github", "repo": "k-talo/foreign-regexp.el", "unstable": { @@ -41674,14 +42346,14 @@ "repo": "magit/forge", "unstable": { "version": [ - 20221025, - 1208 + 20230220, + 1945 ], "deps": [ "closql", "compat", "dash", - "emacsql-sqlite", + "emacsql", "ghub", "let-alist", "magit", @@ -41689,8 +42361,8 @@ "transient", "yaml" ], - "commit": "45b06b80137e981bca268b800469dada0ef7acb0", - "sha256": "0pv5bd3x074sl23x2ryfs8rbbvrmvc7pmaiqf6dxmns9rzy14jfy" + "commit": "3164739dc70ee5ecf05d87dba9dc803d62a89adf", + "sha256": "01mxlikyxjl9q4gc5bp0i5vy2jvg7fc9ramilajgx37yf7nf5gn2" }, "stable": { "version": [ @@ -41745,15 +42417,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20221008, - 1655 + 20221210, + 1608 ], "deps": [ "inheritenv", "language-id" ], - "commit": "c237c4cdf70a93c2d975b418314af33a210a5740", - "sha256": "17y2paxygi4akwndjmnzj7ngg814nq0ylxsrihkni0grxv5b76ww" + "commit": "c156ffe5f3c979ab89fd941658e840801078d091", + "sha256": "0h6sv36psl9rp1xvg5xzz4w2c7xlrz5iykivf7cfnq5g48aqsihs" }, "stable": { "version": [ @@ -41839,8 +42511,8 @@ }, { "ename": "fortpy", - "commit": "73b277e19f5f9f6605f3e9b7afac95152dac0599", - "sha256": "1nn5vx1rspfsijwhilnjhiy0mjw154ds3lwxvkpwxpchygirlyxj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1napc40chs3m2lhv4ig45i3v94jmw20nycfap41zkscihv9mvf21", "fetcher": "github", "repo": "rosenbrockc/fortpy-el", "unstable": { @@ -41890,26 +42562,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20211223, - 405 + 20221225, + 1016 ], "deps": [ "seq" ], - "commit": "594d0b97fede90a01ed341bb3fc42ac51f31e1c4", - "sha256": "14m6vbiwapd33nmffvimr3y98mw2x1v6a4540csq4v83qjpfb1nx" + "commit": "bfbd41a126f12abb4c0f279b087816d7dd483ff9", + "sha256": "1i9x3jd0phrm4a1jgngpvnmjs5j3y4sfy5yzjv5wwbcp9b8hmidl" }, "stable": { "version": [ 3, 6, - 0 + 2 ], "deps": [ "seq" ], - "commit": "205d7caeb65766e7787d827a80cca893747a09cc", - "sha256": "14cb4r23pn98sxzh0qwjwpvm7k7q9hhpks8avydccwssm69x1s1w" + "commit": "1a0482e03e9cf05e481a57c057cf9b985c6ca4d5", + "sha256": "0mml0in6xxhfv4mdb7rl9k8m6xwmrjl5bb301p8d56sfng982pdl" } }, { @@ -42050,14 +42722,14 @@ "repo": "tarsius/frameshot", "unstable": { "version": [ - 20220509, - 2010 + 20230212, + 2017 ], "deps": [ "compat" ], - "commit": "db75e7b903d0202ba75e64a5a85eac720a30c3c2", - "sha256": "0iqc9sg5l4zjzwzpf3pnkk6qzl1n2kfjfw5dj8y1d2jp7w4741vd" + "commit": "96f2cc9a0cb672b1989022caa290218c8024a376", + "sha256": "01z4n2j8sc6fdyqglhnbq6pszkjjnikqj868p4lfnrzb3nxj4a05" }, "stable": { "version": [ @@ -42203,8 +42875,8 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200527, - 830 + 20200828, + 1218 ], "deps": [ "cl-lib", @@ -42212,8 +42884,8 @@ "friendly-tramp-path", "with-shell-interpreter" ], - "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", - "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" + "commit": "1b1ba2033e59e5968380640280bd853701fbbb21", + "sha256": "0hh6y21vcpxazqsk9qdr3d120ai9qb5rkdjdh99ck2s26zvm1hjs" }, "stable": { "version": [ @@ -42272,16 +42944,16 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200527, - 830 + 20200828, + 1218 ], "deps": [ "cl-lib", "dash", "with-shell-interpreter" ], - "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", - "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" + "commit": "1b1ba2033e59e5968380640280bd853701fbbb21", + "sha256": "0hh6y21vcpxazqsk9qdr3d120ai9qb5rkdjdh99ck2s26zvm1hjs" }, "stable": { "version": [ @@ -42336,11 +43008,11 @@ "repo": "pdo/frimacs", "unstable": { "version": [ - 20221113, - 1231 + 20221127, + 910 ], - "commit": "ae3870ebced2fb92f7fac1aa0051f7e46b30d55b", - "sha256": "0r18cgi4hycif9r53vn1cakajkbrqpaziz240bq5yw2wnyvmkgfx" + "commit": "2aa343d743e70fa90ae06927fa2c7dabeca04fa2", + "sha256": "1rvhxyzljpdv4h1mwi767jyz4ql61806vq6q9681ixvm9jzxs8p4" } }, { @@ -42459,11 +43131,11 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20221106, - 2050 + 20230219, + 1511 ], - "commit": "cfd3f8827e8ec9cbf4d23653c4b05db4c01a5947", - "sha256": "0nxicqypwpksq9nc1b6v25j984ssqg8nb53wdpynsc422g2sqs0h" + "commit": "09fec6c91f9c18173f145e28c55d6f21be678231", + "sha256": "0p1y1y3g9qxkgn38fd34wkjkxplg3aphdqgisx556maig69ki789" }, "stable": { "version": [ @@ -42482,8 +43154,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20220725, - 2139 + 20221214, + 1220 ], "deps": [ "company", @@ -42493,8 +43165,8 @@ "quick-peek", "yasnippet" ], - "commit": "60489e75c6f26417068bf861b6db2935e72c38fe", - "sha256": "17j66xilzv0dv91jzk7v224hwpm0mlyxcsz7qf0ip8379ax1jb8g" + "commit": "ab0697b9474f36942a12a4b2a75251c247c18e9e", + "sha256": "02cyd5jl3xgzyiq4bbppnx8vhvw9h7i51776p3ld7m4shck7qyhz" }, "stable": { "version": [ @@ -42518,14 +43190,14 @@ "repo": "factor/factor", "unstable": { "version": [ - 20221108, - 1757 + 20230120, + 1737 ], "deps": [ "cl-lib" ], - "commit": "8c9bb02fe3c958d657857117825a83548cdfe2f0", - "sha256": "1gjbz95nzv348qnj76pxgmc3515sv4zw59axkhbp841cfjkd091g" + "commit": "25236d56df9b39c607a6af75d4e16273201031bd", + "sha256": "0rd0hgcxafbji2gs7lwxbcchcq8qai1yrrh6rld3cfwi83qkm3jn" }, "stable": { "version": [ @@ -42707,20 +43379,20 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20221025, - 843 + 20221223, + 1440 ], "deps": [ "cl-lib" ], - "commit": "6d89758828c6ebdce0d28c334c618bfd1d45e8d1", - "sha256": "0r91yw867h1z592rcw744616sfzqak7mrgpkc1p7qzb77d3fxqf4" + "commit": "942450534547e2081a3ce6c13b6ccfbb4d6c05f4", + "sha256": "01jnr1i2bj70jrhvyis2k0fljb1lwf1wns6xgs1ad3ndvgyi3c42" } }, { "ename": "fuz", - "commit": "2d3139563902bb1cb8aa48a517747f12a1ca1746", - "sha256": "0xmi3r7mhxc38rjmx2p0lhsn0gch21hhbr2s0gxy1h29mhgvy3sb", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "18jjk2aqvs7sjc9alxzbl3cr01swfag07mmnzmvd6ghi2y8v6px9", "fetcher": "github", "repo": "rustify-emacs/fuz.el", "unstable": { @@ -42749,11 +43421,11 @@ "repo": "auto-complete/fuzzy-el", "unstable": { "version": [ - 20211231, - 1837 + 20221231, + 1634 ], - "commit": "f63d6279a781cf9f33dd2f22826788d98d475961", - "sha256": "11dj0qg2411r2nby2nzi1i4s2v5wnz4594cl5c8gq9hws7cmp6q2" + "commit": "fc7ca5bc81f1798596bc1d254d74a5ea95edc432", + "sha256": "0i0wpsbr3d2bv9pjkdx6a5188csw2vi53rprk1j05bv0wcm81ark" }, "stable": { "version": [ @@ -42796,20 +43468,20 @@ "repo": "theBlackDragon/fvwm-mode", "unstable": { "version": [ - 20160411, - 1138 + 20230214, + 2149 ], - "commit": "6832a1c1f68bf6249c3fd6672ea8e27dc7a5c79e", - "sha256": "03zmk4v259pqx7gkwqq95lccn78rwmh7iq5j0d5jj4jf9h39rr20" + "commit": "574c0370f6199c9a1492923bf0d35fdd26738d24", + "sha256": "100al4f4jchg9mmq6in2dv948msx0j56qd3qzjmb5az7hy19ncnj" }, "stable": { "version": [ - 1, - 6, - 4 + 2, + 0, + 0 ], - "commit": "d48a309bb7db21f5404b6619c6ee861fe0457704", - "sha256": "0c3g0yfclczdh6nxmg9lljjf288zibqy51bhh1b1cgdmxcbpg8bv" + "commit": "574c0370f6199c9a1492923bf0d35fdd26738d24", + "sha256": "100al4f4jchg9mmq6in2dv948msx0j56qd3qzjmb5az7hy19ncnj" } }, { @@ -42820,29 +43492,32 @@ "repo": "tarsius/fwb-cmds", "unstable": { "version": [ - 20220422, - 1610 + 20230213, + 1143 ], "deps": [ "compat" ], - "commit": "b2661943ff3e2ad8d6db2158c173ca04221790a1", - "sha256": "0vpv7qwf849qxhzv23x7l1fd2zgvs9p4nx5rd9mpbai9w5sgf7m1" + "commit": "1b375c6890de61eaccc97c92f2b46de6f9205417", + "sha256": "0wqkd8p04hklp1hysppp83rx3d32qv62ln5baf725f3xz0lilv21" }, "stable": { "version": [ - 1, 2, + 0, 0 ], - "commit": "1143188080e33afd3330f540c7e7df48898a4777", - "sha256": "032ykl67f5x1f98gm8s9jiynlvip16r4lkl64a7xn36g32a4g4x9" + "deps": [ + "compat" + ], + "commit": "1b375c6890de61eaccc97c92f2b46de6f9205417", + "sha256": "0wqkd8p04hklp1hysppp83rx3d32qv62ln5baf725f3xz0lilv21" } }, { "ename": "fxrd-mode", - "commit": "796eb6b2126ec616c0de6af6abb7598900557c12", - "sha256": "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1cyniw1bzqvllcacisbg9ksmx1va348kk2lkcj0wsxn9q40kfr4j", "fetcher": "github", "repo": "msherry/fxrd-mode", "unstable": { @@ -42891,11 +43566,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20220726, - 2216 + 20230114, + 403 ], - "commit": "21912ebc7e1084aa88c9d8b7715e782a3978ed23", - "sha256": "0gdqjh8996hb06bnnyhi94k69mjfrzyfgq00a9s4wwagv28sqmkj" + "commit": "1d80e76df0899e26196aea150c29fba95fc73ed6", + "sha256": "075v5ypn4clkgg9jb4jd9xrw3ldy7sz5f2vryf5kniwm8zhs85yi" }, "stable": { "version": [ @@ -42948,19 +43623,19 @@ "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20220512, - 222 + 20230214, + 1359 ], - "commit": "937b2223259fb102bd6991fe46f509897e4f6cba", - "sha256": "1d11w3mgni0i75in9zi27glmx8vjyab9fqr8bp3pxp1skishx3a1" + "commit": "a50a290e5559e9f099e2bbbcecacac9e484ef4d9", + "sha256": "0k1icyhyqa71d651vdb8mb9vg37nx50l3xs13whv3mq1kcbp0hxp" }, "stable": { "version": [ 6, - 9 + 11 ], - "commit": "1964d9a52693f3aa9279eed8864bc317ee5c6dc4", - "sha256": "070qmshqn6gz4av3rzbjihlw6psx5c61kbcwdymswzfzmhg5dyn6" + "commit": "2bc1ae508b2e5c0ac377b012ca41eb6be73f9705", + "sha256": "0n1xqsk7086b6dx43djy1aliriidfksafh77f7ng4596sxnphrxz" } }, { @@ -43040,11 +43715,11 @@ "repo": "wavexx/gcode-mode.el", "unstable": { "version": [ - 20210522, - 1025 + 20221205, + 116 ], - "commit": "1f83845af4102efc5e5856b55bd5ad165b2f0cdd", - "sha256": "0lrsnl08npknif66chs3spy6pnblx3mbxxw1dii8a7zcj2s0ripv" + "commit": "3b17b5ba85e5a05dac79b15b5231ad41f0a0fce5", + "sha256": "1i515clygcknp3f1rcf5kl63cx29vmqqkmfg4gk78s1pdika06qi" } }, { @@ -43109,15 +43784,15 @@ "repo": "ahungry/geben-helm-projectile", "unstable": { "version": [ - 20160611, - 59 + 20170524, + 334 ], "deps": [ "geben", "helm-projectile" ], - "commit": "14db489efcb20c5aa9102288c94cec3c5a87c35d", - "sha256": "1nd1jhy393vkn2g65zhygxkpgna0l8gkndxr8jb6qjkkapk58k8l" + "commit": "31ce0faca5dcc71924884f03fd5a7a25d00ccd9b", + "sha256": "0a1srhwfbgkvndjfi9irg5s6snlxyqrw1vwyqg1sn8aqnbpgib04" }, "stable": { "version": [ @@ -43156,25 +43831,26 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20221115, - 2228 + 20230120, + 1738 ], "deps": [ "project" ], - "commit": "15dfe0fceea4d3508cd22a05fee18b617f84df2f", - "sha256": "10f048rkcw0rnn03dq9v5bgg61zclznnsl6hl9sqjanb16vhs5lp" + "commit": "e54d5e6dc659c252d10c4280f4c4d78d38623df5", + "sha256": "13q78d6pgmv7nmv0c4nfggbf29l624q73sycz3gr6hqng6kdlsvb" }, "stable": { "version": [ 0, - 28 + 28, + 2 ], "deps": [ "project" ], - "commit": "04dbdacfeca0190856abad859360da4bb873f9dd", - "sha256": "0dd20cq3nz4jjysaqx2aiqqaxvkfkbj2x4zm2mz3pd4rmydckj2y" + "commit": "bfc9cce54b7ac1cb036911965198b5cbe2f43f4c", + "sha256": "01sif1pw3shhdzcg9vidc2j5cqmrgjh5kynicf5mh3kmlvvsg9k6" } }, { @@ -43237,8 +43913,8 @@ }, { "ename": "geiser-chicken", - "commit": "cfc698ce9f759b5664217a4866a91605c11c13f6", - "sha256": "0pmy5gxsvp33m3dd5fnanxbjmds2vvaq649hp0nrjixykqhg9gf4", + "commit": "a2ad985f3b2b3e9192b6a8525483f43f52df9a10", + "sha256": "1hq3qk8vbspycvm9fv5s9d07gn0m55gwcvgv4ycvyf8gmi2j3xdy", "fetcher": "gitlab", "repo": "emacs-geiser/chicken", "unstable": { @@ -43328,28 +44004,28 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20221115, - 2230 + 20221205, + 1425 ], "deps": [ "geiser", "transient" ], - "commit": "961c9630f90733f517a9124750e72da55b569f10", - "sha256": "1hhn4nrhwnkrks1kij27dza0zlj0z6jpw9k9nqqswb3h9qll3nvz" + "commit": "24ce15de235c105daf5ecfb818200dae1c9815ee", + "sha256": "178anfklxk7wnbwnbjnc1nhg54b2s07z66g6gybd4imacn09f1az" }, "stable": { "version": [ 0, 28, - 0 + 1 ], "deps": [ "geiser", "transient" ], - "commit": "f5e82dc0f5a076335f201885a7edbefaa1ad435f", - "sha256": "13qxg1npm0pmnml5q268k5xk1clyqldp8v200ihrqwqlc3ga7f36" + "commit": "f57bfd5039ce158de95d2ef2933e64fb16def4f6", + "sha256": "0gp8xbfm7y2gabjyys8jylfy1pkkglqas32xxrbqxfh1hv0cfh2f" } }, { @@ -43476,11 +44152,11 @@ "url": "https://git.carcosa.net/jmcbray/gemini.el.git", "unstable": { "version": [ - 20210909, - 1442 + 20221127, + 1619 ], - "commit": "60bd07b3a1e532c950c132673777ceb635c9960d", - "sha256": "1dj6bmlrqkqvykasdav9f4jw8aykqj6c0jr09r9x4sb2w0pcd9ik" + "commit": "a7dd7c6ea4e036d0d5ecc4a5d284874c400f10ba", + "sha256": "1pvlk56mhh4xh4gwzqldfk79jsjbcpivv5scd9811pv3afc30gsx" } }, { @@ -43522,8 +44198,8 @@ }, { "ename": "genrnc", - "commit": "dd2d908ba5fa96d90643091573939e54d9165aaa", - "sha256": "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "18x7zmgrgwwsqc19vkqy44l9xq771wcfhsb6jxlfyp8d68b8yfys", "fetcher": "github", "repo": "aki2o/emacs-genrnc", "unstable": { @@ -43650,16 +44326,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20220928, - 227 + 20230102, + 1714 ], "deps": [ "dash", "magit", "s" ], - "commit": "38e53dfa782d65c7f93db8368b0c49f619c1f09e", - "sha256": "0rjrv7y4zkzry2fbsi55ccrnmasd0l8cpd0rapf0sskwc1wldymi" + "commit": "76cc426d62f1b4964159706eafa8f5b50b8427ea", + "sha256": "0wzb4z4hqx7n5nn7jsgzvjqxd65w9s6fnasz9mpkh9vfvv3zngjg" } }, { @@ -43769,8 +44445,8 @@ "repo": "sigma/gh.el", "unstable": { "version": [ - 20220302, - 549 + 20221204, + 1817 ], "deps": [ "cl-lib", @@ -43778,8 +44454,8 @@ "marshal", "pcache" ], - "commit": "27ccc892e94f7e747e5b879eec71119965d9ed6e", - "sha256": "0biljpqw14kjv0njyrahfdgglaphghva0kpfjhiprfwbd0rmmi1k" + "commit": "e1423a54fc97924e75d1fde27911c3c678a7d6c3", + "sha256": "1fr4pikcjasqy41g86pjwhz3alky42m2z7ziag051xhcd8nlm51s" }, "stable": { "version": [ @@ -43819,15 +44495,15 @@ "repo": "anticomputer/gh-notify", "unstable": { "version": [ - 20211126, - 638 + 20230117, + 317 ], "deps": [ "forge", "magit" ], - "commit": "8937f64092ea3b7e2cea2d61c12fde8e0f5e7917", - "sha256": "1amqyv0xdvl1ghy2pv2kvp2lc2q250p71mq3qdf50v87png57d9p" + "commit": "e1afdd49deb8ddf1a988e8d3fa699b06dfa92f5f", + "sha256": "0vx77b54hyx1f6qq1n57x7sn2080fdb67678jiw3c152jai99kx3" }, "stable": { "version": [ @@ -43950,16 +44626,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20220918, - 2022 + 20230212, + 2209 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "f07790b36beb563d5b87be896efbd3b8533f2acf", - "sha256": "132b5b1jdk0r68rklmf05avnmgm39rawl2ak4cinwis5p5m0hw2n" + "commit": "47b7dc9bb299d50647cd24efebaf41dbc07d9e90", + "sha256": "0k9zx62cwcb3pribmj1s4f7v7d4rg3msnscv1y2pjf2x740a1vj9" }, "stable": { "version": [ @@ -44157,11 +44833,11 @@ "repo": "wavexx/git-assembler-mode.el", "unstable": { "version": [ - 20210207, - 1545 + 20221205, + 1014 ], - "commit": "1243bdc1a9cdc79802ece05c90731ee14e4f92c9", - "sha256": "1rc8z2r8lxzx836j7nk61snps8r0szzifg0inzfv3nb2z8bsiw0b" + "commit": "e88d69d1fd93f166d8b31e02790a1d241fea44aa", + "sha256": "1lvhgs57848jiqsv4nhr3y65jh2zx8fwjh301v7cc162l66bny56" } }, { @@ -44317,16 +44993,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20221106, - 1128 + 20230220, + 1901 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "161ab485209ecd0f304e16ca95f8a145327e7ffe", - "sha256": "0dm68s284ybcqr626d2fhfc6icyb1c0yrbmmdbwr0vdlc0zv1iha" + "commit": "76fe46c098498deab54b6c5b11731e970040a52b", + "sha256": "0jbf10w7v7bni8wvn6l8ml05hfxljjb8ns16z20f7hn9zvmgdb26" }, "stable": { "version": [ @@ -44610,11 +45286,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20220613, - 135 + 20230216, + 300 ], - "commit": "fe2e8aa92dd8f1a9fb3f471658701487ff21f22b", - "sha256": "1pbzcvv4hd6hkbqaln4gmdqmbv46b0556d35m3zkg0hvrrspp7bi" + "commit": "d3ba912079e0ca5fd727b1f617791c6ae1e0da82", + "sha256": "14czzi9gi1zms1nnpjabn4b7cyahjj0xz8y4jxr6pn6gp20zzp0n" }, "stable": { "version": [ @@ -44663,11 +45339,14 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20220422, - 1611 + 20230212, + 2212 + ], + "deps": [ + "compat" ], - "commit": "845d333732ad9c8d65a28f12af645c6682db6f45", - "sha256": "1616z9jvwcxs9pfsycbp0n4nss7gai9d0yx915l1mx9ksp631pf4" + "commit": "f0a0154bf48dd1c0c587596cf4cfd3c90f673a05", + "sha256": "0bgjdmrdw5jfr7lsjar45m0hdb2cawv3y73czbbh8qid2ajm6shl" }, "stable": { "version": [ @@ -44921,10 +45600,10 @@ "unstable": { "version": [ 20220313, - 2033 + 2040 ], - "commit": "0f0f0b52ee55a5c9305ebf5abb7bcf480f98db0a", - "sha256": "1xyrixgmmlb25km9ya20hqh3g89y070xsjqnhgzspa3938bcyzhn" + "commit": "2123bcd08fe42094b07180632be2cd2af606ee21", + "sha256": "1n41px99cs6q53lfs2dn9h7ml6hc4yz7mbjlg30hp4l8a3j74lz3" }, "stable": { "version": [ @@ -45222,8 +45901,8 @@ }, { "ename": "gitlab", - "commit": "1d012991188956f6e06c37d504b0d06ab31487b9", - "sha256": "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0ax1773qf1kpmpkfqkaxr5v69b6w7vy7gfbp53f4ff7rfiag2mp8", "fetcher": "github", "repo": "nlamirault/emacs-gitlab", "unstable": { @@ -45577,11 +46256,11 @@ "repo": "hajovonta/glue", "unstable": { "version": [ - 20221114, - 1120 + 20230112, + 2159 ], - "commit": "abfad405f240d9a89f792aae36efb3c2af43021f", - "sha256": "08iyb35mpcdca9raq636m06gdis6p3n67wqhzq612p71gpx9l4bl" + "commit": "dcdf8a69db87acea4fa61d4b4b9b1265c7e025db", + "sha256": "0n5834ghphb37780f6vs3hvh39m5a7hs7xx352bwwskrv522ik01" } }, { @@ -45810,11 +46489,11 @@ "repo": "akib/emacs-gnu-indent", "unstable": { "version": [ - 20220515, - 1719 + 20221127, + 2112 ], - "commit": "ff3e10edbdf9b919747ec2ba3434d5858f5cc9fa", - "sha256": "040vlkzhgi7mhp6m4nrqz2srh8fr8xgpgbiqm8mbcs7py41smkg0" + "commit": "f31dbe60478b6270bb57b6b05998df8eec56f801", + "sha256": "06b02s78ln9bxrh924952w2kvzgiqw422p70cf102wwmrqknlqlf" } }, { @@ -45825,20 +46504,20 @@ "repo": "emacs-gnuplot/gnuplot", "unstable": { "version": [ - 20221112, - 2049 + 20230218, + 1717 ], - "commit": "fe7ce76d797b34214178ac8e470f2fa9a63b2520", - "sha256": "06avd1bpk6n8d3yc2427f6z24f3d6dlbfhw6gg39mja06n4a2jh3" + "commit": "663a89d263d4f26b996796d01b6a3b783449e0f5", + "sha256": "0s0k18ibi4b2vn6l7rwdk79g6ck6xafxzzbja8a8y0r8ljfssfgb" }, "stable": { "version": [ 0, 8, - 0 + 1 ], - "commit": "116cad8e09024223f97e81b0a4503cef20de9bf5", - "sha256": "09y177sq24gs7wwjihw59g0m4n1rv2ws9890ynxjxawv823r0fxm" + "commit": "663a89d263d4f26b996796d01b6a3b783449e0f5", + "sha256": "0s0k18ibi4b2vn6l7rwdk79g6ck6xafxzzbja8a8y0r8ljfssfgb" } }, { @@ -45908,8 +46587,8 @@ "repo": "deusmax/gnus-notes", "unstable": { "version": [ - 20210207, - 1010 + 20221206, + 616 ], "deps": [ "async", @@ -45920,14 +46599,14 @@ "org", "s" ], - "commit": "1457bba34b40d5197aa14dbf0856925f83025ae1", - "sha256": "01jm2maa8q0zjpqa95c84k9b9jx5rgwvvhaqbwvw8ccz883mcdjm" + "commit": "9996b382c5c7b4f944a716baac69b556ef181462", + "sha256": "0m34dxxmhcsxmlx5ci9zzlhfm4jgp4ind5fhaj1ycyi1grwk92ca" }, "stable": { "version": [ 0, 4, - 1 + 2 ], "deps": [ "async", @@ -45938,8 +46617,8 @@ "org", "s" ], - "commit": "8cacba653f8912355d45847c5e5376eb83e6898f", - "sha256": "11d98vasn74p7ifyw8qnyzm4na8l0pnbh7a04cr2znnwqjbnzd7s" + "commit": "249e1471d586e0b3679a4b1ac4070e9f5c4516d2", + "sha256": "0jn8g4zw5f06nxfxl7iffyf4jdza3wq9zwa3mj36ir012jrn5xbm" } }, { @@ -45950,11 +46629,11 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20220902, - 658 + 20230104, + 1924 ], - "commit": "ebaa2389d20bc5fe1796f895f1faedcfc99026d0", - "sha256": "06qxc9hhbpc4k1disashc347x589f2hhjs85vrsvr73kphv05b7k" + "commit": "5a4a28710dedef939dd8f1a743c5626e40271842", + "sha256": "1a0baimrynhng3d2ywdb66vzyvrrpv4fb30b9qibwp0gn2ds6g2q" }, "stable": { "version": [ @@ -46029,14 +46708,14 @@ "unstable": { "version": [ 20140610, - 731 + 2156 ], "deps": [ "log4e", "yaxception" ], - "commit": "c2c8c5e94ac94f4c40e023452119c088ac59eac9", - "sha256": "0gf418ri69yzi9cbxdyna9kxjsniyw72xix2r94m439k1axpwa3f" + "commit": "978bdfcecc8844465b71641c2e909fcdc66b22be", + "sha256": "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril" }, "stable": { "version": [ @@ -46293,14 +46972,11 @@ "repo": "s-kostyaev/go-gen-test", "unstable": { "version": [ - 20210816, - 1215 - ], - "deps": [ - "s" + 20230127, + 1422 ], - "commit": "35df36dcd555233ee1a618c0f6a58ce6db4154d9", - "sha256": "1r0cdpfrrz3lgkd7xzkw77c48w11l9maydm32rz27zpjgzgpakdp" + "commit": "f84f4177af7fcbe10ce2116d5417ad5f0485034b", + "sha256": "1bxa3870vr2hyaj4isvhzfhhs56qyrp9lngapsggxhdq1r9vwqra" } }, { @@ -46329,15 +47005,15 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20181012, - 330 + 20220114, + 2239 ], "deps": [ "cl-lib", "go-mode" ], - "commit": "120fb911f1d8038f828da85eed8aaad977dabd8c", - "sha256": "18qx1mf4fgrzm8g89c4y7zvwl3djrbbkhar242zl5ab5218dsp0s" + "commit": "3273fcece5d9ab7edd4f15b2d6bce61f4e5a0666", + "sha256": "00qzn136d8cl3szbi44xf3iiv75r6n1m7wwgldmzn4i5mpz8dbq7" }, "stable": { "version": [ @@ -46429,11 +47105,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20220727, - 115 + 20221228, + 1706 ], - "commit": "08aa90d52f0e7d2ad02f961b554e13329672d7cb", - "sha256": "1zdyhjg3crvcw093zw2nv3kzs583i26ba6pbs8jyhqnnysl7llfc" + "commit": "166dfb1e090233c4609a50c2ec9f57f113c1da72", + "sha256": "0vahf3gbdw8b7k28zicm1xi686b2lrzdx8nkzhwk9z25brw86jj8" }, "stable": { "version": [ @@ -46468,28 +47144,28 @@ "repo": "grafov/go-playground", "unstable": { "version": [ - 20220106, - 1618 + 20221127, + 1342 ], "deps": [ "go-mode", "gotest" ], - "commit": "d2eb9ee18a7934c8f5395bdeedf52cb0f62f8aa2", - "sha256": "02p99180nqsy78g9xwqx2rvyxxv1bq95b09vwz0k1vz8xf6lqfbf" + "commit": "e70aeb111fbb4487b464a813feb8ecad1542dc1c", + "sha256": "0r7rds41m899ikc6lnjhlkkrhljmazsddk8f050nzngdfb60p3sa" }, "stable": { "version": [ 1, - 7, - 1 + 8, + 2 ], "deps": [ "go-mode", "gotest" ], - "commit": "d2eb9ee18a7934c8f5395bdeedf52cb0f62f8aa2", - "sha256": "02p99180nqsy78g9xwqx2rvyxxv1bq95b09vwz0k1vz8xf6lqfbf" + "commit": "e70aeb111fbb4487b464a813feb8ecad1542dc1c", + "sha256": "0r7rds41m899ikc6lnjhlkkrhljmazsddk8f050nzngdfb60p3sa" } }, { @@ -46547,14 +47223,14 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20190805, - 2101 + 20220114, + 2239 ], "deps": [ "go-mode" ], - "commit": "13e9f22957df5a819b711994a4933927823fa14a", - "sha256": "007ky80h53r0kmk35cn0j6gk1rg2dwg6f4rbiszagm79hxf1dxnq" + "commit": "3273fcece5d9ab7edd4f15b2d6bce61f4e5a0666", + "sha256": "00qzn136d8cl3szbi44xf3iiv75r6n1m7wwgldmzn4i5mpz8dbq7" }, "stable": { "version": [ @@ -46601,8 +47277,8 @@ }, { "ename": "go-snippets", - "commit": "ca9f3022e7f4d5391be394cd56f6db75c9cff3b6", - "sha256": "1wcbnfzxailv18spxyv4a0nwlqh9l7yf5vxg0qcjcp5ajd2w12kn", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "08cif7lra3vmkraa5j44irjqap748rm8xysrc1hh6n80fklkxb4v", "fetcher": "github", "repo": "toumorokoshi/go-snippets", "unstable": { @@ -46640,26 +47316,26 @@ "repo": "brantou/emacs-go-tag", "unstable": { "version": [ - 20180227, - 411 + 20230111, + 651 ], "deps": [ "go-mode" ], - "commit": "8dbcb7d42dccac046c7beb31bdf79bb09a0fef40", - "sha256": "1l20az4lhgbrh96sk6bpvp3w4bh29653fms4bimmiaqmhn2n14y2" + "commit": "33f2059551d5298ca228d90f525b99d1a8d70364", + "sha256": "1nmxw99xqhr9sg5lafqjs7x033br8xz9106zc96gxf07v6zgbxy2" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "go-mode" ], - "commit": "8dbcb7d42dccac046c7beb31bdf79bb09a0fef40", - "sha256": "1l20az4lhgbrh96sk6bpvp3w4bh29653fms4bimmiaqmhn2n14y2" + "commit": "33f2059551d5298ca228d90f525b99d1a8d70364", + "sha256": "1nmxw99xqhr9sg5lafqjs7x033br8xz9106zc96gxf07v6zgbxy2" } }, { @@ -46670,19 +47346,19 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20221119, - 627 + 20230112, + 1532 ], - "commit": "8746d229474958dc4456ef9ba4b0a258acff8e56", - "sha256": "1znqj87xgb880aqqd10mxq5r3walhasvldmm3mvmvnywg91rrdyj" + "commit": "e8343e7d41af67f55c2da9231fb275a93382a4c8", + "sha256": "0f8d96pz676bl1b8rh2wxhdw1incaf691rkdlwzyzsar51c11dj9" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "8de1c3b660602b6739444ceed3e48214c417fe38", - "sha256": "0b8jbcs848ck0zbl6rmyyac3mbhx58zq04l7wvi7paficg9lphj9" + "commit": "923d117ab399a0598a496d3fab84188c6f460dae", + "sha256": "1bhfd41x3i2gabvf50pdpmnvcdqg69ygslyjcg7jvf486b44gvfk" } }, { @@ -46708,20 +47384,20 @@ "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20221109, - 707 + 20221230, + 708 ], - "commit": "49c1a1753188e5b2788b8c1f1f9fbd1264460bab", - "sha256": "0h1kfvr4zahk8ihvri1r16b2nkg3dg3524ic64c6w0jing2gr37c" + "commit": "607aff10a7b27a8aa0c1a15c2c39337ab17cfda7", + "sha256": "032c82cgf8dafc3w951f2n2a1327rxz9126ri8vz9n3fblwdizj5" }, "stable": { "version": [ 2, - 17, - 3 + 18, + 0 ], - "commit": "a72feb2fe8b1a8993c472995d83d9c4718f7a7c1", - "sha256": "1wsc04l5j5a9y5439qx85pcchxjnjgcgwbffw3l30q9zlblvc58b" + "commit": "c7754eaadaeabae2df94e23317b4a04d19b3f9e0", + "sha256": "1njln47w25ix9w0xjv02110ngr8d8ma3w7db0x4xcxhihbl65zly" } }, { @@ -46756,19 +47432,19 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20221011, - 1137 + 20230218, + 1710 ], - "commit": "f0e80d3be9f5195682f8edf903ded9cdc947683a", - "sha256": "1ca5gwa2r1nya84w0dkvmplbqfyksqbgfcl595fc1z5mysg09yzh" + "commit": "b715ff51e4b80c3c5487e7be6deadb1bb1497af6", + "sha256": "0crll7r1qzpipimrahbfgk31f6rys58gzsbiwi65l0gqw49699sx" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "6023ca87b28fa05ebad320c8b9c5887c6dd0f51b", - "sha256": "15bqjmwfdqp2np6fln6xjyw59c5iddvzsyga0lvb8raa753cdh2k" + "commit": "b715ff51e4b80c3c5487e7be6deadb1bb1497af6", + "sha256": "0crll7r1qzpipimrahbfgk31f6rys58gzsbiwi65l0gqw49699sx" } }, { @@ -46829,8 +47505,8 @@ }, { "ename": "golint", - "commit": "34f22d829257456abbc020c006b92da9c7a7860e", - "sha256": "1q4y6mgll8wyp0c7zx810nzsm0k4wvz0wkly1fbja9z63sjzzxwb", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1g3rpp8h911jrmkwhlpb6c6bsx8ig3ms1y6y7jpq1k40pb4zrxm2", "fetcher": "github", "repo": "golang/lint", "unstable": { @@ -46997,20 +47673,20 @@ }, { "ename": "google-translate", - "commit": "ec8e444027703ac04575a670b6ab806e8a290d15", - "sha256": "0rj3cybs603c8fy3yxgmhdvraiqwk4nj1pdjryqi4xaddj5glzzb", + "commit": "c7050f5197fbc7e70d13a6f290d4c61f4684c85b", + "sha256": "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47", "fetcher": "github", "repo": "atykhonov/google-translate", "unstable": { "version": [ - 20220920, - 35 + 20220921, + 245 ], "deps": [ "popup" ], - "commit": "f893b680311fedb1dd735bf5b3be7af1ed1583be", - "sha256": "12c6yj7bjradzgl0xjvv7xg8xii9imppb6d9ij0v4q2cfw7v8ihn" + "commit": "e60dd6eeb9cdb931d9d8bfbefc29a48ef9a21bd9", + "sha256": "07w3vcinb4wzcancfmhi7ips6dr2lg6va1xlm74kvk5n8vqafp8a" }, "stable": { "version": [ @@ -47092,30 +47768,28 @@ "repo": "nlamirault/gotest.el", "unstable": { "version": [ - 20220728, - 750 + 20230221, + 945 ], "deps": [ "f", - "go-mode", "s" ], - "commit": "2ec82dcc70d5f6aa22f66b44f8b537be33bd7903", - "sha256": "0jm4i5axw19451z8m79iv1zqlhqpr8mn4r9mcli5j9hrvb7wczrd" + "commit": "490189e68d743a851bfb42d0017428a7550e8615", + "sha256": "19lpr9wa73415jmdl1acijz54h5sdsj95wxigigbiqdhq6pd301p" }, "stable": { "version": [ 0, - 15, + 16, 0 ], "deps": [ "f", - "go-mode", "s" ], - "commit": "9b1dc4eba1b22d751cb2f0a12e29912e010fac60", - "sha256": "0693fcli1nv9mn60gh30xspwiwhab8vxf09i1s9yxs80ai712i12" + "commit": "490189e68d743a851bfb42d0017428a7550e8615", + "sha256": "19lpr9wa73415jmdl1acijz54h5sdsj95wxigigbiqdhq6pd301p" } }, { @@ -47150,11 +47824,11 @@ "repo": "emacs-vs/goto-char-preview", "unstable": { "version": [ - 20220704, - 630 + 20230111, + 1525 ], - "commit": "507bd498457cf755d3500209ec0c2a4625a96584", - "sha256": "1m4bnx34wf7gh99fqp0gigvafij20awx3ya2yfcxymshk9vx73ii" + "commit": "feee79f83194155e67f5b16ca57b51b2d941b2ee", + "sha256": "19qnf1x0kysxjfx4dkl13f7cfv6s1cqmcjbnmmjvk7x8mah88qx2" }, "stable": { "version": [ @@ -47237,11 +47911,11 @@ "repo": "emacs-vs/goto-line-preview", "unstable": { "version": [ - 20220704, - 630 + 20230111, + 1531 ], - "commit": "ee1cb651c021d1cab1a9f2577fa76d54da894037", - "sha256": "15s47jpvbanymd9kn5xfzprr1yaiv7hzsq8wqs4pzxnciv3bira7" + "commit": "c6db484cf401351f7f2f57496b0466b774435947", + "sha256": "0wzc5vaw461lzwhs1d9b479ns8wgil528np6xs5rqr3czsm61k44" }, "stable": { "version": [ @@ -47261,8 +47935,8 @@ "repo": "vmware/govmomi", "unstable": { "version": [ - 20220509, - 1455 + 20221216, + 1712 ], "deps": [ "dash", @@ -47270,14 +47944,14 @@ "magit-popup", "s" ], - "commit": "72c2000c01b73c884f1f94df52765762e187b1de", - "sha256": "1jbgqwjncw4xwdjjsn738j4mmmccfb32g6iznlm97qgpyjl0sg81" + "commit": "c82a709c50c0cd1ae560dd4c8da2d5b266114c50", + "sha256": "1a9x8x45ylr3q87ryfrm3d4s5pahqvwrymvn9db194bx1wxj7mp6" }, "stable": { "version": [ 0, - 29, - 0 + 30, + 2 ], "deps": [ "dash", @@ -47285,8 +47959,8 @@ "magit-popup", "s" ], - "commit": "69ac8494c2bead55022dcd1dc18f9ca8b159ccd2", - "sha256": "04lsqq8ik8mgxhnxma24lkwn7qnjwr9djwrq0j0h3pw8bfbk4m29" + "commit": "9078b0b4399930876c766d4dff04935c523a7e18", + "sha256": "1w0rfzaa27xlns23y0aakz5wq7fpz79wvmj8wmim64p2pfggbpi6" } }, { @@ -47329,6 +48003,21 @@ } }, { + "ename": "gpt", + "commit": "0064e7b747b695a213c233480c962233d10b7bb3", + "sha256": "1yd2fiaq21bk6pnx3gdl5mrj0n0i3jbxfagdrawsfs9i3ys7m7vf", + "fetcher": "github", + "repo": "stuhlmueller/gpt.el", + "unstable": { + "version": [ + 20230204, + 433 + ], + "commit": "a5eb9ce9cced47c26ecac5fa6bee044054ef948e", + "sha256": "1vg4sc6j0i03riwzvj8pg333fihj4g2nwd3pgahjfkxps7fbmlqv" + } + }, + { "ename": "grab-mac-link", "commit": "e4cc8a72a9f161f024ed9415ad281dbea5f07a18", "sha256": "1a4wyvx1mlgnd45nn99lwy3vaiwhi1nrphfln86pb6z939dxakj3", @@ -47497,16 +48186,16 @@ "repo": "emacs-grammarly/grammarly", "unstable": { "version": [ - 20220704, - 624 + 20221231, + 1655 ], "deps": [ "request", "s", "websocket" ], - "commit": "284acc680a68ffeeed958e62a568b49b0d9e0551", - "sha256": "18f8hvjmsy517nz9r5nv6h7x1bczkg4y00fz1rmkdjn656apcgam" + "commit": "0d9fbee337cb8dd316e5dcf0bff91e44c115dd0d", + "sha256": "1ljlfnvlp7lpr6sc89xnp8jy5m0n5sfrcs43y60b0wnvxxj4w1k9" }, "stable": { "version": [ @@ -47628,11 +48317,11 @@ "repo": "vermiculus/graphql.el", "unstable": { "version": [ - 20221029, - 1808 + 20221128, + 1106 ], - "commit": "4575642c3213593abe5972510c418ebb11bf1d99", - "sha256": "1apbnxbxzk6ngigdpbjkn52cli9axwxlkv2fhksyqsqvxrg8f119" + "commit": "b57b5ca5d2d0837e1fb4a4f30c051d5f3e643f0f", + "sha256": "18k2c2b7y5qgc7qpkqjmz1nv61w470ja3vwprmy5dlkzficzqsvf" }, "stable": { "version": [ @@ -47699,11 +48388,11 @@ "repo": "ppareit/graphviz-dot-mode", "unstable": { "version": [ - 20220309, - 1336 + 20230213, + 1945 ], - "commit": "6e96a89762760935a7dff6b18393396f6498f976", - "sha256": "04p8x4lwbp2qwlsr5xlzjn3a25bg0rsnk3nqfvvz66zv0srz62mn" + "commit": "a3cbfa969051dd638a993e1962e2b965067896f6", + "sha256": "01f0p4gkbr2n57qkr4hxgwqm7rsflqp3y806ab4l66g42xn1lp5j" }, "stable": { "version": [ @@ -47930,11 +48619,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20221003, - 1518 + 20230206, + 323 ], - "commit": "e1e8ee952f75cdca93327b6e7dcd79244ca66bc0", - "sha256": "008iyd67l69zk4zdzzkjjjja54z81w88l71rsbp054ggsvy6qq0a" + "commit": "bdee160db6ab8c988bb0de95ad306ff8b793ec67", + "sha256": "0mnwpng1zhq4piaxnbrqpn6di4jhnh7dhf2vrgmqiw66c16vz9hx" }, "stable": { "version": [ @@ -48007,8 +48696,8 @@ }, { "ename": "groovy-mode", - "commit": "3fe318b4e51a280a55c01fa30455e4a180df8bd6", - "sha256": "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1q2zxx6glqp3z0ipsy4ry5fn4wrsz0slr5i36hxfhd8d1lrfn7ca", "fetcher": "github", "repo": "Groovy-Emacs-Modes/groovy-emacs-modes", "unstable": { @@ -48044,11 +48733,11 @@ "repo": "rexim/gruber-darker-theme", "unstable": { "version": [ - 20220107, - 1815 + 20221122, + 1143 ], - "commit": "72278089c440d45c00fb8afcd53af82fd30f451b", - "sha256": "15akxpc1zgdbhzcjc1cs8w1wm4yjgnxicgmqjrcgcqc8g0zhagcf" + "commit": "6de7a37d7b18cf3f0ec51db799f4f2aa6e3e89ff", + "sha256": "1bqjn67s0kcnf86qjxz0ayaash4rbwfwqsppqyy7p9qfc00cjix2" }, "stable": { "version": [ @@ -48067,11 +48756,11 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20221001, - 1525 + 20230121, + 1825 ], - "commit": "d03ccd6314d474f3e6beadc69c0b6ce32af62f07", - "sha256": "1s5xig6pbkbnb0xn7rp3a02ig0pzdwxqj54f3bjda0c37ch0l1cj" + "commit": "088f26330be161cfad4835e155595ec60dcb335a", + "sha256": "094kwvm136nw3p1l2bxkbp97qnsg46g0b3mgskm323bcdggj1g12" }, "stable": { "version": [ @@ -48123,13 +48812,13 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20220909, - 241 + 20221213, + 25 ], "deps": [ "autothemer" ], - "commit": "3177b458dcbd5db6135a8d57fd5b765131e4da6a", + "commit": "736729265bfe5e247cf1b48bcf996e56516b0d89", "sha256": "0dgjf86i8179l1nsjyc20chysqmy8yhphpd5lzv2ypx79l4z3jka" }, "stable": { @@ -48306,8 +48995,8 @@ }, { "ename": "guess-language", - "commit": "6e78cb707943fcaaba0414d7af2af717efce84d0", - "sha256": "1p8j18hskvsv4pn3cal5s91l19hgshq8hpclmp84z9hlnj9g9fpm", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1sbvvzzdb76wf9km9sp6p6yp6cc3irvajz4fz78y90iw3dka2w6q", "fetcher": "github", "repo": "tmalsburg/guess-language.el", "unstable": { @@ -48388,14 +49077,14 @@ }, { "ename": "guix", - "commit": "b3d8c73e8a946b8265487a0825d615d80aa3337d", - "sha256": "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9", - "fetcher": "github", - "repo": "alezost/guix.el", + "commit": "f01c0af156ac4f89ebb706c93085f46f1740f212", + "sha256": "17gd0farvxs38l0a8v20cc1d6h1ri7nmdjl7i1mnwfb410rijvhy", + "fetcher": "git", + "url": "https://git.savannah.gnu.org/git/guix/emacs-guix.git", "unstable": { "version": [ - 20210608, - 1653 + 20221011, + 1244 ], "deps": [ "bui", @@ -48404,8 +49093,8 @@ "geiser", "magit-popup" ], - "commit": "c9aef52121b458297e70bb50f49f7276b4a8d759", - "sha256": "00xdxadbi9fxpfp60zah9190rcz3w08vl1blbhmaiy7c1hd2gi39" + "commit": "cf5b7a402ea503c3dcda85a86b9a6c6dd01896e0", + "sha256": "0wxiipgv91rlk9bhspx370rykywi52rxg5m1f7680vzs3ckc7nyd" }, "stable": { "version": [ @@ -48447,11 +49136,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20220831, - 2055 + 20230115, + 2105 ], - "commit": "008e8fdec489a28e8cf807b3b511a9561c64268c", - "sha256": "1n5fdi328fvcnq5vb421d7mafkwidn4arah67difxkl6aq7g54jp" + "commit": "0ada8c575d4e94b4f3edb0092239cfa835b17726", + "sha256": "0jq43w12j6sf6qammahfyhmzcq78y2w00lmaxr2mjqdmq435vhah" } }, { @@ -48509,8 +49198,8 @@ }, { "ename": "gvpr-mode", - "commit": "ab25afcf4232082dc0e48706734f141a308912a7", - "sha256": "19p6f06qdjvh2vmgbabajvkfxpn13j899jrivw9mqyssz0cyvzgw", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "07c5l9n3337nqzijkr3sz4q0mwf429i5jpyiqmnqrkdpwkbh26h3", "fetcher": "github", "repo": "rodw/gvpr-lib", "unstable": { @@ -48546,6 +49235,21 @@ } }, { + "ename": "h5dump-mode", + "commit": "5c5d429299615aaf1917f9602eda7fa6f3d1a4f9", + "sha256": "04vl82x9zi1sjjzg85q4w9pj98lj7jr0a88xr93x2g82s4p9gkfg", + "fetcher": "github", + "repo": "berquist/h5dump-mode", + "unstable": { + "version": [ + 20221128, + 1935 + ], + "commit": "3c9e4608112da91db76bf316417023bed0422ef3", + "sha256": "17qqvl99vyfcxa90wkpqd2r7b2s05nnp4jnf3lhflx8s3dzmnpzy" + } + }, + { "ename": "habamax-theme", "commit": "77386484ad0b31c2818fae52cd312821c4632cb8", "sha256": "1rmir9gc1niwkshxg1826nkh8xxmpim5pbhp61wx1m273lfn2h69", @@ -49018,20 +49722,20 @@ }, { "ename": "haskell-emacs-base", - "commit": "5daff329a96a6d10bca11d838bbc95d1c8bcfbd9", - "sha256": "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0lfn13vgp0jpqhgsxg6qhcr408bpfhnfr0dccs7c5i9rlk8xn0cv", "fetcher": "github", "repo": "knupfer/haskell-emacs", "unstable": { "version": [ - 20150714, - 1559 + 20160904, + 2026 ], "deps": [ "haskell-emacs" ], - "commit": "7f91f65254902b8ff04fdb679bc569b2f6a51637", - "sha256": "17i9l6wgrvmp31ca4xrax31f7bjnn0vn2figycxhfaq9f6vxgkkn" + "commit": "a2c6a079175904689eed7c6c200754bfa85d1ed9", + "sha256": "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam" }, "stable": { "version": [ @@ -49054,14 +49758,14 @@ "repo": "knupfer/haskell-emacs", "unstable": { "version": [ - 20150713, - 1416 + 20160904, + 2026 ], "deps": [ "haskell-emacs" ], - "commit": "cc240612740fc3fd6e3c3d8cdfe486a89954f5d1", - "sha256": "09g6b1ad7qi9k58ymgmssgapwapxcwf30qhmfl2w8sl045ngzlkk" + "commit": "a2c6a079175904689eed7c6c200754bfa85d1ed9", + "sha256": "1xpaqcj33vyzs5yv2w4dahw8a2vb6zcb3z7y2aqc5jdg3fx9ypam" }, "stable": { "version": [ @@ -49101,8 +49805,8 @@ }, { "ename": "haskell-snippets", - "commit": "b5534e58ea66fd90ba4a69262f0b303c7fb85af4", - "sha256": "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1pif4wv1d9gjhkxg57c5byg58gdlf0cpd8a4jjbkwlqqz1z7zgf5", "fetcher": "github", "repo": "haskell/haskell-snippets", "unstable": { @@ -49138,11 +49842,11 @@ "url": "https://git.spwhitton.name/haskell-tab-indent", "unstable": { "version": [ - 20200513, - 1950 + 20200514, + 1424 ], - "commit": "e332562b67b2611ef3f97d6a0bc395c6aeb70c7b", - "sha256": "0g06rs9lmpawbk02yiyq7gxrsfb6ps7vq0ghija9h97n47arxczb" + "commit": "1127f46eca40a48be9cd2380df2cfc5f0b694e63", + "sha256": "13c2z1i7icpwv60njn83qbla9i0qlq3m0yz88ach1mlvmsdfj9jz" }, "stable": { "version": [ @@ -49184,26 +49888,28 @@ "repo": "purplg/hass", "unstable": { "version": [ - 20220813, - 1717 + 20230116, + 2220 ], "deps": [ - "request" + "request", + "websocket" ], - "commit": "c6d9bd2e29fc2c4f37c0c72f3d136e43f34addbc", - "sha256": "0km3gcsd9vn4w9700rzfyfw4vj47sbd39xxn42lgqjw0h1bywdkw" + "commit": "033d11b07e0f8bb68b348a12d5ae13fabea56c73", + "sha256": "09jh1awga10jys9sj5szrx9jmgdjr33ahb8dqkryxykxm8527g6c" }, "stable": { "version": [ - 2, - 2, - 3 + 3, + 0, + 2 ], "deps": [ - "request" + "request", + "websocket" ], - "commit": "c6d9bd2e29fc2c4f37c0c72f3d136e43f34addbc", - "sha256": "0km3gcsd9vn4w9700rzfyfw4vj47sbd39xxn42lgqjw0h1bywdkw" + "commit": "033d11b07e0f8bb68b348a12d5ae13fabea56c73", + "sha256": "09jh1awga10jys9sj5szrx9jmgdjr33ahb8dqkryxykxm8527g6c" } }, { @@ -49387,22 +50093,37 @@ } }, { + "ename": "heex-ts-mode", + "commit": "dbc1afa79eb2b9b50c9aed1a33f7eacd8cc5754d", + "sha256": "1c1d7ji2j0y99qnv2qwj5jf3vij56ja3pf0jzxxwmm9ka9scb3rj", + "fetcher": "github", + "repo": "wkirschbaum/heex-ts-mode", + "unstable": { + "version": [ + 20230216, + 554 + ], + "commit": "3eecf4dad47a4cb6d92d730021e72cefda267539", + "sha256": "19rpjhyd1k7qp3gvl3hq2ah72m7a8da0h0a93smfpkkkz3j4n5dz" + } + }, + { "ename": "helm", - "commit": "38cea79ddef23a10098b5f3f8509e5be1e59536c", - "sha256": "032ypri8p6q1xz65imd89xizm4gzxkg62zaqyyv5pb2kbbv1y2b0", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "01h2k8xb4r98xxyff8cg53fzv3xc4nq7gl3qhghn03vla2l9hzpq", "fetcher": "github", "repo": "emacs-helm/helm", "unstable": { "version": [ - 20221117, - 1800 + 20230221, + 819 ], "deps": [ "helm-core", "popup" ], - "commit": "8de5444df2bafd1b3a91acd0e00cf1e0ee81682b", - "sha256": "09dk0dz8fkigi3zbinq76310nnnw29z4pca0ypsn2z6l0l3hg7zb" + "commit": "fb3df89c7b0a68c79d6725beb20d3dc6ccd348a1", + "sha256": "189d1ldhaw83ahvjpi1l5q6v1agglvbll9qimfyv8g2h4nj50730" }, "stable": { "version": [ @@ -49718,8 +50439,8 @@ }, { "ename": "helm-bibtexkey", - "commit": "d35a2e5cb5232d16d5c98168706d8b6426fcfb44", - "sha256": "00i7ni4r73mmxavhfcm0fd7jhx6gxvxx7prax1yxmhs46fpz8jwj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1rz9140miy9qnx2nhzhaqjggv8dp9kh0x6sr5m4a1z0j3720ql0a", "fetcher": "github", "repo": "kenbeese/helm-bibtexkey", "unstable": { @@ -50199,8 +50920,8 @@ "repo": "youngker/helm-codesearch.el", "unstable": { "version": [ - 20190412, - 1153 + 20221219, + 1219 ], "deps": [ "cl-lib", @@ -50208,13 +50929,13 @@ "helm", "s" ], - "commit": "72f1d1de746115ab7e861178b49fa3c0b6b58d90", - "sha256": "1qxpx8jmkvg59k4rx99bn9asnh4nl5rwkjvbhprdlqaicglm153q" + "commit": "bd5a7e3ece98f2940cb09be56d3e56da97d4c865", + "sha256": "12lay84wys9hwry68nyxfa0visjv6bhndc3nyhggwd44i30wvx8c" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ @@ -50223,8 +50944,8 @@ "helm", "s" ], - "commit": "a6bac6b8a063b91b444a72318b163b266742db9b", - "sha256": "0xmplh7q5wvrkfha8qc9hx7sjyc8dsms0wrvj2y7zg35siw1561l" + "commit": "bd5a7e3ece98f2940cb09be56d3e56da97d4c865", + "sha256": "12lay84wys9hwry68nyxfa0visjv6bhndc3nyhggwd44i30wvx8c" } }, { @@ -50300,14 +51021,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20221113, - 1706 + 20230217, + 602 ], "deps": [ "async" ], - "commit": "51b28e8c5ba63aa891d5d05aca08ac2688701971", - "sha256": "10xicmc6h0qlxahnf7zd70jg40i2mcz9m7vr1b28wpjgi1rmf8ix" + "commit": "dfd6403947c5cd9f32afcd6bc92a1756cc958c82", + "sha256": "03rw1j7cs7glwcnwxp69zl0csfj138csyzcg6g2yj1vsm31mx2mn" }, "stable": { "version": [ @@ -50501,14 +51222,14 @@ "repo": "masasam/emacs-helm-directory", "unstable": { "version": [ - 20170706, - 402 + 20170709, + 1103 ], "deps": [ "helm" ], - "commit": "caa013b820b5263bf1c6446debfea0766dae8ab8", - "sha256": "15ljhz7cik7qzbh69l28c9mcvls5zgk42lp5bm9kl9fg6m6aasvq" + "commit": "2c6d45404506ba744888dcdb65e9f63878f2da16", + "sha256": "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h" }, "stable": { "version": [ @@ -52200,14 +52921,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20220920, - 1200 + 20230102, + 1148 ], "deps": [ "helm" ], - "commit": "b9865a3a8ba8af572fcf12d975ea04dc9437c1a2", - "sha256": "1x9z790chc4ia5ipb30fza5bjybp6xp1194z5wbb1fn7hnyxa5z4" + "commit": "2422f57ed40d998ac6f085f93b24223c91cefaf7", + "sha256": "1j6avadq1jn5bib1nr8sj08qn4f67psb39jdcn314n6r84xf4gam" } }, { @@ -52399,8 +53120,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20220318, - 1529 + 20220527, + 703 ], "deps": [ "dash", @@ -52408,8 +53129,8 @@ "org-ql", "s" ], - "commit": "f666fe150f1bf3c3ce43d0e15f90b20d43c2e772", - "sha256": "1mpq3v8lxqllnb4afqh7p9av0p9bha8ld7741zaw4hxb1252xgm2" + "commit": "115500c8a0a3190ec6a69d1120fe81944d819125", + "sha256": "0iamqv5j43ngj1xdqr36rkgk9lqpk9bg8y531jsldnvwzrp3srpf" }, "stable": { "version": [ @@ -52769,16 +53490,16 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20220820, - 826 + 20221215, + 613 ], "deps": [ "cl-lib", "helm", "projectile" ], - "commit": "5813f7286533990783546c9c39c184faa034d1f1", - "sha256": "1qrdms3lmr7wspqhd0ygqmyznlc6spy2lnn1n8p4v495nzdygzdh" + "commit": "35a2111d00c0c0c9d8743280d3f1243bb217118a", + "sha256": "0gd170h3v5i1886f7pvb5h5licy797djhjrigwfj2wa7i5q1avxv" }, "stable": { "version": [ @@ -53293,8 +54014,8 @@ "repo": "emacs-helm/helm-searcher", "unstable": { "version": [ - 20220704, - 634 + 20221231, + 1632 ], "deps": [ "f", @@ -53302,8 +54023,8 @@ "s", "searcher" ], - "commit": "27a6cfc7f9b3c988b4c7c6f1b3954760a9701dc0", - "sha256": "13pb0rcwp7jaj30d98lhi0jyk4dxlgk8pg64s5bnxf492hjzsk4x" + "commit": "225480fa89d73eb53478576610f48d035b77cda9", + "sha256": "0xmjccgym52fdryggr8lpamxy5d39jxr5mrl76r11n30dr46r1qi" }, "stable": { "version": [ @@ -53806,26 +54527,26 @@ "repo": "masasam/emacs-helm-tramp", "unstable": { "version": [ - 20190616, - 125 + 20221228, + 1444 ], "deps": [ "helm" ], - "commit": "924b5516270b3933e847562e8e14e3888dd24184", - "sha256": "19y97ia4zl50wd22gkb7kkhj713imd5jc92l2xnpw04b59b60di1" + "commit": "10711393c05272112e1585dca87ebeb0ea5b114d", + "sha256": "0rijcx9qsj76yf5lwmjicq94r6knaqh9v0xiq2i4gr48gf3j7irv" }, "stable": { "version": [ 1, 3, - 9 + 10 ], "deps": [ "helm" ], - "commit": "924b5516270b3933e847562e8e14e3888dd24184", - "sha256": "19y97ia4zl50wd22gkb7kkhj713imd5jc92l2xnpw04b59b60di1" + "commit": "10711393c05272112e1585dca87ebeb0ea5b114d", + "sha256": "0rijcx9qsj76yf5lwmjicq94r6knaqh9v0xiq2i4gr48gf3j7irv" } }, { @@ -54136,10 +54857,10 @@ }, { "ename": "help-find-org-mode", - "commit": "572003398d1bba572fa9f6332b25ade9306bf718", - "sha256": "149rd61bcvgrwhnhlqriw6fn6fr4pwr4ynmj2bwcp558nwf0py0b", + "commit": "7ea0e06818d5bf0f48da5e491b39891c78744d67", + "sha256": "12yqgl2sm4kys6ar9sgxc6myixr0shdraxdh41702bn2chlxvkcc", "fetcher": "github", - "repo": "EricCrosson/help-find-org-mode", + "repo": "emacsorphanage/help-find-org-mode", "unstable": { "version": [ 20181204, @@ -54166,8 +54887,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20221108, - 2042 + 20221209, + 1743 ], "deps": [ "dash", @@ -54175,8 +54896,8 @@ "f", "s" ], - "commit": "dc4e356b55212f67c7022f3aec4f5986a23d5d5e", - "sha256": "18dy3nxdnxz3wyr4hza9jcv4agsyyqf82jp6jdqcj13kncfl9gn5" + "commit": "94c25337b2de2f9da60914a7c0c6cca9584c0231", + "sha256": "09da3d3kx4c8im58kwfv59zpwda70yvwnjk01w7r6lra1ww8d3yx" }, "stable": { "version": [ @@ -54276,11 +54997,11 @@ "repo": "kuanyui/hexo.el", "unstable": { "version": [ - 20200416, - 1410 + 20221130, + 1642 ], - "commit": "d600b6c2d51959f1331c8abf3953365544322afa", - "sha256": "07w6jlq3z5y019n5kplqn38gw60ffk2yx4vchp6qgif98lhcjiyr" + "commit": "709c069ec0f9ffd8bc2f8fff18a66d80bc205f6d", + "sha256": "14jsanf2wc6k7rqiy3l2i8nzhlasknjvdmq7mh7q680ajj8hry7d" } }, { @@ -54380,17 +55101,17 @@ }, { "ename": "hiccup-cli", - "commit": "524a84be8692bd29b93e4897467e2e798be5fa53", - "sha256": "0xv6bq2ryz71lqqm1z6wg0lf1qmqwydg17zi614dsajsa5xhrjkb", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0b79709x1lj050jicwklp0bx3v0j9d5ymdzp5niqsnww5z81q0bb", "fetcher": "github", "repo": "kwrooijen/hiccup-cli", "unstable": { "version": [ - 20210208, - 652 + 20210211, + 2127 ], - "commit": "863aa81c30d747e88cf53b3922169f8196d18a97", - "sha256": "0j1zw88frqlzhr94b5550ljlm8wlqqxjb2gjysi1g1k7kqha868b" + "commit": "cfbb957a1f86bc1d28e778bfdffdeaaa2ae79286", + "sha256": "0f3b7wsq9b0xswvj4073ykkcc36kybz16bz4q068qziig22d9szb" }, "stable": { "version": [ @@ -54833,11 +55554,11 @@ "repo": "fgeller/highlight-thing.el", "unstable": { "version": [ - 20220726, - 2237 + 20230217, + 728 ], - "commit": "cdf429c41c13c22d25fe43493cc5d85cc480dba6", - "sha256": "1p3q0s96f2pgmf327zzwx11sdy24im3dy9qv53bk2nb5zysvklzm" + "commit": "ad788d7a7ee9eb287a8cca3adb21510b89270dca", + "sha256": "1p829ydpc1qhqabwi0xaa9yy4rqz9wbkphq7kdly6qiz59jasdq1" } }, { @@ -54884,19 +55605,19 @@ "repo": "dantecatalfamo/himalaya-emacs", "unstable": { "version": [ - 20221007, - 1816 + 20230209, + 1545 ], - "commit": "1735b55e4dd60c63fe3900e959655f1f8b961590", - "sha256": "19w5vjx0zlfvfldblb7fjd4vzhbsi9y0plj1a6avplk8jypjdr7r" + "commit": "712bb410afd4cd43d3a8e9bcf2b1930dcde7000c", + "sha256": "136fdjb033dx1k94580ygglldhii6smcf7hvqawb4x1z6i80p8jq" }, "stable": { "version": [ 0, - 1 + 3 ], - "commit": "1735b55e4dd60c63fe3900e959655f1f8b961590", - "sha256": "19w5vjx0zlfvfldblb7fjd4vzhbsi9y0plj1a6avplk8jypjdr7r" + "commit": "712bb410afd4cd43d3a8e9bcf2b1930dcde7000c", + "sha256": "136fdjb033dx1k94580ygglldhii6smcf7hvqawb4x1z6i80p8jq" } }, { @@ -54907,26 +55628,26 @@ "repo": "mihaimaruseac/hindent", "unstable": { "version": [ - 20210201, - 148 + 20230221, + 619 ], "deps": [ "cl-lib" ], - "commit": "89b8f857a1e706f723de27063a8d9f870efa0169", - "sha256": "1yvrkwv3cdbz9y526zqsc9764x27l7ih5vcyh8lqmy4w93akh151" + "commit": "a9c2898b9ac8f13e57092e3d5287e05b942d4539", + "sha256": "05ss0601jqyvxqr6pblpjwlq2hl0yq3abdlvxjhdx4br4mgi3sgq" }, "stable": { "version": [ - 5, - 3, - 4 + 6, + 0, + 0 ], "deps": [ "cl-lib" ], - "commit": "68d5211b2737c2ba31bbceed9b1abbb36bb83e39", - "sha256": "0qkrgar7blirhx85p0m4pjvwwh5rcs9ypy49hyg9bah1dgrnm88b" + "commit": "a9c2898b9ac8f13e57092e3d5287e05b942d4539", + "sha256": "05ss0601jqyvxqr6pblpjwlq2hl0yq3abdlvxjhdx4br4mgi3sgq" } }, { @@ -55119,11 +55840,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20220731, - 2352 + 20230201, + 130 ], - "commit": "a9e8e8cfd83972a448bdbb0a9967989d0aa1d05a", - "sha256": "0bdn9d28g2nmbxq0jhjrcpxadl18q0z231ciyqw2cvcc60i4n4rq" + "commit": "352686955b6e73c6353c640c7d3bc09487c9de69", + "sha256": "1xqrd6z015ka42b1j1kakym3qvv1m5ip450fiffkv8gmfnxi7mkj" } }, { @@ -55170,11 +55891,11 @@ "repo": "ideasman42/emacs-hl-indent-scope", "unstable": { "version": [ - 20221016, - 508 + 20230116, + 2310 ], - "commit": "fa2f0f28ad869e83ae3c77d8d936dde5a1e45f24", - "sha256": "1lygcap8fk25cqqnvsdrkhhvca22c62vf02xq75ccx2aic9dnshh" + "commit": "5e806bfedd01bf82e4fda27e4b9809662318c287", + "sha256": "1xj2xaxff7qan8mmndzr88kx0b80bva1myy37si5jw2d6k3z8scf" } }, { @@ -55185,11 +55906,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20220731, - 2353 + 20230201, + 140 ], - "commit": "6d419cc36936f3bb3c9c63a6f77cc88a80b0db9c", - "sha256": "19k1g8g0z9sllqjq2arp2fdcpn9xs8d73d7nx7bn12s1kpa7viv6" + "commit": "a573977f9734b1786a4691c9fb8e5031159027f6", + "sha256": "0wnf62vlpa46nb0ziabn3c95i59x7b0sxjwkmkhmcgzqfa8g86jd" } }, { @@ -55222,14 +55943,14 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20221011, - 1032 + 20230212, + 2213 ], "deps": [ "compat" ], - "commit": "c699c9beb2f878ad3803c91bd0bd7c1a5e1c9690", - "sha256": "1bmvcr72ch94kdqnzysx98kswlv9r6al6kwv7bxrkbq922shqf11" + "commit": "13034b2709b22631772ef24d08f8a16bfa06bc34", + "sha256": "1dmzw1nin7h9ns7md9lgkfcdxja1vlxh03mp9ggn2n79cv6abjkf" }, "stable": { "version": [ @@ -55395,14 +56116,14 @@ "repo": "Boruch-Baum/emacs-home-end", "unstable": { "version": [ - 20180817, - 855 + 20190109, + 541 ], "deps": [ "keypress-multi-event" ], - "commit": "211914c5e7b25f35f02626575a9b10536f81ba1d", - "sha256": "1ppjm0sb4svarnqcv6j581sqnjjsps27ghx63759v9wkylqyi995" + "commit": "30676ceec0d4ad84038cd0d65ee45ae810ab185c", + "sha256": "0czvnk74988p6gqz5jz83gkvvqdrdmzn4qz6cc8dmbyxk1zg6l8y" }, "stable": { "version": [ @@ -55536,11 +56257,11 @@ "repo": "axelf4/hotfuzz", "unstable": { "version": [ - 20221017, - 1506 + 20230221, + 844 ], - "commit": "05330fc7208c654631e7484c3c7c441716901237", - "sha256": "0s38pip10k4sfjffcx96pbjvrjlx7ijjgs4plr9axxdvdgnjwjvy" + "commit": "90d95663f9ff667786b71071a039502d873ef4aa", + "sha256": "1bllfjj4s4lqdb7r9r4nmwb31qdlcrswbxxyfwzyv0ygw7cmaz76" } }, { @@ -55642,20 +56363,20 @@ }, { "ename": "howm", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "0jc585z0whcph644k2iic41xvjgzln3w2kdibrmr8lpcifbfr5qk", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1i2lcgxcqbpdi5mh2684m0sqyvmw59pmd9rpx1kmpy17a9972b87", "fetcher": "git", "url": "https://scm.osdn.net/gitroot/howm/howm.git", "unstable": { "version": [ - 20220815, - 1125 + 20230218, + 818 ], "deps": [ "cl-lib" ], - "commit": "9982e74e212014bc8ed67bbe780eb6ca55dc5298", - "sha256": "05dfd8sqvv51miwkr82hym5z7byiiv38zsx47b7sqr8kkqj9jcf5" + "commit": "ffc1e7da1f02f750094a9f0fe8a0aa837743193b", + "sha256": "1hhphdczwqiwb96d4wi0bxv4cjph4sb4pgb4wjihy2805b0dj9ar" } }, { @@ -55684,14 +56405,14 @@ "repo": "Wilfred/ht.el", "unstable": { "version": [ - 20221031, - 705 + 20230214, + 1632 ], "deps": [ "dash" ], - "commit": "ef768ccdeb8159814628ab0e2714e7dc8d9674fa", - "sha256": "1ckkjb9nl9vfphj6c2zdc5jjsv44b00l8p8kn6dzihazjcip7f4m" + "commit": "3c1677f1bf2ded2ab07edffb7d17def5d2b5b6f6", + "sha256": "0nbmdh0ba89hr617kk0ak78blj7birrxi8rpn9ps38a5x41l46a4" }, "stable": { "version": [ @@ -55728,11 +56449,11 @@ "repo": "rejeep/html-script-src.el", "unstable": { "version": [ - 20120403, - 1815 + 20130807, + 918 ], - "commit": "0efeed7ab948e48128e6f1a7ddff17ef2951e1c2", - "sha256": "11zffiy5s0zqwi8hxwa87j2k8n2lm54v8knnbwa5zafhqpb53znm" + "commit": "ed5e686ab604c81222c7e50b27c5d874c5687db7", + "sha256": "0rrm1azjgclidb8js8qvkhgnlmz9ivbjw69p6z25h5p0rxfx3jnj" }, "stable": { "version": [ @@ -55752,15 +56473,15 @@ "repo": "plexus/html-to-hiccup", "unstable": { "version": [ - 20211129, - 944 + 20230120, + 1416 ], "deps": [ "dash", "s" ], - "commit": "97ecc8cce11f577ad4406da0367aa5eeec1bd8c6", - "sha256": "0i96m9wpgwlxp8b6lw7a8lsjbxb7q9m12p8yra33q7q3ilav4g8p" + "commit": "12f12fe3165eebbcf17e6209693c8e7251ffa04c", + "sha256": "0k25rd75j37dl19h1w03i1sbjdhwczpw5bb9ynarr6xxfk73iaaj" } }, { @@ -55807,8 +56528,8 @@ }, { "ename": "htmlize", - "commit": "075aa00a0757c6cd1ad392f0300bf5f1b937648d", - "sha256": "16nvvsi4nxi0zzk5a6mwmp43p0ls20zdx9r18mxz6bsaw6jangh2", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0wmsgvqyag03qq6rqiqkg2vmzv3rql7h7k090280lp1khgs4xyhk", "fetcher": "github", "repo": "hniksic/emacs-htmlize", "unstable": { @@ -55894,11 +56615,11 @@ "repo": "hassy/http-twiddle", "unstable": { "version": [ - 20160801, - 1911 + 20221203, + 1351 ], - "commit": "46da2dbc40209925aa88ab19014ca982bcf9ac70", - "sha256": "03fdpl64lgwlz8yc29ia9scbh0s5xh7g7jbyfvvp6hcy2f0yiyx7" + "commit": "c07e8620183ec710623db35e26dd839b84c56007", + "sha256": "1r8lb9qzrvpkh8qjba7pjmq4jw2na6grjckydm3s2m65lq618vjg" } }, { @@ -56270,11 +56991,11 @@ "repo": "vifon/hyperlist-mode", "unstable": { "version": [ - 20200515, - 2209 + 20230119, + 28 ], - "commit": "00af994deda061fa95ad0046510eb6a2672c99aa", - "sha256": "1l99h6m1h01iz0fq5nn56lxx8wnvci7jm0iwqyyjrgll808z1ji7" + "commit": "480dbf33ca72e7b5fade952aaf0d5a5eb43acb1d", + "sha256": "0rjlhqrr4plgx8fw8sbj8mv05w9gdc0ac34igm6lxgb4amkrvs00" } }, { @@ -56425,6 +57146,30 @@ } }, { + "ename": "ibrowse", + "commit": "f40df0797df7ac0721debf139418f91dc7e82333", + "sha256": "185z9yqf6qp4q93mzmgz8mr3azbhwgs4gzqrqlv75fk332rpdl96", + "fetcher": "sourcehut", + "repo": "ngraves/ibrowse.el", + "unstable": { + "version": [ + 20230123, + 737 + ], + "commit": "b42685528d7bb2ca968fbf536d8745838e633828", + "sha256": "0q3imid9byaay0lqvv5n2klwk680w8x3qzdb279rdr08bb36w5ya" + }, + "stable": { + "version": [ + 0, + 1, + 8 + ], + "commit": "b42685528d7bb2ca968fbf536d8745838e633828", + "sha256": "0q3imid9byaay0lqvv5n2klwk680w8x3qzdb279rdr08bb36w5ya" + } + }, + { "ename": "ibuffer-git", "commit": "d341da1b9bac782c75ab931fd53a9525a85c702e", "sha256": "048888y07bzmi9x5i43fg6bgqbzdqi3nfjfnn6zr29jvlx366r5z", @@ -56532,11 +57277,11 @@ "repo": "svend/ibuffer-tramp", "unstable": { "version": [ - 20151118, - 1739 + 20180127, + 2122 ], - "commit": "41fab2ad174f53a4cf5ef7d2ebef518dede82ab4", - "sha256": "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq" + "commit": "bcad0bda3a67f55d1be936bf8fa9ef735fe1e3f3", + "sha256": "1ry7nbhqhjy6gkxd10s97nbm6flk5nm0l5q8071fprx8xxphqj8f" }, "stable": { "version": [ @@ -56556,14 +57301,11 @@ "repo": "purcell/ibuffer-vc", "unstable": { "version": [ - 20221025, - 1411 - ], - "deps": [ - "cl-lib" + 20221215, + 1752 ], - "commit": "813d2dec32bd7ecbb1ecd781c2a63046f71d0dd3", - "sha256": "04h6p5vfxm3pgkjc29wvb58csg7wh31gj9wp4x8i8hpma5gkm07l" + "commit": "9204001d1c5ca39409485c1574fd315b0e137a92", + "sha256": "1xf9brpimdpalrwfd8h9233ssw6b2s6wszissw1836f6x76cx5lj" }, "stable": { "version": [ @@ -56653,15 +57395,15 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20210612, - 1340 + 20210630, + 1606 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "5ca5bd6b1bf307953b5fe7be1967c38cc879ad8a", - "sha256": "0xv4lridnzqalgaqg99a715fv15rknznjy3fw4b1jpkjl49rb398" + "commit": "4521e9d2debef7687bfd26a664479f0c46688a36", + "sha256": "0s65kilx1jrjhm80sc4fj3x0mr3x4m3vjllm6qxj8ml8sh3pkai3" }, "stable": { "version": [ @@ -56762,11 +57504,11 @@ "repo": "ideasman42/emacs-idle-highlight-mode", "unstable": { "version": [ - 20220731, - 2354 + 20230208, + 359 ], - "commit": "b3eed5553fe8d7b28bd95b5093e4174d859695ca", - "sha256": "1wp6mcj7j7hdwhdg29d6csma2v02g1w5z5kv5aa9lwmb3w7pfdq6" + "commit": "215d6612b4f8f412c14f9f456106bfa4c5df3d2f", + "sha256": "1wxfry0z7k9xx5yrns127yj5vfbsh2ldm6ajlqz4bxx476zwwwdk" } }, { @@ -56807,11 +57549,11 @@ "repo": "katspaugh/ido-at-point", "unstable": { "version": [ - 20151021, - 757 + 20151113, + 1508 ], - "commit": "6b267f202dc3d3d924c904fbd894e9a209f231de", - "sha256": "1bj8k5fq6x3s5qmr02bnkcls7sndmg4wjjjrsd3fr6yl8c4jcy3k" + "commit": "e5907bbe8a3d148d07698b76bd994dc3076e16ee", + "sha256": "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp" }, "stable": { "version": [ @@ -57180,15 +57922,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20221118, - 1026 + 20230210, + 2150 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "67e06eccbd063078df9671169c60ed5bb941d9cf", - "sha256": "1hc6f24l8z8nz0sg5dz14wrxsi40x5dzx9a4plldcfdh743lsvp6" + "commit": "788f53520db8042fb6dbc56779a9439da0dd6693", + "sha256": "00apzc6n80hwf0g64mzq3pm9jbqw3k3i8ffr0hfjdp1c0777cwiy" }, "stable": { "version": [ @@ -57434,14 +58176,14 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20221022, - 2233 + 20230212, + 2016 ], "deps": [ "compat" ], - "commit": "d9b5cb5c0a5483e663cc3c345df7659ddf08b61e", - "sha256": "0b53y83w1ksy96h10vnbn0f3is4g5nb3dxmh0v8plrchkwxb0pq3" + "commit": "e8c0f88fa56e3b73307f50a21ab664a4b1bb59eb", + "sha256": "15ldjmvrxlwl0bfwjyw7f9ms3k6asm735la3h6ywkj5231yxfn1x" }, "stable": { "version": [ @@ -57462,10 +58204,10 @@ "unstable": { "version": [ 20180318, - 2027 + 2222 ], - "commit": "5e842a8c60ba98f344edf1b1e65f5a480ed938ed", - "sha256": "16k7cxzdjbblzckp5qppw1ga0rzdh3ww2ni7ry1h43p9cfna0kcx" + "commit": "79bbbe918319bc1e8f42a0bef53dc7c77fe868ea", + "sha256": "0lqhwh8kav7f526a40rjdy2hzarzph1i3ig2dmbf02gp32sl7rg9" }, "stable": { "version": [ @@ -57627,20 +58369,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20220519, - 635 + 20230219, + 1703 ], - "commit": "e022d1a2fdc899b4c22254ebcf8997f5690d7c60", - "sha256": "0knpyh0ci777g6h83lr4pvy7w1syf068gy1p409rg3ssnwjnkxnl" + "commit": "20417eaf6f349b3707e515d5d7817896243a8ad1", + "sha256": "1xymssi0kyipgy9dyda931795xpvr1afnisaccl9yq53rzibwxfx" }, "stable": { "version": [ 0, 9, - 0 + 1 ], - "commit": "ca82a1700cf7834b55ada36e53811f6effde6283", - "sha256": "1c9d895g4dw0jp1ipm1mlhs2ln5f61ng83rv294jh32nrl3wrs81" + "commit": "2b2fe48234e73b447e3578fd211627ac4e78d070", + "sha256": "0r6m8jdn0lknhrivba27c7y54lysiab5nq5lm2i6bybzvc13ism5" } }, { @@ -57684,8 +58426,8 @@ }, { "ename": "impatient-mode", - "commit": "aaa64c4d43139075d77f4518de94bcbe475d21fc", - "sha256": "07z5ds3zgzkxvxwaalp9i5x2rl5sq4jjk8ygk1rfmsl52l5y1z6j", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "11z0b8992k14jnpshbprsnhhgq1nsrpz3mxak9gz0wh6hi449f7j", "fetcher": "github", "repo": "skeeto/impatient-mode", "unstable": { @@ -57842,11 +58584,11 @@ "repo": "flashcode/impostman", "unstable": { "version": [ - 20220818, - 1845 + 20230111, + 2012 ], - "commit": "16ee00e35e9ee82bb06c6feafb148d98165f822f", - "sha256": "1ghwrg7w9b3xhfj2yjxzd9ysbgrb81pkg6gqhiq3n2zsia18i87p" + "commit": "936575500f733c2428ba878f9400f3eef8c9645e", + "sha256": "16zd5bk7s1h9yrrsk0ngpzb4cfyj4gkmq70m0ijsc94az7m9rlx3" }, "stable": { "version": [ @@ -58135,11 +58877,11 @@ "repo": "J3RN/inf-elixir", "unstable": { "version": [ - 20221013, - 2100 + 20221120, + 2028 ], - "commit": "0eaea59f20889b3d0048719377e5a05a2e7fea1a", - "sha256": "1swiw3yih4xbgrh4dx7sqxrz4d7jjkhnjfirjdcds0c6mjg0cvzp" + "commit": "6fbb0867b586ad1bf8adc09cc55f33dfa72db833", + "sha256": "0gwg2hjz0s6gkyifvni3mghrp7174prwrl46sbxx5pi9s435djpm" }, "stable": { "version": [ @@ -58174,11 +58916,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20221016, - 2238 + 20230122, + 246 ], - "commit": "c6192178941b46754fdb50405f344481c8ef2fd1", - "sha256": "1rmhqwhyp7756z0zl313clv4wkv1zxvyhlznqjpjwqajcjbz1ib4" + "commit": "0ce7f4049edcae188b4643b3163e5301f9ef09cc", + "sha256": "0ygm4y0iwvh1mz883x9727jlw0pnf0xgl4b1xysbvsyg6gplf0xv" }, "stable": { "version": [ @@ -58459,11 +59201,20 @@ "repo": "Lindydancer/ini-mode", "unstable": { "version": [ - 20170424, - 909 + 20230211, + 1512 ], - "commit": "2194cfa2fd13196a37350ec20b3f00dcf6162b7c", - "sha256": "0s3dcqywrbggrcn9j5nibhcl4xbnhdndz5sibcp26qswd18jyrdk" + "commit": "5472abc94e564edc6b469c48d2324519a044a77c", + "sha256": "1k2xscd9dhxd4znsxn3ryvds8g9yrd82bz4jdx5p2km9czpjrj88" + }, + "stable": { + "version": [ + 0, + 0, + 7 + ], + "commit": "5472abc94e564edc6b469c48d2324519a044a77c", + "sha256": "1k2xscd9dhxd4znsxn3ryvds8g9yrd82bz4jdx5p2km9czpjrj88" } }, { @@ -58571,11 +59322,11 @@ "repo": "ideasman42/emacs-theme-inkpot", "unstable": { "version": [ - 20221029, - 2301 + 20230110, + 950 ], - "commit": "7b723a7c9c6381d09cc1c267fb067c055cfeab72", - "sha256": "1wrb6m7i180pxa2mg3737vhamzmrrwki0ii44iakp5588qyn7y3c" + "commit": "fa0746d927ad205b2f17589e67703c18f42aacf4", + "sha256": "1q8mqz8635fgg1jsp0gypngjicymnfw1ba50hvvzd4nigg107xhz" } }, { @@ -58712,11 +59463,11 @@ "repo": "lassik/emacs-insert-random", "unstable": { "version": [ - 20220622, - 1653 + 20230212, + 1710 ], - "commit": "049567eeca639017ac2db786cefaf38af7273654", - "sha256": "0ml5sig9c9q3s51wk32njwnfnz6s8jpbmj43ni1l33dlvyc10jl7" + "commit": "a13827fd68457f939e46f95a662752f6f344107c", + "sha256": "1jlbi6hv7f5aar5mf5zqa3pr6m7qss9hfsi5glgjg26m7633pv7d" } }, { @@ -59113,8 +59864,8 @@ }, { "ename": "irony", - "commit": "d2b6a8d57b192325dcd30fddc9ff8dd1516ad680", - "sha256": "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a", + "commit": "c1cca9d0b5a701d542f37f21748eb4be00af3b4a", + "sha256": "06x7b26vkdfjw6jk27s45hgaff7p4xjdmpncdgcgjvwyy2wbw1j6", "fetcher": "github", "repo": "Sarcasm/irony-mode", "unstable": { @@ -59310,14 +60061,14 @@ "repo": "pythonic-emacs/isortify", "unstable": { "version": [ - 20190315, - 2004 + 20221121, + 1816 ], "deps": [ "pythonic" ], - "commit": "4d8ecfcadf58ea51368e66ecf6f2a95a95953fcf", - "sha256": "0gslib1r9d9dqd9r89dfg8npkybjw2bjdrbs0z2qcnfa82x4fq4z" + "commit": "2751fb23eea4a40437e7d9bca77cbc9c06b44f3d", + "sha256": "09j042cl7mvhbp1r1fzxl17qc9z5ba0s6h5nwjx1yph7x1f7gmcf" } }, { @@ -59423,8 +60174,8 @@ }, { "ename": "ivariants", - "commit": "ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38", - "sha256": "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1krll431c0jzy1g7w16b70lqa49is5pp9axaagn9nfv9l3hck8a6", "fetcher": "github", "repo": "kawabata/emacs-ivariants", "unstable": { @@ -59909,16 +60660,16 @@ "repo": "ROCKTAKEY/ivy-migemo", "unstable": { "version": [ - 20220309, - 605 + 20230121, + 1934 ], "deps": [ "ivy", "migemo", "nadvice" ], - "commit": "f31a2b314b81e328ce0222d8796b808230ddaa0e", - "sha256": "07l6x4aysxzrwlva7df5mdmb8kir1w9jpk7jqc5823zd00dmd6hf" + "commit": "6022b24e72f073a7b5599f2dea611da3a1282378", + "sha256": "1qg60wgykxzhngzg7lw1fdmji8qrdigak9w40qrhsh70vlyssha5" }, "stable": { "version": [ @@ -60066,27 +60817,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221112, - 344 + 20221216, + 112 ], "deps": [ "ivy", "prescient" ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" }, "stable": { "version": [ 6, - 0 + 1 ], "deps": [ "ivy", "prescient" ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" } }, { @@ -60374,13 +61125,13 @@ "unstable": { "version": [ 20131027, - 1629 + 1657 ], "deps": [ "grapnel" ], - "commit": "47632caf925fbb3cc8633834d2d619032d039336", - "sha256": "1j6axmi6fxcl2ja4660ygxchggm2dzjngi0k3g6pimawykvgxs3n" + "commit": "498dac674f4f1910d39087b1457c5da5465a0614", + "sha256": "0rpxh1jv98dl9b5ldjkljk70z4hkl61kcmvy1lhpj3lxn8ysv87a" }, "stable": { "version": [ @@ -60438,6 +61189,29 @@ } }, { + "ename": "jack", + "commit": "87a205d634c117b81f3e982ee75ebb9a0cbd0d08", + "sha256": "1f0a7nsmigw5qk7s6r80n3a7gi8bq2khsd96i3j58xd12mvnp38m", + "fetcher": "github", + "repo": "tonyaldon/jack", + "unstable": { + "version": [ + 20221122, + 632 + ], + "commit": "3b4ea97fcc107d0ffd201ea695129af52f390113", + "sha256": "1cizszj62ic41zc97glf2mdvm1kd95vdfg2dip3n2p2g0nlk2hjf" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "7e4b1a1c732fdc8ccda4bb78c0aa8697bdf43491", + "sha256": "0w89qgjry3gp3mclnpglma1pvq8cdxbk074153v38scpw3ankp2h" + } + }, + { "ename": "jack-connect", "commit": "c0f5c5f8051f3046baebb08f41b0ca0bf0d73c85", "sha256": "1ssl126wihaf8m2f6ms0l5ai6pz5wn348a09k6l0h3jfww032g1q", @@ -60753,8 +61527,8 @@ }, { "ename": "jdee", - "commit": "a6d2c98f3bf2075e33d95c7befe205df802e798d", - "sha256": "15n76w0ygjmsa2bym59bkmbbh0kpqx6nacp4zz32hlg48kgz1dx4", + "commit": "5d8c2c6662dc3cd0140bc039a1dca9c3e38673f4", + "sha256": "0a0p01w1azqxjalmij2prqapwrzq9wf3iwrhbkrjp2464z3mbb2f", "fetcher": "github", "repo": "jdee-emacs/jdee", "unstable": { @@ -60962,14 +61736,14 @@ "repo": "john2x/jenkinsfile-mode", "unstable": { "version": [ - 20220428, - 1113 + 20221124, + 30 ], "deps": [ "groovy-mode" ], - "commit": "fa5545be1329df3067dcfd81749bbd99df070d6b", - "sha256": "1cg1k3c4k21im499i09yajqhh20igmd2riyia8y65swvvksnzyrc" + "commit": "1d90c1ff8edc7ea88844af92a206e7c5f083b568", + "sha256": "0l51r96vyk8wq8d6jmbchna2ckv47qzm290k4mpybxp85phvajzj" } }, { @@ -61011,6 +61785,36 @@ } }, { + "ename": "jet", + "commit": "964d3110aee413dacb5b303229eba62da5a0b2df", + "sha256": "12hpl5m2qhzdcivdd1xff4dh9fyqpn2y8v9n6khv4qh7d6x014gq", + "fetcher": "github", + "repo": "ericdallo/jet.el", + "unstable": { + "version": [ + 20230213, + 1615 + ], + "deps": [ + "transient" + ], + "commit": "90fcdec479d2b1755a1410ae65d53d421f7683c9", + "sha256": "05xc3pxr0wa3asrlkga7kdw8k81lgd7l42pqd222692apvd2j33g" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "transient" + ], + "commit": "90fcdec479d2b1755a1410ae65d53d421f7683c9", + "sha256": "05xc3pxr0wa3asrlkga7kdw8k81lgd7l42pqd222692apvd2j33g" + } + }, + { "ename": "jetbrains", "commit": "00dd4626e261d9831fc62d866d50b7257ee418c4", "sha256": "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7", @@ -61172,11 +61976,11 @@ "repo": "ideasman42/emacs-jit-lock-stealth-progress", "unstable": { "version": [ - 20220905, - 41 + 20230117, + 117 ], - "commit": "ebcff242ab90e7562f9873c946a9b067459da779", - "sha256": "178hy00mjaanxry23prnpl3fzzx6v7pl6ma6qrszry7wiyavh7pf" + "commit": "0a6881b887f846f224c939c598bf0807bde2018e", + "sha256": "1m57j6m9f1x79bgffgh86f9ffpmvk06vph2shk0ap1is4qbbckqx" } }, { @@ -61202,11 +62006,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20221117, - 1441 + 20230220, + 341 ], - "commit": "be47c70024dff044322b281ebbcea38de6d5b50b", - "sha256": "0n1hhq7vmj9a7lww8vfwq96lmsdsj5hngb18gid2qav7kf32dlw3" + "commit": "4f14058229855c0a92bab19d76a295dfdcb35f10", + "sha256": "08fgd6l5k6fh3pjc2vgbj919g6d3cvvbsblxki5mix94g0g1bvyh" } }, { @@ -61237,10 +62041,10 @@ "unstable": { "version": [ 20221119, - 901 + 1653 ], - "commit": "c902ad94c2d043f620a44e4c9b1bd7f4d6f22229", - "sha256": "0xp149ibvjxr04pnlfl75gfcjwa91wxvk59dr6fa6761j6phc98j" + "commit": "baaffdfd22a19afb1997ec3715d063186b80d3f5", + "sha256": "0kjzgz8kzvyh7kqjcd9r2cfrhldv90v3yjkpd41vnzbb29b46d4h" }, "stable": { "version": [ @@ -61381,8 +62185,8 @@ 20180807, 1352 ], - "commit": "59caa137c4beec4dec4a7d7ebf8bcb6af44d72f0", - "sha256": "10xxg8lc4g9wdl4lz7kx6la23agpbq4ls1mn5d4y364j8nfcxf9g" + "commit": "29d245b4d126a5fc5153a4d8f17396be4165b4a6", + "sha256": "1d0q59rk44jf87ppnn5bwr14p2vgcnfdr7pf6hdqkhb8gzr8bh7c" }, "stable": { "version": [ @@ -61417,11 +62221,11 @@ "repo": "redguardtoo/js-comint", "unstable": { "version": [ - 20200117, - 615 + 20221201, + 1150 ], - "commit": "0dedaf4753fbe8cdbab14aa85f05d7673cbee8b6", - "sha256": "09wfafrklkybfg44skn1lg2hvcj4gfdv908dq87w1r4wv6ibkvka" + "commit": "30e521ada5806ab780f68e09529715acb88f32cd", + "sha256": "1khxry9rvmcwh1mzqlxa5alfcwh2cqi2afz8b6yya3ahxfal5i5q" }, "stable": { "version": [ @@ -61474,16 +62278,16 @@ "repo": "jakoblind/js-import", "unstable": { "version": [ - 20210105, - 829 + 20230131, + 1900 ], "deps": [ "dash", "f", "projectile" ], - "commit": "941091b3ab074c482a5920194d61f50e9b50d503", - "sha256": "1p18lg3apmhcmvkwldnygy35s1kjj68sgv81lyyf0csvc0pxbcpk" + "commit": "9f8b6bc4f080c7146ce7ee5dd5a6572aeb6f1cc7", + "sha256": "1nlcfqy4wciai7g9zdjy4lx50dipv6yq74fladgsw7yq98hpg501" } }, { @@ -61903,10 +62707,10 @@ "unstable": { "version": [ 20220205, - 1503 + 1504 ], - "commit": "dcbe7cc6eadf5b6ef0cadb6ec5111af2b541e73a", - "sha256": "1mr0k7gyw82gsrr26pvz08zfwvb29caf8gyv3kvnqh6pcnla05sb" + "commit": "349e1f4722474bf1f75dbc8eb9d9c59d790b8083", + "sha256": "11911dk8nkacml6p29m5kpcxhjyas5ymarjsi802s426gpn8wj94" }, "stable": { "version": [ @@ -61950,11 +62754,11 @@ "repo": "iwahbe/jsonian", "unstable": { "version": [ - 20221119, - 518 + 20230117, + 2212 ], - "commit": "1e8103c281bf7781bf3246d2049165d8966710c6", - "sha256": "0xv5lsl21h0jg5iryg89j6qf4c97v2rw7rh5ja8bbch3s21bv69c" + "commit": "d0583a890a8e43845935c31de9f069192011451e", + "sha256": "1ccp7fm9cdq51p00b70plyxwfqp0j4241airxa0hd868m4vi08pz" } }, { @@ -62080,11 +62884,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20220418, - 809 + 20230119, + 1840 ], - "commit": "adf4029be778c5983c436873b8a78bc72a6b09f8", - "sha256": "0z6vx541vskgzb1dmlcijbch4z84lrz5fm2ay0n15sypvxfp2yks" + "commit": "7aafa8e77df64a47fa4729a0c1ea572b5bc8e30e", + "sha256": "1agk2jf76ardqxm28nw341jb92sl6ylkr8yfibsp5vaid9dlq6bp" }, "stable": { "version": [ @@ -62103,14 +62907,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20221026, - 833 + 20230112, + 1929 ], "deps": [ "s" ], - "commit": "6625e95c3d0561c6966a13c2565d35d2ae6c07ca", - "sha256": "0iymb4zmgcxpyxdrpw5icqmmw711p85c2s593kqf3wxcbx8acv45" + "commit": "57a15dfafed680ad7d81f779d414e8cb6717417c", + "sha256": "1bpp7216j1a3agwfsidikf65mmym0xyhq2yn6s9ipsk25n6vac1s" }, "stable": { "version": [ @@ -62183,6 +62987,24 @@ } }, { + "ename": "julia-ts-mode", + "commit": "fd6521584f31c6d349aead6647b58fddbc1529c9", + "sha256": "1m6hm69pc1m47bk09cwlv544bkqy552nqg95w3shch18kslgli8n", + "fetcher": "github", + "repo": "ronisbr/julia-ts-mode", + "unstable": { + "version": [ + 20230124, + 1427 + ], + "deps": [ + "julia-mode" + ], + "commit": "d78307d95a2a97abc54c918eb8feffa62b26673b", + "sha256": "0psvglckx4ryav0bjadn7s0zbxiddq7z03bkr0fkhr2gsdga69zq" + } + }, + { "ename": "julia-vterm", "commit": "401185621fd57899b314a205ea1ffd9765e570c8", "sha256": "1992mnbpiw9pr2vy8ad4hmb4q02va4ha5995dwqyc2h9hzld35qa", @@ -62238,16 +63060,16 @@ "repo": "eschulte/jump.el", "unstable": { "version": [ - 20161127, - 128 + 20210110, + 2237 ], "deps": [ "cl-lib", "findr", "inflections" ], - "commit": "9519c675e8a650f6afade7d870e925d0fb50f112", - "sha256": "1bm1mgd632gq3cl4zrq66vnqq9ynvc01iy6szp464ccnm3cmqdzr" + "commit": "55caa66a7cc6e0b1a76143fd40eff38416928941", + "sha256": "03fh7i6blnbc0zbmp83fk095hr3q4fdvrvfxad74zghcbc2nk7b7" }, "stable": { "version": [ @@ -62343,8 +63165,8 @@ "repo": "nnicandro/emacs-jupyter", "unstable": { "version": [ - 20220419, - 1852 + 20230214, + 215 ], "deps": [ "cl-lib", @@ -62352,8 +63174,8 @@ "websocket", "zmq" ], - "commit": "7d20c0aee2f9c896215f35232905b23532ef04c5", - "sha256": "0lrg43xas5dx1qlhzk7irq5hwgpfpxkv27zgcrcy0sbhd9y8dad6" + "commit": "eebeef1293287075f65d27f5442bb151bf27d92a", + "sha256": "188xkmvl8qz2bkvgy57w8xpnfbif7adrnj0jyqhgl5xhxv40l0gz" }, "stable": { "version": [ @@ -62403,29 +63225,29 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20220903, - 901 + 20221222, + 1650 ], "deps": [ "f", "s", "transient" ], - "commit": "c1995b1a2ea09d7a2af69edcc2a47f5b6d217d5f", - "sha256": "0qa8q5asnjwl4b3ljgpl3ckahfrr1vbmbqha4paq5b63aiblgm2g" + "commit": "141daaa4b0dc07fe25423609dcd14441a9f2613e", + "sha256": "01z86a5bfpgsczy4xbzl6wwg5wwcjnjb7za7xsdv8lvam1s4868n" }, "stable": { "version": [ 0, - 10 + 11 ], "deps": [ "f", "s", "transient" ], - "commit": "c1995b1a2ea09d7a2af69edcc2a47f5b6d217d5f", - "sha256": "0qa8q5asnjwl4b3ljgpl3ckahfrr1vbmbqha4paq5b63aiblgm2g" + "commit": "141daaa4b0dc07fe25423609dcd14441a9f2613e", + "sha256": "01z86a5bfpgsczy4xbzl6wwg5wwcjnjb7za7xsdv8lvam1s4868n" } }, { @@ -62460,8 +63282,8 @@ }, { "ename": "k8s-mode", - "commit": "44085c3f730315a5fc2a9a003ffa16d5df9f9a52", - "sha256": "14m4s0l61a2h38pdq6iczva24cl3mqdkw99k1q0drisdrvy57f33", + "commit": "949da8f16687bad96f53714ccbde895587d439ff", + "sha256": "1xxz2y3wnlqy70d3d68icrblz7832yqhdlzc5h027c61j9p1pg07", "fetcher": "github", "repo": "TxGVNN/emacs-k8s-mode", "unstable": { @@ -62496,14 +63318,11 @@ "repo": "mhayashi1120/Emacs-kaesar", "unstable": { "version": [ - 20160128, - 1008 - ], - "deps": [ - "cl-lib" + 20230212, + 743 ], - "commit": "d087075cb1a46c2c85cd075220e09b2eaef9b86e", - "sha256": "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9" + "commit": "d62b18e888d69d27b0b74cf47224a1ac204dfb0b", + "sha256": "060zskrrr0m9bfccskl06knlly3zwy1s9dzyzn9l4n8rr487fqqq" }, "stable": { "version": [ @@ -62526,14 +63345,14 @@ "repo": "mhayashi1120/Emacs-kaesar", "unstable": { "version": [ - 20160128, - 1008 + 20230212, + 743 ], "deps": [ "kaesar" ], - "commit": "d087075cb1a46c2c85cd075220e09b2eaef9b86e", - "sha256": "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9" + "commit": "d62b18e888d69d27b0b74cf47224a1ac204dfb0b", + "sha256": "060zskrrr0m9bfccskl06knlly3zwy1s9dzyzn9l4n8rr487fqqq" }, "stable": { "version": [ @@ -62556,15 +63375,14 @@ "repo": "mhayashi1120/Emacs-kaesar", "unstable": { "version": [ - 20160128, - 1008 + 20230212, + 755 ], "deps": [ - "cl-lib", "kaesar" ], - "commit": "d087075cb1a46c2c85cd075220e09b2eaef9b86e", - "sha256": "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9" + "commit": "48b7160a817cb1e430726e1d2243d921c3f0508f", + "sha256": "0kxd9pl5d4nlbwpvyv0mnp2hd14z65b1mfksr24s1gih5df8ii2l" }, "stable": { "version": [ @@ -62617,16 +63435,16 @@ "repo": "jmorag/kakoune.el", "unstable": { "version": [ - 20210220, - 1858 + 20230206, + 2037 ], "deps": [ "expand-region", "multiple-cursors", "ryo-modal" ], - "commit": "c39f278811945dbf0958ca8cf81d7b03c39efbcf", - "sha256": "0ajh4nk8brwi41rsbd9dn5gbf7i2mkaxm3aal09r2wgmgxigsiqp" + "commit": "b39c5605e896c55ea246f755c46171bd6d0768a8", + "sha256": "00581hhj6rw2p4d3kjfifd1xylacjsgjcg29f2svd412xlmhkm2j" } }, { @@ -62693,11 +63511,11 @@ "url": "https://hg.sr.ht/~arnebab/kanban.el", "unstable": { "version": [ - 20170418, - 810 + 20230206, + 2131 ], - "commit": "dd11d722b20ae720f29b8aa93a3b1cad87650b33", - "sha256": "07g0spi9jf48vap76f9rgl61sg3jqy03qdxnmchzwlia8wvcsscb" + "commit": "9b588f94efb5a784c9bc10ad66f424b253c5fe5e", + "sha256": "18ywrhj74v7vlcfz84ld90qs9axc2p61x05q27hv2fhzmv3pc72b" } }, { @@ -62751,21 +63569,21 @@ }, { "ename": "kaolin-themes", - "commit": "043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4", - "sha256": "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0f498cqs1an5d9spfl0581ycbv1kw4skqpjnvjbnlspldcqcqrx9", "fetcher": "github", "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20221025, - 812 + 20230126, + 2302 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "c24665044f1bced33b6df4e36e55495f05050c78", - "sha256": "0qryc82d5s314bm1ijxn7hk5fpm1qclr2hc630sh3ppkgayrlp48" + "commit": "e69a183c1173f7f9ee19ad06ab109ade3811ae77", + "sha256": "0csiglvggxqliakgx94dmy5bifgj72dal6w6shrg1q1abq2ra995" }, "stable": { "version": [ @@ -62884,10 +63702,10 @@ "unstable": { "version": [ 20211030, - 948 + 958 ], - "commit": "c45e0854041b94e5ad8bc512474b0e3e286f72fc", - "sha256": "0mp0msh8ppdy6x1lbi1f772b5xr9v3i6pscsdd5wfgafkq2wlsvl" + "commit": "f432bb60f9f3bd027025140d723906dcabeefaef", + "sha256": "0wrzbcd070l8yjqxg7mmglc3kfgy420y3wnykky198y83xsv3qy2" }, "stable": { "version": [ @@ -62930,6 +63748,48 @@ } }, { + "ename": "kele", + "commit": "cebfd6d6356a70955f518c785ec9258305de9415", + "sha256": "1s0jgh5ajx93wgs5ycdfay8bh46bw2ycys2fvj5zqwmb0anhadqn", + "fetcher": "github", + "repo": "jinnovation/kele.el", + "unstable": { + "version": [ + 20230205, + 1814 + ], + "deps": [ + "async", + "dash", + "f", + "ht", + "plz", + "s", + "yaml" + ], + "commit": "8faeb28bcef6d4a3d314364f1b7252e7e6f916a8", + "sha256": "03an3n9hnaz8sz34gmdyl5hav1cms3i73ywzsn1y9idybbmdy3k9" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "async", + "dash", + "f", + "ht", + "plz", + "s", + "yaml" + ], + "commit": "8faeb28bcef6d4a3d314364f1b7252e7e6f916a8", + "sha256": "03an3n9hnaz8sz34gmdyl5hav1cms3i73ywzsn1y9idybbmdy3k9" + } + }, + { "ename": "kerl", "commit": "166afdc776689b0da93576dbeaa71ff6dfb627db", "sha256": "0f8n7cm5c432pwj28bcpv2jj5z3br3k164xj6nwfis3dvijwsgss", @@ -62952,11 +63812,11 @@ "repo": "Boruch-Baum/emacs-key-assist", "unstable": { "version": [ - 20210722, - 758 + 20230122, + 718 ], - "commit": "8e5cd089e0b2fedec57c55eeff74cdb6121441aa", - "sha256": "0lg8v6lsa62zhnlrz47hlda65ra6yfqijgz4jcl5vxcx2hgks8g8" + "commit": "41a958ca6b038586bfdcf01045bb8b9d379248fe", + "sha256": "099g9y3ky8hmgrq68idcjwa3452jdkggblgz397824kj13d7z02b" }, "stable": { "version": [ @@ -63096,14 +63956,14 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20220422, - 1611 + 20230212, + 2016 ], "deps": [ "compat" ], - "commit": "0c37db482ca98e729430121209d70dd093082a5e", - "sha256": "1i4l145k9jrl8dv5wkcg3nbm6s0as1myz8vzh4k9rdi2ra6lkajr" + "commit": "cabb3fac1ccf2980ff3bcdbc1648d2a15ebe7cb1", + "sha256": "0zvq7i3v3ycki695ah7iim134qmg8m9dcblj3srrr1k8kp63ywq0" }, "stable": { "version": [ @@ -63196,26 +64056,26 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20220918, - 2243 + 20230213, + 1152 ], "deps": [ "compat" ], - "commit": "e4ef3c5fb46b1f749c9d838d2eba709e164402e2", - "sha256": "19vf6rmydf0ayns9cllj2skq79xjfdn343csijmy3vb6hp3zq869" + "commit": "1806ff73b0a68e84234d65c7d08a18cf3f0d29e5", + "sha256": "1amcipkd4k8kfrlnq5sqzgwwhd42kx6aw5fnallidahz8pw79s7g" }, "stable": { "version": [ - 3, - 2, + 4, + 0, 0 ], "deps": [ - "cl-lib" + "compat" ], - "commit": "753fa7b5bdb761a1eb9a7b09db50c0bee3ae5241", - "sha256": "0604l1rxvxq88i2pnb4q0jaf9i3pmf3756nkrivvaj1l4v6nswlk" + "commit": "1806ff73b0a68e84234d65c7d08a18cf3f0d29e5", + "sha256": "1amcipkd4k8kfrlnq5sqzgwwhd42kx6aw5fnallidahz8pw79s7g" } }, { @@ -63331,11 +64191,11 @@ "repo": "emacs-grammarly/keytar", "unstable": { "version": [ - 20220704, - 626 + 20221231, + 1655 ], - "commit": "9d232decb1dee73b1b60480eb9c7ab6750ea90e1", - "sha256": "05wxrpp6758anp88n25fizc9qwjcf0df7b1mdfi7a4hljzq15z0n" + "commit": "51c8f2f1f207cc67af4e67731ee056860e107811", + "sha256": "067gmril73ri1zsakh284vxaw8sqmyr9vflmsh7a3033p4gabw4w" }, "stable": { "version": [ @@ -63388,20 +64248,20 @@ "repo": "hperrey/khalel", "unstable": { "version": [ - 20221008, - 1456 + 20230122, + 1139 ], - "commit": "fce18763a07769f2dbbb84eb20490aabbf612b66", - "sha256": "1w951a7czw5f62d9336lvrrsw57pym27vscfby1pz6n6ld44ybsl" + "commit": "fbd4b4d6ae8f152140674e843ed7d82d223d52fe", + "sha256": "025c12im3yvxb37a5y5x7zwdwll50lzx5nzsh54ipacrzhc0fyn5" }, "stable": { "version": [ 0, 1, - 8 + 9 ], - "commit": "bc919e40ce9afbc1cc160d86c27f73b1cb9f5b50", - "sha256": "1w951a7czw5f62d9336lvrrsw57pym27vscfby1pz6n6ld44ybsl" + "commit": "fbd4b4d6ae8f152140674e843ed7d82d223d52fe", + "sha256": "025c12im3yvxb37a5y5x7zwdwll50lzx5nzsh54ipacrzhc0fyn5" } }, { @@ -63435,6 +64295,36 @@ } }, { + "ename": "khoj", + "commit": "2d2fb91173b05871a0bf56d09f264ca44ae27c06", + "sha256": "0jcjn8va5hqx7pgpz42g3djbrfji3b8nmp2mc1v2zss124nx715w", + "fetcher": "github", + "repo": "debanjum/khoj", + "unstable": { + "version": [ + 20230218, + 231 + ], + "deps": [ + "transient" + ], + "commit": "61b6ee2857b92721fc2c7e1329ae476a8d41f040", + "sha256": "16rcjgyaqkncfxy8zihn339rj1dxc55pcr4h1m1z1hpq7dnk895a" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "transient" + ], + "commit": "47c2cc63e166543447d9604d5c462b90e7342fc3", + "sha256": "1ngnvf788bgfamcp0d3chim1ka04pb0629xkv30z6bg96p88lhpn" + } + }, + { "ename": "kibit-helper", "commit": "f7fee551ca9ed226f1285dffe87027e1e1047f65", "sha256": "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s", @@ -63465,6 +64355,21 @@ } }, { + "ename": "kill-file-path", + "commit": "bbb76c99758c378c1cf26046a4e25e0933dfd947", + "sha256": "0gif8qrrgqj0vgffznqwxwia9c750nkpnwdszcavn2xfyrj67vf8", + "fetcher": "github", + "repo": "chyla/kill-file-path", + "unstable": { + "version": [ + 20221205, + 1119 + ], + "commit": "88de62d038d7e6e0e0a217c4773a1871549c7c3d", + "sha256": "0dry8wlci74qwpaaw8fic54hack71qhsybgbqvv48ly6a811rcpi" + } + }, + { "ename": "kill-or-bury-alive", "commit": "25016ed09b6333bd79b989a8f6b7b03cd92e08b3", "sha256": "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8", @@ -63587,11 +64492,11 @@ "repo": "kivy/kivy", "unstable": { "version": [ - 20210318, - 2106 + 20220306, + 810 ], - "commit": "db86b06b9b72e514c122e3f54a0bce74adad44c5", - "sha256": "1v14gsk1fal8xqpy8myk02n7s0f0yzpcmgf8a0mizh858y1sbxxv" + "commit": "023bd79b90f9831b45bb8eb449346648aa5fe5f8", + "sha256": "0q0hn1q5l1pg3ma2x922m93vpfax7x9cmm8psy3qw7b5pf4cillk" }, "stable": { "version": [ @@ -63656,11 +64561,11 @@ "repo": "WammKD/emacs-klere-theme", "unstable": { "version": [ - 20221101, - 805 + 20230214, + 213 ], - "commit": "6f63bbf71653ec94ccc3693141f031eb6902b25f", - "sha256": "131az3gfpspzg8xlhmcryzkz83nfxzh1jcd4aa0fzcixxz59kqcl" + "commit": "61d2cd649a1cf57ce61063f76b395f21f358372e", + "sha256": "006130dd83h5d3qxj7x8j64pxq05mq0rcyx68i5n2lfwj94k6sv5" } }, { @@ -63687,10 +64592,10 @@ "unstable": { "version": [ 20160208, - 2304 + 2305 ], - "commit": "ab8cf84ad8031ff85b983c528ebb7117dc784aad", - "sha256": "19qky551arnb7gl7w0yp54kkdls03m9wn9bxnr7hm5nv1bml2y64" + "commit": "c381a9735f3ea86ebc9667e35cdfeab0b67fefb7", + "sha256": "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k" }, "stable": { "version": [ @@ -63792,11 +64697,26 @@ "repo": "Emacs-Kotlin-Mode-Maintainers/kotlin-mode", "unstable": { "version": [ - 20220527, - 1646 + 20230123, + 1859 + ], + "commit": "fddd747e5b4736e8b27a147960f369b86179ddff", + "sha256": "0wbv3pjanmf97wchhg1w8ahvpxn8kgpnl45pmwqg019xj9yfpgpb" + } + }, + { + "ename": "kotlin-ts-mode", + "commit": "33ccef52aa0d6df974c1128ab2ba8febb9187877", + "sha256": "088b87mmcalkjqz1m1p53v3d9jldvrsbc0rcfvypsid9gpaisv25", + "fetcher": "gitlab", + "repo": "bricka/emacs-kotlin-ts-mode", + "unstable": { + "version": [ + 20230119, + 1153 ], - "commit": "99499e1500034b5fd5fdce9bfef367d90c61b5ce", - "sha256": "067m5idlnfz01aiynmnxh3x3vv4c2nkkldskv7g1cssxqaxagnxj" + "commit": "28eb29a99a5f334e7e7c0e2f2ada23159f114bc5", + "sha256": "19q4gvrccc1yfwg46wb82fs5qj6ml9qkgjf8sb00nwbnb0jb48k7" } }, { @@ -63859,6 +64779,30 @@ } }, { + "ename": "ksp-mode", + "commit": "b979d0d2f3007d166d595ecf7140d78585efdd6c", + "sha256": "169grixvkchz8h8jp3ns1jnqi861la7rgsm58kbmdf6pigi729zy", + "fetcher": "github", + "repo": "youngker/ksp-mode.el", + "unstable": { + "version": [ + 20221220, + 1136 + ], + "commit": "89b91b8ed6753867e30aa494e5d80325dfe25569", + "sha256": "1pw40a7acs0xxabmyfn359b2zcgmb5c1fv98q1x0276ws0hh0jzw" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "89b91b8ed6753867e30aa494e5d80325dfe25569", + "sha256": "1pw40a7acs0xxabmyfn359b2zcgmb5c1fv98q1x0276ws0hh0jzw" + } + }, + { "ename": "kubectx-mode", "commit": "e1a9badd46f8900a1d6355cb2c703788ed66e8fb", "sha256": "0g73yf3kl1f1c40p1na29hli4q0ligy0dh0lxc21k9mj57dbnzyg", @@ -63905,8 +64849,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20221112, - 240 + 20221123, + 241 ], "deps": [ "dash", @@ -63914,8 +64858,8 @@ "transient", "yaml-mode" ], - "commit": "ca6c3f84cefaf1287e432f2f3b4bdf630edd3bac", - "sha256": "0y3f1c4fbzy0yb5n986bzmgkkaxhgw06wxjvla4mkln6hccnxdia" + "commit": "5962d566db17ddfa25ac3120b4591df1d741e979", + "sha256": "1mi5xp573ww0agscjd4qxvnxgsrqgk23f7kiy406p4cm2h2s7cfl" }, "stable": { "version": [ @@ -63940,15 +64884,15 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20220318, - 2124 + 20220909, + 2028 ], "deps": [ "evil", "kubel" ], - "commit": "79b0624293a76c19ddc5f6e0f9848af7aa3fd91f", - "sha256": "115hdaav9ik55s4vjm15q7y20wh4w15m6z5v1hz0v0854hvzhgsl" + "commit": "1b405d8756ffc7c8f1e11450d6f07ffde38fe351", + "sha256": "1a724p9xcl1x50bxrhyyriza3wmcm1q9ljflf9ba5fgl2vrvcw5h" }, "stable": { "version": [ @@ -63971,8 +64915,8 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20220715, - 1717 + 20221229, + 1519 ], "deps": [ "dash", @@ -63983,8 +64927,8 @@ "transient", "with-editor" ], - "commit": "8163fd38015cbde0485f6eaab41450132bf6e19d", - "sha256": "06p5qz4h5ar86vv4nzpw08x18fjvs2zg5brx55h80hjdgr89b771" + "commit": "099004511670c7fd52a619c5758047bb3172ba36", + "sha256": "113c490gp69pkq9rnw5s7vfkr8pw14q7lv205gwx8awg129frnpn" }, "stable": { "version": [ @@ -64045,14 +64989,14 @@ "repo": "abrochard/kubernetes-helm", "unstable": { "version": [ - 20210902, - 2232 + 20230221, + 1438 ], "deps": [ "yaml-mode" ], - "commit": "95cf92600436f67bd7bfe650763e68635f5ecc8e", - "sha256": "0k1kk472yianf5sn05hxqfpza5yxm9lmr917wmw3mca17758hsgm" + "commit": "f70e2efa6ef869143ccb2f158f4ab7df91dcc58f", + "sha256": "1nsjnfabg4nqvy5z2pbxjcsqykk9as12frq5lgrypiax42rx2wp0" } }, { @@ -64081,26 +65025,26 @@ "repo": "emacsfodder/kurecolor", "unstable": { "version": [ - 20220830, - 1620 + 20221213, + 124 ], "deps": [ "s" ], - "commit": "553e852e19b01015f84846568d96cde9ef670ba2", - "sha256": "18csg7y73bwvdimsj1kjzkzbsh925yd2p3jjh2wcixqykxlqx3kr" + "commit": "ac67ceba85839ab1ced96fad605bf023b697263f", + "sha256": "0xi330md4av8qczm5973ps2qvmx4fc0z28547viq5as3v897psn2" }, "stable": { "version": [ 1, - 6, - 2 + 7, + 1 ], "deps": [ "s" ], - "commit": "553e852e19b01015f84846568d96cde9ef670ba2", - "sha256": "18csg7y73bwvdimsj1kjzkzbsh925yd2p3jjh2wcixqykxlqx3kr" + "commit": "ac67ceba85839ab1ced96fad605bf023b697263f", + "sha256": "0xi330md4av8qczm5973ps2qvmx4fc0z28547viq5as3v897psn2" } }, { @@ -64158,36 +65102,6 @@ } }, { - "ename": "l", - "commit": "a3645b08cb46e3d91081da7baa982b5283918447", - "sha256": "0ggbgbpskdbywyqh0mpyfq5jlcwlqpv8fbi7jcdmyzmsyfjwhbgd", - "fetcher": "sourcehut", - "repo": "tarsius/l", - "unstable": { - "version": [ - 20220422, - 1612 - ], - "deps": [ - "seq" - ], - "commit": "e7c4cbd930fed4a4a183e473ad2598610de00e21", - "sha256": "0m0ck78d8pkm5hd9gicc33x3gcqjcnvlafny6cncl38kc33gv47a" - }, - "stable": { - "version": [ - 0, - 3, - 0 - ], - "deps": [ - "seq" - ], - "commit": "5e2c05478868e9e5fac909ac1bee535ffc5c6695", - "sha256": "11fmcqn9xpq8hqwf914yd715xrbfyymki95iq5y3r4x42gl30q7s" - } - }, - { "ename": "laas", "commit": "db04bf3e4da0a51cbbab7db4c6070f1d06053c90", "sha256": "1cpd9zflk57fb70xjlkfwr9ghv11xmvad5px0fzb6gf51gqh3g6x", @@ -64243,11 +65157,11 @@ "repo": "ksjogo/labburn-theme", "unstable": { "version": [ - 20200822, - 2153 + 20221208, + 1611 ], - "commit": "4ef2892f56c973907361bc91495d14204744f678", - "sha256": "1kpin7r1a1la9s4khrn6rwhgkbib9j7lgyqk9b48fzjhp1h25mgq" + "commit": "bd0de2fdcf285d981f32e3e5ebc56fe3c9b589a5", + "sha256": "0nj61wqszm6wi4hvvc640iy1b65k8cwfggcys49p30f6f6jk6hlm" }, "stable": { "version": [ @@ -64267,19 +65181,20 @@ "repo": "zakudriver/lacquer", "unstable": { "version": [ - 20220811, - 649 + 20230206, + 756 ], - "commit": "70650105be1b4c1ade34c0a1c3263d80b2388593", - "sha256": "0rzdc2v9gfj3mh2dvpb90ikvyk67cbmd6snadpraawypajgr7vyc" + "commit": "8a4e7dc1827862ad025f2af5354ca377cc660939", + "sha256": "05h8ycdmqds016m17hz86v4xnlsy060lmfrjddy3cazwzgs1a4s1" }, "stable": { "version": [ 1, + 2, 2 ], - "commit": "70650105be1b4c1ade34c0a1c3263d80b2388593", - "sha256": "0rzdc2v9gfj3mh2dvpb90ikvyk67cbmd6snadpraawypajgr7vyc" + "commit": "ebdb531f5b7cb691751e468942e28921a9dcc98f", + "sha256": "1xfvf21g2p2zh5g5wih37nrk6z8fpxsy4hw8sfsmrk2fx2cw5sj2" } }, { @@ -64305,30 +65220,30 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20220909, - 1444 + 20221228, + 1622 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "8752043f903acc7f4c54bc9ea18b9cec83beee70", - "sha256": "1y28dbw1n4mw0abdb628111h1z7mz2jc2jnyskpw9hv4mbnaq5b9" + "commit": "1f4e1a024bb0b0f3a0fdd8b5428e737adf1a68d7", + "sha256": "086mqschzr420kad5x7ibjwz3b7ckfkkqv7486pn5pmbkqrb2iwg" }, "stable": { "version": [ 2, - 2, - 1 + 3, + 0 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "33348d8325916da440a4e96490fd20b0f6d313c5", - "sha256": "0aqqrmg5hj0323412l3qb566j1bcgff39ll7bzy4ghlrz14n6rm7" + "commit": "4939b93c2721c8aa4dc88a7b8190dd43e3badfdc", + "sha256": "0zw7r60r2plg73g9n42yn46zbrx4gzjyf3rqwpkvqvinx43bp4dz" } }, { @@ -64381,32 +65296,26 @@ }, { "ename": "langtool", - "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", - "sha256": "1vsxdkq8qdjn446rf7gjcnr1hwaasqrp0ibv4nsvnib7n85ldl7s", + "commit": "a3bddbf96a3bdcfb9bc32720eb371f2b4a5a570d", + "sha256": "0s9420v9q3ab9glmvbflc9hmcx3mv1v4yi4vibbp1jd67cw7l0fs", "fetcher": "github", "repo": "mhayashi1120/Emacs-langtool", "unstable": { "version": [ - 20200529, - 230 - ], - "deps": [ - "cl-lib" + 20230207, + 950 ], - "commit": "8276eccc5587bc12fd205ee58a7a982f0a136e41", - "sha256": "1pkfazn6qy6n4rg1rvw7b79b7nsp7xqdadhpah4xjvqxd6apqasz" + "commit": "fc6c046af1c5e4e55331414387865f65afb1bd3c", + "sha256": "0vzs3hkhmvdrbii1hmg87brddpjfmqfqykf7a2hnwmdbkihiwwk9" }, "stable": { "version": [ 2, - 2, - 1 - ], - "deps": [ - "cl-lib" + 3, + 7 ], - "commit": "0fe79567244ca719448c55a89082505596a2359a", - "sha256": "1pkfazn6qy6n4rg1rvw7b79b7nsp7xqdadhpah4xjvqxd6apqasz" + "commit": "fc6c046af1c5e4e55331414387865f65afb1bd3c", + "sha256": "0vzs3hkhmvdrbii1hmg87brddpjfmqfqykf7a2hnwmdbkihiwwk9" } }, { @@ -64428,6 +65337,38 @@ } }, { + "ename": "langtool-popup", + "commit": "a3bddbf96a3bdcfb9bc32720eb371f2b4a5a570d", + "sha256": "09d73saz5wz1g8w6pzfrdwr3i6w48h8gpy6rss4ipf2lyaf0mfm4", + "fetcher": "github", + "repo": "mhayashi1120/Emacs-langtool", + "unstable": { + "version": [ + 20230207, + 319 + ], + "deps": [ + "langtool", + "popup" + ], + "commit": "25b23a2dc592cdfe498740af87d975f7ef23a854", + "sha256": "0hbvkynasz54scd1avsskxav9nlb3z571wrmz2z10kyx3z6rnr9a" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "langtool", + "popup" + ], + "commit": "e0666f000c11571f96582f0a1dd75d6e29e74703", + "sha256": "1jjiq22wn7npgzmszy3hpi8a1wqij4s74p73vqav7c15w1a8pfrm" + } + }, + { "ename": "language-detection", "commit": "ed2b68d0a11e5db0e7f2f5cbb2eb93c298bcb765", "sha256": "1c613dj6j05idqyjd6ix7llw04d0327aicac04cicrb006km3r51", @@ -64453,11 +65394,11 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20221025, - 541 + 20230214, + 710 ], - "commit": "40ceb1f23d4419e8fdb2808c2c71dd46e541c4c4", - "sha256": "15719hkfnkn15bal2ppcxqaddhqhxg3wb9i8kzac5g81mfs79agb" + "commit": "302533245972d9bc7722328742247d2b2b225e01", + "sha256": "0c38d7vvm3gx2fdi1qm6kzl3x58fksfk2qnzf32np5vy2vwi8ira" }, "stable": { "version": [ @@ -64476,26 +65417,20 @@ "repo": "PillFall/languagetool.el", "unstable": { "version": [ - 20220514, - 309 + 20230122, + 121 ], - "deps": [ - "request" - ], - "commit": "503d18bd3c074fe8f495cfa6a34ccca1ef6961ce", - "sha256": "0zid9ip540qknnj9sdky2jrxp5l5kym76dr3wgff3ika6g7y75p6" + "commit": "57af28a0c370866945988461a259b6551a1c4074", + "sha256": "094ndmybj0g2v75zc21644q0b4kpkff8lhj2bw0rg8q8lg5ha5kp" }, "stable": { "version": [ 1, - 1, + 2, 0 ], - "deps": [ - "request" - ], - "commit": "503d18bd3c074fe8f495cfa6a34ccca1ef6961ce", - "sha256": "0zid9ip540qknnj9sdky2jrxp5l5kym76dr3wgff3ika6g7y75p6" + "commit": "57af28a0c370866945988461a259b6551a1c4074", + "sha256": "094ndmybj0g2v75zc21644q0b4kpkff8lhj2bw0rg8q8lg5ha5kp" } }, { @@ -64562,14 +65497,14 @@ "repo": "slotThe/change-env", "unstable": { "version": [ - 20220710, - 933 + 20230220, + 637 ], "deps": [ "auctex" ], - "commit": "4e6f75f678b207b3bb5031c8b2e31f8d577df445", - "sha256": "1bggvbs9q9yq1p8v188h2hgnhg405n8zjxg8az6h30kpkw8nz04g" + "commit": "748cdbb4bbf29a2e5053cf3d965e95cc7db67fac", + "sha256": "1kca90skv4pp7j08jgbhhkmvr5aiwp88gpdx869g53nqy8ssishh" } }, { @@ -64658,9 +65593,41 @@ } }, { + "ename": "latex-table-wizard", + "commit": "798041b4fe72da6a57224e909cd8a0312318d9e2", + "sha256": "0fiin25f4w3cs7mjkk34hw8g28hh8pg1psaj3dbfsxq6d8lavwfy", + "fetcher": "github", + "repo": "enricoflor/latex-table-wizard", + "unstable": { + "version": [ + 20230103, + 2241 + ], + "deps": [ + "auctex", + "transient" + ], + "commit": "61fb455a1e6a28b93512e63c609ca7ad7dd5bec5", + "sha256": "07fvyjm0invlw190iiy6v1zj772vr7y6lkqmhyng175xvhy3i62p" + }, + "stable": { + "version": [ + 1, + 2, + 1 + ], + "deps": [ + "auctex", + "transient" + ], + "commit": "61fb455a1e6a28b93512e63c609ca7ad7dd5bec5", + "sha256": "07fvyjm0invlw190iiy6v1zj772vr7y6lkqmhyng175xvhy3i62p" + } + }, + { "ename": "latex-unicode-math-mode", - "commit": "9c021dfad8928c1a352e0ef5526eefa6c0a9cb37", - "sha256": "1p9gpp28vylibv1s95bzfgscznw146ybgk6f3qdbbnafrcrmifcr", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1z1f5fz08rghlfyczkyjp2yh5xijmkgy0r41vfb0lz4zxc12rmk0", "fetcher": "github", "repo": "Christoph-D/latex-unicode-math-mode", "unstable": { @@ -64713,8 +65680,8 @@ }, { "ename": "launch-mode", - "commit": "876755fff14914b10a26d15f0c7ff32be7c51aa3", - "sha256": "1za0h16z84ls7da17qzqady0simzy5pk1mlw3mb0nhlg2cfmn060", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0686fb547lqzf9ngw3ln0lgh06qjamg4mvdbv9smwqkiqwm19l04", "fetcher": "github", "repo": "iory/launch-mode", "unstable": { @@ -64794,10 +65761,10 @@ "unstable": { "version": [ 20160816, - 540 + 630 ], - "commit": "e5b0b6ca6c5feeb2502d66a760ddf5bb590d04c4", - "sha256": "0i58qz4l5rzwp9kx4r9f818ly21ys71zh1zjxppp220p3yydljfq" + "commit": "be0768e9aa6f9b8e76f2230f4f7f4d152a766b9a", + "sha256": "0mgcqqhjadm8ckp6x37f9j4xcs61g73m9v8qr4zbw115yci2d0xk" }, "stable": { "version": [ @@ -64846,14 +65813,14 @@ "repo": "AnselmC/le-thesaurus.el", "unstable": { "version": [ - 20220920, - 1924 + 20230112, + 1604 ], "deps": [ "request" ], - "commit": "4dbe929aeaef7d38e75d52844cf9022244fc94ae", - "sha256": "1wbbp4ypph2kvgslwmcnigs6aag0sz3d9wx7dzkn5avj19ym78ci" + "commit": "83e8df8957a3b8167cc2bf97849a1eca555ce9a6", + "sha256": "00phb69hn8w5zl47k5l8gqlxqjm5ig7rz0v4g47hx7xlnhcsfvj4" } }, { @@ -65012,8 +65979,8 @@ }, { "ename": "lean-mode", - "commit": "42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde", - "sha256": "0rdraxsirkrzbinjwg4qam15iy3qiixqgwsckngzw8d9a4s9l6sj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0rwb4ca079myvipzq938mry5d0fvq5p7cj40fnjfx1cflwwfxbj8", "fetcher": "github", "repo": "leanprover/lean-mode", "unstable": { @@ -65118,17 +66085,17 @@ }, { "ename": "ledger-mode", - "commit": "1549048b6f57fbe9d1f7fcda74b78a7294327b7b", - "sha256": "10asbcb5syv3b75bngsab3c84dp2xmc0q7s29im6kf4mzv5zcfcf", + "commit": "ae67bc440aa7bb9e7e97edbd0eaf06ceb4d9e661", + "sha256": "1239j3r9cvaklh25v2kq0z9vp3bm6cx9al4jh7pxri6dl21vcixy", "fetcher": "github", "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20220623, - 1125 + 20230106, + 1610 ], - "commit": "8bad528d43007e0310b5e72e6e021b502b30495c", - "sha256": "11s33ajzjhqjqxilwn06v79vndl3x61z35c0cr5s641h5lxlj442" + "commit": "4b32f701736b37f99048be79583b0bde7cc14c85", + "sha256": "17653pz69nmzg7452zq7pcj31dk86vssj94i9al28lgfv02h07l2" }, "stable": { "version": [ @@ -65231,17 +66198,15 @@ "repo": "phillord/lentic", "unstable": { "version": [ - 20210727, - 1247 + 20221201, + 47 ], "deps": [ "dash", - "f", - "m-buffer", - "s" + "m-buffer" ], - "commit": "36861bdf9c1d88492648da553f66529e3a879880", - "sha256": "0cj19czxmrxw1id1ym1ai3k7sv9shl3lz4fqj8qyg73j4kj1gbn0" + "commit": "6af878392e127e75409ae0f4bc08837a8f591d88", + "sha256": "134rk1kcfkqnzhn51c0vvkj4839d5lbn0g61bqfpkgsvfpn05wh4" }, "stable": { "version": [ @@ -65361,20 +66326,20 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20220922, - 1545 + 20221228, + 2143 ], - "commit": "1dbd4bda6045080d5a293d56e686af5b4f7fdd9d", - "sha256": "112vd01kd8gr2ybw9x83qcaf283z05cdazz3b7k20jlck633qxi8" + "commit": "2bbffb0555f49fd67a92a48415caca894109cbb6", + "sha256": "086q97268s2j9cc98v0i44vl08iskqkav7hywz26girf5ca9dfsr" }, "stable": { "version": [ 1, 1, - 2 + 3 ], - "commit": "c72db2d5aeb5ed8e4ca066c803ae8d30e7540f79", - "sha256": "1mv5lv98b3351cwkiw51bq8xx4hmnvk93sx6lkdmq0sciw2qz22i" + "commit": "2bbffb0555f49fd67a92a48415caca894109cbb6", + "sha256": "086q97268s2j9cc98v0i44vl08iskqkav7hywz26girf5ca9dfsr" } }, { @@ -65458,11 +66423,11 @@ "stable": { "version": [ 2, - 0, + 1, 1 ], - "commit": "c09b9aebaa659f5c2d0c152d8401fd6924144ce9", - "sha256": "0a5cfnk3021idvv4bv2lvnksjy9d0yyd13bnj793ks86j5f3hdv5" + "commit": "b969afb9b5928d33dcaef636ed9020e620858190", + "sha256": "14bffvmyq6czfhvmcw332a7y4cyr27f75kzk46qlhlqs6l3rahqx" } }, { @@ -65503,14 +66468,14 @@ "repo": "DamienCassou/libelcouch", "unstable": { "version": [ - 20200923, - 1836 + 20230129, + 1000 ], "deps": [ "request" ], - "commit": "5ae35266c9a2eb33f0c708bc8c0687339cee9133", - "sha256": "0vk7m8napg3ss4d9cgsrhkycb5k07q440lspxihy047556l6q3cm" + "commit": "595697f4199519dd018fe489e885f237c54b0675", + "sha256": "0a3mykx9xmbl8scpz08349lyxi0ism8bv01a4aw770649vnqz86j" }, "stable": { "version": [ @@ -65533,11 +66498,11 @@ "repo": "merrickluo/liberime", "unstable": { "version": [ - 20220928, - 845 + 20230113, + 556 ], - "commit": "2217883b0ca3b308de4e2c670a0ac8c767fd633e", - "sha256": "0s0fsjs52x4v1h04j711fd2w7dmx55dc1chfd0s3czf1r5vr7hc3" + "commit": "cc9eb9812fd6f68e78ed6a0c0a85da7a18765753", + "sha256": "11c2wj00wwbdxqkzl60sd77cp43rja5v8hrvhrvhg75v62kawva2" }, "stable": { "version": [ @@ -65595,20 +66560,20 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20220706, - 1952 + 20221229, + 916 ], - "commit": "c27c08949a742a888eb9921a8528882b2aec6137", - "sha256": "1lp3ld38x0s982zvpgj1hfky3wsdfwjii1yp5j7rq5n6si97aw7i" + "commit": "e7d35ba9254ead1516133f182a01f6161ae26388", + "sha256": "03bavca89cf7dsjmg7hb48qnvca41ndiij33iw5yjjhbq1zyj8r4" }, "stable": { "version": [ - 1, - 3, - 1 + 2, + 0, + 0 ], - "commit": "8cf3512a437251863d56ba4933a8dd53988b1d6d", - "sha256": "0fsg2si7afrnsz91i0ziza6nbc4ds9kpnr2z71wf6896zb1afhfx" + "commit": "e7d35ba9254ead1516133f182a01f6161ae26388", + "sha256": "03bavca89cf7dsjmg7hb48qnvca41ndiij33iw5yjjhbq1zyj8r4" } }, { @@ -65716,6 +66681,24 @@ } }, { + "ename": "ligature-pragmatapro", + "commit": "c0dfe32d78143bd9cee66db92aad6c3caa29fe4a", + "sha256": "1by34q3nc4dkc96snks25gyyx4ix53lfnnxp43wsb0b0xc8i6hf4", + "fetcher": "gitlab", + "repo": "wavexx/ligature-pragmatapro.el", + "unstable": { + "version": [ + 20221127, + 2252 + ], + "deps": [ + "ligature" + ], + "commit": "85f7b15a5cf5f2ee843bc0469e03602a0251c275", + "sha256": "1818lwncgx6iayvxpdmlwv1irbj1vdcmwipf464pvz7dmgfnz8hh" + } + }, + { "ename": "light-soap-theme", "commit": "053be1123bb934d80b4d6db0e7e39b59771be035", "sha256": "09p4w51d5szhi81a6a3l0r4zd4ixkrkzxldr938bcmj0qmj62iyk", @@ -65738,11 +66721,11 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20221031, - 1737 + 20230130, + 541 ], - "commit": "d3c28b3f98a12af5f68abe729d378a597b26ecd9", - "sha256": "0fa01mgsj21cvd7isgy0fli5qpczbzy8dd2bdn5f6m23b9z1j1hy" + "commit": "fa63e64ff3de4de78f74c2d270c0c0f000abec8f", + "sha256": "1gxpdr7ssdzmax4g7fcn15l3rr4m4zm2gv695iywa5x48k4syzn8" }, "stable": { "version": [ @@ -65762,8 +66745,8 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20221017, - 747 + 20230104, + 1211 ], "deps": [ "fringe-helper", @@ -65771,8 +66754,8 @@ "indicators", "ov" ], - "commit": "501b4739e422ca4859f47b9226e2ea292ecb6800", - "sha256": "1kgkjr5gh0agibc0jbj2z7bab9cnjrwkxsdfs2b7p3jkcmfdd2qg" + "commit": "41a22589ebc3843f6736669a4517014800f09e16", + "sha256": "052viq2qjm8x1ah1hkba0pqafdmbm63dlp1mw3l5kzjrn8rv308m" }, "stable": { "version": [ @@ -66148,8 +67131,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20221114, - 2013 + 20221225, + 1927 ], "deps": [ "ace-window", @@ -66158,8 +67141,8 @@ "swiper", "zoutline" ], - "commit": "f35eadf8c1be43a395e196463314b17ea3b4e16f", - "sha256": "01k73h33njx01v0rylrrgxw5q4dzkiiygn68gilx1lkndcg17kyx" + "commit": "097dd66e662c3eee90d112d88bac5345d26e508f", + "sha256": "1cf0nk0c9k78y3gbz6y4bqqdjscs46kb56xkd0lp641gawsa0kls" }, "stable": { "version": [ @@ -66255,11 +67238,11 @@ "repo": "purcell/list-unicode-display", "unstable": { "version": [ - 20181121, - 2316 + 20230216, + 958 ], - "commit": "62fbf84dbf0b9a4cbbbeede69d5392fe2774391b", - "sha256": "0397inzyqssy8j1yz1j5mgjnwyx559f82hy4w8kz1hv3mhih8lp0" + "commit": "57b4384ebe0c5d10890ee0dfcf66d0b16e5f5060", + "sha256": "0182irm3vai6ngl2xlqpj94qzx673rygzik36amrcw2ji9ssf4f9" }, "stable": { "version": [ @@ -66305,11 +67288,11 @@ "repo": "publicimageltd/lister", "unstable": { "version": [ - 20220802, - 2128 + 20230204, + 1357 ], - "commit": "f3e9748b3417184c36e301a381ec20ef4a88e511", - "sha256": "04y51ifjdnkczsvmv70py15p41gc8mhg6f568k3xwdg1791qhwr5" + "commit": "b256c254f670ebaf50134655fbe430025fff41ab", + "sha256": "151wn6g49w15bjnqbnq12ig7f9zdi5d1j21yadp0jvb9jjzk6jg1" }, "stable": { "version": [ @@ -66329,11 +67312,11 @@ "repo": "HectorAE/lit-mode", "unstable": { "version": [ - 20141123, - 1736 + 20141205, + 441 ], - "commit": "bfecbe898223393f34340ca379977be753ee497a", - "sha256": "1sjyb5v3s9z128ifjqx7a1dsgds2iz185y82581qxakl7ylmn15k" + "commit": "c61c403afc8333a5649c5421ab1a6341dc1c7d92", + "sha256": "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd" }, "stable": { "version": [ @@ -66449,14 +67432,14 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20220215, - 1814 + 20230127, + 153 ], "deps": [ "s" ], - "commit": "f5133e65d8ffdab918cdfc269ac0c067a0de5e9b", - "sha256": "0gvha2fl5macpwsp4fpa9nv14sg0yqr90s3v92f6imx89ll0rcya" + "commit": "900bdd12c0a6e6874f60b0df99a72fd329873ea1", + "sha256": "1kbx1i977pyv5ckg6d5c5p806nlrl6y06jmcjwi90yri8l0bia5y" } }, { @@ -66608,20 +67591,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20221118, - 341 + 20221203, + 38 ], - "commit": "388cb12be5f1e225449cf34bf8c0b18b718d932c", - "sha256": "1fbkz6j545sy33xqkg9kgkr83147yg7g1f7brr796hmc474f5h1k" + "commit": "c02c7a5002d817d6e9cd4d7a1551c0ee412a65f1", + "sha256": "0m5v46s4n4wq730pdzhmf26r4lxj23sg24l7yzf40dhsa7pfgh4p" }, "stable": { "version": [ 4, - 8, + 9, 1 ], - "commit": "b10020b0414f15990f4139c363910b58c7ca0852", - "sha256": "0lch1m9xw5xq71sllkhiaxls8rbq9gdj24pyi66p7g6026n5fc21" + "commit": "c02c7a5002d817d6e9cd4d7a1551c0ee412a65f1", + "sha256": "0m5v46s4n4wq730pdzhmf26r4lxj23sg24l7yzf40dhsa7pfgh4p" } }, { @@ -66722,14 +67705,14 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20220428, - 1405 + 20230107, + 1517 ], "deps": [ "seq" ], - "commit": "5d1da6dc68a1f76f52b7acc808ee430b72fb98ae", - "sha256": "18wzgwyqinsy75cg0hcgxicd40a8n65n6lyparf66aljlm9bq0qm" + "commit": "f76fd445966e3671bb59ba7a0a575f3b2ff59c33", + "sha256": "0pvg2fhidi5br97ppd58jqkpb583yra0wwqmjkng0cqa0x3i002a" }, "stable": { "version": [ @@ -66775,14 +67758,14 @@ "repo": "daviderestivo/load-bash-alias", "unstable": { "version": [ - 20220108, - 2103 + 20230107, + 1737 ], "deps": [ "seq" ], - "commit": "968f037eff48ceca15fd135738051c48ab14cfd6", - "sha256": "03xsgjihp0y62jc6q8fihxvh3siwsvs5kj36wfxp0hpc753ib31g" + "commit": "68cfd70c339c5213c513f7b802b6b50598c9a159", + "sha256": "1gmwrg82vdwdh04zp5nigrn8k8ba2rg61x5rg2lf31q03r7fv2ry" } }, { @@ -66808,20 +67791,20 @@ "repo": "rocky/emacs-load-relative", "unstable": { "version": [ - 20201130, - 2202 + 20230214, + 1032 ], - "commit": "ff2a827144353d29d70392fd95c14c15df207011", - "sha256": "1g8awvbn4f3g611svi58n9sk188skkn7a9jng6nbxbi9diiy3vvz" + "commit": "b7987c265a64435299d6b02f960ed2c894c4a145", + "sha256": "1jmi1j8fkvwfawd9q8b6yhqbg8frckjxsgf9jwgiqw9cvakz6wbf" }, "stable": { "version": [ 1, 3, - 1 + 2 ], - "commit": "5055bfd80644e306aef4e7a7e3e9e5d765b691a4", - "sha256": "1w2xvnihk607vnmlmqz7zsjksd3mscjx2igdadxsfz398bjwl0qd" + "commit": "b7987c265a64435299d6b02f960ed2c894c4a145", + "sha256": "1jmi1j8fkvwfawd9q8b6yhqbg8frckjxsgf9jwgiqw9cvakz6wbf" } }, { @@ -66847,11 +67830,11 @@ "repo": "rocky/emacs-loc-changes", "unstable": { "version": [ - 20200722, - 1111 + 20230214, + 1036 ], - "commit": "2db42905675e1740305f9884613bc48582601b8a", - "sha256": "0dqk8m7j14c0n5sh7jgjwlrlqxxncfi3x9sagv0hx4sc6900mmnd" + "commit": "622371e432f50626aaac82f8ee2841f71685b0fb", + "sha256": "1kfgmpnj26h8y063rqs39k4c98yy840mkj2pblm7vm0s1fhddj1f" }, "stable": { "version": [ @@ -66939,11 +67922,11 @@ "repo": "dykstrom/log4j-mode", "unstable": { "version": [ - 20221112, - 1509 + 20230219, + 1433 ], - "commit": "a878589fbbd291d0aa27f56c582ab900a03ca063", - "sha256": "04jw2zfbzw8qblkmxg5c4dm31i5kk8d9r3l1bqa1bld8s7pdxnp4" + "commit": "5c31af49bfbb2f387fa505ba4aeb2004b249af2c", + "sha256": "05y2qvagcc4r3q594gvlabd37ljw51482wdhw8d49ls624fdcwyl" }, "stable": { "version": [ @@ -67111,28 +68094,27 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20220916, - 2058 + 20221206, + 1843 ], "deps": [ "datetime", "extmap" ], - "commit": "3b0b544b69759f4c119d4460f98263b6e739e7de", - "sha256": "04sr8byk7q04vrk673kk9fk1lxawin5ysqkp7mhnxc1ib9535lp9" + "commit": "9bf89f7e628f947f3c0c47fe557bb1878843644a", + "sha256": "0j7qma1lff809d3yynd283jnml0s4nhiq76scxprv9waf3pp39sj" }, "stable": { "version": [ 0, - 15, - 1 + 16 ], "deps": [ "datetime", "extmap" ], - "commit": "617d5d20662c0ab5e2e120609b11cb7b7ced0220", - "sha256": "1khri5632pjirj191x3ps94s4pyrwapf1pbrkmqqp0d26b50d3s2" + "commit": "155df70c7e4aa496f34a85e480c794f679651bfa", + "sha256": "0vw6brs76z7fkvlazakwhhgdcydjc099j150c7503kwi2hmmp0p8" } }, { @@ -67244,11 +68226,11 @@ "repo": "0x60df/loophole", "unstable": { "version": [ - 20221111, - 1517 + 20221126, + 1556 ], - "commit": "a4f161f9ab582ac7cd92e8621530f3a30a59372e", - "sha256": "0kxgkrw7bfk484qa3plh7y0acj8z8byrf2pfq7n8f0k1mcfd71wa" + "commit": "dadc3fadc68b13501c4dbe89109f30deb0d3441a", + "sha256": "1qjifn3rzqs0k7j2mfc98vkni7mzszc4pqd0i5zz9xald61di1dc" }, "stable": { "version": [ @@ -67268,28 +68250,29 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20220821, - 1746 + 20230129, + 151 ], "deps": [ + "compat", "map", "seq" ], - "commit": "bb817524a6cc623e1496fb53c044b738c7dc69ab", - "sha256": "143grcv2md8fcj8hdg0w2br76wafzxc7xp10jscs8p83q1wij9xn" + "commit": "85b817f000d922c8e98865bb621b7432dfc0e938", + "sha256": "05vg4w5j9zs4g2z0i0884p8grnh9pahhicp8dva28cg3jmxny625" }, "stable": { "version": [ 0, - 10, - 1 + 11, + 0 ], "deps": [ "map", "seq" ], - "commit": "cd49433244ef450a1dd10a65a7839076d61bdcf1", - "sha256": "0mdr09vqy4xrqb2l4g3j8n99zvqajw1jxxvvm9zv03zkwvcink1c" + "commit": "771c1d1edd4dfec96b576b1d2b551e4aae066dc9", + "sha256": "1z1bi1ms5508iv5w1jmmlml2fay21dhgl2lzbv2is5mnkkv0s6di" } }, { @@ -67300,28 +68283,28 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20220330, - 127 + 20221125, + 2001 ], "deps": [ "dash", "loopy" ], - "commit": "cd49433244ef450a1dd10a65a7839076d61bdcf1", - "sha256": "0mdr09vqy4xrqb2l4g3j8n99zvqajw1jxxvvm9zv03zkwvcink1c" + "commit": "771c1d1edd4dfec96b576b1d2b551e4aae066dc9", + "sha256": "1z1bi1ms5508iv5w1jmmlml2fay21dhgl2lzbv2is5mnkkv0s6di" }, "stable": { "version": [ 0, - 10, - 1 + 11, + 0 ], "deps": [ "dash", "loopy" ], - "commit": "cd49433244ef450a1dd10a65a7839076d61bdcf1", - "sha256": "0mdr09vqy4xrqb2l4g3j8n99zvqajw1jxxvvm9zv03zkwvcink1c" + "commit": "771c1d1edd4dfec96b576b1d2b551e4aae066dc9", + "sha256": "1z1bi1ms5508iv5w1jmmlml2fay21dhgl2lzbv2is5mnkkv0s6di" } }, { @@ -67332,11 +68315,11 @@ "repo": "jschaf/emacs-lorem-ipsum", "unstable": { "version": [ - 20190819, - 2042 + 20221214, + 1857 ], - "commit": "da75c155da327c7a7aedb80f5cfe409984787049", - "sha256": "04h97vnd758gsdfg30wkrhnh4hz7k63xbrw178dxfcwsylq32wi0" + "commit": "4e87a899868e908a7a9e1812831d76c8d072f885", + "sha256": "10l0dmnp1kjyca5jqbf4j98xchcbf9grlv0nv3ygf167vps40il6" } }, { @@ -67407,8 +68390,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20221108, - 1242 + 20221226, + 1829 ], "deps": [ "dap-mode", @@ -67420,8 +68403,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "cc6c51b1e7887736c08260dbbcd28215c019a67a", - "sha256": "1cq730i2nnj1xyxr2f9kc0y2w7abmnhn6ga05f57wzy2bnx5vhi5" + "commit": "3db9f93c83052d6a8976c92d67d2b24473930760", + "sha256": "0sfcdmzsnasgickp9ikmkzvi3czads3ik7msyaldyj0al2cf2mqg" }, "stable": { "version": [ @@ -67451,18 +68434,19 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20221025, - 1659 + 20221226, + 1000 ], "deps": [ "dash", "f", "ht", "lsp-mode", + "s", "yaml" ], - "commit": "3ffd7729cdd748586734135e36713517e14a1578", - "sha256": "0jvflkqgrvy5nadw0vdygcdfss1hnl11j4fi47wk0hnhlanvlj67" + "commit": "1e1f33ed729c220485c16e6597738d8e416f31b7", + "sha256": "1s1j34y70lf2lxa6ywd2xg2j3411nxlmq4ixrbk9374kp5ml98xq" } }, { @@ -67505,8 +68489,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20220916, - 441 + 20221231, + 1655 ], "deps": [ "grammarly", @@ -67515,8 +68499,8 @@ "request", "s" ], - "commit": "eab5292037478c32e7d658fb5cba8b8fb6d72a7c", - "sha256": "1sx47y9w8cqdrw54acply48wibsmc963i896ncmf8z7mfly7cb9x" + "commit": "6d111728f9d062d723bb88bd462b6eafe5cafe3f", + "sha256": "05gqsz3jdvh1ni11jkvzy6qghz9nwr25yr21dabqcmc2zxld0j6n" }, "stable": { "version": [ @@ -67543,14 +68527,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20220809, - 2129 + 20230104, + 1508 ], "deps": [ + "haskell-mode", "lsp-mode" ], - "commit": "485c1148ce4d27030bb95b21c7289809294e7d31", - "sha256": "0ygyvam8h59bhx785rwf4hs30d95xk5kb48inr1gs4313qc2lil2" + "commit": "3249cde75fb411f95fe173c222b848182fd0b752", + "sha256": "06n16v278wzzh1iq4lp0k508dnynrz5c0qbv86hksm7sa4a4w4s7" } }, { @@ -67612,8 +68597,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20220825, - 450 + 20221227, + 1331 ], "deps": [ "dap-mode", @@ -67625,8 +68610,8 @@ "request", "treemacs" ], - "commit": "13b92b097f91f9296ca65a1dc3eda992315c67ea", - "sha256": "1dzcrlwdsnvm1l0jiwqn2q48nzx792dhrvab5jhfqlva4ivw5h0x" + "commit": "dbe448a886e2f4fb5d3a616f4499adbe643ba7a5", + "sha256": "1brp8giavxh71frf920h7r4qa8ndf046aaf4kgrpzgw39ywyka68" }, "stable": { "version": [ @@ -67737,26 +68722,26 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20221020, - 159 + 20230121, + 1846 ], "deps": [ "lsp-mode" ], - "commit": "ee4df225b59992946c19d8523e940944f76661c4", - "sha256": "06xzx79b39ykr4afmcpgqhw71mkpn6rk37kf7h392ras9mf17vvc" + "commit": "de080d83f5759ead46dd7a26bb73b7c3a940ef40", + "sha256": "18k93vwq95zyhfp8jj6ppsks95rcqs39p3lhwshgwq9k2i33v1zi" }, "stable": { "version": [ 3, - 0, + 1, 0 ], "deps": [ "lsp-mode" ], - "commit": "94c4536579c18e17e87f2441810968a153c3bea1", - "sha256": "1myzjgx2hq70aa9vb0vmgh2jdd25c5b7x580ccb9c0p40rzjjpbr" + "commit": "de080d83f5759ead46dd7a26bb73b7c3a940ef40", + "sha256": "18k93vwq95zyhfp8jj6ppsks95rcqs39p3lhwshgwq9k2i33v1zi" } }, { @@ -67767,14 +68752,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20220916, - 442 + 20221231, + 1658 ], "deps": [ "lsp-mode" ], - "commit": "ab485b8dca64922c024cb1a7ee95231d68883bca", - "sha256": "1b9z01snd1avpvn3zff4bmca96yhs6xgsqrz0jjdmkh64xvnr4l0" + "commit": "d1a599c8ec3748c2b81899d5831b6e7158255479", + "sha256": "1y6l7wi216s6vpahp3wsmjrfafny2gsf043hx9rwiijwq324ilq3" }, "stable": { "version": [ @@ -67843,19 +68828,20 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20221118, - 815 + 20230221, + 1558 ], "deps": [ "dash", + "eldoc", "f", "ht", "lv", "markdown-mode", "spinner" ], - "commit": "b4e8aac32d28dfe0f73e0981387c5b20249f385c", - "sha256": "0pim03m7czfy6jphzmw9y38jxhagmffy02d0q95glwxxiz7m6h6r" + "commit": "e6293251a65554fa23f87d0e883d121b4f0aed4e", + "sha256": "1gkn3zw9h2kgpcmmpsadnh9aazgyyp9lmxkl6i7wd7gx5mg6fp49" }, "stable": { "version": [ @@ -68002,16 +68988,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20220614, - 1545 + 20221201, + 1501 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "b7d6e5bbf2141d2a1efb469ad3451ecc12ddb1cd", - "sha256": "1z6yhv8ks48wi0m03nb0x5wx2f1fiq4d312amcca7j9mkwf41lqs" + "commit": "4cd2adbb32287278d9d9da59a3212a53ecdf8036", + "sha256": "0ys76xd1bg9r0hkgq1h3aq6wxsjxqplxmk7cfwazzh9nwmgp9s22" }, "stable": { "version": [ @@ -68117,16 +69103,16 @@ "repo": "emacs-lsp/lsp-sonarlint", "unstable": { "version": [ - 20210820, - 2044 + 20220510, + 1802 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "3af97828f9c08d782fb2086e3a73bda5759e6788", - "sha256": "1d1yfgvdyas6vbg992f5s4sayaxjxs33gh13z629x67hx6p22n3r" + "commit": "a429be2aea7797369a3c751ef54e3554733117be", + "sha256": "11rgfn9sdwxsncc4xrchiqn9dbqi3zirjvbz91kc5rvjv436077b" }, "stable": { "version": [ @@ -68169,15 +69155,15 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20221102, - 1343 + 20230215, + 1425 ], "deps": [ "f", "lsp-mode" ], - "commit": "6e5addff47bac15f99d8efcff2191818dd71d7b4", - "sha256": "0y2j1rp66h2vxf1q553a74mr7a9m6a7c7hrvzwx1wv19wz7ayb1n" + "commit": "563c1dddb26c82b82dcac0b436594b17375a1480", + "sha256": "137fd4xrzr2ggh872qv9rm4lbi4gs0g1nhxw7fr4gd2gfbbkljcl" }, "stable": { "version": [ @@ -68236,16 +69222,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20220924, - 850 + 20230116, + 2024 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "3cd7cc61273341023b863dcf45906ac9142fd1aa", - "sha256": "10x4wf046b12kiayd1bhh95kvynpl2wynyrza6zp4c1qnn7mn5gb" + "commit": "295d8984da06a745b0a36c56e28ce915bc389adb", + "sha256": "1s3vc0rpwwck1g61gh55nq6sqaf7rq16yqg5ayj45z3gd4gd29xf" }, "stable": { "version": [ @@ -68270,11 +69256,11 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20220801, - 503 + 20221218, + 605 ], - "commit": "d17a00ca50aee197cd017d573b83367eb241cc44", - "sha256": "0jib46v4g5f6p5whj45fmhr5q0a9472gzp3ys6az13q9qp6y149d" + "commit": "ad639c62e38a110d8d822c4f914af3e20b40ccc4", + "sha256": "1p653jbijnjfcgv66k2gjzcg6flqhzfyab8l7b0sf89zwbmkil3r" }, "stable": { "version": [ @@ -68310,11 +69296,11 @@ "repo": "lurk-lang/lurk-emacs", "unstable": { "version": [ - 20221114, - 2218 + 20230120, + 2226 ], - "commit": "568fdce7b80a3d71d09369318b18f86de2372105", - "sha256": "03d2xlyw9bqd9wpxxim63c43jpdnjnxi2xyp16359zhxs2np9src" + "commit": "59a3f956944a5ddd43cfd57deeff6b647fc46554", + "sha256": "1g64jc7fy5229jv8x25rj4fj344kfbrnrvc9wxgsxv7lfvb770kv" } }, { @@ -68418,26 +69404,26 @@ "repo": "montag451/lxc-tramp", "unstable": { "version": [ - 20200414, - 1445 + 20230119, + 1251 ], "deps": [ "cl-lib" ], - "commit": "1585e55a5deb89e2f4e30a0ad9e0f121d1e0ebcb", - "sha256": "1zs4wcbxqx8275j2q1118ipqw7532cd6cdy2whw22ck4z5w47vfg" + "commit": "57559701334bb5635b82a252bd00298d06d794fe", + "sha256": "0pv45p6yvsivchqkfg6wirf2vcdfmzymjyqr8n201k2c75qjkgdx" }, "stable": { "version": [ 1, - 0, - 0 + 1, + 1 ], "deps": [ "cl-lib" ], - "commit": "1585e55a5deb89e2f4e30a0ad9e0f121d1e0ebcb", - "sha256": "1zs4wcbxqx8275j2q1118ipqw7532cd6cdy2whw22ck4z5w47vfg" + "commit": "57559701334bb5635b82a252bd00298d06d794fe", + "sha256": "0pv45p6yvsivchqkfg6wirf2vcdfmzymjyqr8n201k2c75qjkgdx" } }, { @@ -68595,14 +69581,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20221113, - 1020 + 20230215, + 142 ], "deps": [ "transient" ], - "commit": "78898be20e3fffef67b3f1eb812347df89cd151f", - "sha256": "1312gd7f02frc26c899cpdbdsxafqgw459i1lwxnnssck48m30vz" + "commit": "e7b16e8b78db6d7fcc17eb05fa3a2a4ed439f2f2", + "sha256": "1kzxq9qcsn63lqx22d21zd4c8wm80d4nhqfsvh5m3p88as9ff29q" } }, { @@ -68765,20 +69751,20 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20220926, - 1228 + 20230103, + 1503 ], - "commit": "0ae427be02275054ec08cd6fc5259f38473120b3", - "sha256": "068wylr06qq2mgpn786lb2jb4cfp28h8aqiqzdhnq1sdcrqmxb1c" + "commit": "a2ddc7cad487e6165c2e2ac26acec62b1f7bbeca", + "sha256": "007lprnl9ylzk0246yh885nikhbwxxrghismsqrwiiair758hrv6" }, "stable": { "version": [ 0, - 0, - 3 + 1, + 0 ], - "commit": "d280836c77fd263ee404273d7c21f47395a657f9", - "sha256": "0ibasyhqc6zgvzvkfyfvx7g6f18z4n7hy2lqjvyckh40cqpzpwj0" + "commit": "05290e30f57379adc73cfd932b728d792039a42f", + "sha256": "0lym5wgb3jbs3bzc77y4i2d6577kyw10973l2h3apbhfnj69gpfj" } }, { @@ -68789,8 +69775,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20221113, - 2221 + 20230221, + 648 ], "deps": [ "compat", @@ -68800,8 +69786,8 @@ "transient", "with-editor" ], - "commit": "05b0d99d714350d51676b86da9f5daa2f6b7fa3e", - "sha256": "043y2fzvm7b9626qyaljab5zcgwflalw5vi9sln72q3pyx8zk8rw" + "commit": "97a95f70079b6613bf98d2306279d3e03fe51234", + "sha256": "1mm13lpq2ank0pnnf6q4qfpaw4k6fw3zjd1qgdi73l4lw8rrbvrx" }, "stable": { "version": [ @@ -68880,14 +69866,14 @@ "repo": "ideasman42/emacs-magit-commit-mark", "unstable": { "version": [ - 20220809, - 625 + 20230214, + 1821 ], "deps": [ "magit" ], - "commit": "9367f7e4038792073f090b2c881cdbde1ab47f40", - "sha256": "16cn28730q52fwfhv1x9z7ky9qngf4jr761qdn8pxi6b8x92c6xf" + "commit": "6ed61986ae28c01d0f8c4f2bcff8ab70707488df", + "sha256": "1fhz29rsyggfqjb140v96i52p7vmxqs0wcxiqjhpjmim4ks3kq31" } }, { @@ -69225,14 +70211,14 @@ "repo": "dickmao/magit-patch-changelog", "unstable": { "version": [ - 20220313, - 1229 + 20221209, + 123 ], "deps": [ "magit" ], - "commit": "96936d2bd92c8bbf87f65bc293f3246014bc2764", - "sha256": "1k0674f9c0h468nl791nrvngymgbdljnsrwapnki5b3zvaxglckc" + "commit": "fd259cf6ce270a21df2f00b1e031193c8595a7a9", + "sha256": "01h07bg1w1gg33saa86ph6ma1y0vn18dbkhhxqnm3x1m1kq9ssi5" } }, { @@ -69311,15 +70297,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220929, - 1014 + 20230213, + 2018 ], "deps": [ "compat", "dash" ], - "commit": "cfe5a1260bf19191adab837e90acc1004529a0c9", - "sha256": "04lfwy494bv1acmr9jhr4w46jrpi4hyjmg5wjsxf547vx666q6vd" + "commit": "deb10e984e16201182b0569f7df7d30ec3b8afa9", + "sha256": "0qh8170mb2bm2zmncpzd7zz11s7bvbw9pzpwf52cbai3qk90b544" }, "stable": { "version": [ @@ -69479,14 +70465,14 @@ "repo": "greenrd/magit-topgit", "unstable": { "version": [ - 20160313, - 1954 + 20161105, + 1623 ], "deps": [ "magit" ], - "commit": "243fdfa7ce62dce4efd01b6b818a2791868db2f0", - "sha256": "06fbjv3zd92lvg4xjsp9l4jkxx2glhng3ys3s9jmvy5y49pymwb2" + "commit": "11489ea798bc88d0ea5244bbf725285eedfefbef", + "sha256": "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q" }, "stable": { "version": [ @@ -69977,8 +70963,8 @@ }, { "ename": "mandoku", - "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", - "sha256": "00w246svp3lmbhq7cak2p7fmabnl6dbbsa3cx7wbiwq0f4hpjiaw", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0nhh8m9kyz1kh3c9iwv73q6m91lb9f2ra64vf430rfmn9p4ilr95", "fetcher": "github", "repo": "mandoku/mandoku", "unstable": { @@ -70121,19 +71107,25 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20221016, - 1017 + 20230217, + 2050 ], - "commit": "cc7a086cd7816ad41ff004c61c41bdd26ec3ea0b", - "sha256": "0ncdyczalvl677nim0iha003xway7rwxw8y35vcvkgsdk4vzv848" + "deps": [ + "compat" + ], + "commit": "ccf573e2145d9deb9d734432351eefc87fc1bc16", + "sha256": "0zi3q7dd9dgrhbz6ww270i43kkqs0ddk0vzs89mfvwa5pzw32d2q" }, "stable": { "version": [ - 0, - 15 + 1, + 1 + ], + "deps": [ + "compat" ], - "commit": "cc7a086cd7816ad41ff004c61c41bdd26ec3ea0b", - "sha256": "0ncdyczalvl677nim0iha003xway7rwxw8y35vcvkgsdk4vzv848" + "commit": "ccf573e2145d9deb9d734432351eefc87fc1bc16", + "sha256": "0zi3q7dd9dgrhbz6ww270i43kkqs0ddk0vzs89mfvwa5pzw32d2q" } }, { @@ -70160,13 +71152,13 @@ "unstable": { "version": [ 20201219, - 231 + 232 ], "deps": [ "choice-program" ], - "commit": "b012270ea7780ed02ddf61d884b96cdc4fc01594", - "sha256": "0wmbrv5b4y1qq28w7glxqysrqfycp9gcs6cb3cjjlil74m1lcvc9" + "commit": "a622d128afc8d2d67de897666a1e2eccba8d7818", + "sha256": "1zb0ynwficxninyw89z53qf78s1ns60nh4cyzk96m05jlcaa1s44" }, "stable": { "version": [ @@ -70241,11 +71233,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20221105, - 236 + 20230212, + 1208 ], - "commit": "c338cdff80012893e64ba62a199281f430db7021", - "sha256": "0glmrn96aji78jf3nvj5w0bkwswd0kyazfnm1jszgyy7h01am9rm" + "commit": "c765b73b370f0fcaaa3cee28b2be69652e2d2c39", + "sha256": "1i9qw8pyf44zvdfc8nh5gjpiihhafvjjqwgc6z7r6jl2gn4bmyri" }, "stable": { "version": [ @@ -70487,20 +71479,20 @@ "repo": "jcs-elpa/marquee-header", "unstable": { "version": [ - 20220704, - 753 + 20221230, + 1008 ], - "commit": "14f490b8683bdce53a6272fcc28a9b4137f86a24", - "sha256": "0vkf98hbcla6gl4xvy0wln87msjh5wf9dhnyscbqavgwql6m07k9" + "commit": "1fee5bbec486d0755954f5cafda67f342dc7daa1", + "sha256": "1i5ysf6sh8ziaqwg3bk80psig6gi4psl6xqjna59hdi0xnb4nly8" }, "stable": { "version": [ 0, - 0, - 9 + 1, + 0 ], - "commit": "d8e83b837bacdd45d274be42fe2d172fd1cbbba2", - "sha256": "1iy8vg2wlrzb01nc6sx21ijg62ak94k2x2w6gy56krp7frakacrv" + "commit": "1fee5bbec486d0755954f5cafda67f342dc7daa1", + "sha256": "1i5ysf6sh8ziaqwg3bk80psig6gi4psl6xqjna59hdi0xnb4nly8" } }, { @@ -70571,16 +71563,16 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20221117, - 1357 + 20230219, + 2053 ], "deps": [ "persist", "request", "ts" ], - "commit": "98276c45f29d4e45955ad7649758619453423cb4", - "sha256": "1sikn8jbq06k2z3qssrgh393hadrvmf667k6w3xd02sbas3zpk5d" + "commit": "4f9a7be4926dbf3f33a717fcbed12de78c22b331", + "sha256": "0grgilbfzn1fhmzriq5wynxm119dlav8d975inhr2gi49sg8bx1d" }, "stable": { "version": [ @@ -70640,7 +71632,7 @@ }, "stable": { "version": [ - 4, + 5, 0, 0 ], @@ -70649,8 +71641,8 @@ "json", "s" ], - "commit": "0f0b2315d23e5d18b627c9faa8f231f175b728a0", - "sha256": "003ih3nrv753rj4ssdvs6ddqzxgl63vzmrypd41xf4g5dfsbmsf0" + "commit": "dd41b03c64eca324558e6139699cacccfdd0efd2", + "sha256": "04sd9147ll28zabi1kr4qbg1z04svgfix1rxh151sz6jmars7qj0" } }, { @@ -70678,8 +71670,8 @@ }, { "ename": "math-symbols", - "commit": "d7b0799bddbbbecd12bc1589b56a6250acf76407", - "sha256": "0sx9cgyk56npjd6z78y9cldbvjl5ipl7k1nc1sylg1iggkbwxnqx", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "05m9sd93llbfl15nx0zbj03vggjfqh4i0j1rgx5nlqmrix6r3caq", "fetcher": "github", "repo": "kawabata/math-symbols", "unstable": { @@ -70699,15 +71691,28 @@ "repo": "enricoflor/math-tex-convert", "unstable": { "version": [ - 20220918, - 1850 + 20221210, + 1937 ], "deps": [ "auctex", "math-symbol-lists" ], - "commit": "91a9588f0d2d145f1695a531cc8bba8ec0adee3b", - "sha256": "1n6pizx5rnjrmr3xm98mwsq95xa50xagpg8k01k7vqwi472g7f3h" + "commit": "8b174d05e8e5269322a1ee90f94cf1ed018d4976", + "sha256": "0y8mk22jklj0bappvfjmkz8cf9j9ppsbgp770fvc6m62xf544jlx" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "auctex", + "math-symbol-lists" + ], + "commit": "8b174d05e8e5269322a1ee90f94cf1ed018d4976", + "sha256": "0y8mk22jklj0bappvfjmkz8cf9j9ppsbgp770fvc6m62xf544jlx" } }, { @@ -70718,11 +71723,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20221008, - 1623 + 20230120, + 1938 ], - "commit": "e0d127935c7a45b1178182a43ab000f41a9f73d7", - "sha256": "1nwpqbbfabcjryqg41fkdailhq2m5f55yxcz7z75s07y15xl1c5y" + "commit": "4cf540990f1f568c513162a0103b2b00c3d1ae43", + "sha256": "0ypm3kl67025wr7wfvgl9l9ig00kz0kpr9544g4dw92yq4wp5504" } }, { @@ -70795,20 +71800,20 @@ }, { "ename": "maxima", - "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", - "sha256": "1vb9r501r1l4j721ybhl2pl90m2qzq0ky01dv2zipzph0gdx5q0a", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0wmnw3rwxfg2pha18b67qdk745w0hn0apsvs1p84mapkjl8cmw9l", "fetcher": "gitlab", "repo": "sasanidas/maxima", "unstable": { "version": [ 20220531, - 1751 + 1847 ], "deps": [ "s", "test-simple" ], - "commit": "8f0f64740928def955762780c801ef682dabd562", + "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" }, "stable": { @@ -70822,7 +71827,7 @@ "test-simple" ], "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", - "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" + "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" } }, { @@ -70833,20 +71838,20 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20220921, - 1904 + 20221201, + 1855 ], - "commit": "74fd873981b0fdc35518e4cfdd52527b6f95cdf5", - "sha256": "1ha890bvbcc2b4nvx35idsi3q244d30jg8vkzvwcw26ic5sjr03r" + "commit": "a6e5209a3569857836c5f6e58eb33ec98a9f6700", + "sha256": "0rypc37pr2v57fqkr50aaqrp2159lxw8llmvflkxl9zk3fwnrm80" }, "stable": { "version": [ 0, - 10, + 11, 0 ], - "commit": "74fd873981b0fdc35518e4cfdd52527b6f95cdf5", - "sha256": "1ha890bvbcc2b4nvx35idsi3q244d30jg8vkzvwcw26ic5sjr03r" + "commit": "a6e5209a3569857836c5f6e58eb33ec98a9f6700", + "sha256": "0rypc37pr2v57fqkr50aaqrp2159lxw8llmvflkxl9zk3fwnrm80" } }, { @@ -71059,15 +72064,15 @@ "unstable": { "version": [ 20220101, - 501 + 505 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "4582818c4795cbe231665ab4c0f38ccfa650ce8b", - "sha256": "15119yjrsqy2hdga2p2y3nd0zqxy1xqjywfiwiyr28gw6v50sk3a" + "commit": "59c46cabb7eee715fe810ce59424934a1286df84", + "sha256": "1azjp340wxv25c7bg1y5m8gwmgsdfvlxxcisczz44v87v8jbjhyw" }, "stable": { "version": [ @@ -71092,11 +72097,11 @@ "repo": "baaash/melancholy-theme", "unstable": { "version": [ - 20221017, - 43 + 20230204, + 212 ], - "commit": "42b89124dd400d81b81d871d853ed8f11abfe01c", - "sha256": "1d44ry85qxfm6jkmwjgr2i74lni0f8g0r5k777s5lvfq3yirmjw6" + "commit": "c29f9c70787f75749a8f5af4b1a650eec5bbf689", + "sha256": "06hag53si17sjbqj0679jcg302nl2shivxb5wrdbiqv1f5j83sr5" } }, { @@ -71212,8 +72217,8 @@ "repo": "skangas/mentor", "unstable": { "version": [ - 20221030, - 1607 + 20230103, + 1146 ], "deps": [ "async", @@ -71221,21 +72226,22 @@ "url-scgi", "xml-rpc" ], - "commit": "291ba7fd29aabcadb584feddc0b3ae4120713209", - "sha256": "1yijc61x6c8g6azm3bj7miqzymx5n25pjx0b5850i5jddqd2sjvz" + "commit": "f51dd4f3f87c54b7cc92189924b9d873a53f5a75", + "sha256": "1jmgq8n6lf2gkxx1f2nv56dvs335zhcq4kgvmsrdiaay4v4j9pgi" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "async", "seq", + "url-scgi", "xml-rpc" ], - "commit": "4ce024e17bf8ae079b2cd67af475b3e636c82be1", - "sha256": "0bs5zlf8f5pil0z5bcq1p5vxrhlnlki1khfsmif56msxhsf0m6wc" + "commit": "480602f2ec5467aa2418ee98b328fb85d3b58d0c", + "sha256": "1yjlv14wab2a39bi5v1p5mkri696fq22j1fnac1k83qc3s67m4hi" } }, { @@ -71246,11 +72252,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20221027, - 28 + 20230213, + 200 ], - "commit": "4ad1a11d14c8bc0ba4137900c7833fbdacf7bdb3", - "sha256": "0dnz5kd2swk7jn661nchj2sjhl7ydf4zks2vfxcyr7npgkxw78cf" + "commit": "1e69067c1647ea634c87c021c5acf4a81152f4b2", + "sha256": "125g3ya4n7whj88ja80gl8pfg3zwnkbmizkxyvs1hfwla1xr559p" }, "stable": { "version": [ @@ -71270,21 +72276,22 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20220630, - 1249 + 20221222, + 1239 ], - "commit": "2e006714bbd000e2e4ad8d67469254ca2988def6", - "sha256": "11d6x988mjpcbkrj812w9rv0j24hnhlxkk6g5fbcji19pxqrz3xn" + "commit": "41cd949106fbf0769c97e3a56808e4d99fc42c6f", + "sha256": "17fvs379xqdr3lhpqvj36vrdp12swnaz3hgnf312bjni15gpyiyi" }, "stable": { "version": [ 4, - 6, + 7, + 1, -4, - 414 + 500 ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", + "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" } }, { @@ -71295,29 +72302,30 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210615, - 1208 + 20221123, + 1408 ], "deps": [ "auto-complete", "merlin" ], - "commit": "aa9a385e7b610b855911c4e544371725dd83511e", - "sha256": "159hsnjdkjhldn19vw43fnv2yzfb17yg3p8x41vs8wq3rw6msc7j" + "commit": "8bcab034a680f57ddf58092fda6288dc4caddd2a", + "sha256": "18pp8rjdf0lbdppnp0yxb77hpl9bvxbxkk05yf4flbpa101q74cj" }, "stable": { "version": [ 4, - 6, + 7, + 1, -4, - 414 + 500 ], "deps": [ "auto-complete", "merlin" ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", + "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" } }, { @@ -71328,29 +72336,30 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210615, - 1208 + 20221123, + 1408 ], "deps": [ "company", "merlin" ], - "commit": "aa9a385e7b610b855911c4e544371725dd83511e", - "sha256": "159hsnjdkjhldn19vw43fnv2yzfb17yg3p8x41vs8wq3rw6msc7j" + "commit": "8bcab034a680f57ddf58092fda6288dc4caddd2a", + "sha256": "18pp8rjdf0lbdppnp0yxb77hpl9bvxbxkk05yf4flbpa101q74cj" }, "stable": { "version": [ 4, - 6, + 7, + 1, -4, - 414 + 500 ], "deps": [ "company", "merlin" ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", + "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" } }, { @@ -71361,14 +72370,14 @@ "repo": "Khady/merlin-eldoc", "unstable": { "version": [ - 20190830, - 517 + 20230213, + 555 ], "deps": [ "merlin" ], - "commit": "db7fab1eddfe34781b7e79694f8923b285698032", - "sha256": "1c13cgmi8z69b5imd9zlagfgrsdl3qv73n24wgc4ih99w1c7sc08" + "commit": "bf8edc63d85b35e4def352fa7ce4ea39f43e1fd8", + "sha256": "01k9hnhv9wbshwkrhzmy1d6dw1dps0amjpdcjhzyzz3d97kwnjws" }, "stable": { "version": [ @@ -71390,29 +72399,30 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20220330, - 1736 + 20221123, + 1408 ], "deps": [ "iedit", "merlin" ], - "commit": "b94e980b7d10830a83b73794a90b7b9ad04239dc", - "sha256": "0iymv5kvybfbp5q0mkvy8nx5988nd9yh5p7xrbfmk3ds62gjwa35" + "commit": "8bcab034a680f57ddf58092fda6288dc4caddd2a", + "sha256": "18pp8rjdf0lbdppnp0yxb77hpl9bvxbxkk05yf4flbpa101q74cj" }, "stable": { "version": [ 4, - 6, + 7, + 1, -4, - 414 + 500 ], "deps": [ "iedit", "merlin" ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "f3643eab67b5d2a89c3310282b1b605eadeb1908", + "sha256": "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01" } }, { @@ -71423,14 +72433,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20220716, - 1705 + 20230131, + 1601 ], "deps": [ "f" ], - "commit": "a98a9e733b1da1e6a19e68c1db4367bf46283479", - "sha256": "1xhvjng4av3k9n96p3gi0v9i47ya23rz02pwzgp7xxvhflbas4ph" + "commit": "f0c9b5202d70bce783494a971d3c67d4700cff53", + "sha256": "14kfsni9x7ds7zw16kln2mkzqkrkd7vakc575s1c36c9zgvqk2nb" } }, { @@ -71464,11 +72474,11 @@ "repo": "alexmurray/message-attachment-reminder", "unstable": { "version": [ - 20200428, - 124 + 20230124, + 520 ], - "commit": "02d7e66e55729d294f92881530f58a6a7364a78c", - "sha256": "02cqbxdhncnd48nnm3ya5fwkzhq7ax2z277biv7z2nhmx52dwcds" + "commit": "975381d6e7c6771c462e73abd3398a4ed2a9b86b", + "sha256": "1frh5kksypp8lwp3hsfh6fxbm4hbylkq2ll8g9nvq84kaq9m1k84" } }, { @@ -71682,17 +72692,17 @@ }, { "ename": "mew", - "commit": "362dfc4d0fdb3e5cb39564160de62c3440ce182e", - "sha256": "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0yh1z3y58mrl053biy3awrawy4k94vz3gp0bl5h4mbxwkdvpjz65", "fetcher": "github", "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20221117, - 1310 + 20230209, + 1231 ], - "commit": "7e4dd83a1896f44e1b6c820263c850e3b33eec50", - "sha256": "0zjnqnrz4gy1rikrgg8smg62wy3m50w0gpsq644606s24hvf7kwc" + "commit": "2f9143f5865cdbd31701be58093961b41def0edc", + "sha256": "0535p05iggc20p168lniy42c5zlvj5j7gpny4yfm75b8b8h6zk11" }, "stable": { "version": [ @@ -71726,19 +72736,20 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20220821, - 2242 + 20221206, + 2219 ], "deps": [ "cider", "dash", "geiser", + "parseclj", "parseedn", "projectile", "s" ], - "commit": "43b2061f907dda533abd3136dccdb1ce467ec6c0", - "sha256": "0jrqxk0sf6360sm7b78cbmdkhi4ihgdjsyxgw5qn8xl81n41xas1" + "commit": "493e652b8fffcbed226f69a2ea82e6f9fc51ab08", + "sha256": "1k5r4k2l31vxn7cmfl2ijzlay4klyr66ljzp3c779mz967f0sf5h" }, "stable": { "version": [ @@ -71775,8 +72786,8 @@ }, { "ename": "mhc", - "commit": "d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba", - "sha256": "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0d5k7sfacf6158qfck9b10pblsrna7wl1a1r1vk4m73sq4hsk0b9", "fetcher": "github", "repo": "yoshinari-nomura/mhc", "unstable": { @@ -71804,6 +72815,30 @@ } }, { + "ename": "mic", + "commit": "5a37253a8a1b2f107705c2f323f104c091f39204", + "sha256": "0grjdymn8qy5lyg0l98ayz7w5rjdmzqmhc03r8690zsfh9sk8f6w", + "fetcher": "github", + "repo": "ROCKTAKEY/mic", + "unstable": { + "version": [ + 20230123, + 944 + ], + "commit": "7d0a31ace0b801cb8b58a7bb61a981b67508208d", + "sha256": "1gz6fbj7l0pm6ghv40665iaik2rw3qmbrbccb84jjky2a3d6vcch" + }, + "stable": { + "version": [ + 0, + 36, + 0 + ], + "commit": "fcb51a8171354d1d912c29095488ed8536b89bb0", + "sha256": "1j15s74klkhmmav6s1ga1kxvwq633gqix4vbddxvwkv80bwp9bvf" + } + }, + { "ename": "mic-paren", "commit": "6f0e54eac31fbbce9a778fb654f07e11aaaa46ca", "sha256": "17j0b8jyr0zx6zds2dz5fzvarm2wh8l5hxds2s90kh5z0kk23r07", @@ -71961,14 +72996,14 @@ "repo": "pft/mingus", "unstable": { "version": [ - 20220825, - 1103 + 20230206, + 618 ], "deps": [ "libmpdee" ], - "commit": "aca914bfd81e18a37b2cc91f8ad219719a46c108", - "sha256": "11lfdvjjg0bdyach78dw7hi8whc0500w2339pr17dmwks4qyzdcl" + "commit": "f4d1df06f537ae88830a040eea5e23768a0ebd5b", + "sha256": "1gpiyh694qnipg33w90riwmf6717lkbabdqm6ybjbcn6d7k60b6y" } }, { @@ -72178,14 +73213,14 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20220422, - 1615 + 20230212, + 2213 ], "deps": [ "compat" ], - "commit": "b0427eea174adb494efc9fa212c22021861d3f76", - "sha256": "0jzmyf9x9nq4jw8a0b5lisam0wz6vy3f8sxn4dj3anawjivn6ml0" + "commit": "c5e8b65620558409a79766e86e3e8263cef765df", + "sha256": "1prs6zr924smh1kiq1rljz0vim4rl2ngi5rj7lrq60k0hq1vyddl" }, "stable": { "version": [ @@ -72283,8 +73318,8 @@ 20221031, 411 ], - "commit": "df81e04668de74740e252ddb0f34569b351b92b4", - "sha256": "0lsafb7jciqll2f3mr7jnf4ydrhlvqi1pjyr5snsjk98q0yigskj" + "commit": "7bb0f9946f5833eada199e880fdc4efa6df09e0b", + "sha256": "0fwxhkkhvbwdxrg9j9pjgkh864fa8rvc6dcr46a69spyjja3rw90" }, "stable": { "version": [ @@ -72400,20 +73435,20 @@ "repo": "jdtsmith/mlscroll", "unstable": { "version": [ - 20221101, - 1715 + 20221204, + 1608 ], - "commit": "101821ad61222e318d924aaebac091650ec2a047", - "sha256": "1nh0bh8q2n02ys0jvvpgba8k188v20d4dvnnl71vfwkm2b17kpmw" + "commit": "de9f84531ca4db6e54a2ca7201638decc0ccadd4", + "sha256": "04gqvlqb00jmkxj4wv4yr3hyvyal4vp2i2x0r338144bhwcxmi71" }, "stable": { "version": [ 0, 1, - 1 + 6 ], - "commit": "5811cb564727f74eb0c8b8b075e6dc982e6ac5f6", - "sha256": "1wj71kz9zdp1rb2lmxrfrrwjg7wb4yjgsaqmhv2l4hyq97pzr0nm" + "commit": "aca5dc9b1be2e38d051c098cf5bc3412cec1ccee", + "sha256": "0k8v6wnscwm5bn6ksr0sbd9cj559ddcbqj7vhh0w67sfy9lgvriz" } }, { @@ -72453,14 +73488,14 @@ "repo": "dgutov/mmm-mode", "unstable": { "version": [ - 20221027, - 2340 + 20221228, + 1931 ], "deps": [ "cl-lib" ], - "commit": "3c2071347a48a5aa172671687b0a3972381dc7d7", - "sha256": "02gcv9rxxl278sx5kw1w1zgj0yi2rscr2dk93l58yggwc4pxnai5" + "commit": "171bf6395b8a95a2d08d41fa38cc1799025d3916", + "sha256": "1m6nqkjy04s5c4v3a952gx79dnc3ihc5w5vj6lg26ps9syzk3b0b" }, "stable": { "version": [ @@ -72585,8 +73620,8 @@ }, { "ename": "mocha-snippets", - "commit": "93c472e3d7f318373342907ca7253253ef12dab8", - "sha256": "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0kv2qcxga1fpdvyd898sjg1c64gj7d83fyjs5b24zx4yysxfp04z", "fetcher": "github", "repo": "cowboyd/mocha-snippets.el", "unstable": { @@ -72722,14 +73757,14 @@ "repo": "tarsius/mode-line-debug", "unstable": { "version": [ - 20220422, - 1615 + 20230212, + 2015 ], "deps": [ "compat" ], - "commit": "4e9e4d774c69a694ff1c781ec2c9215b2f2dc643", - "sha256": "0p23hvan3snpdizlgx4221nnzgj631b0fhd6w13cq1fcrvis3a9w" + "commit": "d6148f6819e8500c907271ef82c4604ee416f941", + "sha256": "10l1gm4bma6cwmcx7b00hzd8zpaxl60lql71qrx4bcad076n3afz" }, "stable": { "version": [ @@ -72749,11 +73784,35 @@ "repo": "ideasman42/emacs-mode-line-idle", "unstable": { "version": [ - 20220731, - 2355 + 20230116, + 951 ], - "commit": "11877416ef391dffa38eb1433ce2f337405c7ddc", - "sha256": "13vaxj7hy7zp7zy2g5vfgd4mrkhw6r3bi4hfn1h1h2ijf9hln3am" + "commit": "be393eb5c60382ed297b59f69292917bfc9bf60f", + "sha256": "1n391gvk7gzcvkwlhwid0lhlbva2a4pghb7r8mrnf8pm1imzydjf" + } + }, + { + "ename": "modelica-mode", + "commit": "7c490aa852043e71eb5d3bb8e8b36160e0ac888b", + "sha256": "1jq8jsm7ap14r7vrhbicsrcq9g07yv8adl733c3fil02db6aipfm", + "fetcher": "github", + "repo": "modelica-tools/modelica-mode", + "unstable": { + "version": [ + 20230109, + 1000 + ], + "commit": "291f1bb8147693e21054722757f1e2cef4b27d12", + "sha256": "1dswgjsza688v17cmcyw5w58dywz346bq4v0msvyrm3rhv2xbwrz" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "commit": "291f1bb8147693e21054722757f1e2cef4b27d12", + "sha256": "1dswgjsza688v17cmcyw5w58dywz346bq4v0msvyrm3rhv2xbwrz" } }, { @@ -72869,20 +73928,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20221117, - 1155 + 20230220, + 1859 ], - "commit": "30b622807601d3c1722347717f998d6d5a0146f3", - "sha256": "0iis4lc2sxbzf5syp23zqpy451avv7k1hwjc5d3y0lrnp4ivchln" + "commit": "f4282839d880a88062acaafbd8acea2708d3932b", + "sha256": "0nn5mkm2pn59l1bchxaz59zsl9xhvjxmqc5vizrgl77y9mjkws96" }, "stable": { "version": [ - 3, + 4, 0, - 0 + 2 ], - "commit": "0bf4095918281f50f27ff3174482678c84c645d7", - "sha256": "1468y1ra4w4ihq68mfvddyijppj5sz143aawzg2nxdzphy9a84l2" + "commit": "ca4d92aa0dd2046a06821281b12201bcaa95bb1d", + "sha256": "05wl0310va5irc2f72d2mxq19xafxswmgc0a048mah0aam8lsv2f" } }, { @@ -72893,11 +73952,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20221107, - 255 + 20230110, + 422 ], - "commit": "b7960f079e6f2b82468b4ca2afd4edf8bbdb6fdb", - "sha256": "1g8n3k5dsaib17jksbbbyg7sm82fskxgb6zv8jysrj4zv3yll7h3" + "commit": "171d76b0c69e42a9d7b62c5c472944951cb2be6c", + "sha256": "0g4dci8r0p69vmhbp5djrjvqv7z90xw7pznzapgxy8dqmbvc14k0" }, "stable": { "version": [ @@ -73013,8 +74072,8 @@ "deps": [ "scrollable-quick-peek" ], - "commit": "e72472d3c490c8e3ffc5ca7bf8e535e15bd867a7", - "sha256": "0xzj9jqnzyzkbjfj2rfg4fzaprprqzy3xqnacfnmavr2l68vigih" + "commit": "0e949d08198c0bd003f1d5c8cdceb7e36bef22f7", + "sha256": "0fgnfslhg10q96lyxfnpa7s8dvw5gjlll7p6qji2jfz3kncwhf5l" }, "stable": { "version": [ @@ -73031,8 +74090,8 @@ }, { "ename": "monky", - "commit": "9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc", - "sha256": "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "17cipbdbksr3aqd5slk8i0xf86kz7gw757mnl24dnc0j2z4a3c96", "fetcher": "github", "repo": "ananthakumaran/monky", "unstable": { @@ -73168,20 +74227,20 @@ "repo": "jessieh/mood-line", "unstable": { "version": [ - 20211003, - 2113 + 20230126, + 917 ], - "commit": "ef1c752679a8f92faa7b4828adbbb300b6942f22", - "sha256": "0z6s80j259xf8nxjxcsmp7wyvpcg5wyx58brlrbwg1aa9hl3fxga" + "commit": "58e85c815092ac93d02dab584fe537fd1be3828a", + "sha256": "0davxbpw2a15n1wcza3qszdvmyzypffz8rdkizlq6xhccdyk0rvd" }, "stable": { "version": [ - 1, 2, - 5 + 2, + 0 ], - "commit": "ef1c752679a8f92faa7b4828adbbb300b6942f22", - "sha256": "0z6s80j259xf8nxjxcsmp7wyvpcg5wyx58brlrbwg1aa9hl3fxga" + "commit": "d6369af8228921b5ffa328e671c7446a2733fe43", + "sha256": "0davxbpw2a15n1wcza3qszdvmyzypffz8rdkizlq6xhccdyk0rvd" } }, { @@ -73192,20 +74251,20 @@ "repo": "jessieh/mood-one-theme", "unstable": { "version": [ - 20220613, - 114 + 20221222, + 1214 ], - "commit": "033910aaf1bb41f384d1b5b96d55975d1378a34b", - "sha256": "0ban8p3nnxnds3yscdi4h9v3ni9l0diwd4y9cy52xp0kkl4jxayg" + "commit": "dfbc81900737d3382a340feeed24d2bcd9bdedb0", + "sha256": "0scraadlync08zsn84f66jb1s6jch3pr6asgvfm9cms8fsnfmrbs" }, "stable": { "version": [ 1, 2, - 1 + 2 ], - "commit": "42e402a89473458f55a71c5bbe785575e9a927ba", - "sha256": "1ma5138src6iglkhd2h8w9k4gqqaxvsngz08cd4v2s8dhqkcayw8" + "commit": "dfbc81900737d3382a340feeed24d2bcd9bdedb0", + "sha256": "0scraadlync08zsn84f66jb1s6jch3pr6asgvfm9cms8fsnfmrbs" } }, { @@ -73216,14 +74275,14 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20220620, - 844 + 20230212, + 2015 ], "deps": [ "compat" ], - "commit": "a798096ee4ccf66ef2aa7016c00c8531bd63d27a", - "sha256": "0xqv6wd7zyka0dn5hrk0rq6ym04qn3sfza7cqr7i4fvpdkxlv7iv" + "commit": "4c7171cbe39adcf2ab1ae5290bdb0ecfd7d669d1", + "sha256": "0kp7inp55xbchwm1s16rwq6a99731yinylv39hds24y6fbc09zpi" }, "stable": { "version": [ @@ -73340,14 +74399,14 @@ "repo": "tarsius/morlock", "unstable": { "version": [ - 20220422, - 1616 + 20230212, + 2015 ], "deps": [ "compat" ], - "commit": "9cb24413291beb1f4204765c77d65e78dcf83a3b", - "sha256": "1qffgvz3dk668907kk6y35q6j1i5qcywjspdfv37qccn51jw8fpr" + "commit": "674354d41bd2bccf0590467851796db6d4595873", + "sha256": "1kwmgvy2w3spqs4bjrh9c3va3yd2j67lgj09i3wyglnic34zjlkp" }, "stable": { "version": [ @@ -73367,8 +74426,8 @@ "repo": "themkat/mos-mode", "unstable": { "version": [ - 20221007, - 1641 + 20221209, + 1353 ], "deps": [ "dap-mode", @@ -73376,8 +74435,8 @@ "ht", "lsp-mode" ], - "commit": "396abaa4afbca895fe27bc0570491fb005fc7693", - "sha256": "02br0xi6cqpj196f581c3gsl1j81wf7gqb2ras7v5f4c1jh3icw0" + "commit": "770f49417e8ad7dbf382c8691f6f689d793b9314", + "sha256": "0g3hk4s3wirrdr2j0hivyqkw0hzbibp62abbwy2q04svr9yyw6dj" } }, { @@ -73412,10 +74471,10 @@ "unstable": { "version": [ 20200808, - 931 + 1353 ], - "commit": "40cfe032281611f69d804006d15bef46f93261b7", - "sha256": "1pb26h8yxq0nknpbdcl1as0igs2ach5kv2i17jclhj0mlqncc74f" + "commit": "90c09da92b30c6497e9141f0edfe7842440c4d53", + "sha256": "0bcqg5p7v6wi3g68c9qpv3rvi9lh6427dd0gmmnwvs1qysz28f1b" }, "stable": { "version": [ @@ -73488,6 +74547,29 @@ } }, { + "ename": "move-mode", + "commit": "d492e6f0532df9c1d5966e1a61160ab8535be4e4", + "sha256": "1krki5spb8r9ajzaawrgz1y8kzfljwvpx9cfhml39izq7yi03kh4", + "fetcher": "github", + "repo": "amnn/move-mode", + "unstable": { + "version": [ + 20221205, + 1433 + ], + "commit": "fa34fbe977d62c8297abc3547b9cfb25802e033c", + "sha256": "1qxnkdvn0d2ybrkwm57wn0k5y1nr6sc82i9n3s2306anyflvn868" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "87aabaac939b69bfd4cd23704e3b67f59c461358", + "sha256": "0sdb783i0rg1fgcs38xxn59z7mzkc43m9cgdx9vzb2ymzzfgg0z9" + } + }, + { "ename": "move-text", "commit": "82bfd0f41e42eed1d4c2361ec1d1685edebbac1b", "sha256": "04bfrkanafmbrdyw06ciw9kiyn7h3kpikxk3clx2gc04jl67hzgy", @@ -73519,11 +74601,11 @@ "repo": "retroj/mowedline", "unstable": { "version": [ - 20161122, - 235 + 20171218, + 237 ], - "commit": "bde4de0a4e1404127b0a48897d8cd1d1cb8a263d", - "sha256": "0wwl9f01b9sgs8n19a4i7h08xaf6zdljf2plbdpyy4gzi2iiqcc4" + "commit": "c17501b48ded8261d815ab60bf14cddf7040be72", + "sha256": "1k3b018xq2qqq30v0ik13imy9c84241kyavj5ascxhywx956v18g" }, "stable": { "version": [ @@ -73543,11 +74625,11 @@ "repo": "google/mozc", "unstable": { "version": [ - 20210306, - 1053 + 20221214, + 1435 ], - "commit": "b8dc3b676c0443853bf55c3ab5b73db54132441d", - "sha256": "0d9r2rn64wc53s6jq5nr3fas59bq6vqlnrvm45y4qs4siscw6lm1" + "commit": "cebb883f5d7d8d6dec05c6e2ed4096d0e8ff8c9f", + "sha256": "19i9ab311zk6fa7zbqaaiqkqhlx364d1zgd8zafmh5fqcwrbns7x" }, "stable": { "version": [ @@ -73673,28 +74755,62 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20220706, - 1952 + 20230103, + 1924 ], "deps": [ "libmpdel", "navigel" ], - "commit": "be954f3722d4f28718748eeb5dc859b04d3fefeb", - "sha256": "0aqg6lzih3v9fik370l9q1ans678zng258vnr36f9jj0wayi60z5" + "commit": "365b2661e56165c53eadd28d3e0a5f9d594412c7", + "sha256": "00ajjb9iawva3g7i1y6bz4d4ny3cv5rby6vgkwiy2xkprzxi8900" }, "stable": { "version": [ 2, - 0, + 1, 0 ], "deps": [ "libmpdel", "navigel" ], - "commit": "0a06789e9f74bf6bb23f9097dd8072fb7c545d96", - "sha256": "1wg48z0g6qqsd38r2ydba8dp7cq72cnkzshmhj6900xak6f5ywfd" + "commit": "365b2661e56165c53eadd28d3e0a5f9d594412c7", + "sha256": "00ajjb9iawva3g7i1y6bz4d4ny3cv5rby6vgkwiy2xkprzxi8900" + } + }, + { + "ename": "mpdel-embark", + "commit": "a97575c3154a1b011989f312d085cd8a68b7c09f", + "sha256": "0da3fp3b64abixai1f624lq5l4rz0l7a3d4xmhzsz5ghb8kn1rnz", + "fetcher": "github", + "repo": "mpdel/mpdel-embark", + "unstable": { + "version": [ + 20230103, + 2021 + ], + "deps": [ + "embark", + "libmpdel", + "mpdel" + ], + "commit": "31d91a62b680fb4472ec34c04ac6af80bb3cf4b8", + "sha256": "129ay53zrq4gzqf2vh41q3yp613vzi9b57jlzyl8jnbn0wfbjx65" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "embark", + "libmpdel", + "mpdel" + ], + "commit": "31d91a62b680fb4472ec34c04ac6af80bb3cf4b8", + "sha256": "129ay53zrq4gzqf2vh41q3yp613vzi9b57jlzyl8jnbn0wfbjx65" } }, { @@ -73706,13 +74822,13 @@ "unstable": { "version": [ 20210904, - 35 + 2048 ], "deps": [ "elmpd" ], - "commit": "6694fef890ae3ed4faf6a6bf671f3ef197bcc9c1", - "sha256": "1a7dg0mdcsn3cfclfgjyxdf2xn03bbxwa4y3d790f8mr2qb60vjz" + "commit": "66031a8993a2a704bdfaa9c63ec590dd0c5a2eea", + "sha256": "0n4b1klaf1jwd8bj9gqjy5p9yabgkgj9zai1cmsbnb4174h0719q" }, "stable": { "version": [ @@ -73848,8 +74964,8 @@ }, { "ename": "msvc", - "commit": "69939b85353a23f374cab996ede879ab315a323b", - "sha256": "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1j88a2nnrqjhq5avs665486l3xp20fc9789zh2izmf3msrxqimns", "fetcher": "github", "repo": "yaruopooner/msvc", "unstable": { @@ -73977,19 +75093,20 @@ "repo": "Alexander-Miller/mu4e-column-faces", "unstable": { "version": [ - 20220704, - 1920 + 20221213, + 2206 ], - "commit": "c5938a4f4ed23cf543f73d24e0a6f53272bdcd4a", - "sha256": "1lzmrryyqmvshcbnf2i3jji97bvp5faxh7kybdv8ks2v2lgnjgl2" + "commit": "1bbb646ea07deb1bd2daa4c6eb36e0f65aac40b0", + "sha256": "12cb37lj8j1fd5kp3gbnzgknb57j5l8xgrnhb60ysff66m1mbrr7" }, "stable": { "version": [ 1, - 0 + 2, + 1 ], - "commit": "2f903099073a863fb9b827d3d10c439237925548", - "sha256": "03szkxv565pdkam60wxcfqv0bcxjbidww53diid6w42b9y8ks54r" + "commit": "1bbb646ea07deb1bd2daa4c6eb36e0f65aac40b0", + "sha256": "12cb37lj8j1fd5kp3gbnzgknb57j5l8xgrnhb60ysff66m1mbrr7" } }, { @@ -74015,14 +75132,14 @@ "repo": "wavexx/mu4e-jump-to-list.el", "unstable": { "version": [ - 20211030, - 2307 + 20221202, + 1023 ], "deps": [ "cl-lib" ], - "commit": "4d362a668be4ae624ee96bf7806b25505b4bdf5c", - "sha256": "0jqnmzaa2vf4gxy9yzrvhijm3s4zaip4qxgxjlb240fr9ray6rgf" + "commit": "cf19684d2333cb0cda7f6b62c7607144baa49310", + "sha256": "02kyqd4ihliahkhirqqy7a8fi7s8haf9csaq95xi2hc9zkbd2nx5" } }, { @@ -74059,14 +75176,14 @@ "url": "https://repo.or.cz/mu4e-marker-icons.git", "unstable": { "version": [ - 20220714, - 1405 + 20230107, + 1504 ], "deps": [ "all-the-icons" ], - "commit": "5e8dab1f07fca183f29e310c208ecb0086ff3222", - "sha256": "1ss36wgxjy3c9gci8xf1wyyl0156cr6p0g395b2rdb9jj1xdk96d" + "commit": "6d6a0b4a7f6bbec34bc58c6704b7c199c8f1a751", + "sha256": "07cc9973ahl2i57grqbr99f82j8191d0hm88hvrwphrmg3fw10kc" } }, { @@ -74141,6 +75258,27 @@ } }, { + "ename": "mu4easy", + "commit": "10f16723cf6565a0ae0284bf178322b6148b8090", + "sha256": "1s20ygmdcxf0kzbj2an557lmcgk5qs9809l7068x9q8920g7hxld", + "fetcher": "github", + "repo": "danielfleischer/mu4easy", + "unstable": { + "version": [ + 20230207, + 2042 + ], + "deps": [ + "helm-mu", + "mu4e-alert", + "mu4e-column-faces", + "org-msg" + ], + "commit": "34565ddb9fc74675b28ce19694485cf2e91eba20", + "sha256": "134w5sgzicbn1ycf0dq1v4g4ph6jygzqvvgniygy6rgw1gs1gmx7" + } + }, + { "ename": "muban", "commit": "167ddaca39085bd570bb9392408ae31e58509793", "sha256": "13p1xbz90q055iczyclwcw0bkwwphq3c9bgy1ykr84jhfhvpm80a", @@ -74416,14 +75554,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20220821, - 932 + 20230113, + 835 ], "deps": [ "cl-lib" ], - "commit": "1e4842d1297241a5277bfd5c7bfab9e8711da60a", - "sha256": "0qrkgbihbax422x0y0hhdx9aflplp4cbc089ry3dbzyl09s7mwfl" + "commit": "16223efc2d6dece2d43bbccc189d7a4bab6de571", + "sha256": "14girixq6xjipvxdmnnah8fczvs5asb7zv7ng5slrlcrsqi11izx" }, "stable": { "version": [ @@ -74685,19 +75823,19 @@ "repo": "NinjaTrappeur/my-repo-pins", "unstable": { "version": [ - 20221115, - 1729 + 20230120, + 1105 ], - "commit": "e6d7d6c21c53d9120e54d5f68a6277f49acbe3bc", - "sha256": "0a1d5z8ma5b8mjkaiibblcf1x2rnlbr5zc0nxjnhv2lw569iv3ql" + "commit": "e6fe3864e244e6db74b668d24857c04472b2d475", + "sha256": "1r9mw4jbpi4i7lvd0gg5li0ia16s9pcfxl71c8l9qvqp73hvr51b" }, "stable": { "version": [ 0, - 2 + 5 ], - "commit": "3a85c415b2fd6c9146de9de6cc99fe5de629cd07", - "sha256": "1ndn17jqlcgp7k7qwli67i23hvbcvgp0jyj967hfisbd553x9964" + "commit": "e6fe3864e244e6db74b668d24857c04472b2d475", + "sha256": "1r9mw4jbpi4i7lvd0gg5li0ia16s9pcfxl71c8l9qvqp73hvr51b" } }, { @@ -74723,20 +75861,26 @@ "repo": "redguardtoo/mybigword", "unstable": { "version": [ - 20220715, - 615 + 20221219, + 1033 ], - "commit": "6c35dd44369930b039a37f6174617bb6ab93be27", - "sha256": "04kljxzzja1hb2lr45vik8x7v3l32xmbyl5vq85s0p74qmm5pcxi" + "deps": [ + "avy" + ], + "commit": "b070c907455e4edd129d3471f338172a5868cc04", + "sha256": "1l9km7rgidz1ppqrkrnxqzm1c4gjhdp9sxphxv45rqlz9xxllk53" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 4 + ], + "deps": [ + "avy" ], - "commit": "4c1386252444df2ade734e02078069a06f3f0f97", - "sha256": "0gbynsf84dgsg2m6h2m2xj54ph0a7kiz9njd33j4xp7r36d268f8" + "commit": "b070c907455e4edd129d3471f338172a5868cc04", + "sha256": "1l9km7rgidz1ppqrkrnxqzm1c4gjhdp9sxphxv45rqlz9xxllk53" } }, { @@ -74920,11 +76064,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20221004, - 1251 + 20230215, + 623 ], - "commit": "81ede3eb8f0fb4854ec3a9d2350f98dfd03163d4", - "sha256": "0686qrzwrjinp69hnqn76gdydxk8plgdcc3ymwbbbvzfwb466933" + "commit": "508bf3505e9bf60163b68056b89c084df97b48aa", + "sha256": "0x1n41c8bvi1ynsa9ka8wz7plk0a04c18ynyswcff3shrzayyr7d" } }, { @@ -75054,11 +76198,11 @@ "repo": "Malabarba/Nameless", "unstable": { "version": [ - 20190429, - 1202 + 20230112, + 1259 ], - "commit": "a3a1ce3ec0c5724bcbfe553d831bd4f6b3fe863a", - "sha256": "0pxfn81bc8smik0qksfjbrdjkzy0cbjzbc3ik47zl2i9blmx5krv" + "commit": "e468f3eea4518b9827419611868c897dce20453f", + "sha256": "1cyri78rlv5i9a8ryn4s0s83wd80366nsv2nkp4i6nrsxffkrrkq" }, "stable": { "version": [ @@ -75078,14 +76222,14 @@ "repo": "Malabarba/names", "unstable": { "version": [ - 20180321, - 1155 + 20221227, + 1825 ], "deps": [ "cl-lib" ], - "commit": "d8baba5360e5253938a25d3e005455b6d2d86971", - "sha256": "11wyha2q8y7bzqq3jrzix8n97ywvsibvddrahqcps1a1yqk4hzfz" + "commit": "45a272fae915148d9a74d4cb3c39917b272ee9c3", + "sha256": "1pzf5hkcvcqljl0kymjfg763nn4i5f94ywl1jrr3iwd72nqp0yp0" }, "stable": { "version": [ @@ -75462,8 +76606,8 @@ }, { "ename": "ncl-mode", - "commit": "2eea3936b8a3a7546450d1d7399e0f86d855fefd", - "sha256": "1niy0w24q6q6j7s0l9fcaqai7zz2gg1qlk2s9sxb8j79jc41y47k", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1ddirhz98j55f2c44dprkwkg32n6nmcw6f00ycs7vsbap2nx47yy", "fetcher": "github", "repo": "yyr/ncl-mode", "unstable": { @@ -75522,20 +76666,20 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20220514, - 2039 + 20230217, + 957 ], - "commit": "fbbf920514f8277947ec967d2b5ac5cc081e51aa", - "sha256": "10v7imy28lwakigvqisaf8vpnifw92lsn216893rk5zjk9xlrj9w" + "commit": "abea182499897eda40088d24b647e66099ef94ed", + "sha256": "19gqiynl59n2ni748f3wz212q22hnsx7xvq122hhwha0srdq8nyr" }, "stable": { "version": [ 0, 1, - 47 + 56 ], - "commit": "4515ec26790aa93af6463bca926ad614a1bc94b6", - "sha256": "0nygv1qd7a73z401gpwmkflhm6nhfn61js34f281x8kg7l2lihby" + "commit": "abea182499897eda40088d24b647e66099ef94ed", + "sha256": "19gqiynl59n2ni748f3wz212q22hnsx7xvq122hhwha0srdq8nyr" } }, { @@ -75959,11 +77103,11 @@ "repo": "th994/nikki", "unstable": { "version": [ - 20210227, - 1707 + 20210228, + 428 ], - "commit": "894bb6060018cb523abe43a7d3b2bf5691dda5e8", - "sha256": "1sav5biq26c5xi4bc7n3n3f3a1q16n47pa1nlnmm6jyilv8fh3zi" + "commit": "b2ea20d04a061df88d72bd8dd0412a6e7876458d", + "sha256": "0a4kv2zb6wmacfjsihzr1ac6rsynay30zl2qiyzv21js6wmrwn9c" }, "stable": { "version": [ @@ -76031,26 +77175,26 @@ }, { "ename": "nimbus-theme", - "commit": "fc0e6b456b76e2379c64a86ad844362c58146dc6", - "sha256": "1hy4rc1v5wg7n6nazdq09gadirb0qvn887mmdavwjnnac45xyi18", + "commit": "9801e3d79078edc2210bbf7d8091b3273fb67408", + "sha256": "0b70hjj07dh6hgq0a63y3lp1vx67ihakxbysh9mgsf22v48khbig", "fetcher": "github", - "repo": "m-cat/nimbus-theme", + "repo": "mrcnski/nimbus-theme", "unstable": { "version": [ - 20221003, - 1934 + 20230219, + 1337 ], - "commit": "3afc9b9d5288f4125f19176888f7639c3ae64500", - "sha256": "0fbv3dpm3a50vaprs15zz92x4wygds2q52x8c11xssmnmsydnzy9" + "commit": "b28256c3a3d3d316d09e63a1fdd0817db110c3ce", + "sha256": "11cxg4n95kw1824mcaifgz2w6akhq37cy00xmrz2b94fwpnf3dml" }, "stable": { "version": [ 1, - 1, + 3, 0 ], - "commit": "5ae0bee99d005e62c3b18e793a81405a1a3ca0e5", - "sha256": "15fhim7cj7inc2kyl0xgv18a8p4lygnpkxgbq34nl567y9374vs4" + "commit": "178557148f2e132c79be25429d04c5b89f6535dd", + "sha256": "09lcyxd4nds79m8bpk5pq5p5brb8c6czzvniarn8njzj13lcy2g6" } }, { @@ -76163,24 +77307,28 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20221109, - 17 + 20230210, + 1540 ], "deps": [ "magit-section", "transient" ], - "commit": "127d76202f10973e5af760fdb7804cc55cf51152", - "sha256": "1vaw5mc551ikgfqrww2v4njh16nxka9jacymga3v1mhzfw5gmqjk" + "commit": "c18a24e9ac569a221e88ba9d74d52c7b02b6eb77", + "sha256": "06prys01afi5f2n9lpasmybwg8v434yi19zm0dm4j59ziiknpn0l" }, "stable": { "version": [ 1, - 4, - 5 + 5, + 0 ], - "commit": "471a90ac96f4c94a717e5138fb0b03a167cfbf26", - "sha256": "1bqlhkxg0faddhvxx909dq46dxdxk4mdyhdpww92dmzgxdpq38sx" + "deps": [ + "magit-section", + "transient" + ], + "commit": "54e5626829168e22126b233e079f04dff3c71b90", + "sha256": "1xvrnpk7cnjm55ja6j7bdnszkzj914gmyzb12r89jh0z25r09crq" } }, { @@ -76460,14 +77608,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20221027, - 346 + 20230220, + 1519 ], "deps": [ "compat" ], - "commit": "cb277b8a84ca5857b607b3ff6132ee3663a57953", - "sha256": "1x6jcsndmlxvj9ncrg2nam5zqvcs0a5jjjm7ij3q929rdn5fl3kc" + "commit": "b1ba75ab9296ada356219ff8ae26333a79871c61", + "sha256": "0v1p6zwxkjfbk52l927wnlflnj0r25z7jyf2pjc1c39p9yg6gwl5" }, "stable": { "version": [ @@ -76803,11 +77951,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20221115, - 1134 + 20230221, + 1455 ], - "commit": "5ba7684445b9338ab289d502d4688d9aff3d8803", - "sha256": "15f6f4wm0k99ipzd7q3iv4w1ch534wyrnm0vhqa25k0sz2skzssr" + "commit": "48d774bbf4dc6e442e1be96aab712947b408fc5a", + "sha256": "1wl88x1h275f4lbmxq00r85qs3rkc0lviwn1k4ajmgwfhx591f3d" }, "stable": { "version": [ @@ -76826,15 +77974,15 @@ "repo": "tarsius/notmuch-addr", "unstable": { "version": [ - 20220422, - 1618 + 20230212, + 2014 ], "deps": [ "compat", "notmuch" ], - "commit": "d0a91745a4643fab65358d237fb1ef9ee6cff159", - "sha256": "1n99mn9mz4algz5a2cq55rbag7lgknhvbmshfdzjc2rkqlpm5mnn" + "commit": "fc00a3aac925d082b8f263e2a6d64b67535f5731", + "sha256": "18cckfdf3hbb4r33cg8gs1z4b3mpvvzcc42vd769gwfjchs0ws2m" }, "stable": { "version": [ @@ -76916,15 +78064,15 @@ "repo": "tarsius/notmuch-maildir", "unstable": { "version": [ - 20220422, - 1621 + 20230212, + 2014 ], "deps": [ "compat", "notmuch" ], - "commit": "1d2a160acd0f37a2d93909dc057cbf8f853758e8", - "sha256": "1nbb6qw5mrmxgs5nmgjg2gjnsn54dgfld26xwpqvp8pj91hbr70h" + "commit": "0d8f1534691e834f26e1899dd54df2db7f810669", + "sha256": "1x91rz8xf3i72y618ff3h1zizrsjdqv2im1ffmxrs7sq7xn52d58" }, "stable": { "version": [ @@ -76947,15 +78095,15 @@ "repo": "tarsius/notmuch-transient", "unstable": { "version": [ - 20221028, - 1344 + 20230212, + 2014 ], "deps": [ "compat", "notmuch" ], - "commit": "757ee082a2228e70151468f049eee2f14ed1e8d2", - "sha256": "0l3bpqcd10fi7ggalgxak5fy5dx70ag3acbki7w38q9100gzl3rd" + "commit": "9d1fa80be0656e712a3f86079ea0abba0542dd88", + "sha256": "1yy5hxkqjwm3l6nfnl9vky3jly36bagrsqp58yxn9ryz8b18spq9" }, "stable": { "version": [ @@ -77048,14 +78196,14 @@ "unstable": { "version": [ 20220428, - 839 + 927 ], "deps": [ "jest", "transient" ], - "commit": "d0ba171f311e84a5c3e125f982a8d2718e49b662", - "sha256": "1ijm0k2fi57l3f194h84yjxrimp00sxgl282q5ah2i3ry9wj2y4m" + "commit": "6eb0a58274870dd75bf848cf5a916a9f2c6ddae5", + "sha256": "1shl3ixvbfs84cw62dh0xzc0kacpbvrg49qnbkyvk9kn91x6k9c1" }, "stable": { "version": [ @@ -77123,13 +78271,13 @@ "unstable": { "version": [ 20140807, - 1554 + 1557 ], "deps": [ "cider" ], - "commit": "9506238562c2e0c0df744e0d81edff4c74322a7d", - "sha256": "1si5pfczk3iypdx2ydhirznx2hvp6r7sq2hy64gn3mn4r68svlfi" + "commit": "471a08df87687a3eab61b3b8bf25a2e0962b5d5b", + "sha256": "1l07nrlfd5qj8jnqacjba7mb6prapg8d8h3881l3kb66sn02ahgy" }, "stable": { "version": [ @@ -77832,11 +78980,11 @@ "repo": "mzimmerm/ob-dart", "unstable": { "version": [ - 20170106, - 1624 + 20221201, + 633 ], - "commit": "2e463d83a3fe1c9c86f2040e0d22c06dfa49ecbf", - "sha256": "0qkyyrrgs0yyqzq6ks1xcb8iwm1qfxwan1n8ichmrsbhwsc05jd3" + "commit": "f6d5664d5cc8b15e002f6899f8adedcb10ced5f1", + "sha256": "0zlr12sk2821fsjblhxgj6l5wwrb75w7asdqvc0d92jcjjhjl7r6" } }, { @@ -78163,8 +79311,8 @@ }, { "ename": "ob-ipython", - "commit": "557c36e86844c211f2d2ee097ce51ee9db92ea8b", - "sha256": "06llf365k8m81ljmlajqvxlh84qg6h0flp3m6gb0zx71xilvw186", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0f2zxi0wl0d8g2fqr2q3xjypnf1ins750j9pjjjpclsafgm6119q", "fetcher": "github", "repo": "gregsexton/ob-ipython", "unstable": { @@ -78274,14 +79422,14 @@ "repo": "lurk-lang/lurk-emacs", "unstable": { "version": [ - 20221107, - 1338 + 20221122, + 2058 ], "deps": [ "lurk-mode" ], - "commit": "b341ffbf5959bbbc7dd33b35e207ce8b7bfbf565", - "sha256": "1hs4msdqi1m74ypgqrzag49x868i2vxf6wybb6kcc26kb9f36pwp" + "commit": "bd7cf661ccb31bfbfab542018c361bd79064d4f4", + "sha256": "0nrh517q7czfdr637qkv2j5mifd7wrdj0fzkfvbn8pz6s8fj0av1" } }, { @@ -78349,11 +79497,11 @@ "repo": "pinetr2e/ob-napkin", "unstable": { "version": [ - 20200816, - 1245 + 20200817, + 1259 ], - "commit": "a2e7e77706a326c00eb6a441de1e920fba676ee0", - "sha256": "122zwxhxsm08k8c4sgz61299dbdbjlgl0paqxi8vshbl9fqawqfj" + "commit": "7af5e8af08da8455c489909afbd9528a61f570e7", + "sha256": "1rmfxbnl2y6yx1869sm5203k7hch481wh5dq6lik5bj00cf3knc6" }, "stable": { "version": [ @@ -78384,6 +79532,36 @@ } }, { + "ename": "ob-nix", + "commit": "5e5a469f50f4f8099243450333d88722f581d61f", + "sha256": "0didm1mc0pghrh6pnskwls681zafvwdl65irfvwizy87hxpg78c4", + "fetcher": "codeberg", + "repo": "theesm/ob-nix", + "unstable": { + "version": [ + 20221224, + 334 + ], + "commit": "76d71b37fb031f25bd52ff9c98b29292ebe0424e", + "sha256": "1m9xxw8kncbifr3g9spqnp16iqmcfa1rblk01d3rwiricd9agb7n" + } + }, + { + "ename": "ob-p5js", + "commit": "7df9edede9c67c88acbd446742960cd5d75bdd3d", + "sha256": "1iglav8iii01xgv05q35xl82vljqcihfxgxcjcdr52abfbbvsn48", + "fetcher": "github", + "repo": "alejandrogallo/ob-p5js", + "unstable": { + "version": [ + 20230103, + 1356 + ], + "commit": "c9f89c8b588cdb0c021a875b8f9fc91be7e39de8", + "sha256": "0rs8c4dlxawm4sclgrc2bi6z43dhalbac91hgxa7kw6vssfgibbp" + } + }, + { "ename": "ob-php", "commit": "efb4e6d8540e6ca38c3aa0997116f5995ba1ea83", "sha256": "09j53drzi2pkfzpjasmpfijsdlirh919vkg9yv9nhls2x3vgmrjb", @@ -78535,8 +79713,8 @@ }, { "ename": "ob-sagemath", - "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", - "sha256": "1xb8s4xm9wzfpdlhj5rym2lh4naz3h13v4sjqh71zxw6hy82gba3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "099crpv8367zhzrm7wxwbwinr9k97ngh6xmhf84zq44l22y5x65n", "fetcher": "github", "repo": "sagemath/ob-sagemath", "unstable": { @@ -78736,15 +79914,15 @@ "repo": "xenodium/ob-swiftui", "unstable": { "version": [ - 20210618, - 856 + 20221231, + 1941 ], "deps": [ "org", "swift-mode" ], - "commit": "31cfe991eb171bb0d2f53cf621be1b9d91573ac3", - "sha256": "1l2n4ijf3sfgj05xzvnb1cd9k24ynh2cg36yj386bq7kadamympc" + "commit": "0b453efeb8310311d7f722a0f2dce41c14d4090e", + "sha256": "0y6yafam7zdhc89c4q76ipb8jmlw9rhvps4zp6l0wppdkyb520yf" } }, { @@ -78950,11 +80128,11 @@ "repo": "ideasman42/emacs-theme-oblivion", "unstable": { "version": [ - 20221029, - 2302 + 20230112, + 636 ], - "commit": "a86b744d3baa4b6888e36d9109675853e0b3b9b8", - "sha256": "0zjzjp3g38kcp0x5imyk09pn4qylzzxrdj6b6h27jiff08jcbi3w" + "commit": "751687dd6163593fca2b21bb06a75ac2597de055", + "sha256": "124zsjcy3bs68gdcwqb0x7qhhz6lk1pvhaq11yskgyik7ig1ydzi" } }, { @@ -78965,8 +80143,8 @@ "repo": "licht1stein/obsidian.el", "unstable": { "version": [ - 20221115, - 1143 + 20221228, + 1142 ], "deps": [ "dash", @@ -78975,14 +80153,14 @@ "s", "yaml" ], - "commit": "95bf7624e26adb29925e4609dd0aeacdb29c5bc5", - "sha256": "17ymp9z735cisb7bjdcmqmhv88n2vhzg3l7708jcj6a588i3sbf3" + "commit": "d9fdc5e2b7ee6602ac99511d670a382c5586f14c", + "sha256": "0h3503m4qygjshzmhijs9agpfgf1xyp412bp77sgpijyspln9mpn" }, "stable": { "version": [ 1, 1, - 9 + 10 ], "deps": [ "dash", @@ -78991,8 +80169,8 @@ "s", "yaml" ], - "commit": "95bf7624e26adb29925e4609dd0aeacdb29c5bc5", - "sha256": "17ymp9z735cisb7bjdcmqmhv88n2vhzg3l7708jcj6a588i3sbf3" + "commit": "d9fdc5e2b7ee6602ac99511d670a382c5586f14c", + "sha256": "0h3503m4qygjshzmhijs9agpfgf1xyp412bp77sgpijyspln9mpn" } }, { @@ -79018,11 +80196,11 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20220707, - 751 + 20220718, + 1147 ], - "commit": "384bdf4327a25a1b47f5b24dfe7d9706750396fc", - "sha256": "0ib0jf4k94qsbll2rwa3h8psg60m4n7dlfy5rvz1afk9mv2vvazv" + "commit": "86938aa4435b251af1a3b081f7fbed90f982cf62", + "sha256": "0y1j5mwwrliy6a78cmpi6j8gw425shghqg9ylyl3qw5fx4b088pp" }, "stable": { "version": [ @@ -79096,8 +80274,8 @@ }, { "ename": "ocodo-svg-modelines", - "commit": "5b9651865f4f8009c9b31fa1e5561de97a5ad8de", - "sha256": "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1j9cvs9wr71jgg51f8cbx8v5qnwvm8kk6jsgkydi7lwb042xs4vn", "fetcher": "github", "repo": "ocodo/ocodo-svg-modelines", "unstable": { @@ -79209,32 +80387,32 @@ }, { "ename": "oer-reveal", - "commit": "7c4e4d7c68548415413d4ad972b2c804e7d867f8", - "sha256": "04rwyhq500c8wcgfhg2xmb246az9sc6s2y45ichxhvvhvqgxjib3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0bhcqgq8jv7rxwllpjksibp1zi4wvb2cavgj8gsl1fv6x57w822r", "fetcher": "gitlab", "repo": "oer/oer-reveal", "unstable": { "version": [ - 20221005, - 1718 + 20221229, + 727 ], "deps": [ "org-re-reveal" ], - "commit": "a5a292c5a5f3757e01bdd13bbd57bbf7b55bda0b", - "sha256": "1b3anr0mm9ikk0sjckhm77ih5ahf40wpgjf3n7zax632a70aaq0k" + "commit": "a2dde292e464bfb9b4d8ab470bb9a6a37b5cb6b9", + "sha256": "0nr63m4wka7q48hll0fhq8ijw7dw6g7m80r81xn62yfd7j7mfwk4" }, "stable": { "version": [ 4, - 8, - 0 + 10, + 2 ], "deps": [ "org-re-reveal" ], - "commit": "a5a292c5a5f3757e01bdd13bbd57bbf7b55bda0b", - "sha256": "1b3anr0mm9ikk0sjckhm77ih5ahf40wpgjf3n7zax632a70aaq0k" + "commit": "68c3b97812a638b63e846c788041ec9cda129e53", + "sha256": "0nr63m4wka7q48hll0fhq8ijw7dw6g7m80r81xn62yfd7j7mfwk4" } }, { @@ -79267,14 +80445,14 @@ "repo": "conao3/oj.el", "unstable": { "version": [ - 20200811, - 517 + 20230212, + 148 ], "deps": [ "quickrun" ], - "commit": "2dd65324ac9833e07eaed5fb04acebafc6d5cbd2", - "sha256": "00lxjl1i6kcvj9lym2m59xb5hrx2gcdpvsvq972d8iczp2jmcfxr" + "commit": "6d586cb108c642bc166c64df113e03193f4d1495", + "sha256": "0xjm365zd6jiv3aqa2cknb7b813d6pq854qj73hkffkp6dm0yxih" } }, { @@ -79285,16 +80463,16 @@ "repo": "tarsius/ol-notmuch", "unstable": { "version": [ - 20220428, - 1337 + 20230212, + 2013 ], "deps": [ "compat", "notmuch", "org" ], - "commit": "744399e054ef3a19f66418fdb98ef9ad139cc3b5", - "sha256": "0mxhnh64arm8dlna88ml9x9grm0v4fh1zbk1pfav957fxwx9l9dm" + "commit": "ee3646627e47312a0c6ab0a5f6eba3baf8b20cb6", + "sha256": "0522szjhl61a5sgq1gnv71swnznz72m0dsws0cb061p3n4k4cnmw" }, "stable": { "version": [ @@ -79311,6 +80489,24 @@ } }, { + "ename": "ol-tmsu", + "commit": "0d546d03d27303217a083f1a18f21098d5102387", + "sha256": "0cqb77impg5c51hincl65w72242qw89hjnmv6l8ink0zb4f2rr15", + "fetcher": "github", + "repo": "vifon/tmsu.el", + "unstable": { + "version": [ + 20230207, + 1457 + ], + "deps": [ + "tmsu" + ], + "commit": "9672d193a51f2848696445528de757aa21b2b686", + "sha256": "04xx7kbhfvh0m3ghgs6cngrzsz6dl5a0w3fyfqs1ypvnsgbnpv17" + } + }, + { "ename": "olc", "commit": "1e21abd021d72c491ed1503146c51761e18c56c4", "sha256": "0kcqwnhhy5wa0r61yqg9gly9jd6b1846q2w43fmhzk3l4nzky32r", @@ -79620,8 +80816,8 @@ }, { "ename": "omtose-phellack-theme", - "commit": "478b1e07ed9010408c12598640ec8d154f9eb18d", - "sha256": "0aj0sw611w13xryn762ws63dfalczxixa5rv3skglmfy9axg3v3b", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0bc7cdxycginrzhimfi5nz9mp78rjdxsz42d340gmqb8h5k6ysp9", "fetcher": "github", "repo": "franksn/omtose-phellack-theme", "unstable": { @@ -79741,8 +80937,8 @@ }, { "ename": "open-in-msvs", - "commit": "09a462fac31a7ceda4ee84a8550ff1db6d11140f", - "sha256": "0cng0brxjdriyhwsbn85pfrgqg56chzk24lvkx91rzgz15fbpnv5", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0q2rscnw9hzlh37i4v2h5f3kpmkdbl6wlrxh7wz13jfn5xdj6420", "fetcher": "github", "repo": "evgeny-panasyuk/open-in-msvs.el", "unstable": { @@ -79822,8 +81018,8 @@ "cl-lib", "request" ], - "commit": "ab75048b1073fb1b1452dabae94ab55e0cfb57c4", - "sha256": "00kh8m23jzwb0wipwjdm2wad08xqrlcg00vzc4vzijgrapz0da3h" + "commit": "c384f67278046fdcd220275fdd212ab85672cbeb", + "sha256": "0gci909a2rbx5i8dyzyrcddwdic7nvpk6y6djvn521yaag4sq87h" }, "stable": { "version": [ @@ -80008,19 +81204,19 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20221113, - 1719 + 20230219, + 1648 ], - "commit": "2debd96da6f75703ccbca6d852ad994ce84fa529", - "sha256": "0ppwlp6a105m5ic5k2xgxz4c5wwsq025vhclzgvbnk73lmmg2c0v" + "commit": "e6784026717a8a6a7dcd0bf31fd3414f148c542e", + "sha256": "0rd6ajsjqjbfkxnbfnbpacwwwka5z49l2am54rpk0w49jk8gsidm" }, "stable": { "version": [ - 0, - 7 + 1, + 0 ], - "commit": "92008e762b30cb445a2227e458cbb9a5e1b1d4e8", - "sha256": "0m9nyz80j0qnn14drbgk8vn5yr7sv0z6yiz8w95ahcw2qwlgyjs7" + "commit": "847694e78c12d903d5e3f6cb365a5d3b984db537", + "sha256": "1jmwyici90v82gqjq44n0scrwhmg05pi9yplkn4bpss80c83dxp4" } }, { @@ -80170,30 +81366,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20220817, - 655 + 20230117, + 727 ], "deps": [ "dash", "promise", "request" ], - "commit": "4ed63cbebb35d7427d92652df209b0450655e5ac", - "sha256": "0zsrvkp4cp65yzqhhx5bzj6bskrjwzvgnsf9nxpf0m0wdcpqxvv6" + "commit": "f10feec7bd70916808a3cd8b4c3e3c7f65764acf", + "sha256": "0k1yhicja53qnnd0498pj6lp06pd47ph0h39qjvgb95w8qzng6nn" }, "stable": { "version": [ - 1, + 3, 0, - 5 + 0 ], "deps": [ "dash", "promise", "request" ], - "commit": "4ed63cbebb35d7427d92652df209b0450655e5ac", - "sha256": "0zsrvkp4cp65yzqhhx5bzj6bskrjwzvgnsf9nxpf0m0wdcpqxvv6" + "commit": "f10feec7bd70916808a3cd8b4c3e3c7f65764acf", + "sha256": "0k1yhicja53qnnd0498pj6lp06pd47ph0h39qjvgb95w8qzng6nn" } }, { @@ -80497,14 +81693,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20210706, - 1519 + 20230217, + 1908 ], "deps": [ "org" ], - "commit": "46ca9f766322cff31279ecdf02251ff24a0e9431", - "sha256": "0bj08f5mg9v0xm2awbv1fxv98jj9scvqss6fmw0lzix6s3112z25" + "commit": "2bad7732aae1a3051e2a14de2e30f970bbe43c25", + "sha256": "03g9khz168pl23q3l822ri0h2605nrq6b0vxl5278lmpcwxbqf93" } }, { @@ -80539,14 +81735,29 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20200510, - 2030 + 20230205, + 2235 ], "deps": [ "org" ], - "commit": "8569941a0a5a9393ba51afc8923fd7b77b73fa7a", - "sha256": "05lgxqaffnqaqnzl24frafdkskran88hl2ml05qvyjhs4jjbgw9g" + "commit": "cc1b820773ccab9e3d8f584e96c14cdbb22cdb16", + "sha256": "0ffpnpn4x8g41k3clc5i5jfdxpxr8nyq44pzq5xqwpc8472h0jk8" + } + }, + { + "ename": "org-calibre-notes", + "commit": "5596b73bc4e8a61d90fa8e306d52983d17bab2d9", + "sha256": "0xcpf8c9m6bmshds5xjxg119zz5slpwvvqywsb7r87j4w1yih4gy", + "fetcher": "github", + "repo": "bpanthi977/org-calibre-notes", + "unstable": { + "version": [ + 20221202, + 1657 + ], + "commit": "3120797ecbcb58827b91e3610e65579593d9a402", + "sha256": "0kamfmh2zkamzg72kw51p4cvj7p1bx3k8vk1dssv62r2kq7j349k" } }, { @@ -80566,8 +81777,8 @@ }, { "ename": "org-category-capture", - "commit": "6760daac1ef9d9d7ba07e2fc9668873020f901f1", - "sha256": "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1sl5kxnvzhd5xzfr75spyk9334n8njd253j653d9xky7ipl2fhdg", "fetcher": "github", "repo": "IvanMalison/org-projectile", "unstable": { @@ -80635,14 +81846,14 @@ "repo": "dfeich/org-clock-convenience", "unstable": { "version": [ - 20220515, - 849 + 20221124, + 2304 ], "deps": [ "org" ], - "commit": "9201db80862d144459f1316d571842f5389a47eb", - "sha256": "010wl014dh8sipfqnyasxy1rq5q726bgxm50v4fyqlqkpc6r07d2" + "commit": "9d21d3a5ba2f8656aa23b8cb557017440f1b74e8", + "sha256": "187mccgv555phchmbn8622l0why6qf7h0scwvncdzc37g8jkpdi2" } }, { @@ -80684,11 +81895,11 @@ "repo": "inickey/org-clock-reminder", "unstable": { "version": [ - 20211010, - 2139 + 20230217, + 728 ], - "commit": "9f9b88348ffbc6628f2286dcb4c064b520d0a638", - "sha256": "1dm1q2adgbdb3q0aqacd9nmqxb1dzsrc5gmz7ap2lf0g02b8nwqa" + "commit": "fd3d2ca9d5ca1a804c0e70193f89f650c69a8dc1", + "sha256": "119ad38hnj4i1wbsp9hkl5sa3s8z17aqly2y5ml37dbfid05w0ps" } }, { @@ -80761,14 +81972,14 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20220910, - 436 + 20221221, + 431 ], "deps": [ "org" ], - "commit": "217ba04c9d638067a6ccb0829cf1885f54c1d568", - "sha256": "0f0vjdvx0hffj2xvyrya8yfl77djmzmpxdxsx58ym4lmdvwyb6x3" + "commit": "bb4032eb12c20d34555a4e670f28696cf31a7b54", + "sha256": "149s34d4j68f8crp66xmscd22svwkar1a6zifznxlyhvszg0zl27" } }, { @@ -80828,15 +82039,15 @@ "unstable": { "version": [ 20210212, - 139 + 142 ], "deps": [ "dash", "s", "seq" ], - "commit": "bb3e28841ebc4b87a34a642a40662316234601c4", - "sha256": "11x26d4qq04yxncgllvsydaxm67fycbwxa1jmppf7918j8xcc9vw" + "commit": "e6149dcfbb6302d10109dd792fd0ffae7bfe2595", + "sha256": "129zdnz97h6px0yz0f0if4gw96zxmsg24xc8vg51crsazqqz8l3b" }, "stable": { "version": [ @@ -81284,8 +82495,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20221119, - 0 + 20221212, + 1817 ], "deps": [ "aio", @@ -81296,14 +82507,14 @@ "request", "request-deferred" ], - "commit": "86faad251d3109a900661d40001f214cf51bc635", - "sha256": "1ygl4c6x7h1wlwhh92b75wiqf5hkmi3q5j4q9klvicn2hb1hfgaa" + "commit": "9bb3720525ad1c45823abab8ce910dd1225e7dcd", + "sha256": "0b7i1xc21vsjcvbkakkgzhidnypc5anmb9mdkh9mab09d7kxkbc7" }, "stable": { "version": [ 0, 4, - 0 + 2 ], "deps": [ "aio", @@ -81314,8 +82525,8 @@ "request", "request-deferred" ], - "commit": "86faad251d3109a900661d40001f214cf51bc635", - "sha256": "1ygl4c6x7h1wlwhh92b75wiqf5hkmi3q5j4q9klvicn2hb1hfgaa" + "commit": "3cc48a989ac859a97d25964c28874317a6e1672a", + "sha256": "11whjprc6h7knapjg29wz85mw338mvmyjwcmdai65m25pplxr25i" } }, { @@ -81409,8 +82620,8 @@ "repo": "Trevoke/org-gtd.el", "unstable": { "version": [ - 20220213, - 41 + 20230221, + 1602 ], "deps": [ "f", @@ -81419,14 +82630,14 @@ "org-edna", "transient" ], - "commit": "4e0fcf9a440e463d395f8f37efe8f1e691ed07dc", - "sha256": "0672pcklp743k8fz39hwf1zxb7f1sywdjsm8d8ha8r6h2rjbyl6k" + "commit": "05689a73f9e4841818948e97ecec431b8ca39948", + "sha256": "0f7c799xnp8abk70my8yc6kpbyy48dmkzbzxf2hnakgdpnpkdgin" }, "stable": { "version": [ 2, - 0, - 0 + 3, + 1 ], "deps": [ "f", @@ -81435,8 +82646,23 @@ "org-edna", "transient" ], - "commit": "4e0fcf9a440e463d395f8f37efe8f1e691ed07dc", - "sha256": "0672pcklp743k8fz39hwf1zxb7f1sywdjsm8d8ha8r6h2rjbyl6k" + "commit": "ed8528d70c17471f24f6acb9ffc466fff5bee1d4", + "sha256": "0d9r7ywr0k03s12yj6nmi4n565klmm8l9k2s0rb0p98l3yn9r34x" + } + }, + { + "ename": "org-habit-stats", + "commit": "dd9fbd4b21685225c2dedafd7eee40fa58910cb1", + "sha256": "1qr60hlv4n4wrzri3n9i516lvksg6rrn0vyaa1hqj5fm9vs7al5s", + "fetcher": "github", + "repo": "ml729/org-habit-stats", + "unstable": { + "version": [ + 20230210, + 1859 + ], + "commit": "0e28b1c1ba330d7d07064a7272104f7e793be4ce", + "sha256": "0mybc4vghyicvn1gmnhw9ljny56cbhmyk21mia5q478pin6krscl" } }, { @@ -81527,6 +82753,39 @@ } }, { + "ename": "org-incoming", + "commit": "1f63ea5ac2c7ce864172effa33ea8387095f23f4", + "sha256": "05cxa22vj8rm4xy57scwcgkrypjbc0c5zh9127c35pmqzab3wbad", + "fetcher": "github", + "repo": "tinloaf/org-incoming", + "unstable": { + "version": [ + 20230209, + 1509 + ], + "deps": [ + "dash", + "datetime", + "s" + ], + "commit": "5c5a5cc034a0b9ed808e5cbbf4876d489a6c7d28", + "sha256": "0fr1q5i29irxdng3b3r854sap66mhdrccb7i5w6vdkgvqdnp8dwn" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "dash", + "datetime", + "s" + ], + "commit": "0eca164ebc45eb85962eef092f72151e8090d348", + "sha256": "13vdclmjfayhypw4wzzr2yahvrai64i8k9qwiq8zpdqwdc0mi3h2" + } + }, + { "ename": "org-index", "commit": "35763febad20f29320d459394f810668db6c3353", "sha256": "092q92hwvknwm3v2shp8dm59qdamfivx9z9v23msysy7x2mhg98f", @@ -81534,30 +82793,30 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20220801, - 928 + 20230103, + 1720 ], "deps": [ "dash", "org", "s" ], - "commit": "9ca02c4e7a38c788b70a1f5364ab505695335bd3", - "sha256": "0j7c775vx9a25qh3485xlnd3j070cq4d9yyrlq1d6j5r6i5iwhjj" + "commit": "d919b9e2ef8c0f814455b82ffea080e872b89c72", + "sha256": "0191fph92aizhvydx3viswqmq6b2cc7x5wwnwifkgmw05lra5z6s" }, "stable": { "version": [ 7, 4, - 2 + 4 ], "deps": [ "dash", "org", "s" ], - "commit": "7bc78ebf7c1c334e8cc73af44793a7eaffb66a99", - "sha256": "0g1ahvsn50kr79q9bbrmgf78j1wfcibjp0j57qv7kxiqc71s7s19" + "commit": "d919b9e2ef8c0f814455b82ffea080e872b89c72", + "sha256": "0191fph92aizhvydx3viswqmq6b2cc7x5wwnwifkgmw05lra5z6s" } }, { @@ -81620,8 +82879,8 @@ }, { "ename": "org-iv", - "commit": "e7db0c34f0f6fb9c3b9e581a74304cc9a26ed342", - "sha256": "1akhabp6mdw1h7zms6ahlfvwizl07fwsizwxpdzi4viggfccsfwx", + "commit": "56c38111ad4b7e9f015122ff3151e15cfefff274", + "sha256": "1nphccwfl87yz72vj7xf8g4xn8zp7m9p8a35bi7cjz89hk5whx2b", "fetcher": "github", "repo": "kuangdash/org-iv", "unstable": { @@ -81639,6 +82898,25 @@ } }, { + "ename": "org-ivy-search", + "commit": "fbc5475f597b5456a35dd864936588b0444f33fa", + "sha256": "0bwbm3cf8dcv49spfq2l8jmgf8szn37ms7vlckj8akgfiii457p4", + "fetcher": "github", + "repo": "beacoder/org-ivy-search", + "unstable": { + "version": [ + 20230220, + 812 + ], + "deps": [ + "ivy", + "org" + ], + "commit": "e7170ff613734f24edace3309d69e23ef73f4b0f", + "sha256": "0sp6qpzj69n1hir9widxdbhz3781ld5hg1h98s23v1lqqxa6ddk9" + } + }, + { "ename": "org-jira", "commit": "e0a2fae6eecb6b4b36fe97ad99691e2c5456586f", "sha256": "1sbypbz00ki222zpm47yplyprx7h2q076b3l07qfilk0sr8kf4ql", @@ -81680,14 +82958,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20220920, - 1514 + 20230109, + 1217 ], "deps": [ "org" ], - "commit": "1ea9e3b672ed384922ede6af96598446f3691873", - "sha256": "0qkdy6vf9pallr21hz9blj1ac08i5q832rz9fr0gajizadf4g3b1" + "commit": "c84f1a771933d662695c20b73832a6415b7d3603", + "sha256": "0djypcb09iwx42mrnwq3nr381qmz0ssavwmsvzmq4rfpdj3gh5ly" }, "stable": { "version": [ @@ -81725,16 +83003,16 @@ "repo": "SqrtMinusOne/org-journal-tags", "unstable": { "version": [ - 20220815, - 1604 + 20230105, + 1937 ], "deps": [ "magit-section", "org-journal", "transient" ], - "commit": "c7db858aef69501b2878a7c2aed4ad0447842b4e", - "sha256": "142wrq9k494aks4lxbq80pkm39nqkbdpfw69mlh33skmwvsfzzsf" + "commit": "dfb3b2d583ceb7ad9fbc8ac23ab6316ae172e9fb", + "sha256": "0nfk2kb0jii0v51al115n9i13dp6mw2964d2plgbxdd7yqwhwkrj" }, "stable": { "version": [ @@ -81827,20 +83105,20 @@ }, { "ename": "org-link-beautify", - "commit": "acd9bcc86c90e507fcd76f16e7ab57d64114f8b4", - "sha256": "1k1rczs3w3cxh9fryd1qr1dnr5v2hhxad1vcyjrqvyqpbm1dqnlh", + "commit": "2cbc9e1af903ffc900be7ec0ed1050ae9ad81011", + "sha256": "1h4ppxc9giii3rg5hvpf2dm4c9w0wwd56ivmqyx0q4b9fi69lswa", "fetcher": "git", "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20221117, - 1124 + 20230221, + 1311 ], "deps": [ "all-the-icons" ], - "commit": "f4d9c343c75dc0bbda5375d5315cdee8c819a61e", - "sha256": "0vxw5f8fcx6n6gkmzxh0vd0gmpzjaczsa3a9ig1hxz6zw46q1vzi" + "commit": "370535e4259888f686cb6cedcabb79c5b389e6bb", + "sha256": "113q1axrhl1y5lq5pf799nlh0i7vinrikphb90fwmx35y0gkpgj7" } }, { @@ -82080,19 +83358,19 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20221020, - 749 + 20230215, + 718 ], - "commit": "59b2e3c94756b4e37b2cf7b9f81028c6d4758672", - "sha256": "1n5csrj560crc66iqpfsx60055cgzh817v169s6jqkqzrzdigzvy" + "commit": "42fdbd2d27f5a8652593577a200eeea96555d018", + "sha256": "09i85yfg8knkf3z2yrx2wzj1fqsy8f8hxz184zjdacaj4xygpzj6" }, "stable": { "version": [ 0, - 5 + 8 ], - "commit": "ed9d67d00f26148019acd67b4aac0e26360a33b1", - "sha256": "1gny2p3w6ck5sarv6vap2y1lj6h9qaxbh7r7bzszb9qj8rhapk6q" + "commit": "42fdbd2d27f5a8652593577a200eeea96555d018", + "sha256": "09i85yfg8knkf3z2yrx2wzj1fqsy8f8hxz184zjdacaj4xygpzj6" } }, { @@ -82127,6 +83405,24 @@ } }, { + "ename": "org-mpv-notes", + "commit": "65be49ab5f7680f4b65b657d62c4de337425484e", + "sha256": "0rd91dc19b38q0s4vgsa0habg1par395b8kwyv4qb1vl64f7zblp", + "fetcher": "github", + "repo": "bpanthi977/org-mpv-notes", + "unstable": { + "version": [ + 20221202, + 1657 + ], + "deps": [ + "mpv" + ], + "commit": "8c123996044cfb87101da6c5f16634188f019cca", + "sha256": "1nr4n74c5l2azgyv3w828g6n8p3bjfrs8s6b37j87v9vscc24mic" + } + }, + { "ename": "org-mru-clock", "commit": "b36bf1c1faa4d7e38254416a293e56af96214136", "sha256": "1arww5x6vdyyn1bwxry91w88phbr9l6nk8xxrw40iqmmbhggahgm", @@ -82134,11 +83430,11 @@ "repo": "unhammer/org-mru-clock", "unstable": { "version": [ - 20220902, - 654 + 20230104, + 1922 ], - "commit": "2d3374a1b758a04f08f75b2a5fe05e99989077c1", - "sha256": "0kcbfs334rkr337kqdds5wpjzs7g1jl36avw6mf4q5iajc8z0pvm" + "commit": "be90bc9084b384d8a728d68f69da09171ca26d3c", + "sha256": "0ssbfq12g85i41p5wp84ii6wd10sjhf96fcvdn16g3vvi2nj8f2h" }, "stable": { "version": [ @@ -82158,14 +83454,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20220809, - 1736 + 20230127, + 520 ], "deps": [ "htmlize" ], - "commit": "e0174324ac37a63ed36869c7632dd7139f1b2419", - "sha256": "1ks5hcadgzaa81ii71flnna8kbchk8x3kf7dz3h31yk95hx3jjf8" + "commit": "7b1dfb96d558f6e5626e96d4f4a5150d55cb7eb2", + "sha256": "0dvq8dg8ga6bx9kd4bk5im87nmwkac6h0pcxyvcm2pk60id8xar7" } }, { @@ -82401,8 +83697,8 @@ }, { "ename": "org-page", - "commit": "80c4f9e9f3e398dd6d230068ae2a42b060bd84cd", - "sha256": "0pf7rjdaiz9y1kr8sc3bb2bz3bzmd4msziya5h4cfkmzx6pq8a3n", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0a3ijqaiw6m8sbf3hpzfnbsgfv8ian71jfqi1a5i22phk8w86zv6", "fetcher": "github", "repo": "emacsorphanage/org-page", "unstable": { @@ -82664,8 +83960,8 @@ }, { "ename": "org-projectile-helm", - "commit": "6760daac1ef9d9d7ba07e2fc9668873020f901f1", - "sha256": "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1zs3f4g5pn2l1gz1yfbbldm6d8ypzn8581ppgzbw3mvhcxxz23bj", "fetcher": "github", "repo": "IvanMalison/org-projectile", "unstable": { @@ -82728,8 +84024,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20221007, - 2334 + 20221225, + 2351 ], "deps": [ "dash", @@ -82743,8 +84039,8 @@ "transient", "ts" ], - "commit": "5f70636556bffca92d8ef8297ba3002a4ab5b52d", - "sha256": "1fyqsl8ybx3x413p04cywzj0gdwwpidqw1ja2433ij21vvmph1vj" + "commit": "29533525c39e0e243912bb3c807412e4bc3e804e", + "sha256": "01zc2mrlr197r0h2xjgzg88fy74lqbw0hv60jw08ihs0yw7n56y7" }, "stable": { "version": [ @@ -82859,28 +84155,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20221007, - 1714 + 20230220, + 848 ], "deps": [ "htmlize", "org" ], - "commit": "941aa4b94f4eb13cea23013126e84f335059dead", - "sha256": "1jzr7xlzinhfb0197anbkrr5zrs13f7kyznr5q3zyxdndhg6a53n" + "commit": "611d6bd1f66eedf5ee2590426990efd4ca990076", + "sha256": "1l8qjzijgbjzy4skhy9n0z05bczqlyh9lxwsd98f83mv956ghbkd" }, "stable": { "version": [ 3, - 16, - 1 + 17, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "941aa4b94f4eb13cea23013126e84f335059dead", - "sha256": "1jzr7xlzinhfb0197anbkrr5zrs13f7kyznr5q3zyxdndhg6a53n" + "commit": "91cdd82c47b86990b5eb41fe34446a042194cc83", + "sha256": "1bp3kz2awy2mizs59qsa2yl7wfa0197fklnramzifz6z2zv5kbrx" } }, { @@ -82985,31 +84281,34 @@ }, { "ename": "org-recur", - "commit": "cbdf8c9a3c7c289ce13542a12769a7f3d7f53d72", - "sha256": "0qlpwia2dg4l00jahc3si0mi27gv6zlvkbdx0rq37dh61dabgkiq", + "commit": "9801e3d79078edc2210bbf7d8091b3273fb67408", + "sha256": "12rh3qpjdcar2m473fi61i3l4k20sr7iq8p731k9vzm5888dl0sr", "fetcher": "github", - "repo": "m-cat/org-recur", + "repo": "mrcnski/org-recur", "unstable": { "version": [ - 20211007, - 238 + 20230124, + 1532 ], "deps": [ + "dash", "org" ], - "commit": "093c1726ffe4358d60fbb97c1bcf01b785827098", - "sha256": "004g7av1dx3i25lr0r33dd2ch4i9r5mcgjh7gjm6rj6nbyh1gqhb" + "commit": "628099883a63d219f76cd9631cc914fe6ec8a3e3", + "sha256": "0s2n62y3qc72ldzpaq2jz9335h532s566499n346nx21l4qsqdz6" }, "stable": { "version": [ 1, + 3, 3 ], "deps": [ + "dash", "org" ], - "commit": "093c1726ffe4358d60fbb97c1bcf01b785827098", - "sha256": "004g7av1dx3i25lr0r33dd2ch4i9r5mcgjh7gjm6rj6nbyh1gqhb" + "commit": "628099883a63d219f76cd9631cc914fe6ec8a3e3", + "sha256": "0s2n62y3qc72ldzpaq2jz9335h532s566499n346nx21l4qsqdz6" } }, { @@ -83035,8 +84334,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20221015, - 1308 + 20230131, + 1743 ], "deps": [ "avy", @@ -83051,8 +84350,8 @@ "parsebib", "s" ], - "commit": "25fddfc5c4d700cba4600ae114a8c12603ae1649", - "sha256": "01rd5acrn7s5ihqzh1fqzciflj1mhdqcgykqfiwcsrm31kmzwm83" + "commit": "4c691f7b4cafbd9bf8c9608fe9d590f7c4894d67", + "sha256": "01yym610ffmf38vp3m3h9vc00y9gfx46pn83js6zwksq2rf6n96l" }, "stable": { "version": [ @@ -83128,28 +84427,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20221119, - 1134 + 20221203, + 259 ], "deps": [ "dash", "org" ], - "commit": "b6d6b7179019e87b13dfdfeef28037821ed4d01f", - "sha256": "0yibkc1mh8z15lpjws92d71d8vxr6svcbdnlxi9rpr1c108vqqkg" + "commit": "fca95cd22ed29653f3217034c71ec0ab0a7c7734", + "sha256": "15jymjfdsmbcr5l03c605kbi68afcnwandhpgkcn912add9iqczr" }, "stable": { "version": [ 0, 4, - 1 + 2 ], "deps": [ "dash", "org" ], - "commit": "f1fcb0c6391f8e38c94a18f7c2a19124196e4862", - "sha256": "07yv157ci814ndzwrynmys80w5iiq9k43qvv4hajn5x7c467vm97" + "commit": "6e5240f54423a3b98167e2fb7bbe51a1f15b7f75", + "sha256": "09xvkw2h7i702wr4k5zqcd91sc4jwqzawwqsxf13qiwdm4kfxfk8" } }, { @@ -83160,11 +84459,11 @@ "repo": "brabalan/org-review", "unstable": { "version": [ - 20220411, - 1205 + 20230119, + 1706 ], - "commit": "466f7d8f183f226f1e665cf806cb094471903d9c", - "sha256": "122l2n1qz5qps3jphimp1dd743ckbqcvnjdwc5zcdzp9x70yy3nh" + "commit": "77211e40db8a9558b866f5660c7127922b459e6c", + "sha256": "1izm9aj8cqni8sjsxmlk5bbl4nn90476pa339jfxh812v5will1y" } }, { @@ -83199,8 +84498,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220908, - 1625 + 20221231, + 2122 ], "deps": [ "dash", @@ -83209,8 +84508,8 @@ "magit-section", "org" ], - "commit": "d95d25615e69e7cc847641800c1886366336c97e", - "sha256": "0k9wfmjpkzbzsqd4npn8vxs0xch42glnmmh28a55rzkyc2bh8n1r" + "commit": "74422df546a515bc984c2f3d3a681c09d6f43916", + "sha256": "0vhl69y6yk2zzfixjdwr8vxl2k921h0syshk5123r1nm9jp3i1s9" }, "stable": { "version": [ @@ -83237,15 +84536,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20221104, - 2139 + 20230201, + 1834 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "3810ddcd9d69ab27a40d5ba88b553df8db1b4884", - "sha256": "0l22sdq5gg8ih9ir6djd1yfql3yy00c24g2sjyxhswsv83q6j2k8" + "commit": "c87acc2d5685ba2608e2bd1f128e723f1de9d837", + "sha256": "15a9b8b7xqrjyqbddqb05b1fqf2xcwxqfj9hfjvkqzk9rwgz3sir" }, "stable": { "version": [ @@ -83340,11 +84639,11 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20220512, - 1927 + 20230120, + 140 ], - "commit": "d60aac9519e15fde8b2dc1de08e90856d5e02b42", - "sha256": "0m9j3nmki0cn8i19d8z14f5wc7c353n3j6g9k5fhd85abw5mjphx" + "commit": "be8218d66493c122a60049ff5e6bd41abfaabbd8", + "sha256": "0m0myd3akf61lng518s6i9mgy01g2xrw0lmmina40l2fc8nwzwd6" }, "stable": { "version": [ @@ -83582,15 +84881,15 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20201202, - 144 + 20220326, + 1106 ], "deps": [ "org-starter", "swiper" ], - "commit": "9a394099e42dff255ec1609e2b1358d32c7ca4de", - "sha256": "04szyrr7vadwmh4g0qphw5m3wm3cclif1xipddwxf6ygs941x6dm" + "commit": "cd9c5c0402de941299d1c8901f26a8f24d755022", + "sha256": "07z17r2ny9m4cddr87v636vgvcfgv1j5qkvhckms0xnfh9wcs9j3" }, "stable": { "version": [ @@ -83614,11 +84913,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20221024, - 605 + 20230204, + 1000 ], - "commit": "f830e027986df120be4f199f4f36b8f2948f3247", - "sha256": "1vz9zjwk3m03yvx28p14jx0a075wc2b11xilldsaqvq8srijim16" + "commit": "99ee0c8261267a89708e3a9dd0e0d865e894f96e", + "sha256": "00xcyarsg2pmsr1085yrq75s7n7llc2dinzy8qlgw1xxkxb2b55r" }, "stable": { "version": [ @@ -83704,14 +85003,14 @@ "repo": "integral-dw/org-superstar-mode", "unstable": { "version": [ - 20210915, - 1934 + 20230116, + 1358 ], "deps": [ "org" ], - "commit": "03be6c0a3081c46a59b108deb8479ee24a6d86c0", - "sha256": "0w97xqvbgh57227qq750b8rxlkkdd61j9frz7wc9f9x1mya305j2" + "commit": "29dbbc48ac925f36cc1636b36b4a3ccb3588e17f", + "sha256": "0bk7c1hlkdrfhah18i13yi3819m4wv5b5lwpnyg292b4k25p39nj" }, "stable": { "version": [ @@ -83854,15 +85153,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20221031, - 326 + 20221211, + 941 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "1c0600d10e513aebd6a991d0acde9ccea4122909", - "sha256": "1gkc3d6xgaimlxcw3bw2zgyi290z379vlqm0md8lc1jzay7xzls7" + "commit": "5eb75d86c143c1801c71b54fe0da832affc3adc3", + "sha256": "17hq54v6f1b4cbjf9dsxq7f72ls5bal8lmhfjd27kkbhj2h5ky1w" } }, { @@ -83916,8 +85215,8 @@ }, { "ename": "org-tfl", - "commit": "d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf", - "sha256": "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "05rxa0anf1kv2akidjdvdr1kkzah37ji3ywxfxkzvx2dkjb3by1i", "fetcher": "github", "repo": "storax/org-tfl", "unstable": { @@ -84335,11 +85634,11 @@ "repo": "amno1/org-view-mode", "unstable": { "version": [ - 20220218, - 2106 + 20221208, + 327 ], - "commit": "7061ae94d20b6a047f424f35dc3d229824bfd60f", - "sha256": "1vbcx61qrplcmvara8y1nssdkxwzrqln7i5nlba0rl9b4prhwkia" + "commit": "014f96acb7093ffae93c62aabff750e63c3babc5", + "sha256": "1m9jv6nssf2nqkav8nx1748wwc8i5338bc2brxlqajcy4dcz3fbg" } }, { @@ -84351,10 +85650,10 @@ "unstable": { "version": [ 20220929, - 1407 + 1415 ], - "commit": "71d57ca126ccb5441b87aa052903fa6ad59b62f3", - "sha256": "1xl9v42isszx6svdnsnlfs5ksczyzwh14bzh5szkw041gfmy9k0r" + "commit": "afa4b6f8ff274df87eb11f1afd0321084a45a2ab", + "sha256": "125db5gyyc4xyrr0n06ch5rrai3zcxbr3rm3i3b5gyki8wjw0ydk" }, "stable": { "version": [ @@ -84427,16 +85726,16 @@ "repo": "akhramov/org-wild-notifier.el", "unstable": { "version": [ - 20221107, - 1009 + 20230211, + 2354 ], "deps": [ "alert", "async", "dash" ], - "commit": "544df8a78090411479495494f9de724c350649ac", - "sha256": "1xwx3q18kl5za2qzq596v1ibhggnrmn7b3r8sd77c7kffjd8k6ib" + "commit": "4bbf7e90886122b1320ee793a00ef6a27a797c25", + "sha256": "07fnpzsasdvpb30qbg45nby9nnxjr3jyxhdwlywayb55cbmd2b38" }, "stable": { "version": [ @@ -84512,32 +85811,32 @@ }, { "ename": "org-zettelkasten", - "commit": "ed12df24029a4154fe55588f3e8ca0670af3f5f3", - "sha256": "1fhjbg3jjcinnja96fzcsxnjxg0x4vnsw84g1q63c325sv4xv2mw", - "fetcher": "github", - "repo": "ymherklotz/emacs-zettelkasten", + "commit": "e5b341b5faae8c563c2a18010f410f3552b17c39", + "sha256": "023pdv194pfbaslvgjw2j64zsp4hrgh79ldivd0ksadd9alp296c", + "fetcher": "sourcehut", + "repo": "ymherklotz/org-zettelkasten", "unstable": { "version": [ - 20220819, - 2335 + 20230108, + 1326 ], "deps": [ "org" ], - "commit": "c1f3ca9368a43638de7a0e78a0dceaa0f8943c37", - "sha256": "0ii50lxmvgz48knfq42da9w9wpnxk120vkna5sq1f296y6sn9z35" + "commit": "8002c96d94cb89a0f5af03974f6d1eaea45e1e41", + "sha256": "1j9iqpx88gkhc6nb1fvn3ri5qzakfc77q7vvkaagsda2gphabf7i" }, "stable": { "version": [ 0, - 5, + 7, 0 ], "deps": [ "org" ], - "commit": "f470db20ad0a7e591daa73c903524ac267ae7236", - "sha256": "0xjhcc4xsfgp55mr73cv7nhl3a8ccy1khsnsvrwfbxnhxxi40pnr" + "commit": "e8a4d435e1d33344a1be192b6816a67394d91307", + "sha256": "0rx3sv3hg5f9b18nr3yiqd5zbmf778qa0fm2l5nzsgb4zlrhm6vp" } }, { @@ -84548,8 +85847,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20221118, - 536 + 20230113, + 309 ], "deps": [ "htmlize", @@ -84558,8 +85857,8 @@ "writegood-mode", "xml-rpc" ], - "commit": "0d435af91c237351f0880536cb3cf21a91041ba4", - "sha256": "1h2i63b7615kdn7d8bfhpn8c5ml17vf9lj7cyz4bhgrd8jdsrm71" + "commit": "1b2c10d1332390750e76a140b8c55f884ae1b3c4", + "sha256": "1yn7kvl5y2ykydkwblp23r50qzwcmkppzkfj2sf2zajdyrrw6qx0" }, "stable": { "version": [ @@ -84716,11 +86015,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20201216, - 2240 + 20230121, + 1815 ], - "commit": "0ed99a9c0cf14be0a1f491518821f0e9b7e88b88", - "sha256": "1l70vvyv8walqjk96jgr8047fi0yiqz0lm3r0vh6xrh6phna5mcd" + "commit": "7ca93a1c42bba1bcced181bd8cc34cb57be39537", + "sha256": "1fa27522nb3jqswbii9qsi1csjqw5p6a7lsrylhw2vll8w9v4mma" } }, { @@ -84799,16 +86098,16 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20220425, - 1157 + 20230212, + 2013 ], "deps": [ "compat", "magit", "org" ], - "commit": "6dc4d4bfffd6c11550952203a51346b13e120165", - "sha256": "1xpkwp3qk2jr1rphrcxdmld498prh3cds12y2a9cln27yfg8lkql" + "commit": "fc40397f7b36fa513d41f3119b7430cb236de9dd", + "sha256": "0a2fmhs18d2f3xgksw4z8zf10k35xjz105ccl1h8gj79n0jgnkpf" }, "stable": { "version": [ @@ -84832,8 +86131,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20220422, - 1625 + 20230212, + 2013 ], "deps": [ "compat", @@ -84842,8 +86141,8 @@ "org", "orgit" ], - "commit": "0ffae0b325824372e5e6b1451e5e863e170cdef3", - "sha256": "0cbxz5hsyyl8p9zzgi9kinr0x9hjmwdj9fc5flw3c1ir8gwvmcrp" + "commit": "6f424ff3a2df7d9c00c217011949c1367cc15227", + "sha256": "1zym7mnqvh8rs7qpsy1yqjhlpz0xm1f73q18dnfz6r29nkkginx5" }, "stable": { "version": [ @@ -84869,16 +86168,16 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20220422, - 1626 + 20230212, + 2213 ], "deps": [ "compat", "org", "seq" ], - "commit": "6b2ac90af9f36e99aa2d4f56ffb237a80341beb8", - "sha256": "0qww8k9s7ra9bcjx7mw8vwm9llib8bcd98kl4nci7m2czmmr6asz" + "commit": "168d46a33476c4c8ce56818faa6183421b16d211", + "sha256": "0iyfn1px0svlr7ng7x6hh0ixyicvgi04jxd4vn6qy1524f9cga56" }, "stable": { "version": [ @@ -84941,19 +86240,20 @@ "repo": "tgbugs/orgstrap", "unstable": { "version": [ - 20220715, - 16 + 20230202, + 235 ], - "commit": "55ee428cd53c8de2a6b2a2ab32eb9f613a4617ec", - "sha256": "1f1r0mgq2bh07b7hj16qfh1s0mmyc2dfczaigjbaw8vhfc8lnvqg" + "commit": "3cf0fec936fc0dc72bd7bd970fa91d445e763af4", + "sha256": "1kljqbwjz102igpygijxnrs0cmiwn1xnyxn7fxqblfb1l7s29dkw" }, "stable": { "version": [ 1, - 5 + 5, + 3 ], - "commit": "55ee428cd53c8de2a6b2a2ab32eb9f613a4617ec", - "sha256": "1f1r0mgq2bh07b7hj16qfh1s0mmyc2dfczaigjbaw8vhfc8lnvqg" + "commit": "3cf0fec936fc0dc72bd7bd970fa91d445e763af4", + "sha256": "1kljqbwjz102igpygijxnrs0cmiwn1xnyxn7fxqblfb1l7s29dkw" } }, { @@ -84964,11 +86264,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20220928, - 1944 + 20230205, + 836 ], - "commit": "068973339af3714ea015501f0fcc35014f255c1a", - "sha256": "03h0g2pr1yxbvvp7bj0k00p16dp3g5h4jgqjp28d4pllcpfwspmy" + "commit": "4f9fcb4f7380b247d628b899135df23c8fc8b6f1", + "sha256": "1b17c8g3x5k94yn76cl1h40hf9hka3w3cfjyybmcnrm92mg8g1cw" } }, { @@ -84979,11 +86279,26 @@ "repo": "tbanel/orgtblasciiplot", "unstable": { "version": [ - 20200411, - 711 + 20230122, + 816 + ], + "commit": "4160128045b271bc1aef3d14dbf0c5b53ae58bd2", + "sha256": "1zhhppk05av94i77s16mrjbbc55gvcsm8sk6l7rdfrsfaislabmw" + } + }, + { + "ename": "orgtbl-fit", + "commit": "0c6b5087c69dbf444ebc6a0f56c44d7943ea673a", + "sha256": "05qhkgjv719cl96a6vhiwmfxjvvd9xs0gzkaczqfrryj76mkpk6c", + "fetcher": "github", + "repo": "tbanel/orgtblfit", + "unstable": { + "version": [ + 20230110, + 1544 ], - "commit": "59618630205fc8c0fcc74fb34c4581d9712a5181", - "sha256": "1qx6la70cdxr556d2kna4ra76kdliaqkwm97jahd20nhs2izvpl1" + "commit": "5bde4902187b2578dc39ee3a02cd7c84c4470b8a", + "sha256": "0hy6i6m38k3ad2yr22jrr5i3af9v3k0106bilqxklv8jv6i4x284" } }, { @@ -84994,14 +86309,11 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20220928, - 1946 - ], - "deps": [ - "cl-lib" + 20230127, + 2133 ], - "commit": "8ce207b7100dc9cde071099b56cebb87924aaafd", - "sha256": "07mp1kgp9jkajs1lwwzl051gaygi8wqmnkp52pddw4xfcni9i6va" + "commit": "257bd101a142aaad2fc3993f7752fe839d1663e0", + "sha256": "15f8zrzrpl967x7pq5833vclvrpj07n936gyhpslxlpd1shjnwg7" } }, { @@ -85012,11 +86324,11 @@ "repo": "DamienCassou/orgtbl-show-header", "unstable": { "version": [ - 20141023, - 837 + 20141031, + 1547 ], - "commit": "2f13391f56cf94f8fe1dc79d6eccb662198f9b69", - "sha256": "0s3pf18n7vh67am1pjaa22gh645088dbz2rgxixr9avpfyalaycj" + "commit": "f0f48ccc0f96d4aa2a676ff609d9dddd71748e6f", + "sha256": "0zfiq9d5jqzpmscngb1s2jgfiqmbi4dyw0fqa59v2g84gxjg793x" }, "stable": { "version": [ @@ -85121,8 +86433,8 @@ }, { "ename": "osa", - "commit": "df18def95ae792387da2e21f1050cfc25af772fb", - "sha256": "1knzkwvdq9wwy2x7kgl1nf0p564247l2y82ms77r0j5vfqhsfd9s", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1kdhrslsjcdndbi1cf4r53zj4imd0zw2a5ishw3xf0x0rfda2b9m", "fetcher": "github", "repo": "atomontage/osa", "unstable": { @@ -85136,8 +86448,8 @@ }, { "ename": "osa-chrome", - "commit": "b9c83566892095706033869da370a12e8eccc590", - "sha256": "1spihfihcd5iblsl1xp19ayk65mn9ik32jlqn2pg15jwhyfmvyfs", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0ha4n12298p9splvvc2j6g9l19wp7mxshhs5y28hwjyfscasxfpw", "fetcher": "github", "repo": "atomontage/osa-chrome", "unstable": { @@ -85160,19 +86472,25 @@ "repo": "minad/osm", "unstable": { "version": [ - 20221021, - 1152 + 20230220, + 1723 ], - "commit": "5b24ed076c9998be627c19549d403d5b219b7b28", - "sha256": "1c0wymsrfdjsapwyhkp1a497hw96pkps7j5fkf0rd2sp9c4fln7y" + "deps": [ + "compat" + ], + "commit": "6c0054004174840be106b3627a4b704a197bad6a", + "sha256": "1wak2nif0mwvvfyswjhs6cdymhxvhdr1c5l0brhavla62npnzbah" }, "stable": { "version": [ 0, - 8 + 10 ], - "commit": "563d9646b1f8df37cefcec5d51d20249eba407da", - "sha256": "039ac364f00slx1dxxgsgfcr4x47v9ymn8arcs0fyhdhw7jnky5j" + "deps": [ + "compat" + ], + "commit": "c3fbc813f2e76c71056bf6e28ae3a997f33718d1", + "sha256": "07caffh30sgmcbhxqk3wfpml3310ldvwkqbh19czq7nx4llynixc" } }, { @@ -85299,8 +86617,8 @@ }, { "ename": "osx-org-clock-menubar", - "commit": "cade09308a6b8c998800f2ad2592ad6ea79f65ca", - "sha256": "1y5qxslxl0d93f387nyj8zngz5nh1p4rzdfx0lnbvya6shfaxaf6", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "018g269qp9qv0ddxdhmmk7p4d5i9c800zg7h0gsvbym7kphqz05m", "fetcher": "github", "repo": "jordonbiondo/osx-org-clock-menubar", "unstable": { @@ -85424,16 +86742,16 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220810, - 1617 + 20221229, + 1731 ], "deps": [ "bech32", "cbor", "dash" ], - "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", - "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" + "commit": "fb7d4deee41816bf6d79004b2301a1275fa87402", + "sha256": "142425jyi4r5brihds514dsjymgw01f4p19pmblp07hsl3g2zhsy" } }, { @@ -85459,14 +86777,14 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20220720, - 1144 + 20230212, + 2012 ], "deps": [ "compat" ], - "commit": "9cc3fed195e0a1f960a971880287856c148b4861", - "sha256": "1k3nislsc47k7sf24vyv4krj2nldcibxwq0j33bzq5sxg8q2rz8i" + "commit": "2404f29d376fb14f9f38eb09be8f0574f3ca19ac", + "sha256": "1qh5j67cn2cwpjrp5kl80j3qg3by9wq744z5xbc4rn897hz4516n" }, "stable": { "version": [ @@ -86166,20 +87484,20 @@ "repo": "DamienCassou/ox-linuxmag-fr", "unstable": { "version": [ - 20221030, - 716 + 20230215, + 2020 ], - "commit": "32e0bd1f19b4e6b80b88272f7ec00dc34e52c544", - "sha256": "1l4psldwd4jkd6nbh55m78czyicssrnrqdn2gbgqpdxjfvwzw6qn" + "commit": "2c06d5441e9e67c3ce419bc84b1d4612f64ff40b", + "sha256": "0azg5c7q3dl8v8162x9nmanh55f9drfkclmrhawmnjbk0m2sj8la" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "32e0bd1f19b4e6b80b88272f7ec00dc34e52c544", - "sha256": "1l4psldwd4jkd6nbh55m78czyicssrnrqdn2gbgqpdxjfvwzw6qn" + "commit": "2c06d5441e9e67c3ce419bc84b1d4612f64ff40b", + "sha256": "0azg5c7q3dl8v8162x9nmanh55f9drfkclmrhawmnjbk0m2sj8la" } }, { @@ -86261,29 +87579,29 @@ "repo": "emacsorphanage/ox-pandoc", "unstable": { "version": [ - 20220705, - 1036 + 20230128, + 1219 ], "deps": [ "dash", "ht", "org" ], - "commit": "1beb7c04d1879d72a2e95aaaa59d7ef4e75b7c9d", - "sha256": "0118kphc2z8j6bf9imivvdsyn96h52vhv5s6y291yd5n5kjppga4" + "commit": "66c32cca4f6047dd7e0f77f10bd565a2d83d4729", + "sha256": "0ciihyhmn32kl2iicr90xrzx5nrlcqniq38qpxq0vj6kxwm2gxg3" }, "stable": { "version": [ - 1, - 150707 + 2, + 0 ], "deps": [ "dash", "ht", "org" ], - "commit": "035f1d60a0139349232c382cfd23a96902b7003d", - "sha256": "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29" + "commit": "824d3707bb51e31249a7550a3e759e5fbb5207e5", + "sha256": "0sh8l18lc2hngbmb1vv99xb8cp4sfy90j9cbf7b09l82jmnlqmk1" } }, { @@ -86312,11 +87630,11 @@ "repo": "0x60df/ox-qmd", "unstable": { "version": [ - 20210826, - 1425 + 20221127, + 702 ], - "commit": "8a6e14416ba8865bb6e254754fefd8570b4ff403", - "sha256": "0sf9v0nzq97k3mv5mp5hkl866bl7cfia0rbkx59yl9g1fslpk218" + "commit": "026e4bd227589b3500294a56c2eca43b3405f992", + "sha256": "0s0wnssc2ky4w7hjp3s4c8acw8c1g6rx356ddzx8ih8f8khl868q" } }, { @@ -86356,14 +87674,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20220627, - 1539 + 20221127, + 814 ], "deps": [ "org" ], - "commit": "8567d2b1118bde343980b878af9a38f14d85ffcd", - "sha256": "0prxa7rijhxha3z4y1vyy7y0pr8wzavj7gq1aqaw42rvlpnbdv84" + "commit": "f55c851bf6aeb1bb2a7f6cf0f2b7bd0e79c4a5a0", + "sha256": "1ck8v9qwk434w4ib9bmlmpqmiv8k1is5bcr5h7pnswgmgma68dka" } }, { @@ -86415,6 +87733,24 @@ } }, { + "ename": "ox-rss", + "commit": "0cc83cda4df36ceb9584d02c36392b6c1fcce4d0", + "sha256": "0ngc4v5gg7py623nxl56wm6qrijryvsrbasjgxpn74cx3lblw8m4", + "fetcher": "github", + "repo": "BenedictHW/ox-rss", + "unstable": { + "version": [ + 20230129, + 1538 + ], + "deps": [ + "org" + ], + "commit": "81e2eea65e0654e9022f3f732b6cf9dc942423d1", + "sha256": "076v8bri7zdqpgij7hxsyplpgaay463w6fvrcl5ylcd7nzgq2v83" + } + }, + { "ename": "ox-rst", "commit": "85770d6e235217e98dda9d8b9f027a4ba3ebba96", "sha256": "0447q0gvasii57rp391la9prz0w228jnzgi59s785vzswdryww0n", @@ -86459,14 +87795,14 @@ "repo": "lorniu/ox-spectacle", "unstable": { "version": [ - 20181211, - 953 + 20230210, + 113 ], "deps": [ "org" ], - "commit": "9d3ec9a6326289074d8620e97d65e3105307ff51", - "sha256": "1gm8wwpsq10cfppzl104g3x2g9bha1209p2n8mj9azv71b9mszqx" + "commit": "0bca84ff6d3c49e4ca1bf5c3922ed261aafa3635", + "sha256": "1fnyywr4zhnb4wgimz9md0y1p4wlb6g1h4520jlb6yxlcpkng7gl" } }, { @@ -86832,19 +88168,20 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20221113, - 1600 + 20230221, + 1303 ], - "commit": "9190f3d21b7cd1c0e7c26f4c1cf6b4a07f7ab8fa", - "sha256": "02r5bs5ifm95j0lcdkaqkn77wdwvdmd2f6r6b4b5ynyx3rlp9003" + "commit": "9199271d78dc0f4f85047d6daef0e9721a6e63cd", + "sha256": "0vr9v826yypa3zsycs6j7l4kw3ydvdv2ih16lqlj16ici6h2gy8w" }, "stable": { "version": [ - 3, - 2 + 4, + 0, + 0 ], - "commit": "b40825a1ff83fb1adfaa61ea91d99a85bc52ea85", - "sha256": "02ngllr9lilpjsgdpk4628kdp0nwdlrkxj78bvi4jlhnbk4chh1c" + "commit": "0598e92cd61aa5196f78576fac7675bcff4ab217", + "sha256": "165gbrc1h1yj764kn3qq2y1551y04lqnklfa0k87gqgd38q5v985" } }, { @@ -86901,14 +88238,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210530, - 319 + 20220212, + 825 ], "deps": [ "package-lint" ], - "commit": "10b6f3aab4f7c014ce339694255cf2c6dfd2bdea", - "sha256": "0ps3v3v4279rbma8fscrpm13dimv2d93hgbq3fqcq4j9kfd25jzq" + "commit": "7a83a138e6546f4c4a9988ba6dddc5339fbe7272", + "sha256": "0srqcrhbdmd39jdsvh8k3nbrkqrl4nlic59dp5bal5vj495j7126" }, "stable": { "version": [ @@ -86999,29 +88336,32 @@ }, { "ename": "packed", - "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", - "sha256": "19bqa1j2g453gk9h0k4pvi1mgpyx9f9rh7ang28sq13hzd9c8mjb", + "commit": "f7cc44a1b339829cf7ee9b0cb4b2f113befd2c0d", + "sha256": "166s0kff4jn38xi1ygcalpqd90y124zscjvf5szqwxyjrrpqhdx8", "fetcher": "github", - "repo": "emacscollective/packed", + "repo": "emacsorphanage/packed", "unstable": { "version": [ - 20220422, - 1626 + 20221130, + 2228 ], "deps": [ "compat" ], - "commit": "2d4ed03032b3ddc008182f48bd3b81dbda0cbefc", - "sha256": "0fchl8gkh8x6mj787gbnclb2y0h6szaw5b0sfbxyydn4pgmm699j" + "commit": "169064f7acfe198cc7dd43d02518b773691e1314", + "sha256": "1y3dbyaxr5smw9zxvy0cgfcg1i3ciq7r40njf8dkra4080ibxdnx" }, "stable": { "version": [ 3, - 0, - 4 + 1, + 0 ], - "commit": "51f22a68e23b87626d162c58a0afbc21ad22f210", - "sha256": "1gpv2vaci0m48fzn0sy7iwl1mnkkqc30bf05jjrqlpn9kpbjyf1p" + "deps": [ + "compat" + ], + "commit": "c0d075fa02424b39bd5a3492167f914b8522f686", + "sha256": "0i2j5yk6xhv4rh3317f241y9llwf4wk18a6a4lkqrvbjpvi9yvn0" } }, { @@ -87306,15 +88646,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20220907, - 2117 + 20221128, + 2034 ], "deps": [ "dash", "hydra" ], - "commit": "0e1a50717599e813e2b872f2af9f40b2272793fd", - "sha256": "1qjwpxjnqnf0pxmsdqwpa7wxs173mivdj4prahjpykknvb0v7z36" + "commit": "8f955abec9c1d75acd9b03389b90a276ec4e2137", + "sha256": "0jpjd3vhwc85vrp050qr7gmxm661m248pv3mndjq5w6z4862annm" }, "stable": { "version": [ @@ -87360,11 +88700,11 @@ "repo": "cadadr/elisp", "unstable": { "version": [ - 20200510, - 5 + 20230124, + 2301 ], - "commit": "3ec6350d77d3e6d67066839513994a5351dd5755", - "sha256": "1lj6y8yms3dl2dwv0xcmlp5sgb7yxiwsfj67lhhnx5a6avmjxc4s" + "commit": "c5c3761b1edbb8afe24425d8610aa368a762ff63", + "sha256": "1s9anxa8p3q1imas29lgfh2jiffmsh4csrmypq2s7sp93d2fwdhl" } }, { @@ -87375,16 +88715,16 @@ "repo": "atgreen/paperless", "unstable": { "version": [ - 20220819, - 226 + 20230204, + 1815 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "f230acbc01588bb2ec99426832099b7fb7bad6c0", - "sha256": "1glxxmm28w7yklr86m743mg068k24hbnvfx6xyb48d3fq568r2d0" + "commit": "e524e31350d74f13319968d24b7326a4a412e105", + "sha256": "1dba7n6ws6f8y5j6qvy8ildjrlz5ahzzpfqcjnvynpycxj54vjs1" } }, { @@ -87425,20 +88765,20 @@ }, { "ename": "parchment-theme", - "commit": "f2302f512053b22e5abbd6a654cf94e4d5c7f5ca", - "sha256": "1dkl1f0zmnkw8xd89m5kd42rk4pg6a6wnm52g4p1b4yqqq27h6zm", - "fetcher": "github", + "commit": "cb6cf7e2af2800ad0e295db6116a63009ba8eea0", + "sha256": "0f2h41rj96779pbfd78j9pcq5byv328j1wdcmhr1khkqhzflvzsg", + "fetcher": "gitlab", "repo": "ajgrf/parchment", "unstable": { "version": [ - 20200910, - 2310 + 20221206, + 1541 ], "deps": [ "autothemer" ], - "commit": "95e8248edbdb01fedc7db4472bcce90d2d872106", - "sha256": "13rcajw03sbddks5wgzznvrz7ibd7m0jx8mcw1amfk97ghs57h7s" + "commit": "07c9887be6e7d94a8546db625c7d62c54d2e5923", + "sha256": "0hr2dmxz7iv2vd7x17ndx4j7hzl52j46x6gnx8m2mnwviipgriq1" }, "stable": { "version": [ @@ -87461,18 +88801,18 @@ "url": "https://mumble.net/~campbell/git/paredit.git", "unstable": { "version": [ - 20220709, - 916 + 20221127, + 1452 ], - "commit": "42500e5d450c88a3b249b548be447577d8549b17", - "sha256": "1phyyqnmdjxyx60k6ngyypgc9bl723sj1s1ws19h2pnpycr3ymhd" + "commit": "d700549d8aad684f1fabcfff565a9ad8b468199b", + "sha256": "0lx0l07psdm4dypvfadgdsx2wsjd7xpsdlagfbr7jr2nbgjkxzy7" }, "stable": { "version": [ - 24 + 26 ], - "commit": "82bb75ceb2ddc272d6618d94874b7fc13181a409", - "sha256": "13wzz5fahbz5svc4ql3ajzzpd1fv0ynwpa5widklbcp5yqncv1vm" + "commit": "72cc1f6055321a53021186b86d2f825167b81478", + "sha256": "1hwl2jhv1fhsdrspfhprq77n763i4zsj350q024ajy0m2kaql6ws" } }, { @@ -87545,14 +88885,14 @@ "repo": "tarsius/paren-face", "unstable": { "version": [ - 20220422, - 1627 + 20230212, + 2012 ], "deps": [ "compat" ], - "commit": "7117d73a4d006be8a1e6730bb167d691e284c78b", - "sha256": "06xx3bx6fv41iz82d60civlvrimnyy08i0498wklvmnjw050b1bm" + "commit": "ff95d3cba363a1a0f60bf3088e8ec3170fe83e85", + "sha256": "14k3r320zkh4kc37pizbdwji37h0sm9vsr1sblf5i1ag35zchy02" }, "stable": { "version": [ @@ -87595,11 +88935,11 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20210413, - 2 + 20230204, + 1915 ], - "commit": "c2c1bbec6cc7dad4f546868aa07609b8d58a78f8", - "sha256": "0az4qp118vsqzgsl87wgszzq91qzqkpabifd8qrr2li3sizsn049" + "commit": "332c7f47426f0519dc5c24dda82afdb1aa8b61ee", + "sha256": "12rx37js82lxq80bq2rpzgw8miw7ni0hx9xhxa775c67idyppjzv" }, "stable": { "version": [ @@ -87845,26 +89185,26 @@ "repo": "pjones/passmm", "unstable": { "version": [ - 20210109, - 8 + 20221204, + 1927 ], "deps": [ "password-store" ], - "commit": "d78d1bf4f397180d2256248df589f33aafb4c8b4", - "sha256": "0r2nj2p6kx40lhmsv06xsyylj5b9lqji32rc4ipr1biaai52w2b6" + "commit": "66691e301dff476eaff7c6e817ed9df96d4404c8", + "sha256": "1rk0yrjdkhvqms137rlfryfmlyzkavs2m5qmdx644l7w4v86jd2n" }, "stable": { "version": [ + 1, 0, - 4, - 1 + 0 ], "deps": [ "password-store" ], - "commit": "b25a92048c788a8477cc5ffe14c0c4a4df19d79a", - "sha256": "1jg2rs010fmw10ld0bfl6x7af3v9yqfy9ga5ixmam3qpilc8c4fw" + "commit": "66691e301dff476eaff7c6e817ed9df96d4404c8", + "sha256": "1rk0yrjdkhvqms137rlfryfmlyzkavs2m5qmdx644l7w4v86jd2n" } }, { @@ -87905,16 +89245,15 @@ "repo": "zx2c4/password-store", "unstable": { "version": [ - 20220906, - 1855 + 20221226, + 1528 ], "deps": [ - "auth-source-pass", "s", "with-editor" ], - "commit": "47f8d950c58949733862813f29856480a9e232c7", - "sha256": "01267lb9ixrb3255n536k6klkp2d7gj08n9vzcdczbz5b69ybv18" + "commit": "26d2dae04bb76a87be6960861c10432820cd5d55", + "sha256": "1pkx6pgkkpddxrshzq3x8ilfwqjw9gawnbbskcbssxc88wrpbcjb" }, "stable": { "version": [ @@ -88022,11 +89361,11 @@ "repo": "kiyoka/pastehub", "unstable": { "version": [ - 20140615, - 620 + 20140627, + 1319 ], - "commit": "3cc5dcb87104f3b4320a6d7fa20fa7340e6b7026", - "sha256": "0wbb5689n9k351gf3s9mqr3bi00lpajk0h1k9gx1b2mdbb7lq7xd" + "commit": "37b045c67659c078f1517d0fbd5282dab58dca23", + "sha256": "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n" }, "stable": { "version": [ @@ -88279,8 +89618,8 @@ }, { "ename": "pcmpl-git", - "commit": "6a51c16bed8d0a2fecad0ae9580d58cd44cc8930", - "sha256": "12y9pg1g4i1ghnjvgfdpa6p84h4bcqrr23y9bazwl9n6aj20cmxk", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "078ajwsalirr9xkqfbbbmc5z3fdh9n5jckc6z7r90g899cxwcyzz", "fetcher": "github", "repo": "leoliu/pcmpl-git-el", "unstable": { @@ -88390,11 +89729,11 @@ "repo": "mhayashi1120/Emacs-pcsv", "unstable": { "version": [ - 20150220, - 1131 + 20230207, + 757 ], - "commit": "798e0933f8d0818beb17aebf3b1056bbf74e03d0", - "sha256": "0aaprjczjf3al5vcypw1fsnz5a0xnnlhmvy0lc83i9aqbsa2y8af" + "commit": "4b5e801d213a460a6cb3cb2997a0a6cd33c7bc58", + "sha256": "160lnkslvmm6dzlb5fxdy7zsjz0pcg6x6lmx43xz95sq99kz679v" }, "stable": { "version": [ @@ -88444,29 +89783,28 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20221007, - 1404 + 20230117, + 632 ], "deps": [ "let-alist", - "nadvice", "tablist" ], - "commit": "d6980bc3273e1cf1a73feee6bb523d1568405685", - "sha256": "1a0l76k183fmkd7wjw86lf0mwcvkvd0gsyyh3p49z56094srxjar" + "commit": "bc2ba117e8c3196ff9adf0da4fa1e63a8da3d7c8", + "sha256": "1v732z5zrvh4k21m6g35xalfx09ixnnvyk88418nrizc72lx1pvr" }, "stable": { "version": [ + 1, 0, - 91 + 0 ], "deps": [ "let-alist", - "nadvice", "tablist" ], - "commit": "2f5a1b939369657eb56d4cfa4bdf0b5c11aacb1d", - "sha256": "07ixspgn4s1jg66w7m2f3sh43giakz9srhp7rpw389z32g57i1rx" + "commit": "1885cefc24883c220cdd4acafdf1d14f290a6979", + "sha256": "1idazz46zx2q84di4p73770l4bcnai2a03q95psg827ykdnmjwij" } }, { @@ -88525,11 +89863,11 @@ "repo": "ArneBab/pebble-mode", "unstable": { "version": [ - 20221009, - 2113 + 20230123, + 1801 ], - "commit": "b256cebef2911021f0241364b4642357d5efd201", - "sha256": "02hcii6kywn6vxpgkjm0xw6zppq5ra3kds7w34g15abi9xdmkhxh" + "commit": "bcbc76aa89196338f12a8ddfe4486edf83c19c5e", + "sha256": "0djax1yaab8mpjih1ggc1hvvzw7bjwl5bfr2kmixj90scgh9r42b" } }, { @@ -88702,20 +90040,20 @@ "repo": "Fanael/persistent-scratch", "unstable": { "version": [ - 20220620, - 408 + 20230113, + 318 ], - "commit": "92f540e7d310ec2e0b636eff1033cf78f0d9eb40", - "sha256": "1hl4xac1zsvpbibahp54phf1b1srhnm2nh30vzmh96aynnf38vqd" + "commit": "f9c1361ad69073af8133174f9e37b594df9be361", + "sha256": "1bgz6hdxwwi96pgxlxabzq6v7a63xznzd7ifmcdx9571vlbg48cc" }, "stable": { "version": [ 0, 3, - 7 + 8 ], - "commit": "92f540e7d310ec2e0b636eff1033cf78f0d9eb40", - "sha256": "1hl4xac1zsvpbibahp54phf1b1srhnm2nh30vzmh96aynnf38vqd" + "commit": "f9c1361ad69073af8133174f9e37b594df9be361", + "sha256": "1bgz6hdxwwi96pgxlxabzq6v7a63xznzd7ifmcdx9571vlbg48cc" } }, { @@ -88790,11 +90128,11 @@ "repo": "Bad-ptr/persp-mode.el", "unstable": { "version": [ - 20220909, - 836 + 20230110, + 1045 ], - "commit": "67be9feeb02613ea97f0de9eb5b792b193f073bc", - "sha256": "1wwcck650wxmgmc8kxpixfhiqzxk6qkkb1rpz77prbl068d3sl3v" + "commit": "df95ea710e2a72f7a88293b72137acb0ca024d90", + "sha256": "0jf4wsq13bjdr0wdm9jv702xxyhadfglxhvf9f7ahh3g4izjfqyr" }, "stable": { "version": [ @@ -88915,30 +90253,30 @@ "repo": "SqrtMinusOne/perspective-exwm.el", "unstable": { "version": [ - 20220125, - 1939 + 20230218, + 1358 ], "deps": [ "burly", "exwm", "perspective" ], - "commit": "541946caa0359c14c90da58196bec7baed122a46", - "sha256": "0mcrvv9mhg0cfkcp64hkdd9wh9j04hw0d9dz1ghafa4h6hf3azfl" + "commit": "01d51f5c92a30b65e8346582ed1ce6513570bb0a", + "sha256": "06lnmbimjj5kyr0mixjagcv903fbn00wvp63wlni2g8c3bhx1p48" }, "stable": { "version": [ 0, - 1, - 4 + 2, + 0 ], "deps": [ "burly", "exwm", "perspective" ], - "commit": "ebe6f50be216d55ff2aea878aaf4b7c2c1032bdc", - "sha256": "0drjfyfmhil20pv96af8s4w3xzm3pqx095n89r0aqzp2falvrvpw" + "commit": "01d51f5c92a30b65e8346582ed1ce6513570bb0a", + "sha256": "06lnmbimjj5kyr0mixjagcv903fbn00wvp63wlni2g8c3bhx1p48" } }, { @@ -88975,11 +90313,11 @@ "repo": "ksqsf/pest-mode", "unstable": { "version": [ - 20200321, - 504 + 20221231, + 15 ], - "commit": "e71e2f2730e926ee936ff7be15d912de27547e9e", - "sha256": "1rmqw21mlq2dpg3fr6z30hxincmhhw1k1bz61y4hqlqy70zfi20m" + "commit": "8023a92ce59c34dcd1587cbd85ed144f206ddb89", + "sha256": "0hbbwnamhbg295iva3ffp1al7cyjmc7nb2ilh1zqb4kvz6zyqhxj" }, "stable": { "version": [ @@ -89053,19 +90391,19 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20221111, - 756 + 20221210, + 1215 ], - "commit": "3e79c965063bc15d1e2ed9a1c152ba603b84e68a", - "sha256": "1g3qh1xvdri2vp652jzihzvfnn39wbpy79sscaav09lkbc4phgb5" + "commit": "f91d546a35ed3479cdb656b17525285e11565892", + "sha256": "0a38rvl5rwfb77p4xxmjhrs6s67pfkzjfm0pdxvf0b6xh7h404kh" }, "stable": { "version": [ 0, - 16 + 20 ], - "commit": "11f27360086f27936401e1f4b196f73dbd11d880", - "sha256": "1jdnslpgdm16klaga02p33g7c8bjzg164kxz3jd7gs5v9gqa6ppz" + "commit": "f91d546a35ed3479cdb656b17525285e11565892", + "sha256": "0a38rvl5rwfb77p4xxmjhrs6s67pfkzjfm0pdxvf0b6xh7h404kh" } }, { @@ -89085,8 +90423,8 @@ }, { "ename": "ph", - "commit": "f62ca074ca2df780ab32aac50b2b828ee6a9934c", - "sha256": "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0xrg7d1mqgvv3s0l4biyyccn3bj1khs496rdwih91bazs634g2y4", "fetcher": "github", "repo": "gromnitsky/ph", "unstable": { @@ -89398,8 +90736,8 @@ }, { "ename": "php-eldoc", - "commit": "7af452f42847a947e87edd6aa559f807d08920c1", - "sha256": "1q5fkl8crqrgxik2mxbkqv10qnqhqrazd66rgfw797s3jcchv58j", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "14kgydh5vm5kqsigs6z9bnkzjh53syq4a43j9gdkbvsisibjl5iq", "fetcher": "github", "repo": "sabof/php-eldoc", "unstable": { @@ -89419,11 +90757,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20221112, - 1616 + 20230212, + 731 ], - "commit": "d01cfc9cd51706e076bf7e5cbf0cfa7ee885efb4", - "sha256": "13lkzvamr86409whr8as4721gx9xrlfkmxvv941775mryliqk6j6" + "commit": "fb11df8268b7099766264cd53836ef159746adbd", + "sha256": "083nsw65d1zvknxyvwnxw8n8fjc566w940x5lgxz937afy6qxvfq" }, "stable": { "version": [ @@ -89629,8 +90967,8 @@ "repo": "nlamirault/phpunit.el", "unstable": { "version": [ - 20220704, - 1554 + 20230124, + 743 ], "deps": [ "cl-lib", @@ -89638,8 +90976,8 @@ "pkg-info", "s" ], - "commit": "02020d4b3e5ae9fdb82be9203fa6d330adcbc0eb", - "sha256": "14x4cmwc8m787dv49kpaw285109d85zv95dlkcxza8g8f493mdw1" + "commit": "4a36906344c0abc11f48cc08cd8d50a9f46963f8", + "sha256": "03a9brby841kqyjqpyxxxvh60hcqa0ly4yc4flawbvnvm7rm7bv3" }, "stable": { "version": [ @@ -89734,8 +91072,8 @@ }, { "ename": "pig-snippets", - "commit": "a0d7c07d28e2f229b281201a781ebaceed6465ed", - "sha256": "1sqi0a2dsqgmabkrncxiyrhibyryyy25d11b15ybhlngd05wqbx2", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1g983r0jj7ziysdsxv94ikdncpagdl16a23xzshlvrx4qyfyl4pn", "fetcher": "github", "repo": "motus/pig-mode", "unstable": { @@ -89803,25 +91141,25 @@ "repo": "davep/pinboard.el", "unstable": { "version": [ - 20200630, - 1544 + 20230101, + 850 ], "deps": [ "cl-lib" ], - "commit": "d426f9d2ebec5f907c8a89d6b38ccbcb13750d4f", - "sha256": "0jganb5ws2qlzyncyhaw1hldqbpxm44ddzzy17hmriy8n5701fyv" + "commit": "112e903b489fed3f71b3165447ba6f21ee5675e6", + "sha256": "0yj5jzv3vdydn0hhdbikjxjfb9kqsqsjgb4524ghxn8nh2r40avm" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "7c57f20667ead2bb27ab1d0a03307c28ea728bd9", - "sha256": "0d9z1hr2082sbg4dlmarksh598xd92w7c09xmdjyn1yqm39gsljw" + "commit": "112e903b489fed3f71b3165447ba6f21ee5675e6", + "sha256": "0yj5jzv3vdydn0hhdbikjxjfb9kqsqsjgb4524ghxn8nh2r40avm" } }, { @@ -89895,8 +91233,8 @@ }, { "ename": "pinot", - "commit": "f75cd89811b4bb668c1e7a93246b93fbcf5d9c47", - "sha256": "1kjzq02pddnkia637xz2mnjjyglyh6qzragnf7nnxbw9ayiim58i", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0gw6xzaw60vp89jk035pvl7k13w9anvf371wrpxp49y49bg4qjy1", "fetcher": "github", "repo": "tkf/emacs-pinot-search", "unstable": { @@ -90418,10 +91756,10 @@ }, { "ename": "playerctl", - "commit": "6db0d82c2eef7c5bef5f9f2c15969da4c404b62d", - "sha256": "1pix3hcsg6ymzajiixwcq4v3clvadpkl0rhplkhachv6wmci327x", + "commit": "d866d72f544ca6833b142ec2731afec142952ddc", + "sha256": "0nvd3290lbw8c6r3z5famyl47pzlg3iz7rpndv8hs0mb54q8mpz0", "fetcher": "github", - "repo": "thomasluquet/playerctl.el", + "repo": "thomas-louvigne/playerctl.el", "unstable": { "version": [ 20220714, @@ -90454,15 +91792,15 @@ "repo": "twlz0ne/playonline.el", "unstable": { "version": [ - 20200317, - 642 + 20200318, + 758 ], "deps": [ "dash", "request" ], - "commit": "7f20037688d92e6af67384d99abf7f9671326cd1", - "sha256": "0p2iwd7iq5z4r5i14qq0jki68h0f0skk1bvxigybxx3ckggga5y7" + "commit": "463a94fc01112817d1e6e0209ea85385efcb1329", + "sha256": "14x2x4k7h172l660h1z0j44ar5m08gghxa1yhh5d4sgnzqvx6viz" } }, { @@ -90511,11 +91849,11 @@ "repo": "flexibeast/plisp-mode", "unstable": { "version": [ - 20200427, - 405 + 20221130, + 524 ], - "commit": "59e682d77569b04e9fc80af9c4b05e4a997dbcec", - "sha256": "10v9j7sv5q9ywq8bdj2g1j262ggsy3hwqybn6rnrcim5v1f7a51r" + "commit": "3a0ec9741ae7ca67852022c6fa85519fcb4b69ba", + "sha256": "1lfn6bylpsam2la8r1k0gb3aik1fbbvpln37zc0hmdj3k0w4clci" } }, { @@ -90830,24 +92168,6 @@ } }, { - "ename": "poet-client", - "commit": "a0b003773edaa728ed49f0de2ca64a00cb60d13a", - "sha256": "11yj57915ly8j2byp5c395lip73iv1chrzxdlxilhnll1brvmaw0", - "fetcher": "github", - "repo": "wailo/emacs-poet", - "unstable": { - "version": [ - 20190403, - 708 - ], - "deps": [ - "request" - ], - "commit": "38a9635cab4799224153f89ff47cf1b060fb3939", - "sha256": "1h8svmh2pmg822jpag33ahmhpvdc77fbxxn205kx8p3vk362vbvi" - } - }, - { "ename": "poet-theme", "commit": "40bbe29dee56f7989d8e87c03f4842e2b191acc3", "sha256": "0pllyp4spj30g6ihzc91hzvnrvcg2zb49adj8wcmbzvq3hxnvls1", @@ -90906,8 +92226,8 @@ 20170421, 1632 ], - "commit": "f4126b64567a81e7f22058f09d56c63b2ff06632", - "sha256": "1sbwz9kxvnd5r24q9x6bhcjajjnm2z8q6khgqs4gl4ycs60kn0s6" + "commit": "4cd0f8c8d1296c5c64f708b6a5835e8520c51b68", + "sha256": "1l3mlz51wp729rm6wf72x2fk1fla2n2s1qh8h8z58inipdi2qydp" }, "stable": { "version": [ @@ -91076,15 +92396,15 @@ "repo": "polymode/poly-markdown", "unstable": { "version": [ - 20220117, - 2351 + 20230202, + 1210 ], "deps": [ "markdown-mode", "polymode" ], - "commit": "81d648ce623c05727836dbee5cbd1dfe6fe850f1", - "sha256": "0i28ml09a8c1n8frqa8zrpsv7b1d2fzz2j2hai222wldxs79hqpa" + "commit": "98695eb7ca4ca11dcec71a1cab64903bbf79b4d3", + "sha256": "0x22ablv7qc7h0llqkp6n42cg1nlwlx305ssigijcxbi99dyf3pz" }, "stable": { "version": [ @@ -91384,8 +92704,8 @@ }, { "ename": "pony-mode", - "commit": "a1fd64317610fb6ef5b14e8bf15e727680d5ff09", - "sha256": "1hgiryhpxv30bjlgv9pywzqn2ypimwzdhx03znqvn56zrwn1frnl", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0yzkin6akmdmwdyjsc65clj40j8m8vwzgzkpcx3i3p2pg0d8nlxh", "fetcher": "github", "repo": "davidmiller/pony-mode", "unstable": { @@ -91526,11 +92846,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20220711, - 836 + 20230120, + 751 ], - "commit": "d7560f18350faaee8362aee16481268de3cc6457", - "sha256": "12br7pnn01k7hwbcrx9c0dppp2jly7xhif3jrkg1v7mh8cj6sccs" + "commit": "da70c8296a3b3b69626b11f2d202a38075f00c7b", + "sha256": "02lls6fh0fyxq3hwnwb5kih26q29fgl9g4isq1qk6j7bvv53gb04" }, "stable": { "version": [ @@ -91549,11 +92869,11 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20220927, - 1610 + 20221231, + 1634 ], - "commit": "20ce6cbd2f06423be35b3b700c698f0e109e880c", - "sha256": "13ww7hld5pa32myj9krr6prmc99s7hnpsw8mw9krpxffykkblj2f" + "commit": "71cede0588c10526f88dd0375bce776ec2eed05e", + "sha256": "07rnncg8x1a2kk158pnqazj3hiqf1rf3bmwlhadajqbfb0vv96hv" }, "stable": { "version": [ @@ -91791,20 +93111,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20221118, - 614 + 20230212, + 808 ], - "commit": "48b7130ca3b5c98bdb21bf99b64a3536acf2b0eb", - "sha256": "1v8jkrgfkj2a08m82dz7vrlyjw3wrk3nd33wi4c166agssznlmih" + "commit": "06b939cfb06168782fc378043ff35bd7fec203b8", + "sha256": "0c04005k0g0np96prff461nqkmac4l0d4sda42v2jnjh25ylhy81" }, "stable": { "version": [ 1, - 2, - 0 + 3, + 3 ], - "commit": "48b7130ca3b5c98bdb21bf99b64a3536acf2b0eb", - "sha256": "1v8jkrgfkj2a08m82dz7vrlyjw3wrk3nd33wi4c166agssznlmih" + "commit": "06b939cfb06168782fc378043ff35bd7fec203b8", + "sha256": "0c04005k0g0np96prff461nqkmac4l0d4sda42v2jnjh25ylhy81" } }, { @@ -92154,19 +93474,19 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221118, - 307 + 20221216, + 112 ], - "commit": "a000de747515aa7e7ad1ea0eab711864a4be0ab5", - "sha256": "1d1d4msmkc0cvd6vva0pfq72i07p0my9wj2s8zvj60pvah620yl0" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" }, "stable": { "version": [ 6, - 0 + 1 ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" } }, { @@ -92216,8 +93536,8 @@ }, { "ename": "prettier", - "commit": "e9992d6d5ed3bd677976262d8a887e5c0a4f4914", - "sha256": "07zhjbb40jl6xkfdzavqg33z17z8s4nyrv3qjh8c0m3si8abh6zb", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1b6kmx72c19l1z74lbs3k0w4yj20xq8692mc4hnkz0hivwb6f3fy", "fetcher": "github", "repo": "jscheid/prettier.el", "unstable": { @@ -92917,20 +94237,20 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20221118, - 1035 + 20230219, + 647 ], - "commit": "5703797bb2a400e962479e670086aca4241a77b7", - "sha256": "0xm6792q1z90mjmxrp54vw2yh34hzxisdxz5dl5df78ckkgbxsww" + "commit": "fd257811c46f89f53143dd0ccbc134fc9459d6bb", + "sha256": "0rawixwdya1cva40r0ppq8c22ifdlprgyz6nw1a99w3bgny284zn" }, "stable": { "version": [ 2, - 6, + 7, 0 ], - "commit": "e3bae8c91bb69c501dcc2e74f9ea14e89cf0a09c", - "sha256": "0xs52fv4scb6389fzd0mp1qjh695z3b7n7116bb0mn50kjws6447" + "commit": "14beeaee7a77601aee4d4982811f6a27f696403c", + "sha256": "0ybd41iss8vd56qv6czpxqq7a99s4h7i3a2r4khy4rf5blj5zdqi" } }, { @@ -92991,8 +94311,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20220403, - 1621 + 20221231, + 1643 ], "deps": [ "dash", @@ -93002,8 +94322,8 @@ "projectile", "rake" ], - "commit": "f7877971cfe266d3d91b3a72012855e12a0112df", - "sha256": "0rlqrrndzlv96siyjcy47rwbd14sfk30rj0pqkv62rdy94m2wxay" + "commit": "701784df7befe17b861f1b53fe9cbc59d0b94b9f", + "sha256": "14lmasn46v4gsqciiqr2dr3xq73y0skdinmjsarlhjd0syw66sk4" }, "stable": { "version": [ @@ -93218,8 +94538,8 @@ }, { "ename": "projmake-mode", - "commit": "df23138073d2416fa6522beca86b7a62eb4d42e3", - "sha256": "192gvmhcz1anl80hpmcjwwd08dljyrap9sk6qj0y85mcnaafm882", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1hsw13lpnwxdi4h1vwd9inkv6fakx5f5s24hfqk276cnmjf53ms4", "fetcher": "github", "repo": "ericbmerritt/projmake-mode", "unstable": { @@ -93323,11 +94643,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20220930, - 1309 + 20230130, + 1024 ], - "commit": "ef18ee4d6ffa160fe563307561f2cad12e9478b5", - "sha256": "12sy38s3ys1jyvbfrbq9xwhdvvdmhcj3bymnqfvgqlhi7p3frrp8" + "commit": "8416875696cb0c4283e96fe721d343277882ecea", + "sha256": "1wbs3vjiai0k1ywa45yc487d5rhfy360yfd0rprfp4ihc6xx3591" }, "stable": { "version": [ @@ -93394,17 +94714,17 @@ "repo": "ksjogo/proportional", "unstable": { "version": [ - 20200309, - 1556 + 20221205, + 1417 ], - "commit": "0e4537af7ba2bc9dbb449c38350bce012b382f51", - "sha256": "0k4kwmyja5nb6rmbbq71vzxw7nnxr0w8f9vzws14an28niwr4s8p" + "commit": "6b675694292a5dbebb52b6196e8ccee6e3a73042", + "sha256": "098252kjmq2cadz2rnjla9f8636ak8n6qj0axp4l7h4wvf618pzi" } }, { "ename": "prosjekt", - "commit": "6d359ec827573dd8c871c4f23df5d1737f1830e7", - "sha256": "1fn7ii1bq7bjkz27hihclpvx0aabgwy3kv47r9qibjl2jin97rck", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0qhg86p7dndj0sm5nys6207hsylrir4yvv1nl85b39gzwxlgq8ni", "fetcher": "github", "repo": "abingham/prosjekt", "unstable": { @@ -93427,19 +94747,43 @@ "repo": "protocolbuffers/protobuf", "unstable": { "version": [ - 20220303, - 1716 + 20230216, + 1713 ], - "commit": "5f632bef3827a1d95d95bce92c5a3a1f903b6679", - "sha256": "1y86rqs7zzzyakc565zgknx9ykfb02yjb9pdzqybp2f7zla50wln" + "commit": "a847a8dc4ba1d99e7ba917146c84438b4de7d085", + "sha256": "0amfrjww7gl8myc60a3srs4h1d72pwlbmp8ra163g7v6ih4nq8gk" }, "stable": { "version": [ - 21, - 9 + 22, + 0 + ], + "commit": "a847a8dc4ba1d99e7ba917146c84438b4de7d085", + "sha256": "0amfrjww7gl8myc60a3srs4h1d72pwlbmp8ra163g7v6ih4nq8gk" + } + }, + { + "ename": "protobuf-ts-mode", + "commit": "ef4f38a4e91870ebfd8fcd4cfaf3463f77ac31e1", + "sha256": "0kpp1sqwbvipwac95gj873w1zvmsrwdcz3qangqz8bck2f48pvv6", + "fetcher": "git", + "url": "https://git.ookami.one/cgit/protobuf-ts-mode", + "unstable": { + "version": [ + 20230207, + 341 + ], + "commit": "3076f25bd5ce05f4a4a5840506c3a5a2c0e839d9", + "sha256": "04zqi7anmwzrsgg5clbvilbmi7hg0m29gyr4cym871q73xgi2vmr" + }, + "stable": { + "version": [ + 1, + 0, + 1 ], - "commit": "90b73ac3f0b10320315c2ca0d03a5a9b095d2f66", - "sha256": "0g904h7z2nb8vx0529zzq3gm0jal9w4l5ch0zl1q9i1g0n3q1dfp" + "commit": "3076f25bd5ce05f4a4a5840506c3a5a2c0e839d9", + "sha256": "04zqi7anmwzrsgg5clbvilbmi7hg0m29gyr4cym871q73xgi2vmr" } }, { @@ -93582,15 +94926,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20220318, - 1129 + 20230105, + 503 ], "deps": [ "async", "cl-lib" ], - "commit": "328c64804c4c9e15b373c7ba3bc82bfdfb27971a", - "sha256": "1mmn5qmjn77jh0zjfgl6w87yxxq116cb7rj3an0svmaabqsmwpjj" + "commit": "ca5bed69f803aab71851c46b0118b66f58455b8a", + "sha256": "0j2bgcy803qnwbrxqr9f26g593vwzjznnwbsy4r2s7nilgcy3anq" }, "stable": { "version": [ @@ -93681,8 +95025,8 @@ }, { "ename": "ptemplate-templates", - "commit": "3207d42ba3c5d9c2f2e7621934e95ad2755ca1e0", - "sha256": "0i1zipjdcwclrkcs0n7g8n64ggd2lfbndbas6aqpnww4b3kdzdxv", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1cmf8q02532hz0m2zacdkbzvc6mg2qcmhy3kwww0082ck9vwvz95", "fetcher": "github", "repo": "nbfalcon/ptemplate-templates", "unstable": { @@ -93754,14 +95098,14 @@ "repo": "xFA25E/pueue", "unstable": { "version": [ - 20221105, - 1230 + 20230219, + 1558 ], "deps": [ "with-editor" ], - "commit": "5ad6979a0129c7cddc69f71c9084e4356f450fac", - "sha256": "1jcy8gv7zg0hr2p1vcdx0wy2gh6wmrxp6j3g4idsa9sa1kbm6dj0" + "commit": "386e43d46cbf68470d040b422061ac2ba1629749", + "sha256": "0bjshh7k21s14cbbq10ra7dnxw8df8y3447z1icw554jqzmgxm9v" }, "stable": { "version": [ @@ -93808,17 +95152,17 @@ }, { "ename": "pulseaudio-control", - "commit": "7964f226e12c3a27ff856e28f4b030ebf304aea2", - "sha256": "1vdhg85lbdx7sj1xg2vhhfmhrrp5q2x560agnsb0gxi2akp6z9r0", - "fetcher": "github", + "commit": "4fa5695bc55b40eb57ff925ab4af354b789d5224", + "sha256": "0ry55jvf3v7yy9lxwxb37wkn0hhp0kbkcri4vy9vmmf10sv2rx89", + "fetcher": "sourcehut", "repo": "flexibeast/pulseaudio-control", "unstable": { "version": [ - 20220418, - 742 + 20230109, + 246 ], - "commit": "22f54ae7282b37eaec0231a21e60213a5dbc7172", - "sha256": "0y87i8qpf1fvz37zly9srss1y9hpn4jjj8gsikc72c4qs9n0ljv0" + "commit": "34a6114357dbbc6b6720aa013e0f8a48f3739403", + "sha256": "0wm312pqp0i5i6qh6g3nacnnvsrad58927cl2g42gxzrzlb3slv5" } }, { @@ -93883,26 +95227,35 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20221016, - 427 + 20230214, + 1156 ], - "commit": "af8dfe1f5a3e5c4ba650fd15716ae707f29b33f8", - "sha256": "1pdghwwcx28f056w0v26d21da6l3nwh8nsmw7lf8zrn43b259yas" + "commit": "a39a4ecac7279bed1a150a895bbc80baa7272888", + "sha256": "0z10k70rh1lscrmwvrirngl841sf785r0by6166jx3bbsahw72n4" } }, { - "ename": "punpun-theme", - "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", - "sha256": "10mgyrxz2habhaqyg1g4c5kn13q425j0xpkkdlg10cdfvxfl9d1s", + "ename": "punpun-themes", + "commit": "41af65d99ccf3d366a9fd7c857aba3063d074805", + "sha256": "1hjrcqq80m7045g3s0qxcwqn8c4av6xpv5f3qz3nqkz30cmdcs7c", "fetcher": "git", - "url": "https://depp.brause.cc/punpun-theme.git", + "url": "https://depp.brause.cc/punpun-themes.git", "unstable": { "version": [ - 20210508, - 1635 + 20221121, + 1018 + ], + "commit": "6a7e04de1ad9f7ba9074b7206bffc9241c33349c", + "sha256": "0661rhlh3nbbrjdg118y9nk7kmshb5p0jzgfpnqvqmf7j6p6rpg7" + }, + "stable": { + "version": [ + 0, + 0, + 2 ], - "commit": "7026684cd568cb691af3ced5de14c375fe6f5a1a", - "sha256": "1nwvlp93l5lj259mchd1a2glq3jxd0h1vazsbjqfi07hsg86xjp0" + "commit": "6a7e04de1ad9f7ba9074b7206bffc9241c33349c", + "sha256": "0661rhlh3nbbrjdg118y9nk7kmshb5p0jzgfpnqvqmf7j6p6rpg7" } }, { @@ -94067,11 +95420,11 @@ "repo": "ideasman42/emacs-py-autopep8", "unstable": { "version": [ - 20220802, - 1154 + 20230115, + 633 ], - "commit": "4e5a8d5ddd77b45841f0e55d7c5326854f565830", - "sha256": "1k1yvf5n5ygzf170bfb6wjhw3jrk3wsycb9bf39k53p8gzanh435" + "commit": "d0486c22c0a92ad7911714026021fe4ad276b7c9", + "sha256": "1xa25sfdmc6srys0ymhdj07kss4ixnw3sqq5grjix7acifdmrbj9" }, "stable": { "version": [ @@ -94244,6 +95597,26 @@ } }, { + "ename": "pyconf", + "commit": "835c996cefd39c06768790b33d0a0823765c98ef", + "sha256": "0z0d3dy0vp9gq49qkqj66n0w4zd0ci4y1c0vay4nym4xy8mjz01h", + "fetcher": "github", + "repo": "andcarnivorous/pyconf", + "unstable": { + "version": [ + 20230127, + 2046 + ], + "deps": [ + "pyenv-mode", + "pyvenv", + "transient" + ], + "commit": "f78e7f269210c7d7e06001752d87c8fbfd8b9084", + "sha256": "019c1hcdfr9cnpcag2qyg2lkf1scg1m6aw0nllwn31cwa8mvyyga" + } + }, + { "ename": "pycoverage", "commit": "eb0310bbe8427abdcba2b30414ec26475b0b7440", "sha256": "1jaanmpnawk0r6zfzx18crqml7lv412l2l0iabp345xvfvsh8h1m", @@ -94266,11 +95639,11 @@ "repo": "statmobile/pydoc", "unstable": { "version": [ - 20220531, - 1457 + 20221222, + 1426 ], - "commit": "c8b667e17bfe3e63221f822c5c4d58c8fb4fea90", - "sha256": "082ar5w28dknaa63mf587vdzr78xlnvh8lbxqq3hk6qa2c72akam" + "commit": "c9d8b5249c1b3814da062ed9976e4137d6e8d869", + "sha256": "1ifyhdcvj25rnrvq78qjma3dg826hpj3x5ic1sydrvj0yb13jhim" }, "stable": { "version": [ @@ -94375,28 +95748,28 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20221107, - 41 + 20230201, + 203 ], "deps": [ "async", "xr" ], - "commit": "93fab3c9e8c2490687781d45c1cecead0bd3ecf2", - "sha256": "1rlfic87ibbxd86fj0x4cryhz41yggpzy94p3h9xk8j3y74sab9r" + "commit": "295a95067eb00a1a8506991ef9a67e3b8d3317f5", + "sha256": "1scqkl0l7r2g43fp5yz4ymmwyc3md4sqfk880phj4ax22zgla0ry" }, "stable": { "version": [ 5, - 2, - 8 + 3, + 0 ], "deps": [ "async", "xr" ], - "commit": "93fab3c9e8c2490687781d45c1cecead0bd3ecf2", - "sha256": "1rlfic87ibbxd86fj0x4cryhz41yggpzy94p3h9xk8j3y74sab9r" + "commit": "20b633aab16a31ffd1ca642ebaf329f0ad7c79d7", + "sha256": "1han97zb4jp4b4x52x5wzc6z4ndvq6n84cijlgzc9jqahlas18cn" } }, { @@ -94425,8 +95798,8 @@ }, { "ename": "pyim-cangjiedict", - "commit": "a82ac773bb9bc36727314d1eb5a75610ec9ca694", - "sha256": "0ma99y1ijpdqrmypmj108ny7bfj9ylryav7hj7dnp9gj4b1bhxhh", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0n3qp5i23p6vgahhlhvzmb03sxnfsn0g45jjv4nk4a81np277ddx", "fetcher": "github", "repo": "p1uxtar/pyim-cangjiedict", "unstable": { @@ -94443,8 +95816,8 @@ }, { "ename": "pyim-smzmdict", - "commit": "8bad2e8162f5a44bdbe1117efa31133ae7814489", - "sha256": "104kxd8d2b7rch0pfsdz5w98rskx1sl6fx0lqspcilir9k9my1cc", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1j0cdg13n1nhayaagf4zd1simbsknzk9589i103b1zg5fp2rlryz", "fetcher": "github", "repo": "p1uxtar/pyim-smzmdict", "unstable": { @@ -94479,13 +95852,14 @@ "stable": { "version": [ 0, - 1 + 3, + 0 ], "deps": [ "pyim" ], - "commit": "114489ed97e825ae11a8d09da6e873820cf23106", - "sha256": "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc" + "commit": "2766bf0dd8514226cd8aac1ab9402af603b96d06", + "sha256": "1fzzib53b8f0145wih3pbxpngap3xgdqrslgpc7hmm9a0z3v52kn" } }, { @@ -94543,11 +95917,11 @@ "repo": "it-is-wednesday/pyinspect.el", "unstable": { "version": [ - 20221118, - 1014 + 20230216, + 1121 ], - "commit": "a6f9a47327b2465dde106307e5dd8e84cb3321d9", - "sha256": "1lqgv9xbl3fvgkz60rwq7awmzhkpfd70bhl1fbz8v4cl4fhbl1p7" + "commit": "4437dc589d0c1eb0ca80bf0d005ee27d15cf69fc", + "sha256": "1fdgsbd1rz54y18m43dyrpz6ir57p1dqgbnd24sx9zj85mn1z3fa" } }, { @@ -94575,8 +95949,8 @@ }, { "ename": "pynt", - "commit": "fdb297084188a957a46dcd036e65d9d893044bea", - "sha256": "07c0zc68r3pskn3bac3a8x5nrsykl90a1h22865g3i5vil76vvg3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0dklikclzaxp2d0mq2k9731is6gmv3rzglqs1j3gzj6v7vg2qrfh", "fetcher": "github", "repo": "ebanner/pynt", "unstable": { @@ -94616,15 +95990,15 @@ "repo": "dakra/pyramid.el", "unstable": { "version": [ - 20210427, - 1032 + 20230114, + 1049 ], "deps": [ "pythonic", "tablist" ], - "commit": "66f54f4a9cc9fa81edf768ab433d5b3c5517363c", - "sha256": "0sijy6nk46yw21j49x5n93za2zjzqqrfmjm7dz3z3gj7jknk27i9" + "commit": "c8a8b36725d85664e74f59600fe5d18d06ea907d", + "sha256": "05q9bqxnv2b1d9g7j86pc36mfn8d7x5piz95lc38cqwv492ivrbx" }, "stable": { "version": [ @@ -94659,8 +96033,8 @@ }, { "ename": "pytest-pdb-break", - "commit": "4ed7d5d5e81818dad55edda73fbeca8c5021b932", - "sha256": "0dxn53y9zjlip0bjynjql984wrf39pmg5fsx1qgsrj1bw78xqw26", + "commit": "949da8f16687bad96f53714ccbde895587d439ff", + "sha256": "13kbs1zcnjsp6ysdklwd0l1kby68ripp0cvaz4fvalc3lgy1866q", "fetcher": "github", "repo": "poppyschmo/pytest-pdb-break", "unstable": { @@ -94884,20 +96258,20 @@ "repo": "jdtsmith/python-mls", "unstable": { "version": [ - 20221003, - 1451 + 20230218, + 2131 ], - "commit": "398ba92372cc37bae5d63e4d4c42e65edf7db74b", - "sha256": "0mdlqmdwv6kz8dqlzwv46rwz4qkr53a05kh8wgz5mln1x77rwax7" + "commit": "7d0167ecd71b8a2b9cedc08a490107c36b9ada43", + "sha256": "1z4kgzw3al8mldzm0h697r2dig0fia5kicd5r1fv7j32wmp5qxcf" }, "stable": { "version": [ 0, 1, - 4 + 7 ], - "commit": "398ba92372cc37bae5d63e4d4c42e65edf7db74b", - "sha256": "0mdlqmdwv6kz8dqlzwv46rwz4qkr53a05kh8wgz5mln1x77rwax7" + "commit": "945f19455ae60e9b30910980142f67da91d9f001", + "sha256": "1fmzc5y6994mwd97dbgsmj154q9ci1d6d0w5p6a43hxfmgpnv3w5" } }, { @@ -94908,11 +96282,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20221031, - 1030 + 20230209, + 731 ], - "commit": "d0fd742a28e051b99490e48971dafd9766064553", - "sha256": "17jzl1njx420aram9p2kki1f1drwrnr0n6zglc8sv8azli0nxsq4" + "commit": "d00e9ffe3a7c450362d453e00b4adcb826bce464", + "sha256": "0gr7nb350mqdij12mwfvym4ivjm2ml0ckh262w1bb1yk4w6ciqzm" }, "stable": { "version": [ @@ -94998,16 +96372,16 @@ "repo": "wavexx/python-x.el", "unstable": { "version": [ - 20220602, - 2108 + 20230117, + 1408 ], "deps": [ "cl-lib", "folding", "python" ], - "commit": "fef5162af9dfc1225339098ae00e053a2e16b799", - "sha256": "17nyjvbydclp2v2nrmdayxic2mj7j0frksc359ad999r05qq0nv7" + "commit": "744924e7468200f3e8ac7ad60a496ad9d080308e", + "sha256": "127ddg5i31v40calvnd9r4d48my34wnaanaii70mr5jh1w6gw13v" }, "stable": { "version": [ @@ -95085,14 +96459,14 @@ "repo": "nryotaro/pyvenv-auto", "unstable": { "version": [ - 20220315, - 1606 + 20230106, + 415 ], "deps": [ "pyvenv" ], - "commit": "59ece8554bf249f30984c81c103a5704d2fb27bf", - "sha256": "1f599q5bd89k68s0m9mq08a2f3465j00hklnmbyv0cm3j0majwzm" + "commit": "b4365e60e3ba747a5fec8ca909f64fe8c73d8db2", + "sha256": "11js0zkf35vxbbvrxghv4c0i1j4ma6agdfl24qcvchd2wsnmf7mn" } }, { @@ -95103,11 +96477,11 @@ "repo": "psaris/q-mode", "unstable": { "version": [ - 20220306, - 1629 + 20221224, + 2024 ], - "commit": "3eac36d23131088e32057716a3241407fa8dc041", - "sha256": "1wlgkyh8ci03448n5fm0p4z7jkhbrvrd3s8rbxvbdbl6ll1d9x15" + "commit": "e18a7b40e876a5502d9d2d6d16a356295c555fab", + "sha256": "0p5m2hxmf7r9hr00kjhjgpvl2ddk4hwaw9s0m6rlpg9x24bmnzqs" } }, { @@ -95141,11 +96515,11 @@ "repo": "ruediger/qrencode-el", "unstable": { "version": [ - 20211010, - 1334 + 20230129, + 1750 ], - "commit": "76de0de6449031ef5dd3e73ea4ab820e0d58a0e2", - "sha256": "1b7z3nxwrgkw1p7dp6ibsvhvpyl2m881w9yr9qcmdrkf78cqlpvx" + "commit": "449befdf160c62a40961cd97f02bada75ffda5d8", + "sha256": "14fb0jbv3badgvrgav650n4islm3zqwcrfm1djsh06z88a4mc7hz" }, "stable": { "version": [ @@ -95158,10 +96532,10 @@ }, { "ename": "qt-pro-mode", - "commit": "e9af710be77ccde8ffa5f22168d2c8a06b73dd6a", - "sha256": "1k3ph9bqvvg6i6n623qrwdpsffs8w9rv9nihmlggb4w30dwqc9nf", + "commit": "9f7e0dfaed647cdfc77101f1f3ab98293a736cbd", + "sha256": "1w1ydl2dqdvj7hgnm7l426ifdssr59f3vxxdm81jr38w7lqfmwzb", "fetcher": "github", - "repo": "EricCrosson/qt-pro-mode", + "repo": "emacsorphanage/qt-pro-mode", "unstable": { "version": [ 20170604, @@ -95262,11 +96636,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20220928, - 919 + 20221220, + 1136 ], - "commit": "37962e3b264795b7a3593109c7f14dbf57d9b77e", - "sha256": "1xdqr73y8lpxhmgp1yrap3bw5pf8lhaw2v3jib1pka6aj40vi2di" + "commit": "79651cd0de497a8db18d79e7598eb01a4eec4f09", + "sha256": "1d5w4yq9ps65i82767h0jqybgpj2m9p3zryb0816d32h0bqyhxk6" }, "stable": { "version": [ @@ -95285,15 +96659,15 @@ "repo": "quelpa/quelpa-leaf", "unstable": { "version": [ - 20220704, - 635 + 20221231, + 1618 ], "deps": [ "leaf", "quelpa" ], - "commit": "dadbc96a3c806e1c2dd7614a44ccffa3ee673568", - "sha256": "08kqbpm9ns60v50viiwicmks960aaya8cw3kg8a0smkj9qlljc8k" + "commit": "296ef97c29d7540316441715b92f6d15430f3579", + "sha256": "1mcl6ziqqw1dh4kdz1ha8llk4yzljg0r5zrspyw6jw9c4dw4dwxg" }, "stable": { "version": [ @@ -95349,11 +96723,11 @@ "repo": "renard/quick-buffer-switch", "unstable": { "version": [ - 20201027, - 2307 + 20221220, + 1142 ], - "commit": "da82555f286588f171eed1de151325bbdd8cbd91", - "sha256": "1d84zk9a42lcxv95z6izvx30vrniccc88fbd5nmjcp58mq5xh2fn" + "commit": "280f67f1a5e02533573b45d585c222c937f11f81", + "sha256": "122wsgx0wrhk3c5jf2pwns11i686l6c1bcqaqb9qixg0d7l1cg2f" } }, { @@ -95428,14 +96802,14 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20221015, - 1114 + 20221215, + 828 ], "deps": [ "ht" ], - "commit": "548b64c3679ff058d80d0080c06d736e25611563", - "sha256": "1nbvp4vwiz3hd962db1gh4c19r4xj0p0rr6jbm34mbnm3bm0lgyz" + "commit": "7a89313c07a21eae9cd69a1a98e2a134d559e04f", + "sha256": "15z8ix2wi452zkh5qz1qlsvq8bnwjw8014k51i6rvw8aczm344lr" }, "stable": { "version": [ @@ -95593,11 +96967,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20221118, - 1721 + 20230209, + 1424 ], - "commit": "28d19dee861354d92108692dd80d9f18b2db0c46", - "sha256": "08blxg2ibf9nr2m1hhrw9l232a1zly44sw8xrzbznipv6s9388w1" + "commit": "947d9806ee27ef241643f978c7901fd1f9e10c98", + "sha256": "0szcdddfcifawm0b2yvc7rb5w4w1w7znpvi65yg5p2hnwgninqmy" } }, { @@ -95660,11 +97034,11 @@ "repo": "thegeorgeous/railscasts-reloaded-theme", "unstable": { "version": [ - 20190308, - 759 + 20201130, + 903 ], - "commit": "c6a1cf13a164f22b026b0959527c3b98c2b1aa49", - "sha256": "00clkjrp2nfchhznilxjb56bcdv1an50cawnz6747ck22x0ycbfn" + "commit": "1c3850568e60a555d59cbb57bf2b6aa06e99d454", + "sha256": "1z6nyn2galkp9c06n6k431rqm12wla24pa0bmwqjbbhz4jz5dxf2" }, "stable": { "version": [ @@ -96092,8 +97466,8 @@ }, { "ename": "rcirc-alert", - "commit": "735aa2256660efffdaf6ecbd61a3e2818a48327f", - "sha256": "0lyd3gz1sflp93xb7xbvk1gh69w468ync1p144avyh2pybl40q4a", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "03ysdgfki2yn4cn85kmxrhrrlrzjd9s26p93zh46llghgwa12qrd", "fetcher": "github", "repo": "csantosb/rcirc-alert", "unstable": { @@ -96433,15 +97807,15 @@ "repo": "realgud/realgud-lldb", "unstable": { "version": [ - 20220419, - 2006 + 20230201, + 948 ], "deps": [ "load-relative", "realgud" ], - "commit": "19a2c0a8b228af543338f3a8e51141a9e23484a5", - "sha256": "1yyh945w13qh8isj5p0v8sjwzmvzh330szd2hdy3fgc3d58r7sym" + "commit": "74d442abc8469bb6277702f9c60fa479848009b2", + "sha256": "150p7yk0x4apszvkh6sv9iwjv5amzjvlj9ydk9w46bxfypxr29p1" }, "stable": { "version": [ @@ -96754,13 +98128,13 @@ "unstable": { "version": [ 20210930, - 159 + 207 ], "deps": [ "cl-lib" ], - "commit": "42cad906652a82c8c932b90fa04593702ae6f0ac", - "sha256": "1zrb9hix19363z1z4fvnc79wq4lh6f6q92df6dn7szb12xs4vhq6" + "commit": "94b31f6bf1dab6af942948fec975e37424938a62", + "sha256": "06kx2aykxzj60axsxjvqx2j8z3p19k47i0prbqfg78cjgv7fdwy6" }, "stable": { "version": [ @@ -96802,11 +98176,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20221017, - 37 + 20230109, + 536 ], - "commit": "44d4e57a2bfb401c282e4a460db755680e896de9", - "sha256": "191mw99sk027jzhp6gn9g4mx6a318bycfyjdmgsdhms21lxjz0j0" + "commit": "837965094aa55bbba9a62f9612e59c5440cbfc71", + "sha256": "1kzfc4c9iibacrlqp1fzm5cgpl0xpxcrsf56hi2g27cgspj9r5ya" } }, { @@ -96893,11 +98267,11 @@ "repo": "ROCKTAKEY/recur", "unstable": { "version": [ - 20211108, - 219 + 20230121, + 1836 ], - "commit": "cac3120451482516b6e4416b47dea9980f145889", - "sha256": "1pawb3gzqc8dafrqzi4c96gpx9qzibfqh0gpx6cm0glpxqir8mag" + "commit": "043b3267125cb9fa273d0f0afee0dda1fc60c507", + "sha256": "1wn4ayb1f186k1h0c4p893gpc3ldlslrj5wh1jqrv1ffqlnn4lw9" }, "stable": { "version": [ @@ -96917,19 +98291,25 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20221016, - 1015 + 20230215, + 720 + ], + "deps": [ + "compat" ], - "commit": "ba3cc0765af966e8acc27f6606c8918f442e37e9", - "sha256": "1rq2c5jvs0v9z7zvvs6vynchmaxaznw8jw00qbw5y8hq0alifi3g" + "commit": "31b67c17467fd8808efdc9875c9e8115f7b4b534", + "sha256": "1j3q99hlzr6is7w0062mfryqkw3nld3md0qwqgbklzhxngy3vpfi" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "ba3cc0765af966e8acc27f6606c8918f442e37e9", - "sha256": "1rq2c5jvs0v9z7zvvs6vynchmaxaznw8jw00qbw5y8hq0alifi3g" + "deps": [ + "compat" + ], + "commit": "31b67c17467fd8808efdc9875c9e8115f7b4b534", + "sha256": "1j3q99hlzr6is7w0062mfryqkw3nld3md0qwqgbklzhxngy3vpfi" } }, { @@ -97361,11 +98741,11 @@ "repo": "DamienCassou/related-files", "unstable": { "version": [ - 20221101, - 1909 + 20221125, + 1824 ], - "commit": "4085ed9c235983e530da24cb1fbe33a5b7928ab3", - "sha256": "1nnhggbxgvl9h5k796kq3ni2jvv61kki68f3yk54s6yc9h2sgn6p" + "commit": "0c2e38d0bb0db45a50a082d3e8362c07fc60a1f2", + "sha256": "0n87x3ilnn7kc607pa5zffrkpbnkv4xa9hlzyx8ga8xj756zk558" }, "stable": { "version": [ @@ -97385,14 +98765,14 @@ "repo": "torgeir/remark-mode.el", "unstable": { "version": [ - 20210504, - 1238 + 20221123, + 2127 ], "deps": [ "markdown-mode" ], - "commit": "9f15285445fdb53e720ffe72f5cf05231d340906", - "sha256": "0mgkcdagj4n47nahsxnk7l1b4v15cbwqaac4fr8809jvis1rfx5g" + "commit": "5a2a702d2af8fd007ae02237d5824356d0c1acc6", + "sha256": "0b6gk1r90m4wrmn0aimlz4xmpk7jnfm38ri80vpikm3alds5wp7d" } }, { @@ -97453,11 +98833,11 @@ "repo": "karthink/repeat-help", "unstable": { "version": [ - 20220718, - 1742 + 20230118, + 24 ], - "commit": "bdc21d9a8846b4adf63dd9317860666da5ade478", - "sha256": "1bvgq9amnawyv3k1vbalvlfw2r2z1yqilwllcsanlrdcz95awcv2" + "commit": "41dea6fba2edd6ac748d0ca7a6da4058290feede", + "sha256": "1lnwb2z8y9cjah545n27j62a5pdksid0rah2bzws9xi8c7dgavkm" } }, { @@ -97682,11 +99062,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20221115, - 1450 + 20230127, + 417 ], - "commit": "eb66f05fe37f22228f470882b04a6362683975e1", - "sha256": "0g6n9bajgs7mgw9qlx0kin109br92wfn5py5zby674khxvppxdf8" + "commit": "01e338c335c07e4407239619e57361944a82cb8a", + "sha256": "1arhjsybb1nhq14p06jzbvp25pyp1pddq1ldyq25vj1qrsh81rjq" }, "stable": { "version": [ @@ -97857,11 +99237,11 @@ "repo": "pashky/restclient.el", "unstable": { "version": [ - 20220909, - 1233 + 20221203, + 1808 ], - "commit": "1fb570643b08ba66eb70831b6f874f52546917f1", - "sha256": "0npij1p1yw4p1f1yrx6bl8q18nav5p2xvbp7qhzhn7lb2fdn5jqv" + "commit": "0ba72816f92f3d5906cdf76f418fd0a3ee72809b", + "sha256": "16npyzj4d9qaby1nw8dhs5llqkl2jdy1gmxjayjvn0chkjlidq9x" } }, { @@ -98033,14 +99413,14 @@ "repo": "a13/reverse-im.el", "unstable": { "version": [ - 20221103, - 2351 + 20230125, + 1846 ], "deps": [ "seq" ], - "commit": "542a3f7742d2f7878f1509bd193d137b5bba8e7b", - "sha256": "1j3sca85q5kd9b2h0iyy2pml1md6jx0q36c3y948svdil11hxv92" + "commit": "83c639756357c6b154842997b86e63c583ff8ff4", + "sha256": "08nnm6kvndsvnk7l1zr0zmbc0f6wsrfq284n80m2sxhx428k5jwh" }, "stable": { "version": [ @@ -98066,8 +99446,8 @@ 20141205, 145 ], - "commit": "13d0821a4ec5ece7e6a81f50d2a1a7e7ad21394d", - "sha256": "1sfl0rm4sxjkcjki0hmkkcicr24qr2q7gmficg9bi5q6vlrid1pn" + "commit": "3105c950bcb51c662c79b59ca102ef662c2b0be0", + "sha256": "15xnz4fi22wsximimwmirlz11v4ksfj8nilyjfw6acd92yrhzg6h" }, "stable": { "version": [ @@ -98086,11 +99466,11 @@ "repo": "ideasman42/emacs-revert-buffer-all", "unstable": { "version": [ - 20220731, - 2351 + 20230109, + 536 ], - "commit": "c07996fcf3e8f7ee156055327522586f32582ce1", - "sha256": "16288519g1q07rkg8j3kmxv6lssjl04kw7ni4mj44jfgzimm6vn6" + "commit": "08e90d2d75f5d5900ca2a0d2670592bcf2b2d68f", + "sha256": "0yiki0vlxa7xkw19c4gwf5cxl32bhd2nm6ibpfamsh145gq4i8g7" } }, { @@ -98131,23 +99511,20 @@ "repo": "galdor/rfc-mode", "unstable": { "version": [ - 20221013, - 1342 + 20221123, + 1643 ], - "commit": "93208d44516e1f4c6e181ee5d374f2dbd7199d0c", - "sha256": "0rxsmxk3kdlywmyaw2nrq26hqb84l46cj56l1f15b98c3m0pzxzg" + "commit": "53ec006aa6aa4fae9c6c64004692aa3d01b38275", + "sha256": "0qfl774796wpplzsv8ns31472615sb6hh6r7z2mvqhm3i0a5d35z" }, "stable": { "version": [ 1, - 3, + 4, 0 ], - "deps": [ - "helm" - ], - "commit": "02546beecf4c495940885e7b7b911d84b12646ef", - "sha256": "1v52vbs2zbqv62wcgcrqgjcwcdq0w6hdb14nma4yhqldnqi57875" + "commit": "73bb2a18bb34136c9eeddef5f138840872ece752", + "sha256": "1b4wd9ny6rmlw0cr2kvhs0kn33gx0zq4hv6vgr91a9wwj5y33lav" } }, { @@ -98158,15 +99535,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20221024, - 1631 + 20230201, + 1819 ], "deps": [ "transient", "wgrep" ], - "commit": "3880e8c734c976a2d393aeacf60d510f56d8217d", - "sha256": "10rbfncv2baz28zls0zcqbz5gahbvdi3ixab4cm6gfm13xbgwvf7" + "commit": "e7afc1573922dd6ec8e8ccd178e054ff8c99e5bf", + "sha256": "0cng9kra880gma19jl9c8wwrsz94qcha7ymjrw279zq3244750j1" }, "stable": { "version": [ @@ -98386,8 +99763,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20221112, - 1341 + 20230212, + 1425 ], "deps": [ "cl-lib", @@ -98395,8 +99772,8 @@ "popup", "posframe" ], - "commit": "74f3dff40e66c65388a9471eecbc1d9aca5612f7", - "sha256": "1bqhn6pvsgs1x882q7y5p372aify2jmyfmgmx99nzakxbfkb0yqp" + "commit": "6438abacace7d94f05fabc45b82d619677fc5fca", + "sha256": "0fyv92lfz7c98l79valrh9wr78b4303bhnqjgycbz33p9m2hply0" }, "stable": { "version": [ @@ -98465,6 +99842,21 @@ } }, { + "ename": "ring-mode", + "commit": "7e72e31f9f7ce02c68560e6ce3a0eab27f0897de", + "sha256": "1nhc1zn9rgkpz0z076b1r45d7mvxp7layc9jbq1qlj7vj0w8gr4d", + "fetcher": "github", + "repo": "thechampagne/ring-mode", + "unstable": { + "version": [ + 20221226, + 1159 + ], + "commit": "4e38dd5ca374d7d40fd1eeed1e83ef935efd387a", + "sha256": "0972ngw1qybxh3vs2vfbpy1wq8bircvgxqfg6pyg3ynhfnjzmfvj" + } + }, + { "ename": "rings", "commit": "113118947e33ab0c8004dbe9b188eba2ea282356", "sha256": "1ncsb4jip07hbrf1l4j9yzn3l0kb63ylhzzsb4bb2yx6as4a66k7", @@ -98556,14 +99948,14 @@ "repo": "felipeochoa/rjsx-mode", "unstable": { "version": [ - 20200120, - 1446 + 20200224, + 2149 ], "deps": [ "js2-mode" ], - "commit": "014c760138dac5ae47ed3eade62f4a9f765f52b7", - "sha256": "1ahipwncifvbyv9x9gn35zkc1q9y41j0zqgsf9s31825zczgwrb7" + "commit": "0061587a06cdc2579a8d0e90863498d96bf982d8", + "sha256": "08b4hdgq4hc1yfd9pvyir2j3cqqdqa3j5svgaba97x5fzhsz7y8i" }, "stable": { "version": [ @@ -98601,14 +99993,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20221115, - 149 + 20221207, + 225 ], "deps": [ "inf-ruby" ], - "commit": "c29b47f588715b911da4588a59f3a5245f844138", - "sha256": "05b60l9pn4hh3fdxlk0q98qi2w283a62x7jw02v958y33p030bqd" + "commit": "4ddcc847542ffbba41339e83e462c7d9aaaac860", + "sha256": "1srd3rlvm0bg0i592zw41nbf73w4c92mcsv0isih62686237gnzi" }, "stable": { "version": [ @@ -98772,14 +100164,14 @@ "repo": "Dragoncraft89/ropgadget-el", "unstable": { "version": [ - 20221006, - 1105 + 20230107, + 1225 ], "deps": [ "transient" ], - "commit": "03305f2d73d7092adab495c45b15c8f16f292c8f", - "sha256": "0h141q39ij5bggvs4nq8532vdji29pxaaxszahlhabz5rz44wrf6" + "commit": "10e9d6f66de1ee805d871c59f4acc078b66747a3", + "sha256": "1dxslv3akgv60i45d6i4s4140v6n2jxbn4yhsqf59z0dxdpskkgc" } }, { @@ -98790,11 +100182,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20221031, - 2003 + 20221212, + 1047 ], - "commit": "3c4be0ec8dc14d69f2f0b5f46521edf60535b12d", - "sha256": "1srrm2i0yff0dns6rk5wzj8s1hnnbki6ijvih6gn6pfqz3ndvpn6" + "commit": "b437e46bee8f64eec1b8e61f86476977dab6cdb4", + "sha256": "0vbadwr5gmr7px40mhphm4v11ix302bj9f4m8mw7h5mwm8y84skb" } }, { @@ -98868,15 +100260,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20221018, - 1123 + 20230201, + 2008 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "4437a243b2042585db994d77e6b7c85864a8d11a", - "sha256": "1ynvrly22v4jzydr168534xl5kxxnbxg7wm15zj4bjiiq1b47b5z" + "commit": "62853a428b416e6a5fd3d8f57ff83a1798188a3f", + "sha256": "09jmyym1jrr6mj2y2fwgmx5bcbmpgyr1msqnjpsn9qxg24jalzdb" }, "stable": { "version": [ @@ -99030,14 +100422,14 @@ "repo": "jimeh/rubocopfmt.el", "unstable": { "version": [ - 20221024, - 2139 + 20230204, + 1110 ], "deps": [ "cl-lib" ], - "commit": "9b0023158cf2517fc07938f678fac8b67f1c6da3", - "sha256": "1gscj8k82gx3qrq38wvg29jqd8kk2b1qdg2n5s31dcs2sycb5fxi" + "commit": "1c6f4f1da755c9e60eb475eb9530320726904341", + "sha256": "0ng8j835cyzb18izl3syjllh739mkv2cb53zrkjkm81wi1c3ws92" }, "stable": { "version": [ @@ -99113,11 +100505,11 @@ "repo": "rejeep/ruby-end.el", "unstable": { "version": [ - 20141215, - 1223 + 20230205, + 115 ], - "commit": "648b81af136a581bcef387744d93c011d9cdf54b", - "sha256": "1cpz9vkp57nk682c5xm20g7bfj5g2aq5ahpk4nhgx7pvd3xvr1ds" + "commit": "1c87e214de6a75936b89ab50ee5fe522b87b009e", + "sha256": "1y22hn1id6akgx7n295rjlj58qid76vwanhwv58l30g8phg8ysf7" }, "stable": { "version": [ @@ -99321,10 +100713,10 @@ "unstable": { "version": [ 20211205, - 635 + 636 ], - "commit": "8d7a0b2195111713d227f2a9c52343a0251cd06b", - "sha256": "1qi4iv88kz4p78br5rp917h1gzgfb876yp36zh8psj7pw1qb46i7" + "commit": "99b53f7679e3eb868e4b4585085bbed102e5fce7", + "sha256": "0n16al1nx7r98wbwgrq89yfs581wp6nbbhkns1z5qlqmc21brcqr" }, "stable": { "version": [ @@ -99359,11 +100751,20 @@ "repo": "bard/emacs-run-command", "unstable": { "version": [ - 20220821, - 1421 + 20230131, + 907 + ], + "commit": "e44bc5fb9712303150906f05ce7dd41c8c184aea", + "sha256": "0msbyy92gm75r1g70vg5901n1q5y4p7qnhfhgdnid5q59gd5z5dr" + }, + "stable": { + "version": [ + 1, + 0, + 0 ], - "commit": "0ac25bc1acae652ffb58c48a3853cd1dcd7b40a4", - "sha256": "0c455f4jv0c2mmvk37s3cs56gbxbw3h6lbc53q76xnm16hg8b0nv" + "commit": "e44bc5fb9712303150906f05ce7dd41c8c184aea", + "sha256": "0msbyy92gm75r1g70vg5901n1q5y4p7qnhfhgdnid5q59gd5z5dr" } }, { @@ -99374,16 +100775,16 @@ "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { "version": [ - 20221023, - 1807 + 20230202, + 1326 ], "deps": [ "dash", "f", "run-command" ], - "commit": "ca44efc45b906bd377871b876171476f977e9fc1", - "sha256": "10i801x33ld4x7gyfc6fvmhc292hd9dn20qqvyjf1wiqijb1nddc" + "commit": "60e6fdbe6e8bea3871674a0e5779324ed5dbd318", + "sha256": "0ngdxnjz3mvxyzmg00rs9mxy6b2zg86nsplhn0vmbxln133p73jr" } }, { @@ -99394,11 +100795,11 @@ "repo": "ideasman42/emacs-run-stuff", "unstable": { "version": [ - 20221009, - 2235 + 20230115, + 633 ], - "commit": "984e5219adbee369487768a3ad6a408515e15446", - "sha256": "0k4m4rab3dqcsww3c9wz9d3ms7z93nvm97s94gy6i27xw3na5hca" + "commit": "40ac5b62ee655dbba779488d96d844d929a1b6cd", + "sha256": "0yn0mdj4f06v79w4nwq0y48iqr7kgy4qrpk6ws4pjsvcbxqa2nz3" } }, { @@ -99410,10 +100811,10 @@ "unstable": { "version": [ 20160524, - 743 + 1048 ], - "commit": "e7394d7c9e886788a656a7085b4cf963d6fc318f", - "sha256": "0gpfszp6bqr3vdr32vr6l0nq9hnic31vnins68hc5hknli91bpsq" + "commit": "a211d57ddc600410d07a8b534920ba905b093d87", + "sha256": "1ddf5jydpc43wgvw4a669wifij71b4r8zfazcqfdpyfh1j4m591b" }, "stable": { "version": [ @@ -99463,6 +100864,21 @@ } }, { + "ename": "russian-techwriter", + "commit": "23dba361611cc1325d79e307e0b94c3e5178a3f9", + "sha256": "07nrdj1gyc2gry32l8q6n6k5nbpiqcfpr8yv02lgrdhhz2mf4sy4", + "fetcher": "github", + "repo": "dunmaksim/emacs-russian-techwriter-input-method", + "unstable": { + "version": [ + 20221229, + 822 + ], + "commit": "1d86134d04ecf2305969c7546ead7ad425cd7243", + "sha256": "1d170cjlrpabivqy5xdlq9hykhr6gxmghvhacp1sj8288jv63jjs" + } + }, + { "ename": "rust-auto-use", "commit": "a9584d883934e36400ec1924755df34149ad2f9f", "sha256": "0jdg8xgxry0h9nbb9m446gpw54rymw3152n84lvsg5bv51861114", @@ -99485,11 +100901,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20220919, - 1051 + 20230112, + 27 ], - "commit": "1d24ca2e6c18cd036f00e930cca64f44db04fb67", - "sha256": "0wmsrmrbqkd8wfysqkxxks613v9ar31vqkk5zsjdjyc7a6j1xw3s" + "commit": "c12348e40531fc7e7325368621a0e5f8031d99b2", + "sha256": "0sy7v0j81qd1mdq862zm0a4nf3g3wyyjjy3kjlmd9kb3l3f5rh0q" }, "stable": { "version": [ @@ -99532,8 +100948,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20221119, - 1151 + 20230130, + 912 ], "deps": [ "dash", @@ -99547,8 +100963,8 @@ "spinner", "xterm-color" ], - "commit": "1dfa9b5dfbab261bda7555e675ab2b6db13d0be2", - "sha256": "1lara2q3m2mxfxk8bjhal58gqwkaj1rmh9v2racydzp32hjwk6xg" + "commit": "a5fc66c8167a827a57c4426e4b8dbe717b3be43c", + "sha256": "1kg1brqy6bv8z2qw4q3f70az3mcz26pb387qrjlx2ik027zyr0ih" }, "stable": { "version": [ @@ -99622,11 +101038,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20220103, - 940 + 20221221, + 1355 ], - "commit": "0a61eed4d2917422d6401b6abe2037c26dab658a", - "sha256": "1w47wr1hkq6ghw3h9vxw74amnlzpji35ji5250l8gk9k7nr366ss" + "commit": "b9e6a0f33b9e2aeb6088accd23ed312083d8f707", + "sha256": "1kk3szdiqk3860wfjdfzv8l0fc303gr8gqnj2ynplpq0jp16lviw" } }, { @@ -99883,6 +101299,24 @@ } }, { + "ename": "sas-py", + "commit": "57e899a387de8d66bb9135bb8f66b2b03cfb2585", + "sha256": "0sckayc7yix5vq8nphw31rrvy6g70lbf23i5vmq5nhsqh7hk1mr9", + "fetcher": "github", + "repo": "ShuguangSun/sas-py", + "unstable": { + "version": [ + 20230131, + 523 + ], + "deps": [ + "ess" + ], + "commit": "76a2226eb49ec37f211904c6395ee066bd440560", + "sha256": "0fgb5pd9zmc5n9x3aqkylpv57bdv6ck8bcrw7sj0xyzz2333pvc5" + } + }, + { "ename": "sass-mode", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800", @@ -100081,19 +101515,22 @@ "repo": "openscad/emacs-scad-mode", "unstable": { "version": [ - 20221114, - 559 + 20230218, + 2025 ], - "commit": "188c9708e06f59c580866e4b9ead81513dc92df0", - "sha256": "08l9kxxzzm3apfrrwvkqsxyscal8357b7w87c3aagbbwvmxc3zfw" + "deps": [ + "compat" + ], + "commit": "3be01e4213f6828234e73c1f7ec66c0fb594abef", + "sha256": "1pppds3zbyhxqqwslar9bb9l7arcia2igajchxpaf9l8yxf8kw3c" }, "stable": { "version": [ 93, - 1 + 2 ], - "commit": "efcc16b1af3c3e2262fe75e9eb0f2ed30547da3f", - "sha256": "1785fyahlqs7fshvcsa2vpvdi2q1qza03iii984xc260dc4wqv5v" + "commit": "749b11df1d3041aa0a90542cba0fe5d9563c3a1f", + "sha256": "0m87rjmr4990vhakb7jg4nkkn7lp7kiva446j2z5pq7mmhlyxdbc" } }, { @@ -100229,8 +101666,8 @@ }, { "ename": "scion", - "commit": "faf180d15c3847fc6f832866338494dd99b6654d", - "sha256": "17qmc7fpvbamqkzyk8jspp2i0nw93iya4iwddvas7vdpjy7mk81d", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "18nh0bch29ikd2ang7w36n95a5sf3halvlz0dh7sh4zxcpp00n2s", "fetcher": "github", "repo": "nominolo/scion", "unstable": { @@ -100264,8 +101701,8 @@ }, { "ename": "sclang-snippets", - "commit": "680e5757e074c16efd31084a7dc5dcea339597f5", - "sha256": "0q1bh316v737a0hm9afijk1spvg144cgrf45jm0bpd60zhiv7bb2", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0d01grpq2zqqdpgh8jwn2428h3xinfkx1cl4lbh0nv6m9pbrvzbb", "fetcher": "github", "repo": "ptrv/sclang-snippets", "unstable": { @@ -100288,14 +101725,14 @@ "repo": "technomancy/scpaste", "unstable": { "version": [ - 20210223, - 1902 + 20221125, + 1731 ], "deps": [ "htmlize" ], - "commit": "4ec352fb9fe261ffb8b78449dea986dc34d337b3", - "sha256": "0219jzj3rwcx4k6f4grzrarq0v05jgmmracis3jb25rv0cln3i9r" + "commit": "56c67ef63be86ef1f03e15a62ad17c3983e1e5dc", + "sha256": "1ndfcb4zj4vangav1n5g6mbf7ys3a5kw1q4a7dnr36f2n2f6rnb4" } }, { @@ -100383,11 +101820,11 @@ "repo": "thisirs/scratch-message", "unstable": { "version": [ - 20211221, - 1527 + 20220209, + 2207 ], - "commit": "efb2db33e52e5d4a4f1bafbd8b459a3b91c3c87a", - "sha256": "117a3v3s94jra3dlsaafgg6594gw6gbdmh1ay5zar5yjy7q6pi2f" + "commit": "0d4198f6effd8f118bf03ee4979f566041ef6a9b", + "sha256": "0xh67x7pkmppbiacpw3wqipji3na0plnlswvnd355kz2gjab3hhp" } }, { @@ -100465,11 +101902,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20221030, - 2303 + 20230201, + 128 ], - "commit": "a11a242b085f6a4bd64c2846aeed220528572956", - "sha256": "07210wrnxzyq9q5kzsv3gaz9cm9cy8aqbaawhsrqr47jhyngzklp" + "commit": "12101b8cae16ef7d22013aa131d8d7c2808b5f48", + "sha256": "1mak69rlv9v882mi7n94sp7aw1la00qxn74xdf20wahlgrjr9l20" } }, { @@ -100480,11 +101917,11 @@ "repo": "ideasman42/emacs-scroll-on-jump", "unstable": { "version": [ - 20221029, - 1138 + 20230201, + 141 ], - "commit": "b0525ea8812579b11428f3bd0cebc41dcb192ef0", - "sha256": "1qvv36hmm7yb5m2khlv115rfh8m0s9lhg6jda0dwgs3nifhgxf8v" + "commit": "220e4a8f21cc0b430c693a3ecac08156da2602c1", + "sha256": "1dr41gbk4rg5fa288bp5vnyzmyxrjvvlvn1syp5sjh31ypbw6jkz" } }, { @@ -100575,10 +102012,10 @@ }, { "ename": "sculpture-themes", - "commit": "408a269ccf0d938c3248880c5220b5b0b979f271", - "sha256": "1zyiki3raldp4wnhjsnfc5rzs6pycbagfp7qjjjxz1qgqig36wbw", + "commit": "cd55f4fb3501225f722103953ac1ac9adc42d52b", + "sha256": "06p5mpi018nb9xpf3kdn4lqm8nbak4x3afzgbnk2bp1aiz38qk7n", "fetcher": "github", - "repo": "t-e-r-m/sculpture-themes", + "repo": "precompute/sculpture-themes", "unstable": { "version": [ 20220601, @@ -100870,17 +102307,17 @@ "repo": "Kungsgeten/selected.el", "unstable": { "version": [ - 20220509, - 1810 + 20230219, + 1328 ], - "commit": "81cb32521a05ff2a9125e001b83608e108e480f6", - "sha256": "0zk5fnjw5czq71z3qgi7kl9r5y3cw5mx1hswyhli7xhxzjpldxp4" + "commit": "1ca6e12f456caa1dc97c3d68597598662eb5de9a", + "sha256": "11xjv861mx15fhvv8g67ahri5p8mplnhq9sf30c825bk1f0h7xzy" } }, { "ename": "selectric-mode", - "commit": "08922071b9854142eab726302e75f1db2d326ec5", - "sha256": "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1ih3n2b867p09r1hnia22f4cj46iqfkdqlpmphix241d9zph6r30", "fetcher": "github", "repo": "rbanffy/selectric-mode", "unstable": { @@ -100932,27 +102369,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221118, - 307 + 20221216, + 112 ], "deps": [ "prescient", "selectrum" ], - "commit": "a000de747515aa7e7ad1ea0eab711864a4be0ab5", - "sha256": "1d1d4msmkc0cvd6vva0pfq72i07p0my9wj2s8zvj60pvah620yl0" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" }, "stable": { "version": [ 6, - 0 + 1 ], "deps": [ "prescient", "selectrum" ], - "commit": "c28bca2213efd2666b0328c29f2c26e9b603cc9a", - "sha256": "0156sbs4b535mcwm44qjr8lx48svmjvdqh8c8hr6d0l709f27yq3" + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" } }, { @@ -100997,15 +102434,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20220720, - 1346 + 20230104, + 1321 ], "deps": [ "apel", "flim" ], - "commit": "ac3e726ca94ed245c25881ec8d7177d0d834ea6a", - "sha256": "1bg07y6svvg1mmlr455x3j1anjp3wbv27s6b2inp294rbwprm41n" + "commit": "7d8df0ef2f483e2dc063a72099295f467e6bc2c8", + "sha256": "01dn91xjcl7p5rnbgyh5l4kdlqx31s0gw5vh7hhcapbiq8rihmjd" } }, { @@ -101149,15 +102586,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20221117, - 642 + 20230201, + 752 ], "deps": [ "dash", "edit-indirect" ], - "commit": "91a41ff8044e7cbeb82159f6c595393606e5e744", - "sha256": "0bl6wvw1z5bax4msmdahxi0y4cp85nb4s90j32r8vzn41s3pyabz" + "commit": "03e356f1a645a884921975890899fb47acf7d00d", + "sha256": "131n9w1xjgxska2zmf96px05ll4s3bh0mbrw52r07iaqrr8jhskg" }, "stable": { "version": [ @@ -101283,8 +102720,8 @@ }, { "ename": "serverspec", - "commit": "5a4f4757d8886d178a85d4bc8ac9399a99d8c4d4", - "sha256": "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0avyii5xif5dxipmrgf1slp09g8j73565bkc1a1j07p08vrap9c5", "fetcher": "github", "repo": "k1LoW/emacs-serverspec", "unstable": { @@ -101650,11 +103087,11 @@ "repo": "qhga/shanty-themes", "unstable": { "version": [ - 20220816, - 1830 + 20230123, + 2111 ], - "commit": "9ddd8ccd94b51ad5b19ee7097dcfccb3588b5eef", - "sha256": "0j0vf6v4cw9v661zk1hcm3cnxl0lgfk5bpd7xwdah8v38mb02k8w" + "commit": "3f678d953771c4a109bd16f6d7def6bd9bbc811d", + "sha256": "067py5xhlq7qpps39r0wbxlc61br84bgfgad3cm54j2z1kyd1msz" } }, { @@ -101680,14 +103117,14 @@ "repo": "sebasmonia/sharper", "unstable": { "version": [ - 20220510, - 2001 + 20230129, + 1827 ], "deps": [ "transient" ], - "commit": "8020a5da0327f9a18b4bdab474bf8d81c1b38ea7", - "sha256": "0nby923h8hprxqyx48592q5584p8rmq3zvi12g2fbglabff76bmp" + "commit": "496e90e337cb09329d85a6d171c0953a85e918fe", + "sha256": "1a8x6mywxkhcc34lv0s5gq48vnhnq0cir0841zbkdjp1fviyx7j6" } }, { @@ -101867,28 +103304,28 @@ "repo": "mhayashi1120/Emacs-shelldoc", "unstable": { "version": [ - 20200513, - 1206 + 20230207, + 250 ], "deps": [ "cl-lib", "s" ], - "commit": "fa69f67b6229fad3f31d936955ca8d1982009b77", - "sha256": "0ma5j74vkwax9ha945dcgbmf3r4gajj4nvl63pbfyvxvy6svn84r" + "commit": "178d78d08e94b273b23ab1a32c5be509fdfe2286", + "sha256": "1dqdh2rd0v136ckj4wp00g3gsq0lrzicwl1c60xacy548amdxq07" }, "stable": { "version": [ 0, - 0, - 5 + 2, + 0 ], "deps": [ "cl-lib", "s" ], - "commit": "1d40c73969347586906ca1dde2adb50afcd73b1b", - "sha256": "1nli26llyfkj1cz2dwn18c5pz1pnpz3866hapfibvdmwrg4z6cax" + "commit": "178d78d08e94b273b23ab1a32c5be509fdfe2286", + "sha256": "1dqdh2rd0v136ckj4wp00g3gsq0lrzicwl1c60xacy548amdxq07" } }, { @@ -101937,11 +103374,11 @@ "repo": "deech/shen-elisp", "unstable": { "version": [ - 20210530, - 349 + 20221211, + 1313 ], - "commit": "dabb829d0d86f454ceb3b0846cdfc11af1f91cc7", - "sha256": "1h7v3bbljkw7lsxz4ijvw47c6fj070j0p268v4il2xh2mzw1nhjm" + "commit": "957ab44654fc7a7cc1b78181d244fa25166f9b09", + "sha256": "0xfs48fryqjaiy9w7rwxsi9g950gbjq6haacah1lf8h59pa9ff2w" }, "stable": { "version": [ @@ -101960,20 +103397,20 @@ "repo": "redguardtoo/shenshou", "unstable": { "version": [ - 20220808, - 604 + 20230116, + 805 ], - "commit": "25903d642e81f33abea84573979af2a373f5b5b0", - "sha256": "197gs31nb8aa47q1jv6zfrrbbi09n4kbjsdlvi7zviy6xi2723c7" + "commit": "763f28b2d132ed94bb57ca08ef12ff1454b7f7d3", + "sha256": "083csvlx87jj96zkg5nni0rzw831xyaghl9vy76iggk9jyixd60z" }, "stable": { "version": [ 0, - 0, - 9 + 1, + 1 ], - "commit": "25903d642e81f33abea84573979af2a373f5b5b0", - "sha256": "197gs31nb8aa47q1jv6zfrrbbi09n4kbjsdlvi7zviy6xi2723c7" + "commit": "763f28b2d132ed94bb57ca08ef12ff1454b7f7d3", + "sha256": "083csvlx87jj96zkg5nni0rzw831xyaghl9vy76iggk9jyixd60z" } }, { @@ -102055,11 +103492,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20220823, - 543 + 20230127, + 612 ], - "commit": "e185b54d13fb7eac7d045daf6a83731d9ef79231", - "sha256": "0mbv68g1q98dysjvhdxwf3gcwwmihy6ni3b4r4kz6klyfr2jwqim" + "commit": "e556f82247918bdc33acf01b29917314b8b9e22b", + "sha256": "100qw0wfqy0ff7c2k4lbwcanvqg42ai7q0h0c8y4xx2snidfm4zv" } }, { @@ -102400,11 +103837,11 @@ "repo": "riscy/shx-for-emacs", "unstable": { "version": [ - 20220424, - 2124 + 20221224, + 2230 ], - "commit": "db82bd1452928a1151badf7a28ace9d68b265532", - "sha256": "1bpzcwsc5rjgdrkripifgw1bwd8xpj7xyw8kpxjhnz29j39xflfl" + "commit": "b99d16f36bc278d668d8428c4bc9af77064c336a", + "sha256": "1wkqnc5n8if8fsh7f3bdr5nzn6dbj1nzdxlmnz8nflmx4g32fp6v" }, "stable": { "version": [ @@ -102508,11 +103945,11 @@ "repo": "ideasman42/emacs-sidecar-locals", "unstable": { "version": [ - 20220921, - 501 + 20230109, + 536 ], - "commit": "4175fe207de8530474c4ec368d4507ddf97dc412", - "sha256": "04abaql2l8y8na0rcl8hhpc7bjyiv2bylvvikcpzazdj75zgjcni" + "commit": "882923811e9de84c8ebc2f9fe65e9673d7d1f469", + "sha256": "0xba64lgfvybnmbzvlp5b7hlx5s7aw7i51g3ydb2zbmibbi11405" } }, { @@ -102523,11 +103960,11 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20220922, - 508 + 20230216, + 843 ], - "commit": "0bfdb6274cda0c19424c78804086ed93df96b4bb", - "sha256": "0qmva8bhanlrm3s46kmamx4zcais1hxm26gjq4d3q2z598bq46a5" + "commit": "0441f2c308eb9316f01d721a949ba73b6df8c4c7", + "sha256": "0jgkq8x0p291j8rig2hp1hcxiyf8ln9nh8jdbnhiijk229v3wka2" }, "stable": { "version": [ @@ -102547,15 +103984,15 @@ "repo": "emacs-sideline/sideline-blame", "unstable": { "version": [ - 20220629, - 801 + 20221231, + 1636 ], "deps": [ "sideline", "vc-msg" ], - "commit": "6e9fb45caea9031554e6e2110e39e219a407779e", - "sha256": "00a75fl7akwvn04icz79zhl4bk940y2hc6yvm2977r4y9wqbhjj0" + "commit": "1a1d80a71bdabe77fe2a33cd681b7188f193acfc", + "sha256": "1w05825diivgbbbggval1drhnipi4iib1hv5ccr74rpwyixvm4hr" }, "stable": { "version": [ @@ -102579,16 +104016,16 @@ "repo": "emacs-sideline/sideline-flycheck", "unstable": { "version": [ - 20220629, - 752 + 20230216, + 859 ], "deps": [ "flycheck", "ht", "sideline" ], - "commit": "a1fd5368acbc8cd15e00d23a0bf6f19d24f5c061", - "sha256": "0wmzrhp1947xi52m6fvr2vzpvi38nxlxzqgkm2ay7kyf9czkkvdr" + "commit": "1f2f82d4383718a8dd2aff40cffafce4a8d0aca1", + "sha256": "0ksjjd2j377c8hrf378z6x5v8mn2s0q6fifx58l0zz3sw7y649l7" }, "stable": { "version": [ @@ -102612,14 +104049,14 @@ "repo": "emacs-sideline/sideline-flymake", "unstable": { "version": [ - 20221009, - 1555 + 20230216, + 914 ], "deps": [ "sideline" ], - "commit": "e1e1f5cbdfa9ac352e884de97d68da4ea41cc060", - "sha256": "0y3adfvi7d28xkaxa539ys9i1rndn2c9ahs221vlmyf0g9ijxcxh" + "commit": "e92fa5ca861ff5a54273aecde319974fe4aa9dda", + "sha256": "13h4bzqqcvygza2c8x7aalc1cpy3mv0g2rbh2r1991qksddyqvcx" }, "stable": { "version": [ @@ -102642,8 +104079,8 @@ "repo": "emacs-sideline/sideline-lsp", "unstable": { "version": [ - 20220629, - 757 + 20221231, + 1636 ], "deps": [ "dash", @@ -102652,8 +104089,8 @@ "s", "sideline" ], - "commit": "8833cc33383ef3cc1b003be239cd5092b565ac34", - "sha256": "1vi48804bhgvn4b784670xh9mpmqxankgyww37sn0m5v53ywpkr6" + "commit": "38ba700db1769de216989fb9217795934147d160", + "sha256": "01dhnfcc0mig98l7vzc0nfdhz2y041d19jv2r9qp1l6cklimpzfd" }, "stable": { "version": [ @@ -102837,15 +104274,15 @@ "repo": "semenInRussia/simple-indentation.el", "unstable": { "version": [ - 20221113, - 1645 + 20221127, + 1232 ], "deps": [ "dash", "s" ], - "commit": "77685b3dd802dade7d60817fc0e24e60c101776b", - "sha256": "0dsrqip19pjdbdg039pq56wqynx271h5f25wx13k0y08smgpylnm" + "commit": "74efe02aa6c1612ae9b32b88f97b7d6d309726b2", + "sha256": "03dmq63cqymj37mnqxgm4qxmvv6vcxbj5kanr0qwdv1nzkh16dgw" } }, { @@ -102966,6 +104403,24 @@ } }, { + "ename": "simplecov", + "commit": "51858a06108af5a73e92803c3a52e5ea44f81465", + "sha256": "1fvgzlmx99026bpkn7hn32vvfnpbns1bykfbc4i58mh6w9871cdy", + "fetcher": "github", + "repo": "zenspider/simplecov.el", + "unstable": { + "version": [ + 20221206, + 350 + ], + "deps": [ + "dash" + ], + "commit": "215f2bdc5d2ef9b4439779ba4d3129210c9f34ab", + "sha256": "1rr4w0wvx07w62md3y1qj0cp7grn8z7116babvr76iigdcc0mzkz" + } + }, + { "ename": "simplenote", "commit": "8c1c3189da03541e3bee44847ac5d02c2a56ef98", "sha256": "0rnvm3q2spfj15kx2c8ic1p8hxg7rwiqgf3x2zg34j1xxayn3h2j", @@ -103096,8 +104551,8 @@ "repo": "magit/sisyphus", "unstable": { "version": [ - 20221013, - 1729 + 20230213, + 1152 ], "deps": [ "compat", @@ -103105,8 +104560,8 @@ "llama", "magit" ], - "commit": "64860faa0eba4bac8c794af4e8969c9458deb550", - "sha256": "1km8xsl6l1ydc0gj4slwlmchbi4g1svq2spv0b7bj3wwn8knk9mf" + "commit": "1e6fd5ae0fb5384063e8b59d053bc5df7630cf5c", + "sha256": "0r0mvkd7i9n7d92lv4cjd69nprzva6zhn509i4zjdn4dapcqw6z9" }, "stable": { "version": [ @@ -103123,9 +104578,24 @@ } }, { + "ename": "sixcolors-mode", + "commit": "05204862ed7a9513e7f6a8771292efe47ec63699", + "sha256": "15wmasn7m8nij77szxhsqwx0xhsdh1v4l2r3g1ydjdn56cndjym6", + "fetcher": "github", + "repo": "mastro35/sixcolors-mode", + "unstable": { + "version": [ + 20221127, + 1208 + ], + "commit": "fbcf57749ebc74d7b77d148da6c021b1a8e0f650", + "sha256": "072jcm4da8b9vjss4jyb3bs18qdrjdd6mlgp4xwy097ypfdyijm3" + } + }, + { "ename": "skeletor", - "commit": "1e63aefc869900c2af6f958dc138f9c72c63e2b8", - "sha256": "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0gbd7x8vy73dzngw2rk6n712wfm1fbcpy8l9xvz7ykj35zvv4g2v", "fetcher": "github", "repo": "chrisbarrett/skeletor.el", "unstable": { @@ -103186,11 +104656,11 @@ "repo": "dawranliou/sketch-themes", "unstable": { "version": [ - 20220404, - 1741 + 20230210, + 1507 ], - "commit": "8a609ec8fbf12231ba67aab9fcbb6b3ad0420359", - "sha256": "1mfy1vzdsli5qrdbbpm0bkhmvq8qp0692za5ykp7fbq9sxmqd65c" + "commit": "5534254232f1a556ec20952c75b5506625573049", + "sha256": "1r82sl0qvvcjdqrygbdk787dvnjycr20p32qn7z0fzim76nvlbjz" }, "stable": { "version": [ @@ -103232,8 +104702,8 @@ }, { "ename": "skewer-mode", - "commit": "10fba4f7935c78c4fc5eee7dbb161173dea884ba", - "sha256": "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1kh0gnzzh4jik737fwv0rwq3jbk41fhy30x5m9wv2crmrh4bsdw2", "fetcher": "github", "repo": "skeeto/skewer-mode", "unstable": { @@ -103399,33 +104869,33 @@ }, { "ename": "slime", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "06f005f7q6wk6n6kyiamw5zgp1hx5mca45n06y8798f1dwwnq9wl", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "117h3zymami8yxgv919l6fzg4wjyd1m5kdwa5nykgxs4mkfdp3xy", "fetcher": "github", "repo": "slime/slime", "unstable": { "version": [ - 20221003, - 936 + 20230215, + 2125 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "f41e5590e28a1dff1fc07111b43841eb1692de94", - "sha256": "083yr0gy4id40yy2ny50y047p6b0pz8xyc07i7dpqw9l830bsjwq" + "commit": "5e8fc7cad5ae7dc19b434c559ebaee3185d80b98", + "sha256": "1jllc6zk1vmh7g2zq9y1a5kihclawjf9zkizqz8kzs4hsyp6racs" }, "stable": { "version": [ 2, - 27 + 28 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "cf30941e5858e93eb91574ad91499075222a447b", - "sha256": "0wrq7s39lwca9wi01fj0wa2z6n0yyrv17c471kdkxxqppl4whi8m" + "commit": "a4f3471487db48f7289dc0ea019611d093e5ee7f", + "sha256": "155y3xld9snkfm7xhn7gz655xxxr6g7qv45znbg25k6y1lczmy4z" } }, { @@ -103499,14 +104969,14 @@ "repo": "augfab/slime-repl-ansi-color", "unstable": { "version": [ - 20200712, - 1226 + 20230214, + 1453 ], "deps": [ "slime" ], - "commit": "e38c7958d9657e41c426b4e96938b3f604238795", - "sha256": "0rbg6ndi59ycw54s2c21a3c2cr0wlymrpp4qr33yxv1ik00n5n5p" + "commit": "9e8af90490332217e45d7568f1690df3f4e25d4b", + "sha256": "0jsanbz7n8ss6hpgh5wid5lrvq7s2x4yphrgna9zpmgf4b0c3xss" } }, { @@ -103526,8 +104996,8 @@ }, { "ename": "slime-volleyball", - "commit": "853f47f469e372bdbae40f3cea60d9598e966fab", - "sha256": "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "12vcs97wlvwchg1lifl20av8f6mawq6js0c8flyr682j9by2nq15", "fetcher": "github", "repo": "fitzsim/slime-volleyball", "unstable": { @@ -103644,11 +105114,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20221108, - 2234 + 20230216, + 1140 ], - "commit": "992e3f3c1a599a8a10af12323d547b35ce70362c", - "sha256": "0krbfrb304b1v3ps2kiy60bb5d7iw9xx2k1qdxc7x4m6smimbrhi" + "commit": "fa70fc8ab1bc1f1c21661d672834e41b1d0abd39", + "sha256": "1bfigrb4nnx4sv50jsx15jsyh2yfbb72g5nhjbhcpmv8apkq4818" } }, { @@ -103659,15 +105129,15 @@ "repo": "mmgeorge/sly-asdf", "unstable": { "version": [ - 20220707, - 5 + 20221119, + 2235 ], "deps": [ "popup", "sly" ], - "commit": "3180921efdc19a2195960e1d601b2a6f31a6feea", - "sha256": "0gncp8xv33s4wx594bgd35vr1455bcggv1bg28qv75mhv41nzw97" + "commit": "6f9d751469bb82530db1673c22e7437ca6c95f45", + "sha256": "0bxan0h12xqdsfr3bpk7n8zj7d5xvp4v3wg4fbcf2xw63j02m810" }, "stable": { "version": [ @@ -103965,14 +105435,14 @@ "repo": "daviderestivo/smart-mode-line-atom-one-dark-theme", "unstable": { "version": [ - 20220108, - 2110 + 20230107, + 1731 ], "deps": [ "smart-mode-line" ], - "commit": "8ce6cca51b19395ccdd8f33a54419fa539f837f0", - "sha256": "0bvm98n2d4wsjz57g65gv567bmrdkibyimwwwq67bpl5qrf6ca8v" + "commit": "5f2056d7c24e9c8964f700ab6ec6f00ba4315eb8", + "sha256": "1klzgsvl4vnj14azdng7c3dz3r8mw3il9p56gf9dpm5xr8w4mwbl" } }, { @@ -103983,15 +105453,15 @@ "repo": "Malabarba/smart-mode-line", "unstable": { "version": [ - 20160706, - 38 + 20211005, + 233 ], "deps": [ "powerline", "smart-mode-line" ], - "commit": "558251e200cc555df137e60326295f2bd640fd6a", - "sha256": "1xh1qcxw0r3j8hx8k8hsx0cl82wps5x755j4kbn01m7srzv6v167" + "commit": "abcb0ab6f7110a03d6c7428bae67cf8731496433", + "sha256": "1h5w5lrgrmhpaqwppg5msylh7z78mvwy9mm8xiiv8w4wxvncxxl2" }, "stable": { "version": [ @@ -104144,15 +105614,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20220623, - 1523 + 20230219, + 1728 ], "deps": [ "cl-lib", "dash" ], - "commit": "8b6a3c3b31afd5b3f846e09859b5fc62eb06e7c1", - "sha256": "1bifalcx0v9h28q9mdnbad4mrxzr58f4l0wfnw1jhg5khgx4kgl2" + "commit": "f0c863268d296e38d4b5374f4c165cf9a823cd8c", + "sha256": "0f65wwjz4nxk2v49qmqck14xlyv1hfqnzjsf8ny1dv82l0v1by4s" }, "stable": { "version": [ @@ -104316,6 +105786,27 @@ } }, { + "ename": "smilefjes", + "commit": "000639475be669ae606fc37b3d124f616236020b", + "sha256": "1n3fx26givwfr407776f4cmhh4873cy5k50iww0s7kc0q8wkdqdp", + "fetcher": "github", + "repo": "themkat/smilefjes.el", + "unstable": { + "version": [ + 20230129, + 2110 + ], + "deps": [ + "dash", + "helm", + "ht", + "request" + ], + "commit": "52ec05240efba2d5d4666aabf773a1aa63bb3f1a", + "sha256": "1s34jsj3hqjp3mfs35xcsyf8vf3k0sjiz0r5vckhzg52kcrvvksd" + } + }, + { "ename": "smiles-mode", "commit": "67901d48323deba9311b32100574972c7476ad7b", "sha256": "1j3dpq5yw1g3cdalgrbnsw5429r64jiz4krh19zr1w86lh148pdr", @@ -104502,8 +105993,8 @@ }, { "ename": "smotitah", - "commit": "326c213450fc515573b963e794584b7b5ac995fa", - "sha256": "1m5qjl3r96riljp48il8k4rb6rwys1xf1pl93d4qjhprwvz57mv2", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0fwzm88v7shl997zlwd1fgryb4zkvl7ay03x5p551mjhd84sahyz", "fetcher": "github", "repo": "laynor/smotitah", "unstable": { @@ -104596,6 +106087,21 @@ } }, { + "ename": "snap-indent", + "commit": "a4b390ba55dae9c22ea33abf0cc2b4443d2ae323", + "sha256": "1x861zlxrmawdqp6xwp92106r30jq622n6rn907clr81vzppv7ra", + "fetcher": "github", + "repo": "jeffvalk/snap-indent", + "unstable": { + "version": [ + 20221220, + 1908 + ], + "commit": "6020a1784015ba28f439f41d4d8c261c3481079f", + "sha256": "0ph6xfylfxpkdsa1bipfj1x36b5rblr8v33kkgl9kjrp69v7fyb6" + } + }, + { "ename": "snapshot-timemachine", "commit": "69376b802f0687227a78838877d89163b2893c5b", "sha256": "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p", @@ -104649,14 +106155,14 @@ "repo": "weijiangan/emacs-snazzy", "unstable": { "version": [ - 20170823, - 1832 + 20170828, + 757 ], "deps": [ "base16-theme" ], - "commit": "8729d10b5c1edf1053800170dab1ffd820b6fff2", - "sha256": "1c07yggr6cnbca2iag1rjjsp1hiaccix222wzybxrphb72fn93wq" + "commit": "578d7ebc4ed91c0a630b652c4b6fdd54d9ae16cd", + "sha256": "0gykymah4ap7zgjr7fkir21avcdhgy6n88nwxl1iynim3vkq441v" }, "stable": { "version": [ @@ -104691,8 +106197,8 @@ }, { "ename": "snitch", - "commit": "8d08307e483c328075bbf933b2ea0c03bffe8b7c", - "sha256": "1zck9r251jj3q6q1glxj20812yhkv630qnd2y7q1kkjgp68gby7g", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0jh7cs89gwck5589mhswx52wkfs2pbmrwlivk7qzdxisdkyb0vf8", "fetcher": "github", "repo": "mrmekon/snitch-el", "unstable": { @@ -104751,11 +106257,11 @@ "repo": "alphapapa/snow.el", "unstable": { "version": [ - 20210813, - 1902 + 20221226, + 2238 ], - "commit": "4cd41a703b730a6b59827853f06b98d91405df5a", - "sha256": "0c770mgxav92j562knmzxdjlabvyhvhqjrgnk3pa13c5rs08800h" + "commit": "be17977677fa29709a726715a1a1cba1bd299f68", + "sha256": "0fh1hmwpszm9frvnqr2b8rlfx33dy9jm5r82hldgxdbhlv8dq4d0" } }, { @@ -104781,14 +106287,14 @@ "repo": "md-arif-shaikh/soccer", "unstable": { "version": [ - 20220905, - 740 + 20221127, + 1534 ], "deps": [ "dash" ], - "commit": "4bd4131c452f46f47b029bf38c7d98a2d3337b8f", - "sha256": "0772ld106dq1bqk6xib9a4ml2jsqqikfrjgz4bz0dc039yw34cp1" + "commit": "49d0db4f6274f1bd39c58255be069f79e310f465", + "sha256": "1br5dzz3k9ng58v8s64dp9g35j0871jpf1ax23nadq87n6m4q58k" }, "stable": { "version": [ @@ -104979,11 +106485,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20221024, - 220 + 20221119, + 1735 ], - "commit": "929ce58ff0d42cf1109f9fb0655c787ee58cc2da", - "sha256": "0yy9bdbab8k84csskq6lq6vgrzpm3zjj8a9gxbnwxc4ksarm1npg" + "commit": "ddb4a901c33bd29ba2eefff3b7f7461849c6e833", + "sha256": "1hppvvh9mq7yg129490b66bmdnnx6c03acbml03ipbcrfc6950y0" }, "stable": { "version": [ @@ -105061,6 +106567,30 @@ } }, { + "ename": "soong-mode", + "commit": "bac368b425fb24140528cf70a8787b00f6871bfb", + "sha256": "01xwwlrr5nj54z8n2vrapnn45pqpqi2m23lsf8j919p88c4gfa47", + "fetcher": "github", + "repo": "bobrofon/soong-mode", + "unstable": { + "version": [ + 20221217, + 1243 + ], + "commit": "bf3dc1070b368b413958f54fbe9bcc2aaf77b56f", + "sha256": "037dk71xdar01bpggvmw0jnagjfbh60g1s8lkv0nm24yhafbrlkm" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "bf3dc1070b368b413958f54fbe9bcc2aaf77b56f", + "sha256": "037dk71xdar01bpggvmw0jnagjfbh60g1s8lkv0nm24yhafbrlkm" + } + }, + { "ename": "soothe-theme", "commit": "6f26b8281f9bd05e3c8f2ef21838275711e622c9", "sha256": "124akv3a4q4vrmprdcjmq7rq6x73mz4wqxvnlczglh9vjl39ndbk", @@ -105116,11 +106646,11 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20220127, - 1004 + 20230102, + 1459 ], - "commit": "2db1859743fe9fc58eab4e6f6c1e37825ad7b69c", - "sha256": "0vikil31dwpmnd5iv3iwb8wrnny2xibydvc2mlgsvxjqjw7d40ng" + "commit": "7669770034f773bd96a71bb5e0cde93a8f0495e9", + "sha256": "05n2fjvs94s8023xmnbcrdbpqa25mh5j8l7naw4xhlggzynjfvan" }, "stable": { "version": [ @@ -105562,14 +107092,14 @@ "repo": "ljos/sparql-mode", "unstable": { "version": [ - 20220824, - 1323 + 20230104, + 1113 ], "deps": [ "cl-lib" ], - "commit": "15960092e8ce8ebe6a6afd82202ccf47cb306e76", - "sha256": "1wlwn2f6r00fj7wk1pymrha2rpfrd3b2ggmcjsz74f7ixc0y4c2k" + "commit": "1f6196094ec6626722c6e03a13f6844c68f62703", + "sha256": "031n56bsicrw99ls49rwg4padgbh5adb97lb9gxg852x57hilivr" }, "stable": { "version": [ @@ -105592,11 +107122,11 @@ "repo": "ideasman42/emacs-spatial-navigate", "unstable": { "version": [ - 20221030, - 1131 + 20230115, + 633 ], - "commit": "4dd8a164f35affa322c67d9e65af8eda21f99775", - "sha256": "1k8r70j9cqv60pxn8mdy9ixx7l5wbkxs445l7fl9v9h5msav2w7c" + "commit": "11f281ae16b541ede9b4fadf96200e1728eb6ed0", + "sha256": "1wl8fvm9v3gsbdn0y9xzwnfh4ak5cdn0xdp0g816q5y3r5dyiywp" } }, { @@ -105607,11 +107137,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20221117, - 127 + 20230220, + 118 ], - "commit": "9364053159df98809996f3dce622b192638e40ee", - "sha256": "046vfbz6capsymqniclbsyhx6zc1l25z6391709kchyl4as2qlp7" + "commit": "7ae6710a95a02c90b0f13486e8f20be3a746bee2", + "sha256": "159hxs3pa9pmjbhm9i3c2271zllvajw68g8sdcggx6lf3mp5w402" } }, { @@ -105664,11 +107194,14 @@ "repo": "dakra/speed-type", "unstable": { "version": [ - 20220815, - 1458 + 20230206, + 1330 + ], + "deps": [ + "compat" ], - "commit": "304cb8cd6c30d07577d7d864fd32858a29a73dba", - "sha256": "0n7rcb0bfw5d22fmy0kb14i4z88z0p4k23zxq5i23srcskihbkl8" + "commit": "4f8553632d71e827b4da6e091143779d2ad970a8", + "sha256": "1qf68jqkc4v8i0rbia2hyy9srn5paymz5bbv5s222rbjzc66n5hv" }, "stable": { "version": [ @@ -105732,11 +107265,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20221015, - 431 + 20230205, + 309 ], - "commit": "d9078002221609bf69dfb420fea3623d2f534b12", - "sha256": "1splj1g8cjk3vlwzzhr8s889s80nbxgfld55y4nm303m4hm91xr5" + "commit": "d6c170fa971856f0755c1750e66deadd58a5465a", + "sha256": "1sf43zzdcgn3ayq36dwj3xnfb9yhybmx0xs9f6yk29sw1ca7rd0g" } }, { @@ -106181,13 +107714,13 @@ "unstable": { "version": [ 20210305, - 209 + 212 ], "deps": [ "reformatter" ], - "commit": "7db76e74b7d1e2abfd13670c91bbdc12c6cb4fa9", - "sha256": "0jml6jhyvb7claf8754gar40m8ppzvfkgjgcx0c1mxz5fg7ab7gi" + "commit": "0cdb882874ba0853f4f831a07a85b511258472b2", + "sha256": "07ka6fqcbvbvzsdmwris89cj3dpg3qcfhmww2h6qs69za3h7mify" }, "stable": { "version": [ @@ -106340,11 +107873,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20221116, - 52 + 20230205, + 2247 ], - "commit": "689d27ed94254e3a3ce5a104057acc525e68a2ff", - "sha256": "0d14p5ijhs3aii7bzlbkaj7wwsbky2ar8mw55qqvz247b0zr4061" + "commit": "7e92ae3b4c4a7f3386bf1d7d620e5cd29e6e3b37", + "sha256": "0apccq1hj4sydkd7sa5iziavpi6swzaj6w7gckp5n8pjzibnqlx8" }, "stable": { "version": [ @@ -106369,8 +107902,8 @@ 20180715, 1959 ], - "commit": "b1eb7b109bc1c616dbf027429a90dc3b1a4263f1", - "sha256": "05kp8ajbqk7vxzkv23akyk2m7yg81pbrxpl3dsw67101sjazsybi" + "commit": "714387d5a5cf34d8d8cd96bdb1f9cb8ded823ff7", + "sha256": "1a8pqhdi7m3lis5ad2f74s1sy8zpxlwvfsvd80lw746235x2v06z" }, "stable": { "version": [ @@ -106472,19 +108005,20 @@ "repo": "cjohansson/emacs-ssh-deploy", "unstable": { "version": [ - 20220126, - 658 + 20230129, + 903 ], - "commit": "9311f9b4f8d25ce54fb7da9bf59d955fed366a4d", - "sha256": "1wgm4q46nja71grwbdnacnlazj3cgfr6r1glpkyx8y3dn9amdhip" + "commit": "94b56c0428fa0c788578161edc9e7992b13cd400", + "sha256": "1rg1hzhv8q1gfgfhd4pm22vx6mk5zkkkdq3zyg0dqb49r5skrbss" }, "stable": { "version": [ 3, - 1 + 1, + 14 ], - "commit": "20a87ab053b1d56fdb102b75b1c90658df756505", - "sha256": "1m0fav34wvak4k3ki92z5nvsyw6jdxnmhn5xzjiialgz9c3936v8" + "commit": "94b56c0428fa0c788578161edc9e7992b13cd400", + "sha256": "1rg1hzhv8q1gfgfhd4pm22vx6mk5zkkkdq3zyg0dqb49r5skrbss" } }, { @@ -106616,11 +108150,11 @@ "repo": "SFTtech/starlit-emacs", "unstable": { "version": [ - 20221107, - 1632 + 20230209, + 21 ], - "commit": "5f0e9deecfa95e241e4b3957e976b2471ba219f1", - "sha256": "1ly7c72yhacbcapvfilm7vrfdm6sxkfyf73cxnzixd7jyjymfzv1" + "commit": "f910112a76f0ec62f7150a3a2d4f1337a1809ff7", + "sha256": "1zcdbg69aicwsr53h6sbsms7cwq3l6zdhlb0fm8jy6r1rn9clwv8" } }, { @@ -106683,8 +108217,8 @@ }, { "ename": "status", - "commit": "dca8976de7060fcfc37a1623280869e0cef7b0a2", - "sha256": "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "01qjh4bqv9aqc85c2pavdx01q2h8k641d7ra3i02qwy1cglkkf49", "fetcher": "github", "repo": "tromey/emacs-status", "unstable": { @@ -106775,20 +108309,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20220822, - 1637 + 20221212, + 1619 ], - "commit": "ac42629f954e4885ef079a9bdb367a6d4aabc2d9", - "sha256": "0ncjcl8fb1mg5vqh5f8rkrlcjvpfhsnn5z3258w5wc1ibq1pnavw" + "commit": "35a9822ba130613b7ae88d241df48556aaff01b3", + "sha256": "0h82dq2r0bxsv5il15nb9j2v3pikc5g7aaiwvrlkkfjc7ld563a9" }, "stable": { "version": [ 2, - 0, - 2 + 1, + 0 ], - "commit": "7c0fb7928fa691df68107a8473d1970cd6909945", - "sha256": "1pr4asqm2ql29jg3z5racp2z7nl56rj13bzy5jx5rd31gyaqi69f" + "commit": "35a9822ba130613b7ae88d241df48556aaff01b3", + "sha256": "0h82dq2r0bxsv5il15nb9j2v3pikc5g7aaiwvrlkkfjc7ld563a9" } }, { @@ -106807,6 +108341,21 @@ } }, { + "ename": "sticky-shell", + "commit": "8e0e00197932ecea0963ea4c2c450d9b60c346d4", + "sha256": "1zmksmckz320yj1hw0ng4iii8xqjhz4am7nkrqqqipd82s1whrzv", + "fetcher": "github", + "repo": "andyjda/sticky-shell", + "unstable": { + "version": [ + 20230207, + 1454 + ], + "commit": "030535451b7c12eea3a94dfc1a439b8baa96944b", + "sha256": "0l1kmrkhykqbsmasjrrffgwahycdpi2jdpl4hn5y3p3xv16yhcwq" + } + }, + { "ename": "stickyfunc-enhance", "commit": "e24454febf90ec18a587b2c187a2bd2101e1b7b5", "sha256": "13dh19c3bljs83l847syqlg07g33hz6sapg6j4s4xv4skix8zfks", @@ -106829,11 +108378,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20220906, - 643 + 20230209, + 1359 ], - "commit": "4ff97e9d781df9a33dfaf3724d97b072d5c1f55a", - "sha256": "1h8qngjsnq4ghdm64vncnjfa6a85ssk5zy9g5hscmxnxbjv5483q" + "commit": "518b7ad3b6b8234d5a34dca1301f218f786e0a1c", + "sha256": "0066ddnw8ijxbh3snqkkysalf84qj0r5rk4d5zpvzbsals6dhcr3" } }, { @@ -106863,15 +108412,15 @@ "repo": "beacoder/stock-tracker", "unstable": { "version": [ - 20220523, - 1424 + 20230105, + 503 ], "deps": [ "async", "dash" ], - "commit": "14fe70fcce24a045f34e42617432a2d830906b98", - "sha256": "0854qx7vfycf8dfr8amksb0iv4nydbqn0g5357s3dfwmpj6rvvzk" + "commit": "327488e0f1232616bf33ab1a69da1a53aca25371", + "sha256": "14rqxr2w6jcz9vaq3v0mpm3jxv4dyl95y4c5pvgvh8h97gxjb16x" }, "stable": { "version": [ @@ -107091,17 +108640,17 @@ }, { "ename": "stumpwm-mode", - "commit": "caaa21f235c4864f6008fb454d0a970a2fd22a86", - "sha256": "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf", - "fetcher": "git", - "url": "https://git.savannah.nongnu.org/git/stumpwm.git", + "commit": "270e13913999312a4e8ae16cfb0bb8aad0068043", + "sha256": "0mildw327qgj6sgx0m0ks6vmvzg1h8mmyw1hmrfqrp2xsk2zb0g8", + "fetcher": "github", + "repo": "stumpwm/stumpwm-contrib", "unstable": { "version": [ - 20140131, - 216 + 20171027, + 214 ], - "commit": "a920d31bac148e7f6afa98c05f98920135de8b89", - "sha256": "0hg2dhgph1fz8z6c79ia2j36wnbqgi6a7fjiz3wngslhbwy28xq7" + "commit": "333d210cacc7ebac76e14dfc8c0139f0e399c9a7", + "sha256": "1nbk1sqfnyn65mkmgaiyznyqbihrxmlr9nn36p8152dfia71rjnz" }, "stable": { "version": [ @@ -107509,19 +109058,20 @@ "repo": "tlikonen/suomalainen-kalenteri", "unstable": { "version": [ - 20220804, - 657 + 20230102, + 904 ], - "commit": "8a41d16371ffaface70739ec861709f674b4a94a", - "sha256": "0rpkwns05aa4d5ix0ffkh2gzag75dvqb78gqhihq560jb83qhc5z" + "commit": "95d8b7f9b404c749831d7b4e0e396c76bd822015", + "sha256": "107fzsz7c1cl92ryl6dg198bi5jpkl99rlgw544my2yw728bwnfk" }, "stable": { "version": [ - 2022, - 8 + 2023, + 1, + 2 ], - "commit": "8a41d16371ffaface70739ec861709f674b4a94a", - "sha256": "0rpkwns05aa4d5ix0ffkh2gzag75dvqb78gqhihq560jb83qhc5z" + "commit": "95d8b7f9b404c749831d7b4e0e396c76bd822015", + "sha256": "107fzsz7c1cl92ryl6dg198bi5jpkl99rlgw544my2yw728bwnfk" } }, { @@ -107646,14 +109196,14 @@ "repo": "rougier/svg-tag-mode", "unstable": { "version": [ - 20220525, - 1752 + 20230110, + 1824 ], "deps": [ "svg-lib" ], - "commit": "6e52f7c17e92c83476d6278869bf3f55d91ac9c9", - "sha256": "0zx81qjbxm0xzl2whs103py4pd2lqnrj46v50kh90nzz9yz5hxrl" + "commit": "9f5c2cb862fcba96f247b85fdd1b7dffff7af93a", + "sha256": "10gy0pa0147phgx75hh21kgpg4j78v5dcl7alfq6apsximjz8w9f" } }, { @@ -107768,25 +109318,26 @@ "repo": "thblt/sway.el", "unstable": { "version": [ - 20221101, - 2243 + 20221211, + 1439 ], "deps": [ "dash" ], - "commit": "6268291a29da9c6165432f9bbdebf6bab13c72f5", - "sha256": "0cbk44ldrimb9aai1az5vq63m32qcpapc1hsy13lxwnwi2ixcr6w" + "commit": "117eb40691e7a4d2dcd6b5a7fd9f803c7d42c32c", + "sha256": "08jjwh2d1hjbbv493qgaznxjhjhm7ama27wcnaag6mics7ivn59n" }, "stable": { "version": [ 0, - 4 + 6, + 1 ], "deps": [ "dash" ], - "commit": "8a3487115eec5893d317254b423f2ce058f5f795", - "sha256": "1vsz6jdkqh2haphdlyxj7zxaj8bngy1wiljlwv8snci65g9n4479" + "commit": "117eb40691e7a4d2dcd6b5a7fd9f803c7d42c32c", + "sha256": "08jjwh2d1hjbbv493qgaznxjhjhm7ama27wcnaag6mics7ivn59n" } }, { @@ -107880,14 +109431,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20221119, - 910 + 20230117, + 1113 ], "deps": [ "seq" ], - "commit": "6d7093fb4a0b81686ffeff7e39f76027d83b7eb2", - "sha256": "0x27wj5kc77qwnvzm905np37w8rn96i1d104pa882z6pd4bx46ps" + "commit": "778e9e6f35b41fd171bd9f42fd7b89c1001e2a82", + "sha256": "0fxlplpbigbzjis6qdfi51l9a4rxvgmjx60qyfjvhv0gvxl9f9hj" }, "stable": { "version": [ @@ -108201,14 +109752,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20220304, - 917 + 20230117, + 1227 ], "deps": [ "seq" ], - "commit": "c439b73a5f9713bb3dce98986b589bb901e22130", - "sha256": "0n2yknbhwbgbrvmgxk2j2hm5gkdh6m9p5y8vpq758bxf5xk6npzm" + "commit": "ed007230378b03f384b5a2b643dd857010ef21d3", + "sha256": "0hls2qfxrhzdvsfa28brj5yml6zl5djg8kc9m4wk3yx18cas5gvy" }, "stable": { "version": [ @@ -108271,8 +109822,8 @@ "repo": "drym-org/symex.el", "unstable": { "version": [ - 20221111, - 2236 + 20230119, + 1943 ], "deps": [ "evil", @@ -108282,10 +109833,11 @@ "lispy", "paredit", "seq", - "undo-tree" + "tree-sitter", + "tsc" ], - "commit": "32f4d28fd115c0ba417f48afafef62a6cc0c264c", - "sha256": "0ppcadpl7mrrv84n8vqym6g8b9srg9nhclbzlcjx0mqksa6p6mlr" + "commit": "cddb1644ce1fff6724280cc5eae7f6ed1597ae80", + "sha256": "1p3h9qlkvzjniq599awhjz3gy65nz8hwjq5fx9gbgda37v3fag71" }, "stable": { "version": [ @@ -108438,14 +109990,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20220618, - 817 + 20230221, + 937 ], "deps": [ "cl-lib" ], - "commit": "28410740e42ad9bb84416164406269b177fb49fa", - "sha256": "0mxnnrrqkpyjqps6fs7bwy6n4jvl0glwkmzk1fbcy1cmkl1pxm80" + "commit": "830fc4d4fb5d31a018d32319c6e0d2dc29e3de34", + "sha256": "01i3vc0a7jngfwa16yp4knlyiwnak3srxp4lxjnw5fdq2hvgwhz1" } }, { @@ -108627,11 +110179,11 @@ "repo": "holomorph/systemd-mode", "unstable": { "version": [ - 20210209, - 2052 + 20230201, + 302 ], - "commit": "b6ae63a236605b1c5e1069f7d3afe06ae32a7bae", - "sha256": "0q1f5mnx6npr6c94x93lyza87kxjy08v7x4by13wp23fxaqxgzaf" + "commit": "8742607120fbc440821acbc351fda1e8e68a8806", + "sha256": "1cf63r0f8mg4zl6min48f8wby2k7g4v60lyw6j8gsjz8ppww8gx2" }, "stable": { "version": [ @@ -108868,14 +110420,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20221114, - 1744 + 20230212, + 531 ], "deps": [ "project" ], - "commit": "f25bb670c0f7b3f7555634d19fcdd3eb979ac7c0", - "sha256": "0y32r7p4mh56zjhmd5pfkgic3gx0xlwabay690pxzl9sqjpnai4p" + "commit": "6975c51a2154604db70fd38eba27cf784cc3c4a6", + "sha256": "0i01q1fv6kdpf3fmhdagh7wlhycy3c6lmqkjkhiah55h7xymr8rk" } }, { @@ -109035,11 +110587,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20221108, - 9 + 20230111, + 1606 ], - "commit": "632e735c70b16828b3f50bd415b5e218e9780ead", - "sha256": "1h1lskg0nysp3xpzpqn90p05fzvix1dpws5fmrklfbd7m7nzbn2a" + "commit": "5525e49357d066c0dca4ccc12ca69804e46577f2", + "sha256": "0vcvhksiwc2gpz90gl5911nmds4rqgdhk1v3gbpj7cbhi1imrfx5" }, "stable": { "version": [ @@ -109101,14 +110653,14 @@ "repo": "phillord/tawny-owl", "unstable": { "version": [ - 20191108, - 1346 + 20210528, + 1710 ], "deps": [ "cider" ], - "commit": "079028b7547743a36384650981ea068849aac53e", - "sha256": "06sjr4fv8p8y56a35pzghn89r1nzr2h5h3m98h0296bgnz8jgyg2" + "commit": "5da72b601cb9f052f35e88c41f1a18b326c03791", + "sha256": "1hhwyh4qkmhc303sf4qsarpczyqihh45z2xb96m2ra5zlqnklcpp" }, "stable": { "version": [ @@ -109166,8 +110718,8 @@ }, { "ename": "tc", - "commit": "9fddfc79ed2c614c33e90ba80f300912fdab88a3", - "sha256": "05lnsaizlh4wqjkp0wqcm1756r9ia46as8zf01k8qsi0mm452g6q", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1l73y78k3snx2174kz3zv5gv74f3sm4jfy14l35kgyq8ddw3zfkg", "fetcher": "github", "repo": "kanchoku/tc", "unstable": { @@ -109250,15 +110802,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20221105, - 1528 + 20230212, + 1547 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "870fe3201c14f828cfec0529aa78c110958e9aae", - "sha256": "1xrcgkrz8x24wb6k9f5jss6dixdzng1lsyw3jby5r19xsi742fc6" + "commit": "37e7eb805bc247ecc644308f1f2a4ed9a6d30624", + "sha256": "0bc0v7ix59cq269raxl6pdq12qd4rnq7012mix55rmy6llb17jb4" }, "stable": { "version": [ @@ -109371,19 +110923,43 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20221016, - 1017 + 20230220, + 1700 ], - "commit": "7d7adf155760d33b8c391fbf1e99c5be85bab85a", - "sha256": "1za73zszj373r8pxf89cwwfrwsf8dy6nxciw11adcccrm92xwdsz" + "deps": [ + "compat" + ], + "commit": "51773e54224bc3f5631105bf6e29cd1b4b5e41b3", + "sha256": "1qwnr6n7h05vi8jpayrrhzn6s7jn03gdl0dkc54x4nhflxx1f3f6" }, "stable": { "version": [ 0, - 5 + 7 + ], + "deps": [ + "compat" ], - "commit": "7d7adf155760d33b8c391fbf1e99c5be85bab85a", - "sha256": "1za73zszj373r8pxf89cwwfrwsf8dy6nxciw11adcccrm92xwdsz" + "commit": "66e4763087f3e851956b9a77a00527b440737d03", + "sha256": "1qhy9rp0k74hbqns67iwyzk86x7rriqyd4l48j5qqmfvr3v5sg1m" + } + }, + { + "ename": "tempel-collection", + "commit": "f5771cd6a865393c809adb1d9b3d58daa32cd146", + "sha256": "15syfqr46d5dx7ikdqr1jj74mb6rcij66v5ihhxdhk9acdianzl3", + "fetcher": "github", + "repo": "Crandel/tempel-collection", + "unstable": { + "version": [ + 20230103, + 2244 + ], + "deps": [ + "tempel" + ], + "commit": "7ef22ea7aaf699632a1d02d47a9a505ae8bc52c3", + "sha256": "0gvvxkgmj84ivnav0v98m6nhas6mbkhxqqj1ba5gj334h7gxyl4n" } }, { @@ -109436,16 +111012,16 @@ "repo": "kostafey/temporary-persistent", "unstable": { "version": [ - 20200201, - 1719 + 20230115, + 1425 ], "deps": [ "dash", "names", "s" ], - "commit": "0080879b0257d350aeba1c4d6901613d7dc534de", - "sha256": "1np9xh6gqynp96rby2shh4w40r14vsvpvwaibq0c1wr1ydwggm9i" + "commit": "edbde738769e79ac212ae84ae7898ffd5f19e0f1", + "sha256": "0v99azfslg8p6wxs3yf3qq3dzy0f6n9dw5ydj94jrys2ka5gbw1s" } }, { @@ -109771,15 +111347,15 @@ "repo": "ternjs/tern", "unstable": { "version": [ - 20181108, - 722 + 20191227, + 950 ], "deps": [ "cl-lib", "json" ], - "commit": "40a0c74db3888b997a9115720ff91c399bb1b146", - "sha256": "0dh0bfs0knikzn4gvjh9274yhbg3ndw46qmj4jy0kxh7gfl2lpkh" + "commit": "0d19800db70a6348c627a69f444b91d21ad89629", + "sha256": "0ydrxxc3lgs8mpg577iw5sfxgyqfbdkrghwxmv8sxf6sawvhx8zv" }, "stable": { "version": [ @@ -109803,16 +111379,16 @@ "repo": "ternjs/tern", "unstable": { "version": [ - 20170521, - 1935 + 20191227, + 950 ], "deps": [ "auto-complete", "cl-lib", "tern" ], - "commit": "d545bbdd8482c231211f9521c688fc06632e745e", - "sha256": "0ribzvl5gs281chp2kqaqmjj9xji7k9l71hsblfw1vj2w9l7nw2m" + "commit": "0d19800db70a6348c627a69f444b91d21ad89629", + "sha256": "0ydrxxc3lgs8mpg577iw5sfxgyqfbdkrghwxmv8sxf6sawvhx8zv" }, "stable": { "version": [ @@ -109837,15 +111413,15 @@ "repo": "jacksonrayhamilton/tern-context-coloring", "unstable": { "version": [ - 20161218, - 747 + 20170102, + 2253 ], "deps": [ "context-coloring", "tern" ], - "commit": "db0466c650ed4f7e6621a48dfdc53eaf5e127be9", - "sha256": "093mdq97gc0ljw6islhm7y1yl3yf7w4gf205s96bnsnb1v952n63" + "commit": "3a8e979d6cc83aabcb3dda3f5f31a6422532efba", + "sha256": "1rq5aqmsd7jqvwypafad9gmfcwjqjah00j7cws46k5f0dirjaa1y" }, "stable": { "version": [ @@ -109893,15 +111469,15 @@ "repo": "emacsorphanage/terraform-mode", "unstable": { "version": [ - 20221117, - 409 + 20230130, + 2153 ], "deps": [ "dash", "hcl-mode" ], - "commit": "80f0433358b79ed4ba88c51829c7359baa1af8b1", - "sha256": "0gcxsd9zv47hzq1d5xqblyzgcf7vk215743s7x7ciiiwlg5xndnw" + "commit": "39d2fd5bfc86c6bf1c7bc38e6f0016d714f2d79d", + "sha256": "1ancpn3v176lzxd95xshbsna307y55idirbqjsfhpivhvcq6y9g7" }, "stable": { "version": [ @@ -110050,14 +111626,14 @@ "repo": "TobiasZawada/texfrag", "unstable": { "version": [ - 20220508, - 642 + 20230117, + 1746 ], "deps": [ "auctex" ], - "commit": "bcceb82971c10b8c0b058b77b3764669900392aa", - "sha256": "1awlh7z18wzp2mppn21chbylqf3fmjlq8v4105kwg9mmw57xjyb7" + "commit": "6df9044c3d6bbb2a104f2c9b78ad10aa3cdf9506", + "sha256": "1qwp9nb0dswjr7alsrcwbjym0k56ncd0k5plhcsz8liz5886qfdy" }, "stable": { "version": [ @@ -110095,11 +111671,11 @@ "repo": "juba/textile-mode", "unstable": { "version": [ - 20210912, - 906 + 20230112, + 1030 ], - "commit": "a49d9bf42166584cca395a92311e9d0a199efc46", - "sha256": "0b7vbqy2ryp5c0jz7gb5ddpa3mlqmkd7jlf94hdb0d0ffapspqsv" + "commit": "8f8c09ef097a95a713307fdb5c92b9778dfbc1fc", + "sha256": "0x8ib6cm7rp6hf44348nnc937w98v5q0fv9r650jjvkfl9rkbm7b" } }, { @@ -110429,21 +112005,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20200212, - 1903 + 20230220, + 336 ], - "commit": "37a3d2d055bc741b183679647b40b28585a71bd2", - "sha256": "1n6j8kaajqi31n0crv6qr4qbdagx5iscqmm1cyll8sdmfr20xrcl" + "commit": "1d01d76ff25b7d5c5d36a08f111834082277f8e7", + "sha256": "0f1cq9psqqnrxca1sh97dg4kjcqdpdjib9kwx80gg4mr5wjpcw9j" }, "stable": { "version": [ - 2022, - 11, - 14, + 2023, + 2, + 20, 0 ], - "commit": "68ba6854cce62923446c15e7f638417a8d7da7c8", - "sha256": "06nf0cs5cyi69d15471j4mnwbkkli80jnffpkwb23173q2n10h81" + "commit": "1d01d76ff25b7d5c5d36a08f111834082277f8e7", + "sha256": "0f1cq9psqqnrxca1sh97dg4kjcqdpdjib9kwx80gg4mr5wjpcw9j" } }, { @@ -110493,26 +112069,26 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20221001, - 2224 + 20221223, + 1759 ], "deps": [ "haskell-mode" ], - "commit": "aa5f3a976567552de57090e1b67b537cd08b4367", - "sha256": "0rjpg4ig1wjc6k9dicb2nyc2bvxhwlrj4mb0agpy434j1f1xdm2z" + "commit": "14064165cd5b6719af4605087d6e81332920ad60", + "sha256": "11siqw72q7bjhnyd92k35v7ssaxa845v5ax8nlnc3li7bi2vv0gq" }, "stable": { "version": [ 1, 9, - 2 + 3 ], "deps": [ "haskell-mode" ], - "commit": "32479866eab79466d479d6565d7c06a374d6d2d7", - "sha256": "003858lbdkf1liafgnpvn8pi6f7bnkff4k44x890dbbkczyi924i" + "commit": "14064165cd5b6719af4605087d6e81332920ad60", + "sha256": "11siqw72q7bjhnyd92k35v7ssaxa845v5ax8nlnc3li7bi2vv0gq" } }, { @@ -110523,18 +112099,17 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20220514, - 614 + 20230129, + 1346 ], "deps": [ "cl-lib", "dash", "flycheck", - "s", - "typescript-mode" + "s" ], - "commit": "96bfc5da11a9b83b32368c38e933a405270652de", - "sha256": "1py0z8nrkgh3lzsmgxq62bi2nbdx3c97194frjyb5wl81kh4pbbp" + "commit": "29475d9eee26f4101322209e9b6b199df5386094", + "sha256": "05pp0sijyw1q2vfgpir76vmm102k3lhpz6gynqz3ha98xir5j7yj" }, "stable": { "version": [ @@ -110596,26 +112171,26 @@ "repo": "swflint/time-block-command", "unstable": { "version": [ - 20221102, - 1811 + 20230210, + 136 ], "deps": [ "ts" ], - "commit": "5e2c7c050378307e25f3964e082c5ee531ae00b2", - "sha256": "00akh3fcm335glr4lm3nwxhlxf363f6ipk2a7x31sclmwd6jn5fj" + "commit": "e0dcf6eb13871df41b081b9cdaadced722c3ba54", + "sha256": "0vywwr45ylrdaakvc6ilbq0kwsgqvyx8xpfp21n7kprqgnigal2g" }, "stable": { "version": [ 1, 2, - 1 + 2 ], "deps": [ "ts" ], - "commit": "5e2c7c050378307e25f3964e082c5ee531ae00b2", - "sha256": "00akh3fcm335glr4lm3nwxhlxf363f6ipk2a7x31sclmwd6jn5fj" + "commit": "e0dcf6eb13871df41b081b9cdaadced722c3ba54", + "sha256": "0vywwr45ylrdaakvc6ilbq0kwsgqvyx8xpfp21n7kprqgnigal2g" } }, { @@ -110769,6 +112344,52 @@ } }, { + "ename": "timu-caribbean-theme", + "commit": "ab002b78cc839615ea53342250d185438ab16ae7", + "sha256": "03yqh3kx1irz68bxbs0zl1sply4b3ikhbpaa088kza1dgdc2nvn5", + "fetcher": "gitlab", + "repo": "aimebertrand/timu-caribbean-theme", + "unstable": { + "version": [ + 20221226, + 1556 + ], + "commit": "af60151fe35bd1c780b7c4a37032699989ee6162", + "sha256": "0x74vnxkwl1jvkl2fizdkg0v73qjmx2dk68cs49k0b8z0n61w8l7" + }, + "stable": { + "version": [ + 1, + 5 + ], + "commit": "af60151fe35bd1c780b7c4a37032699989ee6162", + "sha256": "0x74vnxkwl1jvkl2fizdkg0v73qjmx2dk68cs49k0b8z0n61w8l7" + } + }, + { + "ename": "timu-macos-theme", + "commit": "326e7cad6877d42bc1809b549503332c98547dcb", + "sha256": "0bxlxjn7fivv72pxchs164941g3y3bylhhzsssik0gwrsyd7x8ay", + "fetcher": "gitlab", + "repo": "aimebertrand/timu-macos-theme", + "unstable": { + "version": [ + 20230201, + 2203 + ], + "commit": "665c6e409c7d6a37575b3e64961b17ae3db18cb8", + "sha256": "17rr28amksxsz2djz0gwdmr3xki7229pcgm841k5dp109l6n9bip" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "bd15dd91086943c7c025895f5f921e1f8253e478", + "sha256": "17rr28amksxsz2djz0gwdmr3xki7229pcgm841k5dp109l6n9bip" + } + }, + { "ename": "timu-rouge-theme", "commit": "5062b3e2d0d1b3bdbde2d0f58ca42952e90a9acf", "sha256": "148k7anayfvvff5nw5jyjnwcwjag5q57kp4knfxfpb2v1nszpp1n", @@ -110776,19 +112397,19 @@ "repo": "aimebertrand/timu-rouge-theme", "unstable": { "version": [ - 20220717, - 2158 + 20230102, + 1925 ], - "commit": "bbfc8bbba01e5caa9d11628f0bc2276605c75901", - "sha256": "0r2647yll9yx9i5i1j2gqr8ammxll5pc367prs9jz8il6nd4irpa" + "commit": "87117f15ea5fcfacbbad23ea6f345d18c2ff0009", + "sha256": "1w67jy0vqmdqq1k2jj60nya8jiwy4kadzyyq534ic9iy9gb4rjan" }, "stable": { "version": [ 1, - 4 + 9 ], - "commit": "02281cde75ab7e5bb624003dc0de035dc14f2469", - "sha256": "1xv0cjiwl86hvyb9f8awjwx14b158qpnlmfxlxn7f0z3lzim9d7x" + "commit": "87117f15ea5fcfacbbad23ea6f345d18c2ff0009", + "sha256": "1w67jy0vqmdqq1k2jj60nya8jiwy4kadzyyq534ic9iy9gb4rjan" } }, { @@ -110799,19 +112420,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20221007, - 1029 + 20230102, + 59 ], - "commit": "278ff2d30f3c2f657c0a828d177ecb37837386d5", - "sha256": "0c879srhnn6fqmsnh9mjfdbrilwrymh8x2wn0w3jw0pp7x3brp65" + "commit": "0d0d977c2149f695de0e4de55ae64a672c34bfac", + "sha256": "0j4p7qckrywpph63m140l4d713c9kx91didyflfpnr1wgy6pzq3v" }, "stable": { "version": [ 2, - 1 + 6 ], - "commit": "d8db5dceb95144ad50c1dc3577196eef7a10d5b3", - "sha256": "14r325a9qq9xigqbp03dbblc8lnw3hz7hbnmj9d58jshd6avdcnc" + "commit": "0d0d977c2149f695de0e4de55ae64a672c34bfac", + "sha256": "0j4p7qckrywpph63m140l4d713c9kx91didyflfpnr1wgy6pzq3v" } }, { @@ -110965,6 +112586,21 @@ } }, { + "ename": "tmsu", + "commit": "0d546d03d27303217a083f1a18f21098d5102387", + "sha256": "12n4p74y4qpcvah9819incwykl3q0y7zbvd9dlk7b7qffqx5h08p", + "fetcher": "github", + "repo": "vifon/tmsu.el", + "unstable": { + "version": [ + 20230207, + 1438 + ], + "commit": "26fb81d2667c88bef4f571c87bd9842d1be21234", + "sha256": "0lkvsqgp5cwi39n37b32dfjrdsk21j6r3q5lx4px84w2sqhm5gg1" + } + }, + { "ename": "tmux-pane", "commit": "8bc165e115a2c457e44ac2762cf6a9f07f1b99c4", "sha256": "0mv5y367i1wmk5kp8ms09xhrwvb4cwa08p39qy6mkakdhiby5m9q", @@ -111030,16 +112666,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20221101, - 1418 + 20230120, + 2208 ], "deps": [ "dash", "org", "transient" ], - "commit": "bfd496dad20bd34ffb0c2301c004a195262718c1", - "sha256": "0xc7pdb347cp82kyhsm448qy6xrgl91ji9bzb19bflp3ic9fmjjl" + "commit": "d79b4ea4ea4891635966bfc2c769484d2916be80", + "sha256": "15hpayv41bb7gfy1s1mc0zmd8r1h8h5xmb18sgc4v6l1k4x17z1j" } }, { @@ -111143,11 +112779,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20221003, - 1909 + 20230220, + 1320 ], - "commit": "adef847adc38b9346ccb83df61ebc51e44776dc5", - "sha256": "078g924qvkg2bmm456n7ami14sl7lq51ssv2v0vlyd3wzmd637d7" + "commit": "4dd1efcab11576c0989c52f67c89759a43e07f0b", + "sha256": "0s4bamim86y42ahg529hj2sf7654lab1p0fb06srn1gqj8zapndj" } }, { @@ -111400,11 +113036,11 @@ "repo": "juergenhoetzel/emacs-totp", "unstable": { "version": [ - 20211018, - 1743 + 20230102, + 1707 ], - "commit": "680b2c969823b91e0b35afbe2a35a610cb2fa26a", - "sha256": "17ylcrz7gw1hyq9ls5anz7ycd5y6f3j06jxr6i80hj5ccylzy82c" + "commit": "a5e059b8475b32bc7f5ddadda248cf84449ed722", + "sha256": "0b76fxk9r3n9zii75q1957ivb6ap5px5h87kagxz083nl77jky7a" } }, { @@ -111415,11 +113051,11 @@ "repo": "chmouel/tox.el", "unstable": { "version": [ - 20160810, - 1555 + 20170404, + 1059 ], - "commit": "27a074b21238855ce3c33d22e42d69e2c2921205", - "sha256": "1m3f0i6vrkrncd7xsgz65m6595iv6yr4gbbzlis8p01kd98wbxfk" + "commit": "7655eb254038d5e34433e8a9d66b3ffc9c72e40c", + "sha256": "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki" }, "stable": { "version": [ @@ -111484,8 +113120,8 @@ "deps": [ "w32-ime" ], - "commit": "41a9751b8cec1f8d88f51240140bc85e0d29205e", - "sha256": "0h0q5xmcm98sb28my07xnrfly5i55g8d90c2h570499gadg777sv" + "commit": "87f0677220b755f947fe5f373b6a34e1afb82f3c", + "sha256": "1xvhagynkhx4l0smbg9lz1kas7y25jpg66m1q5b32z3aagm90sb1" }, "stable": { "version": [ @@ -111550,11 +113186,11 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20210713, - 1609 + 20220421, + 1956 ], - "commit": "054adb71f685f96cef6cb28381c0080af22e729a", - "sha256": "1cqpyvv1ywywr3gd13yhn7wpysi9c429v2x9a7ddlqn03zfyhrkl" + "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", + "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" }, "stable": { "version": [ @@ -111657,14 +113293,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20221118, - 1443 + 20230220, + 1425 ], "deps": [ "compat" ], - "commit": "804c27f1f585c05a777c288fbcfa1c16a3c0cd45", - "sha256": "1krw6rhgc6qvldb83zg021n13gg22l5afddnzpas5z7c0p154dm9" + "commit": "0204a2432862aa187745995f1c378e6d875b35cb", + "sha256": "06qbc8ad3s4z5vihbpvyl8xdlppxkhvprnhxq0kxsasy7psfqdns" }, "stable": { "version": [ @@ -111684,14 +113320,14 @@ "repo": "conao3/transient-dwim.el", "unstable": { "version": [ - 20220425, - 1331 + 20221225, + 1630 ], "deps": [ "transient" ], - "commit": "7b6e70fb49b9d18106748202011863ebc39b864a", - "sha256": "1qph3ffpvrx02a423hpmdfp15g9yqdd38bnmsa735cnnhqm3yshd" + "commit": "cb5e0d35729fc6448553b7a17fc5c843f00e8c1d", + "sha256": "03mk0rvi3mn2wbx817swqd5y784k446yh8l4vv892rjb81fchl2g" } }, { @@ -111745,14 +113381,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20210705, - 2152 + 20221130, + 212 ], "deps": [ "let-alist" ], - "commit": "a03a6f5c7b133e0a37896b6d993dd6d6d4532cc2", - "sha256": "1znpl4ps0ah6lmrlyha6wbkbvnx90qkvksp5xp87apfb61zqzqwz" + "commit": "243d5dc15917df2611fd0c9f288faea17a00a396", + "sha256": "1dp1ypz0vwcggp09rwr1d7dh34d05vlxz0mvry9p44g58dc99cz0" }, "stable": { "version": [ @@ -111815,10 +113451,10 @@ "unstable": { "version": [ 20220921, - 827 + 831 ], - "commit": "e4a1fe564224bce61fbf72ad6f12805078cbf8db", - "sha256": "0yiwm91i6mqgz56pl38nlg862djahl21bm54j3ldgz43xyzmw8x4" + "commit": "ed0156a98b6fce94da9045bdffe369f390b70c0c", + "sha256": "13q9mm76pp2h3jhp5kyc3gynzzzzaiczhkc1lvwq1zmrca9bavr2" }, "stable": { "version": [ @@ -111898,15 +113534,15 @@ "repo": "tarsius/tray", "unstable": { "version": [ - 20220422, - 1628 + 20230212, + 2011 ], "deps": [ "compat", "transient" ], - "commit": "0ff79f738fbff38520d329aa93d59678cfc0e55f", - "sha256": "0kbkxvyf6i105bwllkzdg09rkq52v9bjr4hivp2mfvy5h8k3z4n0" + "commit": "15b0faa8fede31887598b8dd64b69362c10e8a8e", + "sha256": "0gw24wajmnwm8zhcsfvvwzn1rc20a2hyi42c2rpdkxfbw308b1x0" }, "stable": { "version": [ @@ -111998,15 +113634,15 @@ "unstable": { "version": [ 20221012, - 640 + 855 ], "deps": [ "ess", "tree-sitter", "tree-sitter-langs" ], - "commit": "9eb7c35a11d917bc417d8b7b109ed336d58bea53", - "sha256": "15lax4f8jdjsk4ba8f9x8is56qisg9p7cvwlragqdf38bkc29ynx" + "commit": "9669c00f3d3463e6769725af74c392891e269eed", + "sha256": "083m21lqgic910fqbxc104fai0vh2hrb7s2nlln43l7hlb8939b4" }, "stable": { "version": [ @@ -112061,14 +113697,14 @@ "repo": "erickgnavar/tree-sitter-ispell.el", "unstable": { "version": [ - 20221105, - 713 + 20230205, + 533 ], "deps": [ "tree-sitter" ], - "commit": "6d486371d641a809f44df21921e64ef381844e83", - "sha256": "1a1hgxd9f8b5n49bbyqlcswjwbyazjq7p75ng481mlkvb9hac1ic" + "commit": "d8c33c05f689c2cab36b8a9856811f18a4ab7c59", + "sha256": "19i2hv6zy9797dz4b6xrwlkci5fdq4v2mxd55li2bpd6sgga28ns" } }, { @@ -112079,26 +113715,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20221114, - 1054 + 20230205, + 2032 ], "deps": [ "tree-sitter" ], - "commit": "df7d7d1a46b5145d4101f6b313d22e815e4f42b4", - "sha256": "0a34032r6vdnyg4akvil559q1jx091sbmzaq5l59a20pz8jxw349" + "commit": "d8f8ac4faeb4564fbb61e94a631b4672523d84a9", + "sha256": "1i8lhv404ijj52jjxrmljnrhby9jlrdgpymn2jfs4kml0x7qhsna" }, "stable": { "version": [ 0, 12, - 5 + 16 ], "deps": [ "tree-sitter" ], - "commit": "df7d7d1a46b5145d4101f6b313d22e815e4f42b4", - "sha256": "0a34032r6vdnyg4akvil559q1jx091sbmzaq5l59a20pz8jxw349" + "commit": "d8f8ac4faeb4564fbb61e94a631b4672523d84a9", + "sha256": "1i8lhv404ijj52jjxrmljnrhby9jlrdgpymn2jfs4kml0x7qhsna" } }, { @@ -112145,8 +113781,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20221107, - 2105 + 20230104, + 1319 ], "deps": [ "ace-window", @@ -112158,8 +113794,8 @@ "pfuture", "s" ], - "commit": "b19060f25e55514f3d798d9f5af2dcd5b94a6026", - "sha256": "12qq84hnilpgw5rvvbcabi7cj42n73abk07iqaf89b78qkl15vr3" + "commit": "9986d6cd3d2822db7ae0e6d8a275db7057f3e828", + "sha256": "0s9i5amc4bx223d3abikyr8cdkzpzbirfb3x6m26l6i430j8zsal" }, "stable": { "version": [ @@ -112195,8 +113831,8 @@ "all-the-icons", "treemacs" ], - "commit": "ba0afc8be921776b5813e44d5495f09556da087b", - "sha256": "1wdlk3y8hbl11vhnyp7s45i845lpnnqyf5a17glw36gfggjdin5c" + "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4", + "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp" }, "stable": { "version": [ @@ -112226,8 +113862,8 @@ "evil", "treemacs" ], - "commit": "ba0afc8be921776b5813e44d5495f09556da087b", - "sha256": "1wdlk3y8hbl11vhnyp7s45i845lpnnqyf5a17glw36gfggjdin5c" + "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4", + "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp" }, "stable": { "version": [ @@ -112320,8 +113956,8 @@ "persp-mode", "treemacs" ], - "commit": "ba0afc8be921776b5813e44d5495f09556da087b", - "sha256": "1wdlk3y8hbl11vhnyp7s45i845lpnnqyf5a17glw36gfggjdin5c" + "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4", + "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp" }, "stable": { "version": [ @@ -112353,8 +113989,8 @@ "perspective", "treemacs" ], - "commit": "ba0afc8be921776b5813e44d5495f09556da087b", - "sha256": "1wdlk3y8hbl11vhnyp7s45i845lpnnqyf5a17glw36gfggjdin5c" + "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4", + "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp" }, "stable": { "version": [ @@ -112385,8 +114021,8 @@ "projectile", "treemacs" ], - "commit": "ba0afc8be921776b5813e44d5495f09556da087b", - "sha256": "1wdlk3y8hbl11vhnyp7s45i845lpnnqyf5a17glw36gfggjdin5c" + "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4", + "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp" }, "stable": { "version": [ @@ -112409,15 +114045,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220221, - 2038 + 20220911, + 1427 ], "deps": [ "dash", "treemacs" ], - "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", - "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4", + "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp" }, "stable": { "version": [ @@ -112440,11 +114076,11 @@ "repo": "volrath/treepy.el", "unstable": { "version": [ - 20220919, - 759 + 20221205, + 2224 ], - "commit": "de1a2ddc3fd7152d0bfbd9e14312ff8a4864ab2b", - "sha256": "15dm6ccwr4k8dir384417hn7cg3alczrpx7xqf1sfady7q85xcv4" + "commit": "7c4a0d21322506a4d4b2301b4274ec955b429b47", + "sha256": "1q5wcnr3lnbk6rcwbjxnvhi11d57g4497pkm059714ca5pflvmlr" }, "stable": { "version": [ @@ -112457,6 +114093,30 @@ } }, { + "ename": "treesit-auto", + "commit": "a6c7df76503fe374132544679ec326b85a2605f0", + "sha256": "0dzvj7dic978drhkiw0smykchn597ha1j911wb1ncf92dq5mp92x", + "fetcher": "github", + "repo": "renzmann/treesit-auto", + "unstable": { + "version": [ + 20230220, + 1438 + ], + "commit": "ed809a73b3bc418942efee7b682ea4cbd4605844", + "sha256": "13w74467yxhqf87cfmyl9hji3mvn1924m8l5bnkb9fms8m7r5p09" + }, + "stable": { + "version": [ + 0, + 5, + 4 + ], + "commit": "2d3f9d9680f8481945e87ed99210efbb9875c13c", + "sha256": "0xzrx8h3ciwwkyv7m5mnncm3mpz80728hjhbhknk1jwhx2dn3bwr" + } + }, + { "ename": "treeview", "commit": "76e3235134af34a522b5bee69f0a16a54cbd9b52", "sha256": "18df7xpz42z408784w0s39hwp5pxrramzrbk7zfbr4qrnxnk0bva", @@ -112499,11 +114159,11 @@ "repo": "emacs-elsa/trinary-logic", "unstable": { "version": [ - 20180904, - 2313 + 20230213, + 1217 ], - "commit": "886232c6d7e92a8e9fe573eef46754ebe321f90d", - "sha256": "10h6p2dwl2k2p35pi3n8y85qh5y0zrr9nhfr4sviwzj1nbqdrvdr" + "commit": "4268556d89831889a722302241c0de680de3731b", + "sha256": "17a9asi08vi6baagmhlm8qmsh8sbb52gphyg9jdydn1hji0qlk40" }, "stable": { "version": [ @@ -112523,11 +114183,11 @@ "repo": "ianyepan/tron-legacy-emacs-theme", "unstable": { "version": [ - 20220610, - 1746 + 20230103, + 617 ], - "commit": "72655ce5ea0580cc23966821d2813e4d5e961f93", - "sha256": "1ba7abw53qmn0d1swxcvgdx6xgrx79ql0mri5mm7nxf7abifskxp" + "commit": "710c5ef80835cc2f6fb40e51f782ab531048f86e", + "sha256": "10y4wp5c7ycj1sr938gw1zyqyzd307lzn5wv5qmv6z8r6xbh6vcs" }, "stable": { "version": [ @@ -112666,8 +114326,8 @@ }, { "ename": "tsc", - "commit": "f07a741d1a14f99a634041cc9b4c200e75461ae5", - "sha256": "03g9wyna387bcmqcb1z4g5ybmlsxh3vg24i0x3ynvkm8knj8nl2v", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1vcsha1r99kmcb8zvfabkkd3h1yzq04na0chjxi5c793rx5nl6n7", "fetcher": "github", "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { @@ -113044,11 +114704,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20220815, - 1954 + 20230116, + 1533 ], - "commit": "d79551c67ff5f2bd5f651eb411cdc66ceeb787e3", - "sha256": "0r57nxcwdpjckpv6lrk310p3hjivnlyfvqpfg9jd86y37bbaw8fa" + "commit": "4fcb4594819caf472ae42ea068a1c7795cf07f46", + "sha256": "12vw5mjl8d4cfv0z46180llmwdwfqrfp88p1fvgp2viizwmw03ym" }, "stable": { "version": [ @@ -113188,11 +114848,11 @@ "repo": "md-arif-shaikh/tzc", "unstable": { "version": [ - 20220513, - 434 + 20220520, + 557 ], - "commit": "8fa2aa5636448a3c3e7b59ea3fe38e80a268537a", - "sha256": "0qdh1y0jfm8w5xz1z3xy55jy3f7vdjg5gv6w451yszf33092sddc" + "commit": "f4e2273b65ace1ea56c9824c3bdb97925c98c8ba", + "sha256": "0aij1425cwj7423nls1dywxsr2xvzbmz0y6b2rargicxl066swrf" }, "stable": { "version": [ @@ -113259,16 +114919,16 @@ "repo": "rolandwalker/ucs-utils", "unstable": { "version": [ - 20150826, - 1414 + 20230119, + 2237 ], "deps": [ "list-utils", "pcache", "persistent-soft" ], - "commit": "cbfd42f822bf5717934fa2d92060e6e24a813433", - "sha256": "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m" + "commit": "91b9e0207fff5883383fd39c45ad5522e9b90e65", + "sha256": "18yqzy8w4icp60z25ckbrx6wradm3m26vic35kmzr88msc0qdsva" }, "stable": { "version": [ @@ -113309,12 +114969,12 @@ "unstable": { "version": [ 20210929, - 1258 + 1301 ], "deps": [ "projectile" ], - "commit": "f0726b5aa3268a00794ca3380c0f0e15d0b72674", + "commit": "7819d5b78e5b52a09b36c634ce404dc8bc3711ef", "sha256": "0rl71y6mzfcfymkimin18pnfhsa1wb906jywr5jx8b0nwkxk227n" }, "stable": { @@ -113423,8 +115083,8 @@ "dash", "shut-up" ], - "commit": "bd52926ccf0b578ed7ef6667707634c5a8878936", - "sha256": "1ss671fhf4r0hrh67kfv9alp057bbnicp3s9s8bmssln25nln3gm" + "commit": "1d3587f1fad66a747688f36636b67b33b73447d3", + "sha256": "0qmvyy3xg5qi7ws8zcs934d6afsappr1a6pgfp796xpa9vdr4y6j" }, "stable": { "version": [ @@ -113519,11 +115179,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20221015, - 433 + 20230109, + 2256 ], - "commit": "9a7a297e98114deed6c66f7569b7d0ee4aa2ee0a", - "sha256": "1a0w645a79z74g2zh8yffmsjyf4vd1niaw8cq4r5wk8zlgg6dqqn" + "commit": "d59bba01de48a808a42d6e29e011ef641cdb6a77", + "sha256": "0bnwhcybvcb60wh3q71fy2jsprzy00g2ipcksnjdpqcwaqvjwdl8" } }, { @@ -113534,11 +115194,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20220731, - 2356 + 20230205, + 310 ], - "commit": "48544cb102fd3d761acf92598076b20bbb4075f9", - "sha256": "1qyb9ssglg0wnrrpkaqdkrc01f88i976c9fg7hyd7pknfjg7glrf" + "commit": "7b3fd0647dd1fbd02101eec61440e6d44953bcd9", + "sha256": "1vjpr2d9fdpc3slk8gav7vlld9v5nvz6wfs5fhig6m2icklvwhyq" } }, { @@ -113595,10 +115255,10 @@ "unstable": { "version": [ 20210106, - 220 + 222 ], - "commit": "8fbbd43fb95058a3f3452c6eb2bcc1559e93a86b", - "sha256": "01svn5hnnarq0sj35xkp92zigfs03n76mr783bh214p6sssyz3k3" + "commit": "8375d87ec184fbe964189e2f9b7263cdb1396694", + "sha256": "0pg64nza2mp4xyr69pjq51jsq1aaym0g38g4jzaxr0hh3w0ris1n" }, "stable": { "version": [ @@ -113699,15 +115359,15 @@ "repo": "kosh04/unicode-escape.el", "unstable": { "version": [ - 20160614, - 1234 + 20230109, + 1222 ], "deps": [ "dash", "names" ], - "commit": "04c7f22f90c96e93f998f084089ab08dc7f4fdd6", - "sha256": "01i5cq7yan9z1kr6pvp4bwzsnxs0bpqsaglfbvy7v6jfp923bvdm" + "commit": "afbb09c774571eefd4e639fc6163280476484363", + "sha256": "0svv3ncdh9h5cv1i0pkhghq8dfh6bjnwkv7908g0x827p4c2sglv" }, "stable": { "version": [ @@ -114055,10 +115715,10 @@ "unstable": { "version": [ 20220129, - 2013 + 2022 ], - "commit": "cb892d614df659783246393c4223ddd8b2d39cb7", - "sha256": "183v9kwva703s1bflsl6ypmxjy4syghkphl2s3yfyp2ra0fxmnrg" + "commit": "9095a3f870aa570804a11d75aba0952294199715", + "sha256": "1b78m66i00fg4f84kvwd82w3pb2rr3skf6cgckb0g1fsdzzhrjb8" }, "stable": { "version": [ @@ -114254,14 +115914,14 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20221117, - 1610 + 20230203, + 2004 ], "deps": [ "bind-key" ], - "commit": "9090080b15486c3e337be254226efe7e5fde4c99", - "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" + "commit": "77945e002f11440eae72d8730d3de218163d551e", + "sha256": "1irr8a8r28n8c0c2x5w1flgv1f3z5jy2i5r5dknddiqa93b3rm84" }, "stable": { "version": [ @@ -114284,8 +115944,8 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20221116, - 1928 + 20221117, + 1610 ], "deps": [ "bind-chord", @@ -114293,8 +115953,8 @@ "key-chord", "use-package" ], - "commit": "41bf2aaf8854973d06f79ef69a638d0ef3ccf2bc", - "sha256": "0jji4lydv80dl9brbjhf2vyrsf52564nkvlqdrf0xbgaxjh34bnk" + "commit": "9090080b15486c3e337be254226efe7e5fde4c99", + "sha256": "03mqkv63ink2ysy86slac8ac7a5g22bi0pwvxyncfasm43q9d0sx" }, "stable": { "version": [ @@ -114349,15 +116009,15 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20221116, - 1928 + 20221209, + 2013 ], "deps": [ "system-packages", "use-package" ], - "commit": "41bf2aaf8854973d06f79ef69a638d0ef3ccf2bc", - "sha256": "0jji4lydv80dl9brbjhf2vyrsf52564nkvlqdrf0xbgaxjh34bnk" + "commit": "bcf0984cf55b70fe6896c6a15f61df92b24f8ffd", + "sha256": "0pmz5x7ghwsjyr4lhaqa53c7190bjqxaczljpsr62s60bn55fdsi" }, "stable": { "version": [ @@ -114440,11 +116100,11 @@ "repo": "jcs-elpa/use-ttf", "unstable": { "version": [ - 20220930, - 1951 + 20221201, + 751 ], - "commit": "105577c6290934119978e23b168f0b97c9d586ba", - "sha256": "143iy63rlibxlyrzxj2qfh3vjwsdgzypimazs7vd6x7l4p45xzrj" + "commit": "3ae1dd908c822e98e017ada034181ad3ffebc1d6", + "sha256": "0f0gbhv6gi9spfsfwg9bjlz90029r9whzgfaba5qq8f9rs390c35" }, "stable": { "version": [ @@ -114464,11 +116124,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20220710, - 1024 + 20230201, + 143 ], - "commit": "32994d27771f77a384b246e69a621c4d26e27f4f", - "sha256": "1zjb0sr4z0qpdivzdpskidxcdl3c6y6f80yim7yfs1bhdd049kld" + "commit": "b5cdcc022dfe248f1fe7d85e735dd7d9434d200a", + "sha256": "135zfgjb4acf57yincpdgjckg1dzv9axm9h7izpalqn4y546kpp8" } }, { @@ -114479,26 +116139,26 @@ "repo": "diml/utop", "unstable": { "version": [ - 20221103, - 1446 + 20230105, + 1430 ], "deps": [ "tuareg" ], - "commit": "c596ac7b88ce0686bc8bf82dfa77fc055cdbfbef", - "sha256": "1nl18rshaw0f93i67n53s7f9x9ykn49bik14432zmr00kcddmn4q" + "commit": "595002e6f07e6a3c6abc6e94a1b2448006115f1b", + "sha256": "0a3imki76pz68s6s495wdw0ig5j8hiwrgbm2lj3ddsm5w2cxxi12" }, "stable": { "version": [ 2, - 10, + 11, 0 ], "deps": [ "tuareg" ], - "commit": "e56a75d2826fbe0ba3bc27a6d19fe08e02c3216d", - "sha256": "1pcix3h9f7is06581iax4i08zkd6sv8y5hy1vvxhqhcsd9z0qfl3" + "commit": "595002e6f07e6a3c6abc6e94a1b2448006115f1b", + "sha256": "0a3imki76pz68s6s495wdw0ig5j8hiwrgbm2lj3ddsm5w2cxxi12" } }, { @@ -114547,11 +116207,11 @@ "repo": "kborling/uwu-theme", "unstable": { "version": [ - 20221022, - 49 + 20230110, + 153 ], - "commit": "188d74cb279537f476c6f35b4e4f966d38884314", - "sha256": "16idjqc6bdqg60mv2h3bgip38j1mpfwpffckpg5vzan9ylsivxxx" + "commit": "6b66376b9d7053eb9c23449a601d24511a0b44e6", + "sha256": "1rkxsnxzgcqmhvll156ipncpcc252j2y1m2jbh7yq8h5m1sz1az9" } }, { @@ -114562,11 +116222,11 @@ "repo": "non/uxntal-mode", "unstable": { "version": [ - 20220502, - 154 + 20230131, + 235 ], - "commit": "3fa793964f287d448e3e2b53fd812803c5f5890e", - "sha256": "149nqrih95b2jvvj8nsl0msah646m8zrfgww8piwil1x16dy43a5" + "commit": "aaaa7a7ac24eb142c68f691185166327ec1e4520", + "sha256": "1bba89vw937rzcm1lr2ym9kkyd56wkgpzhc7dxz73nh74wwh4mf5" }, "stable": { "version": [ @@ -114655,8 +116315,8 @@ }, { "ename": "vagrant-tramp", - "commit": "baea9f16e245aec3f62e55471358c7208f61372d", - "sha256": "0ij7k27zj22sl7inx141l4dg0ymywnvyabjvaqzc0xjdj0cky5c5", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0yqy8nz4501wvzb9bqj2i2aimdkp04bnk40p33cwqakrkprg1gfq", "fetcher": "github", "repo": "dougm/vagrant-tramp", "unstable": { @@ -114751,8 +116411,8 @@ }, { "ename": "vbasense", - "commit": "8e7dd1e985d55149f48e4f93a31fb28ec01a4add", - "sha256": "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0p9kc10xbbjlk9li1ch9589jykn290npq423xvb7zvj0bgjnfhzh", "fetcher": "github", "repo": "aki2o/emacs-vbasense", "unstable": { @@ -114851,11 +116511,11 @@ "repo": "venks1/emacs-fossil", "unstable": { "version": [ - 20220607, - 617 + 20221120, + 908 ], - "commit": "8ce6113aa272583130e5f929fefd67115c8f572a", - "sha256": "087na2g22dnyw52cwaxkzdgbl13p2ldvby7lmqg05bm02cmsv9c2" + "commit": "e059ca466cc8914757c6bdb26fa9cc6b0820a9c1", + "sha256": "0bsb1wv581cwkl46vqm6r726fikv701rvzgx2nqr2ws07p9y4v99" } }, { @@ -115314,6 +116974,35 @@ } }, { + "ename": "verilog-ext", + "commit": "0f5390a1b25d0f370ef11d310f292eda3a3a77f9", + "sha256": "02dccbf38imvg92zv6hdhw8ibc9rahrb1ppbvy3ngk346789l0dj", + "fetcher": "github", + "repo": "gmlarumbe/verilog-ext", + "unstable": { + "version": [ + 20230220, + 1852 + ], + "deps": [ + "ag", + "apheleia", + "company", + "eglot", + "flycheck", + "hydra", + "imenu-list", + "lsp-mode", + "outshine", + "ripgrep", + "verilog-mode", + "yasnippet" + ], + "commit": "6872a42791c5105bfe1de1d63abae537559c7ca9", + "sha256": "15p160yrlxxdlby2fr5aavsxzagdc31wrb2902frgix9zr2z3igx" + } + }, + { "ename": "verona-mode", "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", "sha256": "0qkrfgf9mpf3jphspzpw9sk3d0x9nfx1rcf7ff3s6m470vmg7xbr", @@ -115375,8 +117064,8 @@ }, { "ename": "vertica-snippets", - "commit": "d3c8cb5c0fdbb6820a08091d8936dd53a3c43c56", - "sha256": "0044qcf6dyxp2h14ij6w19zs7ikx9xalfrz6jqbl8sy35wcihmhn", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1d39q0i1nzmcc36pmiavz10q2fi72mxmgn454qasl07lgsqyg795", "fetcher": "github", "repo": "baron42bba/vertica-snippets", "unstable": { @@ -115399,15 +117088,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221118, - 1427 + 20230221, + 1257 ], "deps": [ "prescient", "vertico" ], - "commit": "680fefa4601586dd87d549d33f5ae6fda3212c35", - "sha256": "16k34jp07snzknyp2lg0g6vsb7pk96s0fplb9hdjq8w3n4kyirb1" + "commit": "822481e722502081deedbe6b1a9776eda0ca7bfe", + "sha256": "1h9chc5bipvmn6vqzr150dk91hfcj6yzdn3ylb4lgk70x8if4xvn" + }, + "stable": { + "version": [ + 6, + 1 + ], + "deps": [ + "prescient", + "vertico" + ], + "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", + "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" } }, { @@ -115455,6 +117156,29 @@ } }, { + "ename": "vhdl-ext", + "commit": "addd32ea66e8834de5b14a7d8493f34c8bba62b9", + "sha256": "051p2kx9vxn7di2qzi96hx53kqlwkg93w7jcpa3rjp114nk2f41s", + "fetcher": "github", + "repo": "gmlarumbe/vhdl-ext", + "unstable": { + "version": [ + 20230221, + 1447 + ], + "deps": [ + "ag", + "eglot", + "flycheck", + "hydra", + "lsp-mode", + "ripgrep" + ], + "commit": "6b9cbfeedc4914b08b65e498fb3213bba3221155", + "sha256": "0dkl6h4v6gs7mp14597jd0wdli8jmcfyl4wfmnw7lvzwmah1mjal" + } + }, + { "ename": "vhdl-tools", "commit": "b1a3336bff4d677b3bc7fbb8ef230ffc7b78e268", "sha256": "0xdq9sicwpv3qzy833fqhvi4yllqmqgd4p9lbgq7dn1g8qz2gakn", @@ -115767,19 +117491,20 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20220519, - 1959 + 20230102, + 1830 ], - "commit": "453d698d7fc243a547665f8ba43c55eee574e0db", - "sha256": "168wiywaffhhn7j4nfbnq4lfxpxl0x17z9ckk3nwkpaz45d9a2q6" + "commit": "695a59789209c42fa08a5bce92963ee32f4455be", + "sha256": "0006x7vbwrx4w3b51aajzds0qaw3zb3b2wmj0c3j0anlrmyb37yz" }, "stable": { "version": [ 2, - 5 + 5, + 1 ], - "commit": "453d698d7fc243a547665f8ba43c55eee574e0db", - "sha256": "168wiywaffhhn7j4nfbnq4lfxpxl0x17z9ckk3nwkpaz45d9a2q6" + "commit": "695a59789209c42fa08a5bce92963ee32f4455be", + "sha256": "0006x7vbwrx4w3b51aajzds0qaw3zb3b2wmj0c3j0anlrmyb37yz" } }, { @@ -115957,11 +117682,11 @@ "repo": "k-talo/volatile-highlights.el", "unstable": { "version": [ - 20160612, - 155 + 20230220, + 1415 ], - "commit": "9a20091f0ce7fc0a6b3e641a6a46d5f3ac4d8392", - "sha256": "1dsa6769lphyyv7yg92vkkpk395w52q4m7hdn8xy7s6lh5c6a955" + "commit": "513c8b73cd3bc06cb9936a100468c227f649851c", + "sha256": "0a2r492plzxcl5sl2n75xqywk6yjkgj07xzbkcabvibj33bf1mz7" }, "stable": { "version": [ @@ -115995,11 +117720,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20221024, - 1544 + 20221231, + 1702 ], - "commit": "94694257af1831359e645ae87a88437457d2fc49", - "sha256": "0cdywisdy3696qk5861gckd7pnkca7asnxnp2f24y384g2gjhpnp" + "commit": "636f4db45aa4dac1cda09b54757fdc3584ce6697", + "sha256": "1kyzlhhz70d228xpy8qjliyfxv68rgdn468jix9nfgj5i8q2xxhz" }, "stable": { "version": [ @@ -116018,11 +117743,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20221024, - 1546 + 20221231, + 1702 ], - "commit": "344a4dc59ecb25be772b5a15f07b448f3eb339b9", - "sha256": "0xskb48klafspqwymfy9x708lxsgymd3r054nmalnl2z4q1wvh7s" + "commit": "988b649dcb9074719c7fd0ad3f289cf2995d7635", + "sha256": "0frmgyj71glsng83ila9kb7691kfxyblxjgy5dvilzwjc9a0g8p2" }, "stable": { "version": [ @@ -116056,11 +117781,11 @@ "repo": "ianyepan/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20220320, - 530 + 20221121, + 1846 ], - "commit": "cec18a9d816fef372a4e70f6ad1e16a42aa93b06", - "sha256": "1byssa2rv2j9s3m10v7ihi1avqkjc5wqj62393wkp85k73z9v3dq" + "commit": "f33e1f92f6b34bbd7ecc81cb4c6d48f9cab393d9", + "sha256": "1s2jp3s6vnhdhdv53sp4qkpg19pxfjgwgpch9xc5nqb7ljk22fqx" }, "stable": { "version": [ @@ -116089,17 +117814,17 @@ }, { "ename": "vterm", - "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", - "sha256": "0dd1fcpkhmk7c0r0bl93sack68iyfnnzmii40ixjhm7ma5ms0lnz", + "commit": "a560fc2dbcfd37485890faf5243fbdb653ecaf99", + "sha256": "196vad9hh44pc8r1qd7pv92wr4wa0ni92gjb8bd066a6aagxr6s7", "fetcher": "github", "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20221118, - 1354 + 20230217, + 228 ], - "commit": "f14d113ee4618f052879509ec378feb9766b871b", - "sha256": "0alvh18agp815g5r2cwvyhfpspjfjz5gi84bg1xsi085g1wvgmbl" + "commit": "3e5a9b754b8e61850bb7d1b63b090b9fbf6687f3", + "sha256": "1px5nnwlnpiqry7s99ykvjf2hqryixnl6qvv9wj3808qkls6wykk" } }, { @@ -116238,8 +117963,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20220714, - 1856 + 20221128, + 633 ], "deps": [ "dash", @@ -116247,8 +117972,8 @@ "org-roam", "s" ], - "commit": "8070a599583f0126a089f386e35df62451e51a91", - "sha256": "1zwgsg8p1xghzzim1kpzijin098p707skhwm38cgv258hp4sgw22" + "commit": "bee9bda6a17657155d233e375a2cae693fbe8676", + "sha256": "1j075p8716kfqd68rlfcax3rv8a2aggmz0m8hw3kic91q7psnb7m" }, "stable": { "version": [ @@ -116353,11 +118078,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20221116, - 2331 + 20230119, + 418 ], - "commit": "b1642c87fe83700a929aebb774c89071e23c84e0", - "sha256": "1qblbxv4zbyv2ax1m42wfh1nx6bpl7snixx0whg8jiiqmk9sy6rb" + "commit": "d7f99ea4561004f7f15e8d17f5f7a084d04f3925", + "sha256": "15dpxppfpwrkpfrvjpq6cwkkkkmywvv3rf3pn8psykc48qg1ri95" } }, { @@ -116612,22 +118337,22 @@ }, { "ename": "wanderlust", - "commit": "426172b72026d1adeb1bf3fcc6b0407875047333", - "sha256": "0lq7fvqc0isv49lcm7ql6prc3hpcj5cx4kf8f4gcnfv5k8159cq9", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "03lv7fzwh3s87m8sf0jj69c7nsagj0bkiysjdn8l2vgh5br0pvzs", "fetcher": "github", "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20221117, - 1230 + 20230120, + 904 ], "deps": [ "apel", "flim", "semi" ], - "commit": "f5cb2f0cf5e2c893acf2e669fd549836828dfdfc", - "sha256": "1ijs57wv1vrh33vn311hgkp42vlmjyi998nc4qdrqi7yy9j8hl1h" + "commit": "77662986fd91cff991f502b19262227227740d52", + "sha256": "19iwyzvlidkxldyalppscfhpxj5cqgcn15gp8105xh9bwpwshfkz" } }, { @@ -116768,14 +118493,14 @@ "repo": "ruediger/weather-metno-el", "unstable": { "version": [ - 20150901, - 107 + 20230129, + 1540 ], "deps": [ "cl-lib" ], - "commit": "bfc7137095e0ee71aad70ac46f2af677f3c051b6", - "sha256": "05gfc67724b0mwg8kvk3dsazx3dld50b9xjq8h1nc6jvdz3zxb9z" + "commit": "58b3aa479d85b4b38eb233ac2fbac40faf906f4c", + "sha256": "1r82arsrl7s4gvkfrkbjmwhg198f6r5gqbf7wq3z8m1wxapypsza" }, "stable": { "version": [ @@ -116835,8 +118560,8 @@ }, { "ename": "web-completion-data", - "commit": "604f155a3ce7e5375dcf8b9c149c5af403ef48bd", - "sha256": "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "07bz8gkyqg4clifnrxqgwn2h3rd73607m6w86ni8vzni02s24wqd", "fetcher": "github", "repo": "osv/web-completion-data", "unstable": { @@ -116864,11 +118589,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20221012, - 800 + 20230206, + 1654 ], - "commit": "4b8a695825fda366927894e498421f35fce1cbb9", - "sha256": "0m8fhy3vgczgl051l05lycydpybki2b5gi63i134h2xmgm2m5rvq" + "commit": "df97ab62c94826a84adbde060a4111ca91deda8e", + "sha256": "1nvw1wrvh97gjrk72skp00r4dbdz0a1jsaxgxia3jgbmm6aa5l6l" }, "stable": { "version": [ @@ -117019,8 +118744,8 @@ }, { "ename": "weblogger", - "commit": "e8ccb10a5d1f4db3b20f96dee3c14ee64f4674e2", - "sha256": "0k0l715lnqb0a4hlkfjkyhr8i1jaml8z2xzhal7ryhjgvf8xinvs", + "commit": "ed9e52d5ddfca4fe7f139eff949596ad76c21002", + "sha256": "1r7xi5bm4b3b2zrcfk5k6lhbkp6bwl4zi08bzndywnz0bd5j15si", "fetcher": "github", "repo": "hexmode/weblogger-el", "unstable": { @@ -117105,20 +118830,20 @@ "repo": "xgqt/emacs-websearch", "unstable": { "version": [ - 20220823, - 42 + 20230210, + 1321 ], - "commit": "9336601462ce29822e6aa14db01d923a4bd1c6ef", - "sha256": "0vwsi1ibmw4947bm7c1yz6jvgphilh7039akckfknc6dpacic2r6" + "commit": "aa0d7899e032e330e2980aa4be34ed872395883b", + "sha256": "1z4y9clvpmgflfq13jmb1j4gy8ly93sfcjwmyf3sn25gld6dmnpi" }, "stable": { "version": [ 2, - 0, + 1, 0 ], - "commit": "a39858c0b81817e3defd7b02583287a4d020bc25", - "sha256": "0vwsi1ibmw4947bm7c1yz6jvgphilh7039akckfknc6dpacic2r6" + "commit": "aa0d7899e032e330e2980aa4be34ed872395883b", + "sha256": "1z4y9clvpmgflfq13jmb1j4gy8ly93sfcjwmyf3sn25gld6dmnpi" } }, { @@ -117129,14 +118854,14 @@ "repo": "ahyatt/emacs-websocket", "unstable": { "version": [ - 20210110, - 17 + 20230129, + 1601 ], "deps": [ "cl-lib" ], - "commit": "34e11124fdd9d73e431499ba8a6b6a8023519664", - "sha256": "066zql1zknnc1dlj9jj4dx7w8y8z2q6i2gnagy3jwwxc8j5pp0c2" + "commit": "2c576b6cb8e7b868e09e09c8e9cb6cf66f427bad", + "sha256": "0khrk3q88py4bcb0ir41cjyrclyqn864d4yknssflx5ppalcgyz1" }, "stable": { "version": [ @@ -117261,6 +118986,21 @@ } }, { + "ename": "wfnames", + "commit": "a62d25c944bff5563303fdc4736697d9144d8eb7", + "sha256": "1y749nxrs6a7z81s91ggiax4r4dkvicf23xngab5yasj4ppsi6s8", + "fetcher": "github", + "repo": "thierryvolpiatto/wfnames", + "unstable": { + "version": [ + 20230117, + 729 + ], + "commit": "0804263fa22bf77fcdb65017ddedc168905f3228", + "sha256": "1mzi55hnnkx6xrl41vmp87bsxc2mjrb1r8cpbkf9si2pw9ldghlw" + } + }, + { "ename": "wgrep", "commit": "9648e3df896fcd97b3757a727108bc78261973cc", "sha256": "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4", @@ -117268,20 +119008,20 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20210322, - 2207 + 20230203, + 1214 ], - "commit": "f9687c28bbc2e84f87a479b6ce04407bb97cfb23", - "sha256": "090k2kznhdmzzd4hrs834mbr8kwady2ks1684kgzqjzvwhv36v6i" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" }, "stable": { "version": [ - 2, 3, - 2 + 0, + 0 ], - "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", - "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" } }, { @@ -117292,26 +119032,26 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20200128, - 109 + 20230207, + 1125 ], "deps": [ "wgrep" ], - "commit": "088c04e2ca44eac7e7221f91668ce074915d2f4e", - "sha256": "1a2jvj00yk5wz7djbqaw8xnsappd66ld1liv6zsvv2qa6fnzvlka" + "commit": "edf768732a56840db6879706b64c5773c316d619", + "sha256": "1v4kh00vv7ccs8j46gyp0ikb6v3ppb1na2azdmxwyb6n2acvy4qx" }, "stable": { "version": [ - 2, 3, - 2 + 0, + 0 ], "deps": [ "wgrep" ], - "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", - "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" } }, { @@ -117322,26 +119062,26 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20200217, - 1028 + 20230203, + 1214 ], "deps": [ "wgrep" ], - "commit": "253f93d2764b16a877ae83ecdba692c88eaded24", - "sha256": "15wwrzhaf6iycfwn7p0d6kd32axfpa7wvd72wahzaxx58v4kl8cz" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" }, "stable": { "version": [ - 2, 3, - 2 + 0, + 0 ], "deps": [ "wgrep" ], - "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", - "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" } }, { @@ -117352,26 +119092,26 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20210322, - 2148 + 20230203, + 1214 ], "deps": [ "wgrep" ], - "commit": "4c2f345b9b6b46a2257544acb8c4d92d418f443c", - "sha256": "0arlh6da9z0dp22aydzw642287i9gf895bv24p3y3pv752smxbq3" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" }, "stable": { "version": [ - 2, 3, - 2 + 0, + 0 ], "deps": [ "wgrep" ], - "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", - "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" } }, { @@ -117382,26 +119122,41 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20200128, - 109 + 20230207, + 1125 ], "deps": [ "wgrep" ], - "commit": "088c04e2ca44eac7e7221f91668ce074915d2f4e", - "sha256": "1a2jvj00yk5wz7djbqaw8xnsappd66ld1liv6zsvv2qa6fnzvlka" + "commit": "edf768732a56840db6879706b64c5773c316d619", + "sha256": "1v4kh00vv7ccs8j46gyp0ikb6v3ppb1na2azdmxwyb6n2acvy4qx" }, "stable": { "version": [ - 2, 3, - 2 + 0, + 0 ], "deps": [ "wgrep" ], - "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd", - "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d" + "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b", + "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a" + } + }, + { + "ename": "wgsl-mode", + "commit": "4861b04693f404acadecf938117a27aa6e7f3f2e", + "sha256": "12k311nsv57mrxwhfc0lmp4f8avhy2b23blyqydnrmijl841a0zy", + "fetcher": "github", + "repo": "acowley/wgsl-mode", + "unstable": { + "version": [ + 20221127, + 2129 + ], + "commit": "e7856d6755d93e40ed74598a68ef5f607322618b", + "sha256": "0344db2kx1hw1gr971iqxhwy7qzn2vfkjgg8ccla9zsf22nlqxk3" } }, { @@ -117610,11 +119365,11 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20221103, - 1110 + 20230201, + 1408 ], - "commit": "ce6bbe7f106f11840443fd94cc3161f67ffc9f61", - "sha256": "143xzj9mm3r8acfl71msw2n4ajw4qhkcvgn6a5x98mf53i110z6f" + "commit": "eae090d48f7942f58231be71683865ba3cd56c24", + "sha256": "1mmsk9fsr30a4n1185828sa8jjzfwdcjgq491q027ly5kh4kqc7x" }, "stable": { "version": [ @@ -117662,11 +119417,11 @@ "repo": "akib/emacs-why-this", "unstable": { "version": [ - 20221014, - 1653 + 20221129, + 817 ], - "commit": "258f010001b4d3da89eea56b329f9f24bed0f6ce", - "sha256": "1pcfcbh55a26si8hb2hbgax7iww7nhcgy9m93ncikxhwrk8s8k37" + "commit": "5203d9379afaf6703746823a580c804e1dd98e08", + "sha256": "0ng6z0w6qx4bhgndg14qiabv8qh1vgxdqqzgf0ngidyrm4n43rpp" } }, { @@ -118163,10 +119918,10 @@ "version": [ 1, 0, - 7 + 10 ], - "commit": "3c9e708df324289f39ada9f1f8beae7e7a84f326", - "sha256": "0fxngiy8dmryh3gx4g1q7nnamc4dpszjh130g6d0pmi12ycxd2y9" + "commit": "072fb89d39e33418cb48fa5d25d50545b03f4db0", + "sha256": "13xlagkjmnzv0fn6bwb3vrqn6arxx1g2m1b4wg2rzm7dadlpgmpn" } }, { @@ -118207,14 +119962,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20220810, - 1159 + 20230212, + 2214 ], "deps": [ "compat" ], - "commit": "14a958d4f2fc932db1c1af30ca405e6570d60e24", - "sha256": "1m5cw9z4jl3rhfsf31g8k27bj8yvhll2lm0hk3l3djgqz0ay612r" + "commit": "59867aebe16454be4d8c0c858f3b00b8a34f3f61", + "sha256": "1jrkr58xn0lpxxq0mlar6jpxd7ylnqma4scb148dpfimav1qz3lj" }, "stable": { "version": [ @@ -118314,9 +120069,9 @@ "unstable": { "version": [ 20210527, - 2320 + 2337 ], - "commit": "41f4547339927aec16ede71d1bff7837f5ff49ed", + "commit": "ee4d2b75fd99bac3de40675b0a0e03529718f59f", "sha256": "0n8h84whsh0aph8xhn9plprix9f6bysgvarz2anz7kwns19js6s4" }, "stable": { @@ -118421,8 +120176,8 @@ }, { "ename": "wonderland", - "commit": "ed02d5e4cba10023ebc7c26f90ba8d1e8ee32a08", - "sha256": "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "0vjbhj2c80lkbdqm4cpwb31jcd8agk75js5ca0dn6jijg9amcw2j", "fetcher": "github", "repo": "kurisuwhyte/emacs-wonderland", "unstable": { @@ -118461,11 +120216,11 @@ "repo": "progfolio/wordel", "unstable": { "version": [ - 20220508, - 1745 + 20230109, + 1407 ], - "commit": "d37187bb5abb2fe4a8ba120fad9e52dd74cc220e", - "sha256": "0527j2ldfiaqlblk00abdl0s0l0wmxac74i4qa899mlqq5sp7kyy" + "commit": "77999d75c5eae29e22b8e3f8859b62c6e30aa65f", + "sha256": "0nz0nl0xs71xaa5cq46skfsyszaq622i9zcrz8z9p48hx57dz04m" } }, { @@ -118521,14 +120276,14 @@ "repo": "martianh/wordreference.el", "unstable": { "version": [ - 20221114, - 1300 + 20230214, + 1735 ], "deps": [ "s" ], - "commit": "31d5c2c06f07a695d41212760726bd5036297405", - "sha256": "1q5g5j63z2j43zfiyr76gq12mkslp194mhnmljsnfv4c0gbgihwj" + "commit": "8ccda3422fc30fba23602327cc8e7de9f53bfa1d", + "sha256": "12lhaqhri3yh2l010a2kajzys5jvvad1yg0rcwiyn6hlr6wsg60a" } }, { @@ -118607,8 +120362,8 @@ }, { "ename": "workgroups2", - "commit": "4f9cfb740cce05a6805d9a047e4c1380305da4df", - "sha256": "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1dr0sx92mm9gybdn3gq64lkr3gsphdxazp09vkiyaabvk2hwv4ng", "fetcher": "github", "repo": "pashinin/workgroups2", "unstable": { @@ -118640,14 +120395,15 @@ "repo": "akib/emacs-workroom", "unstable": { "version": [ - 20221114, - 350 + 20230123, + 1630 ], "deps": [ + "compat", "project" ], - "commit": "b81e76e0a39937b7544bf77cbff16cc8c239b58f", - "sha256": "137nc6zm8fnj1ymvmrmkm7y41132cpfr6i8akzj7sj8jmvayzv98" + "commit": "360420501a239f74bff60941d28052fc19a92bce", + "sha256": "13d1qmkls8dbrm2wagrvrffyis87pyy2l2hsmnxrp2mqzk0vx541" } }, { @@ -118721,16 +120477,16 @@ "repo": "dangom/writefreely.el", "unstable": { "version": [ - 20221024, - 221 + 20221221, + 1456 ], "deps": [ "org", "ox-gfm", "request" ], - "commit": "ef22839e590ea62f8ec9510bf03fba8fa3aef4c4", - "sha256": "1pb8gmbqj40m1xqbhaa8k8j29zl39bfsib74m6rcwlzbn2fk5gdg" + "commit": "db70444eb5fbe0820754574d70b1ae44967607dc", + "sha256": "1570vi25pwsws8dskmgclnxc6hjwma44wwvddnnmp8jy8a4fsa3l" } }, { @@ -118956,17 +120712,17 @@ }, { "ename": "x509-mode", - "commit": "27145423eb4e68e006ef96868a35b99d119a3099", - "sha256": "15k3pxj3a2vaf64cl2xrzzlvzbqzqc29qyfd8brhq6yc69snr0vj", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1i3sv9m5kzxchdbdwv87jn7iillw7bk8vh1dzy4j4cxwl17gkfb0", "fetcher": "github", "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20221115, - 1401 + 20230119, + 838 ], - "commit": "814114b3dfe44ac477831c8ca5da0050a9d0fdf1", - "sha256": "0p0l8q1m3mj9lfss2sjbglpcp4dxzf46zjl9c2vzqf2v7hxlps2a" + "commit": "0118ac433f5aa0c4a7ea51709ba9da51388d644d", + "sha256": "0gp0s2xwq384lm80lrdxsghhld5vz6dmxqfacxbp4nk5fqp9xgll" } }, { @@ -119212,13 +120968,13 @@ "unstable": { "version": [ 20191011, - 1148 + 1159 ], "deps": [ "reformatter" ], - "commit": "670ba3d69e702f76a687f81e079addfc7c66075c", - "sha256": "0b21g6kzikg3gbm840dadk0a04j7rhzrgmi849znz6jg6cy6vqrg" + "commit": "2861c4e33e18b077112efa072316b031bca4236c", + "sha256": "1g0v5ir6nwpamnwvq509d1s1s60n0s5p2lvqqm0n0rk9r753cqkh" }, "stable": { "version": [ @@ -119256,11 +121012,11 @@ "repo": "xml-rpc-el/xml-rpc-el", "unstable": { "version": [ - 20221027, - 1812 + 20221228, + 2346 ], - "commit": "de58ee692a459d7e0e8d3df004eda2686f749d3f", - "sha256": "1whvbw91hjkc85wdrxrfvkw8nm8w3c3cpcqf3i0dk5479idv160l" + "commit": "8272789df8a4deab4de7d50e63b73b7d0543bc7f", + "sha256": "1l57q1gskkdjfhnl3jil1gblj2jz6j1l0njwnz5bs76dajhlmjpj" }, "stable": { "version": [ @@ -119427,11 +121183,11 @@ "repo": "ideasman42/emacs-xref-rst", "unstable": { "version": [ - 20220710, - 1033 + 20230116, + 1300 ], - "commit": "e1dd4439e535185a0cd195bb392f70982cf5aadc", - "sha256": "0snl51bnm69zwb8wm8yr0xr263m2sr6f2b1d30p1yp0p0jv40i33" + "commit": "0cc7fadd4698bd5b51ce2a52fcb4de41c7f030f2", + "sha256": "1ilb0zyan6bl4smr1m3c9fhh6r3l8py6lmsg177jasyzdb9bsycr" } }, { @@ -119442,11 +121198,11 @@ "repo": "martenlienen/xresources-theme", "unstable": { "version": [ - 20190108, - 1851 + 20221208, + 2015 ], - "commit": "5239acb51aa2dfa89a207e57012108d8fcf60562", - "sha256": "13pls0f85n5rpbrbqcmrmcznv9hxiaglrnwpzivrli33cba92fpm" + "commit": "76532fc4330e9e31accc580708514b83b15d70a7", + "sha256": "1ilvjdz7j2s1flq4ivn7lcq47d4lshn24sn9qmzj7nln2qz63r7n" }, "stable": { "version": [ @@ -119483,8 +121239,8 @@ }, { "ename": "xterm-keybinder", - "commit": "656f8e27b4e6055a634249f134a4fc0667fa0e95", - "sha256": "1n0zp1mc7x7z0671lf7p9r4qxic90bkf5q3zwz4vinpiw2qh88lz", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "13bgkmdl3ijm5i6ks5rgld6a73b8plsr7s7njp7daiy6krckd98a", "fetcher": "github", "repo": "yuutayamada/xterm-keybinder-el", "unstable": { @@ -119635,6 +121391,30 @@ } }, { + "ename": "yabaki-theme", + "commit": "149f2219404fddc58a94d0ff4aba7fdc7043d814", + "sha256": "1dzh6ry23x5dbw40jiyj97r5clrd2kzdmj89z9x0ijm7alqycsjg", + "fetcher": "github", + "repo": "seamacs/yabaki-theme", + "unstable": { + "version": [ + 20230117, + 2312 + ], + "commit": "5b0aaaf352384f24b0104065b5c600e8e6fab707", + "sha256": "0rvhcbdhj0ha41mkyjccrhpjb75svk01dl33vdkkplqf8rx19p1s" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "5b0aaaf352384f24b0104065b5c600e8e6fab707", + "sha256": "0rvhcbdhj0ha41mkyjccrhpjb75svk01dl33vdkkplqf8rx19p1s" + } + }, + { "ename": "yabin", "commit": "cc44b28e32ff9b35f60744a175c2d1e3036db8bc", "sha256": "1kmpm2rbb43c9cgp44qwd24d90mj48k3gyiir3vb6zf6k3syrc17", @@ -119759,8 +121539,8 @@ }, { "ename": "yaml-imenu", - "commit": "71e7c2df9e34093ad2634d5a56133fa30126fb5c", - "sha256": "03r7020gyr96m1z7p947nb7z8szzlkqv21g1hm10sqa8qp7k0qli", + "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "sha256": "1w3kl28lvcq8y80gxx7kaarb715434xah5z1i9n5nav1fg89r37z", "fetcher": "github", "repo": "knu/yaml-imenu.el", "unstable": { @@ -119819,26 +121599,26 @@ "repo": "zkry/yaml-pro", "unstable": { "version": [ - 20220919, - 1312 + 20230115, + 427 ], "deps": [ "yaml" ], - "commit": "36d340b27a008478466e0158c8ef4098230bfe49", - "sha256": "1m8vkhr4yqwkgmd0inlmmc6bv9x065q9anv0gy2vl15lss1cyljk" + "commit": "5b8c236e1a45b4f6e2d32e10b69868634c8152bf", + "sha256": "0644ibfymf6favv0bx2g542vp4al6276lsi236d7353v3f22f94d" }, "stable": { "version": [ 0, - 2, + 3, 2 ], "deps": [ "yaml" ], - "commit": "36d340b27a008478466e0158c8ef4098230bfe49", - "sha256": "1m8vkhr4yqwkgmd0inlmmc6bv9x065q9anv0gy2vl15lss1cyljk" + "commit": "5b8c236e1a45b4f6e2d32e10b69868634c8152bf", + "sha256": "0644ibfymf6favv0bx2g542vp4al6276lsi236d7353v3f22f94d" } }, { @@ -120086,14 +121866,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20220713, - 1234 + 20230220, + 1659 ], "deps": [ "yasnippet" ], - "commit": "cd665c9cba4bab646f6d50ac098bee63573a4ca5", - "sha256": "113yn1imk8pffn3vyqbjmg7j64x0y0dgqx56jss8wbf17nzck17w" + "commit": "9580874944cce78b3bb2296ae10de1443b0a57e8", + "sha256": "0ig8ywpw1ql49fp1nlxrgaiadd6zxf2npxnpiv09vj6vij0pank4" }, "stable": { "version": [ @@ -120144,19 +121924,19 @@ "url": "https://www.yatex.org/hgrepos/yatex", "unstable": { "version": [ - 20220929, - 123 + 20221216, + 904 ], - "commit": "923a6c0183be469fb4f94b1258527f2ca1cc5b79", - "sha256": "0f5xgzid2bl0qy803vzy1dn8hiq022rbdq2lnj4zxjcvz9jd5cm7" + "commit": "c11261c0960fe44c8664aa017924475dde9d7f71", + "sha256": "1q1m1lap3h32i4j09n1c326d71l18ky4k75mdmcxr1r8z3agsfjz" }, "stable": { "version": [ 1, - 82 + 83 ], - "commit": "4dad5f91b26cb44a8caa888fe8aa0aad1f1f10bb", - "sha256": "0dww4ycfsqskxvnw7yh1a1rylq5d2wgjf75j22pn36nng0zkb7b6" + "commit": "157aa7974191bbb4707d26b05ce830282ad70ef5", + "sha256": "0k23snhqj9vqzrv8mbyjfqv1q3riv67dmphbdrpxprfm0k6bd3ds" } }, { @@ -120168,10 +121948,10 @@ "unstable": { "version": [ 20150105, - 1452 + 1540 ], - "commit": "21a36020c6a5319ea6461f4524aa3a0589df3bbd", - "sha256": "06fnm2c17hmlfp40mq8lxk1blmcy10z0xxdpy8ykyv1r1r6syjf8" + "commit": "4e94cf3e0b9b5631b0e90eb4b7de597ee7185875", + "sha256": "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8" }, "stable": { "version": [ @@ -120249,11 +122029,11 @@ "repo": "jacksonrayhamilton/ydk-mode", "unstable": { "version": [ - 20170113, - 921 + 20170114, + 223 ], - "commit": "3de9ef27dbdf5887f05092895e4ba93e7659e0ec", - "sha256": "1kc1qsblfxfxrbgv3ksqf87gzic463136k2v7ryaj3x2r9mc0j3l" + "commit": "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e", + "sha256": "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi" }, "stable": { "version": [ @@ -120522,11 +122302,11 @@ "repo": "mmcjimsey26/yuck-mode", "unstable": { "version": [ - 20221024, - 146 + 20230113, + 2304 ], - "commit": "b1f76283d435812d08a616db36dc17d949464487", - "sha256": "1x6l7wr5pgs9k0d7s2b884dpqg4g4jza4p0mhrr4lhdx4bjbyxmp" + "commit": "e084416fa3e7f91bb429edbf7ff1585aa5674367", + "sha256": "1ilwn7ml5wbwgwbhqp2nc0v9xvxrax5g3lvxajdjcpx5cipa601h" } }, { @@ -120868,14 +122648,14 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20220626, - 1100 + 20220702, + 1527 ], "deps": [ "zetteldesk" ], - "commit": "171fefe91fc616c94b2ec29826fa6893f5816c00", - "sha256": "07awg6zrnckjbvndmlsmcy5l99f7rmf03zfghzwgdmg7bfyfwxbq" + "commit": "99c5434a809da0b783f31b10872c8cb2a2176e2d", + "sha256": "1bw4d98k8fk9xbm4fcx03p1mc7yq3l5vmdyhwdsj92h3zarcdggk" }, "stable": { "version": [ @@ -120898,16 +122678,16 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20221009, - 2122 + 20221121, + 1811 ], "deps": [ "hydra", "major-mode-hydra", "zetteldesk" ], - "commit": "7d99ea13b8187cea1cc6c44fc70100a2fdd8ed15", - "sha256": "178dvb1ais0p87xf7lqnvax9fs066zdlxw0hsaplyrfwlb6p3k4a" + "commit": "b3e1479286932c59d951c68682675137acd834f9", + "sha256": "1plph3ha1prq7p5cf75d9nm6l1sv0mhd5hl3b6v15jk54mfxj7hw" }, "stable": { "version": [ @@ -120932,15 +122712,15 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20220619, - 2028 + 20220702, + 1527 ], "deps": [ "bibtex-completion", "zetteldesk" ], - "commit": "cac8fb90596d7d2573ef42e2a4a7de0cf49107b9", - "sha256": "1vnknrihhm54khmbawpiavl3k225prgi00y481pfjg2dvvrl3zsx" + "commit": "99c5434a809da0b783f31b10872c8cb2a2176e2d", + "sha256": "1bw4d98k8fk9xbm4fcx03p1mc7yq3l5vmdyhwdsj92h3zarcdggk" }, "stable": { "version": [ @@ -120964,15 +122744,15 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20220626, - 1100 + 20220702, + 1527 ], "deps": [ "org-remark", "zetteldesk" ], - "commit": "171fefe91fc616c94b2ec29826fa6893f5816c00", - "sha256": "07awg6zrnckjbvndmlsmcy5l99f7rmf03zfghzwgdmg7bfyfwxbq" + "commit": "99c5434a809da0b783f31b10872c8cb2a2176e2d", + "sha256": "1bw4d98k8fk9xbm4fcx03p1mc7yq3l5vmdyhwdsj92h3zarcdggk" }, "stable": { "version": [ @@ -120996,14 +122776,14 @@ "repo": "ymherklotz/emacs-zettelkasten", "unstable": { "version": [ - 20220819, - 2351 + 20230108, + 1724 ], "deps": [ "s" ], - "commit": "505fd41dea012e743962c3a376c1e63e7a1e127e", - "sha256": "13pf2ygyizqk3axfl7s246an9w1ih38jq1knzy5f4qn2pf5k2zjs" + "commit": "cc4d69c302a46b8f802a1871aae091df1f3398ba", + "sha256": "16an3pym99r0w6810zw1m1jydb7zvk01mw55zxl64kjc37zdlckr" }, "stable": { "version": [ @@ -121058,11 +122838,14 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20220521, - 1148 + 20230121, + 1229 ], - "commit": "dbc648f5bca8f3b9ca2cc7827f326f5530115144", - "sha256": "0hwkkwhc5b2pzyqa2h0xw8wxijsrp1fk70fhyv8hx19shzlc4la3" + "deps": [ + "reformatter" + ], + "commit": "3cf8ccb55156677b77e0cafbafee8f63dcebfd49", + "sha256": "0bsinwy2nh4gwm7r8m6w4v6ksxrcmhbk62rm4fzp7mj2k7hg2584" } }, { @@ -121073,8 +122856,8 @@ "repo": "WillForan/zim-wiki-mode", "unstable": { "version": [ - 20211117, - 2000 + 20230211, + 1650 ], "deps": [ "dokuwiki-mode", @@ -121083,8 +122866,8 @@ "link-hint", "pretty-hydra" ], - "commit": "aa906931f22c34d77c65bed31121edfef714e4e2", - "sha256": "071xw635ik9jqlgmrzg11d826d3fsjgzyyj60jq6142jr5a0jpqb" + "commit": "cf3d5a0dfb53d6cba8d7d35420ec18bf81b5bf2f", + "sha256": "194wcyz1zwwkizpblq4pwixigpjyy3br7psiaj0p7fmrcicdfmlv" } }, { @@ -121113,11 +122896,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20221104, - 1238 + 20221121, + 1252 ], - "commit": "509b84e2eabb42f951e3a0a4f94218c285e3ac0c", - "sha256": "01pd24m95cdygnwzqqfz3k4jx7h0ibkjlsagalqckri2vpp1q03i" + "commit": "afddac4018c8cf8d8088b4ca128adb01a872e741", + "sha256": "0xmxfkrkijh0n73g0gpynb9rmrxf4mhmk0pwmf2q53wmvpvyn6bm" }, "stable": { "version": [ @@ -121155,14 +122938,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20221107, - 1204 + 20221209, + 1331 ], "deps": [ "zk" ], - "commit": "8cc0ca548f8fc1930bbc14b273b8a30df0c6327c", - "sha256": "0akqvgvlkfv05dl2d11gkb3ym38l1apsdp3d7l8sli7jdwqrhiaf" + "commit": "34fb7d2efffe3f0a9318da3fd3a055e805518b3d", + "sha256": "1sq1mvnnh0ynq7yn9q35dw188mlg5kzb0afd2fc10mirwryimwqi" }, "stable": { "version": [ @@ -121184,15 +122967,15 @@ "repo": "localauthor/zk-luhmann", "unstable": { "version": [ - 20220820, - 1643 + 20221210, + 1227 ], "deps": [ "zk", "zk-index" ], - "commit": "304536486ccae8129dd681265d199062f2026891", - "sha256": "1b4nmf7dicp11hn7sp0p1j5wg5fix9fg32wky29wgr8p3qsnr9wl" + "commit": "d797ce0a143e3bf40d767fa47dee914dd3a2645a", + "sha256": "1kqc6v3c3wkisz8b95727r1qj6gh9yqc9s45gfqc0n4nlh63lz15" } }, { @@ -121218,14 +123001,14 @@ "repo": "nnicandro/emacs-zmq", "unstable": { "version": [ - 20220510, - 1820 + 20230214, + 36 ], "deps": [ "cl-lib" ], - "commit": "af5299d80715b1083a18145e9c84ef9563020676", - "sha256": "1jn1jkkl0pg2psncrf0rx9csp95pg9wm1pcmy1cb3kbqla9x27p4" + "commit": "4e1355a0fbaa4581c9c7822cee7c671b6bf15eab", + "sha256": "1a2n0gr4gvyn1n7dhyaqmlpi27zmh16nbxagn1r9mj0s9whx78q2" }, "stable": { "version": [ @@ -121293,14 +123076,14 @@ "unstable": { "version": [ 20150304, - 1448 + 1702 ], "deps": [ "cl-lib", "haskell-mode" ], - "commit": "03b8d3635f65dbf38f9a19b5d1a8dfdcb38ba423", - "sha256": "0rp615k41v5v9m9g3ydyzgwr6a7wqrmsdkz3pc2frl1zij8jpjm4" + "commit": "9e99d444a387dd1634cab62ef802683f5bf5d907", + "sha256": "1ksjd3askc3k1l0b3nia5mzkxa74bidh2x0xlrj4qs4im5445vnz" }, "stable": { "version": [ @@ -121414,11 +123197,11 @@ "repo": "emacsorphanage/zoom-window", "unstable": { "version": [ - 20201205, - 1038 + 20221228, + 407 ], - "commit": "474ca4723517d95356145950b134652d5dc0c7f7", - "sha256": "0syr88kqzh27ap57v97prk2z0l9wkaysqf1263j7nn9pl4jswppd" + "commit": "093dd7a5d60141812762eba40b021c76ff41f83d", + "sha256": "0i3ch9r8rnk3j6qzfnhj5svdqyas1j85aggn0way6ra3png4r40d" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index feed7ba5b41e1..499da2a8f93e1 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -60,7 +60,7 @@ assert withPgtk -> withGTK3 && !withX && gtk3 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; -let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation (lib.optionalAttrs nativeComp { +(if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; } // { @@ -69,7 +69,7 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation patches = patches fetchpatch ++ lib.optionals nativeComp [ (substituteAll { - src = if lib.versionOlder version "29" + src = if lib.versionOlder finalAttrs.version "29" then ./native-comp-driver-options-28.patch else ./native-comp-driver-options.patch; backendPath = (lib.concatStringsSep " " @@ -241,7 +241,7 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation passthru = { inherit nativeComp; - pkgs = recurseIntoAttrs (emacsPackagesFor emacs); + pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage); tests = { inherit (nixosTests) emacs-daemon; }; }; @@ -269,5 +269,4 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation separately. ''; }; -}); -in emacs +})) diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index dde5083d9c8d0..5472b28b62b9f 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glow"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "0m673xf67q9gjhd98ysh3dvwiqbj6lgsbm20c4zxyz76vdn5k6x8"; + sha256 = "sha256-CI0S9XJtJQClpQvI6iSb5rcHafEUwr2V6+Fq560lRfM="; }; - vendorSha256 = "0ngasfcimizahm80gflxzz3cxz0ir10l62i03l73w8syx4wll0q4"; + vendorHash = "sha256-2QrHBbhJ04r/vPK2m8J2KZSFrREDCc18tlKd7evghBc="; doCheck = false; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 337370a6ddb7a..d04e2507c9174 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "43.4"; + version = "43.6"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Hg1tZ4RcGb7J463VlpX5pTHXKg5UKyA6zJD7OBInwrw="; + sha256 = "m08hPdloyVL75CJoUPXJVk3f1XimoPiT06K2rhmjd6k="; }; patches = [ diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 156e8eaac7e76..e0b7bc9524fd0 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -21,12 +21,12 @@ }: stdenv.mkDerivation rec { - version = "3.42.0"; + version = "3.44.0"; pname = "gnome-latex"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ASMecEE3WNGu1pYNqhoigfqRNaYFkQuodM7VMn3LhUM="; + sha256 = "iL1TQL0ox+0Bx5ZqOgBzK72QJ3PfWsZZvmrRGAap50Q="; }; nativeBuildInputs = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; passthru.updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index 55135c255bfb1..5c450e21748c3 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -23,6 +23,9 @@ rustPlatform.buildRustPackage rec { mkdir -p $out/lib cp -r runtime $out/lib installShellCompletion contrib/completion/hx.{bash,fish,zsh} + mkdir -p $out/share/{applications,icons} + cp contrib/Helix.desktop $out/share/applications + cp contrib/helix.png $out/share/icons ''; postFixup = '' wrapProgram $out/bin/hx --set HELIX_RUNTIME $out/lib/runtime diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index 9adce387f4077..715693770c550 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk"; }; buildInputs = [ ncurses ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=stringop-truncation" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=stringop-overflow" "-Wno-error=stringop-truncation" ]; patches = [ # gcc7 compat (fetchpatch { diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index 2f1ea40359d50..42b3f1495a317 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { patches = [ ./gcc7.patch ]; - NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-narrowing" ]; meta = with lib; { description = "File editor/viewer/analyzer for executables"; - homepage = "http://hte.sourceforge.net"; + homepage = "https://hte.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 913ef7570eeea..c04e215b99084 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -62,7 +62,7 @@ let rm -rf bin/gdb/linux ln -s ${gdb} bin/gdb/linux - ls -d $PWD/bin/lldb/linux/lib/python3.8/lib-dynload/* | + ls -d $PWD/bin/lldb/linux/x64/lib/python3.8/lib-dynload/* | xargs patchelf \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 5d54b1150bcc1..0dc6e8297c6bb 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,50 +3,50 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "cd057a0aa96cf5b4216a436136a1002e6f3dc578bcd8a69f98d6908381b03526", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "896e9cc5b908aa51e091201c320f6f08033f9064382e44b107fccc554ed94895", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.tar.gz", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "e542111e490fbbc80d3aebcbbc343b29e17bf6766d7b708675618d8e49b6ee83", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.tar.gz", - "build_number": "223.8214.62" + "version": "2022.3.3", + "sha256": "a5575ff7e80dd4e9390eb64fc54ed4a924403950da0c38da548de3c4bd97b34b", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3.tar.gz", + "build_number": "223.8617.3" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "7bfe02c1b414c2fc095deab35fa40ed29a129bfa76efc3e31a2785f0f37fa778", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "987f6dca9518da262f556ba1a5afe6190cc5c13a6692c194b4f9ee05d4e66318", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.tar.gz", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "566eada40511cd06727d69047e8a6a1e75b06ebade93d1ea78262fc2715c8a38", - "url": "https://download.jetbrains.com/go/goland-2022.3.1.tar.gz", - "build_number": "223.8214.59" + "version": "2022.3.2", + "sha256": "f130d0e4c2c89dcd291e05cca33484eb08e247e9ec29c13deaf67176afbf6a36", + "url": "https://download.jetbrains.com/go/goland-2022.3.2.tar.gz", + "build_number": "223.8617.58" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "4c3514642ce6c86e5343cc29b01c06ddc9c55f134bcb6650de5d7d36205799e8", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.tar.gz", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "02bc35281eb4e1285eeb9d797ec2b31ec7370e320ad0e89f6f1fa704d78ec4bf", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.tar.gz", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "ce807ba3a776e14f85dbd38f2744fc97e54318561eddd1c265f0d2cacc2565da", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.tar.gz", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "6fa3aff1c730bb79bf3e2e29edcce6d4cdbccfa631524c6253de518be6b6f3d2", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.tar.gz", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", @@ -59,101 +59,101 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "222e8cf974f70a77c92f03b34c38645bfe72a2dd4da20d7154f40375db54709b", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1.tar.gz", - "build_number": "223.8214.64", + "version": "2022.3.2", + "sha256": "7592d18fa1e199087cfd661b64c2fad717840f8ff3e3faf4d88db58bdb397e03", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2.tar.gz", + "build_number": "223.8617.59", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "b243103f27cfb763106a2f5667d8f201562154755ce9746e81e88c80acd7b316", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "0ae72d1931a6effbeb2329f6e5c35859d933798a494479f066ef0a7b2be6b553", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "8f845077cc0fa3582348ee3d76a69ff001391b3f3d63a9b279b8039fd6e07622", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "56430090dd471e106fdc48463027d89de624759f8757248ced9776978854e4f6", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "d785f02e355983c6762248860052a81f75b392e25b585ff5a913aeaa2a2a3010", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.tar.gz", - "build_number": "223.8214.53" + "version": "2022.3.2", + "sha256": "ad853b75bc1e1379593bece3a5fbecec21d1de30263d0d5fef067a352b7d27ef", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.tar.gz", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "4d2adb310b14fb38afcaa2da5c254c2fc0bede109e597eed6d3c36837497591f", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1.tar.gz", - "build_number": "223.8214.60" + "version": "2022.3.2", + "sha256": "8c803914c55a3c1801ff9b619870d81597fabedbfb08a7c1aecf24f5d0884aea", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "d78bd6494cced51fe77d87c07040fa3a29e8af917317399036af161c56afd927", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "2b612177c99ff0c6c542abe005846c3aa6cf170faa0202daafeb4ab1627c3794", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2.tar.gz", + "build_number": "223.8617.44" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2022.3.1", - "sha256": "e6246c929e0d0b9340b66dd282572d67db7bf6031d5789f197be8817de54b186", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "482461646f61f355c7fd976e655bf77dadfa545483c6ab47352ff22eb1193e33", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.dmg", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2022.3.2", - "sha256": "3c91269f04bd6f6df0ae8f2042c029097f56c2ccbc45db95b4f66e87e9d4a320", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.dmg", - "build_number": "223.8214.62" + "version": "2022.3.3", + "sha256": "e9da8036c7d268368b3f82034389481730cb663b809659b1fa1ab91fd9bdc8cd", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3.dmg", + "build_number": "223.8617.3" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2022.3.1", - "sha256": "4b86b523b02f2df5150bc965bcef7e1a0bf7a7e6d2233a3a2603529a8577dd43", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "26ff68ea27952c1adc651ad5f2fae7ad4ca7b744f70f582bdf1bd4c1d17132f4", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.dmg", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2022.3.1", - "sha256": "296d5da052b59a00b0930cf6eea07eb2e5ed4eb1417ee505b013c6d83ffda2e1", - "url": "https://download.jetbrains.com/go/goland-2022.3.1.dmg", - "build_number": "223.8214.59" + "version": "2022.3.2", + "sha256": "8e12ae0ee0d88cd716ac76a8a49392a51236287984d84c19324a19758fe8fc03", + "url": "https://download.jetbrains.com/go/goland-2022.3.2.dmg", + "build_number": "223.8617.58" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2022.3.1", - "sha256": "8ea8b1ceebde397950592708b55f277ca43856b4013f597ccbf385bb75a42c72", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "14b3f587e868adfb132791e17e3b1978a2fb5fd55447eae589c4d95d70c9ace7", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.dmg", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2022.3.1", - "sha256": "5278cf5ded9464b284fa568f2b453eb5b207a0c75e26354bfb66ef8e96be85e6", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "54d51ba7b65f84545faa7f8fc001b2bce48ef3ddb76006a44de9e95c6b395b8c", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.dmg", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", @@ -166,101 +166,101 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2022.3.1", - "sha256": "a2ea7d0f1fd9810a46a3f3fea5f47475fe8b325514488f46ee4dace474388fa4", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1.dmg", - "build_number": "223.8214.64", + "version": "2022.3.2", + "sha256": "a2833c575cfa17c8d30a5f2e0d4ff06167372e7d8190ff08fc2f14e57a21396c", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2.dmg", + "build_number": "223.8617.59", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2022.3.1", - "sha256": "adfb73d85ffb30c2abf715a6c6a0a2ed64a047a3016021a2cb61838457c66a81", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "0a5a396b71533ab7ec77b2f10e08a20a970ac5712cfeb3378728020ec84be416", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.dmg", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2022.3.1", - "sha256": "2e3bff74a53df74ceee0ac182ffc2f22248317ced0a33f8c0014b1ed504d9650", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "6537fe033c13fb9b06da7583c875b0dc5f20660e5b349edc39bd8fdddffaf0f3", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.dmg", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2022.3.1", - "sha256": "9d73b21e558db89ac24a406187cb96e506e320ca0154e8db6aeac7ff960c8944", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.dmg", - "build_number": "223.8214.53" + "version": "2022.3.2", + "sha256": "896dadb76b44bacef79b31619719107f8cf0e729331bda2d6b9f80e8be6dea92", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.dmg", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2022.3.1", - "sha256": "3b23165c3ea9ef3d87233a64005bee4fbf98c99df5d60410a1418e022ce032d6", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1.dmg", - "build_number": "223.8214.60" + "version": "2022.3.2", + "sha256": "bea0a86a4ca00c08d78ccca7568ad5170798544c4a64b21bbfede126bdff0a99", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2.dmg", + "build_number": "223.8617.48" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2022.3.1", - "sha256": "ea2fb464cf8ba0bf553115cd0f006cb4dab729cbde941de2fc86588024abe8b9", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "87e716107156d15aa68230369b6eab2d25c5f6134cfe38cdb01e5b10f2a24418", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2.dmg", + "build_number": "223.8617.44" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "85ee94f4dac126ee2b87ab225f9be6fa828a0c17e067b896f541fd25599411ef", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "0d3d8ccce520a26781a2d126b887d5a829e97987b728104203528510ff9a4423", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2-aarch64.dmg", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "13c8503f190e82b00949b26312873976a10c64dcca036ecc6ce9547b69341658", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2-aarch64.dmg", - "build_number": "223.8214.62" + "version": "2022.3.3", + "sha256": "ef76c7d61c64f7f0f831ef2774bd908e68d651a20648fc4e63618e24a81be6dd", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3-aarch64.dmg", + "build_number": "223.8617.3" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "555ca346ec41de06223d3a4b5e9247809e07c8339bff0d139b624634c812c8e5", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "776ff0a5f0293cd4b4c29380199757b359e6e195a57b69d2cef73f9cc44ee456", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56-aarch64.dmg", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "5873200406e91ca64df50470eb20f907c568f5d95b7488cb4c3b3d3eb8353df4", - "url": "https://download.jetbrains.com/go/goland-2022.3.1-aarch64.dmg", - "build_number": "223.8214.59" + "version": "2022.3.2", + "sha256": "1df4707686f88e284e15a7fd63945b476dabf8e5a041894c281aba4838c603d9", + "url": "https://download.jetbrains.com/go/goland-2022.3.2-aarch64.dmg", + "build_number": "223.8617.58" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "394478e3f2a2ea1788a5c2ef9c5a9db72531462b4db921483d24a08f7c260a43", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1-aarch64.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "808fa52e8dceacb8beb6b84705ac44ded04b67d07c1310449d7cd5c7afbdea46", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2-aarch64.dmg", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "1e9454c2500e1ec0d490e19d175a30f4441ffd30200a5a1041ecbeff3c66c7e4", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1-aarch64.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "ea6da172fc8f27b7bad5475f0e1fc3359c492885bba8b6de59be727cb7b65284", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2-aarch64.dmg", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", @@ -273,51 +273,51 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "7658bcf3433d8f6b983136cc3f3edae5c02053d6983a59c273448f246ea3bcef", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1-aarch64.dmg", - "build_number": "223.8214.64", + "version": "2022.3.2", + "sha256": "4e1244d7fa459a7f07ec43725ed4271e2c669c3202cc04cc074f11fb07bbb25e", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2-aarch64.dmg", + "build_number": "223.8617.59", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "6574cfd20a586fcbdfbac2ea0fa903ea078c1702fd9e5145c33c7c8dc4506388", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "5a0fcb9fdc94896cd5651d9d60fa708596aebe374bc35944b3ff6133f4eb5aae", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "640e4088d976820808d4571c8060b473ab6cfde34699d5913ec3c528ca70faac", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "3237e19f920880a92712d7a61df5eadd6b8e1652cf97115078289468e17332a4", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "d25ba49504c22e8669b8e15033cb6e944e9948ecbb0394ba4bbd5804f1f6657f", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1-aarch64.dmg", - "build_number": "223.8214.53" + "version": "2022.3.2", + "sha256": "a680b91d6c909f913317c91b1912b1b822c121d14d78962f7f44f7473e54b5a2", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2-aarch64.dmg", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "d0ec036ed67146beb46059a6ec9aa07d8caa2225e141183fe1d47e27170ad71a", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1-aarch64.dmg", - "build_number": "223.8214.60" + "version": "2022.3.2", + "sha256": "346b990c412f272acc2fc7e87448f456d8d6a1978b7a94eb645f9cea806b083c", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "f63d2708cccc57bd404b782137f11e5dabf012df0c18aabf900743c4f02daa97", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "a869cd1c1c7b01bbd98f9a1cfd08b1b18ebe77f1c4422ee7e11ddc2c3cb250ce", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2-aarch64.dmg", + "build_number": "223.8617.44" } } } diff --git a/pkgs/applications/editors/kakoune/plugins/generated.nix b/pkgs/applications/editors/kakoune/plugins/generated.nix index 953c95c472483..a37c90fb99d37 100644 --- a/pkgs/applications/editors/kakoune/plugins/generated.nix +++ b/pkgs/applications/editors/kakoune/plugins/generated.nix @@ -1,15 +1,15 @@ # This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit! { lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: let - packages = ( self: +packages = ( self: { active-window-kak = buildKakounePluginFrom2Nix { pname = "active-window-kak"; - version = "2020-05-13"; + version = "2022-11-14"; src = fetchFromGitHub { owner = "greenfork"; repo = "active-window.kak"; - rev = "988db69cfbb88bd741d089bb43b0be551693e7c1"; + rev = "36bf0364eed856a52cddf274072e9f255902c0ee"; sha256 = "1fv1cp9q212gamf9z2papl5xcl2w31fpcmbgdzbxcxdl1pvfsqp8"; }; meta.homepage = "https://github.com/greenfork/active-window.kak/"; @@ -17,12 +17,12 @@ let auto-pairs-kak = buildKakounePluginFrom2Nix { pname = "auto-pairs-kak"; - version = "2021-03-28"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "auto-pairs.kak"; - rev = "526779a26a5cf5f48e7c4f5c5fecca274968a737"; - sha256 = "0gkhvwxyh8pdfydrj7zkfidk0drrbhvdi1fq3pkzllna3vz8q181"; + rev = "bfdcb8566076f653ec707f86207f83ea75173ce9"; + sha256 = "0vx9msk8wlj8p9qf6yiv9gzrbanb5w245cidnx5cppgld2w842ij"; }; meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/"; }; @@ -41,48 +41,48 @@ let fzf-kak = buildKakounePluginFrom2Nix { pname = "fzf-kak"; - version = "2021-04-03"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "andreyorst"; repo = "fzf.kak"; - rev = "1b3a3beebbe7134e671fde2ef2f4242b34ae2c60"; - sha256 = "0rsd65zcizbq3isy8576gqw7mcml5ixw84padaz6ndwfif5fv701"; + rev = "6910bfb4c23cac59c17f5b7850f7bd49aba3e5cb"; + sha256 = "1hlals4d9x5i4mwigxjlx4f9xgc9rw15yzvbvc64cminxic2i3i8"; }; meta.homepage = "https://github.com/andreyorst/fzf.kak/"; }; kakboard = buildKakounePluginFrom2Nix { pname = "kakboard"; - version = "2020-05-09"; + version = "2022-04-02"; src = fetchFromGitHub { owner = "lePerdu"; repo = "kakboard"; - rev = "2f13f5cd99591b76ad5cba230815b80138825120"; - sha256 = "1kvnbsv20y09rlnyar87qr0h26i16qsq801krswvxcwhid7ijlvd"; + rev = "5759dcc5af593ff88a7faecc41a8f549ec440771"; + sha256 = "0g8q0rkdnzsfvlibjd1zfcapngfli5aa3qrgmkgdi24n9ad8wzvh"; }; meta.homepage = "https://github.com/lePerdu/kakboard/"; }; kakoune-buffer-switcher = buildKakounePluginFrom2Nix { pname = "kakoune-buffer-switcher"; - version = "2020-12-27"; + version = "2022-09-18"; src = fetchFromGitHub { owner = "occivink"; repo = "kakoune-buffer-switcher"; - rev = "6a27c45db87a23070c34fab36d2f8d812cd002a6"; - sha256 = "1rmwy317908v8p54806m721bpzm8sgygb9abri34537ka6r05y5j"; + rev = "21319aa08e7c9072dcf1a4f2f5583887d701fc37"; + sha256 = "0lnvcb4khw1ywxd369phd2xibsh5f6qc11x5vrla331wr1q7y8j8"; }; meta.homepage = "https://github.com/occivink/kakoune-buffer-switcher/"; }; kakoune-buffers = buildKakounePluginFrom2Nix { pname = "kakoune-buffers"; - version = "2021-04-02"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "Delapouite"; repo = "kakoune-buffers"; - rev = "7832ea7a4528363482f5684f16cbcebcbec0adfd"; - sha256 = "196d36jww6asf5zr03l1rwg49kkv16s2d4zyryb2m3zvy7prf2bb"; + rev = "6b2081f5b7d58c72de319a5cba7bf628b6802881"; + sha256 = "0pbrgydifw2a8yf3ringyqq91fccfv4lm4v8sk5349hbcz6apr4c"; }; meta.homepage = "https://github.com/Delapouite/kakoune-buffers/"; }; @@ -101,12 +101,12 @@ let kakoune-extra-filetypes = buildKakounePluginFrom2Nix { pname = "kakoune-extra-filetypes"; - version = "2021-01-15"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "kakoune-editor"; repo = "kakoune-extra-filetypes"; - rev = "c6f8aaccd8c9cd6b487964c8943416e21fbe7c18"; - sha256 = "1vkff8xbycfgxv8x09cvc79qcg5fdzn2x77mbmifmkq236khrwrg"; + rev = "8ffeec08068edfee42e076c5f6d56a54a498bad2"; + sha256 = "1v87aqfk2jcysbdls3mh2v1yafk1albbinfxsxp11m4nxd2b9agl"; }; meta.homepage = "https://github.com/kakoune-editor/kakoune-extra-filetypes/"; }; @@ -125,24 +125,24 @@ let kakoune-registers = buildKakounePluginFrom2Nix { pname = "kakoune-registers"; - version = "2020-06-19"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "Delapouite"; repo = "kakoune-registers"; - rev = "9531947baecd83c1d4c3bea0adf10f4462f1e120"; - sha256 = "08v9ndghh7wvr8rsrqm05gksk9ai5vnwvw9gwqasbppb48cv4a8c"; + rev = "b8ca8e04ebe50671a937bceccba69c62b68ae8b0"; + sha256 = "0vy5dc6jly5xqcck0vhnmbjxjdy3615b6d329v0b04amzy0hdlck"; }; meta.homepage = "https://github.com/Delapouite/kakoune-registers/"; }; kakoune-vertical-selection = buildKakounePluginFrom2Nix { pname = "kakoune-vertical-selection"; - version = "2019-04-11"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "occivink"; repo = "kakoune-vertical-selection"; - rev = "c420f8b867ce47375fac303886e31623669a42b7"; - sha256 = "13jdyd2j45wvgqvxdzw9zww14ly93bqjb6700zzxj7mkbiff6wsb"; + rev = "227b3fd9643e6e3b9d36fab324081a988c038e21"; + sha256 = "0ygqhlk31ilczpwws28iqya8i1qhnwkb5rw6bn2zqgxj428a1kqj"; }; meta.homepage = "https://github.com/occivink/kakoune-vertical-selection/"; }; @@ -161,24 +161,24 @@ let pandoc-kak = buildKakounePluginFrom2Nix { pname = "pandoc-kak"; - version = "2020-11-30"; + version = "2021-06-29"; src = fetchFromGitHub { owner = "basbebe"; repo = "pandoc.kak"; - rev = "63979f7e08b86d80436bbe2d9dba173a56057b97"; - sha256 = "16pmmnpyxf8r7gpj8g1lwa960nscjmcl52n1a7s6xcqkp9856wxs"; + rev = "e9597e8df58427884161ce27392a9558930832a7"; + sha256 = "1baslidszbybx2ngdkm7wns2m5l27gc0mb3blhhydiav8fcfvc6m"; }; meta.homepage = "https://github.com/basbebe/pandoc.kak/"; }; powerline-kak = buildKakounePluginFrom2Nix { pname = "powerline-kak"; - version = "2021-04-06"; + version = "2022-04-05"; src = fetchFromGitHub { owner = "andreyorst"; repo = "powerline.kak"; - rev = "6fa5ad383f2884f201d6e3ef07a4687c606df525"; - sha256 = "1s7ggjby0bymq48njzhdvkkarmzl44803xv0dlnzrj7q9c3xv27a"; + rev = "c5ef9a845bbd886c73ef00c0efff986e02d5f5d8"; + sha256 = "1lshlnz5xrxzafxmb6w05g2i6nvi49aqyd8852k9l0lmzqryp7l2"; }; meta.homepage = "https://github.com/andreyorst/powerline.kak/"; }; @@ -195,41 +195,41 @@ let meta.homepage = "https://github.com/kakounedotcom/prelude.kak/"; }; - replace-mode-kak = buildKakounePluginFrom2Nix { - pname = "replace-mode-kak"; - version = "2020-10-07"; + smarttab-kak = buildKakounePluginFrom2Nix { + pname = "smarttab-kak"; + version = "2022-04-10"; src = fetchFromGitHub { - owner = "alexherbo2"; - repo = "replace-mode.kak"; - rev = "5f4c73cdbaf5aeb964ee35ad4b9081b233af90c0"; - sha256 = "1cmylx99bm7jwfb4hclb69sdc4n8f29ssyy2byjiw53ni9rnc8q0"; - }; - meta.homepage = "https://github.com/alexherbo2/replace-mode.kak/"; - }; - - sleuth-kak = buildKakounePluginFrom2Nix { - pname = "sleuth-kak"; - version = "2020-11-06"; - src = fetchFromGitHub { - owner = "alexherbo2"; - repo = "sleuth.kak"; - rev = "911db8bd208ad0d289b8fa15a2ac665ff39bd6bd"; - sha256 = "0g41c0038fpmihqva71xl4vfbmvsp13i47gp6fnmaikajpynzc51"; + owner = "andreyorst"; + repo = "smarttab.kak"; + rev = "86ac6599b13617ff938905ba4cdd8225d7eb6a2e"; + sha256 = "1992xwf2aygzfd26lhg3yiy253g0hl1iagj0kq9yhcqg0i5xjcj9"; }; - meta.homepage = "https://github.com/alexherbo2/sleuth.kak/"; + meta.homepage = "https://github.com/andreyorst/smarttab.kak/"; }; tabs-kak = buildKakounePluginFrom2Nix { pname = "tabs-kak"; - version = "2021-04-14"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "enricozb"; repo = "tabs.kak"; - rev = "048f83455ea7c671ab06e9b9578ac25e5de1d6fb"; - sha256 = "0xswpsdf1bj54inl6vf2lzbjkxfc6g0fyv5kd6y9ahlh5irij8z0"; + rev = "1cb19e410a3ef299f7a701fa5bec98c2d9284dac"; + sha256 = "0hxa4mvw1k74vscxkm520c6g7iwcaqh8kj9g4mwy6n5kkvr1drf0"; }; meta.homepage = "https://github.com/enricozb/tabs.kak/"; }; + zig-kak = buildKakounePluginFrom2Nix { + pname = "zig-kak"; + version = "2019-05-06"; + src = fetchFromGitHub { + owner = "adrusi"; + repo = "zig.kak"; + rev = "5a7e84e138324e6b8d140fe384dfe5cc941e26b7"; + sha256 = "1w0nmhsgchjga4by9ch9md3pdc1bwn0p157g6zwnfpj7lnaahsmq"; + }; + meta.homepage = "https://github.com/adrusi/zig.kak/"; + }; + }); in lib.fix' (lib.extends overrides packages) diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names index a6cae7a4505b3..b856308c78310 100644 --- a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names +++ b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names @@ -1,20 +1,20 @@ repo,branch,alias -alexherbo2/auto-pairs.kak,, -alexherbo2/replace-mode.kak,, -alexherbo2/sleuth.kak,, -andreyorst/fzf.kak,, -andreyorst/powerline.kak,, -basbebe/pandoc.kak,, -danr/kakoune-easymotion,, -Delapouite/kakoune-buffers,, -Delapouite/kakoune-registers,, -enricozb/tabs.kak@main,, -greenfork/active-window.kak,, -kakoune-editor/kakoune-extra-filetypes,, -kakounedotcom/connect.kak,, -kakounedotcom/prelude.kak,, -lePerdu/kakboard,, -listentolist/kakoune-rainbow,, -mayjs/openscad.kak,, -occivink/kakoune-buffer-switcher,, -occivink/kakoune-vertical-selection,, +https://github.com/greenfork/active-window.kak/,, +https://github.com/alexherbo2/auto-pairs.kak/,, +https://github.com/kakounedotcom/connect.kak/,, +https://github.com/andreyorst/fzf.kak/,, +https://github.com/lePerdu/kakboard/,, +https://github.com/occivink/kakoune-buffer-switcher/,, +https://github.com/Delapouite/kakoune-buffers/,, +https://github.com/danr/kakoune-easymotion/,, +https://github.com/kakoune-editor/kakoune-extra-filetypes/,, +https://github.com/listentolist/kakoune-rainbow/,, +https://github.com/Delapouite/kakoune-registers/,, +https://github.com/occivink/kakoune-vertical-selection/,, +https://github.com/mayjs/openscad.kak/,, +https://github.com/basbebe/pandoc.kak/,, +https://github.com/andreyorst/powerline.kak/,, +https://github.com/kakounedotcom/prelude.kak/,, +https://github.com/andreyorst/smarttab.kak/,, +https://github.com/enricozb/tabs.kak/,, +https://github.com/adrusi/zig.kak/,, diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py index dd8765db28a43..49662a0e8e2e2 100755 --- a/pkgs/applications/editors/kakoune/plugins/update.py +++ b/pkgs/applications/editors/kakoune/plugins/update.py @@ -42,19 +42,19 @@ HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/ class KakouneEditor(pluginupdate.Editor): - def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): - sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) + def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str): + sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower()) with open(outfile, "w+") as f: f.write(HEADER) f.write( """ - { lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: - let - packages = ( self: - {""" +{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: +let +packages = ( self: +{""" ) - for owner, repo, plugin in sorted_plugins: + for pluginDesc, plugin in sorted_plugins: if plugin.has_submodules: submodule_attr = "\n fetchSubmodules = true;" else: @@ -62,24 +62,19 @@ class KakouneEditor(pluginupdate.Editor): f.write( f""" - {plugin.normalized_name} = buildKakounePluginFrom2Nix {{ - pname = "{plugin.normalized_name}"; - version = "{plugin.version}"; - src = fetchFromGitHub {{ - owner = "{owner}"; - repo = "{repo}"; - rev = "{plugin.commit}"; - sha256 = "{plugin.sha256}";{submodule_attr} - }}; - meta.homepage = "https://github.com/{owner}/{repo}/"; - }}; - """ + {plugin.normalized_name} = buildKakounePluginFrom2Nix {{ + pname = "{plugin.normalized_name}"; + version = "{plugin.version}"; + src = {pluginDesc.repo.as_nix(plugin)}; + meta.homepage = "{pluginDesc.repo.url("")}"; + }}; +""" ) f.write( """ - }); - in lib.fix' (lib.extends overrides packages) - """ +}); +in lib.fix' (lib.extends overrides packages) +""" ) print(f"updated {outfile}") diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index b49fbc14fad9c..41c72cc51eaa3 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # the linux config works fine on darwin too! buildFlags = lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux"; - NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; + env.NIX_CFLAGS_COMPILE = "-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 23734f3f23cd6..83d6796e68478 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-eqiH/K8w0FZNHLBBMjiTSQjNQyONqcx3X+d85gPnFJg="; + hash = "sha256-ItJ8aX/WUfcAovxRsXXyWKBAI92hFloYIZiv7viPIdQ="; }; patches = [ diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 29749c35db1fa..8a4e86ef6551b 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -9,8 +9,6 @@ let inherit (neovimUtils) makeNeovimConfig; - packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; - plugins = with vimPlugins; [ { plugin = vim-obsession; @@ -47,13 +45,6 @@ let nvimAutoDisableWrap = makeNeovimConfig { }; - nvimConfDontWrap = makeNeovimConfig { - inherit plugins; - customRC = '' - " just a comment - ''; - }; - wrapNeovim2 = suffix: config: wrapNeovimUnstable neovim-unwrapped (config // { extraName = suffix; diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 05037eafcb871..125fae66f7f7e 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -89,6 +89,8 @@ let python3 = withPython3; ruby = withRuby; }; + # as expected by packdir + packpathDirs.myNeovimPackages = myVimPackage; ## Here we calculate all of the arguments to the 1st call of `makeWrapper` # We start with the executable itself NOTE we call this variable "initial" # because if configure != {} we need to call makeWrapper twice, in order to @@ -131,6 +133,7 @@ let builtins.removeAttrs args ["plugins"] // { wrapperArgs = makeWrapperArgs; + inherit packpathDirs; inherit neovimRcContent; inherit manifestRc; inherit python3Env; diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 9146b526262f8..65517d43bbf0e 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation { binaryBytecode binaryNativeCode ]; - maintainers = with lib.maintainers; [ sander rszibele asbachb ]; + maintainers = with lib.maintainers; [ sander rszibele ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index 8f4bcfd672634..fba050a040cfc 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -80,13 +80,13 @@ in stdenv.mkDerivation rec { moveToOutput share/vim "$out" ''; + # Prevent tclPackageHook from auto-wrapping all binaries, we only + # need to wrap poke-gui + dontWrapTclBinaries = true; + postFixup = lib.optionalString guiSupport '' wrapProgram "$out/bin/poke-gui" \ --prefix TCLLIBPATH ' ' "$TCLLIBPATH" - - # Prevent tclPackageHook from auto-wrapping all binaries, we only - # need to wrap poke-gui - unset TCLLIBPATH ''; passthru = { diff --git a/pkgs/applications/editors/qemacs/default.nix b/pkgs/applications/editors/qemacs/default.nix index 9fc91fbe19771..6960ecb3d34e3 100644 --- a/pkgs/applications/editors/qemacs/default.nix +++ b/pkgs/applications/editors/qemacs/default.nix @@ -1,15 +1,46 @@ -{ fetchurl, lib, stdenv, libX11, libXext, libXv, libpng }: +{ lib +, stdenv +, fetchFromGitHub +, buildPackages +, which +, texi2html +, enableX11 ? true +, libX11, libXext, libXv, libpng +}: stdenv.mkDerivation rec { pname = "qemacs"; - version = "0.3.3"; + version = "5.4.1c"; - src = fetchurl { - url = "https://bellard.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "156z4wpj49i6j388yjird5qvrph7hz0grb4r44l4jf3q8imadyrg"; + src = fetchFromGitHub { + owner = "qemacs"; + repo = "qemacs"; + rev = "216b3ff8b77ff138aec22045522d5601b7390e58"; + hash = "sha256-ngVaZZdr/Ym9YswLqzUtDytC0K7L9mKgORopLghGH3k="; }; - buildInputs = [ libpng libX11 libXext libXv ]; + postPatch = '' + substituteInPlace Makefile --replace \ + '$(INSTALL) -m 755 -s' \ + '$(INSTALL) -m 755 -s --strip-program=${stdenv.cc.targetPrefix}strip' + ''; + + nativeBuildInputs = [ which texi2html ]; + buildInputs = lib.optionals enableX11 [ libpng libX11 libXext libXv ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--cross-prefix=${stdenv.cc.targetPrefix}" + ] ++ lib.optionals (!enableX11) [ + "--disable-x11" + ]; + + makeFlags = [ + # is actually used as BUILD_CC + "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" + "CC=${stdenv.cc.targetPrefix}cc" + ]; preInstall = '' mkdir -p $out/bin $out/man diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 71633c8c8e4a9..2d8b3c2bb09c6 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -25,7 +25,7 @@ , makeWrapper , pandoc , llvmPackages -, libyamlcpp +, yaml-cpp , soci , postgresql , nodejs @@ -95,7 +95,7 @@ in openssl R libuuid - libyamlcpp + yaml-cpp soci postgresql ] ++ (if server then [ diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index 0697497d43db9..234d3a06901ff 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.139.0", + "version": "3.150.0", "appimage": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-x86_64.AppImage", - "hash": "sha512-0s/tQmP5PINoQB7FOhR5wYuBvynKHpM9uMNmkJs77z84rY+WXOdZRjki6ZeG60niNXr8rUSLOBffy4jyLka6tg==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.0/standard-notes-3.150.0-linux-x86_64.AppImage", + "hash": "sha512-qDjZ/WQdxXCoTA2PVRiSrIukO+N6gB9UdK7Fed5cvd+xFGteSmfPpP7R6wbvTkxkAe4gkH57taeWg+Tt1jW+nA==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-arm64.AppImage", - "hash": "sha512-LralbOiIVQCtQTqmhTtKttdtMz4M14drPFZ00LPFcwzQviLdU2C/od3NUxf5H5piGgqt5TJlgMCOcLIiyoNKFA==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.0/standard-notes-3.150.0-linux-arm64.AppImage", + "hash": "sha512-KxK5Z3x611kp2TU5MTxwBfPirlPRbe8zSbF4mjMGDuzmTK3beqHhIGUh4Lud5opMyvUlbVxQf4SxslMxh7uvmw==" } } } diff --git a/pkgs/applications/editors/texmacs/common.nix b/pkgs/applications/editors/texmacs/common.nix index e52d95f837df4..82dd13920b026 100644 --- a/pkgs/applications/editors/texmacs/common.nix +++ b/pkgs/applications/editors/texmacs/common.nix @@ -27,18 +27,18 @@ rec { postPatch = (if tex == null then '' gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -) - '' else if extraFonts then '' + '' else lib.optionalString extraFonts '' gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if chineseFonts then '' + '') + + (lib.optionalString chineseFonts '' gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if japaneseFonts then '' + '') + + (lib.optionalString japaneseFonts '' gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -) - '' else "") + - (if koreanFonts then '' + '') + + (lib.optionalString koreanFonts '' gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -) - '' else ""); + ''); meta = { diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 693362f95f688..d4bfdebd6a552 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { buildInputs = [ qtbase qtscript poppler zlib qtwebengine ]; nativeBuildInputs = [ pkg-config poppler qmake ]; - NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler"; + env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; qmakeFlags = [ "DESKTOPDIR=${placeholder "out"}/share/applications" diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 96fb32e80f368..d162261116c0b 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.4.1"; + version = "4.5.1"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - hash = "sha256-3w9JKX0tT5J3tJthIxJ+ZMlG8+gEeQAl9Gn+Zyjhmt4="; + hash = "sha256-QBPWelCqh8Ggp0IjH37QGYGu5Ya2fpsiSEkKh3Ee7PM="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index 67374b9b40b00..4f1544eeb46a5 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -1,28 +1,48 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config -, qtscript, poppler, hunspell +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, wrapQtAppsHook +, hunspell +, poppler +, qt5compat +, qttools , withLua ? true, lua , withPython ? true, python3 }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "texworks"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "TeXworks"; repo = "texworks"; rev = "release-${version}"; - sha256 = "sha256-v0UukFM5brPtgq+zH5H1KfUc0eL0hjTC9z0tVQRqu2Q="; + sha256 = "sha256-X0VuXNghHoNsNNDfZJXXJ++nfUa5ofjW8rv3CHOUzxQ="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qtscript poppler hunspell ] - ++ lib.optional withLua lua - ++ lib.optional withPython python3; + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; - cmakeFlags = lib.optional withLua "-DWITH_LUA=ON" - ++ lib.optional withPython "-DWITH_PYTHON=ON"; + buildInputs = [ + hunspell + poppler + qt5compat + qttools + ] ++ lib.optional withLua lua + ++ lib.optional withPython python3; + + cmakeFlags = [ + "-DQT_DEFAULT_MAJOR_VERSION=6" + ] ++ lib.optional withLua "-DWITH_LUA=ON" + ++ lib.optional withPython "-DWITH_PYTHON=ON"; meta = with lib; { + changelog = "https://github.com/TeXworks/texworks/blob/${src.rev}/NEWS"; description = "Simple TeX front-end program inspired by TeXShop"; homepage = "http://www.tug.org/texworks/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 66369c266d604..27a92ac659ba1 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.0609"; + version = "9.0.1275"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-UBj3pXY6rdekKnCX/V/4o8LLBMZkNs1U4Z4KuvisIYQ="; + hash = "sha256-WDnlYi9o2Kv/f3Fh1MHcfTlBTe1fxw4UyKJlKY04fyA="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 98d7a8db2f4d0..92813ed4637e8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-01-19"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "dac83f630fc6aafd256b149a2c2ae0d4466ec85e"; - sha256 = "1ny56csbrk2kzfqr9a3m858j4vi4iwpmx8w71fr9k6ncychk9pip"; + rev = "3f6fd348df53b9d15aa0a58709562cf0a3b4636a"; + sha256 = "1dyxlam666wvydhmpxvyli3j7immifmw8yb1fyxhdrllivnrkd00"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-12-30"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "4ba9154caafe707c95d438681da4eb4774380024"; - sha256 = "11c39hjpn9i3d74wqnqczcx9bysgaj3wjkb8y86b312kpi4r2agh"; + rev = "9aefe2af9230e8e5aa43ed1faade069da0721b66"; + sha256 = "0pl7qnzxxnzlyzvjwa0p828wx1m69b3qmixdzl18ix4c3g1wakf4"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -101,12 +101,12 @@ final: prev: FixCursorHold-nvim = buildVimPluginFrom2Nix { pname = "FixCursorHold.nvim"; - version = "2022-09-19"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "FixCursorHold.nvim"; - rev = "70a9516a64668cbfe59f31b66d0a21678c5e9b12"; - sha256 = "1np58km2jq26d23rq1szi7v3xnfw63r6hwk263fnf38sr2q6v9cg"; + rev = "1900f89dc17c603eec29960f57c00bd9ae696495"; + sha256 = "0p7xh31qp836xvxbm1y3r4djv3r7ivxhx7jxwzgd380d029ql1hz"; }; meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/"; }; @@ -173,12 +173,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-12-18"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "43433aa8dad1601acf923d3c25fa3325799508aa"; - sha256 = "111nhw85v6hkyjzfs8jx566s44i89mihvlcnwdgwc08pnmnm7fci"; + rev = "0f9606ee3e7c0e2d3437b88b6aad77ed82609e97"; + sha256 = "0kks1rlblniwimzxdjjqypz4s7l6c6lv0bxhsgkyhl2vw978n2xx"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -197,12 +197,12 @@ final: prev: Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2022-12-21"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "a2e7d6ebd26e647469135d4096dfa89da4f070e5"; - sha256 = "0jli6pba08n20n97h0wh6h36pkca9bwq93h9dipmb0q4a2zqb37m"; + rev = "91d86506ac2a039504d5205d32a1d4bc7aa57072"; + sha256 = "12hsdwj4jqbkh8z3hcr1c660jmh44c0j4rzlchnc326gcbrayarv"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -257,12 +257,12 @@ final: prev: Recover-vim = buildVimPluginFrom2Nix { pname = "Recover.vim"; - version = "2015-08-14"; + version = "2022-09-07"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "efa491f6121f65e025f42d79a93081abb8db69d4"; - sha256 = "17szim82bwnhf9q4n0n4jfmqkmhq6p0lh0j4y77a2x6lkn0pns5s"; + rev = "e61319bce3cd1004e5b695933296d8f267dd65a3"; + sha256 = "0hnww4a0vffgpj72qdhhsr28xdh219haldr6jd6my8mqy1rg3yq4"; }; meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-01-17"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "8ec6e1b030d933cba9a207a78c2f24333641fb2c"; - sha256 = "1cqhg2mp2qjpi28yq7pj9qlyry9vlyjw30nvwm0sd02pkjal0m0j"; + rev = "a4798a9fb5fd3ac8e132065597b397cab347d3ca"; + sha256 = "0al1dri6yv3n7a0xdf5lln6dvq4h5zqlxmyc1lgii260kk7zirgq"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,24 +341,24 @@ final: prev: SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2022-11-15"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "8ff0ed105d1403a60e1f79150b8b645a3465b3a0"; - sha256 = "06bddfpmnabhw7q8q459qa55gh3x7xqzb0lq7qpq1i4kg6qsc7ck"; + rev = "fab8e52ec7d67000c8d96028b2d643573a4289b1"; + sha256 = "0kk482si63v67a4086hk9va1lsjqpmbaf71y2cqyrw9vidbmy38g"; }; meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-01-17"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "25e2819b0e6ad38f51c918ea09e159c8a09bbdc3"; - sha256 = "15s0ndfpji3zms2fbijm7ys40x5p8994cdir3a0ya1nksf3yb9jj"; + rev = "6333a123c8681415ae141edc0943d0f7b377e619"; + sha256 = "0f2nbcjcsi993c5lf8mvm5ma80clm793iqhwdq4amjmxxqsdipxp"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-01-17"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "50379d35ddc38ee3651f568d080442d5e4cb4a3a"; - sha256 = "0s830zxirqbw880xv7ddza8m988i4ljrd4vgdk1yxaifid2zx8yg"; + rev = "9a5eb4443e8a990698daa99da512d0fd7aed0f32"; + sha256 = "1fazaiax65fgijm1i5k6n0zazbwhr35bwlagafcv5l4hydrxidqx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-01-22"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "e2b6cd07b45f8457ea183d16e483fdac3581b04f"; - sha256 = "0hx85bkbqcp94d2i1p9jd3c5n91xg1fhmm86yf7xjpx4knynsdbh"; + rev = "faadebfd77f176bd8acfab8bc9decac4abba26b0"; + sha256 = "0jzbapmrca4pqxl5nwra4wm29hgfcq5v0zng2a5hivbbjqrk7zzs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-01-06"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "69c1dc8b5f3d215d4a0538265b2d257c2ed7a8fa"; - sha256 = "00jr9s90i03zkl076pa0knc0k9dx1xcc98ajlrxw3dkq38kbshiy"; + rev = "c3f9bccb8c04b01d5d0712b8691658af0b0ddb16"; + sha256 = "15bpbm0w9crw8pgxfynlvp9ccqzbjibgk4p1pj5fix7vzlhchh2w"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -583,12 +583,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2022-11-29"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "21a0f2520ad3a7c32c0822f943368dc063a569fb"; - sha256 = "1s9ywy69kap0gngpm5xnfkwlrb2apci9xv2ahs2xhhkjncqm38mq"; + rev = "b3eef69e95674905bf26c7740dd4bbb09b355494"; + sha256 = "04b3sik1j5y7yr17q109man97wkhdfmma0ah7arlq0yl08r8p357"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -727,12 +727,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2023-01-04"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "76ce329f419d615f52335e2c18153674a4598276"; - sha256 = "0l4g18d86wibsl4jmnm4kmjrgnk1dfzr2x7xwhx0s2dqkm2g1rqc"; + rev = "7c1be58365428ef18c3621bacc5aaf188f8a4b9e"; + sha256 = "196km3z2pl0zbk8sy7c8z82a7wicla15ylfdraxpxh362sry8ayq"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -775,16 +775,28 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-12-13"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "c8b2f4048f846387361bd04cc185bf1aa7d2e3d1"; - sha256 = "0z02981n9gd5migx774cs4gnwpq9ksd4ava53f4xn973gc8jf4jn"; + rev = "04ccdac802200ecc363b251cf922b2b022bb515c"; + sha256 = "02xvdvy0jakpbgkp33ll21rcqpiybngwgxjsvvw6wg4wqg8dzykv"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; + autoclose-nvim = buildVimPluginFrom2Nix { + pname = "autoclose.nvim"; + version = "2023-02-16"; + src = fetchFromGitHub { + owner = "m4xshen"; + repo = "autoclose.nvim"; + rev = "08b362ba12af1053871b192614b627bcb3c5299d"; + sha256 = "0lw5hxdn72ylyqwh1rs2ab3jknfx6j584zxwz8mcaag6zp75c44k"; + }; + meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; + }; + autoload_cscope-vim = buildVimPluginFrom2Nix { pname = "autoload_cscope.vim"; version = "2011-01-28"; @@ -835,24 +847,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-01-03"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "c1b5d351ccd8f88fd2729b90ade2ef5d333463de"; - sha256 = "1cwkkg57mga200kyvd9j02xi82mbq95i5nj0lkpc7r2lxds70qbr"; + rev = "00512bab6983fb8b996f36a9688b0c8478a1f4f0"; + sha256 = "15w2a8m1pbv265b3s3j0b4a4n3znwmg8629azqw5wdgfhy3sami7"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "ab0d20b2d48551340b52b3cbe8922462caa06950"; - sha256 = "10382d94lg6k7g8inwqs40ddywzm8pfg6j0m97kansag4q7c8p4j"; + rev = "55eb481d2554c7e612e52b68aa23be2090dc58cf"; + sha256 = "1fff73c663z6pcvkic9ngr9hs9vn6fpxw72x2ivwwiz7d983i93q"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -907,12 +919,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2023-01-09"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "6fed33809cde3b416087fc540ad9eb17ec470193"; - sha256 = "1wqps75qkr7rqdvrsn6f8m02nkqap9g6cca1jqf53y9476jsbml7"; + rev = "5cd64c0afb82688748d415710d0187df5bdb96f9"; + sha256 = "0l7nrvk9v1ky0nx1raxmp1ah1qh54glwg18grv6mdg4iksd27kib"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -979,12 +991,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2022-12-04"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "f79e9d186b42fba5f1b1362006e7c70240db97a4"; - sha256 = "08avd9icr7jclljlkzg8q74c95g0knzhxkldgfg9kl298h7qc521"; + rev = "8933abc09df6c381d47dc271b1ee5d266541448e"; + sha256 = "1f2kv77273hgjmkwvsrxmpsdj2gpz8y72fz1nxgawd6h9w9ly7kf"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -1015,12 +1027,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-12-24"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "c7492a76ce8218e3335f027af44930576b561013"; - sha256 = "18vfx8mq2gsv2hqy0c0vgbmx5mhr63bb8ixrmzmjgvbx2djz1jdb"; + rev = "cbb798dd2db7841550cd2c6c6dde12dfda055928"; + sha256 = "0wy8cdrsirk94il9qyv1c29mcysr41mjrr8f595pkb5zyd45lb34"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1039,12 +1051,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2023-01-14"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "8d4ab7a8d9120a3538216056047d10df3947789b"; - sha256 = "0v6d2kiww9ky0m0b94c66kfvxwmv11rkpxqyfv62pigirs8x3a82"; + rev = "691d7d9eeed574bbc6ee70bf5329ccb55a5e1f81"; + sha256 = "0mkcyaxzfjbzm7lnkfv2wwy5wg1jaaalfdnzng7q47yld4gabijn"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1123,12 +1135,12 @@ final: prev: circles-nvim = buildVimPluginFrom2Nix { pname = "circles.nvim"; - version = "2022-11-28"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "projekt0n"; repo = "circles.nvim"; - rev = "91ae7e0ddf95e1984528cf3129879f4841bcbc82"; - sha256 = "0wmy9h2m4zdqaw7cmg1dz5w8l0x5269is0r8bb3ns7clilrknjhm"; + rev = "06357817f6944de132f0a58ee5c1486e4dcc6dda"; + sha256 = "1rvbz9m02vmjs5dg9yhnzzdr46ck1rqdrc7a94sybj8qvw3l5nq1"; }; meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; @@ -1147,12 +1159,12 @@ final: prev: clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2023-01-02"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "a5c3c8390dfb342d630bdc25941a4d8f433510be"; - sha256 = "0picfypj5by4zmq37h0dmszwk8vzj5dq04q2jy8lb9p5n36rkwya"; + rev = "722ee39d4c1b309bef4a6c2da1749c3e3358757f"; + sha256 = "1wdni05s0d1p5wmzr30sazqm3fi8n178jf1fdwwlbjpvalgjn5kp"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1219,24 +1231,24 @@ final: prev: cmp-clippy = buildVimPluginFrom2Nix { pname = "cmp-clippy"; - version = "2021-10-24"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "vappolinario"; repo = "cmp-clippy"; - rev = "9f8dd021f7b9326407a439105b0c646983191a49"; - sha256 = "02k0zwjbd98f76f3v46lvd8wfm8wibkh703g8vxr26yv1fwghs4n"; + rev = "eb501c9fa429c5852f8f420e71a9f565f4852c8f"; + sha256 = "1l07fvfc37sp531rjzpajf90dprcnylrkj9prr6qrgr1xlxqsvwh"; }; meta.homepage = "https://github.com/vappolinario/cmp-clippy/"; }; cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; - version = "2022-11-27"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063"; - sha256 = "0vffivj94736njjhlazrs0jkc1nyvcdjpw64w38d1lhlyflf4cl7"; + rev = "8fcc934a52af96120fe26358985c10c035984b53"; + sha256 = "1bhhna3f1xzf6y7q6iq9v2369w0jrgnh0hngnw84wh79pknqsgb3"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -1303,12 +1315,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2022-11-23"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "b7c0629e10c8a3a10311aa4ad952d207509d5e67"; - sha256 = "1hs3pying86zbrk3vnrpv4nfa8nl8b2ify5wks8675x5rc9z8iyh"; + rev = "fb3fba41fe14f4e96551e46ec74dfd1d46fb864a"; + sha256 = "10axz30ix4kxix8yw3qqamp28d07jb95sq2ry79q9vawmjfpz648"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1351,36 +1363,36 @@ final: prev: cmp-fuzzy-buffer = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-buffer"; - version = "2022-11-22"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-buffer"; - rev = "471949d19b1246f069eaf50729b39231eab3221b"; - sha256 = "1l10acnb8rxis7hs1a333b23cfcjllwzr98cn9xh18mrh77my7w5"; + rev = "5da5f20b2b459671c207599404ef8fe3fa0f60f0"; + sha256 = "08q6i73pp7h03ghd3fpdlfxhz85hrgg5s4cp4f2j4h87sssi5mzw"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/"; }; cmp-fuzzy-path = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-path"; - version = "2022-11-29"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-path"; - rev = "28735cebc314f0b080a41350adae8612b6fc7814"; - sha256 = "0jwr9xb0axs1i3xk0z773jrp77jy1a274pwwd09lradm4rfa052q"; + rev = "0caa34810c03a94ef01a57c3758fcaeab3130cf3"; + sha256 = "1axr13kw7g3jmk29s20nyqv153qxfjd4jajwcxw9m184p27nb74z"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/"; }; cmp-git = buildVimPluginFrom2Nix { pname = "cmp-git"; - version = "2023-01-09"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "6bcb61c0a5ec2e0d522ece7c8fb3e009f1c79261"; - sha256 = "0n00apdpm920hjddmyhzynqxzdqz1scmqays9p4c4b6dq06jblbr"; + rev = "191ec4788656c3d1ad59c9edc3d96e132f93e039"; + sha256 = "0ln32vw0kqjfc8m4qn963f656hivg3v275dj0xqis25pcdwqpidg"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -1399,12 +1411,12 @@ final: prev: cmp-latex-symbols = buildVimPluginFrom2Nix { pname = "cmp-latex-symbols"; - version = "2022-12-08"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "kdheepak"; repo = "cmp-latex-symbols"; - rev = "1ec2e4f47cde6c7ffcebec92cfec58ddc1f6689a"; - sha256 = "093wj6kfln2lsgcijnwjj924lbgld0vhfvx8w0kfhlhpv5fr5dfz"; + rev = "165fb66afdbd016eaa1570e41672c4c557b57124"; + sha256 = "19hrj03b1l6n981h0rjy6y98fach7hj64hh3l787w1wkhq3pirxj"; }; meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; @@ -1435,24 +1447,24 @@ final: prev: cmp-npm = buildVimPluginFrom2Nix { pname = "cmp-npm"; - version = "2021-10-27"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "David-Kunz"; repo = "cmp-npm"; - rev = "4b6166c3feeaf8dae162e33ee319dc5880e44a29"; - sha256 = "0lkrbj5pswyb161hi424bii394qfdhm7v86x18a5fs2cmkwi0222"; + rev = "e5753b6103ce4cf887233142fa9f31b2d13b42f2"; + sha256 = "1hcl7ch38pnjsjnpvrqmfghikaps80aykxbn63xm8wrdqa7rxph3"; }; meta.homepage = "https://github.com/David-Kunz/cmp-npm/"; }; cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2022-11-16"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "59224771f91b86d1de12570b4070fe4ad7cd1eeb"; - sha256 = "1m8xs7fznf4kk6d96f2fxgwd7i5scd04pfy2s4qsb5gzh7q2ka9j"; + rev = "0e6b2ed705ddcff9738ec4ea838141654f12eeef"; + sha256 = "0gpwwc3rhfckaava83hpl7pw4rspicblxs7hy3y57gb560ymq6hg"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -1471,12 +1483,12 @@ final: prev: cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp-signature-help"; - version = "2022-10-14"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp-signature-help"; - rev = "d2768cb1b83de649d57d967085fe73c5e01f8fd7"; - sha256 = "13imcdv0yws084z2x2lmdj17zy4ngf126i7djknnwp2jfkca1120"; + rev = "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1"; + sha256 = "0bkviamzpkw6yv4cyqa9pqm1g2gsvzk87v8xc4574yf86jz5hg68"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/"; }; @@ -1603,12 +1615,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-12-27"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "ee1341c53e7b82f55c6e83287828f652c2ac35e1"; - sha256 = "0x61dhbx1wvbnf1pjz1an3zhmp25xy07wshw8dw5yf46qi623l09"; + rev = "1b1c0235c54e3fc9e77504ed8d36028f64e6f48d"; + sha256 = "12ivpbxpqvxb6c2p0snpr65d45ppx57l8aylnb3l39ciabknjhdm"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1735,24 +1747,24 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2022-12-24"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "4f8d072df2609219b8d79b67641a9753e3d7fff0"; - sha256 = "1nsv5ag13yzcffq404darfk0vz4sbchj941bcf960znnlynlcya0"; + rev = "5fae5a15497750483e21fc207aa6005f340f02f2"; + sha256 = "1r9jhdxm3y1lpdmwmlk48skihf7jxdm2sxirzyd1kwb88nvn4c3r"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2023-01-17"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "e74d1173689dccde72fdccaabae19cbe93d2f1be"; - sha256 = "0pmx80b4s0nvdz5ps0jrlgrsir00q0s4ighjl7598gfh59ic8jhl"; + rev = "bf9bde0a86022c494c995778a5bf7210f2420601"; + sha256 = "0fyyq22f33q949v5cabjynbj311279cxfm4wb3mi6v1agzpxh8lb"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1795,12 +1807,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2023-01-21"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "e86b15bbcabc2cc1f20a40e7c127a424e7ad3850"; - sha256 = "1qh30yg082a6s55psa1z844n3s5z8s31pan7iywaygwcnpxhlgx6"; + rev = "bbaa1d5d1ff3cbd9d26bb37cfda1a990494c4043"; + sha256 = "116h45vnz98ni60i12f2z6rwz9gkpp1k4ysp1ry0qpjgmb5fcbsy"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1819,12 +1831,12 @@ final: prev: codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2022-12-02"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "6537ba677a0c7c6c796b195f29077b57fad33716"; - sha256 = "01rk4i212zcas64hk3d2a15qvn8rxwlkghzci2cd1n79ywj0q9xd"; + rev = "ab8c5faa867424c79a7d5d3a7f55d3a2528ee9b9"; + sha256 = "0d3rpj31wd5xzwcrnv7rwm54g81s3i4hxs7lcwph8k1j7pb8i1nl"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -1879,12 +1891,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2023-01-18"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "eab2c83a0207369900e92783f56990808082eac2"; - sha256 = "0kin87qixkbib55763bd38xrbcgw4nx2rdklg3lmjgkd9w05jjzd"; + rev = "6821b3ae27a57f1f3cf8ed030e4a55d70d0c4e43"; + sha256 = "1c3qrbjzz0kl1k1gjkgil0ni944ac80ps76rdhs9jd7chbn7l0sb"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1951,12 +1963,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2023-01-19"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "c9ce6476e4b481c64d13939c6696043b8e21dd43"; - sha256 = "0mqb300w663xb4yfxkijbn8ixzgj8azgywmhg7qjskds7w8af15z"; + rev = "26009c1d6265a6b6e86d8e74a81a235892f67e87"; + sha256 = "0g2b0mxssx6sjmn2iqlipwj50jmw8hfq648xcg3f78phmn03b4s4"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2083,48 +2095,48 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-01-22"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "6ca9b4b3eda9138406291493750a6890c927dbfa"; - sha256 = "00dfhj44hfqi66j1ayr7h424qc160l9d91wlbfb4hhbg2rcldp4l"; + rev = "5304ea7079f38df200f4357401f1510fd00560a8"; + sha256 = "12gnvz8634d0bx1fxcl2lq7w76cs795bz11p3r21vggznbzpgvs4"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2023-01-18"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "8c8416488ef21483dd5d2922ea194c05e9a3baaf"; - sha256 = "08zs24jqwv6z5fih1701wxlpbb2bjp5zlj0incw7vyi87zk2i3va"; + rev = "9e869d29e62e36b7eb6fb238a4ca6a6237e7d78b"; + sha256 = "0jzk1hd8kvh8bswdzbnbjn62r19l4j5klyni7gxbhsgbshfa3v87"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-01-22"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "0b78334e1edcd7eb3d2038621b388ff040f035fb"; - sha256 = "0ag9f1h03s0pfiqaxclcz73sra0lwkva23dyacg53svcmpi9bpic"; + rev = "eba0531cea9fe292059dbecf677d36a07f9c28b2"; + sha256 = "059p1rjjhk4i2fxi9zgd923j7ksj9cfx4f9smhnqdqgmkm57lnwd"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-01-22"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "d48f1315617092a8c0db29c2fd2d81d5e244c555"; - sha256 = "1ddzfj9gg67jz5kx4i51iyyl3js1b3k7mzxxa8pp5fh1021pi1hy"; + rev = "531faab60ba9418eb180a4a127a661bed98b46a2"; + sha256 = "0lkkyd9iz89lnalvf2i8yz9ssiwiavvnmavxzn0siw7p69x2fkr2"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2143,12 +2155,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-01-22"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "25232d23926c28c34f462dd9a57847d90b1af969"; - sha256 = "1ycf3mfrs2a4c43mbdc3rs2kby1y2gxpp0kxilv8vp0c1idibyxr"; + rev = "272a39c8f483c0bf6137dd382363639aab83a23e"; + sha256 = "0yy9lyh9wx7wa4s6ishqg3g0lb0z3c6hhywghpvyd16kldf6lrd9"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2179,12 +2191,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-01-13"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "707ed7d6f8927a5ec0c241aa793f694f1b05f731"; - sha256 = "1nd7n871vlp5hdgl5xap09kn596rx99i11ccn7nr4abl56q2dp2s"; + rev = "3fc7ddac13ddf65914a733ef074317c4c72ef05b"; + sha256 = "1gyhh32v40c9cndyg3jxpyhaaxh392xl93la3aplpl4xwaphhzbv"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2215,12 +2227,12 @@ final: prev: csv-vim = buildVimPluginFrom2Nix { pname = "csv.vim"; - version = "2022-11-23"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "fb159987bb430bb61e07928d132e4487e54a82ef"; - sha256 = "1c6fas33baabdfsm95icbi8n84ica2hysyvkprx4zpz5zn2b8rk5"; + rev = "0f6900bf1d0f2ccdbe59ed246db4a82e5cc16e78"; + sha256 = "0yi9r665xsvp2043mwc58wljfnsp38pzab7j14mb0fcs787r0kq4"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -2287,12 +2299,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-01-10"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "f7d623457d6621b25a1292b24e366fae40cb79ab"; - sha256 = "17vwcqajvxhbvifg562zxvzwln0llb3gzyih3k61yssdp5akcfl0"; + rev = "0d5e201629a85617fb7efef61c3212fb4529f31a"; + sha256 = "1jylspgsfana9chd5ywx3ylk54fkgj5r2jhy5x7145k1zmwq49qv"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2661,24 +2673,24 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2023-01-15"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "dbcfd4510d31884d444ec33a4453d0f06ad4a5eb"; - sha256 = "1qcwchka11gaphb36njcwa7qdw4hbp0x36w7mhsdm8p4i5xw3161"; + rev = "5020da900cc5dfd7067f181ee2ebd872ca7c84e8"; + sha256 = "0qxd2wn6q5v60ai222yjhzqkcb9v0dnlr4k2pvn9zqcwhj0qc2py"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-01-15"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "5bbcf162d03287296fe393f88da6065db3cf9fd0"; - sha256 = "0lmqvm2sdj5mpq8hd03wyvmxgm6y286f0b7kr820znh1swlky3z1"; + rev = "11827d46e939b4748dbdb7e0df4982a63bd59d26"; + sha256 = "101l5v8a0ya7cz230rd85gwc06b4hxnilbydf0zcxy85dq5j8wq7"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2721,24 +2733,24 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2023-01-19"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "a0b129d7dea51b317fa8064f13b29f68004839c4"; - sha256 = "0q7ly95hp123z9z8qh4sih5a53dnbxv0jxa80b1s7d6h1wpr2w5j"; + rev = "798274ba3c454a9aa3cd71f95a86ea55cbbbb142"; + sha256 = "156g08ab9jghi580b1k88si3bc6h72d77avlpn34dnnn5481anvh"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-12-13"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "4436d6f41e2f6b8ada57588acd1a9f8b3d21453c"; - sha256 = "1iwxqfqp3x09wz3rnvli3y80n38rw149cmjj9pmbkhiqgsm9p461"; + rev = "db716a0f1279f79a886c0e0b6ab3c3d5ffdb42fe"; + sha256 = "00k2gpmikkp2bcpg8jg6pcjwvd806garficbjiv2k9ibzpbvc4xl"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2757,24 +2769,24 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2023-01-14"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "5064f59094c42911e2ce57e1b59acda546c3905b"; - sha256 = "1gssj61d8lma9kbadmdwgpa3i4343srlfnzjc3br527dhw7ihcqm"; + rev = "c9a87dd0b7b5417c3797332ef06b17733626387f"; + sha256 = "1cjl5gyp2wibhb8d4rwsav62bs0x12n4xjrkmz189rc5dmh1yplw"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-01-22"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "ed23a49992a8adfc0a1db765cb5353adeb12f9ff"; - sha256 = "09bi47gv5xd7wf7i53kbp3d2n5xzbns408cg52faxixd001m0f71"; + rev = "1d54632f7fcad38df8e428f349bc58b15af4b206"; + sha256 = "1692rzbv64332wi0cmyf0g5m8k039vvrijxmryrqnxaf15493mbw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2843,12 +2855,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2023-01-03"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "62408f6cb189606bc4b16832ada29be3ae33515f"; - sha256 = "18h7mwr9lpsdsdi90vn4nc868g50li27xvylrs2srppfjr7kvl7w"; + rev = "aa97c07ee7b327120e467927c85a57ff1d713754"; + sha256 = "0pr4igijc9n8gwr64x4srgbwg21m6x0bkl2v00ps6iscblfmzzr3"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2891,12 +2903,12 @@ final: prev: fcitx-vim = buildVimPluginFrom2Nix { pname = "fcitx.vim"; - version = "2022-11-15"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "fcitx.vim"; - rev = "dc95d0301b61a7db1f1badfe743fb627ea6e06d1"; - sha256 = "1z6n9ax8mnr9p1j64hrl463kqnaf7gc08975j5n7c77rrz23bd1q"; + rev = "92247352c6f05c8deebea2f50d8e842bfd91c294"; + sha256 = "01p7w8pc0d3crbksn5xwz4zcbnb7phjz5n6lk59v9b326sjm3rai"; }; meta.homepage = "https://github.com/lilydjwg/fcitx.vim/"; }; @@ -2927,12 +2939,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2023-01-15"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "4841c8830f0354808952fd4f64869383413c194f"; - sha256 = "0jmv0wqx0234dz0xlqjf1rhn7y4hnd4vxxqfr0f166nz678fld05"; + rev = "1856f0390b1ae15d446b94dc47ccf5b967537ad1"; + sha256 = "06c54lhn30ibn721l6vh5gx4kdyrk39w2kkcwrlhskpx6dipava5"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2951,12 +2963,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-11-27"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "44585a0c0085765195e6961c15529ba6c5a2a13b"; - sha256 = "112mjmy2nrqwj3l9dp3gzxsygaidcdrz2l6vzn27k1a57a7jyb8l"; + rev = "688b4fec4517650e29c3e63cfbb6e498b3112ba1"; + sha256 = "16j8c13jyqr9f8lw8sxcvcv0p60qpa4apdcqcz3ll6r6pb1413vz"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2975,12 +2987,12 @@ final: prev: firenvim = buildVimPluginFrom2Nix { pname = "firenvim"; - version = "2023-01-09"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "b6be2e074b8f62815a45e31eb0966b4dd5e57810"; - sha256 = "0jhb91wfkz3jr1hxhigb551gg4c0gv8hdj9avyd5kj5lqwmy1j4q"; + rev = "dca3e56021cb5c39f401c9d83531743416c3365f"; + sha256 = "0hrkidscljbggsvkajvmqn1x79raa1bpjbwiqjgp3b1vckhyzz3h"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3000,12 +3012,12 @@ final: prev: flit-nvim = buildVimPluginFrom2Nix { pname = "flit.nvim"; - version = "2022-10-14"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "be110f9814a45788d10537fd59b3c76d956bb7ad"; - sha256 = "1innhwy2izcw2w7qhp6x7s3q07zy0zxfwqmlqskgl6c75r4akqyn"; + rev = "980e80e8fe44caaeb9de501c8e97a559b17db2f4"; + sha256 = "1aw5455gin4ki3sn2ml38acqi2w94mhbx37pkajfbb5bfagdpdb0"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3048,12 +3060,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-01-01"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "ae0be3cef35c0cb41d6c7f814a19b3402d50fd7a"; - sha256 = "0ynidizghmbrapcm2wrn6cjmn28gvzkxc1ia9s8nmh63574prfrv"; + rev = "d67caa7dd17eccb89bfda1c0657d0723e339ef60"; + sha256 = "1rgl6kaa0rv7hx6fslrmm8glw9gfpl7yqpf31zj5lazw82k5wk1c"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3084,12 +3096,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-01-19"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "046e4d3491baf664e0eef5231d28beb49333578b"; - sha256 = "1ywp6lfzdx4k1pj6fzxd703zcvwrfkbmcmggds267bjgadrfbbnc"; + rev = "6fa50a94ba5378bb73013a6e163376d8e69bd8a5"; + sha256 = "0a0xzfynxrwb53azlsdqda4pdsnvavkdfxmsg776snv6iqx9sw1g"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3180,36 +3192,36 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-07-16"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "f8988d7d738a0e9e7aba2f0a9512df6356bbda07"; - sha256 = "1bl8a3mnz9p9a03pqq3gdxpfxk8j3pjj8g4828nca3df72nk9vrn"; + rev = "16905056051759b15a388709a3fa65ff098eb243"; + sha256 = "1330a2ycs9bz0kkkygbsri5fh9grldzkg5fwahv30vf3nsybsrpc"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-01-15"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "292de730ebbd3834e87f864c8c4115dc1035db37"; - sha256 = "068rwvq5q264lpfxgg4gw259rsy4wp6n6bf4877azk19f1b4j0ys"; + rev = "b15ef042f7006827e7413baad89a0e8541079c9e"; + sha256 = "0svjfw6nsczqpfqic1zvpnz3bn9iivzp81i5kkq7vqgks11ji0w9"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2023-01-16"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "bdf48c282ad2174c25c059b3cdb7956427b07a99"; - sha256 = "0xjbnvyp0qnfnvz0grhyfcmzn7m90v3d3pfqfvivis3x1vws883q"; + rev = "dc71692255b62d1f67dc55c8e51ab1aa467b1d46"; + sha256 = "0h8yq3rxm6dfryjlh57n13bylwg4f4c4skc9z0krgl200v39ard0"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3240,12 +3252,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2023-01-02"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "9e4f5360b69558799c6974ed72248b86d09c6549"; - sha256 = "1pv64p2g385h4awapg99m39r3qipkpwg4rkicvdsc0dsnamqmis3"; + rev = "8340095e5a8263494abadf5a81970ff92091e004"; + sha256 = "0glp8nnj9jsps465srn59bdc6g5pnyrs3n9kxghp0wzf8hrx2zic"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -3288,12 +3300,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2023-01-14"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "5ddf157139ecfc0d2161f00c2cce4874578dc355"; - sha256 = "0d4caahrnqgy06mvqvxhhcr2li2hvk44hwqvw9dkxh9g6hyfjj87"; + rev = "17840d01f42ee308e1dbbcc2cde991297aee36c9"; + sha256 = "1ldc2lnabz5hr18xgiwrr83w93rnqidhycwkkhi4bc0hmabacsix"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3336,24 +3348,24 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2022-09-26"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "c68d4873a14d2ae614875685ccca2e49472989e8"; - sha256 = "1lr55vn4mr9gdhr1zxihm98hjv1ypp47k5vhq5fkv14sd37hmwf8"; + rev = "cc59f732f3d043b626c8702cb725c82e54d35c25"; + sha256 = "000gg83j6fcx6iwp39m3dljfpg0f5vna8pkvwp1b13jf4hjyzcff"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-01-20"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "7b37bd5c2dd4d7abc86f2af096af79120608eeca"; - sha256 = "19kna3rjdzfx2ys07jwb413saj9dg25i9ym6r8037r7h65h42yz2"; + rev = "f388995990aba04cfdc7c3ab870c33e280601109"; + sha256 = "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3372,12 +3384,12 @@ final: prev: glance-nvim = buildVimPluginFrom2Nix { pname = "glance.nvim"; - version = "2023-01-10"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "611478d2b36beb3c416c92f77e7c116d7bd25ee6"; - sha256 = "0fhxg27yq2lfwfwgpg2zf28hrb6kfa6nffrm6bzajk192z1zbak0"; + rev = "bbded06ea23faad779297122e93b1c0dcdb2a770"; + sha256 = "0sirrb5s3g93a65ygc2s8g481vfgp205vyvsrghml5r93pddvzkc"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -3396,16 +3408,28 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2023-01-14"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "c88184a0bbd3e32e0274ad8c3782aba718f1053c"; - sha256 = "0b1yqy0j7akgqal1zq8h3zgrk0asvyffxrad81s2wv4r0dcg8csr"; + rev = "2bb4afb6e9dbc93993a1d7d4168dac08c74590ac"; + sha256 = "0k6wrlzn5i7c1gfhs077aivvgy1qbjrjr79j1m6y3n8jgdzk1f6z"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; + go-nvim = buildVimPluginFrom2Nix { + pname = "go.nvim"; + version = "2023-02-21"; + src = fetchFromGitHub { + owner = "ray-x"; + repo = "go.nvim"; + rev = "7a6c02dd199f62e4c87c4e9641b0963c6b0ad81f"; + sha256 = "1jzl73fxpa370jxh9i134jpgnm9badim3i581h5n5id8qgfnibng"; + }; + meta.homepage = "https://github.com/ray-x/go.nvim/"; + }; + godbolt-nvim = buildVimPluginFrom2Nix { pname = "godbolt.nvim"; version = "2023-01-02"; @@ -3516,24 +3540,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2023-01-14"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "30e9f4b0fa24c25980df1690a8c47c36e40b6673"; - sha256 = "0nzrjrkfvckhzmxpwmn5qr62zfhkidmccfwj7iaaa3f4mi2ya5mb"; + rev = "13b7eb4589d9ab0f388ca51047051f7158c930e5"; + sha256 = "0mivkynl1xl40mk9ppiixk5mk8z70g30i7bm3lwpg02746vyp04v"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-01-04"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "e863942494d7c72a7c8d2c54cf651f28fc5a76ab"; - sha256 = "0xh1y64bn274f7rm597gqgqjrra5fafydqcm127ikdiqsa948psy"; + rev = "73f009df5ed929a853244c413bb52c1d02c117ce"; + sha256 = "1q8lxhw9fcvgx6km4l32571c2qq7fid460h69c8j4wxz3a16y1n4"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3576,35 +3600,35 @@ final: prev: hare-vim = buildVimPluginFrom2Nix { pname = "hare.vim"; - version = "2022-10-10"; + version = "2023-02-10"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "267fb4dac4e8cd4df1d9b57fa587ce718f5fc256"; - sha256 = "1spl17vd8w5k5xgqvmr80fi5samzhxfcqnkmzpqjk2sf5z88k80k"; + rev = "75874719e1aee0171a0f06d1508ff9a116f6ac75"; + sha256 = "0n2rh59nnp0fv4jxvx30arrrqpfbagix6a94rxq3100n8kszr218"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2022-11-23"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "21d0d1bfa3000e4384740bfaefa0ebc51c773786"; - sha256 = "16idy8a2ar2gc7kdr888wwlyw4m48kbw2yzflz16fbdg56krb43d"; + rev = "8c0bb0a328e57278f4783bb0e2ea32f296d36db1"; + sha256 = "0w1v0r420m9aqkl4h4wjzhc7am8pf43pbv6g8mkf50x8mgxqyac6"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "6ac15db045393cb40c484b19f3903d89acf2b125"; - sha256 = "07rsq2wgdjqlav15jvaiwk4a33q6w07all7q6v7hzdpng8bmywgi"; + rev = "f95c5b019777768c0498bef05e1ee095f7d9398f"; + sha256 = "0pz4xma58zwzi1705lmv7q6ijjqcrgydip47cbp6h7si1sl42kl4"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3645,6 +3669,18 @@ final: prev: meta.homepage = "https://github.com/travitch/hasksyn/"; }; + heirline-nvim = buildVimPluginFrom2Nix { + pname = "heirline.nvim"; + version = "2023-02-19"; + src = fetchFromGitHub { + owner = "rebelot"; + repo = "heirline.nvim"; + rev = "b69415d912d466db17b8ee1eb777cc7f776a9286"; + sha256 = "0pv320i23wwp58xy3lpiy4j90y6fl8frmw19nk0c8dy9c10pdg6s"; + }; + meta.homepage = "https://github.com/rebelot/heirline.nvim/"; + }; + hiPairs = buildVimPluginFrom2Nix { pname = "hiPairs"; version = "2020-12-10"; @@ -3659,11 +3695,11 @@ final: prev: himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; - version = "2022-10-09"; + version = "2023-02-15"; src = fetchgit { url = "https://git.sr.ht/~soywod/himalaya-vim"; - rev = "747ff2a6055839cb5b403b540883515af37b7117"; - sha256 = "05d8nfzqp96s05agj4fd5r2fckdsxacl0qvlk9dhxz4dh8kgsqyi"; + rev = "64fb17067cf5dbf5349726b9ed1b1b38065cdb82"; + sha256 = "13d5vs35bmzr4dj2anj2k7scmx647ddsyz941sjaajsyff37bvsv"; }; meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; }; @@ -3718,12 +3754,12 @@ final: prev: hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-12-02"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "1002bcdea7af06c5a7bfce0536d96bc4b03ab42e"; - sha256 = "0cbw07w65kmp1w2l2k4vbnv10vhpj30ija14mdn8mfbqwbp8pb2j"; + rev = "9fd5d6e341861c776ec9c69a2fc524deae67b541"; + sha256 = "0cysw3852wgnaahw1fwbmq72m0pi4yqf9r1kqi4gzim1fva7sy61"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -3742,12 +3778,12 @@ final: prev: hydra-nvim = buildVimPluginFrom2Nix { pname = "hydra.nvim"; - version = "2023-01-16"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "anuvyklack"; repo = "hydra.nvim"; - rev = "d00274f05363c13f29ed1fa571026a066a634cce"; - sha256 = "1scf9pmwch081l2rvfm0np6cjd4kj3kzpzkjlbc7zjw4gbbrbr9s"; + rev = "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0"; + sha256 = "1dwhi2543drbncrqx80nsi5hw48d6my4wbsp71gx6m0clkp4469h"; }; meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; }; @@ -3850,16 +3886,28 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-12-08"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "c4c203c3e8a595bc333abaf168fcb10c13ed5fb7"; - sha256 = "1kanfs0c1rbi23dm0vkmyzg4qkxq18hc2jc2izvyqiklbpi49x06"; + rev = "018bd04d80c9a73d399c1061fa0c3b14a7614399"; + sha256 = "1ncpar0n8702j5h4a2bv8zx9kcg7gwfhs52qqrcg1yfsgjzb86bl"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; + indent-o-matic = buildVimPluginFrom2Nix { + pname = "indent-o-matic"; + version = "2023-02-13"; + src = fetchFromGitHub { + owner = "Darazaki"; + repo = "indent-o-matic"; + rev = "f4138581fe4575b720eae2d123cbaed0d86c94cf"; + sha256 = "1n4vdpfhy8lga2d508ixi7mwa12rd8zk37ms43d4vrjff0v35nd5"; + }; + meta.homepage = "https://github.com/Darazaki/indent-o-matic/"; + }; + indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; version = "2022-09-07"; @@ -4127,24 +4175,24 @@ final: prev: lazy-lsp-nvim = buildVimPluginFrom2Nix { pname = "lazy-lsp.nvim"; - version = "2022-11-02"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "7866efc6e5bef78e7f14ab2c0118c1fed15947c9"; - sha256 = "1d9qk7bffj2ppyd6m6r8g5ip804kqjn64a8k7ckd6jqxfl9w3xga"; + rev = "d22d54c7558415faf6f518db1e00d995d595a99d"; + sha256 = "0v7j8bjd5naf5qbr362r82nqa4grwj2r9wk68s5dv9zg576ybm0p"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "cab4682d22a0451bc36a648694235621b5dd808e"; - sha256 = "0kxvb6l9pxdrs9cxh1cqf9p4y8nbfn9rx3a7zgd21h4c6126bcvh"; + rev = "8077428e63feb0f3bf795d53b23ba1695b28ab0e"; + sha256 = "12bq0ppdm7frjgd336lvp3crw9ivsl5lj33f7fjvpqgsib7gy87r"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4199,24 +4247,24 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-01-19"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "ff4c3663e5a0a0ecbb3fffbc8318825def35d2aa"; - sha256 = "1pxm1b3crqmvbmds5cjfnqirvqbjqzc6vc59i6jsr8i79vymf16z"; + rev = "9a69febb2e5a4f5f5a55dd2d7173098fde917bc5"; + sha256 = "0mrayfya1c752bbysjp2720frqm24rhqg8apl4h0cv4lanfv6hj4"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-01-06"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "3008ed68c8f309ced07587684c8af53884791d35"; - sha256 = "113y46yf33ymb53wpqnc9glzv2m3lfsnxsmnxn3cpk016zy9fp3z"; + rev = "9e38951df410c6d65fa2b932832d201d7cd6ca62"; + sha256 = "14sw0xaf7qr9896hcl9vb5ivmc6w15p1np0gqnyhjqbmcqj20yp8"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4235,12 +4283,12 @@ final: prev: lessspace-vim = buildVimPluginFrom2Nix { pname = "lessspace.vim"; - version = "2019-09-12"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "thirtythreeforty"; repo = "lessspace.vim"; - rev = "dc05cf6c3b67e3f8c87da2e565c5524872526316"; - sha256 = "154x6i2ncmcbc3snkzdcggq5m5zvlbjyry5lvr6n4qcvf65z5z44"; + rev = "2f3e60d79501026b78b593e8a12749ef1220dd61"; + sha256 = "1ggm78rrql668xl3ggybmi14i31a4jxcvq9bncm79mx1by2n694n"; }; meta.homepage = "https://github.com/thirtythreeforty/lessspace.vim/"; }; @@ -4283,12 +4331,12 @@ final: prev: lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2021-08-18"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "aa8e8f270c1d3be4fbe6b153827a191a5fcaa0d7"; - sha256 = "0lgpxgg2696pbfdgnr2zcapvhfk6d1qwvci223h69rvg0fh853rz"; + rev = "02764e0e87f85fa13e0d6a0e38ac6605f806d560"; + sha256 = "0d4hs4qh4fm393f1k6085l1f8yvqjpr2wdh7ia26k9839s4k2pn0"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -4391,12 +4439,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2023-01-15"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "937e882c169d572a8a73dfcb71137a264c6369b2"; - sha256 = "00aw82ymjqh729mi38l3nx0fhpp6rciqyqv0ar4g0v1qlq4gyp4l"; + rev = "1aa871f20637eccc4e1e26b0fbcf9aafc9b6caf7"; + sha256 = "0vwlp8b4kj0201abq5rh470kf4lsk2pr1207qhjd2ay1wp69ywiq"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -4475,12 +4523,12 @@ final: prev: lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "lsp-colors.nvim"; - rev = "750d59b643865b906996028147675e9af216ea95"; - sha256 = "1i5qn1npa9zil3xql7yavx3p7w9xa26fz2lxw9ks23mpgdplk9gs"; + rev = "d0b245232aeb197bbd097111d8b69621b0671edb"; + sha256 = "1nvspfsd3x3i5wv8y3a0kvnnl56wha038dblz2d8psrbkghr1fbh"; }; meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; @@ -4511,12 +4559,12 @@ final: prev: lsp-overloads-nvim = buildVimPluginFrom2Nix { pname = "lsp-overloads.nvim"; - version = "2022-12-04"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "12f5468781d2d1d3feb6ad7459de764fc33898fe"; - sha256 = "1lxsg05qv87v2imhsfwa9mqfib4332cvhflivpzkamg1acs6bc9j"; + rev = "d371137c6d2c942c1ad4fe400f536c2ebf0792bd"; + sha256 = "184ybjs9c6xn6079i4gw411j06kxsmf3gqxz8c6rcj0hiv87wsn2"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -4547,12 +4595,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-01-19"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "0b312c34372ec2b0daec722d1b7fad77b84bef5b"; - sha256 = "095n5sq850b66cpbqfbqkz5xzd2klyv5ijknffrbdrx0gwjh561l"; + rev = "674a60c7d4f2a90c75d66fe98603d7ca708939dc"; + sha256 = "1iha7i85bsamnb7gqnnhh784xycfwfg8vbyc93d42wpsksm7yjzr"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4582,12 +4630,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2023-01-21"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "b86f249cba85ec2f0f74c62b65898bade00b4413"; - sha256 = "0kbcws9dwsvjg6psfax4azd6j46n05jhkkdgsc1c4wjhyg74jas9"; + rev = "6f6252f63b0baf0f2224c4caea33819a27f3f550"; + sha256 = "01913fb3g3f8291fw48a3rlsr4wkn6imljpk0h60vg65d2xc15l3"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4642,24 +4690,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2023-01-11"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "0050b308552e45f7128f399886c86afefc3eb988"; - sha256 = "12c6f3xcj38zbiya3m4glwr5pkh0fq51gmch994i2mg5xy1ni3yw"; + rev = "e99d733e0213ceb8f548ae6551b04ae32e590c80"; + sha256 = "01v3612yplmgwbdiz7pgrc3a660q4z3v3g554nzxd3wn39cmd2wq"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "5955bdd7b20854aea74dc86c7ddf9989296d52d7"; - sha256 = "0yzhz6cyhsh7aypvi0cz20wapn1xcild6llif7yvqbmvl4ygrdl5"; + rev = "92276ba735056dab04b0508e421a6a5d729e3f81"; + sha256 = "1vfkra9xygdm6ffdlkdca636i97hazhv1l66zpn3lwlliyqi1pzv"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4727,36 +4775,36 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-01-22"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "d7ff61a828d59bc593ea3e2020508c114048d790"; - sha256 = "03rmdhp30kzvc98gaagxbm3cm0q1mqy28wjih6r7l14kp3qv8bv1"; + rev = "93e58e100f37ef4fb0f897deeed20599dae9d128"; + sha256 = "1d6ym8g3fix2m6412485kbm43mb61wdb3ggm3q6ddqxxvh06n41c"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; mason-tool-installer-nvim = buildVimPluginFrom2Nix { pname = "mason-tool-installer.nvim"; - version = "2022-10-29"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "27f61f75a71bb3c2504a17e02b571f79cae43676"; - sha256 = "0zhmffjqssfqjbx69j7ambzr4dz52r4sgl6xhmzf9qxr8xlkhvny"; + rev = "6ca38efeb0406dea8da6c97f61d6f6ef30ab0576"; + sha256 = "0a4h7hmm53qaydnqfrfp7yb4j157da0mvr0ivkm77f270rr2pwg0"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "bb88357eff0d0c69ab8ecc5985952e0a9a72175a"; - sha256 = "0hfnwjv165w1d89xd7gs11q5j8a52zj43acxaash2qaxy5hl3zpz"; + rev = "b8a6632a0f2d263199d5d480ca85477fe0f414ab"; + sha256 = "0622x0k1xi5z6jdz2bpqvym34ysk38axfyjq45m6hhl6qcy0ysxg"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4787,12 +4835,12 @@ final: prev: material-vim = buildVimPluginFrom2Nix { pname = "material.vim"; - version = "2023-01-12"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "kaicataldo"; repo = "material.vim"; - rev = "ec5a2cecee50ea2074e6f19bd1c98e7d868a52c7"; - sha256 = "08s8k9nwnmyqzlpvfz2pp1j8dhip1syhkilrrzbj723xknclxyzf"; + rev = "b47e7f884cb606c19a20e8e520dfa10c3b3a52f9"; + sha256 = "1abhf71ap9cs03ibi3qm8lw8kdynb86x85didnhlhb673xg0kbcz"; }; meta.homepage = "https://github.com/kaicataldo/material.vim/"; }; @@ -4823,12 +4871,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-01-21"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "1c11d5fdb71c1d766545e42b0dd99eda50f1e349"; - sha256 = "16g9yzwiibrjhl9ln911kw433li5av64p6nrhypj6pcf2n1dkrfc"; + rev = "369f16f29559cb15931d3d5acfcf253969f74066"; + sha256 = "00r3jd76rnfijxli66m24qhjfgjy2mazy8qr15i7vadhdnr1za2p"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5159,12 +5207,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-01-12"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "8238865e1d9c61f1a260c290653f2c419503e0a9"; - sha256 = "18rndx83magknmjyihl02vjnqjra2x6y5d9wzz5qkhhacl8jhhbb"; + rev = "245cf1e68840defcc75a16297740f6203f5a045d"; + sha256 = "1w933phd5p0jdgmcdxcsv6ddhs7zx11amp5ziixzfh91a845shmf"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5183,12 +5231,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-01-22"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "0d4a5197def6019f125444c3870aa5a8f251a2db"; - sha256 = "03shsrnagr37awsvr88pzm1yhdp680dbzzgknzxf5d9sw7c3jfsg"; + rev = "ca85eea7841f043671ebd6c784771f08b9d34231"; + sha256 = "0pf44ydg6m70haban92fl7yvl3755jqw6h1icaglci8p198gsvln"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5207,36 +5255,48 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-01-21"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "34dd33cd283b3a89f70d32c8f55bb5ec4ce2de93"; - sha256 = "1skz0fj0v5s926mfg58nrdmivsadjzlhlymxfyz0zvkj3vkf7d50"; + rev = "a81e749d0fe8429cd340b2e40f274b344bef42ac"; + sha256 = "0k3b71by64gh2bfqsp3rlgg5w6w86jdyq8166abddfzbs24r4v5i"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2023-01-11"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "ec601d38a2e9309109f405ce038c5a6ce774f1a9"; - sha256 = "028xycbvjhs7mvnzlismjipibgqdhjm9s0asmjpg3g7y2qhkw3ix"; + rev = "16bd62efc3fcdcd0f6682ea47f1f6070850f9963"; + sha256 = "1d5bqxfdg01hnx239v7bi301325ihvdypy0p4b1ay5py5jckld9h"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; + neogen = buildVimPluginFrom2Nix { + pname = "neogen"; + version = "2023-01-16"; + src = fetchFromGitHub { + owner = "danymat"; + repo = "neogen"; + rev = "465af9d6c6fb7f360175991dcc23fc10917e3a06"; + sha256 = "08frlngajmb1905f52xh299h8l3mf34lp4aa5rgs2hl96iafbjr3"; + }; + meta.homepage = "https://github.com/danymat/neogen/"; + }; + neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-01-20"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "30265e7a1bdf59361b37e293cdcecc167851c602"; - sha256 = "0fk29ggvncc26zx8zxdbyhqydxmvw3k71nf7ipp7pcxgkgm4zj4s"; + rev = "bde758e658c1cdc794293afbde698b5aaa93c5de"; + sha256 = "093gg1k7z0afhg8m2zvpkbf6aqb2ggjz50lrrf3wq0j25qsj1f4i"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5255,12 +5315,12 @@ final: prev: neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2022-03-19"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "0556893d7fbc1948ac1a82cd0f41023d76a234b2"; - sha256 = "0dw6miyxbbi71na8qb7nqk20vni1q46lmg51r0h354xcnxn4hyms"; + rev = "584f882b9f991245374e7e7d7d1f78bae90b7a35"; + sha256 = "0wywd9s5x70zw7yrid6nvlq1hz406j5j47y011jxan4ra4r9ixvy"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -5291,12 +5351,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-01-16"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "4a9a5fe13cd454692fc4db0b27783cd005e6be56"; - sha256 = "15a8az9xlcc0h0pw7s8kmd4zm5nx7d0q0j4d192d62mkdqc685mh"; + rev = "93c40f2e38a0770e9ce95787c8363320344a87c3"; + sha256 = "1gh7nlnm41vkqc0yvmb7jni6w4q3f690705f2dqdgh2frfssqi3r"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5351,48 +5411,48 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-01-18"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "6676edc3078b8936df989df639900dc9a70dfc8a"; - sha256 = "1rhh775mm7byxcazl63hwdz8yjlz4fghd7yxaysv49s3rbrka1z1"; + rev = "0d17889ce740c83c18577487498a1a8fea144b0b"; + sha256 = "1p0yfglnmsvlr7lk0pylzm1d50yg49g82pp0wv2cgm6w240y27sk"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-01-14"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "0bf23c10e4e72c7f21a2bb4cb8d8a28ac93f6f5f"; - sha256 = "0gwwm402lgnnk4zcsydbfx9iw4sndmc1xg1yfsab04mna8560bg6"; + rev = "83c0c173725cb028bd3d62affe771ad8a45a81b7"; + sha256 = "0rw08nzmbz4jjnpg7r6qv5qzrxk337y406k47haj2d0rx144lppx"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2023-01-07"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "ba749799e48a8c5065106989eb8bf9915b51081d"; - sha256 = "0xqdz4qb0sdb9g2hdgm5c2ry0m3ar78hyp0n93k92dwd1v575996"; + rev = "0eb91afe11f1763a477655965684269a545012e1"; + sha256 = "1nhayyl8lr22j0qrf64h1sjq9z650sxwgcqi8an1b6g6nhqwc329"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; - version = "2021-07-02"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "0bef4e1a81c65fc05d31380dd74454bd67733837"; - sha256 = "02a8ipk341bs6y8mk7nixdkbk1c4jdddsjp1qvqgyyca0shaqsz8"; + rev = "f6a1429bd0ac9953eb1d838ba800e69685fbcac1"; + sha256 = "0d2r8dx9sicf4fjf87ksclsvdvx2f7npjqpscyvycn04wrzvjsaq"; }; meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; @@ -5423,12 +5483,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2022-11-09"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "98cc4a2d64ca67cccbf5b5cf47c682ebadaaff58"; - sha256 = "0s8czq77lsf10b2fsw6mhavirc1ivby1a9c5y49zj9fva876h968"; + rev = "d069f7fb562fb9eb6911fe23cda7aca2a387043e"; + sha256 = "0ir2cghjcz3wr1sp1fzvdjnwqrjy82n3zlhrcz7cs41n8f2wich7"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -5483,24 +5543,24 @@ final: prev: nginx-vim = buildVimPluginFrom2Nix { pname = "nginx.vim"; - version = "2022-12-31"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "chr4"; repo = "nginx.vim"; - rev = "99694458062e4e1d138bd022b10432a05612a2db"; - sha256 = "1ih25dl3zzcp2245vrq3ypii76b3ri73ayv3w8qg7s73j1g1c6p5"; + rev = "8a42e93c9f004fbc5b32bb2e4940107fb7b70a42"; + sha256 = "12dhzglvmpv1b0ynwig224dnilakqkwh4npidmgh5njy2rrqvy9m"; }; meta.homepage = "https://github.com/chr4/nginx.vim/"; }; nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-01-18"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "97e66dfaaecdc81f1dd7da00f8d4a6033f3bf6b2"; - sha256 = "01q3qlazc6m39rn67qpz03prrs2x9wqf71xi5s4a82vp53ha1fjv"; + rev = "be5e53df21c8f41790d25c56cd16cda90137dc63"; + sha256 = "08gk1rga3w5fkjg37618g3mpkpba43rb0r5ckj9wpdgpvmm436y8"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5531,12 +5591,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-01-22"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "26fb0c6c5653b0bda95f29eae638305bab351123"; - sha256 = "0w9yy5c4rxw0k8z975p6zn1792lmjld1gch1m1gji0nvyyasvsbi"; + rev = "cbe9ee8184e46311efbce79d9806f3ee803a2521"; + sha256 = "16jv396s6mpk6w9fhrkh1wgc484647x1vs05y05j6smgi5h1hrlg"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5565,14 +5625,26 @@ final: prev: meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; + no-neck-pain-nvim = buildVimPluginFrom2Nix { + pname = "no-neck-pain.nvim"; + version = "2023-02-20"; + src = fetchFromGitHub { + owner = "shortcuts"; + repo = "no-neck-pain.nvim"; + rev = "c97c44bc86522ceead8c9c9b775b2e1215549158"; + sha256 = "03zyfnzqj20yv9cy6pvh8r5j5v0mgcay7jv4lmgi3gsp0z4qa8ia"; + }; + meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; + }; + noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-01-17"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "16b60455867dec069bf41699d690fa01261b4bf6"; - sha256 = "1fsngf0lf45csr5w6691xkdnkjbmp82xr4q65fnc5p0931q1yl7x"; + rev = "d8a1f3056ad713b5d471048f8d029264828e22c0"; + sha256 = "0m6058yy4bn66bdr47na91g4pnm27y3msr386hj0hss975iaicwq"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5627,24 +5699,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2023-01-16"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "b99e6cb13dc51768abc1c4c8585045a0c0459ef1"; - sha256 = "0fgwi68ks7qalr2nn1pzf3jdzyx5scmziz2dhp3yyw7mc1nq3fi1"; + rev = "d147222a1300901656f3ebd5b95f91732785a329"; + sha256 = "0p2sc3jnkvxax55acizjjna2rh9bnwfrm7z5apyasyzvlixgxxz2"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-01-20"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "33cfeb7a761f08e8535dca722d4b237cabadd371"; - sha256 = "1lna5833nvk8db5jv549147078m6mzgzqvc42gqby8ma54rn6dq3"; + rev = "689cdd78f70af20a37b5309ebc287ac645ae4f76"; + sha256 = "1fja54wrmqafqww1ifkpmidwq52r246sana9j57dm92j3l39fv5q"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5673,6 +5745,18 @@ final: prev: meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; + nvim-FeMaco-lua = buildVimPluginFrom2Nix { + pname = "nvim-FeMaco.lua"; + version = "2022-10-10"; + src = fetchFromGitHub { + owner = "AckslD"; + repo = "nvim-FeMaco.lua"; + rev = "469465fc1adf8bddc2c9bbe549d38304de95e9f7"; + sha256 = "1rv3ppjfndi27dbg7dsapxacbal1mj2a9dx2vq0yvi2v1gb97b3x"; + }; + meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/"; + }; + nvim-ale-diagnostic = buildVimPluginFrom2Nix { pname = "nvim-ale-diagnostic"; version = "2021-11-06"; @@ -5687,24 +5771,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-01-21"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "31042a5823b55c4bfb30efcbba2fc1b5b53f90dc"; - sha256 = "1jiwwmm87d2i76jgimk40mydsg2jddpl7q9axy94g6411hkdq261"; + rev = "bde7a1b4534e0a4c2451a738379cd628ba65eba7"; + sha256 = "0axmm6qj1vklkg7czcw0pqkd2gbzcj7z2llhvyf4fnqr4fwbi8y0"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2023-01-11"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "cf8252058c8fc486bc565a815083a2eb390f7621"; - sha256 = "1hcj0k8szin32b2ki6mkqwpckinyca8vpwvd3rmaf597qnk0bv5h"; + rev = "36f0e1d27fb87fd5199baa32c1e2921af6061e44"; + sha256 = "079f6dvdcl6zzdl8rgyxr7g8gla066w41ndmg2qakrbj5fap3fyn"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -5723,24 +5807,24 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2023-01-17"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "d15b59d7429d45f0b057aa63a0266989adc95715"; - sha256 = "0fsb8ybymxppkbdg45f7vr5vys2nl7b45nw6dprarh8bwp2qnkcr"; + rev = "b71e6bc220ea2ef8f09d5e6b39d52609a965f322"; + sha256 = "0kl2p55vrq1qwbk4r7mrly0gmw794h6nxivb17f4zn8lmvvcbmjc"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-bufdel = buildVimPluginFrom2Nix { pname = "nvim-bufdel"; - version = "2022-09-20"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-bufdel"; - rev = "a60b3531e5bd56f8602acb4ba7f5b2eeb782d54b"; - sha256 = "1yyxcnnh560gilkrqadpiwx3kpql4msw0as2v9i2v8m4z5yw36bd"; + rev = "2f55e78c62b45df5404b9ea522e82e8de1483c66"; + sha256 = "0jpr544daap2swnanaczz3hf0if32y3r3wiyvbwqd256896rdad2"; }; meta.homepage = "https://github.com/ojroques/nvim-bufdel/"; }; @@ -5759,12 +5843,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-01-06"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "11a95792a5be0f5a40bab5fc5b670e5b1399a939"; - sha256 = "178r1v9p7mcwg8xgl3jr4ibjsh9wiq0y81mps0nhx8q2dgnx8cyz"; + rev = "8202df9561b90102b41dbc1ad71945534ef4ea39"; + sha256 = "15mpzg05x36vnbq9gs5q71fw9hin8b635r5lf42v6crdqw8wghmf"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5867,60 +5951,60 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-01-18"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c64a6627bb01eb151da96b28091797beaac09536"; - sha256 = "1nf48ns1zfmpizmki9545w4m8ndmkh76aadlmjpzn7y4draq5asf"; + rev = "049eebe3a1609547a5d2db5ba99585212836adf5"; + sha256 = "080bwr5cl1qy331caaq7j587bqpnqsqxigyvhi3hgyhsv2w5lbm1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPluginFrom2Nix { pname = "nvim-dap-go"; - version = "2023-01-04"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "6f045a72a05a78e4071dd0880f08214a2bb1461b"; - sha256 = "153dxjwq93wg1079485hqpvq81mai1yzqjmc9qybda09zra5wlk9"; + rev = "b4ded7de579b4e2a85c203388233b54bf1028816"; + sha256 = "188w0n42gzvc4c1j6i5i48j60zxx9lrc3nq2z8ly0m7l6lc88vx9"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; nvim-dap-python = buildVimPluginFrom2Nix { pname = "nvim-dap-python"; - version = "2022-12-18"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "d4400d075c21ed8fb8e8ac6a5ff56f58f6e93531"; - sha256 = "1glhxrv57gc3g60i876d5p3429z4kl6mhkbvrf41kvcqqb8m21m0"; + rev = "65ccab83fb3d0b29ead6c765c1c52a1ed49592e8"; + sha256 = "1ald7spnfqbyiqz4kgp21wxwqm3zr53d4ajxls0rsy6mkqq6b2jl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2023-01-11"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "b80227ea56a48177786904f6322abc8b2dc0bc36"; - sha256 = "11a9jn4m1db2zlkfvwym98h15l46idf14gaddczf1njxhms52nm1"; + rev = "bf9f0c4768ce8cb99ac0b99cf06ae6f91c906a1a"; + sha256 = "0fxvxlp27dm0jmch4k46pyh2lbkabqvc00gmdgyr4iwnkywr0596"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2023-01-16"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "191345947a92a5188d791e9786a5b4f205dcaca3"; - sha256 = "05rhpr34qsjczcv5kjd8664629308k3nazd8ksgfrpkjbg0ifjq9"; + rev = "8db23ea51203b5f00ad107a0cef7e0b2d7a0476c"; + sha256 = "0763sssfznv7l1mpgrkyd26avbmpza41iaikq4b65g0y56j318ix"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -5999,24 +6083,24 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-01-03"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "718f09fc3ee6381d881863a817e44935bf41b1ab"; - sha256 = "1i2s8a6bgvm65iynbhhbyii72sr0f4wsnpvpxxyh3fnr2vlf61wc"; + rev = "dbd396e7729ad35c9c238f9e20fe3c701d63bb3d"; + sha256 = "07l52iv763rjzwkwl9avd8p7kb8wf0ir6nvayi0pl38dfphb2qhm"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2023-01-18"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "fc83bd515c21c7912a6b9f97088e0492e923dfe0"; - sha256 = "03wpjgr8ziw9dllngh06l7wkf39vd9z96ivbyhzvdq801v0lyyw7"; + rev = "5e3e9088fba7508cee3612ee50b14dfdd3ab19af"; + sha256 = "1ih4zkb025wvns0bgk3g9ps9krwj5jfzi49qqvg5v3v707ypq2kj"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -6035,24 +6119,24 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-01-20"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "beb9101fb4a8a4f2655e691980b4c82a27d2e920"; - sha256 = "1j56xz39wfdxinmzi83qfb6gljnag8a590wvyjg9c8m7ssd0ixw6"; + rev = "8fe3be1c08ab0bb55f2998fbc02f1a08f87a44bc"; + sha256 = "08nkbwzby8j156n3s89aj3nbhy99pb0nkpdj3rqqvrbyqyia5jbn"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; nvim-jqx = buildVimPluginFrom2Nix { pname = "nvim-jqx"; - version = "2022-09-21"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-jqx"; - rev = "24d3e0228aec27280e091d09ff65593e99d4d564"; - sha256 = "06zp3hffwjgq3c30d7h3a3bnx7vw77xwz4g3kcb54rxffvhjwwvj"; + rev = "4c4082cf94ccd32f5780859c875f91ddef763694"; + sha256 = "0clqgq8whvcnpxlqhyw721kyljhsyvmx8mqfq8qaxys8b6cf8fwy"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; @@ -6095,12 +6179,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-01-21"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "57a52fce9b4a045f0b371a4ca5cbb535b9db0bdd"; - sha256 = "0bliv6vzgqk6nz0wk334gkbsdmkzxv38rjs0pf7jdk5azvgczslh"; + rev = "9e3b261583a39b47facfefd181a233bfd68b9af0"; + sha256 = "19xg67i22kzy1f0f1mlgb0dkllf955m0rxy606sfyqv2nj93g4zl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6119,12 +6203,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "85cd2ecacd8805614efe3fb3a5146ac7d0f88a17"; - sha256 = "0fhfqf4rag58q64wfrlfzyw87n3zv24gnwr9inn3i63b27r57w83"; + rev = "b5db147e28337319331d516a826b00976f3584de"; + sha256 = "14hjgk0g81mn26xwd3hspzi2jqiy1viiyc6pz3zqnmn66g958bfl"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6167,12 +6251,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2023-01-14"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "c552c96b837ce8b1318cf3eccbda41a73760cb21"; - sha256 = "1fqi33clnjsyx0fkdajl9vyrpmbdry11dm38nmm5d83a4zyb4qax"; + rev = "0b9c5303b7402ae24971ed2f0e5890fd72505532"; + sha256 = "18r8vhflf9k8rmbw7czv2v7l46144nv7ia3sszhby8p1npd57ld7"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6191,12 +6275,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-12-11"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "7a2b823152fe4de65ee7925b0e32d26ed73bc57c"; - sha256 = "00hsnlbr6s2ljwzl5ayjw1m2bdm4kmypl7xlg2p8l1yjnnsk4dn4"; + rev = "7e9d2b2b601149fecdccd11b516acb721e571fe6"; + sha256 = "02dzs5bh29ncvz3nzc2isnz9y5c99mx5qm97nvwrbbvxcp3yah2m"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6215,12 +6299,12 @@ final: prev: nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2022-12-22"; + version = "2023-02-04"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "68ecb6476f1b96d03c702dce6cf3ef1e5171c9a8"; - sha256 = "1vmzl5b3a07kh8b4wqqxd05sygvlyxq9vkrsshn2lrxmpbdg6227"; + rev = "ceda07dc7339f35444b5f4c4016f76a9eb42ac16"; + sha256 = "0kcagkzgvib0jg9aywfvrk4bx7pdyk7zj5b5i4wzacdcyx5yb7mx"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; @@ -6237,6 +6321,30 @@ final: prev: meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; + nvim-nu = buildVimPluginFrom2Nix { + pname = "nvim-nu"; + version = "2023-02-18"; + src = fetchFromGitHub { + owner = "LhKipp"; + repo = "nvim-nu"; + rev = "ebacb8363ed3c21ffd4e47e277dde8f34609585b"; + sha256 = "0wd9ddyllmrisdcbp6mxl7nhcxs449k0rbwm0vshk3wig1wz4gdi"; + }; + meta.homepage = "https://github.com/LhKipp/nvim-nu/"; + }; + + nvim-osc52 = buildVimPluginFrom2Nix { + pname = "nvim-osc52"; + version = "2023-02-16"; + src = fetchFromGitHub { + owner = "ojroques"; + repo = "nvim-osc52"; + rev = "358a2b4804c5f35b9ab6975cf68611afcbbc9b0d"; + sha256 = "1vr92nishv9hsnhx0k8jlnsdcbqag60dk2xqaxqc81q98ypq1h27"; + }; + meta.homepage = "https://github.com/ojroques/nvim-osc52/"; + }; + nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; version = "2022-11-16"; @@ -6251,24 +6359,24 @@ final: prev: nvim-rename-state = buildVimPluginFrom2Nix { pname = "nvim-rename-state"; - version = "2022-10-16"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "olrtg"; repo = "nvim-rename-state"; - rev = "43f2a8eb313eef767f1a28b69758cd86fc221e65"; - sha256 = "08q5q7l2l4jvw7yh4zddcczwndcajddbaj3zddwc04ykzlh2ks1f"; + rev = "8ba78ea517a605ea1a89bd1ed335886435010882"; + sha256 = "15n1xnip4dzil7fh50s2216wbryzv75jggmz4qabdfv0s6zz67n2"; }; meta.homepage = "https://github.com/olrtg/nvim-rename-state/"; }; nvim-scrollbar = buildVimPluginFrom2Nix { pname = "nvim-scrollbar"; - version = "2023-01-12"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "petertriho"; repo = "nvim-scrollbar"; - rev = "6a2065fbcd032075a06d2ab54508b69842bc4496"; - sha256 = "0i6kg4lw7v9fggi7j13lyb7ncchk1w10qdkzdgxn2cani2clwx9s"; + rev = "75210c554e935740448cfb532d8a671ae544bb1b"; + sha256 = "03wv5bswh3mm0ci5qdqgvxknwx3pd7qsxygyl9jdnffiwgw3qdb5"; }; meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; @@ -6287,12 +6395,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2023-01-19"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "97df9b3e7da6f9a7325cb5c32649dddc48bb1630"; - sha256 = "188gr37y77l74dlzsp8wgccglx5c67gpdb3fmrn34cbw7id7fj7d"; + rev = "80104ebd1e77d019f736bee46de2f1dbfe36f8af"; + sha256 = "144vv4yggmhsdrzqfrazj9cxm0pqcxlyqc7h535ss8cg0wqgx9bp"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6311,24 +6419,24 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-01-11"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "24275beae382e6bd0180b3064cf5729548641a02"; - sha256 = "0rw2g0a1sdd92ac22rgmvb4yk17ps2c760g03pbdwfca14d50fnh"; + rev = "ce73d505fdc45f16c1a04f6a98c1c1e114841708"; + sha256 = "1g315gnirzi885i7yg4j3nz57r793grqv9xj213yahg0b3y1akii"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2023-01-01"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "ad56e6234bf42fb7f7e4dccc7752e25abd5ec80e"; - sha256 = "1fi5lk3iacjdbq1p4wm0bia93awwqfn7jiy019vpg4gngi41azrz"; + rev = "9739e85547cb97d2f0497d2aedbab7d6f5c6654d"; + sha256 = "0lirvmb9yc2yc8an2x0wll1vwlpc4fh95x3r5wh21s8m0nqvv577"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6359,35 +6467,35 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-01-21"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "96506fee49542f3aedab76368d400a147fea344e"; - sha256 = "137gwzb6xq32mwkbzwqiw2i3bgjz07nd1xx7d6ys825a9akkddcn"; + rev = "9c97e6449b0b0269bd44e1fd4857184dfa57bb4c"; + sha256 = "1qdz4ark1xjwc3xkcc3dm9cxinnfhd8mi0kawb8qjy87gw73i9mz"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-01-22"; + version = "2023-02-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "7bef1d53302f1087a07f83a4321582d835f44d4f"; - sha256 = "1v560a216ink7km0gr32kgjxd84lcvpiwy991pvp3s0xqxmw5bx7"; + rev = "ba35d094c1dfffa652e9c20971c51bd5271c1d25"; + sha256 = "0kvp7wd14q4z7a4y7yscbl3ksbjqzwm10f79jfwigfxgd7f0h5r3"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-01-06"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "cacee4828152dd3a83736169ae61bbcd29a3d213"; + rev = "895ec44f5c89bc67ba5440aef3d1f2efa3d59a41"; sha256 = "0d9j5wz1fqk8ipf2x8vym0m3zpydslivwsnha8h1qz6yp6zyq5hc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; @@ -6419,12 +6527,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-01-17"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "2fb97bd6c53d78517d2022a0b84422c18ce5686e"; - sha256 = "0wwzmkkdw3n2agxsclaniblwfjaqwav7vyd5w0fjcqvqjim4jd9d"; + rev = "2f3583001e2bf793480f38cf0d055571787b0259"; + sha256 = "1hdccjwj8wyfi5nramzyj3jpdb6xf7kmkm5l0j7q9jqil34phx6v"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6455,35 +6563,47 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2023-01-09"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "nvim-ts-rainbow"; - rev = "aa83e4967bf78f85ffd9a11e159900c7ea7e423b"; - sha256 = "09x3bq4j9398avmzix78gm1qam0m34r9ifz7rb6l5rcqw7lhvr5q"; + rev = "496ff7ea19cdd4e4b7cf2aeeb6780d015f3f9fa5"; + sha256 = "0li2mcxppk37dqxpln6py056i7mzwf541f7mcd037h1zy14075bs"; }; meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/"; }; nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-01-19"; + version = "2023-02-20"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "2e0e2167f173df2f075fd52add2a0d6c66a2344a"; - sha256 = "0z5w6y6ynv4q8rjcrfi2vklf9l9h5azda73ragqbfijkx9ggniyy"; + rev = "99768947820b969bcd99c4252c6166a984f99be4"; + sha256 = "0swhhj6algx9j9020rcwbra8qw0nxk5c2pan0vjv4g18byya7i2y"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; + nvim-ufo = buildVimPluginFrom2Nix { + pname = "nvim-ufo"; + version = "2023-02-03"; + src = fetchFromGitHub { + owner = "kevinhwang91"; + repo = "nvim-ufo"; + rev = "b70c9ef0f8e2673a11387a39185ff249e00df19f"; + sha256 = "1fx3w2mlc23m55whvvrs1g648yg862i50100wfxxljmfkvnc12yv"; + }; + meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; + }; + nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-01-21"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "13d06d74afad093d8312fe051633b55f24049c16"; - sha256 = "07qixz6l1dyy84l14mbx6jwrmpmwdgvj8crq9vxqh44w5gwjr3qs"; + rev = "4709a504d2cd2680fb511675e64ef2790d491d36"; + sha256 = "0b3h95x2xhrhwspfazibpknxrli70vjahbf52h74yda4ji0n2x4a"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6514,12 +6634,12 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-09-14"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "31436f34f3f95e4e70853cd653fdf78246cb0e85"; - sha256 = "1i018fmglfyqd8q762vks8yhh2kwg754ysf7d6d3hq2sb7w7kzwn"; + rev = "e592a9142fbfe0878ce886cd0d745963604c61d2"; + sha256 = "00gwdnmsc0dlc0p8j6b6jld1vh78zf57dmk2arw3f0xpwirgkkxx"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; @@ -6562,24 +6682,24 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2023-01-18"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "52b2c9702fb9e219cd4182ed29daee644ec535f6"; - sha256 = "0inw57p02ad644f7fjfwsvk0lap6kpwrriz43kpp2x7wypkj8jxi"; + rev = "f336322f865cfa310ae15435c6bec337687b6b20"; + sha256 = "1gyf9avw82fpdw8cvn611xzl0kq140b4ik7b4cc7mblmk6xmdqwp"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-01-22"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "6c6b7673af1314dd7c8254a95eb8d331f6b76ac6"; - sha256 = "0gwfl7hslgbr2fawx15wbd6p4j60jnd2l68v36rxrmxl9iqm1ra6"; + rev = "f1ea6e0ad03e1d7b1acad4d0796d39c4a82b3463"; + sha256 = "0s9c7cdqs8rf8pzrw68ynh9q76rqzwq5kc96dlgip4273s38x25j"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6587,12 +6707,12 @@ final: prev: omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix { pname = "omnisharp-extended-lsp.nvim"; - version = "2022-10-29"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "Hoffs"; repo = "omnisharp-extended-lsp.nvim"; - rev = "83be0f285afa360ca4a134820381e54b4b7aadd3"; - sha256 = "1hdsc68qzf4j83xah72yjan7mlsvdz7w310m1qw81yzd45z0scyd"; + rev = "55cb3d7310e07e38d0d420d195f353c51eb603fb"; + sha256 = "1wy2cpg4cb2f18751lxiy8lbhxmp17z9d01b7qwbz6pxyr4l6k2p"; }; meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; }; @@ -6611,12 +6731,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2023-01-19"; + version = "2023-02-14"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "f0a70e0993acbb348c32a52a88058cc60c160992"; - sha256 = "0mscpy6949zvcwfdp18nn4bkzrp9r5iyw4h2v310p5mr8gd3fjpv"; + rev = "1fe908fb4acdcee26573e9ccde0de94ec77e5e84"; + sha256 = "03n2109p1jpl1gjznjci8wi84b2lminvw0avxx6dx6sv5b8z2x67"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -6635,12 +6755,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-01-18"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "2aeceb0f0700ba57c8248aa36b3a900e58f5820e"; - sha256 = "0nslv7dxsxfjh2xlkh5w10gpi29c65g3mf9m7zyrbj3s0m5pldgg"; + rev = "828d1af53c466a2cf4940e8dc920b1ea026a455a"; + sha256 = "1sv3cpdm3wb930vnm2v9wlhflzjc4a4m358i7cq7yrilmclhblfn"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6659,12 +6779,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2023-01-07"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "b05d57d04445836e6b9235e1937bf0a3ba42506b"; - sha256 = "1n92ajibyz9w1iyyndkjzk6vzk3vz0wam1h39990c7fl4jj74is1"; + rev = "71bdcdf105a8feb16cd5248b40e44c88832f75ca"; + sha256 = "0pflq1p48rd3s5vfi2bk04ick2iyl8fg1a25qpawm8wb1ds10ln4"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -6695,24 +6815,24 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-12-13"; + version = "2023-02-11"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "dadf56334d2be7d9e8ad1e22c697a6e75f0164b7"; - sha256 = "19bp9mbjldxi2qzsa364rw86zp450zr2ajnnflp2sr0hhdvg620f"; + rev = "313ce5a04e7fc3d677ad906a94fc49c1f54d1572"; + sha256 = "1d9a7ddyd09ym53nvijiy5z67mj79a93fqsm35jxfv4wkcraq9xd"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; oxocarbon-nvim = buildVimPluginFrom2Nix { pname = "oxocarbon.nvim"; - version = "2023-01-10"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "b58812cde84df6ec0c2f54e602d608d94a78ebef"; - sha256 = "0gk2j9dkdjdiagz49wxj0skm9w50fifl0xg2496rcdarvhh5lny7"; + rev = "0dcf03dc2d9c96166d20b82875ce7eea484b5fdc"; + sha256 = "1qvwcfid1vs9a0k3xn2ki5iiwgv246qkdzsl2pndsrv04gk42j07"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; @@ -6801,6 +6921,18 @@ final: prev: meta.homepage = "https://github.com/andsild/peskcolor.vim/"; }; + pest-vim = buildVimPluginFrom2Nix { + pname = "pest.vim"; + version = "2020-04-20"; + src = fetchFromGitHub { + owner = "pest-parser"; + repo = "pest.vim"; + rev = "ebeeea5e0757adee037135cf3b8248589b22ae16"; + sha256 = "159h9f96x127w1i0cj0cwb8cr2k0fbb9l3vsyky60h344p8amcbi"; + }; + meta.homepage = "https://github.com/pest-parser/pest.vim/"; + }; + pgsql-vim = buildVimPluginFrom2Nix { pname = "pgsql.vim"; version = "2021-12-08"; @@ -6839,24 +6971,24 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2023-01-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "01c27f37a1f067200680cacfb7b96f5ad2fa5cd6"; - sha256 = "13h5w5f9ywigi33g38ij5k24kyyz2nafwhzs5zqn8mngnvh7h0km"; + rev = "4044b53c4d4fcd7a78eae20b8627f78ce7dc6f56"; + sha256 = "11h0fi469fdjck318sa4fr4d4l1r57z3phhna6kclryz4mbjmk3v"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2023-01-10"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "1c7e3e6b0f4dd5a174fcea9fda8a4d7de593b826"; - sha256 = "12hp9a2q80hg93ynfa97v03fmxqwv4d6f1yb92bi6ih3kbjyjsji"; + rev = "253d34830709d690f013daf2853a9d21ad7accab"; + sha256 = "17vvl06jc5vrfrv7gljflkqykshhg84wnhbl9br4pm050ywlg4ng"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -6900,12 +7032,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence.nvim"; - version = "2022-11-17"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "c1c54758824cbecd4e18065d37191f7666fdd097"; - sha256 = "0j23gdp29xb1rfb7crr5s1xs61wjzrsxwdpv01s79cjnwcvxzgxz"; + rev = "87c857a56b7703f976d3a5ef15967d80508df6e6"; + sha256 = "06cql88anhwnwxmssgbzaxwnx9d88mp04rjbh7cgrzr7pff2x6v6"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -6946,6 +7078,18 @@ final: prev: meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; + promise-async = buildVimPluginFrom2Nix { + pname = "promise-async"; + version = "2023-02-01"; + src = fetchFromGitHub { + owner = "kevinhwang91"; + repo = "promise-async"; + rev = "7fa127fa80e7d4d447e0e2c78e99af4355f4247b"; + sha256 = "12d7l5b79fj4lpd3gfjqrmy6ffh06cxsr13vaw29rjif57wf0f53"; + }; + meta.homepage = "https://github.com/kevinhwang91/promise-async/"; + }; + psc-ide-vim = buildVimPluginFrom2Nix { pname = "psc-ide-vim"; version = "2021-05-31"; @@ -6960,12 +7104,12 @@ final: prev: purescript-vim = buildVimPluginFrom2Nix { pname = "purescript-vim"; - version = "2022-12-07"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "purescript-contrib"; repo = "purescript-vim"; - rev = "7af25a840d38dc6767c85edd1f35c1f835618071"; - sha256 = "1aw0bd0cx76ldm5nx17lqsxshlaiw8v9j0rwf1mlbz5k40c5v2w9"; + rev = "82348352e6568fcc0385bd7c99a8ead3a479feea"; + sha256 = "14729v7rndi3l8fpnbzapgwb4dj7537fik54g6frm1r1724f5cr2"; }; meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; @@ -7129,24 +7273,24 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-01-19"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "ee63338cfb9151018afb243f5af5262c1686b280"; - sha256 = "03fgla400n5mqhpfa3lljzark76ah7n0mzzxfsn5c6m3hxfkvaim"; + rev = "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a"; + sha256 = "0w4gw09b94dhxbbkyl0zhwxl5m370qp8la6frbjcan06bqh85xcv"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-12-15"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "667ae447d2c7efb64461a2c58f5311d1248cdb5f"; - sha256 = "0j2mp8kan6gf1ynv90pkwghjpsqzhxdfxs1v0kh55vmld2r31r56"; + rev = "2d08fffeb8533d3678bd796010c13c7fa2534263"; + sha256 = "060rh1a4cdbs8w28l3lkgk8r7k80pd44dqczdb2bpnhyvc7mckn1"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -7165,12 +7309,12 @@ final: prev: rest-nvim = buildNeovimPluginFrom2Nix { pname = "rest.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "090e253c114b6d5448bac5869a28a6623c195e3a"; - sha256 = "0qdxm9rcbq78yh0s3cvsbpnjjfd772fhkdrzwg1gc7k8p4ppnm1q"; + rev = "0fdb69f328529b34a2279c14be63b3325dc52740"; + sha256 = "0dn9g6a3lidavw381cd9ckhw3biiq81vypgg4bl5yl6w4avp5nr0"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -7189,12 +7333,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-12-08"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "64579c485812867bbd7890a55ca93884beb440b6"; - sha256 = "0yzy3mq7b7hnnb04z45m4r3hcpf11djv5zxhsyk60pnyvlwrdl7k"; + rev = "cd0311d65cb3b8f8737b52f3294eb77d2fcec826"; + sha256 = "08n5ri9d9zm8r7mss6wxfjpyzsdvgrb18795ngvgyg34c10i0pcg"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -7249,12 +7393,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2023-01-08"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "df584e84393ef255f5b8cbd709677d6a3a5bf42f"; - sha256 = "1h2p6xdv4bxphn98iwjzk9fh54lh1ff41smp2n0j84inqpl0mygv"; + rev = "71d2cf67b5ed120a0e31b2c8adb210dd2834242f"; + sha256 = "14vma4r8v20r2ddkhwxs5zhp5lcqa51sxayxdri1z21gvaykzs8a"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -7403,6 +7547,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; + sg-nvim = buildVimPluginFrom2Nix { + pname = "sg.nvim"; + version = "2023-01-30"; + src = fetchFromGitHub { + owner = "tjdevries"; + repo = "sg.nvim"; + rev = "c5e4ab788efeec9453706a4489bcaeaa867aeeb3"; + sha256 = "1yd006gykkxddr57mc0mpfqc817akaaaj2cabih9gbdsm7qy131p"; + }; + meta.homepage = "https://github.com/tjdevries/sg.nvim/"; + }; + shabadou-vim = buildVimPluginFrom2Nix { pname = "shabadou.vim"; version = "2016-07-19"; @@ -7454,16 +7610,28 @@ final: prev: slimv = buildVimPluginFrom2Nix { pname = "slimv"; - version = "2022-05-09"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "cba9910aaad90dd5f1cd508ad98adebe2271069c"; - sha256 = "16zxvwrgiv5fafwm0b75ici35c630466mxdk4dww978152bxahzn"; + rev = "48f21d04dc7f9732d04ffec101dfcf17b7f515cb"; + sha256 = "01dkvxkh3xpv45cbc4sylw5a1dsipd3841x88cc32nrarafsmgfn"; }; meta.homepage = "https://github.com/kovisoft/slimv/"; }; + smart-splits-nvim = buildVimPluginFrom2Nix { + pname = "smart-splits.nvim"; + version = "2023-02-13"; + src = fetchFromGitHub { + owner = "mrjones2014"; + repo = "smart-splits.nvim"; + rev = "b38431f1f68bc43d6bf9d1edb21c2bcb06b1197c"; + sha256 = "16wsgb62xcps24xickrly8hqwdvdc5kiylq965xq0q5g74kiz9jh"; + }; + meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; + }; + smartpairs-vim = buildVimPluginFrom2Nix { pname = "smartpairs.vim"; version = "2018-01-01"; @@ -7502,24 +7670,24 @@ final: prev: solarized-nvim = buildVimPluginFrom2Nix { pname = "solarized.nvim"; - version = "2022-12-02"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "solarized.nvim"; - rev = "36615f1e4d16b87def801a75132f4aab5944e9fc"; - sha256 = "1nn12zpsgiq9idsa93s04m8l2mpb2aq7f7n11cs2yhv2kbb9krlf"; + rev = "fe02ed49cc017cc93657bd6306a2624394611c69"; + sha256 = "185drqdf6qcwbjvs2f5gnz660w45d4pwqal40mbf1p3gd32il6qa"; }; meta.homepage = "https://github.com/shaunsingh/solarized.nvim/"; }; sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2023-01-14"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "e2e89497f178bec568a0a43cda651f0429ec8ec1"; - sha256 = "0dh5dsn8znhxsdr9plxa2mchlnfbgrvalc5pnz2wdsc2adz37521"; + rev = "c55985d5df53751a44fc532a53bed3be9f3b0d14"; + sha256 = "0jmwsdpmj01g78gkv4cc7l5fxxhxrzlx2lkwmj5r9klkx07fpsrg"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -7634,12 +7802,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2022-09-04"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "956d67c88512b91c2938da3a9e0aeeea2b82cd0b"; - sha256 = "0dlsdb42j4d9q1fcw7jfwks6w516xi8ap1v7kip831bh4p6jyl1w"; + rev = "cdc1eb05496c2ecdeea7c7bf7ab0b6ab5b421f24"; + sha256 = "0rm8ml6nxkl0sgwbhsp5xjjjn45dq2pdg8amaywp0vjdnjcq9pi5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -7647,12 +7815,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2022-11-18"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "53cac3fdb5f5e4e63e243232b6eccf3c764ae18a"; - sha256 = "0qp3b6jd6khp8wmc4s8n6sc518p6m44l7f7ln8pr91jz6qh5z30p"; + rev = "93ff5824682ecc874200e338fd8ca9ccd08508f8"; + sha256 = "07wv8shiilibgnp7l0pk9b6qwydwwfvdzdv2vvwn0k0jpaxsjvmy"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; @@ -7803,12 +7971,12 @@ final: prev: swayconfig-vim = buildVimPluginFrom2Nix { pname = "swayconfig.vim"; - version = "2022-10-05"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "jamespeapen"; repo = "swayconfig.vim"; - rev = "30014a34d0ab46f26311f47c1c11ba0b9166f1d5"; - sha256 = "03jw3w80zgmql8ngs8s1j8digwkn7206psklmcnmc1p2drb2d3pf"; + rev = "ce04a8e8c494590382d1b32a20ed3b451d608623"; + sha256 = "0lirihvrx0qn59nbg5s3sh1jgv0v3q4ag7kgvc3r7q9a2fbjg46y"; }; meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; }; @@ -7827,12 +7995,12 @@ final: prev: switch-vim = buildVimPluginFrom2Nix { pname = "switch.vim"; - version = "2023-01-18"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "switch.vim"; - rev = "9aa594704eb63b81477bf7547342a5cc4012ef80"; - sha256 = "058nwj9rin11p9ifcl50i6ys5fv4v80kml4gnxqq89cd52sz07mh"; + rev = "41fec8581f4816291481ab6c6e0516bf904d4a7a"; + sha256 = "0gxipkigllr82gadgnhlhj4kk47131ykqac26zp6yxamgrnx43sq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; @@ -7840,12 +8008,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2022-08-29"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "6a3ed24c5631da7a5d418bced57c16b32af7747c"; - sha256 = "0x4jq7z54nj7p4abnaqc2cnldyi7rcl5r444n9jc82i5pmg6ck27"; + rev = "512791925d57a61c545bc303356e8a8f7869763c"; + sha256 = "11c5gr117cad9zw5c8msh7xrk1n02kmyb52vwbrzd0vd0kzy52ia"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -7864,12 +8032,12 @@ final: prev: tabby-nvim = buildVimPluginFrom2Nix { pname = "tabby.nvim"; - version = "2022-12-22"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "187b604da1a6452c700ce21fdf340ffbea956298"; - sha256 = "0b61qmqzl8vqryy58p9688vhxwhfby6qsygi3720hvvgizxk9jka"; + rev = "9065c65138b59ea8182024216a5bbcf0d77baebb"; + sha256 = "0jfgg02l2872ickl3bwsm6xyh5nl5sqgn3yfk9kn45aba3kd7nvm"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -8033,24 +8201,24 @@ final: prev: telescope-cheat-nvim = buildVimPluginFrom2Nix { pname = "telescope-cheat.nvim"; - version = "2021-12-05"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-cheat.nvim"; - rev = "8a169767c19db2f2ef2fb3fffe6adbac5a630282"; - sha256 = "0x68zb1x1v7dkrbgz88wh9ffij0ngjr23k5axxhhi07ppynmhvag"; + rev = "5549dfe9207b06eb28bff74af977f078376f9762"; + sha256 = "0wxdv266fn83yh1dy05pw5xgd0j7gndngk3s3g7lljbj7y0nzy5m"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-cheat.nvim/"; }; telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-12-08"; + version = "2023-02-16"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "878c8ac14f809f7a1247a090408f7c23fa075470"; - sha256 = "0q237i5cwxqzzhfmnbvljsmc4z7gmdfapz965pp135ybid4nh5xh"; + rev = "a1aaabdb3b546f63d24f1fd156dfb1ddc0bc03de"; + sha256 = "1i76sjlw8irvk52g2sj90f9b3icdjvzp0zdc72fsbfjxd2kwr926"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -8069,36 +8237,36 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-12-31"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "304508fb7bea78e3c0eeddd88c4837501e403ae8"; - sha256 = "0hyy1fwp06748qy7rs7gf27p7904xfrr53v1sbrmqhlxinlsyp0m"; + rev = "6eb6bb45b7a9bed94a464a3e1dadfe870459628c"; + sha256 = "0b96wrjvy9mp9qpjhi4jb1mrzsfwww21lahjhgx8kk9y4ml503dg"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2022-12-28"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "62cbd4e7f55fb6de2b8081087ce97026022ffcd2"; - sha256 = "1mmwag20ljszzy9x1vfgxly20pkiwciq7n7cv5d6d6d20xjr7v06"; + rev = "e5696afabd8753d772987ea48434d9c0d8b0aa6b"; + sha256 = "1zcw5lm97kil8jk722xfcnxy9vqlffbrsfhk2f53hwxnabbkl3qq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2022-12-18"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "fab3e2212e206f4f8b3bbaa656e129443c9b802e"; - sha256 = "0paiaag3aazfv8rr0i43maq34pn3iga3lkjyllhfysqvdm8jk50f"; + rev = "580b6c48651cabb63455e97d7e131ed557b8c7e2"; + sha256 = "1yjdn4729syz80radl90f2bsh7jl73rxq5ss0yp2qjj7aj8hkhm6"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -8166,24 +8334,24 @@ final: prev: telescope-manix = buildVimPluginFrom2Nix { pname = "telescope-manix"; - version = "2023-01-14"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "55f73d0743d8597ca9c7bfbebe286e0b5bbe6138"; - sha256 = "1jgl3qb92x4wnkvjwzpqbkcmw22hc4m7nmp1dpj8cy30z5yawg54"; + rev = "28c0100c90dc200dd42471003d458fa8a2b71428"; + sha256 = "0sd914iybjxrvfmakzw8wb6k97sjvw1nnmfli7a0wvrrbak562rk"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; telescope-media-files-nvim = buildVimPluginFrom2Nix { pname = "telescope-media-files.nvim"; - version = "2021-10-21"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-media-files.nvim"; - rev = "513e4ee385edd72bf0b35a217b7e39f84b6fe93c"; - sha256 = "1ap3ijh64ynyxzbc62ijfkbwasv506i17pc65bh3w4dfpzn6rlpy"; + rev = "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a"; + sha256 = "0bvvnflzz1x511fk891mimsfahw843kk4v90l6h4yy1bi9a10qps"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-media-files.nvim/"; }; @@ -8202,12 +8370,12 @@ final: prev: telescope-symbols-nvim = buildVimPluginFrom2Nix { pname = "telescope-symbols.nvim"; - version = "2022-04-17"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-symbols.nvim"; - rev = "f7d7c84873c95c7bd5682783dd66f84170231704"; - sha256 = "1yw09d2snma0vy36nfdswm1snf21w183aji7f6y8jnkx47g6gc37"; + rev = "f2060117d965df4a626f068a4ebbd8ee051aa076"; + sha256 = "1g9pj2g8l2rkz6szrijw56l1hd7lfac8i3g4fyvhi3x4xqjnml3h"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/"; }; @@ -8236,6 +8404,18 @@ final: prev: meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim/"; }; + telescope-undo-nvim = buildVimPluginFrom2Nix { + pname = "telescope-undo.nvim"; + version = "2023-02-16"; + src = fetchFromGitHub { + owner = "debugloop"; + repo = "telescope-undo.nvim"; + rev = "03ff45fab0c4adad4d252e25b5b194e22caf5b4f"; + sha256 = "1mik7qwz16bgbfpr5lcsrgkrjwifk1zanzmsdbj416kxhsz90fx7"; + }; + meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; + }; + telescope-vim-bookmarks-nvim = buildVimPluginFrom2Nix { pname = "telescope-vim-bookmarks.nvim"; version = "2022-07-17"; @@ -8262,24 +8442,24 @@ final: prev: telescope-zoxide = buildVimPluginFrom2Nix { pname = "telescope-zoxide"; - version = "2022-09-12"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "jvgrootveld"; repo = "telescope-zoxide"; - rev = "856af0d83d2e167b5efa080567456c1578647abe"; - sha256 = "10cybnf6lzi3vqbigphjgx45naqfg9b3sz6sbmf8hb960h6f8jz8"; + rev = "68966349aa1b8e9ade403e18479ecf79447389a7"; + sha256 = "1ryc14kggh1qa6qcv5d0zfsxpfzf6jypf4c842cj5c9dm5385jqn"; }; meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; }; telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "dce1156ca103b8222e4abbfc63f9c6887abf5ec6"; - sha256 = "194jkn7a4xh5733n8n1n8n9mwibvadkxj6vw44xvwd01w0db6zhx"; + rev = "a486ac3e8fb2198f3636da1927ed57a28836fbd8"; + sha256 = "1a2qdqxvp3d1i1wlc7gac1vqfbp0idcnk6y78vmjgziksamj4579"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8298,12 +8478,12 @@ final: prev: template-string-nvim = buildVimPluginFrom2Nix { pname = "template-string.nvim"; - version = "2022-11-10"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "axelvc"; repo = "template-string.nvim"; - rev = "fa94fd309f511ac19bcba0b4390104520f07a08d"; - sha256 = "00q8f8v6zcs85iyv36byil0a9v20m7q7scmkx1231nq0z21kzadc"; + rev = "b97ee201fa2d5edced1c6dbaf432d00fec0468f1"; + sha256 = "0cygqc07grd55w4bk42qil80353fr7hf3f73mc9n2y43knijamf8"; }; meta.homepage = "https://github.com/axelvc/template-string.nvim/"; }; @@ -8322,12 +8502,12 @@ final: prev: term-edit-nvim = buildVimPluginFrom2Nix { pname = "term-edit.nvim"; - version = "2023-01-21"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "chomosuke"; repo = "term-edit.nvim"; - rev = "eb9a18b77fa54d0416e315dc0f9793f480930419"; - sha256 = "0562rlcah3czb00m9fkc1dhhy0v9zgi5lx2hc3zjprccdhw9q41j"; + rev = "9efbb3298ce63807750a415a091d7d535ff0a7e8"; + sha256 = "1qb16nnraxg1b9v2hwi8ywzzxgd6p8hxy673d5x561firnfj1zqi"; }; meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; @@ -8428,6 +8608,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/timestamp.vim/"; }; + tint-nvim = buildVimPluginFrom2Nix { + pname = "tint.nvim"; + version = "2022-09-27"; + src = fetchFromGitHub { + owner = "levouh"; + repo = "tint.nvim"; + rev = "f6a259861ba8c0d88afc2ef05140ddf345eb0296"; + sha256 = "0ffbi9nrmr1hrlkvh09xvcdqrxfi66msm9g4xg8ja3zj3gqvi3z0"; + }; + meta.homepage = "https://github.com/levouh/tint.nvim/"; + }; + tlib_vim = buildVimPluginFrom2Nix { pname = "tlib_vim"; version = "2022-07-22"; @@ -8466,12 +8658,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "077c59586d9d0726b0696dc5680eb863f4e04bc5"; - sha256 = "1gvglhdwaqrm3anaz7wyq3k1bjikjq7nqrdaszd9nnp3n4yarmhr"; + rev = "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1"; + sha256 = "1k42l9ghpkds2fqxj8f0anlh4gkpiid28zwkhy29k2br21m7q5fq"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -8503,24 +8695,24 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-01-13"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "a54e6c471ce1cd8ef8357e34598a28a955297131"; - sha256 = "07q90impvavl0vv2c89ckqm2g6b7yk5n4z8n1864pz1j6442vhda"; + rev = "ecf9dacccbcf0d66d9aa9074fdbb5ed51575399a"; + sha256 = "12x47qf98lxwvc6hpw60vwax9aw7wnh21y9j2kxzndzjxi7v6lik"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-01-18"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "4071f7fa984859c5de7a1fd27069b99c3a0d802a"; - sha256 = "0l4ibd0bi2msj2camxls039n6pw008ll50mf5r8888265hmqzkfw"; + rev = "a0abe53df53616d13da327636cb0bcac3ea7f5af"; + sha256 = "1laa7fwg9sy6d83j7p8izij677d29iq6ih2x9jg2blhsc9bp6ds6"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8551,12 +8743,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-01-20"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "15a2262dfcd7848fbafa5afea8adec3941b83c12"; - sha256 = "1jv13wvg6jcca3cw5swirna0jq5m3mj0pq7q113cpy11hd74bzh7"; + rev = "7d397fddf9eb15e5d8e8cb0539beb6f6312a768e"; + sha256 = "14mp801plz90yhf3cdpwhlpndgz724b4a9lykawdnc02jaw5vs5w"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8587,12 +8779,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-01-19"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "b2a0afac2c319a481f0f0318963a74d672ba5766"; - sha256 = "0wjhwzk4drm1phvndbkjjcax3q1gmh9akl5i7fwd8635w8dpc9fs"; + rev = "3b754285635a66a93aeb15fa71a23417d8997217"; + sha256 = "0bgm93g4yh5f84nf7h2w9gb3glaffk2dl2p5b0cp38x033lz1yk9"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -8635,12 +8827,12 @@ final: prev: twilight-nvim = buildVimPluginFrom2Nix { pname = "twilight.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "8bb7fa7b918baab1ca81b977102ddb54afa63512"; - sha256 = "0bqd24cv0mb288qppah5hpmjlik37hbfifgbclfjkkb7irf1va8y"; + rev = "9410252bed96887ca5a86bf16435a3a51a0e6ce5"; + sha256 = "17mw3zqlviz4jsmjfsvddjd60xgkfihc60jv391rinl1w36l79ld"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; @@ -8659,40 +8851,52 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-10-02"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e99fdf15cd55a4a8e0cb0a80a6810c1867a5c401"; - sha256 = "1ym6myhxq4z9h6nnh1dxvkqc4nbhq500wy4mj494lm2hz6nnhl09"; + rev = "0ad238b1910d447476b2d98f593322c1cdb71285"; + sha256 = "1ii9bb2h45ngy3a9ycqiw6i6vg5lyv59ibidgasg4xirnmsrmk1y"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2022-12-09"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "1a23ea84bd02c34f50d8e10a8b4bfc89597ffe4e"; - sha256 = "00r0jnsrqdfns08ndj3xhwfx3yf65dgsin9pihad64gj9fmwvbv3"; + rev = "b6fdb95db53b7ceb23ddfe8a8211a3135d98eef0"; + sha256 = "0jrsqq1k2rvxv85ijhrvc3p0jihwdpg2qvc7rflfzf2rblid1vgw"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; unicode-vim = buildVimPluginFrom2Nix { pname = "unicode.vim"; - version = "2022-09-25"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "4c851a24310fcfb5540a7e2b17c563f1f542e3a2"; - sha256 = "0zgycqvr1z88mjh1xfyvmr00nriwfxk7imvcfqskh9l0wy6z0m52"; + rev = "d4925c55b5d6d57003100b3ce17b82b9e44d161c"; + sha256 = "192ln697rv7m3nk4401p4w75d3afsjlcc5m4hcmf00ci3vimk7mn"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; + unison = buildVimPluginFrom2Nix { + pname = "unison"; + version = "2023-02-17"; + src = fetchFromGitHub { + owner = "unisonweb"; + repo = "unison"; + rev = "6c6fb53b70da614491210bd26c604b47adfb8927"; + sha256 = "1fmadrmxnzdpnb33b52yc9x7cafdmi2z1vh2j94d7x7g6ifxfwki"; + }; + meta.homepage = "https://github.com/unisonweb/unison/"; + }; + unite-vim = buildVimPluginFrom2Nix { pname = "unite.vim"; version = "2021-02-06"; @@ -8767,24 +8971,24 @@ final: prev: verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog.vim"; - version = "2022-11-20"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "5bf36012ecd4f82a987acaee1c8504cbc8711aeb"; - sha256 = "1v2d2jyp9h2mjrmkmya879ilmsjbwdbpms1lfhiw7gx8bzb5qa62"; + rev = "b47a3c0e5ace979f67326b82702b9da5acd7efb9"; + sha256 = "1ig8m86pbvjqvykgi0xm45c0q3h5ibwqjmr3scpqkz2ah6wahpvb"; }; meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-01-21"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "a9488d0803020e8d99ed13b95fd9def82941c978"; - sha256 = "0c78cr5f16vliiblafhcmmcq1xqybfnd70576drh6n7sr2fhss88"; + rev = "c28c3fd97b25776038f51b8062790395bc2dae21"; + sha256 = "1npfs6dy0k89wf848wsjx48mkaphswxwlmwhvddxkqfwmld26xgp"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -8863,24 +9067,24 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2023-01-06"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "aa3428b734ddbd0105615832843f619774a6871e"; - sha256 = "0dnv1ixhzrgafd7kqpx8hp0r1snyqfxw80psnbxsr6qcwzawb2da"; + rev = "c164cac033087d73b3a94650c02f6c092ee56115"; + sha256 = "0n3gj93ankh8nwiwsmydgg0v8vz4bxbymbh551kgj4aigpivip01"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; vim-addon-actions = buildVimPluginFrom2Nix { pname = "vim-addon-actions"; - version = "2020-05-03"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-actions"; - rev = "6d350ca6075779af32016f0a0bd3e3521ec4a9eb"; - sha256 = "1098jc4amwfvcrfjfa5hgmyrjrbl680c3s56h7grvyl3i6n4hj34"; + rev = "f6ea95cfcc13fa6338302daff5ebafa9c936336c"; + sha256 = "06rjzdbk1x3hwkz7kfggsyv76jqzbar8vv96yj63dfncmyw2bsji"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-actions/"; }; @@ -8971,12 +9175,12 @@ final: prev: vim-addon-manager = buildVimPluginFrom2Nix { pname = "vim-addon-manager"; - version = "2022-06-29"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-manager"; - rev = "984320ed46ef6612a1c232bb44f5e51f92d12e7e"; - sha256 = "1p7ads4rg2rcgh4rf2p5qy7bf5yrnvnx6nri90bfinzfsyddb00l"; + rev = "be43aaaa70cf7c08c93f66051612d24de4c9daf8"; + sha256 = "10gsrs69gcjvjcn4hjrqlpsnlqm67gygzlzld6c3cbav1gfbsq08"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; @@ -9115,12 +9319,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2023-01-22"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "c7460aa8836bcb05cf32331cc751739ba9392ae7"; - sha256 = "1w2r5vwll0mfmviz7s9r6n00lr0b1fav7qmkj7zbvxh8hrf2z80b"; + rev = "038e3a6ca59f11b3bb6a94087c1792322d1a1d5c"; + sha256 = "0m59sij2y38sgcmzic3jxw08bwkycywkjxn906xgfkwn2rvhv8cv"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -9511,12 +9715,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2023-01-22"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "5a6ff035e16c57874fbf68951b1206535733827d"; - sha256 = "1v0fxyqnbcf3x5vv5aq1z9q75m1qym6l1f9jn9iwdwg06mj581wj"; + rev = "ee44975ea9797d932de737a770ab6b743b5aa5db"; + sha256 = "14dsjy49jngi8r851casmyg1swwlx0kmhnalkfqs59jkda7bkg33"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9571,24 +9775,24 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2022-12-16"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "48d44707a821f962f56c3d0553144c77211749fa"; - sha256 = "0pgrmcq79jbj68zw1s9wfa5lq133xn34gx3zd2r1dllp2ybqf62a"; + rev = "080b38a0fd14d14e21cf85fc26b18415303c3c5e"; + sha256 = "10734wy3j3ffkrc5ifm04kh4vk0axpl1isxdryak1ai90wxr3xhz"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2022-12-09"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "64ffe0761b9499f15ea8b56b153644c488b5bf74"; - sha256 = "1apym7104z3pxx57srb7ih1qsyidf421f3d6rzfs8nc2vvgdd061"; + rev = "1b76987b6719bee259ba8d1e03a1e7f624a3615f"; + sha256 = "0542dzzixavsfbpdm4qrsnv639gpl70grvv5jhllm2kq4dqyhjil"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -9775,12 +9979,12 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-12-27"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "a09e40664e9cd30cd2b3f8866b796598302070f6"; - sha256 = "0fhbb5yq6ll58gc2wyai7h4c889lfdmvhwzidw1gw529jpgwvc67"; + rev = "389a2b0120f82b13d51ff7c07f5c13f9bc9f412f"; + sha256 = "09ly10yclzkg8p4p0d50bznss76h3252jvpi9wj3qar48jgpmng1"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -9799,24 +10003,24 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2023-01-06"; + version = "2023-02-12"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "f4ead480930a37dd2b0cf917a8c387ed36c2d86a"; - sha256 = "00nmcsna4z1p8i5k74jykzci16by2ga2lf904f1aya0yhwpwrjg2"; + rev = "caf45f54dad6150970331ac115e531524e418c7c"; + sha256 = "1x1qvn245lz8q0a7v6l0s6fr9pjrm8ar9gf72hd1iiskzly28ax0"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; vim-dasht = buildVimPluginFrom2Nix { pname = "vim-dasht"; - version = "2022-12-11"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "sunaku"; repo = "vim-dasht"; - rev = "fe72990f761160c5a8b551dcaa0d3a3927830f52"; - sha256 = "03fxm3p89y3mjr2bqkqb8wy32xvffrnn4pzf2920xrgcpdx41ff9"; + rev = "fcfd4ec32d681745d6c1855097b30b988053fc2f"; + sha256 = "1y97fcmz8lvpj9z0cq46x6m6ac2ck8syfdgyjj62x2m1j40sv63m"; }; meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; @@ -9895,12 +10099,12 @@ final: prev: vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2022-01-14"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "00e77d90452e3c710014b26dc61ea919bc895e92"; - sha256 = "1ind8lyghdizgs0q59k3svwdmnq8l88b8ns1qq1xvz47rh836c6w"; + rev = "6cc2691576f97d43f8751664d1a1a908b99927e5"; + sha256 = "151fxvhz6pi021rg9bc2g564a13lvbcwh3lpa4vl3g5w9j95pmv3"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -10051,12 +10255,12 @@ final: prev: vim-endwise = buildVimPluginFrom2Nix { pname = "vim-endwise"; - version = "2022-08-17"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "4e5c8358d751625bb040b187b9fe430c2b769f0a"; - sha256 = "0vfkvq20kr6jbm526vkvyliv4zybha7jpp7iaimvw4zx1mjs5pih"; + rev = "43301cf9a0fafd78cec7c2e5b9c0e2cfd9436e8a"; + sha256 = "0lcgax5m1zmngdz5dk9lx89didicw831zgyyjx0w9iih6d9amj18"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -10243,12 +10447,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2023-01-22"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "baa0206f8d1685d1239d6c10f4b53869eb84c4a0"; - sha256 = "0hmdpn548bn46ygwm8w2wm609hiyn2nwj2kqc7nsi0ypa5pkbnnb"; + rev = "2ba8af2c9682e3560db5b813d10acf3ba3415bc1"; + sha256 = "0rnyk3q6zkd6b9xi5q61jr8885mqx7xz0v7yyxb3y37lrl0wfz66"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -10291,24 +10495,24 @@ final: prev: vim-fubitive = buildVimPluginFrom2Nix { pname = "vim-fubitive"; - version = "2022-11-11"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-fubitive"; - rev = "318b5ec47f8f1a65b11aae4d11736420a8d3604e"; - sha256 = "19g1iqcpbgy0kqzp3av8xr7djwkv79443ghwfjckhi6ws40hbvgr"; + rev = "f522e7c1c958d099438b375f38576f0f2f5100d2"; + sha256 = "1qd9pka3wrmwq1y33i4bzm2qs6l0lx8g1174aa0g4kcawwf21m7j"; }; meta.homepage = "https://github.com/tommcdo/vim-fubitive/"; }; vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2023-01-17"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "2febbe1f00be04f16daa6464cb39214a8566ec4b"; - sha256 = "0njzhsn5xlwjcgr6nkm8pds4rby46dldl0b25dwj2bj6nyydaa23"; + rev = "62f42f013d866139fa23068ac2651b3f7e05a56f"; + sha256 = "1hbkhdfrg18zzxn2hqz070ns0nzydjj853i2dkz9d59s23bcyrql"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -10447,12 +10651,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-01-15"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "9e64fc1ab60b2e97d39410482b64289dbbaf4eda"; - sha256 = "01vj5c89g6fblrybx2f95ji9blcdjyqrr120qwbq9kawbgja1giy"; + rev = "b8a41085bfd67fee97ad075c6df65590ce7417a7"; + sha256 = "0m477wpyjxx0g7gdrcwnnhp6s8z23wlb7nljd6lrjkf1lqphb5i7"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -10748,12 +10952,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2023-01-11"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "da80f3877896adcf77f59fb0bf74e9601615d372"; - sha256 = "129r4jrdffy18yklk18gbplgxf7dkngda8cgssf9xfawizyg739v"; + rev = "49062ab1dd8fec91833a69f0a1344223dd59d643"; + sha256 = "15456qlblskafaq3x92kp8n8hdfzdfv1hzs9yb4k4aqps1bj2plf"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -10832,12 +11036,12 @@ final: prev: vim-jack-in = buildVimPluginFrom2Nix { pname = "vim-jack-in"; - version = "2022-04-03"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "clojure-vim"; repo = "vim-jack-in"; - rev = "5467e00e26f15680b0a7998f8aa20d5a7dd44cd5"; - sha256 = "1wi379l8d793v6hjx11v0dhgdn8a9ihx64gv51v9wpmjlvp9xbzd"; + rev = "8ca306a9484d6d184de8921a9cab03c63ee9aa79"; + sha256 = "0hrvsq95rqwp0kfsdiid5qv0bfx1i7wc5yn7qmdqc660s7abwqxs"; }; meta.homepage = "https://github.com/clojure-vim/vim-jack-in/"; }; @@ -10941,12 +11145,12 @@ final: prev: vim-jsonnet = buildVimPluginFrom2Nix { pname = "vim-jsonnet"; - version = "2022-10-25"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "google"; repo = "vim-jsonnet"; - rev = "f27e1d67dff34ac9cf9c83ea2f2f814e53aa409c"; - sha256 = "05zlsn7344zffwjsx4f65rp85jrgfm4wi40iqjj137x11jhwb9a2"; + rev = "4ebc6619ddce5d032a985b42a9864154c3d20e4a"; + sha256 = "1z2zk2wqfv58qxd8pa4hrpyhi5nlgf8m4gqb9f31pdnb78ci860a"; }; meta.homepage = "https://github.com/google/vim-jsonnet/"; }; @@ -10989,12 +11193,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2022-07-25"; + version = "2023-02-17"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "e48aae3c7e3136682b3f4c6cfd85867b392f7f1a"; - sha256 = "06caj10yw71rbksf0cjdxak3c1qm7qcby7jrc26llk5qhfpwgh2a"; + rev = "98cf55a5074695e3fca1ccace66ab5563e35111e"; + sha256 = "1kavcc0vpzgzly39qpbcb6a1kmp456c0jz6jc3vmw3sql8c070fa"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -11061,12 +11265,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2023-01-10"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "653fb20b4c0eedabdc5486719b571813d5c8878c"; - sha256 = "1y6hzjx4qknwvilqxshqgl8q6wy7ycabmlzy2kgww7257cxsan1x"; + rev = "6990fa243b684d91bd7386af3f378cdf6ed7c536"; + sha256 = "0zw3zwp9lywdxm47pngqfw5j39d9vkpzfjcckcqkgzzrm7579dcl"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -11133,12 +11337,12 @@ final: prev: vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2022-05-11"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "244a92ceae63b8c23a74022eaf205b431745fcb6"; - sha256 = "1y56xh4k7zqagsnw86lkm747l1x4i5l95r0jks4j35d1fcmpq81i"; + rev = "6cc9f9ffaaf44b45bd5268f8a541363619bf1b13"; + sha256 = "05j14v41jrjm4p1kbqxgx3n54isv4y93w2iy679jyggrrdzi5m71"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -11181,12 +11385,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-01-15"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "3244bed52220bee01515eb6dbc7da29a66998fec"; - sha256 = "0rh5pz0m4nbhx8dw2nqvswyapyh9s8racwlqxgykaxlni89m1g23"; + rev = "65628c3b0affacd0f36a6e294b1c1f96c6fe2455"; + sha256 = "0qkxw3n59a9w74vawyp7b288pfvkjww1d61ipcg3z9bvcv2xf0gz"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11290,12 +11494,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2023-01-18"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "959e0e79ea240cdee29efbdd0d2e2e718931ccec"; - sha256 = "0fyh7894fwnf8hxp8y9016blzmw7qv99izhy62bg11rhdjcgz4n8"; + rev = "3a48818a8113a502f245c29d894201421727577a"; + sha256 = "1hxsjs83i2rjkmhvsxrxk1y6as9xi8b5ji9abvwvb90p2a765987"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -11386,12 +11590,12 @@ final: prev: vim-monokai-tasty = buildVimPluginFrom2Nix { pname = "vim-monokai-tasty"; - version = "2022-11-25"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "55dcb855be754178967b860b0fa63621c319ce0a"; - sha256 = "0yll7qm014ydfa2svx3zaskv8g65scw6mw8m5fsjsi9g2v3369g8"; + rev = "8c1052347dd204a83ef72f7af36bdf2fa6861e0b"; + sha256 = "12wri9qj8klvksn9n7g2jvnnsa41vn4ij44wsyc3g44630p2d7x9"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; @@ -11602,12 +11806,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2022-12-15"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "8d30ed73ce7583b31224ab206ec158f547dd25db"; - sha256 = "041wv3n3w1bfabgwpswwvpc4rsnmib3520cv7rkrvw7dqpywk7dn"; + rev = "4c907ef607810662c42795098d42f23a224fe6e7"; + sha256 = "1355c0kf6g0v0q6sb5xnl8rssm4hjkpkjqwbi9yb0r9sj8z7zx96"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -11770,12 +11974,12 @@ final: prev: vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2022-08-18"; + version = "2023-02-05"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "7dbda1c885c4c5dd3f865aa29e1b82167663aeec"; - sha256 = "0f4bkz619lp0fr1966njm3m5587vq2mbmahy2ya5d8nnqs5f770p"; + rev = "9f406d964ca70d959b7867f1b5cee3d4884d4d3c"; + sha256 = "0r0w4pr6jdh7ww08301h69xfih2gsqqbswfx4fzm10xx8y4csrfv"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -11986,14 +12190,14 @@ final: prev: vim-prisma = buildVimPluginFrom2Nix { pname = "vim-prisma"; - version = "2020-04-04"; + version = "2023-01-24"; src = fetchFromGitHub { - owner = "pantharshit00"; + owner = "prisma"; repo = "vim-prisma"; - rev = "e91ac5011232e1bd8ea53204db8d01203d5d0f3c"; - sha256 = "0pc203n70g1b0qfvrnfi5sxg2vr9zfw274s9lpgpxmribknpxi86"; + rev = "95c5b25066efb34c75bce78698baa371fe0ee7c2"; + sha256 = "046lpazz44f6b1lcvklaq1jl0sbyiklj6kcv580rrff89511nzsy"; }; - meta.homepage = "https://github.com/pantharshit00/vim-prisma/"; + meta.homepage = "https://github.com/prisma/vim-prisma/"; }; vim-projectionist = buildVimPluginFrom2Nix { @@ -12476,6 +12680,30 @@ final: prev: meta.homepage = "https://github.com/t9md/vim-smalls/"; }; + vim-smartbd = buildVimPluginFrom2Nix { + pname = "vim-smartbd"; + version = "2015-12-20"; + src = fetchFromGitHub { + owner = "Industrial"; + repo = "vim-smartbd"; + rev = "62c267401f634d4f8f65933c812469610ba505ea"; + sha256 = "0a4ls93bgy5r7ar3r60zgdn2jzdkk10wrws14lw2xl8yg65rc0mg"; + }; + meta.homepage = "https://github.com/Industrial/vim-smartbd/"; + }; + + vim-smartbw = buildVimPluginFrom2Nix { + pname = "vim-smartbw"; + version = "2015-12-20"; + src = fetchFromGitHub { + owner = "Industrial"; + repo = "vim-smartbw"; + rev = "8091e5e452f63b10d4c9eacf0cc84cba394148f7"; + sha256 = "08i8qyqahj2jv44pay7bi2dxajhsrx244i44v53y4iiddps6smxn"; + }; + meta.homepage = "https://github.com/Industrial/vim-smartbw/"; + }; + vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; version = "2022-06-10"; @@ -12526,12 +12754,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2023-01-14"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "1049d2425b6d270621b48e110de37d5467a2a621"; - sha256 = "083h0dzi60p9hv2g9daydalrrpzngbw0lgyapbn1xzh3idb0hqhx"; + rev = "68dfbccbe97b87ec9c80fa6d5ee144befc3f3a3b"; + sha256 = "05x30vn156x5r57pz4p0ha44riwbprxph4rc98fl507229mnmp60"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -12598,12 +12826,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-12-12"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "cb4c112b9e0f224236ee4eab6bf5153406b3f88b"; - sha256 = "1n1m27vvqcik4c9f80d0blqggyh29s8h20jn3v7gy1fx94bi2n2w"; + rev = "6580cf539c33a212f4f5542068a3b4dd2b3ad834"; + sha256 = "1977l3k7crzrr1cc80afnz7cs6bz2y16qn02gz56marc0pn215mx"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -12779,12 +13007,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2023-01-10"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "ca2502545a8c563e15f556d0eb8a59e0f74d2864"; - sha256 = "1ijfdhnsr3dlp5bw3xarp2nxkavab59lnk563gvjcw74889alip9"; + rev = "c63b94c1e5089807f4532e05f087351ddb5a207c"; + sha256 = "1czd0k91im222ljz6jbggj5k4v2wvb6r1gql1w4ri56s07hc3rbx"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -12899,12 +13127,12 @@ final: prev: vim-tmux-clipboard = buildVimPluginFrom2Nix { pname = "vim-tmux-clipboard"; - version = "2019-04-07"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "roxma"; repo = "vim-tmux-clipboard"; - rev = "47187740b88f9dab213f44678800cc797223808e"; - sha256 = "1a7rpbvb7dgjfnrh95zg2ia6iiz2mz2xps31msb8h14hcj6dsv6y"; + rev = "e1be6608410c260479dc4807ad8c103faf5460d8"; + sha256 = "07a8jj1j8422a8grvp440qbrxmzchqxc3mgmpa7hsyqlkw5fjkj8"; }; meta.homepage = "https://github.com/roxma/vim-tmux-clipboard/"; }; @@ -12959,24 +13187,24 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-01-01"; + version = "2023-02-18"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "86f37afec5cefd75baaebf8900889dabb9789a2c"; - sha256 = "133vfipflvalyp373lmqza5p8dhh2qnnvlh5y2bsxh5abjk1jml1"; + rev = "2b61cd2726d2f2cab5ab66761732143268f78b5c"; + sha256 = "07z5sialjki7w8qipqplpg67jgshgbckv9nmp83x40vrjypsiml9"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; - version = "2022-10-07"; + version = "2023-02-13"; src = fetchFromGitHub { owner = "bronson"; repo = "vim-trailing-whitespace"; - rev = "907174052a504e60e9b915f5c083ee5f6e067080"; - sha256 = "07jsgsv4j1zcxizl9wflib68rrp61zpxzy89yzak4b1lyxnl66s9"; + rev = "41f24890005f6bce34b1603e7c0d530fd70bc2da"; + sha256 = "1ms54fyxwxh4albrdgxpv99k3rwdbb1wy5ss95l585hmk9hfr27q"; }; meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; @@ -13031,12 +13259,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-06-18"; + version = "2023-02-09"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "c93eb128332f8245776b753407ab6c4432c4c556"; - sha256 = "1y686xrcvkwqmc263syh84a396xanqka39axc460ibl9zav7z4nn"; + rev = "b06bc8715cbcb4aa0444abfd85fb705b659ba055"; + sha256 = "0k69hqaxgbhjwq7wf30l8i1b6xv5qhzm4mbg6hydil5rj6zwf7xv"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -13113,6 +13341,18 @@ final: prev: meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; + vim-visual-star-search = buildVimPluginFrom2Nix { + pname = "vim-visual-star-search"; + version = "2021-07-14"; + src = fetchFromGitHub { + owner = "bronson"; + repo = "vim-visual-star-search"; + rev = "7c32edb9e3c85d473d9be4dec721a4c9d5d4d69c"; + sha256 = "1g3n84bwvy2535n8xwh14j3s8n1jwvl577vigg8zsxxvhjzl878b"; + }; + meta.homepage = "https://github.com/bronson/vim-visual-star-search/"; + }; + vim-visualstar = buildVimPluginFrom2Nix { pname = "vim-visualstar"; version = "2015-08-27"; @@ -13173,14 +13413,26 @@ final: prev: meta.homepage = "https://github.com/posva/vim-vue/"; }; + vim-vue-plugin = buildVimPluginFrom2Nix { + pname = "vim-vue-plugin"; + version = "2023-02-02"; + src = fetchFromGitHub { + owner = "leafOfTree"; + repo = "vim-vue-plugin"; + rev = "58ac69b2c8a98a9bd2a95fbaa7b5f0fe806bad0f"; + sha256 = "0x8a66r1wlyashyqxmdpz3wnqhgfmscs42m2r82g5ic6a7n6f36l"; + }; + meta.homepage = "https://github.com/leafOfTree/vim-vue-plugin/"; + }; + vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2023-01-10"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "b487cccc0e920e4fdf84f72d2fc1c86ef8dc3bdc"; - sha256 = "13741pp29f2pqr44sslh9fl49aw7a19l3ff78k1qm4i97ms4r0xc"; + rev = "62113bb063aa1923146e59270d71563441ceabe5"; + sha256 = "1n5d7jz5d3iamq030dmvb67w06b8ap1nvmj03shbx03i189kp2g1"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -13475,12 +13727,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-01-04"; + version = "2023-02-07"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "475d75a32e368dbfc700b580b16b351face72129"; - sha256 = "10r0n4dz8r4jbv9j583r77pp25q4yb4zd5gbrb8svxr873fja33n"; + rev = "4deaffdec34508621934fa4532748ee9deb1f55c"; + sha256 = "014kcjwab8jy89r0rcgci5ih8isbyz4v29q5nv6d2prld100p72f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -13488,12 +13740,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-01-19"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c77ec4e15768ffcb97a96d1bf2df1ef58e94acdd"; - sha256 = "0cdc8qs1jyzxphqs11nwib0xxv4lsaiqi7w580jhg7an7w484kn0"; + rev = "8bbd3b0308ba8238c4d00a24d68a6074e19ccc0a"; + sha256 = "10ahwp0nzz34iq4i8rv1lx45c87zp87wvwg0fn3rwy9hd35gpnn9"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13596,12 +13848,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-01-12"; + version = "2023-02-10"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "e4fa445065a2bb0bbc3cca85346b67817f28e83e"; - sha256 = "1gj1qkq1zxn9by6zxwg46rplpks51wvv3pmdjh8qr0ldkxk9yavy"; + rev = "5224c261825263f46f6771f1b644cae33cd06995"; + sha256 = "1r16iz5yhp56bb2rqi40qsis5yqnfkdq7x5ibwafv5xsmk7nrlgj"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -13777,24 +14029,24 @@ final: prev: zen-mode-nvim = buildVimPluginFrom2Nix { pname = "zen-mode.nvim"; - version = "2023-01-04"; + version = "2023-02-08"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "4313a5828e4d48c5f2f135f29d46f769a59dcfdc"; - sha256 = "05wn6p90ymwg0y3941c6v7zpxhkd2zn4xqg2qvvl4wyyhn4rl4wp"; + rev = "3c92f503823088862ca2a7809d1c7edc90fb92fa"; + sha256 = "1l4dg11bdnkncdscmz3j1wsx9qnllwpsz5pm1a1c96v3s4wlmw0p"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; zenbones-nvim = buildVimPluginFrom2Nix { pname = "zenbones.nvim"; - version = "2023-01-20"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "13ed6d0493a1d5140995c4456ced54d0aa984f6a"; - sha256 = "1k894mxc7v4fp5zr80wbfk18zd5shcfik0j7mv1cs8c950xmahjl"; + rev = "910b8c240c6aaf5263db038db81c538602c766c3"; + sha256 = "1r84wgz4p9zvpnz247xk0svq6r92ir3pgdlsbzf73qjwgph94q7k"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -13825,24 +14077,24 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-12-31"; + version = "2023-02-15"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "c8caa9ab97334ca5af2d69900108bb4af20933c5"; - sha256 = "0mpzlxbf9dclgs4r9pffhc31hri09c78dk9lpij8fr089srgcp5i"; + rev = "a0d9adedafeb1a33a0159d16ddcdf194b7cea881"; + sha256 = "0qcjwms102cpdbjamda3cbdwbqdk4zj5zrvr9dlj2lmwkdjqqfdz"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zk-nvim = buildVimPluginFrom2Nix { pname = "zk-nvim"; - version = "2022-12-19"; + version = "2023-02-06"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk-nvim"; - rev = "2fd9f9f29270bb28477e000100625276ec2a2377"; - sha256 = "1b8w280yivsb34547y7kdcsvgcil41sfj8kvyvs6d24yrxbqs20w"; + rev = "0413c52500cd0133b0cd8e7e7d43084855ac1760"; + sha256 = "0yw7fi9z4rlb2vpm2qp6sm118hjz5vzix6nl7h654vp12zzqrs0g"; }; meta.homepage = "https://github.com/mickael-menu/zk-nvim/"; }; @@ -13873,12 +14125,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-01-21"; + version = "2023-02-21"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "6368edcd0b5e5cb5d9fb7cdee9d62cffe3e14f0e"; - sha256 = "1d1bb9js2i58qn2b8zjhqbawlrbjk3sn91cpkjaw43wldgm3samj"; + rev = "22e55672793be043a5ce9790e7617322ef4ab445"; + sha256 = "0smpk37fiwq4rmgiy2b3f3yyhkwynfy6i70hrxblqn9as5kk7cjc"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13897,12 +14149,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-01-22"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "ed78c1968dfd3b9aa2a3444fce0482c06ee65a17"; - sha256 = "1yhffffvb5ry4vcaiz68rnjv13r63v632962axkm0wgqbc5i62fc"; + rev = "ea91862411d16f4e4bed9c6fef452b8c1b2a662f"; + sha256 = "0fm3kkfvr816n90pl07wyy8mhzpz4rn93xy61hys7cj53q99fngq"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -13921,12 +14173,12 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2022-09-12"; + version = "2023-02-19"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "96fdfff7dac84dda937d843a0aceb1c39acba761"; - sha256 = "1yms82s3iwis6lk5h1kapa9vlhlhbk1kqxlywlvvy6kz7d1iyvjj"; + rev = "d724faa9bfcd37f1995071e678e30af2229eb1a1"; + sha256 = "0ibcifqm3vrdvq2dzm4qyh7y0i134653irq33jg3kmqijxzzrb58"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -13945,12 +14197,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-01-22"; + version = "2023-02-20"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "8516da6a9c40a1d9ab81ad56c90673be29f188f7"; - sha256 = "1l3l1w75j6bal7l4jf27rvy7w5vx1w62z5650y9xgx9wjnc1y955"; + rev = "73380b25ec27e9df788752174703cfdad98e66dd"; + sha256 = "0z50c074bk2jsvsglwdw532i8zp0w8yb2sfk5izgm9hk02n2niys"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 2f2dd0416f276..3ed61e541d90e 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -1,16 +1,16 @@ # generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchgit, fetchhg, fetchsvn }: +{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchPypi, fetchgit, fetchhg, fetchsvn }: { ada = buildGrammar { language = "ada"; - version = "e9e2ec9"; + version = "42cc2eb"; src = fetchFromGitHub { owner = "briot"; repo = "tree-sitter-ada"; - rev = "e9e2ec9d3b6302e9b455901bec00036e29d1c121"; - hash = "sha256-buTQ1GjaJSVy4SPikZq88bifWubyHtPSI4ac7p1/tOg="; + rev = "42cc2eb141529b03a91c18ec8646a0a58fb111ba"; + hash = "sha256-0BWj9MZku+0MfJMPNlbPjHo8Jf1t5PYLPqSr9J970OM="; }; meta.homepage = "https://github.com/briot/tree-sitter-ada"; }; @@ -27,12 +27,12 @@ }; arduino = buildGrammar { language = "arduino"; - version = "c473c09"; + version = "257efff"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8"; - hash = "sha256-aAw1ZgKuMWozQzmENUhkdkHV0BjSGmTdH4Bna7EfDaQ="; + rev = "257efffa387da3283a37816b71dedfecf4af5222"; + hash = "sha256-Yc3oFzOMyQwW2URyEzSIe6wBNAu9J2vPFIXk43sVUv8="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -60,23 +60,23 @@ }; bash = buildGrammar { language = "bash"; - version = "4488aa4"; + version = "7f9506c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "4488aa41406547e478636a4fcfd24f5bbc3f2f74"; - hash = "sha256-QkH5rI9/7x6L7e3YIwDMdSbBHOGhhC6LTHfasS7wX9U="; + rev = "7f9506c34ab6a0f4e3e052b7a49cbeef91f71236"; + hash = "sha256-D9FesfedHnHWUcCIPGs72fpgeBO3xZ2rWTRDewa4qzM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; beancount = buildGrammar { language = "beancount"; - version = "4cbd1f0"; + version = "f3741a3"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c"; - hash = "sha256-Uh9/yBYXNKBvdpqNv1kr5eREYmKy3Z/kvaSZQpUl+0U="; + rev = "f3741a3a68ade59ec894ed84a64673494d2ba8f3"; + hash = "sha256-WtZ3FindaePKbtlnilK9KkOoPxBaxRKNVM+8D52DtBE="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -115,15 +115,37 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "a29bac0"; + version = "5b6c4d0"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "a29bac0681802139710b4d3875540901504d15cb"; - hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY="; + rev = "5b6c4d0d19d79b05c69ad752e11829910e3b4610"; + hash = "sha256-Ax9AuxqQK9gSlkxM2k6E32CskudUmduWm0luC031P5U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; + capnp = buildGrammar { + language = "capnp"; + version = "cb85cdd"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-capnp"; + rev = "cb85cddfdf398530110c807ba046822dbaee6afb"; + hash = "sha256-VB8fNF8EtTAkKBLIAByazczPHJYdBULCeoGQ1ZLLRhI="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-capnp"; + }; + chatito = buildGrammar { + language = "chatito"; + version = "3baf22e"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-chatito"; + rev = "3baf22e7e507cedf15d1dbc03df8afa50a625586"; + hash = "sha256-NsdkvMkrHfVakeYxPJfr4HOg5BlLB6OPFQeMseQQL/k="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito"; + }; clojure = buildGrammar { language = "clojure"; version = "262d6d6"; @@ -137,12 +159,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "a322653"; + version = "399605a"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "a32265307aa2d31941056d69e8b6633e61750b2f"; - hash = "sha256-LBd3SMem1dxZr/dOdJdEFTQxI6d+H8uYE46yN02E/6Y="; + rev = "399605a02bcd5daa309ce63a6459c600dce3473f"; + hash = "sha256-7pzKyfR9RmfgzuX9/elUesmsdbLlwgrfiRP73YQu+gM="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -181,12 +203,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "2d2c4ae"; + version = "56cec4c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1"; - hash = "sha256-BjNWSTpwytOSYw32lYFItNI4t3xw+uJUx/0htYo7aLs="; + rev = "56cec4c2eb5d6af3d2942e69e35db15ae2433740"; + hash = "sha256-CWh5p0tlBQizABjwBRN1VoxeEriOPhTy3lFZI9PjsTA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -203,12 +225,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0091006"; + version = "a02c214"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "0091006d6498ee5647f080ef6c09e5b95e481078"; - hash = "sha256-t1wd32UE2Kz1VkIM4HfFFSDnttdCPGm1xOH9ZP+ATxc="; + rev = "a02c21408c592e6e6856eaabe4727faa97cf8d85"; + hash = "sha256-bgyisXPNZXlvPF0nRPD5LeVhvbTx0TLgnToue9IFHwI="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -249,23 +271,23 @@ }; diff = buildGrammar { language = "diff"; - version = "1d63cd4"; + version = "f69bde8"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-diff"; - rev = "1d63cd49529ef3153393cf8f620718b274bba715"; - hash = "sha256-nAU3IFUsxcqgx/2cFoqNJXtJ7v7KRHVrfKYIVQEJCEk="; + rev = "f69bde8e56f431863eba2fe4bab23e7d9692855f"; + hash = "sha256-MFVXhnNxmGtqu8Y8ciigu/AIi15maPQjnJduBm7iCQI="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff"; }; dockerfile = buildGrammar { language = "dockerfile"; - version = "09e316d"; + version = "8ee3a0f"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "09e316dba307b869831e9399b11a83bbf0f2a24b"; - hash = "sha256-FffwAt9FJurxFJajLTsQe5tLeZty3nSbXBRkgdjNOJ4="; + rev = "8ee3a0f7587b2bd8c45c8cb7d28bd414604aec62"; + hash = "sha256-I73T3NuN/K9+R3itIJrNVjlyVr/432UT3HEf6LND+0c="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -282,12 +304,12 @@ }; ebnf = buildGrammar { language = "ebnf"; - version = "ef241bc"; + version = "8e635b0"; src = fetchFromGitHub { owner = "RubixDev"; repo = "ebnf"; - rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c"; - hash = "sha256-N5TGYJnYNjYIdFXspGn+dDRm0wmJymXHY+Io43wSKlI="; + rev = "8e635b0b723c620774dfb8abf382a7f531894b40"; + hash = "sha256-Cch6WCYq9bsWGypzDGapxBLJ0ZB432uAl6YjEjBJ5yg="; }; location = "crates/tree-sitter-ebnf"; meta.homepage = "https://github.com/RubixDev/ebnf.git"; @@ -325,6 +347,17 @@ }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; + elsa = buildGrammar { + language = "elsa"; + version = "0a66b2b"; + src = fetchFromGitHub { + owner = "glapa-grossklag"; + repo = "tree-sitter-elsa"; + rev = "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"; + hash = "sha256-zahi5hOXzad6R1+mqmYBFfn2X+SejQUIQzbabgCIJ8w="; + }; + meta.homepage = "https://github.com/glapa-grossklag/tree-sitter-elsa"; + }; elvish = buildGrammar { language = "elvish"; version = "f32711e"; @@ -338,23 +371,23 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "a130858"; + version = "203f7bd"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df"; - hash = "sha256-JNyLOW/na8J0WEsLDv3BuC+UXxGpYMYvAlywq4z6Wzo="; + rev = "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"; + hash = "sha256-SaZkyy2wKYoK0+pdHLVpQrdXjEeX/uR5XxgahcAdwz0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; erlang = buildGrammar { language = "erlang"; - version = "f0e2f78"; + version = "2422bc9"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "f0e2f78cdadb2e67323f9ed511656e47dcaa43bb"; - hash = "sha256-aMgKNcIQUkwA3rrzS5+gHzzGESabCtbLa9HGXmIxT90="; + rev = "2422bc9373094bfa97653ac540e08759f812523c"; + hash = "sha256-DTIA3EP2RQtts6Hl6FThSxN1SwEUbRVJJig8zOUQRCo="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -371,12 +404,12 @@ }; fish = buildGrammar { language = "fish"; - version = "6675b56"; + version = "f917690"; src = fetchFromGitHub { owner = "ram02z"; repo = "tree-sitter-fish"; - rev = "6675b56266b3f615fb112205b6b83a79315309c4"; - hash = "sha256-hU2QMiNfO5/Drjl0QoUb9ERaK/3ETGaIsDBHMZ70n/A="; + rev = "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"; + hash = "sha256-nPWkKhhG5MvJPOJ5nhm7GXgjnWX71/Ay55rPW+uKu/s="; }; meta.homepage = "https://github.com/ram02z/tree-sitter-fish"; }; @@ -393,12 +426,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "edcb337"; + version = "67cf1c9"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7"; - hash = "sha256-xZfWtRHWy3MQtkzN9jSwx+sAwLlcRiVLTJjYXyWEIs8="; + rev = "67cf1c96fd0dd92edd7812a95626c86c9be0781a"; + hash = "sha256-OImEGuPlks3XfWSWXLekz5nSPJUHNS9uDm6ugrFPfdQ="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -413,6 +446,17 @@ }; meta.homepage = "https://github.com/mgramigna/tree-sitter-fsh"; }; + func = buildGrammar { + language = "func"; + version = "f161cfe"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-func"; + rev = "f161cfe22452b386eeeab29ba0d2c14893f1a31f"; + hash = "sha256-Swyg5EdBWVT6P9vgS7h/fmK0ySRwiFlynJEZT9I10qg="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-func"; + }; fusion = buildGrammar { language = "fusion"; version = "19db2f4"; @@ -426,23 +470,23 @@ }; gdscript = buildGrammar { language = "gdscript"; - version = "a8fa839"; + version = "31ebb7c"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; - rev = "a8fa839150d05baaf4d5a472520ee71e9b1d8b3c"; - hash = "sha256-uSpic8MKMvl1p7LOHNn5EJGp1iOYkeqcRt7skdROmBo="; + rev = "31ebb7cd0b880ea53a152eaf9d4df73f737181cc"; + hash = "sha256-9fP6Us3mDMjJFM1Kxg0KiulCvyVv5qdo8+tyRgzGxUw="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; git_rebase = buildGrammar { language = "git_rebase"; - version = "127f5b5"; + version = "d8a4207"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; - rev = "127f5b56c1ad3e8a449a7d6e0c7412ead7f7724c"; - hash = "sha256-4XGQTrflV+txVjXbgaQSd6rFES8TkuiXEurJLBdg59E="; + rev = "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"; + hash = "sha256-mbRu2+wZVf5Nk3XlFvLSBOUg2QqmCR2tqO7gLpOJ45k="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase"; }; @@ -459,12 +503,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "190d288"; + version = "f71b93f"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "190d288a1746bddb4abe96b597fb7d17b76e5522"; - hash = "sha256-PPdwdUfJ+2TCxVdEvexxGSBMDZmI1GW7eSfc/X3Me7Y="; + rev = "f71b93f399c9c2b315825827c95466e7405ec622"; + hash = "sha256-489Rbi75XbW/IuFLijFThsI+BNXqVY1tVALwMT6yie0="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -493,12 +537,12 @@ }; glimmer = buildGrammar { language = "glimmer"; - version = "c0bfd26"; + version = "40cfb72"; src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; - rev = "c0bfd260cdcbe2976f4633547c218f09f7222a89"; - hash = "sha256-Goj900MJxO44KYkzD0UpGFEGHAwr6qhe2bmCzpx5BhE="; + rev = "40cfb72a53654cbd666451ca04ffd500257c7b73"; + hash = "sha256-h9ZZz6mbkErLIG/BamNRRoRdqmuBO3v17W0uvmpbm7A="; }; meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; @@ -547,6 +591,17 @@ }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; + gosum = buildGrammar { + language = "gosum"; + version = "14da5c2"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-go-sum"; + rev = "14da5c2a34861eb2d97ed89f39324156031e8878"; + hash = "sha256-PP8uj8tFMIBZtFuOQbEi25Yz/UEy5cRiEklbrlS5J+Q="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-go-sum"; + }; gowork = buildGrammar { language = "gowork"; version = "949a8a4"; @@ -582,12 +637,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "aee3725"; + version = "3bdba07"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e"; - hash = "sha256-DmrrRht3g0hG+OsJCHRL+xW4jflLqtG57AuFf7zd26c="; + rev = "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3"; + hash = "sha256-/aGUdyVxXqXCvjruI8rqiKzfTsyxzOKaXSAUG5xK4cE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -615,12 +670,12 @@ }; help = buildGrammar { language = "help"; - version = "9dee68e"; + version = "8f75ef3"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "9dee68e3912d16e9878b06e3cd87e21ada3d9029"; - hash = "sha256-6XYEC+wKrCbPtcdjFH1O0EdX84M+NpPfTO2tXGFkwtk="; + rev = "8f75ef3ec86bc315d5fdb939899b397289389181"; + hash = "sha256-zzD899bOSVn0/RCki6i8wHEQgaIrCurRw4AxnN3J+VA="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -637,12 +692,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "bd0d463"; + version = "8e2f090"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "bd0d463d1380816240a8cb1fd747fc0d3fed24aa"; - hash = "sha256-0Dafbn0+8N1MBRyOhiaZBo7KZqm8YpFzg/ZwT3SLq+g="; + rev = "8e2f0907e8d2e17a88a375025e70054bafdaa8b0"; + hash = "sha256-kBSigaBR6uM4E9uHI79gYlxBrN0E5i1zTW8syMPIQdI="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -703,23 +758,23 @@ }; java = buildGrammar { language = "java"; - version = "09d650d"; + version = "dd597f1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e"; - hash = "sha256-tGBi6gJJIPpp6oOwmAQdqBD6eaJRBRcYbWtm1BHsgBA="; + rev = "dd597f13eb9bab0c1bccc9aec390e8e6ebf9e0a6"; + hash = "sha256-JeQZ4TMpt6Lfbcfc6m/PzhFZEgTdouasJ3b1sPISy2s="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "7a29d06"; + version = "15e85e8"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "7a29d06274b7cf87d643212a433d970b73969016"; - hash = "sha256-fMPCHdfHHyg7yNi9LDA35z+WFfPRbctrh38dZV5qZt4="; + rev = "15e85e80b851983fab6b12dce5a535f5a0df0f9c"; + hash = "sha256-2SAJBnY8pmynGqB8OVqHeeAKovskO+C/XiJbLTKSlcM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -780,34 +835,45 @@ }; jsonnet = buildGrammar { language = "jsonnet"; - version = "505f5bd"; + version = "fdc7757"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "tree-sitter-jsonnet"; - rev = "505f5bd90053ae895aa3d6f2bac8071dd9abd8b2"; - hash = "sha256-XZqywAzM+UCKto/OFn50hhRpEyFVLpFV7Q1Z0NKoPsI="; + rev = "fdc775714afa27fdef823adbaba6ab98f5ae66f2"; + hash = "sha256-KVpSB3LiC1qpF05Y1ScIglaXWIrAL+m7G4Q4/EVn0U8="; }; meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet"; }; julia = buildGrammar { language = "julia"; - version = "0412178"; + version = "e2f449e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "041217800bf423099015e1654c9a4fdd75310bb1"; - hash = "sha256-DwRU4yqnMFqMIh4mAo9a57SRXhOLTnWKjO6zSaczUNU="; + rev = "e2f449e2bcc95f1d07ceb62d67f986005f73a6be"; + hash = "sha256-ZXnEvHtheP8rI/lwPf94lVCF5S5rw38bewuZ0GHxjr8="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; + kdl = buildGrammar { + language = "kdl"; + version = "c3c4856"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-kdl"; + rev = "c3c4856464842e05366b1f3ebc4434c9194cad43"; + hash = "sha256-vYvyX9NWIFsWkxZvA5k32gFBh5Ykwgy0YrCBPAH6bcg="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-kdl"; + }; kotlin = buildGrammar { language = "kotlin"; - version = "b953dbd"; + version = "e463703"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28"; - hash = "sha256-xTbRn7bDN6FR9UOzw43RVHIahI/DFjwLGQj3cYoPurY="; + rev = "e4637037a5fe6f25fe66c305669faa0855f35692"; + hash = "sha256-Xoj9RJqtyNtwag5tXRfu5iJpTnajRk1g7ClflBbFZyI="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -835,12 +901,12 @@ }; ledger = buildGrammar { language = "ledger"; - version = "47b8971"; + version = "f787ae6"; src = fetchFromGitHub { owner = "cbarrete"; repo = "tree-sitter-ledger"; - rev = "47b8971448ce5e9abac865f450c1b14fb3b6eee9"; - hash = "sha256-Doz561oVrWkmUAL3VUTjraO+F0aDuahhBB+xXevTrkg="; + rev = "f787ae635ca79589faa25477b94291a87e2d3e23"; + hash = "sha256-9Sc22IYWhUUzCslna3mzePd7bRbtWDwiWKvAzLYubOQ="; }; meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger"; }; @@ -890,24 +956,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "16d0b5e"; + version = "7e7aa9a"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "16d0b5e54d781150bea1070ffb360d47e6238659"; - hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k="; + rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"; + hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "16d0b5e"; + version = "7e7aa9a"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "16d0b5e54d781150bea1070ffb360d47e6238659"; - hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k="; + rev = "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"; + hash = "sha256-KsE9oYzD+vVqgR35JdL0NmPfNGJqpC12sEsZVIs7NX0="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -947,12 +1013,12 @@ }; nickel = buildGrammar { language = "nickel"; - version = "092e901"; + version = "d6c7eeb"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "092e90142667482996880044d2c04837d3d1c266"; - hash = "sha256-y0Lx6HdkoC7rOzm8fOfLBUt6672qe7AHe1SI6YY/aHE="; + rev = "d6c7eeb751038f934b5b1aa7ff236376d0235c56"; + hash = "sha256-D/RRwXsWyHMxoU7Z8VVJ6jn7zUFKaKusLT/ofON7sOE="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; @@ -980,12 +1046,12 @@ }; norg = buildGrammar { language = "norg"; - version = "6348056"; + version = "1a30509"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "6348056b999f06c2c7f43bb0a5aa7cfde5302712"; - hash = "sha256-5g4K+pYpS0DyYShKAoBCe6PD1wEZ+bvYMuI+ZbNPgJI="; + rev = "1a305093569632de50f9a316ff843dcda25b4ef5"; + hash = "sha256-dfdykz5DnbuJvRdY3rYehzphIJgDl1efrsEgG2+BhvI="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; @@ -1060,12 +1126,12 @@ }; php = buildGrammar { language = "php"; - version = "973694f"; + version = "f860e59"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9"; - hash = "sha256-upJ8WwosOe4Xv/H9LUFVUVThLSLS+5Htr71Lyc/ZTJo="; + rev = "f860e598194f4a71747f91789bf536b393ad4a56"; + hash = "sha256-j4RJUBbp2zvCHsZwnz62t2Tf6Cy1LOKrhg/pi8cqzAs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1091,6 +1157,17 @@ }; meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm"; }; + poe_filter = buildGrammar { + language = "poe_filter"; + version = "80dc101"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-poe-filter"; + rev = "80dc10195e26c72598ed1ab02cdf2d8e4c792e7b"; + hash = "sha256-KDsi8eLrTnZaD9XwyF24edmBNHre3FoTiD7RE/MpvEQ="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter"; + }; prisma = buildGrammar { language = "prisma"; version = "eca2596"; @@ -1115,23 +1192,23 @@ }; pug = buildGrammar { language = "pug"; - version = "26f6ac8"; + version = "884e225"; src = fetchFromGitHub { owner = "zealot128"; repo = "tree-sitter-pug"; - rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f"; - hash = "sha256-KUIjt8p4B3LrU9vRQGL9Pf3ZYMfdDrazC2kNwTpRAgg="; + rev = "884e225b5ecca5d885ae627275f16ef648acd42e"; + hash = "sha256-qPfVSnsw9bDznq7rhzftGyv9cGi2OiF6DCh55Lxk8xA="; }; meta.homepage = "https://github.com/zealot128/tree-sitter-pug"; }; python = buildGrammar { language = "python"; - version = "9e53981"; + version = "528855e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "9e53981ec31b789ee26162ea335de71f02186003"; - hash = "sha256-D2++Xg7dRfjGM2r4cxaXGQnBOAX5JBREcEAJeNa7Y9M="; + rev = "528855eee2665210e1bf5556de48b8d8dacb8932"; + hash = "sha256-H2RWMbbKIMbfH/TMC5SKbO9qEB9RfFUOYrczwmDdrVo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1181,12 +1258,12 @@ }; racket = buildGrammar { language = "racket"; - version = "dc9c334"; + version = "1a5df02"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "dc9c33451fefc2d84d226e55c828adc8a66f2e37"; - hash = "sha256-ie64no94TtAWsSYaBXmic4oyRAA01fMl97+JWcFU1E8="; + rev = "1a5df0206b25a05cb1b35a68d2105fc7493df39b"; + hash = "sha256-cKRShvkpg6M8vxUvp5wKHvX9ZJOUyv7m2hNyfeKw/Bk="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1234,6 +1311,17 @@ }; meta.homepage = "https://github.com/bamonroe/tree-sitter-rnoweb"; }; + ron = buildGrammar { + language = "ron"; + version = "ce6086b"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-ron"; + rev = "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"; + hash = "sha256-4ZKhJ3qvKWwINQIWJLqgPwfnDvQBWzeZb2dZY7imYfc="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-ron"; + }; rst = buildGrammar { language = "rst"; version = "25e6328"; @@ -1247,12 +1335,12 @@ }; ruby = buildGrammar { language = "ruby"; - version = "7a1921b"; + version = "206c707"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "7a1921bcfd90e3a04c1ad011059087aaf0168dd4"; - hash = "sha256-niL8gqKv1Nq1z8y4c49amqkDo+FoIP3XEJz+dV2UmWo="; + rev = "206c7077164372c596ffa8eaadb9435c28941364"; + hash = "sha256-1kQ3RP2lJ0vwvVmKAQYNyPjltEKZLiZ4iI8iIxcRGd8="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; @@ -1269,12 +1357,12 @@ }; scala = buildGrammar { language = "scala"; - version = "067ee61"; + version = "2275b75"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "067ee61ff9484eac4f5bc4d57dfd007900c48f20"; - hash = "sha256-KyxlDQla/XTBHccJG+rTqN9EO90OElZd7y21f1HTibI="; + rev = "2275b754360de8539e02e84106fa38f7cb6de275"; + hash = "sha256-xc8/N2h9i7gZ+zPUzNpuwPg9++vZo8KvdOnjFF5YIo4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1313,14 +1401,25 @@ }; smali = buildGrammar { language = "smali"; - version = "d7f535e"; - src = fetchFromGitHub { - owner = "amaanq"; + version = "5a742af"; + src = fetchFromSourcehut { + owner = "~yotam"; repo = "tree-sitter-smali"; - rev = "d7f535e176c928d33b0e202dd808ac247cacf2ff"; - hash = "sha256-wSUHzQdpWtIXuqfFvqMNJPQjvdRZ29PBcwtMnyKwRR4="; + rev = "5a742af7388864a3ff2ce8421328a33e7246a2d5"; + hash = "sha256-8FpmeyGzaQDUWXs/XanNi1u0jHsKP9wq7y7XNaQIlXM="; + }; + meta.homepage = "https://git.sr.ht/~yotam/tree-sitter-smali"; + }; + smithy = buildGrammar { + language = "smithy"; + version = "cf8c7eb"; + src = fetchFromGitHub { + owner = "indoorvivants"; + repo = "tree-sitter-smithy"; + rev = "cf8c7eb9faf7c7049839585eac19c94af231e6a0"; + hash = "sha256-3cqT6+e0uqAtd92M55qSbza1eph8gklGlEGyO9R170w="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-smali"; + meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy"; }; solidity = buildGrammar { language = "solidity"; @@ -1346,12 +1445,12 @@ }; sql = buildGrammar { language = "sql"; - version = "9d98029"; + version = "3a3f92b"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "9d9802991aa1d1bc00eee7713a838dab1eb4f149"; - hash = "sha256-Iy5rqNZem1r++aI7vGITzBSFGjdDLGHFOgBWqIgKZX0="; + rev = "3a3f92b29c880488a08bc2baaf1aca6432ec3380"; + hash = "sha256-UdvsZOpnZsfWomKHBmtpHYDsgYZgIZvw2d+JNUphycs="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; @@ -1391,12 +1490,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0fe0de5"; + version = "0c32d29"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "0fe0de56b528cbf24a654c734ca181b48be3831d"; - hash = "sha256-tU6UTyTR5biS6qBG0z6NbjJQUtZItzzscAKftUAzLq0="; + rev = "0c32d2948b79939b6464d9ced40fca43912cd486"; + hash = "sha256-LyeK/fOQBO10blHCXYyGvmzk/U3uIj4tfjdH+p6aVs4="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1426,12 +1525,12 @@ }; teal = buildGrammar { language = "teal"; - version = "1ae8c68"; + version = "2158ecc"; src = fetchFromGitHub { owner = "euclidianAce"; repo = "tree-sitter-teal"; - rev = "1ae8c68e90523b26b93af56feb7868fe4214e2b2"; - hash = "sha256-IGSZurROJLOp1pRPLowHGO1Pu/ehieLKWgI+RCE7wLc="; + rev = "2158ecce11ea542f9b791baf2c7fb33798174ed2"; + hash = "sha256-Vofqs1AW5/a7kdPjY8+fu/t/mfBpaXiFFeG1Y0hsP6E="; }; generate = true; meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal"; @@ -1450,12 +1549,12 @@ }; thrift = buildGrammar { language = "thrift"; - version = "999a27d"; + version = "e0c3e50"; src = fetchFromGitHub { owner = "duskmoon314"; repo = "tree-sitter-thrift"; - rev = "999a27d87b8f90a74306d4e79c5e22db3ab61633"; - hash = "sha256-9aadAYFKeBv0gc4SHCYH+m77BB0c4qXpmg1mOeKp6mw="; + rev = "e0c3e50e17846230e88becdce28fbb1b41dcabba"; + hash = "sha256-yqdGQabEE1unk7Rel+E3/MRXTEOz9XxrBVH9nj+mm/Q="; }; meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; }; @@ -1472,12 +1571,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "d3ef05e"; + version = "6d2ec89"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "d3ef05eec4473094e2d691243aa243ce63de6406"; - hash = "sha256-k5O6VheS8RBrSNk/GBjP3Qun4wY8cbPXxEFU0tCKbuU="; + rev = "6d2ec894aef843fc89312c904e20c5f555aec4e3"; + hash = "sha256-5V4sMnjVsdSJdeYspxn0nYqq73lVHvz7eGRfD/orqo4="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -1505,12 +1604,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "faad909"; + version = "5d20856"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7"; - hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0="; + rev = "5d20856f34315b068c41edaee2ac8a100081d259"; + hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1539,24 +1638,24 @@ }; typescript = buildGrammar { language = "typescript"; - version = "faad909"; + version = "5d20856"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7"; - hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0="; + rev = "5d20856f34315b068c41edaee2ac8a100081d259"; + hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; v = buildGrammar { language = "v"; - version = "0b03983"; + version = "136f3a0"; src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "0b039830a33e759f0c9ee978b47ad10b82d37349"; - hash = "sha256-sQxq/tWNN/aWD3ZmNhil45cnjzfy/2AXn2X/NhzvnKk="; + rev = "136f3a0ad91ab8a781c2d4eb419df0a981839f69"; + hash = "sha256-zmbR2Of/XEJuGvNmXAJ+C4aAMem51LVS3e1rSqjaSb0="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; @@ -1585,23 +1684,23 @@ }; vhs = buildGrammar { language = "vhs"; - version = "8a0df32"; + version = "54fe7c0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; - rev = "8a0df32b72a8cf8d3e3e84f16c19e9ba46d3dba5"; - hash = "sha256-bWI/MW7U5ht7jmL3BSm5HwD1BMDNGwkBShJIpRlhonI="; + rev = "54fe7c05dfa2b9e100572496531e15c9bec86343"; + hash = "sha256-xP0pHuK0Gc8huTWaZY/DMfWzm6Jw/oVCx1huYL8Vwx4="; }; meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs"; }; vim = buildGrammar { language = "vim"; - version = "55ff1b0"; + version = "e39a7bb"; src = fetchFromGitHub { owner = "vigoux"; repo = "tree-sitter-viml"; - rev = "55ff1b080c09edeced9b748cf4c16d0b49d17fb9"; - hash = "sha256-bMh6RPP0+zpNkMS/mpbKTaug9EL6u4kTcztnEXaNGyA="; + rev = "e39a7bbcfdcfc7900629962b785c7e14503ae590"; + hash = "sha256-f3UAHwCL5yerEjmuDp+guzX4/ik4h7ProH5P8AmdO10="; }; meta.homepage = "https://github.com/vigoux/tree-sitter-viml"; }; @@ -1662,12 +1761,12 @@ }; zig = buildGrammar { language = "zig"; - version = "d90d38d"; + version = "6b3f578"; src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; - rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca"; - hash = "sha256-vdfXC9PUyv4YynfrKi7M708zFbNIV6AERBd63/EAp1A="; + rev = "6b3f5788f38be900b45f5af5a753bf6a37d614b8"; + hash = "sha256-KwMo1gwre8/AXkXXwQqPHZIEPXM26PK8SI0p3tmkt24="; }; meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d02431e8bfdfe..c21444afa003f 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -68,6 +68,9 @@ # nvim-treesitter dependencies , callPackage + # sg.nvim dependencies +, darwin + # sved dependencies , glib , gobject-introspection @@ -113,7 +116,7 @@ self: super: { - barbecue-nvim = super.vimshell-vim.overrideAttrs (old: { + barbecue-nvim = super.barbecue-nvim.overrideAttrs (old: { dependencies = with self; [ nvim-lspconfig nvim-navic nvim-web-devicons ]; meta = { description = "A VS Code like winbar for Neovim"; @@ -484,8 +487,8 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); - gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { - dependencies = with self; [ lush-nvim ]; + harpoon = super.harpoon.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; }); himalaya-vim = super.himalaya-vim.overrideAttrs (old: { @@ -506,6 +509,10 @@ self: super: { }; }); + jellybeans-nvim = super.jellybeans-nvim.overrideAttrs (old: { + dependencies = with self; [ lush-nvim ]; + }); + LanguageClient-neovim = let version = "0.1.161"; @@ -697,6 +704,10 @@ self: super: { callPackage ./nvim-treesitter/overrides.nix { } self super ); + nvim-ufo = super.nvim-ufo.overrideAttrs (old: { + dependencies = with self; [ promise-async ]; + }); + octo-nvim = super.octo-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim plenary-nvim ]; }); @@ -744,6 +755,34 @@ self: super: { ]; }); + sg-nvim = super.sg-nvim.overrideAttrs (old: + let + sg-nvim-rust = rustPlatform.buildRustPackage { + pname = "sg-nvim-rust"; + inherit (old) version src; + + cargoHash = "sha256-nm9muH4RC92HdUiytmcW0WNyMQJcIH6dgwjUrwcqq4I="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + cargoBuildFlags = [ "--workspace" ]; + + # tests are broken + doCheck = false; + }; + in + { + dependencies = with self; [ plenary-nvim ]; + postInstall = '' + mkdir -p $out/target/debug + ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug + ''; + }); + skim = buildVimPluginFrom2Nix { pname = "skim"; inherit (skim) version; @@ -910,6 +949,10 @@ self: super: { dependencies = with self; [ telescope-nvim ]; }); + telescope-undo-nvim = super.telescope-undo-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + }); + telescope-z-nvim = super.telescope-z-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; }); @@ -960,6 +1003,11 @@ self: super: { ''; }); + unison = super.unison.overrideAttrs (old: { + # Editor stuff isn't at top level + postPatch = "cd editor-support/vim"; + }); + vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: { # on linux can use either Zenity or Yad. propagatedBuildInputs = [ gnome.zenity ]; @@ -1052,7 +1100,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-v9RXW5RSPMotRVR/9ljBJ9VNbrLnSkU3zlEU79Xem28="; + cargoSha256 = "sha256-MR9n2+B2TUNnWxZhBbXZCBereLxYntBxLfx9g14vDUw="; }; in '' @@ -1162,7 +1210,7 @@ self: super: { hexokinase = buildGoModule { name = "hexokinase"; src = old.src + "/hexokinase"; - vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; }; in '' @@ -1304,6 +1352,15 @@ self: super: { dependencies = with self; [ vimproc-vim ]; }); + vim-trailing-whitespace = super.vim-trailing-whitespace.overrideAttrs (old: { + patches = [(fetchpatch { + # https://github.com/bronson/vim-trailing-whitespace/pull/30 + name = "fix-add-dynamic-TerminalOpen-for-both-vim-and-nvim.patch"; + url = "https://github.com/bronson/vim-trailing-whitespace/commit/99ef803ebdc01d62b418a3e9386d5f10797bfac3.patch"; + hash = "sha256-cyanHUKxhbY8c6EkAbpUq7QcEBQABCwZ6NoEUOpd2F8="; + })]; + }); + vim-zettel = super.vim-zettel.overrideAttrs (old: { dependencies = with self; [ vimwiki fzf-vim ]; }); diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 1cd0de9f12495..d4557f0e4d293 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -64,6 +64,7 @@ https://github.com/hotwatermorning/auto-git-diff/,, https://github.com/jiangmiao/auto-pairs/,, https://github.com/pocco81/auto-save.nvim/,HEAD, https://github.com/rmagatti/auto-session/,, +https://github.com/m4xshen/autoclose.nvim/,HEAD, https://github.com/vim-scripts/autoload_cscope.vim/,, https://github.com/rafi/awesome-vim-colorschemes/,, https://github.com/ayu-theme/ayu-vim/,, @@ -284,6 +285,7 @@ https://github.com/gregsexton/gitv/,, https://github.com/DNLHC/glance.nvim/,HEAD, https://github.com/gleam-lang/gleam.vim/,, https://github.com/ellisonleao/glow.nvim/,, +https://github.com/ray-x/go.nvim/,HEAD, https://github.com/p00f/godbolt.nvim/,HEAD, https://github.com/roman/golden-ratio/,, https://github.com/buoto/gotests-vim/,, @@ -305,6 +307,7 @@ https://github.com/MrcJkb/haskell-tools.nvim/,HEAD, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, +https://github.com/rebelot/heirline.nvim/,, https://github.com/Yggdroot/hiPairs/,, https://git.sr.ht/~soywod/himalaya-vim,, https://github.com/mpickering/hlint-refactor-vim/,, @@ -323,6 +326,7 @@ https://github.com/nishigori/increment-activator/,, https://github.com/haya14busa/incsearch-easymotion.vim/,, https://github.com/haya14busa/incsearch.vim/,, https://github.com/lukas-reineke/indent-blankline.nvim/,, +https://github.com/Darazaki/indent-o-matic/,, https://github.com/Yggdroot/indentLine/,, https://github.com/ciaranm/inkpot/,, https://github.com/jbyuki/instant.nvim/,HEAD, @@ -439,6 +443,7 @@ https://github.com/folke/neoconf.nvim/,HEAD, https://github.com/KeitaNakamura/neodark.vim/,, https://github.com/folke/neodev.nvim/,HEAD, https://github.com/sbdchd/neoformat/,, +https://github.com/danymat/neogen/,HEAD, https://github.com/TimUntersberger/neogit/,, https://github.com/Shougo/neoinclude.vim/,, https://github.com/neomake/neomake/,, @@ -468,6 +473,7 @@ 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, https://github.com/arcticicestudio/nord-vim/,, https://github.com/shaunsingh/nord.nvim/,, @@ -478,6 +484,7 @@ https://github.com/jose-elias-alvarez/null-ls.nvim/,, https://github.com/nacro90/numb.nvim/,, https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,, https://github.com/catppuccin/nvim/,,catppuccin-nvim +https://github.com/AckslD/nvim-FeMaco.lua/,HEAD, https://github.com/nathanmsmith/nvim-ale-diagnostic/,, https://github.com/windwp/nvim-autopairs/,, https://github.com/RRethy/nvim-base16/,, @@ -525,6 +532,8 @@ https://github.com/smiteshp/nvim-navic/,HEAD, https://github.com/AckslD/nvim-neoclip.lua/,, https://github.com/yamatsum/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, +https://github.com/LhKipp/nvim-nu/,HEAD, +https://github.com/ojroques/nvim-osc52/,, https://github.com/gennaro-tedesco/nvim-peekup/,, https://github.com/olrtg/nvim-rename-state/,HEAD, https://github.com/petertriho/nvim-scrollbar/,HEAD, @@ -545,6 +554,7 @@ 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/kyazdani42/nvim-web-devicons/,, https://github.com/AckslD/nvim-whichkey-setup.lua/,, https://github.com/roxma/nvim-yarp/,, @@ -572,6 +582,7 @@ https://github.com/NLKNguyen/papercolor-theme/,, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, https://github.com/andsild/peskcolor.vim/,, +https://github.com/pest-parser/pest.vim/,HEAD, https://github.com/lifepillar/pgsql.vim/,, https://github.com/motus/pig.vim/,, https://github.com/aklt/plantuml-syntax/,, @@ -584,6 +595,7 @@ https://github.com/andweeb/presence.nvim/,, https://github.com/sotte/presenting.vim/,, https://github.com/vim-scripts/prev_indent/,, https://github.com/ahmedkhalf/project.nvim/,, +https://github.com/kevinhwang91/promise-async/,HEAD, https://github.com/frigoeu/psc-ide-vim/,, https://github.com/purescript-contrib/purescript-vim/,, https://github.com/python-mode/python-mode/,, @@ -622,11 +634,13 @@ https://github.com/megaannum/self/,, https://github.com/jaxbot/semantic-highlight.vim/,, https://github.com/numirias/semshi/,, https://github.com/junegunn/seoul256.vim/,, +https://github.com/tjdevries/sg.nvim/,HEAD, https://github.com/osyo-manga/shabadou.vim/,, https://github.com/AndrewRadev/sideways.vim/,, https://github.com/lotabout/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, https://github.com/kovisoft/slimv/,, +https://github.com/mrjones2014/smart-splits.nvim/,, https://github.com/gorkunov/smartpairs.vim/,, https://github.com/camspiers/snap/,, https://github.com/norcalli/snippets.nvim/,, @@ -691,6 +705,7 @@ https://github.com/nvim-telescope/telescope-project.nvim/,, https://github.com/nvim-telescope/telescope-symbols.nvim/,, https://github.com/nvim-telescope/telescope-ui-select.nvim/,, https://github.com/fhill2/telescope-ultisnips.nvim/,, +https://github.com/debugloop/telescope-undo.nvim/,HEAD, https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,, https://github.com/nvim-telescope/telescope-z.nvim/,, https://github.com/jvgrootveld/telescope-zoxide/,, @@ -707,6 +722,7 @@ https://github.com/johmsalas/text-case.nvim/,HEAD, https://github.com/ron89/thesaurus_query.vim/,, https://github.com/itchyny/thumbnail.vim/,, https://github.com/vim-scripts/timestamp.vim/,, +https://github.com/levouh/tint.nvim/,HEAD, https://github.com/tomtom/tlib_vim/,, https://github.com/wellle/tmux-complete.vim/,, https://github.com/edkolev/tmuxline.vim/,, @@ -729,6 +745,7 @@ https://github.com/leafgarland/typescript-vim/,, https://github.com/SirVer/ultisnips/,, https://github.com/mbbill/undotree/,, https://github.com/chrisbra/unicode.vim/,, +https://github.com/unisonweb/unison/,, https://github.com/Shougo/unite.vim/,, https://github.com/axieax/urlview.nvim/,, https://github.com/vim-scripts/utl.vim/,, @@ -1047,6 +1064,8 @@ https://github.com/tpope/vim-sleuth/,, https://github.com/jpalardy/vim-slime/,, https://github.com/mzlogin/vim-smali/,, https://github.com/t9md/vim-smalls/,, +https://github.com/Industrial/vim-smartbd/,HEAD, +https://github.com/Industrial/vim-smartbw/,HEAD, https://github.com/psliwka/vim-smoothie/,, https://github.com/bohlender/vim-smt2/,, https://github.com/justinmk/vim-sneak/,, @@ -1101,11 +1120,13 @@ https://github.com/hashivim/vim-vagrant/,, https://github.com/tpope/vim-vinegar/,, https://github.com/triglav/vim-visual-increment/,, https://github.com/mg979/vim-visual-multi/,, +https://github.com/bronson/vim-visual-star-search/,HEAD, https://github.com/thinca/vim-visualstar/,, https://github.com/ngemily/vim-vp4/,HEAD, https://github.com/hrsh7th/vim-vsnip/,, https://github.com/hrsh7th/vim-vsnip-integ/,, https://github.com/posva/vim-vue/,, +https://github.com/leafOfTree/vim-vue-plugin/,HEAD, https://github.com/wakatime/vim-wakatime/,, https://github.com/osyo-manga/vim-watchdogs/,, https://github.com/jasonccox/vim-wayland-clipboard/,, diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 4235aa5e929e0..44ad9295e2849 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -317,8 +317,8 @@ rec { lib.warnIf (wrapManual != null) '' vim.customize: wrapManual is deprecated: the manual is now included by default if `name == "vim"`. ${if wrapManual == true && name != "vim" then "Set `standalone = false` to include the manual." - else if wrapManual == false && name == "vim" then "Set `standalone = true` to get the *vim wrappers only." - else ""}'' + else lib.optionalString (wrapManual == false && name == "vim") "Set `standalone = true` to get the *vim wrappers only." + }'' lib.warnIf (wrapGui != null) "vim.customize: wrapGui is deprecated: gvim is now automatically included if present" lib.throwIfNot (vimExecutableName == null && gvimExecutableName == null) @@ -330,7 +330,7 @@ rec { else throw "at least one of vimrcConfig and vimrcFile must be specified"; bin = runCommand "${name}-bin" { nativeBuildInputs = [ makeWrapper ]; } '' vimrc=${lib.escapeShellArg vimrc} - gvimrc=${if gvimrcFile != null then lib.escapeShellArg gvimrcFile else ""} + gvimrc=${lib.optionalString (gvimrcFile != null) (lib.escapeShellArg gvimrcFile)} mkdir -p "$out/bin" for exe in ${ @@ -363,7 +363,7 @@ rec { vimGenDocHook = callPackage ({ vim }: makeSetupHook { name = "vim-gen-doc-hook"; - deps = [ vim ]; + propagatedBuildInputs = [ vim ]; substitutions = { vimBinary = "${vim}/bin/vim"; inherit rtpPath; @@ -373,7 +373,7 @@ rec { vimCommandCheckHook = callPackage ({ neovim-unwrapped }: makeSetupHook { name = "vim-command-check-hook"; - deps = [ neovim-unwrapped ]; + propagatedBuildInputs = [ neovim-unwrapped ]; substitutions = { vimBinary = "${neovim-unwrapped}/bin/nvim"; inherit rtpPath; @@ -383,7 +383,7 @@ rec { neovimRequireCheckHook = callPackage ({ neovim-unwrapped }: makeSetupHook { name = "neovim-require-check-hook"; - deps = [ neovim-unwrapped ]; + propagatedBuildInputs = [ neovim-unwrapped ]; substitutions = { nvimBinary = "${neovim-unwrapped}/bin/nvim"; inherit rtpPath; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2db88fa26f9fe..739b0b687fbd2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -546,8 +546,8 @@ let mktplcRef = { name = "markdown-mermaid"; publisher = "bierner"; - version = "1.14.2"; - sha256 = "RZyAY2d3imnLhm1mLur+wTx/quxrNWYR9PCjC+co1FE="; + version = "1.17.4"; + sha256 = "sha256-jJnALJJc8G4/0L7WMmKSZ7I+7Usmyj+WhufBdSzcEK0="; }; meta = with lib; { license = licenses.mit; @@ -624,8 +624,8 @@ let mktplcRef = { name = "catppuccin-vsc"; publisher = "catppuccin"; - version = "2.2.1"; - sha256 = "sha256-vS+hz3RxG71F5QoO4LQOgOgFh6GQ8QX/+4mMD0KC1kA="; + version = "2.5.0"; + sha256 = "sha256-+dM6MKIjzPdYoRe1DYJ08A+nHHlkTsm+I6CYmnmSRj4="; }; meta = with lib; { description = "Soothing pastel theme for VSCode"; @@ -927,8 +927,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "2022.12.604"; - sha256 = "sha256-yfqGITviASp5ZDEJA+zyVz1LpPWV4FM/4fU4eq52Xng="; + version = "2023.2.2804"; + sha256 = "sha256-3jQ0CpAGrPLQPpwZx2u3ylfOwy6cBu7WLr0w3h8IM2Y="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -1307,8 +1307,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.56.7152"; - sha256 = "sha256-9WEvTcVY/yMF00GJVj4h57aWhfBYTSatbw10DjjAaAM="; + version = "1.70.8099"; + sha256 = "sha256-+jlLM9UC1DZFBrtiiri4jvpuc/Rf9PcSVP8D8pmQC2s="; }; meta = with lib; { description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; @@ -1351,8 +1351,8 @@ let mktplcRef = { name = "Go"; publisher = "golang"; - version = "0.33.1"; - sha256 = "0dsjxs04dchw1dbzf45ryhxsb5xhalqwy40xw6cngxkp69lhf91g"; + version = "0.37.1"; + sha256 = "sha256-xOiMVUkcgwkMjYfNzFB3Qhfg26jf5nssaTfw0U+sAX0="; }; meta = { license = lib.licenses.mit; @@ -1375,8 +1375,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.220"; - sha256 = "06kzb4msfdv11lij4dwbn1vxdxhvnpfcjqw0gvydgkqjy7dridjk"; + version = "0.0.224"; + sha256 = "sha256-ObFmzAaOlbtWC31JRYR/1y+JK1h22SVDPPRWWqPzrQs="; }; meta = with lib; { license = licenses.mit; @@ -1504,8 +1504,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "9.4.4"; - sha256 = "sha256-EA3OABn80GciNecXwLcorWP7K3+jI+wgujpmvvFcNOA="; + version = "9.7.0"; + sha256 = "sha256-Y1KoCOoOJ8CZ3IReDoyzF404CBy1BAWaZSr48EP7bz4="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; @@ -1520,8 +1520,8 @@ let mktplcRef = { name = "gruvbox"; publisher = "jdinhlife"; - version = "1.5.1"; - sha256 = "sha256-0ghB0E+Wa9W2bNFFiH2Q3pUJ9HV5+JfKohX4cRyevC8="; + version = "1.8.0"; + sha256 = "sha256-P4FbbcRcKWbnC86TSnzQaGn2gHWkDM9I4hj4GiHNPS4="; }; meta = with lib; { description = "Gruvbox Theme"; @@ -1555,8 +1555,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.23"; - sha256 = "11f1g4a8v8330ki4240bvg5zpydagg1dwqfh1sar9ds7p1795ims"; + version = "1.5.0"; + sha256 = "sha256-anIZxqO4pK77FmhUamRnJVN2q8FifH6ffqRE2eFwyWM="; }; meta = with lib; { license = licenses.mit; @@ -1741,6 +1741,23 @@ let meta.license = lib.licenses.mit; }; + matthewpi.caddyfile-support = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "caddyfile-support"; + publisher = "matthewpi"; + version = "0.2.4"; + sha256 = "sha256-7D7fNlI55MxD6M8ml/dzBAMwCGCEkC+9aKhreZCVMv4="; + }; + meta = { + description = "Rich Caddyfile support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=matthewpi.caddyfile-support"; + homepage = "https://github.com/caddyserver/vscode-caddyfile"; + changelog = "https://marketplace.visualstudio.com/items/matthewpi.caddyfile-support/changelog"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ matthewpi ]; + }; + }; + mattn.lisp = buildVscodeMarketplaceExtension { mktplcRef = { name = "lisp"; @@ -1790,8 +1807,8 @@ let mktplcRef = { name = "marp-vscode"; publisher = "marp-team"; - version = "1.5.0"; - sha256 = "0wqsj8rp58vl3nafkjvyw394h5j4jd7d24ra6hkvfpnlzrgv4yhs"; + version = "2.4.1"; + sha256 = "sha256-h59OmFreja9IdFzH2zZaXXh+pnODirL2fPkUmvAgDyA="; }; meta = { license = lib.licenses.mit; @@ -1865,8 +1882,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.22.2"; - sha256 = "13scns5iazzsjx8rli311ym2z8i8f4nvbcd5w8hqj5z0rzsds6xi"; + version = "1.23.3"; + sha256 = "sha256-0qflugzWA1pV0PVWGTzOjdxM/0G8hTLOozoXCAdQnRY="; }; meta = { license = lib.licenses.mit; @@ -1929,8 +1946,8 @@ let mktplcRef = { name = "PowerShell"; publisher = "ms-vscode"; - version = "2022.11.0"; - sha256 = "01pq84rqh2q6rd0ljfql37q6i1kg597qy0mr7fiz5ddi15zcfn19"; + version = "2023.1.0"; + sha256 = "sha256-OiVb88BGvzsPTzKU1rGLGSMQSwKV4zI9FthOmutz34U="; }; meta = with lib; { description = "A Visual Studio Code extension for PowerShell language support"; @@ -2146,8 +2163,8 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "1.14.2022120303"; - sha256 = "sha256-tlWb2rkDcEWgdpuidkBGN5Nxr3pmkYxnPJN/UdbQfEw="; + version = "1.15.2023021403"; + sha256 = "sha256-g56+nproGC8zHidyf1Tqz0kbJrmrkgOsDA5jqaZULas="; }; buildInputs = [ jdk ]; meta = { @@ -2226,8 +2243,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.22.0"; - sha256 = "0irrivfidgjqfd205gh27r2ccj2anvqgvq7lfaaf92wrrc2zvlsk"; + version = "4.24.0"; + sha256 = "sha256-hJy+ymnlF9a2vvN/HhJ5N75lIc2afzkq+S0Cv/KnD3M="; }; meta = { license = lib.licenses.mit; @@ -2580,8 +2597,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.14.0"; - sha256 = "sha256-DvcQ0wNmWqmMen7jYVP0tCDz/wdzBb56An+OaD3d4xA="; + version = "2.18.0"; + sha256 = "sha256-HwexlpPW15sXoxPQXDHWcQ8Yvz/5KMtZO4A34rXoXQ8="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -2737,8 +2754,8 @@ let mktplcRef = { name = "pdf"; publisher = "tomoki1207"; - version = "1.2.0"; - sha256 = "1bcj546bp0w4yndd0qxwr8grhiwjd1jvf33jgmpm0j96y34vcszz"; + version = "1.2.2"; + sha256 = "sha256-i3Rlizbw4RtPkiEsodRJEB3AUzoqI95ohyqZ0ksROps="; }; meta = { description = "Show PDF preview in VSCode"; @@ -2941,8 +2958,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.24.1"; - sha256 = "00gq6mqqwqipc6d7di2x9mmi1lya11vhkkww9563avchavczb9sv"; + version = "1.24.3"; + sha256 = "sha256-4fPoRBttWVE8Z3e4O6Yrkf04iOu9ElspQFP57HOPVAk="; }; meta = { license = lib.licenses.mit; @@ -3089,6 +3106,22 @@ let }; }; + zhwu95.riscv = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "riscv"; + publisher = "zhwu95"; + version = "0.0.8"; + sha256 = "sha256-PXaHSEXoN0ZboHIoDg37tZ+Gv6xFXP4wGBS3YS/53TY="; + }; + meta = with lib; { + description = "Basic RISC-V colorization and snippets support."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=zhwu95.riscv"; + homepage = "https://github.com/zhuanhao-wu/vscode-riscv-support"; + license = licenses.mit; + maintainers = [ maintainers.CardboardTurkey ]; + }; + }; + zxh404.vscode-proto3 = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-proto3"; diff --git a/pkgs/applications/editors/vscode/extensions/lua/default.nix b/pkgs/applications/editors/vscode/extensions/lua/default.nix index 529428de6702f..6c9c72ca60942 100644 --- a/pkgs/applications/editors/vscode/extensions/lua/default.nix +++ b/pkgs/applications/editors/vscode/extensions/lua/default.nix @@ -1,6 +1,6 @@ { lib , vscode-utils -, sumneko-lua-language-server +, lua-language-server }: vscode-utils.buildVscodeMarketplaceExtension { @@ -14,7 +14,7 @@ vscode-utils.buildVscodeMarketplaceExtension { patches = [ ./remove-chmod.patch ]; postInstall = '' - ln -sf ${sumneko-lua-language-server}/bin/lua-language-server \ + ln -sf ${lua-language-server}/bin/lua-language-server \ $out/$installPrefix/server/bin/lua-language-server ''; 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 e713ba29e84bd..7089f9e3d39dc 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix @@ -1,14 +1,11 @@ { lib, vscode-utils, jq, moreutils }: -let - inherit (vscode-utils) buildVscodeMarketplaceExtension; - -in buildVscodeMarketplaceExtension { +vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2022.11.1003381023"; - sha256 = "0cbnr52pq0yw6i4yzyrifyrz186l482m9s01h4l7d74fby9ska8h"; + version = "2023.2.1000411022"; + sha256 = "sha256-gMK/t/rLXYN3rlHxxVeW0W/FWEP0ZCiEwzM8DY14vYg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/python/default.nix index f7765e6ceb1a6..0a62a5b02daad 100644 --- a/pkgs/applications/editors/vscode/extensions/python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/python/default.nix @@ -12,6 +12,7 @@ , curl , coreutils , gnused +, jq , nix }: @@ -19,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2022.19.13351014"; - sha256 = "1562f4b0v76p1wfbljc5zydq7aq7k5hshxzm2v1whb77cjskiw8s"; + version = "2023.1.10091012"; + sha256 = "sha256-JosFv6ngJmw1XRILwTZMVxlGIdWFLFQjj4olfnVwAIM="; }; buildInputs = [ icu ]; @@ -29,7 +30,6 @@ vscode-utils.buildVscodeMarketplaceExtension rec { propagatedBuildInputs = with python3.pkgs; [ debugpy - isort jedi-language-server ]; @@ -57,14 +57,16 @@ vscode-utils.buildVscodeMarketplaceExtension rec { curl coreutils gnused + jq nix ]} api=$(curl -s 'https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery' \ -H 'accept: application/json;api-version=3.0-preview.1' \ -H 'content-type: application/json' \ - --data-raw '{"filters":[{"criteria":[{"filterType":7,"value":"${mktplcRef.publisher}.${mktplcRef.name}"}]}],"flags":512}') - version=$(echo $api | sed -n -E 's|^.*"version":"([0-9.]+)".*$|\1|p') + --data-raw '{"filters":[{"criteria":[{"filterType":7,"value":"${mktplcRef.publisher}.${mktplcRef.name}"}]}],"flags":16}') + # Find the latest version compatible with stable vscode version + version=$(echo $api | jq -r '.results[0].extensions[0].versions | map(select(has("properties"))) | map(select(.properties | map(select(.key == "Microsoft.VisualStudio.Code.Engine")) | .[0].value | test("\\^[0-9.]+$"))) | .[0].version') if [[ $version != ${mktplcRef.version} ]]; then tmp=$(mktemp) diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 6559bc370baff..eff075c493983 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -19,13 +19,14 @@ let dontPatchELF ? true, dontStrip ? true, nativeBuildInputs ? [], + passthru ? { }, ... }: stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { name = "vscode-extension-${name}"; - passthru = { + passthru = passthru // { inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId; }; diff --git a/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix index 7c58a4bdfb342..818cca51772a8 100644 --- a/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix +++ b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix @@ -25,8 +25,7 @@ }: let mutableExtensionsFilePath = toString mutableExtensionsFile; - mutableExtensions = if builtins.pathExists mutableExtensionsFile - then import mutableExtensionsFilePath else []; + mutableExtensions = lib.optionals builtins.pathExists mutableExtensionsFile (import mutableExtensionsFilePath); vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { inherit lib writeShellScriptBin extensionsFromVscodeMarketplace; vscodeDefault = vscode; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 1b4f4508fbf0b..c2036566b3844 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -135,6 +135,9 @@ let # this fixes bundled ripgrep chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg + + # see https://github.com/gentoo/gentoo/commit/4da5959 + chmod +x resources/app/node_modules/node-pty/build/Release/spawn-helper ''; inherit meta; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1d684f3ee3f3b..9fde08c747aa8 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "192csxsvxdnizdi2jnh0w243h54cb4r99y4p9mnck813bnlcplf5"; - x86_64-darwin = "0l5n7ba3gd7f73dag52ccd26076a37jvr5a3npyd0078nby0d5n4"; - aarch64-linux = "073czaap96ddchmsdx7wjqfm68pgimwrngmy2rfgj4b7a0iw3jg6"; - aarch64-darwin = "1nl3xpjw4ci0z0g7jx5z3v9j6l4vka5w1ijsf2qvrwa27pp8n6hk"; - armv7l-linux = "10vcmicrk19qi8l01hkvxlay8gqk5qlkx0kpax0blkk91cifqzg7"; + x86_64-linux = "0661qkcljxdpi5f6cyfqr8vyf87p94amzdspcg8hjrz18j1adb0h"; + x86_64-darwin = "0781ad52vcqgam3iprm56kvcv5v12pba0i5spazr5zssnn3w3ym0"; + aarch64-linux = "0fwl12yngq3z2f18hp43q7nmnjdikly05q9rar9vcjc63h2pzfc5"; + aarch64-darwin = "1nldkg14zvk6nc72l50w4lv9k490vn34ms6z9x2b9zkx15d09v7x"; + armv7l-linux = "0mhriqi6hzn7wwfzl98dvcghkpkfa4rbbxvmyvzzc5ycgbs6r1mx"; }.${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.74.3"; + version = "1.75.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; @@ -42,6 +42,9 @@ in inherit sha256; }; + # We don't test vscode on CI, instead we test vscodium + tests = {}; + sourceRoot = ""; updateScript = ./update-vscode.sh; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 08219714061d4..cd89ab7d783d2 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 = "0mm6xa0kizgg2f6cql6jk8h83pn89h6q7rrs1kypvj3j0x6ysqsg"; - x86_64-darwin = "1g9syvinj2mx292wrnrdn2znqhg17mrjqij0z1ilag5bi4xmzhcj"; - aarch64-linux = "0xbq6fla0lxan08jgmsva91cbcv8rhzd7mqixrm1lsqh4h0wpssz"; - aarch64-darwin = "1b4a56j256rib1997g9wwiak206axkppl124qg021vyab42x8rim"; - armv7l-linux = "0gb96hi854kyh8694j9mbgl78f4y68czkwmjxhzb054l5b4adjla"; + x86_64-linux = "1qayw19mb7f0gcgcvl57gpacrqsyx2jvc6s63vzbx8jmf5qnk71a"; + x86_64-darwin = "02z9026kp66lx6pll46xx790jj7c7wh2ca7xim373x90k8hm4kwz"; + aarch64-linux = "1izqhzvv46p05k1z2yg380ddwmar4w2pbrd0dyvkdysvp166y931"; + aarch64-darwin = "1zcr653ssck4nc3vf04l6bilnjdsiqscw62g1wzbyk6s50133cx8"; + armv7l-linux = "0n914rcfn2m9zsbnkd82cmw88qbpssv6jk3g8ig3wqlircbgrw0h"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.74.3.23010"; + version = "1.75.0.23033"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 09bc1793818a6..b5e524ea529e1 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1503"; + version = "1504"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-tRS01z2SnWTDDUfQxZTWiagQuIULDA4aQ8390ZFBqn0="; + sha256 = "sha256-EUDkuCMhBz/Gs4DW3V6fqU583MzqXy1r08WDnUN76cw="; }; installPhase = '' diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/applications/emulators/box64/default.nix index 404ece153b1c0..12c13bb9ae87d 100644 --- a/pkgs/applications/emulators/box64/default.nix +++ b/pkgs/applications/emulators/box64/default.nix @@ -5,8 +5,15 @@ , gitUpdater , cmake , python3 +, withDynarec ? stdenv.hostPlatform.isAarch64 +, runCommand +, hello-x86_64 +, box64 }: +# Currently only supported on ARM +assert withDynarec -> stdenv.hostPlatform.isAarch64; + stdenv.mkDerivation rec { pname = "box64"; version = "0.2.0"; @@ -33,49 +40,57 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DNOGIT=1" - ] ++ ( - if stdenv.hostPlatform.system == "aarch64-linux" then - [ - "-DARM_DYNAREC=ON" - ] - else [ - "-DLD80BITS=1" - "-DNOALIGN=1" - ] - ); + "-DNOGIT=ON" + "-DARM_DYNAREC=${if withDynarec then "ON" else "OFF"}" + "-DRV64=${if stdenv.hostPlatform.isRiscV64 then "ON" else "OFF"}" + "-DPPC64LE=${if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then "ON" else "OFF"}" + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + "-DLD80BITS=ON" + "-DNOALIGN=ON" + ]; installPhase = '' runHook preInstall + install -Dm 0755 box64 "$out/bin/box64" + runHook postInstall ''; doCheck = true; - checkPhase = '' - runHook preCheck - ctest - runHook postCheck - ''; - doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck + + echo Checking if it works $out/bin/box64 -v + + echo Checking if Dynarec option was respected + $out/bin/box64 -v | grep ${lib.optionalString (!withDynarec) "-v"} Dynarec + runHook postInstallCheck ''; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + }; + tests.hello = runCommand "box64-test-hello" { + nativeBuildInputs = [ box64 hello-x86_64 ]; + } '' + # There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to + # tell what problems the emulator has run into. + BOX64_NOBANNER=0 BOX64_LOG=1 box64 ${hello-x86_64}/bin/hello --version | tee $out + ''; }; meta = with lib; { homepage = "https://box86.org/"; description = "Lets you run x86_64 Linux programs on non-x86_64 Linux systems"; license = licenses.mit; - maintainers = with maintainers; [ gador ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ gador OPNA2608 ]; + platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" ]; }; } diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index 36d2dfe1ff332..9914e6e691c3d 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { "-C desktop-ui" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14"; meta = with lib; { homepage = "https://ares-emu.net"; diff --git a/pkgs/applications/emulators/c64-debugger/default.nix b/pkgs/applications/emulators/c64-debugger/default.nix new file mode 100644 index 0000000000000..b7c357ca2709a --- /dev/null +++ b/pkgs/applications/emulators/c64-debugger/default.nix @@ -0,0 +1,101 @@ +{ lib +, stdenv +, fetchgit +, alsa-lib +, gtk3 +, libGL +, libGLU +, libX11 +, pkg-config +, upx +, xcbutil +}: + +stdenv.mkDerivation { + name = "c64-debugger"; + version = "0.64.58.6"; + + src = fetchgit { + url = "https://git.code.sf.net/p/c64-debugger/code"; + rev = "f97772e3f5c8b4fa99e8ed212ed1c4cb1e2389f1"; + sha256 = "sha256-3SR73AHQlYSEYpJLtQ/aJ1UITZGq7aA9tQKxBsn/yuc="; + }; + + buildInputs = [ + alsa-lib + gtk3 + libGL + libGLU + pkg-config + libX11 + xcbutil + ]; + + nativeBuildInputs = [ + upx + ]; + + postPatch = '' + # Disable default definition of RUN_COMMODORE64 + sed -i 's|^#define RUN_COMMODORE64|//#define RUN_COMMODORE64|' MTEngine/Games/c64/C64D_Version.h + ''; + + buildPhase = '' + runHook preBuild + + # Build C64 debugger + make -C MTEngine \ + CFLAGS="-w -O2 -fcommon" \ + CXXFLAGS="-w -O2 --std=c++11" \ + DEFINES="-DRUN_COMMODORE64" \ + -j$NIX_BUILD_CORES + mv MTEngine/c64debugger c64debugger + make -C MTEngine clean + + # Build 65XE debugger + make -C MTEngine \ + CFLAGS="-w -O2 -fcommon" \ + CXXFLAGS="-w -O2 --std=c++11" \ + DEFINES="-DRUN_ATARI" \ + -j$NIX_BUILD_CORES + mv MTEngine/c64debugger 65xedebugger + make -C MTEngine clean + + # Build NES debugger + make -C MTEngine \ + CFLAGS="-w -O2 -fcommon" \ + CXXFLAGS="-w -O2 --std=c++11" \ + DEFINES="-DRUN_NES" \ + -j$NIX_BUILD_CORES + mv MTEngine/c64debugger nesdebugger + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -d "$out/bin" + install -d "$out/share/doc" + install -m 755 c64debugger 65xedebugger nesdebugger "$out/bin" + install -m 644 MTEngine/Assets/*.txt "$out/share/doc" + install -m 644 MTEngine/Assets/*.pdf "$out/share/doc" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://sourceforge.net/projects/c64-debugger"; + description = "Commodore 64, Atari XL/XE and NES code and memory debugger that works in real time"; + license = with licenses; [ + gpl3Only # c64-debugger + mit # MTEngine + # emulators included in c64-debugger + gpl2Plus # VICE, atari800 + gpl2 # nestopiaue + ]; + mainProgram = "c64debugger"; + maintainers = [ maintainers.detegr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index f8e585501289a..91f6cb0de1a60 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-22"; + version = "2.0-26"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-ZQfJHQnT5mV6GC3dO6QV1fGsnyZMYqXiVdBSsimL5yU="; + hash = "sha256-+y+PJE2biRvuxIwrFVMjmkZyD8/zhHVMw6vzNKlsOZE="; }; patches = [ diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index d2668c473a628..202d49c19add5 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -14,29 +14,30 @@ }: let + version = "2.7.3"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; - rev = "v2.6.6"; - sha256 = "cCXH1GTRqJQ57/6sWIxik366YBx/ii3nzQwx4YpEh1w="; + rev = "v${version}"; + sha256 = "sha256-lMqYfSA3sI7+glRE+eUf03uLfbf7lipmoqgt74FUaJQ="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; - rev = "v2.6.6"; - sha256 = "VzIqvf83k121DxuH5zgZfFS9smipDonyqqhVgj2kgYw="; + rev = "v${version}"; + sha256 = "sha256-t76Yltx7vHNoAAFvNpYLKuwFja4On6M20upmG6w3C1M="; }; in stdenv.mkDerivation rec { pname = "craftos-pc"; - version = "2.6.6"; + inherit version; src = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - sha256 = "9lpAWYFli3/OBfmu2dQxKi+/TaHaBQNpZsCURvl0h/E="; + sha256 = "sha256-a7oMLfjZUkEWPjxDDywlSW4qLhcQrCXPPY2BEOgiafU="; }; buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { homepage = "https://www.craftos-pc.cc"; license = with licenses; [ mit free ]; platforms = platforms.linux; - maintainers = [ maintainers.siraben ]; + maintainers = with maintainers; [ siraben tomodachi94 ]; mainProgram = "craftos"; }; } diff --git a/pkgs/applications/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix index 2b3deaba653b0..63ebe07202870 100644 --- a/pkgs/applications/emulators/desmume/default.nix +++ b/pkgs/applications/emulators/desmume/default.nix @@ -6,6 +6,7 @@ , agg , alsa-lib , desktop-file-utils +, wrapGAppsHook , gtk3 , intltool , libGLU @@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + wrapGAppsHook desktop-file-utils intltool libtool diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index ad9c470bf4279..b9ef4682e87d9 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -1,126 +1,190 @@ -{ stdenv -, lib -, fetchpatch -, pkg-config +{ lib +, stdenv +, fetchFromGitHub , cmake +, pkg-config +, wrapQtAppsHook +, alsa-lib , bluez +, bzip2 +, cubeb +, curl +, enet , ffmpeg -, libao -, gtk3 -, glib -, libGLU +, fmt_8 +, hidapi +, libevdev , libGL -, gettext -, libpthreadstubs -, libXrandr -, libXext -, readline -, openal -, libXdmcp -, portaudio -, fetchFromGitHub +, libiconv +, libpulseaudio +, libspng , libusb1 -, libevdev -, wxGTK30 -, soundtouch -, miniupnpc +, libXdmcp +, libXext +, libXrandr , mbedtls_2 -, curl -, lzo +, mgba +, miniupnpc +, minizip-ng +, openal +, pugixml +, qtbase , sfml -, libpulseaudio ? null +, soundtouch +, udev +, vulkan-loader +, xxHash +, xz + + # Used in passthru +, common-updater-scripts +, dolphin-emu +, jq +, testers +, writeShellScript + + # Darwin-only dependencies +, CoreBluetooth +, ForceFeedback +, IOKit +, moltenvk +, OpenGL +, VideoToolbox }: stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0"; + version = "5.0-18498"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = version; - sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6"; + rev = "46b99671d9158e0ca840c1d8ef249db0f321ced7"; + sha256 = "sha256-K+OF8o8I1XDLQQcsWC8p8jUuWeb+RoHlBG3cEZ1aWIU="; + fetchSubmodules = true; }; - patches = [ - # Fix FTBFS with glibc 2.26 - (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/02_glibc-2.26.patch"; - name = "02_glibc-2.26.patch"; - sha256 = "sha256-LBXT3rf5klwmX9YQXt4/iv06GghsWZprNhLGYlKiDqk="; - }) - # Fix FTBFS with GCC 8 - (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/03_gcc8.patch"; - name = "03_gcc8.patch"; - sha256 = "sha256-uWP6zMjoHYbX6K+oPSQdBn2xWQpvNyhZabMkhtYrSbU="; - }) - # Fix FTBFS with SoundTouch 2.1.2 - (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/05_soundtouch-2.1.2.patch"; - name = "05_soundtouch-2.1.2.patch"; - sha256 = "sha256-Y7CNM6GQC9GRhlOBLZlxkIpj1CFhIwA5L8lGXur/bwY="; - }) - # Use GTK+3 wxWidgets backend - (fetchpatch { - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/06_gtk3.patch"; - name = "06_gtk3.patch"; - sha256 = "sha256-pu5Q0+8kNwmpf2DoXCXHFqxF0EGTnFXJipkBz1Vh2cs="; - }) - ]; - - cmakeFlags = [ - "-DENABLE_LTO=True" - ]; - nativeBuildInputs = [ - pkg-config cmake + pkg-config + wrapQtAppsHook ]; buildInputs = [ - bluez + bzip2 + cubeb + curl + enet ffmpeg - libao - libGLU + fmt_8 + hidapi libGL - gtk3 - glib - gettext - libpthreadstubs - libXrandr - libXext - readline - openal - libevdev - libXdmcp - portaudio + libiconv libpulseaudio - libevdev - libXdmcp - portaudio + libspng libusb1 - libpulseaudio - wxGTK30 - soundtouch - miniupnpc + libXdmcp mbedtls_2 - curl - lzo + miniupnpc + minizip-ng + openal + pugixml + qtbase sfml + soundtouch + xxHash + xz + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + bluez + libevdev + libXext + libXrandr + mgba # Derivation doesn't support Darwin + udev + vulkan-loader + ] ++ lib.optionals stdenv.isDarwin [ + CoreBluetooth + ForceFeedback + IOKit + moltenvk + OpenGL + VideoToolbox + ]; + + cmakeFlags = [ + "-DDISTRIBUTOR=NixOS" + "-DUSE_SHARED_ENET=ON" + "-DDOLPHIN_WC_REVISION=${src.rev}" + "-DDOLPHIN_WC_DESCRIBE=${version}" + "-DDOLPHIN_WC_BRANCH=master" + ] ++ lib.optionals stdenv.isDarwin [ + "-DOSX_USE_DEFAULT_SEARCH_PATH=True" + "-DUSE_BUNDLED_MOLTENVK=OFF" + # Bundles the application folder into a standalone executable, so we cannot devendor libraries + "-DSKIP_POSTPROCESS_BUNDLE=ON" + # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. + # Note: The updater isn't available on linux, so we dont need to disable it there. + "-DENABLE_AUTOUPDATE=OFF" + ]; + + qtWrapperArgs = lib.optionals stdenv.isLinux [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" + # https://bugs.dolphin-emu.org/issues/11807 + # The .desktop file should already set this, but Dolphin may be launched in other ways + "--set QT_QPA_PLATFORM xcb" ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + + # Use nix-provided libraries instead of submodules + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace "if(NOT APPLE)" "if(true)" \ + --replace "if(LIBUSB_FOUND AND NOT APPLE)" "if(LIBUSB_FOUND)" + ''; + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Only gets installed automatically if the standalone executable is used + mkdir -p $out/Applications + cp -r ./Binaries/Dolphin.app $out/Applications + ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin ''; + passthru = { + tests.version = testers.testVersion { + package = dolphin-emu; + command = "dolphin-emu-nogui --version"; + }; + + updateScript = writeShellScript "dolphin-update-script" '' + set -eou pipefail + export PATH=${lib.makeBinPath [ curl jq common-updater-scripts ]} + + json="$(curl -s https://dolphin-emu.org/update/latest/beta)" + version="$(jq -r '.shortrev' <<< "$json")" + rev="$(jq -r '.hash' <<< "$json")" + update-source-version dolphin-emu "$version" --rev="$rev" + ''; + }; + meta = with lib; { - homepage = "https://dolphin-emu.org/"; + homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; + mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu"; + branch = "master"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ashkitten ]; - # x86_32 is an unsupported platform. - # Enable generic build if you really want a JIT-less binary. - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = platforms.unix; + maintainers = with maintainers; [ + MP2E + ashkitten + xfix + ivar + ]; + # Requires both LLVM and SDK bump + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix deleted file mode 100644 index 7f68b58214953..0000000000000 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ /dev/null @@ -1,196 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, wrapQtAppsHook -, qtbase -, bluez -, ffmpeg -, libGL -, libXrandr -, libusb1 -, libXdmcp -, libXext -, openal -, udev -, libevdev -, cubeb -, curl -, alsa-lib -, miniupnpc -, enet -, mbedtls_2 -, soundtouch -, sfml -, minizip-ng -, xz -, hidapi -, fmt_8 -, vulkan-loader -, libpulseaudio -, bzip2 -, libiconv -, pugixml -, xxHash - - # Used in passthru -, testers -, dolphin-emu-beta -, writeShellScript -, common-updater-scripts -, jq - - # Darwin-only dependencies -, CoreBluetooth -, ForceFeedback -, IOKit -, VideoToolbox -, OpenGL -, libpng -, moltenvk -}: - -stdenv.mkDerivation rec { - pname = "dolphin-emu"; - version = "5.0-17995"; - - src = fetchFromGitHub { - owner = "dolphin-emu"; - repo = "dolphin"; - rev = "8bad821019721b9b72701b495da95656ace5fea5"; - sha256 = "sha256-uxHzn+tXRBr11OPpZ4ELBw7DTJH4mnqUBOeyPlXNAh8="; - fetchSubmodules = true; - }; - - patches = [ - # On x86_64-darwin CMake reportedly does not work without this in some cases. - # See https://github.com/NixOS/nixpkgs/pull/190373#issuecomment-1241310765 - ./minizip-external-missing-include.patch - ]; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - cubeb - curl - ffmpeg - pugixml - xxHash - libGL - libpulseaudio - openal - libusb1 - libiconv - libpng - libXdmcp - hidapi - miniupnpc - enet - mbedtls_2 - soundtouch - sfml - minizip-ng - xz - qtbase - fmt_8 - bzip2 - ] ++ lib.optionals stdenv.isLinux [ - libXrandr - libXext - bluez - udev - libevdev - alsa-lib - vulkan-loader - ] ++ lib.optionals stdenv.isDarwin [ - CoreBluetooth - OpenGL - ForceFeedback - IOKit - VideoToolbox - moltenvk - ]; - - cmakeFlags = [ - "-DDISTRIBUTOR=NixOS" - "-DUSE_SHARED_ENET=ON" - "-DDOLPHIN_WC_REVISION=${src.rev}" - "-DDOLPHIN_WC_DESCRIBE=${version}" - "-DDOLPHIN_WC_BRANCH=master" - ] ++ lib.optionals stdenv.isDarwin [ - "-DOSX_USE_DEFAULT_SEARCH_PATH=True" - "-DUSE_BUNDLED_MOLTENVK=OFF" - # Bundles the application folder into a standalone executable, so we cannot devendor libraries - "-DSKIP_POSTPROCESS_BUNDLE=ON" - # Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways. - # Note: The updater isn't available on linux, so we dont need to disable it there. - "-DENABLE_AUTOUPDATE=OFF" - ]; - - qtWrapperArgs = lib.optionals stdenv.isLinux [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" - # https://bugs.dolphin-emu.org/issues/11807 - # The .desktop file should already set this, but Dolphin may be launched in other ways - "--set QT_QPA_PLATFORM xcb" - # https://bugs.dolphin-emu.org/issues/12913 - "--set QT_XCB_NO_XI2 1" - ]; - - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - - # Use nix-provided libraries instead of submodules - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace CMakeLists.txt \ - --replace "if(NOT APPLE)" "if(true)" \ - --replace "if(LIBUSB_FOUND AND NOT APPLE)" "if(LIBUSB_FOUND)" - ''; - - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Only gets installed automatically if the standalone executable is used - mkdir -p $out/Applications - cp -r ./Binaries/Dolphin.app $out/Applications - ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin - ''; - - passthru = { - tests.version = testers.testVersion { - package = dolphin-emu-beta; - command = "dolphin-emu-nogui --version"; - }; - - updateScript = writeShellScript "dolphin-update-script" '' - set -eou pipefail - export PATH=${lib.makeBinPath [ curl jq common-updater-scripts ]} - - json="$(curl -s https://dolphin-emu.org/update/latest/beta)" - version="$(jq -r '.shortrev' <<< "$json")" - rev="$(jq -r '.hash' <<< "$json")" - update-source-version dolphin-emu-beta "$version" --rev="$rev" - ''; - }; - - meta = with lib; { - homepage = "https://dolphin-emu.org"; - description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; - mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu"; - branch = "master"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ - MP2E - ashkitten - xfix - ivar - ]; - # Requires both LLVM and SDK bump - broken = stdenv.isDarwin && stdenv.isx86_64; - }; -} diff --git a/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch b/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch deleted file mode 100644 index 7da013ecd8f69..0000000000000 --- a/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 5e0cb8066fb1653399c54e93e42375295c2562bd -Author: Ivar Scholten <ivar.scholten@protonmail.com> -Date: Fri Sep 9 14:27:55 2022 +0200 - - Externals/minizip: add missing include to CheckFunctionExists - -diff --git a/Externals/minizip/CMakeLists.txt b/Externals/minizip/CMakeLists.txt -index c3d7c5512e..f59f8b295c 100644 ---- a/Externals/minizip/CMakeLists.txt -+++ b/Externals/minizip/CMakeLists.txt -@@ -60,6 +60,7 @@ if (HAVE_INTTYPES_H) - target_compile_definitions(minizip PRIVATE HAVE_INTTYPES_H) - endif() - -+include(CheckFunctionExists) - check_function_exists(fseeko HAVE_FSEEKO) - if (NOT HAVE_FSEEKO) - target_compile_definitions(minizip PRIVATE NO_FSEEKO) diff --git a/pkgs/applications/emulators/dosbox-staging/default.nix b/pkgs/applications/emulators/dosbox-staging/default.nix index c1820646dc62c..baa283d1178e2 100644 --- a/pkgs/applications/emulators/dosbox-staging/default.nix +++ b/pkgs/applications/emulators/dosbox-staging/default.nix @@ -1,39 +1,42 @@ -{ lib -, stdenv -, fetchFromGitHub -, SDL2 -, SDL2_net -, alsa-lib +{ alsa-lib , copyDesktopItems +, fetchFromGitHub , fluidsynth +, glib , gtest +, lib , libGL , libGLU +, libjack2 +, libmt32emu , libogg , libpng +, libpulseaudio , libslirp +, libsndfile , makeDesktopItem , makeWrapper , meson -, libmt32emu , ninja , opusfile , pkg-config -, libpulseaudio -, glib -, libjack2 -, libsndfile +, irr1 +, SDL2 +, SDL2_image +, SDL2_net +, speexdsp +, stdenv }: stdenv.mkDerivation rec { pname = "dosbox-staging"; - version = "0.78.1"; + version = "0.80.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-gozFZcJorZtbEK0joksig6qWmAMy03hmBHiyJMONfpk="; + hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc="; }; nativeBuildInputs = [ @@ -46,11 +49,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - SDL2 - SDL2_net alsa-lib fluidsynth glib + irr1 libGL libGLU libjack2 @@ -61,11 +63,16 @@ stdenv.mkDerivation rec { libslirp libsndfile opusfile + SDL2 + SDL2_image + SDL2_net + speexdsp ]; - NIX_CFLAGS_COMPILE = [ - "-I${SDL2_net}/include/SDL2" - ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-I${SDL2_image}/include/SDL2" + "-I${SDL2_net}/include/SDL2" + ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/applications/emulators/flycast/default.nix index b597abc7b0693..f1874d62fba45 100644 --- a/pkgs/applications/emulators/flycast/default.nix +++ b/pkgs/applications/emulators/flycast/default.nix @@ -5,25 +5,36 @@ , pkg-config , makeWrapper , alsa-lib -, libX11 +, curl +, egl-wayland +, libao +, libdecor , libevdev -, udev +, libffi +, libGL , libpulseaudio -, SDL2 +, libX11 +, libXext +, libxkbcommon , libzip +, mesa , miniupnpc +, udev +, vulkan-headers , vulkan-loader +, wayland +, zlib }: stdenv.mkDerivation rec { pname = "flycast"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "v${version}"; - sha256 = "sha256-vSyLg2lAJBV7crKVbGRbi1PUuCwHF9GB/8pjMTlaigA="; + rev = "V${version}"; + sha256 = "sha256-PRInOqg9OpaUVLwSj1lOxDtjpVaYehkRsp0jLrVKPyY="; fetchSubmodules = true; }; @@ -35,13 +46,24 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib - libX11 + curl + egl-wayland + libao + libdecor libevdev - udev + libffi + libGL libpulseaudio - SDL2 + libX11 + libXext + libxkbcommon libzip + mesa # for libgbm miniupnpc + udev + vulkan-headers + wayland + zlib ]; postFixup = '' diff --git a/pkgs/applications/emulators/gens-gs/default.nix b/pkgs/applications/emulators/gens-gs/default.nix index 0fbd12fc36511..66c4eb8ada23a 100644 --- a/pkgs/applications/emulators/gens-gs/default.nix +++ b/pkgs/applications/emulators/gens-gs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # Work around build failures on recent GTK. # See http://ubuntuforums.org/showthread.php?p=10535837 - NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; + env.NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; meta = with lib; { homepage = "https://segaretro.org/Gens/GS"; diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 084bf07454298..ac5f0f5ce0346 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -39,14 +39,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.251"; + version = "0.252"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-x+QV4gunnERBHyYB2fXJ2LvMv437Z2omvk+fYkmZfqA="; + hash = "sha256-snef00pTbukiLQp8eAMfuIqNV3l0wP1+KlpFnS3iKFg="; }; outputs = [ "out" "tools" ]; @@ -117,6 +117,10 @@ stdenv.mkDerivation rec { --subst-var-by mamePath "$out/opt/mame" ''; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=use-after-free" + ]; + desktopItems = [ (makeDesktopItem { name = "MAME"; diff --git a/pkgs/applications/emulators/np2kai/default.nix b/pkgs/applications/emulators/np2kai/default.nix index 4e2f01ade369a..4a0ed1d519f9d 100644 --- a/pkgs/applications/emulators/np2kai/default.nix +++ b/pkgs/applications/emulators/np2kai/default.nix @@ -157,7 +157,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # TODO Remove when bumping past rev22 - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; buildPhase = optionalString enableSDL '' cd sdl2 diff --git a/pkgs/applications/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix index 1c0fba3df1c56..88a058865ead8 100644 --- a/pkgs/applications/emulators/pcsxr/default.nix +++ b/pkgs/applications/emulators/pcsxr/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: AboutDlg.o:/build/pcsxr/gui/Linux.h:42: multiple definition of `cfgfile'; # LnxMain.o:/build/pcsxr/gui/Linux.h:42: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; dynarecTarget = if stdenv.isx86_64 then "x86_64" diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index b300dc08268ae..7713c145948cd 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -7,94 +7,96 @@ , ffmpeg , glew , libffi +, libsForQt5 , libzip , makeDesktopItem , makeWrapper , pkg-config , python3 -, qtbase ? null -, qtmultimedia ? null , snappy , vulkan-loader , wayland -, wrapQtAppsHook ? null , zlib +, enableQt ? false , enableVulkan ? true , forceWayland ? false }: let - enableQt = (qtbase != null); - frontend = if enableQt then "Qt" else "SDL and headless"; - vulkanPath = lib.makeLibraryPath [ vulkan-loader ]; - # experimental, see https://github.com/hrydgard/ppsspp/issues/13845 vulkanWayland = enableVulkan && forceWayland; + inherit (libsForQt5) qtbase qtmultimedia wrapQtAppsHook; in - # Only SDL front end needs to specify whether to use Wayland - assert forceWayland -> !enableQt; - stdenv.mkDerivation (finalAttrs: { - pname = "ppsspp" - + lib.optionalString enableQt "-qt" - + lib.optionalString (!enableQt) "-sdl" - + lib.optionalString forceWayland "-wayland"; - version = "1.14.4"; +# Only SDL frontend needs to specify whether to use Wayland +assert forceWayland -> !enableQt; +stdenv.mkDerivation (self: { + pname = "ppsspp" + + lib.optionalString enableQt "-qt" + + lib.optionalString (!enableQt) "-sdl" + + lib.optionalString forceWayland "-wayland"; + version = "1.14.4"; - src = fetchFromGitHub { - owner = "hrydgard"; - repo = "ppsspp"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc="; - }; + src = fetchFromGitHub { + owner = "hrydgard"; + repo = "ppsspp"; + rev = "v${self.version}"; + fetchSubmodules = true; + sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc="; + }; - postPatch = '' - substituteInPlace git-version.cmake --replace unknown ${finalAttrs.src.rev} - substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share - ''; + postPatch = '' + substituteInPlace git-version.cmake --replace unknown ${self.src.rev} + substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share + ''; - nativeBuildInputs = [ - cmake - copyDesktopItems - makeWrapper - pkg-config - python3 - wrapQtAppsHook - ]; + nativeBuildInputs = [ + cmake + copyDesktopItems + makeWrapper + pkg-config + python3 + ] ++ lib.optional enableQt wrapQtAppsHook; - buildInputs = [ - SDL2 - ffmpeg - (glew.override { enableEGL = forceWayland; }) - libzip - qtbase - qtmultimedia - snappy - zlib - ] ++ lib.optional enableVulkan vulkan-loader - ++ lib.optionals vulkanWayland [ wayland libffi ]; + buildInputs = [ + SDL2 + ffmpeg + (glew.override { enableEGL = forceWayland; }) + libzip + snappy + zlib + ] ++ lib.optionals enableQt [ + qtbase + qtmultimedia + ] ++ lib.optional enableVulkan vulkan-loader + ++ lib.optionals vulkanWayland [ wayland libffi ]; - cmakeFlags = [ - "-DHEADLESS=${if enableQt then "OFF" else "ON"}" - "-DOpenGL_GL_PREFERENCE=GLVND" - "-DUSE_SYSTEM_FFMPEG=ON" - "-DUSE_SYSTEM_LIBZIP=ON" - "-DUSE_SYSTEM_SNAPPY=ON" - "-DUSE_WAYLAND_WSI=${if vulkanWayland then "ON" else "OFF"}" - "-DUSING_QT_UI=${if enableQt then "ON" else "OFF"}" - ]; + cmakeFlags = [ + "-DHEADLESS=${if enableQt then "OFF" else "ON"}" + "-DOpenGL_GL_PREFERENCE=GLVND" + "-DUSE_SYSTEM_FFMPEG=ON" + "-DUSE_SYSTEM_LIBZIP=ON" + "-DUSE_SYSTEM_SNAPPY=ON" + "-DUSE_WAYLAND_WSI=${if vulkanWayland then "ON" else "OFF"}" + "-DUSING_QT_UI=${if enableQt then "ON" else "OFF"}" + ]; - desktopItems = [(makeDesktopItem { + desktopItems = [ + (makeDesktopItem { desktopName = "PPSSPP"; name = "ppsspp"; exec = "ppsspp"; icon = "ppsspp"; comment = "Play PSP games on your computer"; categories = [ "Game" "Emulator" ]; - })]; + }) + ]; - installPhase = '' + installPhase = let + vulkanPath = lib.makeLibraryPath [ vulkan-loader ]; + in + '' runHook preInstall + mkdir -p $out/share/{applications,ppsspp} '' + (if enableQt then '' install -Dm555 PPSSPPQt $out/bin/ppsspp @@ -108,14 +110,16 @@ in --prefix LD_LIBRARY_PATH : ${vulkanPath} \ '' + "\n" + '' mv assets $out/share/ppsspp + runHook postInstall ''; - meta = with lib; { - homepage = "https://www.ppsspp.org/"; - description = "A HLE Playstation Portable emulator, written in C++ (${frontend})"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; - }) + meta = { + homepage = "https://www.ppsspp.org/"; + description = "A HLE Playstation Portable emulator, written in C++ (" + + (if enableQt then "Qt" else "SDL + headless") + ")"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/emulators/punes/default.nix b/pkgs/applications/emulators/punes/default.nix index b68b70c0ac440..529dce536430b 100644 --- a/pkgs/applications/emulators/punes/default.nix +++ b/pkgs/applications/emulators/punes/default.nix @@ -1,13 +1,8 @@ -{ mkDerivation -, stdenv +{ stdenv , lib , fetchFromGitHub , fetchpatch -, nix-update-script -, qtbase -, qtsvg -, qttools -, autoreconfHook +, gitUpdater , cmake , pkg-config , ffmpeg @@ -16,41 +11,63 @@ , libX11 , libXrandr , sndio +, qtbase +, qtsvg +, qttools +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "punes"; - version = "0.109"; + version = "0.110"; src = fetchFromGitHub { owner = "punesemu"; repo = "puNES"; rev = "v${version}"; - sha256 = "sha256-6aRtR/d8nhzmpN9QKSZ62jye7qjfO+FpRMCXkX4Yubk="; + sha256 = "sha256-+hL168r40aYUjyLbWFXWk9G2srrrG1TH1gLYMliHftU="; }; - postPatch = '' - substituteInPlace configure.ac \ - --replace '`$PKG_CONFIG --variable=host_bins Qt5Core`/lrelease' '${qttools.dev}/bin/lrelease' - ''; - - nativeBuildInputs = [ autoreconfHook cmake pkg-config qttools ]; - - buildInputs = [ ffmpeg qtbase qtsvg libGLU ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libX11 libXrandr ] - ++ lib.optionals stdenv.hostPlatform.isBSD [ sndio ]; + patches = [ + # Fixes compilation on aarch64 + # Remove when version > 0.110 + (fetchpatch { + url = "https://github.com/punesemu/puNES/commit/90dd5bc90412bbd199c2716f67a24aa88b24d80f.patch"; + hash = "sha256-/KNpTds4qjwyaTUebWWPlVXfuxVh6M4zOInxUfYztJg="; + }) + ]; - dontUseCmakeConfigure = true; + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; - enableParallelBuilding = true; + buildInputs = [ + ffmpeg + libGLU + qtbase + qtsvg + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libX11 + libXrandr + ] ++ lib.optionals stdenv.hostPlatform.isBSD [ + sndio + ]; - configureFlags = [ - "--prefix=${placeholder "out"}" - "--without-opengl-nvidia-cg" - "--with-ffmpeg" + cmakeFlags = [ + "-DENABLE_GIT_INFO=OFF" + "-DENABLE_RELEASE=ON" + "-DENABLE_FFMPEG=ON" + "-DENABLE_OPENGL=ON" + "-DENABLE_QT6_LIBS=${if lib.versionAtLeast qtbase.version "6.0" then "ON" else "OFF"}" ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; meta = with lib; { description = "Qt-based Nintendo Entertainment System emulator and NSF/NSFe Music Player"; diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index c72ff4929b22e..ed6b75ad406a3 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -734,6 +734,7 @@ in picodrive = mkLibretroCore { core = "picodrive"; + version = "unstable-2023-02-15"; dontConfigure = true; makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; meta = { diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index e4198184edc2f..08c65a7dbff2a 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -352,8 +352,8 @@ "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "62873cab5366999207c197e9f55987daee10be4a", - "sha256": "YErmanNczeh6BeanCGllwOoTjXO+9At8l/o4UhIek4o=", + "rev": "b2d43acfbc288038749d8a8fdfbcb0474568e043", + "sha256": "kDSQgF8G/IpZ9NkSwuOjFSkirkum7foRT01qIbNJmJI=", "fetchSubmodules": true }, "play": { diff --git a/pkgs/applications/emulators/rpcemu/default.nix b/pkgs/applications/emulators/rpcemu/default.nix new file mode 100644 index 0000000000000..9befb172fe4bc --- /dev/null +++ b/pkgs/applications/emulators/rpcemu/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchhg +, qt5 +}: + +let + inherit (qt5) qtbase qtmultimedia wrapQtAppsHook; +in +stdenv.mkDerivation (self: { + pname = "rpcemu"; + version = "0.9.4"; + + src = fetchhg { + url = "http://www.home.marutan.net/hg/rpcemu"; + rev = "release_${self.version}"; + sha256 = "sha256-UyjfTfUpSvJNFPkQWPKppxp/kO0hVGo5cE9RuCU8GJI="; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtmultimedia + ]; + + configurePhase = '' + runHook preConfigure + + cd src/qt5 + qmake + + runHook postConfigure + ''; + + installPhase = '' + runHook preInstall + + cd ../.. + install -Dm755 rpcemu-interpreter -t $out/bin + + runHook postInstall + ''; + + meta = { + homepage = "https://www.marutan.net/rpcemu/index.php"; + description = "Risc PC Emulator"; + longDescription = '' + RPCEmu is an emulator of classic Acorn computer systems, such as the Risc + PC and A7000. It runs on multiple platforms including Windows, Linux and + Mac OS X. + + RPCEmu should be considered Alpha Quality code. It has many known and + unknown bugs, and all files used with it should be well backed up before + using them with RPCEmu. + ''; + license = lib.licenses.gpl2Plus; + maintainers = builtins.attrValues { + inherit (lib.maintainers) AndersonTorres; + }; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 93d7a58e3cf4d..f6aa0f9c526a4 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -1,4 +1,4 @@ -{ gcc11Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git +{ gcc12Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git , qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng , ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers , sdl2Support ? true, SDL2 @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14599-d3183708e"; - rpcs3Version = "0.0.26-14599-d3183708e"; - rpcs3Revision = "d3183708e81ba2707d39829cc1c0cb226dd9e50e"; - rpcs3Sha256 = "0lx9v614r9afmfknw9qdwawwayg3z0fj6chbhnfghm2j2zgqqbpi"; + rpcs3GitVersion = "14757-3388c8ed0"; + rpcs3Version = "0.0.26-14757-3388c8ed0"; + rpcs3Revision = "3388c8ed090afb216f40c1d00361c6f6f1e7a9ba"; + rpcs3Sha256 = "0w2qsk91dxp0lxy6bdz4yyf79wqfnzyxswrg1kxwm0s7iwwch2pj"; ittapi = fetchFromGitHub { owner = "intel"; @@ -21,7 +21,7 @@ let sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz"; }; in -gcc11Stdenv.mkDerivation { +gcc12Stdenv.mkDerivation { pname = "rpcs3"; version = rpcs3Version; @@ -82,6 +82,6 @@ gcc11Stdenv.mkDerivation { homepage = "https://rpcs3.net/"; maintainers = with maintainers; [ abbradar neonfuz ilian zane ]; license = licenses.gpl2Only; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/emulators/simh/default.nix b/pkgs/applications/emulators/simh/default.nix index 6f3409ec0637d..b0cae68ed2180 100644 --- a/pkgs/applications/emulators/simh/default.nix +++ b/pkgs/applications/emulators/simh/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # Workaround to build against upstream gcc-10 and clang-11. # Can be removed when next release contains # https://github.com/simh/simh/issues/794 - NIX_CFLAGS_COMPILE = [ "-fcommon" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-fcommon" ]; makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; diff --git a/pkgs/applications/emulators/tilem/default.nix b/pkgs/applications/emulators/tilem/default.nix index bde706e23040d..c9ba0067ee746 100644 --- a/pkgs/applications/emulators/tilem/default.nix +++ b/pkgs/applications/emulators/tilem/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 libticonv libtifiles2 libticables2 libticalcs2 ]; - NIX_CFLAGS_COMPILE = [ "-lm" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-lm" ]; meta = with lib; { homepage = "http://lpg.ticalc.org/prj_tilem/"; description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators"; diff --git a/pkgs/applications/emulators/uae/default.nix b/pkgs/applications/emulators/uae/default.nix index aeceb0dc6f841..105729f628298 100644 --- a/pkgs/applications/emulators/uae/default.nix +++ b/pkgs/applications/emulators/uae/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: bsdsocket.o:(.bss+0x0): multiple definition of # `socketbases'; main.o:(.bss+0x2792c0): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; LDFLAGS = [ "-lm" ]; meta = { diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index ae38f5d3326fd..ed9e24a910f61 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -4,7 +4,6 @@ autoconf, hexdump, perl, nixosTests, supportFlags, patches, - vkd3dArches, moltenvk, buildScript ? null, configureFlags ? [], mainProgram ? "wine" }: @@ -71,7 +70,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional cupsSupport pkgs.cups ++ lib.optional gettextSupport pkgs.gettext ++ lib.optional dbusSupport pkgs.dbus - ++ lib.optional openalSupport pkgs.openal ++ lib.optional cairoSupport pkgs.cairo ++ lib.optional odbcSupport pkgs.unixODBC ++ lib.optional netapiSupport pkgs.samba4 @@ -82,7 +80,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional saneSupport pkgs.sane-backends ++ lib.optional gphoto2Support pkgs.libgphoto2 ++ lib.optional krb5Support pkgs.libkrb5 - ++ lib.optional ldapSupport pkgs.openldap ++ lib.optional fontconfigSupport pkgs.fontconfig ++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio @@ -91,7 +88,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader) ++ lib.optional sdlSupport pkgs.SDL2 ++ lib.optional usbSupport pkgs.libusb1 - ++ vkd3dArches ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav (gst-plugins-bad.override { enableZbar = false; }) ]) @@ -101,7 +97,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security - ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon + ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon ]) ++ lib.optionals (stdenv.isLinux && !waylandSupport) (with pkgs.xorg; [ libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 37953f73c5dcf..d3b285f36d78d 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -18,7 +18,6 @@ gstreamerSupport ? false, cupsSupport ? false, dbusSupport ? false, - openalSupport ? false, openclSupport ? false, cairoSupport ? false, odbcSupport ? false, @@ -30,13 +29,11 @@ saneSupport ? false, gphoto2Support ? false, krb5Support ? false, - ldapSupport ? false, pulseaudioSupport ? false, udevSupport ? false, xineramaSupport ? false, vulkanSupport ? false, sdlSupport ? false, - vkd3dSupport ? false, usbSupport ? false, mingwSupport ? wineRelease != "stable", waylandSupport ? wineRelease == "wayland", @@ -49,12 +46,12 @@ let wine-build = build: release: wineRelease = release; supportFlags = { inherit - cupsSupport gettextSupport dbusSupport openalSupport cairoSupport + cupsSupport gettextSupport dbusSupport cairoSupport odbcSupport netapiSupport cursesSupport vaSupport pcapSupport - v4lSupport saneSupport gphoto2Support krb5Support ldapSupport fontconfigSupport + v4lSupport saneSupport gphoto2Support krb5Support fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport - sdlSupport usbSupport vkd3dSupport mingwSupport waylandSupport embedInstallers; + sdlSupport usbSupport mingwSupport waylandSupport embedInstallers; }; inherit moltenvk; }); diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index 3b5aa19658ceb..2672e75580cbe 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -5,14 +5,11 @@ let src = lib.getAttr wineRelease (callPackage ./sources.nix {}); - vkd3d = pkgs.callPackage ./vkd3d.nix { inherit moltenvk; }; - vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix { inherit moltenvk; }; in with src; { wine32 = pkgsi686Linux.callPackage ./base.nix { pname = "wine"; inherit src version supportFlags patches moltenvk; pkgArches = [ pkgsi686Linux ]; - vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ]; geckos = [ gecko32 ]; mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ]; monos = [ mono ]; @@ -22,7 +19,6 @@ in with src; { pname = "wine64"; inherit src version supportFlags patches moltenvk; pkgArches = [ pkgs ]; - vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ]; mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; geckos = [ gecko64 ]; monos = [ mono ]; @@ -35,7 +31,6 @@ in with src; { inherit src version supportFlags patches moltenvk; stdenv = stdenv_32bit; pkgArches = [ pkgs pkgsi686Linux ]; - vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d vkd3d_i686 ]; geckos = [ gecko32 gecko64 ]; mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ]; monos = [ mono ]; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 0e8f129f91f64..0d7ac403ad198 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -1,17 +1,17 @@ { pkgs ? import <nixpkgs> {} }: ## we default to importing <nixpkgs> here, so that you can use -## a simple shell command to insert new sha256's into this file +## a simple shell command to insert new hashes into this file ## e.g. with emacs C-u M-x shell-command ## ## nix-prefetch-url sources.nix -A {stable{,.mono,.gecko64,.gecko32}, unstable, staging, winetricks} # here we wrap fetchurl and fetchFromGitHub, in order to be able to pass additional args around it -let fetchurl = args@{url, sha256, ...}: - pkgs.fetchurl { inherit url sha256; } // args; - fetchFromGitHub = args@{owner, repo, rev, sha256, ...}: - pkgs.fetchFromGitHub { inherit owner repo rev sha256; } // args; - fetchFromGitLab = args@{domain, owner, repo, rev, sha256, ...}: - pkgs.fetchFromGitLab { inherit domain owner repo rev sha256; } // args; +let fetchurl = args@{url, hash, ...}: + pkgs.fetchurl { inherit url hash; } // args; + fetchFromGitHub = args@{owner, repo, rev, hash, ...}: + pkgs.fetchFromGitHub { inherit owner repo rev hash; } // args; + fetchFromGitLab = args@{domain, owner, repo, rev, hash, ...}: + pkgs.fetchFromGitLab { inherit domain owner repo rev hash; } // args; updateScriptPreamble = '' set -eou pipefail @@ -24,27 +24,27 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "7.0.1"; - url = "https://dl.winehq.org/wine/source/7.0/wine-${version}.tar.xz"; - sha256 = "sha256-gHyqeBIbFiUPJA0oKKB8pOPGCXOeVSTvD0z4muSagWw="; + version = "8.0"; + url = "https://dl.winehq.org/wine/source/8.0/wine-${version}.tar.xz"; + hash = "sha256-AnLCCTj4chrkUQr6qLNgN0V91XZh5NZkIxB5uekceS4="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { version = "2.47.3"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; - sha256 = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE="; + hash = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE="; }; gecko64 = fetchurl rec { version = "2.47.3"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; - sha256 = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU="; + hash = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU="; }; ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "7.0.0"; + version = "7.4.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "sha256-s35vyeWQ5YIkPcJdcqX8wzDDp5cN/cmKeoHSOEW6iQA="; + hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; }; patches = [ @@ -54,14 +54,14 @@ in rec { updateScript = writeShellScript "update-wine-stable" ('' ${updateScriptPreamble} - major=''${UPDATE_NIX_OLD_VERSION%.*} + major=''${UPDATE_NIX_OLD_VERSION%%.*} latest_stable=$(get_latest_wine_version "$major.0") latest_gecko=$(get_latest_lib_version wine-gecko) # Can't use autobump on stable because we don't want the path # <source/7.0/wine-7.0.tar.xz> to become <source/7.0.1/wine-7.0.1.tar.xz>. if [[ "$UPDATE_NIX_OLD_VERSION" != "$latest_stable" ]]; then - set_version_and_sha256 stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")" + set_version_and_hash stable "$latest_stable" "$(nix-prefetch-url "$wine_url_base/source/$major.0/wine-$latest_stable.tar.xz")" fi autobump stable.gecko32 "$latest_gecko" @@ -72,27 +72,27 @@ in rec { }; unstable = fetchurl rec { - # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.20"; - url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-dRt58itan3LJ7BX3VbALE9PtBz6RaMPvStq9nbN9DVA="; + # NOTE: Don't forget to change the hash for staging as well. + version = "8.1"; + url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; + hash = "sha256-QSDuaz8pTZeq8scwNM8cLL8ToZXJTFx0pkaoH5JBJZg="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { version = "7.4.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; + hash = "sha256-ZBP/Mo679+x2icZI/rNUbYEC3thlB50fvwMxsUs6sOw="; }; updateScript = writeShellScript "update-wine-unstable" '' ${updateScriptPreamble} - major=''${UPDATE_NIX_OLD_VERSION%.*} + major=''${UPDATE_NIX_OLD_VERSION%%.*} latest_unstable=$(get_latest_wine_version "$major.x") latest_mono=$(get_latest_lib_version wine-mono) update_staging() { staging_url=$(get_source_attr staging.url) - set_source_attr staging sha256 "\"$(to_sri "$(nix-prefetch-url --unpack "''${staging_url//$1/$2}")")\"" + set_source_attr staging hash "\"$(to_sri "$(nix-prefetch-url --unpack "''${staging_url//$1/$2}")")\"" } autobump unstable "$latest_unstable" "" update_staging @@ -105,7 +105,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-yzZE06FBoPL65+m8MrKlmW5cSIcX3dZYAOY9wjEJaJw="; + hash = "sha256-5AzXXaRGyvfYxd3yXtAlZREv1wp6UqWdDRdnwmKVaUg="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -115,12 +115,12 @@ in rec { wayland = fetchFromGitLab rec { # https://gitlab.collabora.com/alf/wine/-/tree/wayland - version = "7.20"; - sha256 = "sha256-UrukAnlfrr6eeVwFSEOWSVSfyMHbMT1o1tfXxow61xY="; + version = "8.0"; + hash = "sha256-whRnm21UyKZ4AQufNmctzivISVobnCeidmpYz65vlyk="; domain = "gitlab.collabora.com"; owner = "alf"; repo = "wine"; - rev = "1dc9821ef0b6109c74d0c95cd5418caf7f9feaf1"; + rev = "2f80bd757739f2dd8da41abceae6b87d2c568152"; inherit (unstable) gecko32 gecko64; @@ -135,7 +135,7 @@ in rec { if [[ "$wayland_rev" != "$latest_wayland_rev" ]]; then latest_wayland=$(curl -s 'https://gitlab.collabora.com/alf/wine/-/raw/wayland/VERSION' | cut -f3 -d' ') wayland_url=$(get_source_attr wayland.url) - set_version_and_sha256 wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")" + set_version_and_hash wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")" set_source_attr wayland rev "\"$latest_wayland_rev\"" fi @@ -146,7 +146,7 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases version = "20220411"; - sha256 = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU="; + hash = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU="; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/applications/emulators/wine/update-lib.sh b/pkgs/applications/emulators/wine/update-lib.sh index 8192d3b5ab588..8be2645415792 100644 --- a/pkgs/applications/emulators/wine/update-lib.sh +++ b/pkgs/applications/emulators/wine/update-lib.sh @@ -14,9 +14,9 @@ set_source_attr() { sed_exprs+=(-e "${line}s@[^ ].*\$@$name = $value;@") } -set_version_and_sha256() { +set_version_and_hash() { set_source_attr "$1" version "\"$2\"" - set_source_attr "$1" sha256 "\"$(to_sri "$3")\"" + set_source_attr "$1" hash "\"$(to_sri "$3")\"" } get_latest_wine_version() { @@ -39,7 +39,7 @@ autobump() { version=$(get_source_attr "$attr.version") if [[ "$version" != "$latest" ]]; then url=$(get_source_attr "$attr.url") - set_version_and_sha256 "$attr" "$latest" "$($fetcher "${url//$version/$latest}")" + set_version_and_hash "$attr" "$latest" "$($fetcher "${url//$version/$latest}")" [[ -z "$more" ]] || $more "$version" "$latest" fi } diff --git a/pkgs/applications/emulators/wine/vkd3d.nix b/pkgs/applications/emulators/wine/vkd3d.nix deleted file mode 100644 index 249cb2730404f..0000000000000 --- a/pkgs/applications/emulators/wine/vkd3d.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, moltenvk, vulkan-headers, spirv-headers, vulkan-loader, flex, bison }: - -#TODO: unstable - -stdenv.mkDerivation rec { - pname = "vkd3d"; - version = "1.5"; - - src = fetchurl { - url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"; - sha256 = "sha256-47PDVfRvfL/BnnEKR4vLK+4mel82Dn5kBiOM6lLOLPw="; - }; - - nativeBuildInputs = [ flex bison ]; - - buildInputs = [ vulkan-headers spirv-headers ] - ++ [ (if stdenv.isDarwin then moltenvk else vulkan-loader) ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "A 3d library build on top on Vulkan with a similar api to DirectX 12"; - homepage = "https://source.winehq.org/git/vkd3d.git"; - license = licenses.lgpl21; - platforms = platforms.unix; - maintainers = [ maintainers.marius851000 ]; - }; -} diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix new file mode 100644 index 0000000000000..482ea9e06fd58 --- /dev/null +++ b/pkgs/applications/emulators/xemu/default.nix @@ -0,0 +1,131 @@ +{ stdenv +, fetchFromGitHub +, lib +, makeDesktopItem +, copyDesktopItems +, pkg-config +, python3 +, ninja +, meson +, which +, perl +, wrapGAppsHook +, glib +, gtk3 +, libpcap +, openssl +, libepoxy +, libsamplerate +, SDL2 +, SDL2_image +, mesa +, libdrm +, libGLU +, gettext +, vte +}: + +stdenv.mkDerivation rec { + pname = "xemu"; + version = "0.7.84"; + + src = fetchFromGitHub { + owner = "xemu-project"; + repo = "xemu"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-pEXjwoQKbMmVNYCnh5nqP7k0acYOAp8SqxYZwPzVwDY="; + }; + + nativeBuildInputs = [ + pkg-config + python3 + python3.pkgs.pyyaml + ninja + which + meson + perl + wrapGAppsHook + copyDesktopItems + ]; + + buildInputs = [ + glib + gtk3 + openssl + mesa + libepoxy + libdrm + libpcap + libsamplerate + SDL2 + libGLU + SDL2_image + gettext + vte + ]; + + separateDebugInfo = true; + + dontUseMesonConfigure = true; + + setOutputFlags = false; + + configureFlags = [ + "--disable-strip" + "--meson=meson" + "--target-list=i386-softmmu" + "--disable-werror" + ]; + + buildFlags = [ "qemu-system-i386" ]; + + desktopItems = [(makeDesktopItem { + name = "xemu"; + desktopName = "xemu"; + exec = "xemu"; + icon = "xemu"; + })] ; + + preConfigure = let + branch = "master"; + commit = "d8fa50e524c22f85ecb2e43108fd6a5501744351"; + in '' + patchShebangs . + configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls") + substituteInPlace ./scripts/xemu-version.sh \ + --replace 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'" + # If the versions can't be obtained through git, the build process tries + # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar) + echo '${commit}' > XEMU_COMMIT + echo '${branch}' > XEMU_BRANCH + echo '${version}' > XEMU_VERSION + ''; + + preBuild = '' + cd build + substituteInPlace ./build.ninja --replace /usr/bin/env $(which env) + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share} + cp qemu-system-i386 $out/bin/xemu + + for RES in 16x16 24x24 32x32 48x48 128x128 256x256 512x512 + do + mkdir -p $out/share/icons/hicolor/$RES/apps/ + cp ../ui/icons/xemu_$RES.png $out/share/icons/hicolor/$RES/apps/xemu.png + done + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://xemu.app/"; + description = "Original Xbox emulator"; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/emulators/zsnes/2.x.nix b/pkgs/applications/emulators/zsnes/2.x.nix index fdb4ad9fa139b..c11edd325d33e 100644 --- a/pkgs/applications/emulators/zsnes/2.x.nix +++ b/pkgs/applications/emulators/zsnes/2.x.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { dontConfigure = true; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ # Until upstream fixes the issues... "-Wp,-D_FORTIFY_SOURCE=0" ]; diff --git a/pkgs/applications/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix index b9dd0f77a4ff4..1583777a058f7 100644 --- a/pkgs/applications/emulators/zsnes/default.nix +++ b/pkgs/applications/emulators/zsnes/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: initc.o:(.bss+0x28): multiple definition of `HacksDisable'; cfg.o:(.bss+0x59e3): first defined here # Use pre-c++17 standard (c++17 forbids throw annotations) - NIX_CFLAGS_COMPILE = "-fcommon -std=c++14"; + env.NIX_CFLAGS_COMPILE = "-fcommon -std=c++14"; preConfigure = '' cd src diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index 003b07cb97594..c4c2d9e6528b5 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jrP8V1EhHldliZEjiX55TJujc82ub46aWi1boJYDVTg="; + sha256 = "sha256-kXnI8a1nGKBDc+isv9RYvputKk+/FHmM9j+G4UnI5Z4="; }; buildInputs = [ libcap acl file readline ]; diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 3a20726b9b428..069e6f63cc223 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.2.3"; + version = "2.2.5"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VQTZj2BCdV2TnXrYRaJqrf9sR35zsojmeoe7t+I3kyQ="; + sha256 = "sha256-qN/aOOiSj+HrjZQaDUkps0NORIdCBIevVjTYQm2G2Fg="; }; - cargoSha256 = "sha256-jH2BaPiGanBOlOU7JQZ0c0ObCaVURpjvmx2m92Fbdm4="; + cargoSha256 = "sha256-xqWDWN3xkzBwgW0f64QhYHfsOS3Ed50jlQFuHG81/KY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/file-managers/lf/ctpv.nix b/pkgs/applications/file-managers/lf/ctpv.nix new file mode 100644 index 0000000000000..7f5e2a6e089e3 --- /dev/null +++ b/pkgs/applications/file-managers/lf/ctpv.nix @@ -0,0 +1,41 @@ +{ lib +, pkgs +, file +, openssl +, stdenv +, fetchFromGitHub +, waylandSupport ? stdenv.isLinux +, x11Support ? stdenv.isLinux +}: + +stdenv.mkDerivation rec { + pname = "ctpv"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "NikitaIvanovV"; + repo = "${pname}"; + rev = "v${version}"; + hash = "sha256-0OuskRCBVm8vMd2zH5u5EPABmCOlEv5N4ZZMdc7bAwM="; + }; + + nativeBuildInputs = [ + file # libmagic + openssl + ]; + + buildInputs = with pkgs; [ + ffmpegthumbnailer ffmpeg + ] ++ lib.optional waylandSupport [ chafa ] + ++ lib.optional x11Support [ ueberzug ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Image previews for lf (list files) file manager"; + homepage = "https://github.com/NikitaIvanovV/ctpv"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.wesleyjrz ]; + }; +} diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix index 8b54d79622a42..a61b0980d8515 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/pkgs/applications/file-managers/mc/default.nix @@ -6,7 +6,6 @@ , gpm , file , e2fsprogs -, libX11 , libICE , perl , zip @@ -17,6 +16,7 @@ , openssl , coreutils , autoSignDarwinBinariesHook +, x11Support ? true, libX11 # updater only , writeScript @@ -43,12 +43,12 @@ stdenv.mkDerivation rec { gettext glib libICE - libX11 libssh2 openssl slang zip - ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; + ] ++ lib.optionals x11Support [ libX11 ] + ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; enableParallelBuilding = true; @@ -66,12 +66,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/filemanager/ext.c \ --replace /bin/rm ${coreutils}/bin/rm - - substituteInPlace misc/ext.d/misc.sh.in \ - --replace /bin/cat ${coreutils}/bin/cat ''; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString ((!stdenv.isDarwin) && x11Support) '' # libX11.so is loaded dynamically so autopatch doesn't detect it patchelf \ --add-needed ${libX11}/lib/libX11.so \ diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index d9ff3b15c798a..befbffb46e74c 100644 --- a/pkgs/applications/file-managers/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ]; buildInputs = [ readline ncurses ] ++ lib.optional stdenv.hostPlatform.isMusl musl-fts; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include"; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts"; makeFlags = [ "PREFIX=$(out)" ] diff --git a/pkgs/applications/file-managers/spacefm/default.nix b/pkgs/applications/file-managers/spacefm/default.nix index 334228f98ead1..1cab33edb9449 100644 --- a/pkgs/applications/file-managers/spacefm/default.nix +++ b/pkgs/applications/file-managers/spacefm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # `xsets'; vfs/spacefm-vfs-file-info.o:src/settings.h:123: first defined here # TODO: can be removed once https://github.com/IgnorantGuru/spacefm/pull/772 # or equivalent is merged upstream. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; configureFlags = [ "--with-bash-path=${pkgs.bash}/bin/bash" @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 udev desktop-file-utils shared-mime-info wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 - ] ++ (if ifuseSupport then [ ifuse ] else []); + ] ++ (lib.optionals ifuseSupport [ ifuse ]); # Introduced because ifuse doesn't build due to CVEs in libplist # Revert when libplist builds again… diff --git a/pkgs/applications/file-managers/vifm/default.nix b/pkgs/applications/file-managers/vifm/default.nix index ad326e459775d..ab7da2deac897 100644 --- a/pkgs/applications/file-managers/vifm/default.nix +++ b/pkgs/applications/file-managers/vifm/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, makeWrapper +, perl # used to generate help tags , pkg-config , ncurses, libX11 , util-linux, file, which, groff @@ -17,9 +18,14 @@ in stdenv.mkDerivation rec { sha256 = "sha256-j+KBPr3Mz+ma7OArBdYqIJkVJdRrDM+67Dr2FMZlVog="; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ perl pkg-config makeWrapper ]; buildInputs = [ ncurses libX11 util-linux file which groff ]; + postPatch = '' + # Avoid '#!/usr/bin/env perl' reverences to build help. + patchShebangs --build src/helpztags + ''; + postFixup = let path = lib.makeBinPath [ udisks2 @@ -28,11 +34,11 @@ in stdenv.mkDerivation rec { wrapVifmMedia = "wrapProgram $out/share/vifm/vifm-media --prefix PATH : ${path}"; in '' - ${if mediaSupport then wrapVifmMedia else ""} + ${lib.optionalString mediaSupport wrapVifmMedia} ''; meta = with lib; { - description = "A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}"; + description = "A vi-like file manager${lib.optionalString isFullPackage "; Includes support for optional features"}"; maintainers = with maintainers; [ raskin ]; platforms = if mediaSupport then platforms.linux else platforms.unix; license = licenses.gpl2; diff --git a/pkgs/applications/finance/denaro/default.nix b/pkgs/applications/finance/denaro/default.nix new file mode 100644 index 0000000000000..84a76e21f2b5e --- /dev/null +++ b/pkgs/applications/finance/denaro/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenvNoCC +, buildDotnetModule +, fetchFromGitHub +, fetchpatch +, dotnetCorePackages +, gtk4 +, libadwaita +, pkg-config +, wrapGAppsHook4 +, glib +, shared-mime-info +, python3 +, desktop-file-utils +, gdk-pixbuf +}: + +buildDotnetModule rec { + pname = "denaro"; + version = "2023.2.2"; + + src = fetchFromGitHub { + owner = "nlogozzo"; + repo = "NickvisionMoney"; + rev = version; + hash = "sha256-B84uzJ+B7kGU+O2tuObrIFCvgUfszLd1VU7F5tL90bU="; + }; + + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0; + + projectFile = "NickvisionMoney.GNOME/NickvisionMoney.GNOME.csproj"; + nugetDeps = ./deps.nix; + executables = "NickvisionMoney.GNOME"; + + # Prevent installing native libraries for all platforms + dotnetBuildFlags = [ "--runtime" (dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system) ]; + dotnetInstallFlags = [ "--runtime" (dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system) ]; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + glib # For glib-compile-resources + shared-mime-info # For update-mime-database + python3 + desktop-file-utils + gdk-pixbuf # Fixes icon missing in envs where GDK_PIXBUF_MODULE_FILE is not set + ]; + + postInstall = '' + sh NickvisionMoney.GNOME/install_extras.sh $out + desktop-file-edit $out/share/applications/org.nickvision.money.desktop \ + --set-key=Exec --set-value=$out/bin/NickvisionMoney.GNOME + ''; + + runtimeDeps = [ + gtk4 + libadwaita + glib # Fixes "Could not retrieve parent type - is the typeid valid?" + ]; + + meta = with lib; { + description = "Personal finance manager for GNOME"; + homepage = "https://github.com/nlogozzo/NickvisionMoney"; + mainProgram = "NickvisionMoney.GNOME"; + license = licenses.mit; + changelog = "https://github.com/nlogozzo/NickvisionMoney/releases/tag/${version}"; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/finance/denaro/deps.nix b/pkgs/applications/finance/denaro/deps.nix new file mode 100644 index 0000000000000..d6762f6bbe7af --- /dev/null +++ b/pkgs/applications/finance/denaro/deps.nix @@ -0,0 +1,117 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; }) + (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.3.0"; sha256 = "1bsjqxck58dff9hnw21cp3xk1afly8721sfsbnxcr5i39hlrbl37"; }) + (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.3.0"; sha256 = "1zb8ilgywpwgjrzrbdvzvy70f46fb05iy49592mkjg2lv24q5l3y"; }) + (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.3.0"; sha256 = "1bc78409bdhfqqbirwr1lkzxl27adndv05q5fcm5sivmlzr7fbkm"; }) + (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.3.0"; sha256 = "1dz7f29jbmkzcwbggjwsx6r4nmw5xvvyfmia0xpjvpx1zzmfvmc4"; }) + (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.3.0"; sha256 = "1jgwhqghg14z5qkgakd42dnyk6n8cj7nkgf0hbj9zxbd0my9vv6p"; }) + (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.3.0"; sha256 = "0hv55x8snr4fk0z8dn52n8p030f02i3gfysin0bsrlmi879gn9ln"; }) + (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.3.0"; sha256 = "1aibc13yb96bbirh25jv5gp0cqvz1ya9drrdhirfsrn41274ikpm"; }) + (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.3.0"; sha256 = "1xd4yfppr34ngmal3s16f08mqdn7mra97jmjpk13aa9yjbp0avij"; }) + (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.3.0"; sha256 = "065fg5dj97sidrr7n2a6gv8vmylhpfznhw3zazra6krcvzgf1gcz"; }) + (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.3.0"; sha256 = "1r68lfxj98y3fvcxl33lk2cbjz7dn9grqb6c5axdlfjjgnkwjvlj"; }) + (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.3.0"; sha256 = "0c9im9sbiqsykrj4yq93x5nlsj9c5an7dj1j6yirb874zqq6jhsp"; }) + (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.3.0"; sha256 = "12nva0xzykvf102m69gn19ap1cyiap3i93n9gha9pnl4d5g4b4k1"; }) + (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.3.0"; sha256 = "1waiqs52gmpfqxc7yfdz7lp4jr3462js8hrs6acfr47vzddksymi"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) + (fetchNuGet { pname = "Hazzik.Qif"; version = "1.0.3"; sha256 = "16v6cfy3pa0qy699v843pss3418rvq5agz6n43sikzh69vzl2azy"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.3"; sha256 = "00rdsirs32vlqpa1hri3f1m368b05d4r0k95wv5n2y0xi5i8lml6"; }) + (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 = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "OfxSharp.NetStandard"; version = "1.0.0"; sha256 = "1v7yw2glyywb4s0y5fw306bzh2vw175bswrhi5crvd92wf93makj"; }) + (fetchNuGet { pname = "QuestPDF"; version = "2022.12.1"; sha256 = "0nbbk43jr73f0pfgdx3fzn57mjba34sir5jzxk2rscyfljfw002x"; }) + (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"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (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.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (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.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.3"; sha256 = "12qb0r7v2v91vw8q8ygr67y527gwhbas6d6zdvrv4ksxwjx9dzp9"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; }) + (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.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.4"; sha256 = "1v9wly6v2bj244wch6ijfx2imrbgmafn1w9km44718fngdxfhysq"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.4"; sha256 = "14qr84h88jfvy263yx51zjm059aqgwlvgi6g02yxhbr2m7brs4mm"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.4"; sha256 = "1s1dv1qfgjsvcdbwf2pl48c6k60hkxwyy6z5w8g32fypksnvb7cs"; }) + (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"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (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.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"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (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.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"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.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"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (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"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) +] diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index a3d3fda59122f..a2e01303970af 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.22.14"; + version = "3.22.16"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-VT85cVeKuHQCGQokID9yrbents7ewHK1j7I17oFTvlo="; + hash = "sha256-6UpWVEyh94Oo6eI/dEmDuJHRwpPtkEsksjE90iAUgo8="; }; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 929a40d6daab3..18603e38ec532 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.28.2"; + version = "3.28.3"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-ndwDN/DH+Y+dc8aNa45cSIM8yQUmIWq0jx6xWsZo4rk="; + hash = "sha256-nXauZSC78BX1fcx0SXniwQpRmdSLfoqZ5jlbXeHgRGI="; }; passthru = { diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 59794b88a4fd3..d535625c717a7 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -31,11 +31,11 @@ mkDerivation rec { pname = "saga"; - version = "8.5.0"; + version = "8.5.1"; src = fetchurl { url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "sha256-JzSuu1wGfCkxIDcTbP5jpHtJNvl8eAP3jznXvwSPeY0="; + sha256 = "sha256-JnZ0m0GAgfz3BbiKxqLoMoa4pX//r5t+mbhMCdAo9OE="; }; sourceRoot = "saga-${version}/saga-gis"; diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index e09de1b250234..a433cc6516dea 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -21,6 +21,7 @@ , libde265Support ? true, libde265 , fftw , ApplicationServices, Foundation +, testers }: let @@ -33,14 +34,14 @@ let else null; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; version = "6.9.12-68"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-slQcA0cblxtG/1DiJx5swUh7Kfwgz5HG70eqJFLaQJI="; }; @@ -109,12 +110,35 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://legacy.imagemagick.org/"; changelog = "https://legacy.imagemagick.org/script/changelog.php"; description = "A software suite to create, edit, compose, or convert bitmap images"; + pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; license = licenses.asl20; + knownVulnerabilities = [ + "CVE-2018-16328" + "CVE-2018-16329" + "CVE-2019-13136" + "CVE-2019-17547" + "CVE-2020-25663" + "CVE-2020-27768" + "CVE-2021-3596" + "CVE-2021-3596" + "CVE-2021-3596" + "CVE-2021-3610" + "CVE-2021-20244" + "CVE-2021-20244" + "CVE-2021-20310" + "CVE-2021-20311" + "CVE-2021-20312" + "CVE-2021-20313" + "CVE-2022-0284" + "CVE-2022-2719" + ]; }; -} +}) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index d5d64aef6d86c..1d7863df05e87 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,6 +30,7 @@ , Foundation , testers , imagemagick +, python3 }: assert libXtSupport -> libX11Support; @@ -44,15 +45,15 @@ let else null; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.0-57"; + version = "7.1.0-62"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; - rev = version; - hash = "sha256-1fFsrsrY8AAMr6miG8OPZIYaVZhtVi5kEaI/96dzip8="; + rev = finalAttrs.version; + hash = "sha256-K74BWxGTpkaE+KBrdOCVd+m/2MJP6YUkB2CFh/YEHyI="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -122,15 +123,19 @@ stdenv.mkDerivation rec { done ''; - passthru.tests.version = - testers.testVersion { package = imagemagick; }; + passthru.tests = { + version = testers.testVersion { package = imagemagick; }; + inherit (python3.pkgs) img2pdf; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; meta = with lib; { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; + pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ erictapen dotlambda ]; license = licenses.asl20; mainProgram = "magick"; }; -} +}) diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 0e61da0041b60..a780fc039a142 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab -, desktop-file-utils, shared-mime-info +, desktop-file-utils, shared-mime-info, ninja, pkg-config , libiconv , libX11, libXcursor, libXext, libXi , freetype, fontconfig @@ -9,18 +9,20 @@ stdenv.mkDerivation rec { pname = "azpainter"; - version = "3.0.4"; + version = "3.0.6"; src = fetchFromGitLab { owner = "azelpg"; repo = pname; rev = "v${version}"; - hash = "sha256-2gTTF1ti9bO24d75mhwyvJISSgMKdmp+oJVmgzEQHdY="; + hash = "sha256-/shmLdZ4mCBZAeUuqJtCiUjeI8B5f/8dIGPqmXMjZ1I="; }; nativeBuildInputs = [ desktop-file-utils # for update-desktop-database shared-mime-info # for update-mime-info + ninja + pkg-config ]; buildInputs = [ @@ -30,6 +32,10 @@ stdenv.mkDerivation rec { zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + preBuild = '' + cd build + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index c26b2f46e7f63..5c5745646b59d 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "20.8.10"; + version = "20.8.16"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "118e9c9a328c92aeeda3c5925c8d8ed50d0993c07715726447ee720699958626"; + sha256 = "sha256-FBnyogqf5BHLRInjJzC2dENnAwFcWMHDvJ+F0I3ffVg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/drawio/headless.nix b/pkgs/applications/graphics/drawio/headless.nix index c70511fa6528c..34959da67b46e 100644 --- a/pkgs/applications/graphics/drawio/headless.nix +++ b/pkgs/applications/graphics/drawio/headless.nix @@ -21,7 +21,7 @@ writeTextFile { # Drawio needs to run in a virtual X session, because Electron # refuses to work and dies with an unhelpful error message otherwise: # "The futex facility returned an unexpected error code." - XDG_CONFIG_HOME="$tmpdir" ${xvfb-run}/bin/xvfb-run ${drawio}/bin/drawio $@ + XDG_CONFIG_HOME="$tmpdir" ${xvfb-run}/bin/xvfb-run --auto-display ${drawio}/bin/drawio $@ ''; meta = with lib; { diff --git a/pkgs/applications/graphics/emblem/default.nix b/pkgs/applications/graphics/emblem/default.nix new file mode 100644 index 0000000000000..8df8b76801396 --- /dev/null +++ b/pkgs/applications/graphics/emblem/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitLab +, rustPlatform +, pkg-config +, meson +, ninja +, glib +, gobject-introspection +, libadwaita +, libxml2 +, librsvg +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "emblem"; + version = "1.1.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World/design"; + repo = pname; + rev = version; + sha256 = "sha256-kNPV1SHkNTBXbMzDJGuDbaGz1WkBqMpVgZKjsh7ejmo="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-yhXxlUOe+mWVpAEB0yN9m5S5yfNRrHnx7XHLXbbf1hc="; + }; + + nativeBuildInputs = [ + appstream-glib + glib + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + desktop-file-utils + libadwaita + librsvg + libxml2 + ]; + + meta = with lib; { + description = "Generate project icons and avatars from a symbolic icon"; + homepage = "https://gitlab.gnome.org/World/design/emblem"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix index 41999239af1ae..d088f633c3f3b 100644 --- a/pkgs/applications/graphics/eyedropper/default.nix +++ b/pkgs/applications/graphics/eyedropper/default.nix @@ -15,19 +15,19 @@ stdenv.mkDerivation rec { pname = "eyedropper"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "FineFindus"; repo = pname; rev = "v${version}"; - hash = "sha256-sDrMIryVFkjMGHbYvNDmKb1HyJNGb3Hd+muxUJKhogE="; + hash = "sha256-kc/UREQpmw3suA6bYEr9fCIwMzNMrEY9E5qf+rhKsC4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-mztc44hHdqzR3WbG6tkCL38EfgBajRLlpMC8ElpXnlo="; + hash = "sha256-/eas1PObrj9IuDIzlBVbfhEhH8eDyZ7CD871JmAqnyY="; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An easy-to-use color picker and editor"; + description = "A powerful color picker and formatter"; homepage = "https://github.com/FineFindus/eyedropper"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 535b177bd7bd2..971ce42c03f9c 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -22,26 +22,6 @@ , zlib }: let - libs = [ - alsa-lib - bzip2 - fftw - freeglut - freetype - glew - libjack2 - libGL - libGLU - libjpeg - liblo - libpng - libsndfile - libtiff - ode - openal - openssl - zlib - ]; racket = racket_7_9; in stdenv.mkDerivation rec { @@ -77,7 +57,6 @@ stdenv.mkDerivation rec { "RacketPrefix=${racket}" "RacketInclude=${racket}/include/racket" "RacketLib=${racket}/lib/racket" - "LIBPATH=${lib.makeLibraryPath libs}" "DESTDIR=build" ]; configurePhase = '' diff --git a/pkgs/applications/graphics/fluxus/fix-build.patch b/pkgs/applications/graphics/fluxus/fix-build.patch index b19ed9c2cbc7b..b44327520e654 100644 --- a/pkgs/applications/graphics/fluxus/fix-build.patch +++ b/pkgs/applications/graphics/fluxus/fix-build.patch @@ -1,5 +1,10 @@ -diff --git a/SConstruct b/SConstruct -index 32cb644..650333a 100644 +scons does not use os environment by default: + https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html + +nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables +to be passed through like NIX_CFLAGS_COMPILE_BEFORE. + +While at it ported to python3-style print(). --- a/SConstruct +++ b/SConstruct @@ -6,7 +6,7 @@ @@ -11,16 +16,15 @@ index 32cb644..650333a 100644 MajorVersion = "0" MinorVersion = "19" -@@ -225,13 +225,18 @@ if env['PLATFORM'] == 'posix': - ["asound", "alsa/asoundlib.h"], - ["openal", "AL/al.h"]] +@@ -100,6 +100,7 @@ IncludePaths = [ + paranoid = ' -W -Wcast-qual -Wwrite-strings -Wcast-align -Wpointer-arith -Wconversion -Wredundant-decls -Wunreachable-code -Winline -Wlarger-than-256' -+env.Append(ENV={'PATH': ' ' + os.environ['PATH'], }) -+env.Append(LIBPATH=ARGUMENTS.get('LIBPATH', '').split(':')) -+env.Append(CCFLAGS=' ' + os.environ.get('NIX_CFLAGS_COMPILE','')) -+env.Append(CCFLAGS=' -DNULL=0') -+ - ################################################################################ + env = Environment(CCFLAGS = '-ggdb -pipe -Wall -O3 -ffast-math -Wno-unused -fPIC -pthread', ++ ENV = os.environ, + VERSION_NUM = FluxusVersion) + env.MergeFlags(ARGUMENTS.get('CCFLAGS', '').split()) + env.MergeFlags(ARGUMENTS.get('LDFLAGS', '').split()) +@@ -229,9 +230,9 @@ if env['PLATFORM'] == 'posix': # Make sure we have these libraries availible if not GetOption('clean'): @@ -33,7 +37,7 @@ index 32cb644..650333a 100644 # detect ode precision if not GetOption('clean'): try: -@@ -240,27 +245,27 @@ if not GetOption('clean'): +@@ -240,27 +241,27 @@ if not GetOption('clean'): if isinstance(ode_str[0], str): env.MergeFlags(ode_str[0]) except: @@ -65,7 +69,7 @@ index 32cb644..650333a 100644 Exit(1) if not conf.CheckFunc("dInitODE2"): -@@ -334,7 +339,7 @@ if not GetOption('clean'): +@@ -334,7 +335,7 @@ if not GetOption('clean'): ]) if raco_status != 0: @@ -74,7 +78,7 @@ index 32cb644..650333a 100644 Exit(1) -@@ -377,8 +382,8 @@ if not GetOption('clean') and static_modules: +@@ -377,8 +378,8 @@ if not GetOption('clean') and static_modules: app_env['LIBS'].remove("pthread") app_env['LIBS'].remove("dl") @@ -85,7 +89,7 @@ index 32cb644..650333a 100644 # now go through the rest of the libs, removing them from # the environment at the same time -@@ -425,7 +430,7 @@ SConscript(dirs = build_dirs, +@@ -425,7 +426,7 @@ SConscript(dirs = build_dirs, if not GetOption('clean'): helpmap_status = subprocess.call(["racket", "makehelpmap.scm"], cwd="docs/helpmap") if helpmap_status != 0: diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index e8fd0364808c2..b16025e8829c0 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { pname = "foxotron"; - version = "2022-11-02"; + version = "2023-02-23"; src = fetchFromGitHub { owner = "Gargaj"; repo = "Foxotron"; rev = version; fetchSubmodules = true; - sha256 = "sha256-WjsVvFhwVCzclHxA+Gu2YtR2yK0Opqhncwlg9FEhOLk="; + sha256 = "sha256-sPIXLZdtVK3phfMsZrU8o9qisOC5RKvHH19ECXMV0t0="; }; postPatch = '' @@ -46,6 +46,11 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext alsa-lib fontconfig libGLU ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index bcc504effec2a..7ed9cc865d237 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -39,7 +39,7 @@ , soqt , spaceNavSupport ? stdenv.isLinux , swig -, vtk +, vtk_8 , wrapQtAppsHook , wrapGAppsHook , xercesc @@ -97,7 +97,7 @@ mkDerivation rec { shiboken2 soqt swig - vtk + vtk_8 xercesc zlib ] ++ lib.optionals spaceNavSupport [ diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index c69c9af184b00..def7e3e9dd867 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --replace png_set_gray_1_2_4_to_8 png_set_expand_gray_1_2_4_to_8 ''; - NIX_CFLAGS_COMPILE = "-fpermissive -Wno-narrowing"; + env.NIX_CFLAGS_COMPILE = "-fpermissive -Wno-narrowing"; meta = { description = "Open source panorama viewer using GL"; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 3ce6c56d94bb2..8ffc0a0424e5b 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -154,7 +154,7 @@ in stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16"; # Check if librsvg was built with --disable-pixbuf-loader. PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index ae44b47643cd6..2077fabc35dfe 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -109,7 +109,9 @@ in /* menu: Video */ - name = "gap-2.6.0"; + pname = "gap"; + version = "2.6.0"; + src = fetchurl { url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2"; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; @@ -228,11 +230,13 @@ in /* menu: Filters/Enhance/Wavelet sharpen */ - name = "wavelet-sharpen-0.1.2"; + pname = "wavelet-sharpen"; + version = "0.1.2"; + # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS = "-lm"; src = fetchurl { url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; @@ -271,7 +275,7 @@ in gimplensfun = pluginDerivation rec { version = "unstable-2018-10-21"; - name = "gimplensfun-${version}"; + pname = "gimplensfun"; src = fetchFromGitHub { owner = "seebk"; diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix index 7ae618736ca19..3e365d299f9ad 100644 --- a/pkgs/applications/graphics/gnome-decoder/default.nix +++ b/pkgs/applications/graphics/gnome-decoder/default.nix @@ -65,6 +65,12 @@ clangStdenv.mkDerivation rec { LIBCLANG_PATH = "${libclang.lib}/lib"; + # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream + # https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 + preBuild = '' + export BINDGEN_EXTRA_CLANG_ARGS="$BINDGEN_EXTRA_CLANG_ARGS -DPW_ENABLE_DEPRECATED" + ''; + meta = with lib; { description = "Scan and Generate QR Codes"; homepage = "https://gitlab.gnome.org/World/decoder"; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index 0ac22106b989c..b90735d850837 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; - NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isGNU "-Wno-error=catch-value"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=catch-value"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 325d1bcf083dd..8236af42956d3 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkg-config wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; + + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=format-truncation" + ]; + NIX_LDFLAGS = "-lpthread"; buildPhase = '' diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 3dbd1e0d77bf2..847fa9ea5f686 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS = "-lm"; meta = with lib; { description = "A fast image viewer"; - homepage = "http://gqview.sourceforge.net"; + homepage = "https://gqview.sourceforge.net"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 48e97e7dbb3b9..db297f70095a8 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: ../obj/unix/tiles.o:/build/grafx2/src/global.h:306: multiple definition of # `Main_selector'; ../obj/unix/main.o:/build/grafx2/src/global.h:306: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preInstall = '' mkdir -p "$out" ''; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index a82c6ec2f78d6..ecb09e539b3e4 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , gnome , pkg-config , meson @@ -40,6 +42,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-l/iv5SJTUhZUHrvx47VG0Spr6zio8OuF8m5naTSq1CU="; }; + patches = [ + # Fix build with libraw 0.21, can be removed on next update + # https://hydra.nixos.org/build/209327709/nixlog/1 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch"; + sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ="; + }) + ]; + nativeBuildInputs = [ bison desktop-file-utils diff --git a/pkgs/applications/graphics/hdrmerge/default.nix b/pkgs/applications/graphics/hdrmerge/default.nix index b0e346331bce8..d690f5e0671a9 100644 --- a/pkgs/applications/graphics/hdrmerge/default.nix +++ b/pkgs/applications/graphics/hdrmerge/default.nix @@ -46,6 +46,11 @@ mkDerivation rec { url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch"; sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi"; }) + (fetchpatch { + name = "support-libraw-0.21.patch"; + url = "https://github.com/jcelaya/hdrmerge/commit/779e566b3e2807280b78c79affda2cdfa64bde87.diff"; + sha256 = "48sivCfJWEtGiBXTrO+SWTVlT9xyx92w2kkB8Wt/clk="; + }) ]; desktopItems = [ diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index f4d424b3fc30d..204cfa387dd39 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; postInstall = '' for p in $out/bin/*; do diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix index b904dec085699..5d56dbe86d702 100644 --- a/pkgs/applications/graphics/imgcat/default.nix +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-EkVE6BgoA1lo4oqlNETTxLILIVvGXspFyXykxpmYk8M="; }; - NIX_CFLAGS_COMPILE = "-Wno-error"; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; meta = with lib; { description = "It's like cat, but for images"; diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index f78a4f6068154..30a8a24e3bc27 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -11,7 +11,7 @@ , icu , pango , inih -, withWindowSystem ? "all" +, withWindowSystem ? null , xorg , libxkbcommon , libGLU @@ -27,6 +27,12 @@ }: let + # default value of withWindowSystem + withWindowSystem' = + if withWindowSystem != null then withWindowSystem + else if stdenv.isLinux then "all" + else "x11"; + windowSystems = { all = windowSystems.x11 ++ windowSystems.wayland; x11 = [ libGLU xorg.libxcb xorg.libX11 ]; @@ -47,7 +53,7 @@ let in # check that given window system is valid -assert lib.assertOneOf "withWindowSystem" withWindowSystem +assert lib.assertOneOf "withWindowSystem" withWindowSystem' (builtins.attrNames windowSystems); # check that every given backend is valid assert builtins.all @@ -56,18 +62,18 @@ assert builtins.all stdenv.mkDerivation rec { pname = "imv"; - version = "4.3.1"; + version = "4.4.0"; outputs = [ "out" "man" ]; src = fetchFromSourcehut { owner = "~exec64"; repo = "imv"; rev = "v${version}"; - sha256 = "sha256-gMAd8skst72QT4jGFH7aRdWeAd4tf/uQgXhGaM/Dpgc="; + sha256 = "sha256-LLEEbriHzZhAOQivqHqdr6g7lh4uj++ytlme8AfRjf4="; }; mesonFlags = [ - "-Dwindows=${withWindowSystem}" + "-Dwindows=${withWindowSystem'}" "-Dtest=enabled" "-Dman=enabled" ] ++ backendFlags; @@ -87,7 +93,7 @@ stdenv.mkDerivation rec { libxkbcommon pango inih - ] ++ windowSystems."${withWindowSystem}" + ] ++ windowSystems."${withWindowSystem'}" ++ builtins.map (b: backends."${b}") withBackends; postInstall = '' @@ -96,7 +102,7 @@ stdenv.mkDerivation rec { install -Dm644 ../files/imv.desktop $out/share/applications/ ''; - postFixup = lib.optionalString (withWindowSystem == "all") '' + postFixup = lib.optionalString (withWindowSystem' == "all") '' # The `bin/imv` script assumes imv-wayland or imv-x11 in PATH, # so we have to fix those to the binaries we installed into the /nix/store @@ -109,9 +115,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command line image viewer for tiling window managers"; - homepage = "https://github.com/eXeC64/imv"; + homepage = "https://sr.ht/~exec64/imv/"; license = licenses.mit; maintainers = with maintainers; [ rnhmjoj markus1189 ]; platforms = platforms.all; + badPlatforms = platforms.darwin; }; } diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix index bd4a580cc4621..b8cf63b188743 100644 --- a/pkgs/applications/graphics/jpeg-archive/default.nix +++ b/pkgs/applications/graphics/jpeg-archive/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { # gcc-10. Otherwise build fails as: # ld: src/util.o:(.bss+0x0): multiple definition of `progname'; /build/ccBZT2Za.o:(.bss+0x20): first defined here # https://github.com/danielgtaylor/jpeg-archive/issues/119 - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 951bb9d7d8943..ff00d565f47d3 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { - version = "1.5.1"; + version = "1.5.2"; pname = "jpegoptim"; src = fetchFromGitHub { owner = "tjko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QPipwBk+BS/u3YxB8ACeFXQSuoW1aynEyG3tEMrhcaE="; + sha256 = "sha256-PROQvOqsis8we58OOZ/kuY+L/CoV7XfnY9wvrpsTJu8="; }; # There are no checks, it seems. diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index a05dbc28be022..45688725c2afc 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -95,6 +95,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://hexler.net/kodelife"; description = "Real-time GPU shader editor"; diff --git a/pkgs/applications/graphics/kodelife/update.sh b/pkgs/applications/graphics/kodelife/update.sh new file mode 100755 index 0000000000000..992f7c2bf4349 --- /dev/null +++ b/pkgs/applications/graphics/kodelife/update.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix curl libxml2 jq + +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" + +attr="${UPDATE_NIX_ATTR_PATH:-kodelife}" +version="$(curl -sSL https://hexler.net/kodelife/appcast/linux | xmllint --xpath '/rss/channel/item/enclosure/@*[local-name()="version"]' - | cut -d= -f2- | tr -d '"' | head -n1)" + +narhash() { + nix --extra-experimental-features nix-command store prefetch-file --json "$url" | jq -r .hash +} + +nixeval() { + if [ "$#" -ge 2 ]; then + systemargs=(--argstr system "$2") + else + systemargs=() + fi + + nix --extra-experimental-features nix-command eval --json --impure "${systemargs[@]}" -f "$nixpkgs" "$1" | jq -r . +} + +findpath() { + path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" + outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" + + if [ -n "$outpath" ]; then + path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" + fi + + echo "$path" +} + +oldversion="${UPDATE_NIX_OLD_VERSION:-$(nixeval "$attr".version)}" + +pkgpath="$(findpath "$attr")" + +if [ "$version" = "$oldversion" ]; then + echo 'update.sh: New version same as old version, nothing to do.' + exit 0 +fi + +sed -i -e "/version\s*=/ s|\"$oldversion\"|\"$version\"|" "$pkgpath" + +for system in aarch64-linux armv7l-linux x86_64-linux; do + url="$(nixeval "$attr".src.url "$system")" + + curhash="$(nixeval "$attr".src.outputHash "$system")" + newhash="$(narhash "$url")" + + sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" +done diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index cfb63e0e3f7cb..e8e6a2cc9f867 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "5.1.4"; + version = "5.1.5"; kde-channel = "stable"; - sha256 = "sha256-wisCCGJZbrL92RHhsXnbvOewgb4RFFei6sr2rhzKLcs="; + sha256 = "1lx4x4affkbh47b7w5qvahkkr4db0vcw6h24nykak6gpy2z5wxqw"; }) diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index a9b0001847181..4adedcaffe793 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -2,7 +2,7 @@ , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons -, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib +, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib, libjxl , openjpeg, opencolorio_1, xsimd, poppler, curl, ilmbase, libmypaint, libwebp , qtmultimedia, qtx11extras, quazip , python3Packages @@ -26,15 +26,15 @@ mkDerivation rec { 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 + boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib libjxl openjpeg opencolorio_1 poppler curl ilmbase libmypaint libwebp qtmultimedia qtx11extras quazip python3Packages.pyqt5 xsimd ]; - NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] - ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"; + env.NIX_CFLAGS_COMPILE = toString ([ "-I${ilmbase.dev}/include/OpenEXR" ] + ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"); # Krita runs custom python scripts in CMake with custom PYTHONPATH which krita determined in their CMake script. # Patch the PYTHONPATH so python scripts can import sip successfully. diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index d0cf9af97d214..97d889c285c62 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -15,7 +15,7 @@ mkDerivation rec { sha256 = "1izmgjjp8mgyxv57sjjr05z7g7059ykb5wchlcn4wrnnb6aslnvn"; }; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; buildInputs = [ qtbase qtdeclarative qttools qtwebengine eigen diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index b1c4f2258f0b0..54f956981ee96 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,12 +1,12 @@ -{ lib, fetchFromGitLab, fetchurl -, boost, cmake, ffmpeg, qtbase, qtx11extras +{ lib, stdenv, fetchFromGitLab, fetchurl +, boost, cmake, ffmpeg, wrapQtAppsHook, qtbase, qtx11extras , qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper -, mkDerivation, ninja, mpi, python3, tbb, libGLU, libGL +, ninja, mpi, python3, tbb, libGLU, libGL , withDocs ? true }: let - version = "5.10.0"; + version = "5.11.0"; docFiles = [ (fetchurl { @@ -26,7 +26,7 @@ let }) ]; -in mkDerivation rec { +in stdenv.mkDerivation rec { pname = "paraview"; inherit version; @@ -35,7 +35,7 @@ in mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - sha256 = "0ipx6zq44hpic7gvv0s2jvjncak6vlmrz5sp9ypc15b15bna0gs2"; + sha256 = "sha256-WvkKGl5lG+apX6m4ULVZZVtDsSUjEVXe/seh95b+LmI="; fetchSubmodules = true; }; @@ -68,6 +68,7 @@ in mkDerivation rec { makeWrapper ninja gfortran + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix index c3207eb6c57c2..4e9f33621ffd2 100644 --- a/pkgs/applications/graphics/photoflare/default.nix +++ b/pkgs/applications/graphics/photoflare/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; - NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick"; + env.NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick"; meta = with lib; { description = "A cross-platform image editor with a powerful features and a very friendly graphical user interface"; diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 1cbbaf8ffe3bb..ddbeb4caa42ee 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "pineapple-pictures"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = version; - sha256 = "sha256-s4mJNPzrcg5UT8JC3D5ipaM8IvNFAK7e3V0TjVGeRdM="; + sha256 = "sha256-p51FlCeViDRNGUDN//IT4bLJpP2kU0CC67BCAlm0rYk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index b59f17278e08b..f38a9a9dcfe12 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -10,7 +10,7 @@ buildDotnetModule rec { pname = "Pinta"; - version = "2.1"; + version = "2.1.1"; nativeBuildInputs = [ intltool @@ -36,7 +36,7 @@ buildDotnetModule rec { owner = "PintaProject"; repo = "Pinta"; rev = version; - hash = "sha256-hugV4I13wZhPnVTUlGlaVxdjpGRvWDnfRVXgV+oy+sE="; + hash = "sha256-sdSGBf/dk+3Oy/aCfmIDuymwXQZwnth923Wdggir/Q0="; }; # https://github.com/NixOS/nixpkgs/issues/38991 diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index b6e03baace817..9cf2e50ea3b27 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -2,7 +2,7 @@ , mailcap, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig , dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim # Qt 5 subpackages -, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qtwebkit, qt3d, mlt +, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qt3d, mlt }: stdenv.mkDerivation rec { @@ -62,7 +62,6 @@ stdenv.mkDerivation rec { qtserialbus qtvirtualkeyboard qtmultimedia - qtwebkit ] ++ (with xorg; [ libX11 libXdamage diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 0075abc0f6f00..96ec02294ffdc 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, imlib2, file, lcms2, libexif } : stdenv.mkDerivation (rec { - version = "2.3.2"; + version = "2.3.3"; pname = "qiv"; src = fetchurl { url = "https://spiegl.de/qiv/download/${pname}-${version}.tgz"; - sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28"; + sha256 = "sha256-7whf/eLUiwWzZlk55a4eNZ06OBAI+4J2hPfW/UxTNwQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index f9120ca0ee482..706992e2961d6 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,24 +1,24 @@ -{ lib, mkDerivationWith, fetchurl, python3Packages +{ lib, mkDerivationWith, fetchFromGitHub, python3Packages , file, intltool, gobject-introspection, libgudev -, udisks, gexiv2, gst_all_1, libnotify +, udisks, gexiv2, gst_all_1, libnotify, ifuse, libimobiledevice , exiftool, gdk-pixbuf, libmediainfo, vmtouch }: mkDerivationWith python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.18"; + version = "0.9.34"; - src = fetchurl { - url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "15p7sssg6vmqbm5xnc4j5dr89d7gl7y5qyq44a240yl5aqkjnybw"; + src = fetchFromGitHub { + owner = "damonlynch"; + repo = "rapid-photo-downloader"; + rev = "v${version}"; + hash = "sha256-4VC1fwQh9L3c5tgLUaC36p9QHL4dR2vkWc2XlNl0Xzw="; }; - # Disable version check and fix install tests + # Disable version check postPatch = '' substituteInPlace raphodo/constants.py \ --replace "disable_version_check = False" "disable_version_check = True" - substituteInPlace raphodo/rescan.py \ - --replace "from preferences" "from raphodo.preferences" ''; nativeBuildInputs = [ @@ -28,9 +28,15 @@ mkDerivationWith python3Packages.buildPythonApplication rec { # Package has no generally usable unit tests. # The included doctests expect specific, hardcoded hardware to be present. - doCheck = false; + # Instead, we just make sure the program runs enough to report its version. + checkPhase = '' + export XDG_DATA_HOME=$(mktemp -d) + export QT_QPA_PLATFORM=offscreen + $out/bin/rapid-photo-downloader --detailed-version + ''; - # NOTE: Without gobject-introspection in buildInputs, launching fails with + # NOTE: Without gobject-introspection in buildInputs and strictDeps = false, + # launching fails with: # "Namespace [Notify / GExiv2 / GUdev] not available" buildInputs = [ gdk-pixbuf @@ -46,7 +52,11 @@ mkDerivationWith python3Packages.buildPythonApplication rec { udisks ]; + strictDeps = false; + propagatedBuildInputs = with python3Packages; [ + ifuse + libimobiledevice pyqt5 pygobject3 gphoto2 @@ -57,15 +67,19 @@ mkDerivationWith python3Packages.buildPythonApplication rec { arrow python-dateutil easygui + babel colour + pillow + pyheif pymediainfo sortedcontainers - rawkit requests colorlog pyprind + setuptools + show-in-file-manager tenacity - ]; + ] ++ lib.optional (pythonOlder "3.8") importlib-metadata; preFixup = '' makeWrapperArgs+=( diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index c1f78b1807f00..85bbd1414cd92 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,29 +1,66 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, pixman, libpthreadstubs, gtkmm3, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook -, lensfun, librsvg, gtk-mac-integration +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, wrapGAppsHook +, makeWrapper +, pixman +, libpthreadstubs +, gtkmm3 +, libXau +, libXdmcp +, lcms2 +, libiptcdata +, fftw +, expat +, pcre +, libsigcxx +, lensfun +, librsvg +, libcanberra-gtk3 +, gtk-mac-integration }: stdenv.mkDerivation rec { - version = "5.8"; pname = "rawtherapee"; + version = "5.9"; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - sha256 = "0d644s4grfia6f3k6y0byd5pwajr12kai2kc280yxi8v3w1b12ik"; + hash = "sha256-kdctfjss/DHEcaSDPXcmT20wXTwkI8moRX/i/5wT5Hg="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + postPatch = '' + echo "set(HG_VERSION ${version})" > ReleaseInfo.cmake + substituteInPlace tools/osx/Info.plist.in rtgui/config.h.in \ + --replace "/Applications" "${placeholder "out"}/Applications" + ''; - # This patch is upstream; remove it in 5.9. - patches = [ ./fix-6324.patch ] - # Disable upstream-enforced bundling on macOS. - ++ lib.optionals stdenv.isDarwin [ ./do-not-bundle.patch ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook + ] ++ lib.optionals stdenv.isDarwin [ + makeWrapper + ]; buildInputs = [ - pixman libpthreadstubs gtkmm3 libXau libXdmcp - lcms2 libiptcdata fftw expat pcre libsigcxx lensfun librsvg + pixman + libpthreadstubs + gtkmm3 + libXau + libXdmcp + lcms2 + libiptcdata + fftw + expat + pcre + libsigcxx + lensfun + librsvg ] ++ lib.optionals stdenv.isLinux [ libcanberra-gtk3 ] ++ lib.optionals stdenv.isDarwin [ @@ -33,12 +70,22 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" "-DCACHE_NAME_SUFFIX=\"\"" + ] ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; - CMAKE_CXX_FLAGS = "-std=c++11 -Wno-deprecated-declarations -Wno-unused-result"; + CMAKE_CXX_FLAGS = toString [ + "-std=c++11" + "-Wno-deprecated-declarations" + "-Wno-unused-result" + ]; - postUnpack = '' - echo "set(HG_VERSION $version)" > $sourceRoot/ReleaseInfo.cmake + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications/RawTherapee.app $out/bin + cp -R Release $out/Applications/RawTherapee.app/Contents + for f in $out/Applications/RawTherapee.app/Contents/MacOS/*; do + makeWrapper $f $out/bin/$(basename $f) + done ''; meta = { diff --git a/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch b/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch deleted file mode 100644 index 8c3257e888c57..0000000000000 --- a/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0a55ca6d5..68c059aa5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -233,6 +233,6 @@ if(WIN32 OR APPLE) - endif() -- set(BUILD_BUNDLE ON FORCE) -+ set(BUILD_BUNDLE OFF) - endif() - - if(NOT DEFINED BUNDLE_BASE_INSTALL_DIR) -- if(APPLE) -+ if(FALSE) diff --git a/pkgs/applications/graphics/rawtherapee/fix-6324.patch b/pkgs/applications/graphics/rawtherapee/fix-6324.patch deleted file mode 100644 index fa324c2c9389b..0000000000000 --- a/pkgs/applications/graphics/rawtherapee/fix-6324.patch +++ /dev/null @@ -1,356 +0,0 @@ -See: - https://github.com/Beep6581/RawTherapee/issues/6324 - https://github.com/Beep6581/RawTherapee/commit/2e0137d54243eb729d4a5f939c4320ec8f8f415d - -diff --git a/rtengine/canon_cr3_decoder.cc b/rtengine/canon_cr3_decoder.cc -index 6274154cb..98c743dad 100644 ---- a/rtengine/canon_cr3_decoder.cc -+++ b/rtengine/canon_cr3_decoder.cc -@@ -662,7 +662,7 @@ std::uint32_t _byteswap_ulong(std::uint32_t x) - #endif - - struct LibRaw_abstract_datastream { -- IMFILE* ifp; -+ rtengine::IMFILE* ifp; - - void lock() - { -diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc -index 812f122b3..5da696af2 100644 ---- a/rtengine/dcraw.cc -+++ b/rtengine/dcraw.cc -@@ -2025,7 +2025,7 @@ void CLASS phase_one_load_raw_c() - #endif - { - int len[2], pred[2]; -- IMFILE ifpthr = *ifp; -+ rtengine::IMFILE ifpthr = *ifp; - ifpthr.plistener = nullptr; - - #ifdef _OPENMP -@@ -3380,7 +3380,7 @@ void CLASS sony_arw2_load_raw() - { - uchar *data = new (std::nothrow) uchar[raw_width + 1]; - merror(data, "sony_arw2_load_raw()"); -- IMFILE ifpthr = *ifp; -+ rtengine::IMFILE ifpthr = *ifp; - int pos = ifpthr.pos; - ushort pix[16]; - -@@ -6394,7 +6394,7 @@ int CLASS parse_tiff_ifd (int base) - unsigned sony_curve[] = { 0,0,0,0,0,4095 }; - unsigned *buf, sony_offset=0, sony_length=0, sony_key=0; - struct jhead jh; --/*RT*/ IMFILE *sfp; -+/*RT*/ rtengine::IMFILE *sfp; - /*RT*/ int pana_raw = 0; - - if (tiff_nifds >= sizeof tiff_ifd / sizeof tiff_ifd[0]) -@@ -6958,7 +6958,7 @@ it under the terms of the one of two licenses as you choose: - fread (buf, sony_length, 1, ifp); - sony_decrypt (buf, sony_length/4, 1, sony_key); - sfp = ifp; --/*RT*/ ifp = fopen (buf, sony_length); -+/*RT*/ ifp = rtengine::fopen (buf, sony_length); - // if ((ifp = tmpfile())) { - // fwrite (buf, sony_length, 1, ifp); - // fseek (ifp, 0, SEEK_SET); -@@ -7264,7 +7264,7 @@ void CLASS parse_external_jpeg() - { - const char *file, *ext; - char *jname, *jfile, *jext; --/*RT*/ IMFILE *save=ifp; -+/*RT*/ rtengine::IMFILE *save=ifp; - - ext = strrchr (ifname, '.'); - file = strrchr (ifname, '/'); -@@ -7292,7 +7292,7 @@ void CLASS parse_external_jpeg() - *jext = '0'; - } - if (strcmp (jname, ifname)) { --/*RT*/ if ((ifp = fopen (jname))) { -+/*RT*/ if ((ifp = rtengine::fopen (jname))) { - // if ((ifp = fopen (jname, "rb"))) { - if (verbose) - fprintf (stderr,_("Reading metadata from %s ...\n"), jname); -diff --git a/rtengine/dcraw.h b/rtengine/dcraw.h -index 89c1fcaff..f25157088 100644 ---- a/rtengine/dcraw.h -+++ b/rtengine/dcraw.h -@@ -73,7 +73,7 @@ public: - - protected: - int exif_base, ciff_base, ciff_len; -- IMFILE *ifp; -+ rtengine::IMFILE *ifp; - FILE *ofp; - short order; - const char *ifname; -@@ -125,7 +125,7 @@ protected: - int cur_buf_size; // buffer size - uchar *cur_buf; // currently read block - int fillbytes; // Counter to add extra byte for block size N*16 -- IMFILE *input; -+ rtengine::IMFILE *input; - struct int_pair grad_even[3][41]; // tables of gradients - struct int_pair grad_odd[3][41]; - ushort *linealloc; -@@ -278,7 +278,7 @@ void parse_redcine(); - class getbithuff_t - { - public: -- getbithuff_t(DCraw *p,IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} -+ getbithuff_t(DCraw *p,rtengine::IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} - unsigned operator()(int nbits, ushort *huff); - - private: -@@ -288,7 +288,7 @@ private: - DCraw *parent; - unsigned bitbuf; - int vbits, reset; -- IMFILE *&ifp; -+ rtengine::IMFILE *&ifp; - unsigned &zero_after_ff; - }; - getbithuff_t getbithuff; -@@ -296,7 +296,7 @@ getbithuff_t getbithuff; - class nikbithuff_t - { - public: -- explicit nikbithuff_t(IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} -+ explicit nikbithuff_t(rtengine::IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} - void operator()() {bitbuf = vbits = 0;}; - unsigned operator()(int nbits, ushort *huff); - unsigned errorCount() { return errors; } -@@ -309,7 +309,7 @@ private: - } - unsigned bitbuf, errors; - int vbits; -- IMFILE *&ifp; -+ rtengine::IMFILE *&ifp; - }; - nikbithuff_t nikbithuff; - -@@ -378,7 +378,7 @@ void parse_qt (int end); - // ph1_bithuff(int nbits, ushort *huff); - class ph1_bithuff_t { - public: -- ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} -+ ph1_bithuff_t(DCraw *p, rtengine::IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} - unsigned operator()(int nbits, ushort *huff); - unsigned operator()(int nbits); - unsigned operator()(); -@@ -412,7 +412,7 @@ private: - } - - short ℴ -- IMFILE* const ifp; -+ rtengine::IMFILE* const ifp; - UINT64 bitbuf; - int vbits; - }; -@@ -430,11 +430,11 @@ void nokia_load_raw(); - - class pana_bits_t{ - public: -- pana_bits_t(IMFILE *i, unsigned &u, unsigned enc): -+ pana_bits_t(rtengine::IMFILE *i, unsigned &u, unsigned enc): - ifp(i), load_flags(u), vbits(0), encoding(enc) {} - unsigned operator()(int nbits, unsigned *bytes=nullptr); - private: -- IMFILE *ifp; -+ rtengine::IMFILE *ifp; - unsigned &load_flags; - uchar buf[0x4000]; - int vbits; -diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc -index 1fb1d2e1b..951df2248 100644 ---- a/rtengine/dfmanager.cc -+++ b/rtengine/dfmanager.cc -@@ -540,7 +540,7 @@ std::vector<badPix> *DFManager::getHotPixels ( const std::string &mak, const std - - int DFManager::scanBadPixelsFile( Glib::ustring filename ) - { -- FILE *file = fopen( filename.c_str(), "r" ); -+ FILE *file = ::fopen( filename.c_str(), "r" ); - - if( !file ) { - return false; -diff --git a/rtengine/myfile.cc b/rtengine/myfile.cc -index 842766dcf..2321d18bb 100644 ---- a/rtengine/myfile.cc -+++ b/rtengine/myfile.cc -@@ -70,7 +70,7 @@ int munmap(void *start, size_t length) - - #ifdef MYFILE_MMAP - --IMFILE* fopen (const char* fname) -+rtengine::IMFILE* rtengine::fopen (const char* fname) - { - int fd; - -@@ -123,13 +123,13 @@ IMFILE* fopen (const char* fname) - return mf; - } - --IMFILE* gfopen (const char* fname) -+rtengine::IMFILE* rtengine::gfopen (const char* fname) - { - return fopen(fname); - } - #else - --IMFILE* fopen (const char* fname) -+rtengine::IMFILE* rtengine::fopen (const char* fname) - { - - FILE* f = g_fopen (fname, "rb"); -@@ -152,7 +152,7 @@ IMFILE* fopen (const char* fname) - return mf; - } - --IMFILE* gfopen (const char* fname) -+rtengine::IMFILE* rtengine::gfopen (const char* fname) - { - - FILE* f = g_fopen (fname, "rb"); -@@ -176,7 +176,7 @@ IMFILE* gfopen (const char* fname) - } - #endif //MYFILE_MMAP - --IMFILE* fopen (unsigned* buf, int size) -+rtengine::IMFILE* rtengine::fopen (unsigned* buf, int size) - { - - IMFILE* mf = new IMFILE; -@@ -190,7 +190,7 @@ IMFILE* fopen (unsigned* buf, int size) - return mf; - } - --void fclose (IMFILE* f) -+void rtengine::fclose (IMFILE* f) - { - #ifdef MYFILE_MMAP - -@@ -207,7 +207,7 @@ void fclose (IMFILE* f) - delete f; - } - --int fscanf (IMFILE* f, const char* s ...) -+int rtengine::fscanf (IMFILE* f, const char* s ...) - { - // fscanf not easily wrapped since we have no terminating \0 at end - // of file data and vsscanf() won't tell us how many characters that -@@ -253,7 +253,7 @@ int fscanf (IMFILE* f, const char* s ...) - } - - --char* fgets (char* s, int n, IMFILE* f) -+char* rtengine::fgets (char* s, int n, IMFILE* f) - { - - if (f->pos >= f->size) { -@@ -270,7 +270,7 @@ char* fgets (char* s, int n, IMFILE* f) - return s; - } - --void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) -+void rtengine::imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) - { - f->plistener = plistener; - f->progress_range = progress_range; -@@ -278,7 +278,7 @@ void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, doub - f->progress_current = 0; - } - --void imfile_update_progress(IMFILE *f) -+void rtengine::imfile_update_progress(IMFILE *f) - { - if (!f->plistener || f->progress_current < f->progress_next) { - return; -diff --git a/rtengine/myfile.h b/rtengine/myfile.h -index 423edea9a..c655696e6 100644 ---- a/rtengine/myfile.h -+++ b/rtengine/myfile.h -@@ -30,8 +30,6 @@ namespace rtengine - - class ProgressListener; - --} -- - struct IMFILE { - int fd; - ssize_t pos; -@@ -141,3 +139,5 @@ inline unsigned char* fdata(int offset, IMFILE* f) - - int fscanf (IMFILE* f, const char* s ...); - char* fgets (char* s, int n, IMFILE* f); -+ -+} -diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc -index 9da601e2a..097b9e711 100644 ---- a/rtengine/rtthumbnail.cc -+++ b/rtengine/rtthumbnail.cc -@@ -1922,7 +1922,7 @@ bool Thumbnail::writeImage (const Glib::ustring& fname) - - Glib::ustring fullFName = fname + ".rtti"; - -- FILE* f = g_fopen (fullFName.c_str (), "wb"); -+ FILE* f = ::g_fopen (fullFName.c_str (), "wb"); - - if (!f) { - return false; -@@ -1965,7 +1965,7 @@ bool Thumbnail::readImage (const Glib::ustring& fname) - return false; - } - -- FILE* f = g_fopen(fullFName.c_str (), "rb"); -+ FILE* f = ::g_fopen(fullFName.c_str (), "rb"); - - if (!f) { - return false; -@@ -2191,7 +2191,7 @@ bool Thumbnail::writeData (const Glib::ustring& fname) - return false; - } - -- FILE *f = g_fopen (fname.c_str (), "wt"); -+ FILE *f = ::g_fopen (fname.c_str (), "wt"); - - if (!f) { - if (settings->verbose) { -@@ -2214,7 +2214,7 @@ bool Thumbnail::readEmbProfile (const Glib::ustring& fname) - embProfile = nullptr; - embProfileLength = 0; - -- FILE* f = g_fopen (fname.c_str (), "rb"); -+ FILE* f = ::g_fopen (fname.c_str (), "rb"); - - if (f) { - if (!fseek (f, 0, SEEK_END)) { -@@ -2242,7 +2242,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname) - { - - if (embProfileData) { -- FILE* f = g_fopen (fname.c_str (), "wb"); -+ FILE* f = ::g_fopen (fname.c_str (), "wb"); - - if (f) { - fwrite (embProfileData, 1, embProfileLength, f); -@@ -2257,7 +2257,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname) - bool Thumbnail::readAEHistogram (const Glib::ustring& fname) - { - -- FILE* f = g_fopen(fname.c_str(), "rb"); -+ FILE* f = ::g_fopen(fname.c_str(), "rb"); - - if (!f) { - aeHistogram.reset(); -@@ -2280,7 +2280,7 @@ bool Thumbnail::writeAEHistogram (const Glib::ustring& fname) - { - - if (aeHistogram) { -- FILE* f = g_fopen (fname.c_str (), "wb"); -+ FILE* f = ::g_fopen (fname.c_str (), "wb"); - - if (f) { - fwrite (&aeHistogram[0], 1, (65536 >> aeHistCompression)*sizeof (aeHistogram[0]), f); diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 8da308ba61756..0af4a3909825e 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -23,19 +23,19 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.12"; + version = "0.5.14"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-wrx8+18jVDIhYhxD8VgU8wlRDLoUwMWIBOzSUozjUII="; + hash = "sha256-55hB8UyK+EPJ6/Yj5yNK6endNU9Ux/kZmQNjcrYq6KU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-t0nmfM6Z30c+n0iANjMBVifOhYMXdBqgjxYdhOPOhYQ="; + hash = "sha256-NPRImc0nVhYgq9JfGoSM1mT1Z6KQjVWgoLIagOUCM5M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 007483fb5e260..cd64c7b8d44e4 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , sane-backends , sane-frontends , libX11 @@ -10,15 +10,19 @@ , libusb-compat-0_1 , gimpSupport ? false , gimp +, nix-update-script }: stdenv.mkDerivation rec { pname = "xsane"; version = "0.999"; - src = fetchurl { - url = "http://www.xsane.org/download/xsane-${version}.tar.gz"; - sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp"; + src = fetchFromGitLab { + owner = "frontend"; + group = "sane-project"; + repo = pname; + rev = version; + hash = "sha256-oOg94nUsT9LLKnHocY0S5g02Y9a1UazzZAjpEI/s+yM="; }; preConfigure = '' @@ -31,11 +35,13 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libusb-compat-0_1 sane-backends sane-frontends libX11 gtk2 ] ++ lib.optional gimpSupport gimp; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ melling ]; }; } diff --git a/pkgs/applications/graphics/structorizer/default.nix b/pkgs/applications/graphics/structorizer/default.nix new file mode 100755 index 0000000000000..ca58271425d94 --- /dev/null +++ b/pkgs/applications/graphics/structorizer/default.nix @@ -0,0 +1,104 @@ +{ stdenv +, lib +, fetchFromGitHub +, jdk11 +, makeDesktopItem +, makeWrapper +, copyDesktopItems +}: + +stdenv.mkDerivation rec { + pname = "structorizer"; + version = "3.32-11"; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "Structorizer"; + desktopName = "Structorizer"; + genericName = "Diagram creator"; + comment = meta.description; + icon = pname; + exec = pname; + terminal = false; + mimeTypes = [ "application/nsd" ]; + categories = [ + "Development" + "Graphics" + "VectorGraphics" + "RasterGraphics" + "ComputerScience" + ]; + keywords = [ "nsd" "diagrams" ]; + }) + ]; + + src = fetchFromGitHub { + owner = "fesch"; + repo = "Structorizer.Desktop"; + rev = version; + hash = "sha256-rGyeOcGm6uBplgTjMIOy/xRekfHacwDy9kkMigmRSdk="; + }; + + patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; + + strictDeps = true; + + nativeBuildInputs = [ jdk11 makeWrapper copyDesktopItems ]; + + buildInputs = [ jdk11 ]; + + postPatch = '' + chmod +x makeStructorizer + chmod +x makeBigJar + + patchShebangs --build makeStructorizer + patchShebangs --build makeBigJar + ''; + + buildPhase = '' + runHook preBuild + + ./makeStructorizer + ./makeBigJar + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -d $out/bin $out/share/mime/packages + + install -D ${pname}.jar -t $out/share/java/ + makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ + --add-flags "-jar $out/share/java/${pname}.jar" + + cat << EOF > $out/share/mime/packages/structorizer.xml + <?xml version="1.0" encoding="UTF-8"?> + <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> + <mime-type type="application/nsd"> + <comment xml:lang="en">Nassi-Shneiderman diagram</comment> + <comment xml:lang="de">Nassi-Shneiderman-Diagramm</comment> + <glob pattern="*.nsd"/> + </mime-type> + </mime-info> + EOF + + cd src/lu/fisch/${pname}/gui + install -vD icons/000_${pname}.png $out/share/icons/hicolor/16x16/apps/${pname}.png + for icon_width in 24 32 48 64 128 256; do + install -vD icons_"$icon_width"/000_${pname}.png $out/share/icons/hicolor/"$icon_width"x"$icon_width"/apps/${pname}.png + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Create Nassi-Shneiderman diagrams (NSD)"; + homepage = "https://structorizer.fisch.lu"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ annaaurora ]; + }; +} diff --git a/pkgs/applications/graphics/structorizer/makeBigJar.patch b/pkgs/applications/graphics/structorizer/makeBigJar.patch new file mode 100644 index 0000000000000..2090a7b35a45a --- /dev/null +++ b/pkgs/applications/graphics/structorizer/makeBigJar.patch @@ -0,0 +1,31 @@ +Reason: Running the program in a headless environment fails. Besides, tests should be conducted in passthru.tests anyway. There is also no AppleStructorizerApplication.class, only the jar. + +diff --git a/makeBigJar b/makeBigJar +index 25547020..c34d0d9c 100644 +--- a/makeBigJar ++++ b/makeBigJar +@@ -75,9 +75,8 @@ jars="bsh-2.1.0 \ + freehep-xml-2.1.1 \ + freehep" + +-# Apple specific stuff is only used if it exists and the compiled class is available +-if test -f ../bin/lu/fisch/structorizer/application/AppleStructorizerApplication.class -a \ +- -f AppleJavaExtensions.jar; then ++# Apple specific stuff is only used if the jar is available ++if test -f lib/AppleJavaExtensions.jar; then + jars="$jars AppleJavaExtensions" + fi + +@@ -114,12 +113,3 @@ echo "Done" + # remove the jar-directory + rm -R jar/ + +-if test -n "$start_compiled"; then +- # execute the archive +- echo; echo "Running Structorizer from all-in-one jar" +- if test "$start_compiled" = "s"; then +- java -jar structorizer.jar +- else +- java -jar structorizer.jar & +- fi +-fi # start block end diff --git a/pkgs/applications/graphics/structorizer/makeStructorizer.patch b/pkgs/applications/graphics/structorizer/makeStructorizer.patch new file mode 100644 index 0000000000000..b08ec0f30f6fe --- /dev/null +++ b/pkgs/applications/graphics/structorizer/makeStructorizer.patch @@ -0,0 +1,54 @@ +Reason: There is no StructorizerApplet.java anywhere in the source, no .cgt files and running the program in a headless environment fails. Besides, tests should be conducted in passthru.tests anyway. There is also no AppleStructorizerApplication.java, only the jar. + +diff --git a/makeStructorizer b/makeStructorizer +index 99a5e8d3..e954be13 100644 +--- a/makeStructorizer ++++ b/makeStructorizer +@@ -117,18 +117,6 @@ echo "Done" + echo; echo "Compiling Structorizer..." + javac $str_javac_opts -classpath "$str_classpath" Structorizer.java + echo "Done" +-echo; echo "Compiling Structorizer Applet..." +-javac $str_javac_opts -classpath "$str_classpath" StructorizerApplet.java +-echo "Done" +- +-# OS specific classes +-if test -n "$do_apple"; then +- echo; echo "Compiling Apple specific code..." +- javac $str_javac_opts -classpath "$str_classpath" lu/fisch/structorizer/application/AppleStructorizerApplication.java +- echo "Done" +-else +- echo; echo "Apple specific code skipped" +-fi + + # copying some other files to binary tree + echo; echo "Copying resources..." +@@ -147,7 +135,6 @@ cp lu/fisch/structorizer/gui/*.txt ../bin/lu/fisch/structorizer/gui/ + cp lu/fisch/structorizer/gui/*.xml ../bin/lu/fisch/structorizer/gui/ + cp lu/fisch/structorizer/locales/*.txt ../bin/lu/fisch/structorizer/locales/ + cp lu/fisch/structorizer/generators/*.txt ../bin/lu/fisch/structorizer/generators/ +-cp lu/fisch/structorizer/parsers/*.cgt ../bin/lu/fisch/structorizer/parsers/ + cp lu/fisch/structorizer/parsers/*.egt ../bin/lu/fisch/structorizer/parsers/ + cp lu/fisch/structorizer/parsers/*.grm ../bin/lu/fisch/structorizer/parsers/ + cp lu/fisch/structorizer/parsers/*.xsd ../bin/lu/fisch/structorizer/parsers/ +@@ -155,20 +142,5 @@ cp lu/fisch/structorizer/parsers/*.nsd ../bin/lu/fisch/structorizer/parsers/ + cp lu/fisch/structorizer/*.properties ../bin/lu/fisch/structorizer/ + echo "Done" + +-if test -n "$start_compiled"; then +- +- # changing into binary directory +- cd ../bin/ +- +- # run the application +- echo; echo "Running Structorizer from compiled class files" +- if test "$start_compiled" = "s"; then +- java -cp $str_classpath Structorizer +- else +- java -cp $str_classpath Structorizer & +- fi +- +-fi # start block end +- + # move back into the folder where we started + popd >/dev/null diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 16365674706ed..bf19d0f77eb6f 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -3,15 +3,23 @@ stdenv.mkDerivation rec { pname = "tesseract"; - version = "3.05.00"; + version = "3.05.02"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - hash = "sha256-YHj00gG/3SW0ILTiQwphiCxuP9OCDya27hyFQB27mYc="; + hash = "sha256-28osuZnVwkJpNTYkU+5D5PI8xtViFzGCMScHzkS2H20="; }; + # leptonica 1.83 made internal structures private. using internal headers isn't + # great, but tesseract3's days are numbered anyway + postPatch = '' + for f in textord/devanagari_processing.cpp cube/cube_line_object.h cube/cube_line_segmenter.h cube/cube_utils.h ; do + sed -i '/allheaders.h/a#include "pix_internal.h"' "$f" + done + ''; + enableParallelBuilding = true; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index 36c4c694a16a8..aecdf58186d05 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -3,26 +3,20 @@ stdenv.mkDerivation rec { pname = "tesseract"; - version = "4.1.1"; + version = "4.1.3"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - hash = "sha256-lu/Y5mlCI8AajhiWaID0fGo5PghEQZdgt2X0K9c/QrE="; + hash = "sha256-sV3w53ky13ESc0dGPutMGQ4TcmOeWJkvUwBPIyzSTc8="; }; - patches = [ - # https://github.com/tesseract-ocr/tesseract/issues/3447 - (fetchpatch { - url = "https://github.com/tesseract-ocr/tesseract/commit/dbc79b09d195490dfa3f7d338eadac07ad6683f7.patch"; - sha256 = "sha256-lGlg0etuU4RXfdq1QH2bYObdeGrFHKf9O8zMUAbfNIQ="; - }) - (fetchpatch { - url = "https://github.com/tesseract-ocr/tesseract/commit/6dc4b184b1ebf2e68461f6b63f63a033bc7245f7.patch"; - sha256 = "sha256-DwIX3r5NmeajI6WgIVHDbkhLH/ygJIjPO5XrbzWQhSw="; - }) - ]; + # leptonica 1.83 made internal structures private. using internal headers isn't + # great, but tesseract4's days are numbered anyway + postPatch = '' + sed -i '/allheaders.h/a#include "pix_internal.h"' src/textord/devanagari_processing.cpp + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/applications/graphics/vkdt/default.nix index 757bf7cb7b53b..e9b24e4c61f10 100644 --- a/pkgs/applications/graphics/vkdt/default.nix +++ b/pkgs/applications/graphics/vkdt/default.nix @@ -23,32 +23,38 @@ stdenv.mkDerivation rec { pname = "vkdt"; - version = "0.5.1"; + version = "0.5.4"; src = fetchurl { url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-IMCS6bJqOzPeAFZyQtjzd1rQ5ugIevqoFUW6Y0w1Pzs="; + sha256 = "sha256-lyljfJ4RZETEED4bofC/Rq88PMNhoHO1kgHmmaXPuhM="; }; - buildInputs = [ - vulkan-headers - vulkan-tools - vulkan-loader - glslang - glfw - libjpeg - pkg-config - rsync - cmake + strictDeps = true; + + nativeBuildInputs = [ clang + cmake + glslang llvm llvmPackages.openmp - pugixml - freetype + pkg-config + rsync + ]; + + buildInputs = [ exiv2 ffmpeg - libvorbis + freetype + glfw + libjpeg libmad + libvorbis + llvmPackages.openmp + pugixml + vulkan-headers + vulkan-loader + vulkan-tools ]; dontUseCmakeConfigure = true; @@ -60,5 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hanatos/vkdt"; license = licenses.bsd2; maintainers = with maintainers; [ paperdigits ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 2ba96fda3f0b9..e79f322be5e4c 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -1,32 +1,50 @@ -{ lib, stdenv, fetchurl, aalib, gsl, libpng, libX11, xorgproto, libXext -, libXt, zlib, gettext, intltool, perl }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qttools, wrapQtAppsHook, copyDesktopItems }: -stdenv.mkDerivation rec { +let datapath = "$out/share/XaoS"; +in stdenv.mkDerivation rec { pname = "xaos"; - version = "3.6"; + version = "4.2.1"; + outputs = [ "out" "man" ]; - src = fetchurl { - url = "mirror://sourceforge/xaos/${pname}-${version}.tar.gz"; - sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq"; + src = fetchFromGitHub { + owner = "xaos-project"; + repo = pname; + rev = "release-${version}"; + hash = "sha256-JLF8Mz/OHZEEJG/aryKQuJ6B5R8hPJdvln7mbKoqXFU="; }; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ qmake qttools wrapQtAppsHook copyDesktopItems ]; + buildInputs = [ qtbase ]; - nativeBuildInputs = [ intltool ]; - buildInputs = [ - aalib gsl libpng libX11 xorgproto libXext - libXt zlib gettext perl - ]; + QMAKE_LRELEASE = "lrelease"; + DEFINES = [ "USE_OPENGL" "USE_FLOAT128" ]; - preConfigure = '' - sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') - mkdir -p $out/share/locale + postPatch = '' + substituteInPlace src/include/config.h \ + --replace "/usr/share/XaoS" "${datapath}" ''; - meta = { - homepage = "http://xaos.sourceforge.net/"; - description = "Fractal viewer"; + desktopItems = [ "xdg/xaos.desktop" ]; + + installPhase = '' + runHook preInstall + + install -D bin/xaos "$out/bin/xaos" + + mkdir -p "${datapath}" + cp -r tutorial examples catalogs "${datapath}" + + install -D "xdg/${pname}.png" "$out/share/icons/${pname}.png" + + install -D doc/xaos.6 "$man/man6/xaos.6" + runHook postInstall + ''; + + meta = src.meta // { + description = "Real-time interactive fractal zoomer"; + homepage = "https://xaos-project.github.io/"; license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ ehmry ]; }; } diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index dcea56f16d76a..a2e90571e93d5 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.1/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.2/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kalendar.nix b/pkgs/applications/kde/kalendar.nix index eb5649a32252a..1bf6f3d1e1396 100644 --- a/pkgs/applications/kde/kalendar.nix +++ b/pkgs/applications/kde/kalendar.nix @@ -13,6 +13,7 @@ , qqc2-desktop-style , kirigami2 +, kirigami-addons , kdbusaddons , ki18n , kcalendarcore @@ -59,6 +60,7 @@ mkDerivation rec { qqc2-desktop-style kirigami2 + kirigami-addons kdbusaddons ki18n kcalendarcore @@ -97,7 +99,7 @@ mkDerivation rec { description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)"; homepage = "https://apps.kde.org/kalendar/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chuangzhu ]; + maintainers = with maintainers; [ Thra11 ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix index f96e8cf6b677e..468e264915c81 100644 --- a/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdevelop-pg-qt"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; + sha256 = "sha256-PVZgTEefjwSuMqUj7pHzB4xxcRfQ3rOelz4iSUy7ZfE="; }; nativeBuildInputs = [ cmake pkg-config extra-cmake-modules ]; diff --git a/pkgs/applications/kde/kdevelop/wrapper.nix b/pkgs/applications/kde/kdevelop/wrapper.nix index 86d3de9eb39a9..c73f2bba7b508 100644 --- a/pkgs/applications/kde/kdevelop/wrapper.nix +++ b/pkgs/applications/kde/kdevelop/wrapper.nix @@ -1,7 +1,7 @@ -{ symlinkJoin, kdevelop-unwrapped, plugins ? null }: +{ lib, symlinkJoin, kdevelop-unwrapped, plugins ? null }: symlinkJoin { name = "kdevelop-with-plugins"; - paths = [ kdevelop-unwrapped ] ++ (if plugins != null then plugins else []); + paths = [ kdevelop-unwrapped ] ++ (lib.optionals (plugins != null) plugins); } diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index 8262febad7afb..65213fa15afb6 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -3,7 +3,7 @@ , kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet , kwidgetsaddons, kwindowsystem, kxmlgui, kwayland , libvncserver, libXtst, libXdamage -, qtx11extras +, qtx11extras, pipewire, plasma-wayland-protocols, wayland }: mkDerivation { @@ -20,6 +20,9 @@ mkDerivation { kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons kwindowsystem kxmlgui kwayland qtx11extras + pipewire + plasma-wayland-protocols + wayland ]; propagatedBuildInputs = [ kdnssd ]; } diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix index 2ea662419b17c..5fa200978353c 100644 --- a/pkgs/applications/kde/print-manager.nix +++ b/pkgs/applications/kde/print-manager.nix @@ -22,5 +22,5 @@ mkDerivation { outputs = [ "out" "dev" ]; # Fix build with cups deprecations etc. # See: https://github.com/NixOS/nixpkgs/issues/73334 - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security"; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 70a00826dc3de..81ae24b71c833 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1875 +4,1875 @@ { akonadi = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-22.12.1.tar.xz"; - sha256 = "1kb0hf705jqsbv075ja7pfh7yyfnxp5cigcgrdw4i0wh94rr1c3d"; - name = "akonadi-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-22.12.2.tar.xz"; + sha256 = "19cqzpn28xw8g1m9g4z45wh0z2waygx0cbir8yp6xwl78ax9qss1"; + name = "akonadi-22.12.2.tar.xz"; }; }; akonadi-calendar = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-calendar-22.12.1.tar.xz"; - sha256 = "07pk2ivfmf4pcmhafs17bvh63rqq70pybrv9qj2p6lih52a9021g"; - name = "akonadi-calendar-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-calendar-22.12.2.tar.xz"; + sha256 = "0y9dxh3c7044bilky05xhmx15mk3bq1yfpsirn1w6r0pygnrhvgs"; + name = "akonadi-calendar-22.12.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-calendar-tools-22.12.1.tar.xz"; - sha256 = "144k1isdb805zp6mrmpx8n8xww4kv0xd6kp4cziwnbwm46iipwqa"; - name = "akonadi-calendar-tools-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-calendar-tools-22.12.2.tar.xz"; + sha256 = "12p0702gddh0ssz8hnk0vxklj8bpq3n81qz565i4biifamn0zids"; + name = "akonadi-calendar-tools-22.12.2.tar.xz"; }; }; akonadi-contacts = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-contacts-22.12.1.tar.xz"; - sha256 = "1hzgc1bljjf6ac40fsgv5rgndq7s2hl5kn0hc7lb8vkbaab0zmni"; - name = "akonadi-contacts-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-contacts-22.12.2.tar.xz"; + sha256 = "04q72c7k5jnwh16sxap3wlany5kl1wcxaidwk8s7zyssf4zpri1h"; + name = "akonadi-contacts-22.12.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-import-wizard-22.12.1.tar.xz"; - sha256 = "1hlpsnh2v2f5asi07b46n18rhzqcc176n308503xnpmf33iw6dan"; - name = "akonadi-import-wizard-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-import-wizard-22.12.2.tar.xz"; + sha256 = "1iiagyj1q321vn54azq69fkiqjf1ky01bb2ddd97zzll7z4ly5q0"; + name = "akonadi-import-wizard-22.12.2.tar.xz"; }; }; akonadi-mime = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-mime-22.12.1.tar.xz"; - sha256 = "0gz7xn1pkiidmhiwnha6a9ffkyihv8dxvdym2k8amsvabp08nxa8"; - name = "akonadi-mime-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-mime-22.12.2.tar.xz"; + sha256 = "08d8hd5xxmwf2fxnc4g41almcr76pp6gdx54ndxs3n1s3l31mmip"; + name = "akonadi-mime-22.12.2.tar.xz"; }; }; akonadi-notes = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-notes-22.12.1.tar.xz"; - sha256 = "11m38nc3prfar3430makyg9fa3xc2bflyw99lxbfamvh5sk2miv5"; - name = "akonadi-notes-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-notes-22.12.2.tar.xz"; + sha256 = "1n61acjdhsr7nhy5jr261x4h97a2fcf3hlrig7vin4sjp263ik6f"; + name = "akonadi-notes-22.12.2.tar.xz"; }; }; akonadi-search = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-search-22.12.1.tar.xz"; - sha256 = "0hmd6jl3asv4dkicpn05friic61xx0cjz87qznkmknrrlh1hwd8n"; - name = "akonadi-search-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-search-22.12.2.tar.xz"; + sha256 = "1zg0sqzw4vgxghp32k3yb5kixh4nivzpx3gacr94f22jq8h2pgny"; + name = "akonadi-search-22.12.2.tar.xz"; }; }; akonadiconsole = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadiconsole-22.12.1.tar.xz"; - sha256 = "1jgmds3qy74hwcxqnrg9nyndpdp5g9ys83jkjgbf61xzzw83fvgl"; - name = "akonadiconsole-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadiconsole-22.12.2.tar.xz"; + sha256 = "158xgm4z9hk8gzf9z8fnf5mqbryhf6rw3d68195gwfp9i0f3b488"; + name = "akonadiconsole-22.12.2.tar.xz"; }; }; akregator = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akregator-22.12.1.tar.xz"; - sha256 = "14fm2qcc87wawhskc31np9s3i87bmjwy2blzzl4430l6jpgqv0q7"; - name = "akregator-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akregator-22.12.2.tar.xz"; + sha256 = "14s2rcfb7p3yyp46lf91a5ssi0bnh5ff2rcq2sd6z9d8yi01vl9s"; + name = "akregator-22.12.2.tar.xz"; }; }; analitza = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/analitza-22.12.1.tar.xz"; - sha256 = "0wjry2ls7fpi6jdcar4wr9ric5vgzbwqgjyjz2xkgd54l9sqbllv"; - name = "analitza-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/analitza-22.12.2.tar.xz"; + sha256 = "07ch3vsaf9dily42gdyvph52rnvbrcrfnmsav5nvs98ymvkqj241"; + name = "analitza-22.12.2.tar.xz"; }; }; ark = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ark-22.12.1.tar.xz"; - sha256 = "033y3dcxxvkbfqq9ncv0wxnyqdkbg988jn500hvkgzg87ddj8317"; - name = "ark-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ark-22.12.2.tar.xz"; + sha256 = "1hsh1anm555b5mckn60cj9p4sdl5h5g2m01k6ia784l2k4zsrvvb"; + name = "ark-22.12.2.tar.xz"; }; }; artikulate = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/artikulate-22.12.1.tar.xz"; - sha256 = "1j7lmvds5lq2g97llszy05khwsjw0ypsay49551pm7awk2hhx38h"; - name = "artikulate-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/artikulate-22.12.2.tar.xz"; + sha256 = "1cvs0v0x2g8048ksrb9xb41bsvm7lq1g30gch1rjdj86vv3ysraa"; + name = "artikulate-22.12.2.tar.xz"; }; }; audiocd-kio = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/audiocd-kio-22.12.1.tar.xz"; - sha256 = "0m6ik4p3pfw8sdmqiac42v4mi4mrgmx7dsj0n4zzpfa7nn4iiaz5"; - name = "audiocd-kio-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/audiocd-kio-22.12.2.tar.xz"; + sha256 = "1z46gk6lnar280chigjbw45l8zsr6majyk1gxd1kfnpyqgfh6pzj"; + name = "audiocd-kio-22.12.2.tar.xz"; }; }; baloo-widgets = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/baloo-widgets-22.12.1.tar.xz"; - sha256 = "1s2a7rsm6y5z0p0cp49bv0868di45qrzrkl7s76cnm56bssyrrnw"; - name = "baloo-widgets-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/baloo-widgets-22.12.2.tar.xz"; + sha256 = "1041m3r4a3dps5br3m4fmg91fg4d0ww6c6yl2qngyh27arc1ashn"; + name = "baloo-widgets-22.12.2.tar.xz"; }; }; blinken = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/blinken-22.12.1.tar.xz"; - sha256 = "1myn9g04dk43gqsahbgqcg5b5vd8yfwaijxyw0pfqllanj7vjlpa"; - name = "blinken-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/blinken-22.12.2.tar.xz"; + sha256 = "0hz6sa3g7d5x388arsawspgbjzkhv0p85fpkmm8px8ysqa5vn189"; + name = "blinken-22.12.2.tar.xz"; }; }; bomber = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/bomber-22.12.1.tar.xz"; - sha256 = "01d07xi012lq9prs3lr68l5v4m0z31ddmm5rdldxzrx6vwf1233l"; - name = "bomber-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/bomber-22.12.2.tar.xz"; + sha256 = "1ipzk0lys8s9wwmb8mrrsi9c7scdak19ggcbazq6dqzb2iqn381m"; + name = "bomber-22.12.2.tar.xz"; }; }; bovo = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/bovo-22.12.1.tar.xz"; - sha256 = "134bcjfd4sz2d96nd4yad9hz72nymphgsdkgm81p7w29dmyk8bz3"; - name = "bovo-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/bovo-22.12.2.tar.xz"; + sha256 = "12j9g84bi4mkj2gw7jdvbmwf8bmgb4l0imxivifn0i1pz2bjaia1"; + name = "bovo-22.12.2.tar.xz"; }; }; calendarsupport = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/calendarsupport-22.12.1.tar.xz"; - sha256 = "1yz95mlqjac9db7v7k953b4zky5369d9yhrr6f2m8950205xdab3"; - name = "calendarsupport-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/calendarsupport-22.12.2.tar.xz"; + sha256 = "172j3n6s06aax5p3r49kj1c5mx1hz1zljbhvkjdrm4fj6kxwl829"; + name = "calendarsupport-22.12.2.tar.xz"; }; }; cantor = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/cantor-22.12.1.tar.xz"; - sha256 = "0yi2pqh2jarcbx979vgbpm415rbpn5p5q3b6n2276mxq6x338hl6"; - name = "cantor-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/cantor-22.12.2.tar.xz"; + sha256 = "0yv8vq6wkybx0qdbkq0d5qm3xzcla80zlppf7wpf7icdvxqa9g76"; + name = "cantor-22.12.2.tar.xz"; }; }; cervisia = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/cervisia-22.12.1.tar.xz"; - sha256 = "0v2shjgc8jpzpll00apv2d6lqp08a277pv674skq4fc770aviaxk"; - name = "cervisia-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/cervisia-22.12.2.tar.xz"; + sha256 = "0dl16s49msf4z59s3y03c552zkpq9b565fg4yan5950587sbpvfg"; + name = "cervisia-22.12.2.tar.xz"; }; }; colord-kde = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/colord-kde-22.12.1.tar.xz"; - sha256 = "0ky3dr60szvg8fq6zlk7gsx997zql6hsfqv8navri3c3nra26r4y"; - name = "colord-kde-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/colord-kde-22.12.2.tar.xz"; + sha256 = "028f50ab0w08zg70ckisjdqnii3xs5hx5zgmhvvvfjgcacdpgvvb"; + name = "colord-kde-22.12.2.tar.xz"; }; }; dolphin = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/dolphin-22.12.1.tar.xz"; - sha256 = "1slcv108h2i5s9i2hlyiskfpmrc0r4awm3riyw0wa3h902h4lsbz"; - name = "dolphin-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/dolphin-22.12.2.tar.xz"; + sha256 = "0gjpvvwpghs7zf8cm1l7y7821459kggh42rc5jv5vybn1v8wzqg0"; + name = "dolphin-22.12.2.tar.xz"; }; }; dolphin-plugins = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/dolphin-plugins-22.12.1.tar.xz"; - sha256 = "03bj0jf92s5xb8nzzrh4wkcwm1zp101yg2r624r20djl8rkysivj"; - name = "dolphin-plugins-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/dolphin-plugins-22.12.2.tar.xz"; + sha256 = "1y2jkx7rq2kb5zsp5r8d3lhfil3p2nr8vfhlfiaqyisqaj138by1"; + name = "dolphin-plugins-22.12.2.tar.xz"; }; }; dragon = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/dragon-22.12.1.tar.xz"; - sha256 = "1rk00h91dhs78h3n97zxj8qxkvs7m94544xhs37qpnm735fdbkv0"; - name = "dragon-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/dragon-22.12.2.tar.xz"; + sha256 = "0qbhhl3kpq0syik17xhsfgfym16mw5nkz83c620dl0n5c65dyva9"; + name = "dragon-22.12.2.tar.xz"; }; }; elisa = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/elisa-22.12.1.tar.xz"; - sha256 = "1ywi1v2pz9gi3qgdrkcxivcx9sc82swckm1ipaf6x4ygbi5g0r5f"; - name = "elisa-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/elisa-22.12.2.tar.xz"; + sha256 = "09kz7k7w6rs419sv6f2z5m5nqz3j3cdlmcn3ig9f5v9hlci1x1sr"; + name = "elisa-22.12.2.tar.xz"; }; }; eventviews = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/eventviews-22.12.1.tar.xz"; - sha256 = "1bvlnaknn3jcjwwx9gfsqhq7vywjqbji3zfrmab4hv4v1bp5hgs9"; - name = "eventviews-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/eventviews-22.12.2.tar.xz"; + sha256 = "127bxj6pnmkppjchv3pr8wqs75hw2nb3jsx3bgmr11zvm2mbivwc"; + name = "eventviews-22.12.2.tar.xz"; }; }; falkon = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/falkon-22.12.1.tar.xz"; - sha256 = "14wngik0hlvj49x0vx2ndyswk3yvh3jc0g21lfrnsvbxsppjvskx"; - name = "falkon-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/falkon-22.12.2.tar.xz"; + sha256 = "1d6xxq18lx57aw20pzrv7mh0rdw84sli04l15ingvxj6crqkha4f"; + name = "falkon-22.12.2.tar.xz"; }; }; ffmpegthumbs = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ffmpegthumbs-22.12.1.tar.xz"; - sha256 = "0xf54rzard24az08mb6z9p23173nxsgmyfkriil5f87k67f7cf28"; - name = "ffmpegthumbs-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ffmpegthumbs-22.12.2.tar.xz"; + sha256 = "0ykmlr4acx0lbg255xmhjva5kb448mmsbb8xq1xm763qbf9xkdrr"; + name = "ffmpegthumbs-22.12.2.tar.xz"; }; }; filelight = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/filelight-22.12.1.tar.xz"; - sha256 = "1ww6h0p0y9phara8m2l6jbwr6vbhi1zid7xdrhfbg0vwz0ql42sz"; - name = "filelight-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/filelight-22.12.2.tar.xz"; + sha256 = "1kapmwhzpsmvs7757lgbm3d7nv7iaarn0vv5w7ndv3aygxf719d7"; + name = "filelight-22.12.2.tar.xz"; }; }; granatier = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/granatier-22.12.1.tar.xz"; - sha256 = "17qjf35dzsykn7l5483ccihzqc4wz9p3bn2l3s5yrgizsrgbir0c"; - name = "granatier-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/granatier-22.12.2.tar.xz"; + sha256 = "1hngcg7zvgra7j26iksipxg635snmx9bpqxiw7r1v6qfk97hq6a7"; + name = "granatier-22.12.2.tar.xz"; }; }; grantlee-editor = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/grantlee-editor-22.12.1.tar.xz"; - sha256 = "11s7kwm0sdcvzf27fx177n2ynklwlkxy8vl4hh42xh9563v9gw67"; - name = "grantlee-editor-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/grantlee-editor-22.12.2.tar.xz"; + sha256 = "0fiyinazfmh82rxr97icfs3qgrzgydczicdghr2i1pb7frpgpxh1"; + name = "grantlee-editor-22.12.2.tar.xz"; }; }; grantleetheme = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/grantleetheme-22.12.1.tar.xz"; - sha256 = "1xx09jaxg6cwn84svh6wkvxx46qv18rk1dr58dfyxgi3vl3nzihp"; - name = "grantleetheme-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/grantleetheme-22.12.2.tar.xz"; + sha256 = "055cff24fbjhlgc5y7501yy3vyfkgqhsqsc10qbfx24xkgbjfb2i"; + name = "grantleetheme-22.12.2.tar.xz"; }; }; gwenview = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/gwenview-22.12.1.tar.xz"; - sha256 = "12i7zri7mxhjfbykb1nhsh5acppcql3gkmjif92qp4f4d7fqrgsb"; - name = "gwenview-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/gwenview-22.12.2.tar.xz"; + sha256 = "1dkggydnnhn8db2crlxnj7jz47rrrllpjqxg158rgf740dnhdhbx"; + name = "gwenview-22.12.2.tar.xz"; }; }; incidenceeditor = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/incidenceeditor-22.12.1.tar.xz"; - sha256 = "1agqkqcksqf992albppijysddyhfgc6l1zxg6qyyvw9iag6p509x"; - name = "incidenceeditor-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/incidenceeditor-22.12.2.tar.xz"; + sha256 = "0qy4kd1gf72mpi3kks1acdcqn625gys4hjy98cfgn6hz3vp7dfcb"; + name = "incidenceeditor-22.12.2.tar.xz"; }; }; itinerary = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/itinerary-22.12.1.tar.xz"; - sha256 = "1fmsfnjywa0vy91dg2z093x36fcv50gc5xp8hqlrjx4q7hqja13n"; - name = "itinerary-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/itinerary-22.12.2.tar.xz"; + sha256 = "13xm73wdwz2fsmmfvikyyq0x98x48j3vzpvijfafj8a1k82zc7g1"; + name = "itinerary-22.12.2.tar.xz"; }; }; juk = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/juk-22.12.1.tar.xz"; - sha256 = "066ll1lbmgy9l9bpv7iw75gknjdb92dbaqpsir0a2j4llj40yym1"; - name = "juk-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/juk-22.12.2.tar.xz"; + sha256 = "1hi1ywbragllsbx2vf0hmv8a0jnnjnq4jinanxrpkpl2h9hj31bf"; + name = "juk-22.12.2.tar.xz"; }; }; k3b = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/k3b-22.12.1.tar.xz"; - sha256 = "0lg8jfgs73j5bfx00g6lbgmmw98l2m5c5g8mkdw5ayr9wg5iwzhl"; - name = "k3b-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/k3b-22.12.2.tar.xz"; + sha256 = "08979ns5mm92x5swphd6cf4jvin3nly65h3vzsr85g1h2vi5hywz"; + name = "k3b-22.12.2.tar.xz"; }; }; kaccounts-integration = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kaccounts-integration-22.12.1.tar.xz"; - sha256 = "0avy1ld72z5sx7nd78lar54x7a7zb7pa7p62bmxyhkmrvvlj6zjk"; - name = "kaccounts-integration-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kaccounts-integration-22.12.2.tar.xz"; + sha256 = "171jz49j565myd3iprhlfxla2pc5rs608w815z84qya8y0s9ji8q"; + name = "kaccounts-integration-22.12.2.tar.xz"; }; }; kaccounts-providers = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kaccounts-providers-22.12.1.tar.xz"; - sha256 = "16acbba803i24psyax9xbb82gs0wqwhpml1hrd3nwkdf7irngdna"; - name = "kaccounts-providers-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kaccounts-providers-22.12.2.tar.xz"; + sha256 = "0pdkhpprbxd6damdzx4zxd32gs0fdy27s9vhfg79hgb9a94ar8p3"; + name = "kaccounts-providers-22.12.2.tar.xz"; }; }; kaddressbook = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kaddressbook-22.12.1.tar.xz"; - sha256 = "100rrb6q63p1qawp9ww9dif06q1f9w02xgfrlhki3xvgdkpfy92r"; - name = "kaddressbook-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kaddressbook-22.12.2.tar.xz"; + sha256 = "1vwxfhjh4dk94aijazfnb25fdjwbd7520a90hg59g5cxrd3yrlqb"; + name = "kaddressbook-22.12.2.tar.xz"; }; }; kajongg = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kajongg-22.12.1.tar.xz"; - sha256 = "0zc08cgpw0pwbjhrs186m4l5rp61gjbqzh4xh9yg24i3k4yn8z6g"; - name = "kajongg-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kajongg-22.12.2.tar.xz"; + sha256 = "1a2ps3vvrh89ryclz4hh072q4mfayys3kgkhp0r9b74yskjln8zv"; + name = "kajongg-22.12.2.tar.xz"; }; }; kalarm = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kalarm-22.12.1.tar.xz"; - sha256 = "11h0a1jgp7p0zkyqfd2vmv24nnv02jfcqw1z1pi6qr0ywgn8ba9i"; - name = "kalarm-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kalarm-22.12.2.tar.xz"; + sha256 = "16aaxl4j1027p3xwrfilgriddr4dlm33vrbhz26w1kdanq7jicp9"; + name = "kalarm-22.12.2.tar.xz"; }; }; kalendar = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kalendar-22.12.1.tar.xz"; - sha256 = "1r4r2pa5p0951vvcvw1gyrs1k41xd4495lb72qkv0nhvvb6lp2aw"; - name = "kalendar-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kalendar-22.12.2.tar.xz"; + sha256 = "13wkxl4cv7h0jaf5c973ppkflfy5h8x4njmkzgg01fkb4zaxdkdy"; + name = "kalendar-22.12.2.tar.xz"; }; }; kalgebra = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kalgebra-22.12.1.tar.xz"; - sha256 = "0iai8anpxb3qxp927vhz294c3qh2h3fn84l5viry7rsi9wkyckwf"; - name = "kalgebra-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kalgebra-22.12.2.tar.xz"; + sha256 = "1c8z2mpk2k737dshsg76bvipd1msf6fbp4zqjm167ar29bn5s52j"; + name = "kalgebra-22.12.2.tar.xz"; }; }; kalzium = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kalzium-22.12.1.tar.xz"; - sha256 = "0jnhhy9xilkafmzbbgxp4l3hx6qsrkkwm7yxf2i7jw5wzax98s1y"; - name = "kalzium-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kalzium-22.12.2.tar.xz"; + sha256 = "0z0brsxh4ivrna0250j76is9slswmpvkj6n3i6vd9j7x5ayh8kr2"; + name = "kalzium-22.12.2.tar.xz"; }; }; kamera = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kamera-22.12.1.tar.xz"; - sha256 = "0sxms7m9mxadf9qcxdlvnrav7lvapgbs3q48c2pydgyszrq54b54"; - name = "kamera-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kamera-22.12.2.tar.xz"; + sha256 = "0i8l0happ7sg6ch4jp1680c4ikqvf99dfj6d3cfi0k35wh828x32"; + name = "kamera-22.12.2.tar.xz"; }; }; kamoso = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kamoso-22.12.1.tar.xz"; - sha256 = "024j6ijmgxkdjavach6qi6n81g728kd3qs6r6kkm36j3cl19xnpf"; - name = "kamoso-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kamoso-22.12.2.tar.xz"; + sha256 = "1x1w0kgf5fh8jj5bha7q5sr7f8q93jr987v40h9h5d4xlj576n7n"; + name = "kamoso-22.12.2.tar.xz"; }; }; kanagram = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kanagram-22.12.1.tar.xz"; - sha256 = "0ir8xa826mvnk8s38mb5p61kfx7hfrxzifacv4hpwn7wqgb37986"; - name = "kanagram-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kanagram-22.12.2.tar.xz"; + sha256 = "0dgialia8qc09y2gv8031m2g2dn5dhfn5zyvrh3yb7p1bviw301c"; + name = "kanagram-22.12.2.tar.xz"; }; }; kapman = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kapman-22.12.1.tar.xz"; - sha256 = "1qjg13vnwdrkfj7p88rlq1b3vhyxsgd7x6amqwd65qhbiiall732"; - name = "kapman-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kapman-22.12.2.tar.xz"; + sha256 = "1xm3bkp0l9if06l0mnfyk5ywmdd8q0vvdwgjy9xm12k06jqkyhgh"; + name = "kapman-22.12.2.tar.xz"; }; }; kapptemplate = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kapptemplate-22.12.1.tar.xz"; - sha256 = "0ixgfv3q6a1qiggr0r1fnl2frdblb602p3g98mh4yj824ssh950y"; - name = "kapptemplate-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kapptemplate-22.12.2.tar.xz"; + sha256 = "0l95qpw7bdj9na5x32glm465rghylxdmjacfc3372k934vm8ckdl"; + name = "kapptemplate-22.12.2.tar.xz"; }; }; kate = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kate-22.12.1.tar.xz"; - sha256 = "0r7smfmdfhsfqr102w5di8xx1smbk5z9q6a9fhlplrdxkfckmw33"; - name = "kate-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kate-22.12.2.tar.xz"; + sha256 = "199c807yj5vliy1aa0iz3ryymr3zxviakdkidr71imz4bq8v3m70"; + name = "kate-22.12.2.tar.xz"; }; }; katomic = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/katomic-22.12.1.tar.xz"; - sha256 = "15sdvyzy36bw6dwj4v2i02qjw7r4m4xfqk16l8sphw67071vppch"; - name = "katomic-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/katomic-22.12.2.tar.xz"; + sha256 = "000d28jl01sn6nil1d57j1iy1flmrv7z6yjc3ci7kjmapi1167mc"; + name = "katomic-22.12.2.tar.xz"; }; }; kbackup = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kbackup-22.12.1.tar.xz"; - sha256 = "12ms38wv9skzn3dbpdqr1b1rrr2skni4k226sh14l8rlh1phrwx3"; - name = "kbackup-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kbackup-22.12.2.tar.xz"; + sha256 = "1vyl303j7fzyay55agisbn5vj73g26hdk8ilnlwm946rg6nrcf67"; + name = "kbackup-22.12.2.tar.xz"; }; }; kblackbox = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kblackbox-22.12.1.tar.xz"; - sha256 = "0fs2gdlzxf0xmbvf7l833w053s9rhib0cb9iqg9l1kb83j2x0nfa"; - name = "kblackbox-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kblackbox-22.12.2.tar.xz"; + sha256 = "17x4rgji7pnnmnq4dl6mhmdsc8csn3wnwap92jg3lc9r04vpfk5h"; + name = "kblackbox-22.12.2.tar.xz"; }; }; kblocks = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kblocks-22.12.1.tar.xz"; - sha256 = "1aq68p5g0khsa3ci6lw1cm2rmrl2lmx7vwyw8idgbpb18b6w211w"; - name = "kblocks-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kblocks-22.12.2.tar.xz"; + sha256 = "1qf1qf3r659ya8rr00pqikdxb69c05s0v8dzk2j8ajnbzc19w8sa"; + name = "kblocks-22.12.2.tar.xz"; }; }; kbounce = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kbounce-22.12.1.tar.xz"; - sha256 = "0w9p2f3x1jmw6l0im4l3grbm2329rrhs1caf60rzdprkk7xpi5v7"; - name = "kbounce-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kbounce-22.12.2.tar.xz"; + sha256 = "1lbdicwnv1zz3jlg4v2yblm2xjxslkb64nq0z94cgfp1nzwavq3n"; + name = "kbounce-22.12.2.tar.xz"; }; }; kbreakout = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kbreakout-22.12.1.tar.xz"; - sha256 = "1x5gda3ilsxbsnwgj7mmf20i5i8bw2nnnf8n5wbhi2sqlh05xmpy"; - name = "kbreakout-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kbreakout-22.12.2.tar.xz"; + sha256 = "0cx2m4hqw39kpzp4y5rsxa1y264q318q5qsbjwcflbnm50fdbjpd"; + name = "kbreakout-22.12.2.tar.xz"; }; }; kbruch = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kbruch-22.12.1.tar.xz"; - sha256 = "1jf4gv7yihfm9djxqxlp90g49zp6j3nxvlgkh3r31ki11a993nha"; - name = "kbruch-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kbruch-22.12.2.tar.xz"; + sha256 = "1rc8kjyipknrraiyq7wabjzm3i00jsjkd75d8qfk50i2sdxm47kv"; + name = "kbruch-22.12.2.tar.xz"; }; }; kcachegrind = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcachegrind-22.12.1.tar.xz"; - sha256 = "01ign21xhl5xypxry5jfmay456m64kmsb5292xqrd91kwk56z3ns"; - name = "kcachegrind-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcachegrind-22.12.2.tar.xz"; + sha256 = "065lp2g5cp2pmisjfb2m2m64f20r1c18vridlp7zdkran5d3fq0k"; + name = "kcachegrind-22.12.2.tar.xz"; }; }; kcalc = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcalc-22.12.1.tar.xz"; - sha256 = "17msfxjzyjiq4lfl4p3kxndgplc8q3ghjbvfx8z09r0a0bqd52wl"; - name = "kcalc-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcalc-22.12.2.tar.xz"; + sha256 = "021njz922hah1bwrq2mqc96fzg0ap59ffa3n5ycgb66jld1vnn3n"; + name = "kcalc-22.12.2.tar.xz"; }; }; kcalutils = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcalutils-22.12.1.tar.xz"; - sha256 = "077k3wppnzvpwwzf4n9r81rm996x750npsri4acn94ff7wp98r0r"; - name = "kcalutils-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcalutils-22.12.2.tar.xz"; + sha256 = "1kd2nci8j76r847jh91pjhpcy386ilg82caq0npq2n64li2lq0dq"; + name = "kcalutils-22.12.2.tar.xz"; }; }; kcharselect = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcharselect-22.12.1.tar.xz"; - sha256 = "0c5hswy8vjsbacac3la6n11rf4hr2g79w96qqha4dgjzzparaf4y"; - name = "kcharselect-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcharselect-22.12.2.tar.xz"; + sha256 = "1zhj2yzapcxi4vjx64k8mxqd45qknsb825s1la0bkbilkgzljg3p"; + name = "kcharselect-22.12.2.tar.xz"; }; }; kcolorchooser = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcolorchooser-22.12.1.tar.xz"; - sha256 = "1kkhp7m69jcskpqrf6maw0b3k5wjfham54iwngyzgznz195cmad4"; - name = "kcolorchooser-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcolorchooser-22.12.2.tar.xz"; + sha256 = "0zysz6z08xsxv0psyma0cym57w6fj9j2np14jka097qp58hpjkzi"; + name = "kcolorchooser-22.12.2.tar.xz"; }; }; kcron = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcron-22.12.1.tar.xz"; - sha256 = "0i5pnqb39mgllzxqdyp4pa0109i1q59lx3q0b6445r4lbgxmdd8a"; - name = "kcron-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcron-22.12.2.tar.xz"; + sha256 = "1mnb47igwh3kgy75z0ggizj730wajmc2s6kjxbddc6qj33hlrg1k"; + name = "kcron-22.12.2.tar.xz"; }; }; kde-dev-scripts = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kde-dev-scripts-22.12.1.tar.xz"; - sha256 = "0544cjxk8l1hwfzi93xvs0w6fv47dw2s45r5fdzragna3w8nbh9l"; - name = "kde-dev-scripts-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kde-dev-scripts-22.12.2.tar.xz"; + sha256 = "1sr8ykj8n2h4hg85zbz5x68m7kq9sb84k1d6wrxy67n3lzsklswj"; + name = "kde-dev-scripts-22.12.2.tar.xz"; }; }; kde-dev-utils = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kde-dev-utils-22.12.1.tar.xz"; - sha256 = "0vk9ziz4dim55h93v6bfszr7nanxs6hxap059rmq3y5vd4cv5fys"; - name = "kde-dev-utils-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kde-dev-utils-22.12.2.tar.xz"; + sha256 = "1vq1mfys07513gprlj1vmxhl5ijj2p2dxx4ddj2iwg0i9qapjr25"; + name = "kde-dev-utils-22.12.2.tar.xz"; }; }; kdebugsettings = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdebugsettings-22.12.1.tar.xz"; - sha256 = "0fmxh38vc28hjv7brp5khj8mn3k83rwkyjlm6kfxnnxwyp7h3n0a"; - name = "kdebugsettings-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdebugsettings-22.12.2.tar.xz"; + sha256 = "07zw0icfvqg3ispalkyc5h13kln6mpfzgkirwkgnplksd059wzyv"; + name = "kdebugsettings-22.12.2.tar.xz"; }; }; kdeconnect-kde = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdeconnect-kde-22.12.1.tar.xz"; - sha256 = "17yzqibcbab3h1vy88m7wd52gc76j0g5an8mr2xw7nrjl6q7mfm7"; - name = "kdeconnect-kde-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdeconnect-kde-22.12.2.tar.xz"; + sha256 = "09h0by43jrizq2qcmhcr5jbsvhjkcqrgrblzy9i2r0ihhvlkwg87"; + name = "kdeconnect-kde-22.12.2.tar.xz"; }; }; kdeedu-data = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdeedu-data-22.12.1.tar.xz"; - sha256 = "1rfgpb2fa3ivhcicqdb2yvbslgmpw0k1gyrd76awaigymv9hd7l8"; - name = "kdeedu-data-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdeedu-data-22.12.2.tar.xz"; + sha256 = "1nffvgy2imi1csq9z45v2yf7p7d22k8nh25ciiph2dax9w3qlj81"; + name = "kdeedu-data-22.12.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdegraphics-mobipocket-22.12.1.tar.xz"; - sha256 = "13iijl2gagnpx55h65mlvq1g2iy8m2d8w5aj1wx3496nxcj0fyl6"; - name = "kdegraphics-mobipocket-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdegraphics-mobipocket-22.12.2.tar.xz"; + sha256 = "1ly3jv64jdzppnipnzr3chm3s8azwfq1pn94pfxm7hj6p6ywn9fn"; + name = "kdegraphics-mobipocket-22.12.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdegraphics-thumbnailers-22.12.1.tar.xz"; - sha256 = "172lv6ysp3b13ks9548iw1s8nw7wi1vxnxsaf97bsirq1by4f42a"; - name = "kdegraphics-thumbnailers-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdegraphics-thumbnailers-22.12.2.tar.xz"; + sha256 = "0rzy6icli31fp5z1l3jvnxgwq3fgfijlb3kfi5ci3d8raddyzf6r"; + name = "kdegraphics-thumbnailers-22.12.2.tar.xz"; }; }; kdenetwork-filesharing = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdenetwork-filesharing-22.12.1.tar.xz"; - sha256 = "0mwczjnj3nsnlsk5y0v26fszs5gfq8g3yki8xgan7hgc14p4ncik"; - name = "kdenetwork-filesharing-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdenetwork-filesharing-22.12.2.tar.xz"; + sha256 = "0z94la60pj8qnsnikr7j297mxhbyd4sdjhyccdix1dxdglskzqpy"; + name = "kdenetwork-filesharing-22.12.2.tar.xz"; }; }; kdenlive = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdenlive-22.12.1.tar.xz"; - sha256 = "1pfp00gkvxmm578fj6a86la1p2iypfgx2j1zk72qdj9kczsnw7mg"; - name = "kdenlive-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdenlive-22.12.2.tar.xz"; + sha256 = "1g5ylks4i1sfpdhzimyvvw6ljawk19b28242zsk8nz9cn8gbr786"; + name = "kdenlive-22.12.2.tar.xz"; }; }; kdepim-addons = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdepim-addons-22.12.1.tar.xz"; - sha256 = "1zxs8n28yl8a1kbm4ndljs4giyj473alkqlzkjgc60cz6g2fq58k"; - name = "kdepim-addons-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdepim-addons-22.12.2.tar.xz"; + sha256 = "059p7bb0rkp1ph7cigyld3777ib3i4likhr3rcr9q843ksbws43m"; + name = "kdepim-addons-22.12.2.tar.xz"; }; }; kdepim-runtime = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdepim-runtime-22.12.1.tar.xz"; - sha256 = "0vghpf5lnl0mfwdac1mghr48bfvqg16az090w6msn0rs77ai1q2s"; - name = "kdepim-runtime-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdepim-runtime-22.12.2.tar.xz"; + sha256 = "16j6w6y0c05w9vni6wa633b6g0j3f7z5algn5y2292zqnfa9apzd"; + name = "kdepim-runtime-22.12.2.tar.xz"; }; }; kdesdk-kio = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdesdk-kio-22.12.1.tar.xz"; - sha256 = "1rzcq0v0faa2ix596c209p108wsrj8p8mnvrgkkz6s5gwswqvi0z"; - name = "kdesdk-kio-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdesdk-kio-22.12.2.tar.xz"; + sha256 = "0nahw5747fcyvgzp0axm8cvhjfnlwjwl1q4020whp95nw9pa5yjz"; + name = "kdesdk-kio-22.12.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdesdk-thumbnailers-22.12.1.tar.xz"; - sha256 = "1w09rpri600k6v4z0srw0nfrg0dhqhsvxzj3vmgkksw2rllq7gm2"; - name = "kdesdk-thumbnailers-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdesdk-thumbnailers-22.12.2.tar.xz"; + sha256 = "1d79xrxwi760sfjfbv6pjp2hp7n77r17lm6dyvn9m3i5gakq2njx"; + name = "kdesdk-thumbnailers-22.12.2.tar.xz"; }; }; kdev-php = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdev-php-22.12.1.tar.xz"; - sha256 = "0jna5b9c4ir9x622iivbbz2h6bmp9hbvyxa99h791inpfcgbkxh0"; - name = "kdev-php-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdev-php-22.12.2.tar.xz"; + sha256 = "1ds27qf3dbf4m5i8fp5fljx8z41hmhc2915wwm5cqwpyzzmvvx8d"; + name = "kdev-php-22.12.2.tar.xz"; }; }; kdev-python = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdev-python-22.12.1.tar.xz"; - sha256 = "064897836jgrfwqssk0fkxpc5bw61d41l0wk1qqavzv0bd22ljn8"; - name = "kdev-python-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdev-python-22.12.2.tar.xz"; + sha256 = "0c348lrysz3hnb12763f92xw7p8asihc8qnry4mznk8plzrg4895"; + name = "kdev-python-22.12.2.tar.xz"; }; }; kdevelop = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdevelop-22.12.1.tar.xz"; - sha256 = "0qlhjdaaisjqmf1ss1nwrj8ppqy6z7aq9vzh18sb924y439bnc7k"; - name = "kdevelop-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdevelop-22.12.2.tar.xz"; + sha256 = "1jayqbvwx32n6mskdph2mcxf0azzbyc4qc206hfyf2myn5g5xy2p"; + name = "kdevelop-22.12.2.tar.xz"; }; }; kdf = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdf-22.12.1.tar.xz"; - sha256 = "11hh03mhccwqj141xrpkiz72lg1rwzixr3lsdbkjvx8b7mc2f5rc"; - name = "kdf-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdf-22.12.2.tar.xz"; + sha256 = "0vsy1m7lp7lkqg6pmdl5f351rgpcjdizzvihgc1cr6sr1mw4hsmg"; + name = "kdf-22.12.2.tar.xz"; }; }; kdialog = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdialog-22.12.1.tar.xz"; - sha256 = "1wlmq01a78rw3lkv26wjmbyr56y1k945sdwvl521pz5bzanl2ppa"; - name = "kdialog-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdialog-22.12.2.tar.xz"; + sha256 = "1lr6w8j5c38gzlm9qwbchapgn2bc696w7lz4amxb89ixb45miibj"; + name = "kdialog-22.12.2.tar.xz"; }; }; kdiamond = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdiamond-22.12.1.tar.xz"; - sha256 = "1b0ybhryxkr2p0vbs03pn70w16cpgbps3n1gmf4iqsg4xh86hhcc"; - name = "kdiamond-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdiamond-22.12.2.tar.xz"; + sha256 = "14z8gy1yzwx6cqgx5dsrn4wy7vnwg4ynlxpm4zzqnpn0ry1v5ba3"; + name = "kdiamond-22.12.2.tar.xz"; }; }; keditbookmarks = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/keditbookmarks-22.12.1.tar.xz"; - sha256 = "0djcm96hcj7fawyyxg39rnwq01p84c1w7hyrsz6c8cha8875lbr1"; - name = "keditbookmarks-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/keditbookmarks-22.12.2.tar.xz"; + sha256 = "0cgc6biqar78f7q355fcf1ds8zsbzvl24376s5ahgzm8ffcl3m6x"; + name = "keditbookmarks-22.12.2.tar.xz"; }; }; kfind = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kfind-22.12.1.tar.xz"; - sha256 = "1li89qvfj7d6q3m8clk1sgzlwrgki966yvbvsjj6q49c463gjfla"; - name = "kfind-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kfind-22.12.2.tar.xz"; + sha256 = "0p0bgyrxvjryzsr1fwxccv3gdbkbvsdwsc9plq9hq1z2wd078ps4"; + name = "kfind-22.12.2.tar.xz"; }; }; kfloppy = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kfloppy-22.12.1.tar.xz"; - sha256 = "0kxx2h4wxpdjzg4nzfj2ws6vs1jbq1l2r1n1zsllbaj7bxy7rif0"; - name = "kfloppy-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kfloppy-22.12.2.tar.xz"; + sha256 = "0bv9xkn8wdm4kxb379alx3l6l2l3k5ainmjgwafgz2hwgn52369m"; + name = "kfloppy-22.12.2.tar.xz"; }; }; kfourinline = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kfourinline-22.12.1.tar.xz"; - sha256 = "0gag64zbm22mwsqkzip7q2lzwc40vqma6cxlf5m40zxin1p0nk7s"; - name = "kfourinline-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kfourinline-22.12.2.tar.xz"; + sha256 = "1cyvpg07y0q8dh1zl7840qkbppx7ndg52v1z95xwcxvggasmgqj6"; + name = "kfourinline-22.12.2.tar.xz"; }; }; kgeography = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kgeography-22.12.1.tar.xz"; - sha256 = "0xfyvzkzy5pp1321iyyvjy35ayav0adbyfym00np3a0sglpmb007"; - name = "kgeography-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kgeography-22.12.2.tar.xz"; + sha256 = "1qcwdg9qkql7ky9m33fx21d1g6585xbm1z2z179sdsnbcpjmx34c"; + name = "kgeography-22.12.2.tar.xz"; }; }; kget = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kget-22.12.1.tar.xz"; - sha256 = "18z2nsr07m4d9ybi4jdv1hvxnf0cpvbyy39znba7r3psr3q9j9sz"; - name = "kget-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kget-22.12.2.tar.xz"; + sha256 = "00z3h6b5f78cvczapzvbz8q12lr69668n6sryijsv5a2aykimgs7"; + name = "kget-22.12.2.tar.xz"; }; }; kgoldrunner = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kgoldrunner-22.12.1.tar.xz"; - sha256 = "1yrz6iafk01sm4mhjgkz8gsphsaxmrgf0zjjyzqqz4blzhi0fm8w"; - name = "kgoldrunner-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kgoldrunner-22.12.2.tar.xz"; + sha256 = "134dp60a86p1a9rn8svzn8ia2ji7kan7bv53gnis4vgric97dm2v"; + name = "kgoldrunner-22.12.2.tar.xz"; }; }; kgpg = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kgpg-22.12.1.tar.xz"; - sha256 = "081g3ib0cd9zyg7vlkj1c99z1x5a1r3v3ck2f7xhlq1vgh6b610m"; - name = "kgpg-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kgpg-22.12.2.tar.xz"; + sha256 = "02qa3148rkcda21a3n83id1cqkr53y2cilhwlsm52cm5998xr4pd"; + name = "kgpg-22.12.2.tar.xz"; }; }; khangman = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/khangman-22.12.1.tar.xz"; - sha256 = "19yqlin45fwf6n9a94cd3h5101cw50rvxsvcx02y9cm405pdnx6l"; - name = "khangman-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/khangman-22.12.2.tar.xz"; + sha256 = "1iw40hmxylhgla3cf40c67vcf1whgag18jkvlprbw9pap47qn6ql"; + name = "khangman-22.12.2.tar.xz"; }; }; khelpcenter = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/khelpcenter-22.12.1.tar.xz"; - sha256 = "1cwn1mp79lps764vdilrprj99b9vxmqfxz81zk2vsyywnfyq3nly"; - name = "khelpcenter-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/khelpcenter-22.12.2.tar.xz"; + sha256 = "1xjmyw92711y5sfdc37q9al6y70css1h914nyn400m93pijl15kp"; + name = "khelpcenter-22.12.2.tar.xz"; }; }; kidentitymanagement = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kidentitymanagement-22.12.1.tar.xz"; - sha256 = "0zvp52kmg9mmgfjw01il0j9656gqi854i3dvir0djhqrqfv8ivb0"; - name = "kidentitymanagement-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kidentitymanagement-22.12.2.tar.xz"; + sha256 = "08021m509msn4sp7l89lrki0bzqdpnjmix3shg2y86pa7sq3r55h"; + name = "kidentitymanagement-22.12.2.tar.xz"; }; }; kig = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kig-22.12.1.tar.xz"; - sha256 = "1mcb98r6j5byvx6bi2rhr3d6c9xdkf9cwnz2wy3v69xsi29var80"; - name = "kig-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kig-22.12.2.tar.xz"; + sha256 = "0r7wl2vpg38hyvx865kdfx39yjjijnyd4cyriq82vj6h4s60lkfh"; + name = "kig-22.12.2.tar.xz"; }; }; kigo = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kigo-22.12.1.tar.xz"; - sha256 = "1nl0i1qdbfpjp1vmy71zwa6f2yp9vlzvfdfb4rdsqdz23x4irbzg"; - name = "kigo-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kigo-22.12.2.tar.xz"; + sha256 = "1wh929p33iq38yw1836zz1hhaz4wyr0834chx9x6zps0f4qbn6f7"; + name = "kigo-22.12.2.tar.xz"; }; }; killbots = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/killbots-22.12.1.tar.xz"; - sha256 = "0lmd3cr087jjd4h557rsbjqr15j47wwr2is7vv4l3idl3hn3izak"; - name = "killbots-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/killbots-22.12.2.tar.xz"; + sha256 = "1kx4c6gaijfxr7ylazlpr07bbby43fk6x3kgv0n9d9d87fkqwigr"; + name = "killbots-22.12.2.tar.xz"; }; }; kimagemapeditor = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kimagemapeditor-22.12.1.tar.xz"; - sha256 = "1shpkn79ag1invsmizz9amz5sbphpasp2a9l86mkzm8bwsrqjihb"; - name = "kimagemapeditor-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kimagemapeditor-22.12.2.tar.xz"; + sha256 = "01kmvlir5p3ip7rylvd9j9xg7zdp6b8f8i5b5qn9d5d220p2n59j"; + name = "kimagemapeditor-22.12.2.tar.xz"; }; }; kimap = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kimap-22.12.1.tar.xz"; - sha256 = "03fgi82l8zq1r13akvchlymlzc2ivxhw9br75i5j93v3jvfhindx"; - name = "kimap-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kimap-22.12.2.tar.xz"; + sha256 = "03qxfybh8wp5pyyympqhzndbv0dxfj141wh7imwazgvhq5hxy1ia"; + name = "kimap-22.12.2.tar.xz"; }; }; kio-extras = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kio-extras-22.12.1.tar.xz"; - sha256 = "0g1is8hgy9zjzm7l3msg6shcjvrl0x6wf5gji0c34hkrr5axd0gv"; - name = "kio-extras-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kio-extras-22.12.2.tar.xz"; + sha256 = "1420kwhff103h57ii60z23m9w2nr2yqys23faa39b59kg4bx01na"; + name = "kio-extras-22.12.2.tar.xz"; }; }; kio-gdrive = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kio-gdrive-22.12.1.tar.xz"; - sha256 = "1p3q17c7f6i7q5k3k5rxckl1wdr8bs9z9v8zz2jwnky3licfhgk8"; - name = "kio-gdrive-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kio-gdrive-22.12.2.tar.xz"; + sha256 = "00vfrfd9j5qp6g71a4yz0sqckw2rgwd6l16agqkbvb7adiyhwlax"; + name = "kio-gdrive-22.12.2.tar.xz"; }; }; kio-zeroconf = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kio-zeroconf-22.12.1.tar.xz"; - sha256 = "0qhl2yygs2bs56nd3ybwhcd4ry0qls2qzhh3lb8y9xqiakz669sn"; - name = "kio-zeroconf-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kio-zeroconf-22.12.2.tar.xz"; + sha256 = "13rbxds754yc7c7pa52am29ynv01dh7v9rl24znnckr674kw532d"; + name = "kio-zeroconf-22.12.2.tar.xz"; }; }; kipi-plugins = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kipi-plugins-22.12.1.tar.xz"; - sha256 = "1jgjnc0svjyq3ffgiksxcxk140lk3bligh8501jv5q7sy6flcwba"; - name = "kipi-plugins-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kipi-plugins-22.12.2.tar.xz"; + sha256 = "09nk8fg97gjbrv7facdns64i65q0as592wfng8fc1ayr897rlf3i"; + name = "kipi-plugins-22.12.2.tar.xz"; }; }; kirigami-gallery = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kirigami-gallery-22.12.1.tar.xz"; - sha256 = "1drbqhcjx6ilqj49y8pghg94hwdwnj08wfl33j9ssn59wh6s282h"; - name = "kirigami-gallery-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kirigami-gallery-22.12.2.tar.xz"; + sha256 = "0rx9dvimwb9wyxvamcmx2pndzm4gi23nz7lfsdk21vs61swhff03"; + name = "kirigami-gallery-22.12.2.tar.xz"; }; }; kiriki = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kiriki-22.12.1.tar.xz"; - sha256 = "1ad71h5fy6c5826hhdfbzr4x9gbl5z28vqwc9kjhyjvl9x24h264"; - name = "kiriki-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kiriki-22.12.2.tar.xz"; + sha256 = "1pvadk48qbc1qbzmdvn70zpr4idvabgw4gddccslgpx1kh1mv6lq"; + name = "kiriki-22.12.2.tar.xz"; }; }; kiten = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kiten-22.12.1.tar.xz"; - sha256 = "0cz5whrmzj6yflqw5cfvazmdf66qcgm1wz94h8f283nnglc4vz49"; - name = "kiten-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kiten-22.12.2.tar.xz"; + sha256 = "0x7f820r6ql19zrfgmgka4766ni2qp2jrwz3qpz1fidkcxrifnhr"; + name = "kiten-22.12.2.tar.xz"; }; }; kitinerary = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kitinerary-22.12.1.tar.xz"; - sha256 = "0i9mbfm5f57hac9rj50474ck05hrdv4m2qdaqi4jm2dr737wmigh"; - name = "kitinerary-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kitinerary-22.12.2.tar.xz"; + sha256 = "0773yb328msavm0azlmpfq9f3fnajcnwwz1njw1zxrgcmknx002h"; + name = "kitinerary-22.12.2.tar.xz"; }; }; kjumpingcube = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kjumpingcube-22.12.1.tar.xz"; - sha256 = "0cyq25cmcirw7kx6yln1nn0l5va9q7a8ngcldggknlnpap3y5m4q"; - name = "kjumpingcube-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kjumpingcube-22.12.2.tar.xz"; + sha256 = "07vcf7n61izfzfpmci82v00k2sbqlj9lpir730cxiq4nxh4z7jqx"; + name = "kjumpingcube-22.12.2.tar.xz"; }; }; kldap = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kldap-22.12.1.tar.xz"; - sha256 = "1dyn01jxlh5qidlnhd989c88id6vxfazn9flhlhsklgcaywf73y8"; - name = "kldap-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kldap-22.12.2.tar.xz"; + sha256 = "08ij0iv5pk2j7zbnf2dwq20jqcxbmbw8gkpyk45bsw4wv840kspc"; + name = "kldap-22.12.2.tar.xz"; }; }; kleopatra = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kleopatra-22.12.1.tar.xz"; - sha256 = "0vg311c1qbvbajb0n46fhy90yafq5rgrh107z172snbvd1v42bj9"; - name = "kleopatra-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kleopatra-22.12.2.tar.xz"; + sha256 = "1rk0jpab600hfkw35zj2zv5bi1avix61xjxfwywzh5ql1kyv0cka"; + name = "kleopatra-22.12.2.tar.xz"; }; }; klettres = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/klettres-22.12.1.tar.xz"; - sha256 = "1jad7waik1agaih98x9bm6apmm6plz9kpsy3zfcll80vl0p6g8vs"; - name = "klettres-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/klettres-22.12.2.tar.xz"; + sha256 = "1cp8w8fy85ij434nrl6ksivd8dw0nkz3vhwhwmwalrx2pj7h6dpa"; + name = "klettres-22.12.2.tar.xz"; }; }; klickety = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/klickety-22.12.1.tar.xz"; - sha256 = "004hj4dbwxy9yyjcgc8awjwc45x9gsh5jfs5w8261l0qj4zinj8l"; - name = "klickety-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/klickety-22.12.2.tar.xz"; + sha256 = "0zq33801das6l9ph3f20mcx5wfrz10yms11v1dvwnzsjszb4mxb9"; + name = "klickety-22.12.2.tar.xz"; }; }; klines = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/klines-22.12.1.tar.xz"; - sha256 = "0jsb5842qmi0ll23x6rmmiv91zwyijnvmq6bvk9fs66i0fczgkj7"; - name = "klines-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/klines-22.12.2.tar.xz"; + sha256 = "18p7hls5pns5n6asdm4ccm6540qin8n7w4sbmlhrq2qqk07csq3z"; + name = "klines-22.12.2.tar.xz"; }; }; kmag = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmag-22.12.1.tar.xz"; - sha256 = "09vq93jab8hv918fabz3i50311n6vglpig5nrgdzv72mvy5y86bk"; - name = "kmag-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmag-22.12.2.tar.xz"; + sha256 = "11ar70m4b4s2n30rw7b5a0r4bkasraxqcfzfbafyzh2bk51166m6"; + name = "kmag-22.12.2.tar.xz"; }; }; kmahjongg = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmahjongg-22.12.1.tar.xz"; - sha256 = "0103p982wih0niqpzk464m2nwyfxinzl783qj7liwavrgsv1fkfy"; - name = "kmahjongg-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmahjongg-22.12.2.tar.xz"; + sha256 = "1snkxbdsvc0nzqknsgq7cg42imz9ay43ddxxqzf7d47fqsvwac4f"; + name = "kmahjongg-22.12.2.tar.xz"; }; }; kmail = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmail-22.12.1.tar.xz"; - sha256 = "02qgsyxs4y37ry2xwwc2x541l4l7gfbhq1gmankn1gp6128p9zhi"; - name = "kmail-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmail-22.12.2.tar.xz"; + sha256 = "0cj56i27bkxmnl26r20dp7s9qzihp3nlwhznj2nz1xzk6dri6fhb"; + name = "kmail-22.12.2.tar.xz"; }; }; kmail-account-wizard = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmail-account-wizard-22.12.1.tar.xz"; - sha256 = "0ncwmhz69fja35fg90a7q8m1vv94cbxapr5n69vgb4xlypf9sd38"; - name = "kmail-account-wizard-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmail-account-wizard-22.12.2.tar.xz"; + sha256 = "1ldypandladx520qhbrkasqb775i3ld1jnq8h2cm7549zm8rdjxj"; + name = "kmail-account-wizard-22.12.2.tar.xz"; }; }; kmailtransport = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmailtransport-22.12.1.tar.xz"; - sha256 = "19b6hhgdvnh23v5yl6rz6c0i742lavmmx1xkkkza69ha0nfaphw2"; - name = "kmailtransport-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmailtransport-22.12.2.tar.xz"; + sha256 = "0x34fhn12prrc4l01yiwar0kvjr8mbyg7p1sjqvq1gz7pjqflyfa"; + name = "kmailtransport-22.12.2.tar.xz"; }; }; kmbox = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmbox-22.12.1.tar.xz"; - sha256 = "1g01n0nvvjpds8bh8zg2r97s3xddhcvlxs6hvb2m7xck0x0w0rnq"; - name = "kmbox-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmbox-22.12.2.tar.xz"; + sha256 = "1xk44ndglf15fipd9hpqviv2j46linj41lprj5x84w9i3lxcflrf"; + name = "kmbox-22.12.2.tar.xz"; }; }; kmime = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmime-22.12.1.tar.xz"; - sha256 = "196sipqw1w4v3va4qy3y4369hyd6zgi8w36fqfkismc1z5lbhhi5"; - name = "kmime-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmime-22.12.2.tar.xz"; + sha256 = "1i3cfdh79wnmkrgidfbvgc3mdn3b8cfchy2zlkj1kbigx06l8cbc"; + name = "kmime-22.12.2.tar.xz"; }; }; kmines = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmines-22.12.1.tar.xz"; - sha256 = "1n0wbgxjah0n2mik4x1fkb1n3bq7zkkiklj2qn7l64qszdxjmzq4"; - name = "kmines-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmines-22.12.2.tar.xz"; + sha256 = "0n2nzx6b0fn9kkqiyavnijjgks7jgfpv4smzqrm55jskwcni9vry"; + name = "kmines-22.12.2.tar.xz"; }; }; kmix = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmix-22.12.1.tar.xz"; - sha256 = "00nq47v6h452wymj5bv3h0ava8wx1vg3w5kc43bnw7rfgh1ikpm9"; - name = "kmix-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmix-22.12.2.tar.xz"; + sha256 = "170rdwm18ld4khy3zck8d2936026cc90r1d37y0f70lw4p37lwpm"; + name = "kmix-22.12.2.tar.xz"; }; }; kmousetool = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmousetool-22.12.1.tar.xz"; - sha256 = "0z7ph40zld45pzyyh8naczqzvccra7rjcy9d12phcdmii2x05njw"; - name = "kmousetool-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmousetool-22.12.2.tar.xz"; + sha256 = "0pl0203zl989wjzpqg6rjqhr8k1fw22r7cw3plvbq2sgl1rlk7i2"; + name = "kmousetool-22.12.2.tar.xz"; }; }; kmouth = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmouth-22.12.1.tar.xz"; - sha256 = "0gkq6m3ylcghqsdwv8i8372dsia8cd61s8jfwnw94v41zbi5l6md"; - name = "kmouth-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmouth-22.12.2.tar.xz"; + sha256 = "0cx3lnx9909d630ccv6ln9sahgvpcxrpf56xm77rrrx1a8b7483l"; + name = "kmouth-22.12.2.tar.xz"; }; }; kmplot = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmplot-22.12.1.tar.xz"; - sha256 = "0vvqh5nikfd4lx90c41va6y66iad4dgzcgp1kxwshwlzlkpnd783"; - name = "kmplot-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmplot-22.12.2.tar.xz"; + sha256 = "0nb937war0ss0r4a2hp99qf4y9ac5cp8xfm0abnibsa9fykj9lsa"; + name = "kmplot-22.12.2.tar.xz"; }; }; knavalbattle = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/knavalbattle-22.12.1.tar.xz"; - sha256 = "195vqwp3k7dpgkbg43pl5y7vlm6858y1p6wqdz54dam1gcg7185g"; - name = "knavalbattle-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/knavalbattle-22.12.2.tar.xz"; + sha256 = "0nkkdzysmhn1a7yadzsd829xpsl3aqmizm5rb8yadspfv2kkf6pb"; + name = "knavalbattle-22.12.2.tar.xz"; }; }; knetwalk = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/knetwalk-22.12.1.tar.xz"; - sha256 = "0jf2jk1i3awww6yalb6k5p4c31d323m4f6dj76r5nnalpj81jkiv"; - name = "knetwalk-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/knetwalk-22.12.2.tar.xz"; + sha256 = "1a4gv5pb8j2jfavwz2f0qh022ng84ib4851rfzx2piky6wajpx8f"; + name = "knetwalk-22.12.2.tar.xz"; }; }; knights = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/knights-22.12.1.tar.xz"; - sha256 = "106kq9ahr000nnakiq9n8by06qq2av4pnlh23y4n0z52rbhq866w"; - name = "knights-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/knights-22.12.2.tar.xz"; + sha256 = "1l1igm2fvz9aw2hmpb30cajppdnszhpqya7w980m3snm2br8b45b"; + name = "knights-22.12.2.tar.xz"; }; }; knotes = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/knotes-22.12.1.tar.xz"; - sha256 = "180g0j1fhhixm4qm61whbik3z1pvijw33v2pb4jjzzhbxn439xcm"; - name = "knotes-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/knotes-22.12.2.tar.xz"; + sha256 = "073az341ycmrls3mv9m0rr1d8jps0yrsp62sawirk6sqy18i4ngw"; + name = "knotes-22.12.2.tar.xz"; }; }; kolf = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kolf-22.12.1.tar.xz"; - sha256 = "1v5xkjh6xdfmll7bcqsv1218bvr6q3z3ac1367gd824bcxv5j5np"; - name = "kolf-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kolf-22.12.2.tar.xz"; + sha256 = "08kz6gc6dx0v1ldaa518z1sz1n4dilsik2w8f9rggbl6p1ry53bj"; + name = "kolf-22.12.2.tar.xz"; }; }; kollision = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kollision-22.12.1.tar.xz"; - sha256 = "0ksq4inaq5a74jxxhsajwxnpgr7wnjgpm70kj0layxvryqjlzmkj"; - name = "kollision-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kollision-22.12.2.tar.xz"; + sha256 = "0pkz2lv9pwal4dy9y8bi5vwbp8x9z69g3n9vhwbxc4fv9hcqndnm"; + name = "kollision-22.12.2.tar.xz"; }; }; kolourpaint = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kolourpaint-22.12.1.tar.xz"; - sha256 = "0m1p1xdi8ax8zanqgmyqndzz1bngz4bxdv4lxjx4nqimgjjrbmj8"; - name = "kolourpaint-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kolourpaint-22.12.2.tar.xz"; + sha256 = "07zpc8fxlvm49v53cprz7syj59d73733vi3372gbmzir03q3xcw0"; + name = "kolourpaint-22.12.2.tar.xz"; }; }; kompare = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kompare-22.12.1.tar.xz"; - sha256 = "0g6qw3ajgb71rj99f2sni64i7sqdq586i71pj66pj18kx51m4zsn"; - name = "kompare-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kompare-22.12.2.tar.xz"; + sha256 = "14hyp72942alzrqzpv7mig3m4sgh4iivsnvnh1yacd9y4y1sdapy"; + name = "kompare-22.12.2.tar.xz"; }; }; konqueror = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/konqueror-22.12.1.tar.xz"; - sha256 = "1nyhrnl0ry5439r75974fy7mks78knxs6m8zg8y24glbmjnb1d0m"; - name = "konqueror-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/konqueror-22.12.2.tar.xz"; + sha256 = "1k3vf7sh21iy2v8j8bqxl83nnlpxisj14b6mbi1ldxxgsh6vzyly"; + name = "konqueror-22.12.2.tar.xz"; }; }; konquest = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/konquest-22.12.1.tar.xz"; - sha256 = "0nmrxylx1spvp9m3xwy9xgw2nxrv4k68zanr7q7cxlc95wlxdrk6"; - name = "konquest-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/konquest-22.12.2.tar.xz"; + sha256 = "1haa4zcfsgm25fcr20nvrr5pmy0ynz261q70qj722qh3ljz8cvgy"; + name = "konquest-22.12.2.tar.xz"; }; }; konsole = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/konsole-22.12.1.tar.xz"; - sha256 = "1jyfl6ibcpxphgh5by3501vk519fkvr5y9jhl1wzx6dh4vw7zh9l"; - name = "konsole-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/konsole-22.12.2.tar.xz"; + sha256 = "0d9lqq373vxw0fi54ipfll5qi7dz5ylaa7053csnfp26dmmhky9j"; + name = "konsole-22.12.2.tar.xz"; }; }; kontact = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kontact-22.12.1.tar.xz"; - sha256 = "1m943xcg4csjvcfm9py7h7cr3f2k3xvlidr75ri4sbwnhkl7494k"; - name = "kontact-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kontact-22.12.2.tar.xz"; + sha256 = "11l7zd12yfqw66lak5bvacz7fc6ahv5820vkfx8iacynvm43x94f"; + name = "kontact-22.12.2.tar.xz"; }; }; kontactinterface = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kontactinterface-22.12.1.tar.xz"; - sha256 = "13l44jm0rfin0vbm4znjn25igfmgkifi993qcq5pq6fy96cj2g8l"; - name = "kontactinterface-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kontactinterface-22.12.2.tar.xz"; + sha256 = "0yxpz4az4988yvjxy6za93ayiz8w6q61cqpgi48az2q74kc99qik"; + name = "kontactinterface-22.12.2.tar.xz"; }; }; kontrast = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kontrast-22.12.1.tar.xz"; - sha256 = "0vbqxn73p4d0wlv70gv39pz72lrwc92png14vfwi3ka23751mqai"; - name = "kontrast-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kontrast-22.12.2.tar.xz"; + sha256 = "1x8y26g9iy2hmiyadl3w22c5k3jwh9l59747px1nm7rjzsf11hf7"; + name = "kontrast-22.12.2.tar.xz"; }; }; konversation = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/konversation-22.12.1.tar.xz"; - sha256 = "12246dlhwak7hxj2p2i1wksijqx0a8iwrk7qyh1543hcjm4mkyyv"; - name = "konversation-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/konversation-22.12.2.tar.xz"; + sha256 = "1w12ld2xmncz2bmcsf9k5hxmd2djczbm7y8sh86f512km94m8dzg"; + name = "konversation-22.12.2.tar.xz"; }; }; kopeninghours = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kopeninghours-22.12.1.tar.xz"; - sha256 = "198m55gwvv5ig28hibk7gib6wj7rxahngw6ryshqgr0yhrir1bha"; - name = "kopeninghours-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kopeninghours-22.12.2.tar.xz"; + sha256 = "10bc9a0nljj345cgwpw676mcybp4mffzl4d6kfhc3qvcypagbnw7"; + name = "kopeninghours-22.12.2.tar.xz"; }; }; kopete = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kopete-22.12.1.tar.xz"; - sha256 = "0x7ya19n2wfd7h4h71sqa9kp02qh2sc0r8wy9njjn6basc6cj7yd"; - name = "kopete-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kopete-22.12.2.tar.xz"; + sha256 = "0ans8fi0x3n8p13qw6ylviv952zf4i1zwa0m0qb0saqq11my0c1d"; + name = "kopete-22.12.2.tar.xz"; }; }; korganizer = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/korganizer-22.12.1.tar.xz"; - sha256 = "11gqa0bxpwra5ml8yb7pp7x4jbn3rndi8c66jhmi89gb33qyfnzh"; - name = "korganizer-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/korganizer-22.12.2.tar.xz"; + sha256 = "0gvplwpvrm0ylx75sig9khwpqz5gq7q7qlyjx37r9apd3jgjxmyd"; + name = "korganizer-22.12.2.tar.xz"; }; }; kosmindoormap = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kosmindoormap-22.12.1.tar.xz"; - sha256 = "1fb7hbndys6yji6xmdi6qildzr5s5wknr3mzckjc093sqb5q1dv2"; - name = "kosmindoormap-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kosmindoormap-22.12.2.tar.xz"; + sha256 = "1nn5jafz2v262kwf45cgcy4hh8r7sccmzm36kjfinsbcjqci1vfq"; + name = "kosmindoormap-22.12.2.tar.xz"; }; }; kpat = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpat-22.12.1.tar.xz"; - sha256 = "0c0sr0lyskhqvyrhjb4x1hwpp4b5d1kxc6lnxz9w2qlgng8mr73l"; - name = "kpat-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpat-22.12.2.tar.xz"; + sha256 = "0qm6xizw8978xwysb0n120nqv4b1m5paw0hakw2v2sv5kn10mrns"; + name = "kpat-22.12.2.tar.xz"; }; }; kpimtextedit = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpimtextedit-22.12.1.tar.xz"; - sha256 = "10r1gmsqf2bd2f0x3x0nwdzwyp3b6zg32fq0jkgwd1j1zyxipmaf"; - name = "kpimtextedit-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpimtextedit-22.12.2.tar.xz"; + sha256 = "1g08j89dfw3444chndqmn9jwpr07k279rry10sd45l8rv77kdwdf"; + name = "kpimtextedit-22.12.2.tar.xz"; }; }; kpkpass = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpkpass-22.12.1.tar.xz"; - sha256 = "1hp5d7yzklyi9fy1d3dn39xiaxrhvxskchdrpjs83q91l8c49750"; - name = "kpkpass-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpkpass-22.12.2.tar.xz"; + sha256 = "1a8jgqyiv721plglvwsn7yj8zwh4rdz33g68qc23ka6g39s05nqn"; + name = "kpkpass-22.12.2.tar.xz"; }; }; kpmcore = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpmcore-22.12.1.tar.xz"; - sha256 = "13dpp7fm2750qbnwrp4rpj9kp9skpqkpq5jkj1s40b6267v7p7b4"; - name = "kpmcore-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpmcore-22.12.2.tar.xz"; + sha256 = "1a7clvrqm7mn4qqxq9qba9lbvsj6y717xzdx8cwhkfkv1wwi92xj"; + name = "kpmcore-22.12.2.tar.xz"; }; }; kpublictransport = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpublictransport-22.12.1.tar.xz"; - sha256 = "1f8imxkdayyp8p30ld80jl5v2wlnajmxl03cysx016lckqzds60l"; - name = "kpublictransport-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpublictransport-22.12.2.tar.xz"; + sha256 = "1r1hrnc17jkdd73qi9hr2f94f1ca19w1vf4hvc51hnzfmf71blqk"; + name = "kpublictransport-22.12.2.tar.xz"; }; }; kqtquickcharts = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kqtquickcharts-22.12.1.tar.xz"; - sha256 = "1ys904z1c104zyi1184xj63nzhpgwraakmsgw6wfbfxpw6sjy293"; - name = "kqtquickcharts-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kqtquickcharts-22.12.2.tar.xz"; + sha256 = "0m2zapifyi7lxidnhiwic3gp0sz8b5mvhxkz098zzbyygfs8pzwr"; + name = "kqtquickcharts-22.12.2.tar.xz"; }; }; krdc = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/krdc-22.12.1.tar.xz"; - sha256 = "1d8lm41i7mwcg5xd9hl9p32kajxz8iv26696f33z9kb5lhh8wv26"; - name = "krdc-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/krdc-22.12.2.tar.xz"; + sha256 = "1nalhjx4gjr783vbdf9rq5b7ix4af20sxnq446qmkcj923m5rlpy"; + name = "krdc-22.12.2.tar.xz"; }; }; kreversi = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kreversi-22.12.1.tar.xz"; - sha256 = "1aq7qnnmpkkb41znzxvhbfnxr0c60irlirkw7jv2jf7rqlqhahls"; - name = "kreversi-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kreversi-22.12.2.tar.xz"; + sha256 = "0hsf6xkhradd5yy22rj338550h4ls058wzx820qbz3is0l7yh515"; + name = "kreversi-22.12.2.tar.xz"; }; }; krfb = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/krfb-22.12.1.tar.xz"; - sha256 = "04bjybi15bar21334q9zpscw626fih5vnh1ndrz0q95sgyrcpd4z"; - name = "krfb-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/krfb-22.12.2.tar.xz"; + sha256 = "1fxzk5xrg57g84pwd23ibzmp587ly1l8i415mn5kiqkrvqb7i82i"; + name = "krfb-22.12.2.tar.xz"; }; }; kross-interpreters = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kross-interpreters-22.12.1.tar.xz"; - sha256 = "1h97d5gn63r34h9hhn37zmwri1z63c1h30ridahqn45sn2pqigz7"; - name = "kross-interpreters-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kross-interpreters-22.12.2.tar.xz"; + sha256 = "18i86hh9rcjmmx8j30k5z8k6i56qk6rh1nyz2z8zzlcdmnzcnv36"; + name = "kross-interpreters-22.12.2.tar.xz"; }; }; kruler = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kruler-22.12.1.tar.xz"; - sha256 = "18mp51hpqkc9wiwv1zdnx99xjjz58rvk7camz6fj8n4ns1j5q2g1"; - name = "kruler-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kruler-22.12.2.tar.xz"; + sha256 = "0pspihnp7bbmb26jzj6d616j8xmly65cs1h4w6mj5727pnprb4hf"; + name = "kruler-22.12.2.tar.xz"; }; }; ksanecore = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksanecore-22.12.1.tar.xz"; - sha256 = "0cx4n1hdbdfwd86b29risbgg2fijyvjcf29k3qky9gk1c7cfil5d"; - name = "ksanecore-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksanecore-22.12.2.tar.xz"; + sha256 = "133j2q1dm3lxyq10aflaxbjaprzcg875hpfk59z0214cfgnln6hy"; + name = "ksanecore-22.12.2.tar.xz"; }; }; kshisen = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kshisen-22.12.1.tar.xz"; - sha256 = "0phzfzvy8g5dcid92pbx288ix6ri3b9jx6slbqm2wv4p3r96l6hl"; - name = "kshisen-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kshisen-22.12.2.tar.xz"; + sha256 = "0siqribywssqkzjglb3vzizibjzxv8rgizjqbzxsf9frvm9pwc8d"; + name = "kshisen-22.12.2.tar.xz"; }; }; ksirk = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksirk-22.12.1.tar.xz"; - sha256 = "13ykkkygs0xaxd907xq3a9di61p7pnxdggsfmfpz8zk5xawavx2q"; - name = "ksirk-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksirk-22.12.2.tar.xz"; + sha256 = "0i79iiaxqy0w2ikqx503vkdpf6ipwvhkcghhy8rmcqhvc8d1mglq"; + name = "ksirk-22.12.2.tar.xz"; }; }; ksmtp = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksmtp-22.12.1.tar.xz"; - sha256 = "0vbwp2r90fxkmw51fjvphigqjj9lhk0dprb2wnfi9ik08iqc1dk7"; - name = "ksmtp-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksmtp-22.12.2.tar.xz"; + sha256 = "0d04n4i18zglmmdghbzqg75h7qpi19562mgch9aff7jdavx4w582"; + name = "ksmtp-22.12.2.tar.xz"; }; }; ksnakeduel = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksnakeduel-22.12.1.tar.xz"; - sha256 = "16pismxhrygwcbsricmli91sj86w623wkmbblns3yjw7bxy6gg2m"; - name = "ksnakeduel-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksnakeduel-22.12.2.tar.xz"; + sha256 = "08wcqi4cwsb2icf40skkkzhvvpr2gshmjaa33al23b4fmmjbfxyq"; + name = "ksnakeduel-22.12.2.tar.xz"; }; }; kspaceduel = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kspaceduel-22.12.1.tar.xz"; - sha256 = "0qlc3a05ppny6y2kzxqx817qcjmy5zal78bhhxlykn5l4m8hlis4"; - name = "kspaceduel-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kspaceduel-22.12.2.tar.xz"; + sha256 = "0ky59mrph08gpqs2yb6ykxb527qfaj6qgz5hs417a0bripjrznrm"; + name = "kspaceduel-22.12.2.tar.xz"; }; }; ksquares = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksquares-22.12.1.tar.xz"; - sha256 = "1z52c6m7lx9vg8v7kxnblcpag9l3m0r97rv87s7m2g2d3rw4rfib"; - name = "ksquares-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksquares-22.12.2.tar.xz"; + sha256 = "1dxnhqr671mb2drzz1ybvg5iqm2sy3b6vmal0xyfda29zfs1pvia"; + name = "ksquares-22.12.2.tar.xz"; }; }; ksudoku = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksudoku-22.12.1.tar.xz"; - sha256 = "00zylx2gla7c264csyix9z8k1h5zy2l0s9mrb2fds0i7i70gwcsw"; - name = "ksudoku-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksudoku-22.12.2.tar.xz"; + sha256 = "13s44cq0bz0r914ybll8p2f5jr9nfdvz4jx0inc2wzx58rcf6xw9"; + name = "ksudoku-22.12.2.tar.xz"; }; }; ksystemlog = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksystemlog-22.12.1.tar.xz"; - sha256 = "0y7xjf8z8myg3yv7rcdrqj15hj74vibn6myhspb2cn300z617rhr"; - name = "ksystemlog-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksystemlog-22.12.2.tar.xz"; + sha256 = "10ax7x6qy7wnnf4pjazjqw43dp8y8lycibqv3sxqqykwkvvfhmyi"; + name = "ksystemlog-22.12.2.tar.xz"; }; }; kteatime = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kteatime-22.12.1.tar.xz"; - sha256 = "0w7kvvs5w6zhahr1gq8gqv5sljfnp1bwznjammvc1hnqy1f4pj3n"; - name = "kteatime-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kteatime-22.12.2.tar.xz"; + sha256 = "1pa58lmp7gv8vm34b1pypv4m5rw8xlw6iydbsq0j6g2xlwjypx6f"; + name = "kteatime-22.12.2.tar.xz"; }; }; ktimer = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktimer-22.12.1.tar.xz"; - sha256 = "0mid32qr2jgn048vsv7j1jljxzwa87lfh0ybxp94c29z2nkxbxnp"; - name = "ktimer-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktimer-22.12.2.tar.xz"; + sha256 = "1hmg5hni3yqyrz7p1nm54gr14p2iz7q9yr803sh8k5f60xmr58j4"; + name = "ktimer-22.12.2.tar.xz"; }; }; ktnef = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktnef-22.12.1.tar.xz"; - sha256 = "0pcl7iaq1ipab5gg60w9wczkj8q7mnk62na2kajbgrmaw61slnj0"; - name = "ktnef-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktnef-22.12.2.tar.xz"; + sha256 = "03rjdpavqvhipla84lr9x9fq5jmx7zvfnngzldn94acra2806sbj"; + name = "ktnef-22.12.2.tar.xz"; }; }; ktorrent = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktorrent-22.12.1.tar.xz"; - sha256 = "093dc7gd9g05v78l5xq3c4k6kqx3x6c5n4w24mzq88x9ilf19jfw"; - name = "ktorrent-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktorrent-22.12.2.tar.xz"; + sha256 = "008676q9v9psyb0jdkmbj7zbmp6y1mjn3ihbx4zmxv3swzd95dgz"; + name = "ktorrent-22.12.2.tar.xz"; }; }; ktouch = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktouch-22.12.1.tar.xz"; - sha256 = "1zw6fkf8kcf1wc63bnc3f2i1ahq7y5vr3068yf49rxvd6dkmwxaw"; - name = "ktouch-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktouch-22.12.2.tar.xz"; + sha256 = "1f50wm5xqdyk5v15k144dq15schb3l5xfpawqv38n0r16jj3ql1b"; + name = "ktouch-22.12.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-accounts-kcm-22.12.1.tar.xz"; - sha256 = "00sc1jwrqwvia9mylb1xizq0nvkb2zzh72vh9ycpxbxc59x3jdpa"; - name = "ktp-accounts-kcm-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-accounts-kcm-22.12.2.tar.xz"; + sha256 = "1lcchdhxj9xba2l8sqv6xhan1559asncy753idy95lzbk10algqf"; + name = "ktp-accounts-kcm-22.12.2.tar.xz"; }; }; ktp-approver = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-approver-22.12.1.tar.xz"; - sha256 = "1s26y6wmn1m65rk8v1hd511qk21ll52p62hqp39gy4k2wivs1w5y"; - name = "ktp-approver-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-approver-22.12.2.tar.xz"; + sha256 = "1696p98aarmi8lf9n4pzv6rhpbdzn6gs5ci5ms2ypazv1a6jsi3v"; + name = "ktp-approver-22.12.2.tar.xz"; }; }; ktp-auth-handler = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-auth-handler-22.12.1.tar.xz"; - sha256 = "0qcklfnr5nm8c5x5p52nyjkkl2xjw5jzsnn5wsav8bzcm7pfrvp8"; - name = "ktp-auth-handler-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-auth-handler-22.12.2.tar.xz"; + sha256 = "033g8ail8qkv34g1h2ns9wyp64qmz59v1180n83bc9k3jzsnrk2q"; + name = "ktp-auth-handler-22.12.2.tar.xz"; }; }; ktp-call-ui = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-call-ui-22.12.1.tar.xz"; - sha256 = "1v60czwgiad0psas4ky7psyba75bxlg1xry26qrh3xp0r67a2gg3"; - name = "ktp-call-ui-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-call-ui-22.12.2.tar.xz"; + sha256 = "030rzda1l5vir1hcahdirh5n3d49c74m1ijag3cxjip7mv39q7mq"; + name = "ktp-call-ui-22.12.2.tar.xz"; }; }; ktp-common-internals = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-common-internals-22.12.1.tar.xz"; - sha256 = "0j48s6dk8a0925c84iwwk9j3vyw5lnx7mc9jfwaw523qi3pdhc60"; - name = "ktp-common-internals-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-common-internals-22.12.2.tar.xz"; + sha256 = "1d9kzlbf28gprncw98ldwd32cvi4gpi5njb281z5fn1z8m2q6qxl"; + name = "ktp-common-internals-22.12.2.tar.xz"; }; }; ktp-contact-list = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-contact-list-22.12.1.tar.xz"; - sha256 = "09dhr3vclymbkhl1zcd1gqpln5gdb6x4pa3as9gygqfiginnzbqc"; - name = "ktp-contact-list-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-contact-list-22.12.2.tar.xz"; + sha256 = "1xwx74870gqgamb5j6mnngc9l4vyjplnhi7bjf0ik7srg1lq4f34"; + name = "ktp-contact-list-22.12.2.tar.xz"; }; }; ktp-contact-runner = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-contact-runner-22.12.1.tar.xz"; - sha256 = "0d8fj2lf2h1bi36mv2yakc1nz8wmqd2znjx4vjmj7cf49jpr9jlk"; - name = "ktp-contact-runner-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-contact-runner-22.12.2.tar.xz"; + sha256 = "13j9vjdscdm5ljkqi4hy2kghz5w2r6lha78chyyzg3yjdrwayqp5"; + name = "ktp-contact-runner-22.12.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-desktop-applets-22.12.1.tar.xz"; - sha256 = "1wiwflsavbq971mrycn2qrb5xngd6kmph0xwmxj001r3vj6wmxvx"; - name = "ktp-desktop-applets-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-desktop-applets-22.12.2.tar.xz"; + sha256 = "1dxb0n8lq9d31yqrhx5jrqxj9j69x5qq5yq89lfipjz3xmqvws84"; + name = "ktp-desktop-applets-22.12.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-filetransfer-handler-22.12.1.tar.xz"; - sha256 = "0wklr4k2ybbpla0ybnqcj8ms46r14v47ldgy6pkba3lcvydn7zs3"; - name = "ktp-filetransfer-handler-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-filetransfer-handler-22.12.2.tar.xz"; + sha256 = "0dqp2rzld67qlxxj85bi331jn8m6rc7mdd851h3396j6cz6g8bm5"; + name = "ktp-filetransfer-handler-22.12.2.tar.xz"; }; }; ktp-kded-module = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-kded-module-22.12.1.tar.xz"; - sha256 = "123kvzn2cp2gkpgs3wqigzdmxval39jr0xwwr9mrfnbsdyf9cqs1"; - name = "ktp-kded-module-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-kded-module-22.12.2.tar.xz"; + sha256 = "0bpvmf9a9hkiz5f482fnc4qf0imys82ax5iz0rz32blp5j8cydil"; + name = "ktp-kded-module-22.12.2.tar.xz"; }; }; ktp-send-file = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-send-file-22.12.1.tar.xz"; - sha256 = "190gv19fzarj9mm8xp282sqag85hpam9sjiggcixqzcdmwp509z0"; - name = "ktp-send-file-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-send-file-22.12.2.tar.xz"; + sha256 = "0alfkv94s2zxxsxcm67dxvw3j9r5qj8wcn5w40wrp8qw93wigddy"; + name = "ktp-send-file-22.12.2.tar.xz"; }; }; ktp-text-ui = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-text-ui-22.12.1.tar.xz"; - sha256 = "1zdxjf2qvi4cg0hk9x9dv91gay4sqpp6h92vy8pi2fids98b5qa6"; - name = "ktp-text-ui-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-text-ui-22.12.2.tar.xz"; + sha256 = "0ryvi9qsi9bh6c1jjpq69bpgzshp3qi1ap7m9xar8icjbih3nllh"; + name = "ktp-text-ui-22.12.2.tar.xz"; }; }; ktuberling = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktuberling-22.12.1.tar.xz"; - sha256 = "0y7rf74pqd9cjh59w5hz59lixzx8l3qxaaqjyrbrrhal90yxq1g7"; - name = "ktuberling-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktuberling-22.12.2.tar.xz"; + sha256 = "13ks4ai28mb3fhjz2nvlwpb1997pp95l7bdw851i9d3lp2rr8bgn"; + name = "ktuberling-22.12.2.tar.xz"; }; }; kturtle = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kturtle-22.12.1.tar.xz"; - sha256 = "0w3kki02z0hhldalyf08nnvplska10v7d01bkgx5syrlnq9rvafb"; - name = "kturtle-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kturtle-22.12.2.tar.xz"; + sha256 = "18zcq2y48l7nzg20bv8kx370s4rfwl6xix452p6bhbbik7msfr85"; + name = "kturtle-22.12.2.tar.xz"; }; }; kubrick = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kubrick-22.12.1.tar.xz"; - sha256 = "0azr8j3070j6h7c3alkb559i2b8zb4kvazn6dqavj9bpwmymlpnk"; - name = "kubrick-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kubrick-22.12.2.tar.xz"; + sha256 = "02npa6jlzy73zn10kl6nnglagwpzbynk3m6q4a92897xmlzsx537"; + name = "kubrick-22.12.2.tar.xz"; }; }; kwalletmanager = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kwalletmanager-22.12.1.tar.xz"; - sha256 = "0anas3gnkhk1zinjjpixmlcj00bl2q3s5xb21mk1b4wzyz15w20g"; - name = "kwalletmanager-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kwalletmanager-22.12.2.tar.xz"; + sha256 = "1khbxnzciyi4l5dv6xkk5pjw1qk2wbn6l5n8v01azwkllh7wps4q"; + name = "kwalletmanager-22.12.2.tar.xz"; }; }; kwave = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kwave-22.12.1.tar.xz"; - sha256 = "0cvlyrhfw7mc58c25y9cic6c39jc42h3kygdy0v1fp8bg93xzzg3"; - name = "kwave-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kwave-22.12.2.tar.xz"; + sha256 = "0fz23sxn7yp5qvahyjp3ifl7fp7wm18jv20p0fiaq6xsj1q6nf2r"; + name = "kwave-22.12.2.tar.xz"; }; }; kwordquiz = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kwordquiz-22.12.1.tar.xz"; - sha256 = "1xzs0rkmk1mnlss31qhcbwmm6ss9f7my64wsiyfp67rchz9gbl31"; - name = "kwordquiz-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kwordquiz-22.12.2.tar.xz"; + sha256 = "0jadvh00pxjy9bzs2kvn3raywl569rva1n9pa3v0jjgpaa6pkck8"; + name = "kwordquiz-22.12.2.tar.xz"; }; }; libgravatar = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libgravatar-22.12.1.tar.xz"; - sha256 = "0dpvcw5793fsmr23zvnwn2kr194bq880pb3xpq77z9b00yhm6i26"; - name = "libgravatar-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libgravatar-22.12.2.tar.xz"; + sha256 = "1paxv6x8sqzm8xhhnv7f2llk3vyyg9nir2fkdly1gi6b9nl1649q"; + name = "libgravatar-22.12.2.tar.xz"; }; }; libkcddb = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkcddb-22.12.1.tar.xz"; - sha256 = "0w6d2qn4xzxywqj3khbzz3g9lgq5bvimvwqjs1p7i6hak5y4aa0f"; - name = "libkcddb-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkcddb-22.12.2.tar.xz"; + sha256 = "1z04y7ybyfpdzapa0i27w5ryymqfbk7p96ifkhmzf79xvl04g805"; + name = "libkcddb-22.12.2.tar.xz"; }; }; libkcompactdisc = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkcompactdisc-22.12.1.tar.xz"; - sha256 = "1lv94pzyyh90ga18flky096jdbjnf2rl1wn0p17w4lqlhm2n6d40"; - name = "libkcompactdisc-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkcompactdisc-22.12.2.tar.xz"; + sha256 = "169hbqyxy7nhddv3428ynv487fga2yz1m89cj9gjyhpj07pv3df4"; + name = "libkcompactdisc-22.12.2.tar.xz"; }; }; libkdcraw = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkdcraw-22.12.1.tar.xz"; - sha256 = "1sv5mkpf9r7vicyn7kxiaa7ykr81c39hnzh45in95m3ygy9p22lb"; - name = "libkdcraw-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkdcraw-22.12.2.tar.xz"; + sha256 = "11pnbbavviiryyia0ciyfrdhby4f76j988jd91s2hbg2pwh0l1hz"; + name = "libkdcraw-22.12.2.tar.xz"; }; }; libkdegames = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkdegames-22.12.1.tar.xz"; - sha256 = "0agyf6zvr24h550jagpngndmag6xmkjc7m0qmc9mjjk2yg6ildcm"; - name = "libkdegames-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkdegames-22.12.2.tar.xz"; + sha256 = "1x5bi4r6lsxrc68swvrapmszb1hi041aim5pkkp96mka3s97ybrz"; + name = "libkdegames-22.12.2.tar.xz"; }; }; libkdepim = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkdepim-22.12.1.tar.xz"; - sha256 = "1n6v9k1gwgvwjw0fqyj4vq9hw5kzy75dl3h6fmh4cyww9hjrjibl"; - name = "libkdepim-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkdepim-22.12.2.tar.xz"; + sha256 = "1c3bry6z9qi3fhybv018rbrwy4an5km94gygb5jyrkfgpdy94w7h"; + name = "libkdepim-22.12.2.tar.xz"; }; }; libkeduvocdocument = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkeduvocdocument-22.12.1.tar.xz"; - sha256 = "08svz6c2w9lyax0x6gj8zxikz3nzna0r2l1s41b3bhpjs3y3jkf4"; - name = "libkeduvocdocument-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkeduvocdocument-22.12.2.tar.xz"; + sha256 = "1ndzfyf7fn0saska59gvwhidq81arxnxx28ji66fdy7kvbr4a1bg"; + name = "libkeduvocdocument-22.12.2.tar.xz"; }; }; libkexiv2 = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkexiv2-22.12.1.tar.xz"; - sha256 = "1rxrw0m3wxdjzlc0plh0l0qpia6ipbx562m5dq9b9w2ppyxk8213"; - name = "libkexiv2-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkexiv2-22.12.2.tar.xz"; + sha256 = "0034lcsgcfdlkmz6vghxbbsvw3cr32hv6vh9hffz033j2035vc8l"; + name = "libkexiv2-22.12.2.tar.xz"; }; }; libkgapi = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkgapi-22.12.1.tar.xz"; - sha256 = "0i6ip7vrgvfzx27mjr2hyny6yfi622b5q0gp7kpzs95gnfc2f60i"; - name = "libkgapi-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkgapi-22.12.2.tar.xz"; + sha256 = "1n418dsic6jshqahby5drcngd72z6wg23fa9f1wi3h64z76qdddz"; + name = "libkgapi-22.12.2.tar.xz"; }; }; libkipi = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkipi-22.12.1.tar.xz"; - sha256 = "01xyglfzlk6aczxqcg51yx723p6i0m6d91kwixbj0nzkmjaafza2"; - name = "libkipi-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkipi-22.12.2.tar.xz"; + sha256 = "05vrh94vhklyq7bvpfd9wj54hs48zhbn2z17ln75snvzans7mjq9"; + name = "libkipi-22.12.2.tar.xz"; }; }; libkleo = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkleo-22.12.1.tar.xz"; - sha256 = "13flblvkglj25af4jhn9qd0w2krmmmc9icgrppxi8cnlrjyb579y"; - name = "libkleo-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkleo-22.12.2.tar.xz"; + sha256 = "10w14qvflqc9cx5wrgapgyidnj43ik6dl6s36y2k2qw691a3jrrx"; + name = "libkleo-22.12.2.tar.xz"; }; }; libkmahjongg = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkmahjongg-22.12.1.tar.xz"; - sha256 = "1x64iv0c0b1hpn0aj6scq1dz22w95fr1ikq317zvb3vff6wwrbwm"; - name = "libkmahjongg-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkmahjongg-22.12.2.tar.xz"; + sha256 = "0h09d2zb2lihwvr18vl77k5bl64zrpp5wn2nlf1czwkafna83pzy"; + name = "libkmahjongg-22.12.2.tar.xz"; }; }; libkomparediff2 = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkomparediff2-22.12.1.tar.xz"; - sha256 = "16bs5ifvprwjk0gkgp3vgqn2mgvzjkv4gm338xn58ziiisk0wq0m"; - name = "libkomparediff2-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkomparediff2-22.12.2.tar.xz"; + sha256 = "1gwc1dga01f8s2gapngw6zrvns3ks5sdkga0hmv5hrxi2zyx7vm3"; + name = "libkomparediff2-22.12.2.tar.xz"; }; }; libksane = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libksane-22.12.1.tar.xz"; - sha256 = "03kp3jq6y8ia2jshxrq74knazmb2v7i8q5pjv2w11v3gl5m9j0kw"; - name = "libksane-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libksane-22.12.2.tar.xz"; + sha256 = "0xj7vc2hnzgg0z14nh1z5ik4fqkszxjvvjh68qn64xrsf57g4994"; + name = "libksane-22.12.2.tar.xz"; }; }; libksieve = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libksieve-22.12.1.tar.xz"; - sha256 = "0wc505rphvywvixclh17abqla6nnyx8i8j4aysisfzjxkfwi1lsk"; - name = "libksieve-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libksieve-22.12.2.tar.xz"; + sha256 = "16507jn2zzvcg4a4ka870q716m696j1sbjfgnsh46vdy71zkxnrr"; + name = "libksieve-22.12.2.tar.xz"; }; }; libktorrent = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libktorrent-22.12.1.tar.xz"; - sha256 = "14kk8r67v6wssijqlj6p8sah89cxjgn8420pj4m0cvb4bhkf3vjd"; - name = "libktorrent-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libktorrent-22.12.2.tar.xz"; + sha256 = "15npc4n6p5s9z472ww3j8hxbmnvsdjp032zl4004794gwi7iph0r"; + name = "libktorrent-22.12.2.tar.xz"; }; }; lokalize = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/lokalize-22.12.1.tar.xz"; - sha256 = "1mkqk6azf2253z0ifj9y0wf8wdbxwhvn4k659cy3hcdfzd9a73nd"; - name = "lokalize-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/lokalize-22.12.2.tar.xz"; + sha256 = "1fmi1szwif5absg3czzjzh28nwa6k9j332gsi39c9jrznrkfsmyr"; + name = "lokalize-22.12.2.tar.xz"; }; }; lskat = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/lskat-22.12.1.tar.xz"; - sha256 = "0srx44k6zlsskl2mh0xrprxzhfm98ywlvc1br8l639vvr5mx2ms9"; - name = "lskat-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/lskat-22.12.2.tar.xz"; + sha256 = "1199glblbi2hbkyr2bd67v7ybsd9qpbmj9nbyswdis9gmk4jd0fp"; + name = "lskat-22.12.2.tar.xz"; }; }; mailcommon = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/mailcommon-22.12.1.tar.xz"; - sha256 = "009cgafhq26nqf1km4lcmypw1y0dig06wmy9rby4pis1f3ikvg5w"; - name = "mailcommon-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/mailcommon-22.12.2.tar.xz"; + sha256 = "171p4s5mfsa9lib6yk4jinircsz4rgry1x517ixxp8j5y7gm06b7"; + name = "mailcommon-22.12.2.tar.xz"; }; }; mailimporter = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/mailimporter-22.12.1.tar.xz"; - sha256 = "1cgpxavsla32081mynmc4jj6xyg1ahwvqpwvllzdgw060m190r5n"; - name = "mailimporter-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/mailimporter-22.12.2.tar.xz"; + sha256 = "1mvbvj7h476a3s2nxgzwbpsv48l53h6gvlkwa9lpj0llsl3xzc4z"; + name = "mailimporter-22.12.2.tar.xz"; }; }; marble = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/marble-22.12.1.tar.xz"; - sha256 = "1hhsfzcqg7pzj02j56zgz0n36ps7y8rkpnpbnn14c8l1xvic9x2v"; - name = "marble-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/marble-22.12.2.tar.xz"; + sha256 = "0fnsxpa75h2s5ak5ydv6v1wpsdxgkq7aqa2ywb65fl2w7knnm6pd"; + name = "marble-22.12.2.tar.xz"; }; }; markdownpart = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/markdownpart-22.12.1.tar.xz"; - sha256 = "1c8hacz0rqgawmvg2vk0m9sbz14s9z4h0fxxbism1pn3xs7nxdhm"; - name = "markdownpart-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/markdownpart-22.12.2.tar.xz"; + sha256 = "1w1p8q7rzbmw6q16nawiz2pzi1hgz3bsw6gzccwlpz76gsqrlfpy"; + name = "markdownpart-22.12.2.tar.xz"; }; }; mbox-importer = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/mbox-importer-22.12.1.tar.xz"; - sha256 = "1wy46bkm69hpv2rl0mcq1xdklr54clnqvskadny58pj8g9krjcnr"; - name = "mbox-importer-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/mbox-importer-22.12.2.tar.xz"; + sha256 = "00lccs9jm02j2rr5ia8wamx6y220z8ix5mjn8c3i6gampybv0446"; + name = "mbox-importer-22.12.2.tar.xz"; }; }; messagelib = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/messagelib-22.12.1.tar.xz"; - sha256 = "09w2n3wvs5fdbq5nbr9fdigjsxqrsi2dx6zxpgd9jf1m1bmcfd7y"; - name = "messagelib-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/messagelib-22.12.2.tar.xz"; + sha256 = "11c199q82w16nkx9mwswzg83lj4mv06vnv9dm4gqsg5rk7vf3jsz"; + name = "messagelib-22.12.2.tar.xz"; }; }; minuet = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/minuet-22.12.1.tar.xz"; - sha256 = "0zyrbccs2knzj19gh9ykqcyn5j8z9lxnwy15lb2f7h95hqqkn1xy"; - name = "minuet-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/minuet-22.12.2.tar.xz"; + sha256 = "1j9n7wqmvw27zwmk0ayl7jlr2i9wmd25b84m7pa9vhm34kgi1cc3"; + name = "minuet-22.12.2.tar.xz"; }; }; okular = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/okular-22.12.1.tar.xz"; - sha256 = "0w0agchkh0fszhvshqkvxs4z0i3q1vnaijqkzm119y1pjwynfkaw"; - name = "okular-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/okular-22.12.2.tar.xz"; + sha256 = "0l0iakc8zyj8xnv70hwf9kp1h0ayai7hffwi06p6v6nk5f0wnbjw"; + name = "okular-22.12.2.tar.xz"; }; }; palapeli = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/palapeli-22.12.1.tar.xz"; - sha256 = "0r26nlh26f0wwwg19ppq99ljsb0mfpi034h4g7fix5cq5ps0nyk5"; - name = "palapeli-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/palapeli-22.12.2.tar.xz"; + sha256 = "19s05d7v1x06ywcdfz5ch61nm4igj1493h9v3vkvp9ky4q6asspi"; + name = "palapeli-22.12.2.tar.xz"; }; }; parley = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/parley-22.12.1.tar.xz"; - sha256 = "02gqylb3liynnjq1vl67y3zkcadnpixaz3zlfx7j8zxz2p2zlxlb"; - name = "parley-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/parley-22.12.2.tar.xz"; + sha256 = "0sdls4f31k99p3ls3ibg0qqcrgq6c3lf8wmllcj4xaps84y1ar5k"; + name = "parley-22.12.2.tar.xz"; }; }; partitionmanager = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/partitionmanager-22.12.1.tar.xz"; - sha256 = "06ja3qnxshcg0hxczh6z6wc76dcsm41in8np07ch4l13d6nkpqpj"; - name = "partitionmanager-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/partitionmanager-22.12.2.tar.xz"; + sha256 = "1l3nkk4jbzz4kmv1ibyzji5milnjjnpbq9xblazd8y52knqlaqk0"; + name = "partitionmanager-22.12.2.tar.xz"; }; }; picmi = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/picmi-22.12.1.tar.xz"; - sha256 = "06bhkxqhwmk7hpmcsn0s9bql4anlk260dz63g6bcx4c93ln01ypq"; - name = "picmi-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/picmi-22.12.2.tar.xz"; + sha256 = "0dhqln0y366jrf5xs9q6ml8cc4rzi3brcaww96i4zhs707xiv8bb"; + name = "picmi-22.12.2.tar.xz"; }; }; pim-data-exporter = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/pim-data-exporter-22.12.1.tar.xz"; - sha256 = "1cijyd6qscghppcspimdc7kdvv4la6mbk57z9sj5agx2i05xsda6"; - name = "pim-data-exporter-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/pim-data-exporter-22.12.2.tar.xz"; + sha256 = "11qxbvrdcfhfbvnnc7f5v6vmfx04vkavwam60q39bvm5y1qyhnq3"; + name = "pim-data-exporter-22.12.2.tar.xz"; }; }; pim-sieve-editor = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/pim-sieve-editor-22.12.1.tar.xz"; - sha256 = "1nx1vahgxr175fplm4rv7frlr53fqn50xmfsaph42idi7nnqcrl4"; - name = "pim-sieve-editor-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/pim-sieve-editor-22.12.2.tar.xz"; + sha256 = "0d2hsrp53wv1vzrijnqzx1faz1aqfdkx020v6l132haywz1f44jh"; + name = "pim-sieve-editor-22.12.2.tar.xz"; }; }; pimcommon = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/pimcommon-22.12.1.tar.xz"; - sha256 = "128nqsxw275zi6dn3v1pnip9nhraz6pqjlzklkqm5qljfs5z6wk1"; - name = "pimcommon-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/pimcommon-22.12.2.tar.xz"; + sha256 = "1d2m256kd8lyv165jvswqw91wkkhxgpxf73hfw1rlwzvdlpyy5qd"; + name = "pimcommon-22.12.2.tar.xz"; }; }; poxml = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/poxml-22.12.1.tar.xz"; - sha256 = "0rs0bl0vg8qjaxgxbhlv90rgc7y13xg47j9k6v1q1v0gz07l8ms6"; - name = "poxml-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/poxml-22.12.2.tar.xz"; + sha256 = "0n3y1208ffya4p1lbbyj2g2g1mcw63h27wihxijax3iyp6lv6wwx"; + name = "poxml-22.12.2.tar.xz"; }; }; print-manager = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/print-manager-22.12.1.tar.xz"; - sha256 = "09y1x6if1cxsb6xh9b9alfxrfpnzymm71v6hjc0b13jalg7bha1b"; - name = "print-manager-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/print-manager-22.12.2.tar.xz"; + sha256 = "1w1jrqvw10brn7gcpkzcq5618wcjbl9lqplr9nw5h2ag31b8gzhs"; + name = "print-manager-22.12.2.tar.xz"; }; }; rocs = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/rocs-22.12.1.tar.xz"; - sha256 = "032jd0r7wyl33y24wnb95vz70kciyw132ph355ln6vrkkymmfy7w"; - name = "rocs-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/rocs-22.12.2.tar.xz"; + sha256 = "0xjxb1hgcyglnycywgq529sh5722chdngmby5cm4bhcjnmysr3vh"; + name = "rocs-22.12.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/signon-kwallet-extension-22.12.1.tar.xz"; - sha256 = "1pvm1046mp0dlal9ffr455yhvv0689c4iaiv2vkdz7p2lf3745wh"; - name = "signon-kwallet-extension-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/signon-kwallet-extension-22.12.2.tar.xz"; + sha256 = "1b7dhmpycdvvz269kphbddk9xrbhnq3d51mjxvp4aahziyqvjhr2"; + name = "signon-kwallet-extension-22.12.2.tar.xz"; }; }; skanlite = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/skanlite-22.12.1.tar.xz"; - sha256 = "1j00z785ajqj61qsdbq7pwnw5pjsfkqpk52s7li2kkmikmfhqsq8"; - name = "skanlite-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/skanlite-22.12.2.tar.xz"; + sha256 = "17jjx74syb2j7lrqjwfpym3wlk9cq5adgpf539k4zkszxhcqd4i0"; + name = "skanlite-22.12.2.tar.xz"; }; }; skanpage = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/skanpage-22.12.1.tar.xz"; - sha256 = "0wnkw2ybd4x35c1jfx6rmdj4iz4gh9bpfdc5ydri790l7c2zz1w4"; - name = "skanpage-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/skanpage-22.12.2.tar.xz"; + sha256 = "0ylh3grlfl77my135lszlz53fbhxvwyazf5aanhj33ryqwwyy925"; + name = "skanpage-22.12.2.tar.xz"; }; }; spectacle = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/spectacle-22.12.1.tar.xz"; - sha256 = "05pihywsbml6ncvzd9wih9bm0bwdxvlps9678vai9rdxks7apa78"; - name = "spectacle-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/spectacle-22.12.2.tar.xz"; + sha256 = "1gsz3wsir41a8ncyjlmfk8313c88x215myqgs3917wsb9f8x358j"; + name = "spectacle-22.12.2.tar.xz"; }; }; step = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/step-22.12.1.tar.xz"; - sha256 = "1k8s8cyfz895sx5b0w4a71nrsx89zkxk7c8a8fr6jxybgf9gnxz2"; - name = "step-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/step-22.12.2.tar.xz"; + sha256 = "056lhpnfjayv6qnng0g6pbr91zqhj0vzk2k87kj7k6snbhbvfm1w"; + name = "step-22.12.2.tar.xz"; }; }; svgpart = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/svgpart-22.12.1.tar.xz"; - sha256 = "08ffgwm7s8r8yc6j956j08y8dikmgssv0h0xlmk6wlxl0bryb4fr"; - name = "svgpart-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/svgpart-22.12.2.tar.xz"; + sha256 = "0c3b3l86a1di6k6jjf359hdrdxpyxj2fif7kci41y1ig4hipra4x"; + name = "svgpart-22.12.2.tar.xz"; }; }; sweeper = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/sweeper-22.12.1.tar.xz"; - sha256 = "0an6md9nk8sv2bmjcvghjxydpdz0rf4bhianym22gzsyxxi0bccj"; - name = "sweeper-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/sweeper-22.12.2.tar.xz"; + sha256 = "0mj3vhlhjm768zqi0fzs1zwcm566gpr23d36pl436y0rb3d9fm2c"; + name = "sweeper-22.12.2.tar.xz"; }; }; umbrello = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/umbrello-22.12.1.tar.xz"; - sha256 = "1d72808jwgjwzjkj5kw7wvkfvk05x8w0x2abzsbzhl9qf06jgn1h"; - name = "umbrello-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/umbrello-22.12.2.tar.xz"; + sha256 = "0l5rpi7nmky2q2rcnq66jx7g1wra2a21b2dq0hpnjn1f9fskxa97"; + name = "umbrello-22.12.2.tar.xz"; }; }; yakuake = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/yakuake-22.12.1.tar.xz"; - sha256 = "0qh48y2jj7lxn0lqyff5s93s4csyw12da6jcixbmcmnm3z33p09l"; - name = "yakuake-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/yakuake-22.12.2.tar.xz"; + sha256 = "07av7ikj70kj4xwjml2him4lin76gqzs3zrrz2w7q75m6m9qqzpj"; + name = "yakuake-22.12.2.tar.xz"; }; }; zanshin = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/zanshin-22.12.1.tar.xz"; - sha256 = "002smc57r54fs4c2ngk8k20wjjk3khmyfpjlw6hmxbn1hnzl609w"; - name = "zanshin-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/zanshin-22.12.2.tar.xz"; + sha256 = "18df7by60w5vcjy330y10pnzg3xar8i6273q9zba81qkvpvqkwn2"; + name = "zanshin-22.12.2.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 3c08f1d8a9dac..ef9c234bb76fd 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,43 +9,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.9.10" else "8.9.12-4.BETA"; + version = if channel == "stable" then "8.10.0" else "8.10.1-19.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-aoa00W5zvZQeHKd2Eqyrxl5Z1PwLMHc5lkMUskLiD74="; + sha256 = "sha256-mIplIW1XGb7EVlPIHgzL16zvVa/3ypfwTMtVSiSvYYE="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-Zt64UGKI3+DayS6XP7jTE+pxv52tUUZbUHiuzjcm1JI="; + sha256 = "sha256-xjbqZ/+sw3jBzbqhzd/mP7CZOCLYYi6KpX8Ypy/8/Es="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - sha256 = "sha256-sx9eASpMcgkIH1GRzJMqSQa5Y5GJlYU/20CZFyFK+OU="; + sha256 = "sha256-06wOSKzxZ7xVAUyIa4Fv48Z6nbMsQ/o74mEyVkmgkJs="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - sha256 = "sha256-Z1cEynO9iWZra542CVGmefrTNerMe13OcTAzWXNi8jI="; + sha256 = "sha256-zDu3PBj6kvDVpiFuoOuNlmyiSK4ZVuUWX3rBBwlwEvo="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-/WXaLINqLFLft+wrmr+fV0kM9qS5w4etFiGltnzoVdo="; + sha256 = "sha256-F/dnA9mqtXXp5vx6OQ5aPrdeEBMg9g6nozzMMNAZWHk="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-Zv9uHkFCZ0flBMAwQBjNhqFWhAXKyHBfZk733hbSag4="; + sha256 = "sha256-u8ktPt7W4teCJoXq1eEdKZCEsKxjhep/7DMHSMtuFBA="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - sha256 = "sha256-Vryk6nMQY+0NIgwJkZ2j3vrxyhrzxbe96jbyoNbPIR0="; + sha256 = "sha256-dZ1Vv4oocDYlw2sibnokUyAKcZ2W7zKofTX2ELamilI="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - sha256 = "sha256-74iOaNkuPRKUsTNNd7UTpy5ahjoMmxiNT84Op5ztRGk="; + sha256 = "sha256-JA2U/PfW2+qHPjqIGQL5gWIdqtd5G1lL3+hecYh2lcE="; }; }; }; diff --git a/pkgs/applications/misc/1password-gui/update.sh b/pkgs/applications/misc/1password-gui/update.sh new file mode 100755 index 0000000000000..aab589fd37ea5 --- /dev/null +++ b/pkgs/applications/misc/1password-gui/update.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq +#shellcheck shell=bash + +CURRENT_HASH="" + +print_hash() { + OS="$1" + CHANNEL="$2" + ARCH="$3" + VERSION="$4" + + if [[ "$OS" == "linux" ]]; then + if [[ "$ARCH" == "x86_64" ]]; then + EXT="x64.tar.gz" + else + EXT="arm64.tar.gz" + fi + URL="https://downloads.1password.com/${OS}/tar/${CHANNEL}/${ARCH}/1password-${VERSION}.${EXT}" + else + EXT="$ARCH.zip" + URL="https://downloads.1password.com/${OS}/1Password-${VERSION}-${EXT}" + fi + + CURRENT_HASH=$(nix store prefetch-file "$URL" --json | jq -r '.hash') + + echo "$CHANNEL ${ARCH}-${OS}: $CURRENT_HASH" +} + +if [[ -z "$STABLE_VER" ]]; then + echo "No 'STABLE_VER' environment variable provided, skipping" +else + print_hash "linux" "stable" "x86_64" "$STABLE_VER" + print_hash "linux" "stable" "aarch64" "$STABLE_VER" + print_hash "mac" "stable" "x86_64" "$STABLE_VER" + print_hash "mac" "stable" "aarch64" "$STABLE_VER" +fi + +if [[ -z "$BETA_VER" ]]; then + echo "No 'BETA_VER' environment variable provided, skipping" +else + print_hash "linux" "beta" "x86_64" "$BETA_VER" + print_hash "linux" "beta" "aarch64" "$BETA_VER" + print_hash "mac" "beta" "x86_64" "$BETA_VER" + print_hash "mac" "beta" "aarch64" "$BETA_VER" +fi diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index e7f094844b9a0..cbfde434e1eff 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.13.0"; + version = "2.14.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-B9XVejPge8wxWAoxj974rLz0dfaZEAaGn2mUcPeqFIo=" "zip"; - i686-linux = fetch "linux_386" "sha256-kLW9PmhCNDosKn1nmtzo8tBjBOaUyzqlLad332UACio=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-jbvkTlIuAm5tHzGm42kO+jykUffKwfOVSOh33i0URtM=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-kA+NjXrNcX0dKh+gNJT82vbQGKFOU8zPvGPqBtuBqOA=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-Pmfdz6jGWuRS76/35/+Al5gAbJ7rFyQQLB9tQr1Ecv8=" "zip"; + i686-linux = fetch "linux_386" "sha256-UQfoof5yuSiMjIWcbSuE45dhJ41MionPcMn8uAwP6I8=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-sx3wgAvazgWjSQMQxVE0irDXCNnDAPBivKQTUC3bZ08=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-pFoOoE329jSzshaHo/XFTIirKsxfdz1yOA0Ljb9VNkY=" "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 ec699d668923a..61b46e7081be0 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "5.4.1.11"; + version = "5.4.2.13"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-t4azVZVvAJmCCsg/2o+ZWroEmCLfdPYn2iWwVwdhIZw="; + sha256 = "sha256-4DaqIsHfijA0hkhlsC6qQ1n+HC0zwdMtXiswOPOVpM4="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 4b177bf5815ab..d5bbfee0b6f9e 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -58,8 +58,8 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.30.4"; sha256 = "1bzc2vqpsq4mx6rw2rnk4hr14gqd5w8rf2h026gh7rqkwqd3r2dj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; }) + (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.4.1"; sha256 = "0bf68gq6mc6kzri4zi8ydc0xrazqwqg38bhbpjpj90zmqc28kari"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) @@ -93,12 +93,12 @@ (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.4.0"; sha256 = "0d01dpl4bcnrxqxyxcx0jhh9v375fqhva9w0siadj5y6m15h1sl5"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.4.0"; sha256 = "0yyh74b8vlngg2mg728ds86467y9vkxys29yszl129g2n8fk5q0m"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.4.0"; sha256 = "1wccx8ig2xc6xcfh774m5z34w6jn0hjffiwc5sq9yl63zkv01vnn"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.4.0"; sha256 = "1k58j6lfqcgrl5f7dw0xnbq6w5bvr42a9fc44vwbzl52kzjdlnh2"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.4.0"; sha256 = "1rxgf0hbkkzywh8z7asky2rrh1gpnrr514v1aj5vnmh49sa31kiz"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.5.0"; sha256 = "00n8s45xwbayj3p6x3awvs87vqvmzypny21nqc61m7a38d1asijv"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.5.0"; sha256 = "1160r9splvmxrgk3b8yzgls0pxxwak3iqfr8v13ah5mwy8zkpx71"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 2d9b681a2e469..dfea7f1ffd4e9 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -11,8 +11,8 @@ let repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "a4617d145756f6dcf1f5729e5a60689aa484403b"; - sha256 = "178ip280bqyqd36rka9g2jx7b7wdf3zh56sahg53yxr55zwq5bcp"; + rev = "22692a1f115e8ca86f83fa17be55d9b20985570f"; + sha256 = "0k0msk1r7ih092cwjngy1824bxkbjwz0d5p3k2r2l67r2p9b3lab"; }; in diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix index 6ee3318e15010..b93726e1b979b 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="; }; }; - "@babel/core-7.20.7" = { + "@babel/core-7.20.12" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.20.7"; + version = "7.20.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.20.7.tgz"; - sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz"; + sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; }; }; "@babel/eslint-parser-7.19.1" = { @@ -166,13 +166,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.20.7" = { + "@babel/helper-module-transforms-7.20.11" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.20.7"; + version = "7.20.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz"; - sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz"; + sha512 = "uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -913,13 +913,13 @@ let sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.20.7" = { + "@babel/traverse-7.20.12" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.20.7"; + version = "7.20.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.7.tgz"; - sha512 = "xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz"; + sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; }; }; "@babel/types-7.20.7" = { @@ -940,13 +940,13 @@ let sha512 = "6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA=="; }; }; - "@eslint/eslintrc-1.4.0" = { + "@eslint/eslintrc-1.4.1" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz"; - sha512 = "7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"; + sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; }; }; "@fortawesome/fontawesome-common-types-6.2.1" = { @@ -985,13 +985,13 @@ let sha512 = "oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw=="; }; }; - "@fortawesome/vue-fontawesome-2.0.9" = { + "@fortawesome/vue-fontawesome-2.0.10" = { name = "_at_fortawesome_slash_vue-fontawesome"; packageName = "@fortawesome/vue-fontawesome"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.9.tgz"; - sha512 = "tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw=="; + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.10.tgz"; + sha512 = "OTETSXz+3ygD2OK2/vy82cmUBpuJqeOAg4gfnnv+f2Rir1tDIhQg026Q3NQxznq83ZLz8iNqGG9XJm26inpDeg=="; }; }; "@humanwhocodes/config-array-0.11.8" = { @@ -1606,13 +1606,13 @@ let sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; }; }; - "ajv-8.11.2" = { + "ajv-8.12.0" = { name = "ajv"; packageName = "ajv"; - version = "8.11.2"; + version = "8.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz"; - sha512 = "E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"; + sha512 = "sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA=="; }; }; "ajv-8.8.1" = { @@ -1732,13 +1732,13 @@ let sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; }; }; - "array-includes-3.1.4" = { + "array-includes-3.1.6" = { name = "array-includes"; packageName = "array-includes"; - version = "3.1.4"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz"; - sha512 = "ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw=="; + url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz"; + sha512 = "sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw=="; }; }; "array-union-1.0.2" = { @@ -1759,13 +1759,22 @@ let sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; }; }; - "array.prototype.flat-1.2.5" = { + "array.prototype.flat-1.3.1" = { name = "array.prototype.flat"; packageName = "array.prototype.flat"; - version = "1.2.5"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz"; + sha512 = "roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA=="; + }; + }; + "array.prototype.flatmap-1.3.1" = { + name = "array.prototype.flatmap"; + packageName = "array.prototype.flatmap"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz"; - sha512 = "KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg=="; + url = "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz"; + sha512 = "8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ=="; }; }; "asynckit-0.4.0" = { @@ -1777,22 +1786,31 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "axios-1.2.2" = { + "available-typed-arrays-1.0.5" = { + name = "available-typed-arrays"; + packageName = "available-typed-arrays"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; + sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; + }; + }; + "axios-1.2.6" = { name = "axios"; packageName = "axios"; - version = "1.2.2"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz"; - sha512 = "bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q=="; + url = "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz"; + sha512 = "rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ=="; }; }; - "babel-loader-9.1.0" = { + "babel-loader-9.1.2" = { name = "babel-loader"; packageName = "babel-loader"; - version = "9.1.0"; + version = "9.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.0.tgz"; - sha512 = "Antt61KJPinUMwHwIIz9T5zfMgevnfZkEVWYDWlG888fgdvRRGD0JTuf/fFozQnfT+uq64sk1bmdHDy/mOEWnA=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.2.tgz"; + sha512 = "mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA=="; }; }; "babel-plugin-polyfill-corejs2-0.3.3" = { @@ -1957,15 +1975,6 @@ let sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; - "call-bind-1.0.0" = { - name = "call-bind"; - packageName = "call-bind"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz"; - sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w=="; - }; - }; "call-bind-1.0.2" = { name = "call-bind"; packageName = "call-bind"; @@ -2425,13 +2434,13 @@ let sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; }; }; - "define-properties-1.1.3" = { + "define-properties-1.1.4" = { name = "define-properties"; packageName = "define-properties"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; + sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; }; }; "del-4.1.1" = { @@ -2650,13 +2659,13 @@ let sha512 = "/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw=="; }; }; - "es-abstract-1.19.1" = { + "es-abstract-1.21.1" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.19.1"; + version = "1.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz"; - sha512 = "2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz"; + sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg=="; }; }; "es-module-lexer-0.9.3" = { @@ -2668,6 +2677,24 @@ let sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="; }; }; + "es-set-tostringtag-2.0.1" = { + name = "es-set-tostringtag"; + packageName = "es-set-tostringtag"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"; + sha512 = "g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg=="; + }; + }; + "es-shim-unscopables-1.0.0" = { + name = "es-shim-unscopables"; + packageName = "es-shim-unscopables"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"; + sha512 = "Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w=="; + }; + }; "es-to-primitive-1.2.1" = { name = "es-to-primitive"; packageName = "es-to-primitive"; @@ -2713,13 +2740,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.30.0" = { + "eslint-8.33.0" = { name = "eslint"; packageName = "eslint"; - version = "8.30.0"; + version = "8.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz"; - sha512 = "MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz"; + sha512 = "WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -2731,40 +2758,40 @@ let sha512 = "xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig=="; }; }; - "eslint-import-resolver-node-0.3.6" = { + "eslint-import-resolver-node-0.3.7" = { name = "eslint-import-resolver-node"; packageName = "eslint-import-resolver-node"; - version = "0.3.6"; + version = "0.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz"; - sha512 = "0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw=="; + url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz"; + sha512 = "gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA=="; }; }; - "eslint-module-utils-2.7.3" = { + "eslint-module-utils-2.7.4" = { name = "eslint-module-utils"; packageName = "eslint-module-utils"; - version = "2.7.3"; + version = "2.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz"; - sha512 = "088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ=="; + url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz"; + sha512 = "j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA=="; }; }; - "eslint-plugin-import-2.26.0" = { + "eslint-plugin-import-2.27.5" = { name = "eslint-plugin-import"; packageName = "eslint-plugin-import"; - version = "2.26.0"; + version = "2.27.5"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz"; - sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; + url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz"; + sha512 = "LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow=="; }; }; - "eslint-plugin-vue-9.8.0" = { + "eslint-plugin-vue-9.9.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "9.8.0"; + version = "9.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.8.0.tgz"; - sha512 = "E/AXwcTzunyzM83C2QqDHxepMzvI2y6x+mmeYHbVDQlKFqmKYvRrhaVixEeeG27uI44p9oKDFiyCRw4XxgtfHA=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.9.0.tgz"; + sha512 = "YbubS7eK0J7DCf0U2LxvVP7LMfs6rC6UltihIgval3azO3gyDwEGVgsCMe1TmDiEkl6GdMKfRpaME6QxIYtzDQ=="; }; }; "eslint-scope-5.1.1" = { @@ -3028,15 +3055,6 @@ let sha512 = "wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="; }; }; - "find-up-2.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; - sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; - }; - }; "find-up-4.1.0" = { name = "find-up"; packageName = "find-up"; @@ -3091,6 +3109,15 @@ let sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; }; + "for-each-0.3.3" = { + name = "for-each"; + packageName = "for-each"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"; + sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; + }; + }; "form-data-4.0.0" = { name = "form-data"; packageName = "form-data"; @@ -3154,6 +3181,24 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; + "function.prototype.name-1.1.5" = { + name = "function.prototype.name"; + packageName = "function.prototype.name"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; + sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; + }; + }; + "functions-have-names-1.2.3" = { + name = "functions-have-names"; + packageName = "functions-have-names"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"; + sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; + }; + }; "gensync-1.0.0-beta.2" = { name = "gensync"; packageName = "gensync"; @@ -3163,22 +3208,13 @@ let sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; - "get-intrinsic-1.0.1" = { + "get-intrinsic-1.1.3" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; - sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg=="; - }; - }; - "get-intrinsic-1.1.1" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.1.1"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; - sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; + sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; }; }; "get-stream-6.0.1" = { @@ -3253,6 +3289,24 @@ let sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; }; }; + "globals-13.20.0" = { + name = "globals"; + packageName = "globals"; + version = "13.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz"; + sha512 = "Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ=="; + }; + }; + "globalthis-1.0.3" = { + name = "globalthis"; + packageName = "globalthis"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"; + sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; + }; + }; "globby-13.1.1" = { name = "globby"; packageName = "globby"; @@ -3271,6 +3325,15 @@ let sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; }; }; + "gopd-1.0.1" = { + name = "gopd"; + packageName = "gopd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"; + sha512 = "d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="; + }; + }; "graceful-fs-4.2.9" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -3316,13 +3379,13 @@ let sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; - "has-bigints-1.0.1" = { + "has-bigints-1.0.2" = { name = "has-bigints"; packageName = "has-bigints"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz"; - sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; + url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"; + sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; }; }; "has-flag-3.0.0" = { @@ -3343,31 +3406,31 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-symbols-1.0.0" = { - name = "has-symbols"; - packageName = "has-symbols"; + "has-property-descriptors-1.0.0" = { + name = "has-property-descriptors"; + packageName = "has-property-descriptors"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; - sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; + sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; }; }; - "has-symbols-1.0.1" = { - name = "has-symbols"; - packageName = "has-symbols"; + "has-proto-1.0.1" = { + name = "has-proto"; + packageName = "has-proto"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; - sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; + url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"; + sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="; }; }; - "has-symbols-1.0.2" = { + "has-symbols-1.0.3" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; }; "has-tostringtag-1.0.0" = { @@ -3505,13 +3568,13 @@ let sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; - "humanize-duration-3.27.3" = { + "humanize-duration-3.28.0" = { name = "humanize-duration"; packageName = "humanize-duration"; - version = "3.27.3"; + version = "3.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.3.tgz"; - sha512 = "iimHkHPfIAQ8zCDQLgn08pRqSVioyWvnGfaQ8gond2wf7Jq2jJ+24ykmnRyiz3fIldcn4oUuQXpjqKLhSVR7lw=="; + url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.28.0.tgz"; + sha512 = "jMAxraOOmHuPbffLVDKkEKi/NeG8dMqP8lGRd6Tbf7JgAeG33jjgPWDbXXU7ypCI0o+oNKJFgbSB9FKVdWNI2A=="; }; }; "iconv-lite-0.4.24" = { @@ -3604,13 +3667,13 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "internal-slot-1.0.3" = { + "internal-slot-1.0.4" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"; + sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; }; }; "interpret-2.2.0" = { @@ -3640,6 +3703,15 @@ let sha512 = "1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="; }; }; + "is-array-buffer-3.0.1" = { + name = "is-array-buffer"; + packageName = "is-array-buffer"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz"; + sha512 = "ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ=="; + }; + }; "is-bigint-1.0.4" = { name = "is-bigint"; packageName = "is-bigint"; @@ -3667,31 +3739,22 @@ let sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; }; }; - "is-callable-1.1.5" = { + "is-callable-1.2.7" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; - sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="; - }; - }; - "is-callable-1.2.4" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.4"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; - sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"; + sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; }; }; - "is-core-module-2.8.1" = { + "is-core-module-2.11.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.8.1"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"; - sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz"; + sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; }; }; "is-date-object-1.0.1" = { @@ -3739,13 +3802,13 @@ let sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; }; - "is-negative-zero-2.0.1" = { + "is-negative-zero-2.0.2" = { name = "is-negative-zero"; packageName = "is-negative-zero"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; - sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="; + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; + sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; }; }; "is-number-7.0.0" = { @@ -3757,13 +3820,13 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; - "is-number-object-1.0.6" = { + "is-number-object-1.0.7" = { name = "is-number-object"; packageName = "is-number-object"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz"; - sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g=="; + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"; + sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; }; }; "is-path-cwd-2.2.0" = { @@ -3829,13 +3892,13 @@ let sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; }; }; - "is-shared-array-buffer-1.0.1" = { + "is-shared-array-buffer-1.0.2" = { name = "is-shared-array-buffer"; packageName = "is-shared-array-buffer"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz"; - sha512 = "IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="; + url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; + sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; }; }; "is-stream-2.0.1" = { @@ -3856,15 +3919,6 @@ let sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; }; }; - "is-symbol-1.0.2" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"; - sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; - }; - }; "is-symbol-1.0.4" = { name = "is-symbol"; packageName = "is-symbol"; @@ -3874,13 +3928,22 @@ let sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; - "is-weakref-1.0.1" = { + "is-typed-array-1.1.10" = { + name = "is-typed-array"; + packageName = "is-typed-array"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz"; + sha512 = "PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A=="; + }; + }; + "is-weakref-1.0.2" = { name = "is-weakref"; packageName = "is-weakref"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz"; - sha512 = "b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ=="; + url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"; + sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; }; }; "is-wsl-2.2.0" = { @@ -4027,13 +4090,13 @@ let sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; - "json5-2.2.2" = { + "json5-2.2.3" = { name = "json5"; packageName = "json5"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz"; - sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; }; "kind-of-6.0.3" = { @@ -4063,22 +4126,22 @@ let sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; - "linkify-html-4.0.2" = { + "linkify-html-4.1.0" = { name = "linkify-html"; packageName = "linkify-html"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/linkify-html/-/linkify-html-4.0.2.tgz"; - sha512 = "YcN3tsyutK2Y/uSuoG0zne8FQdoqzrAgNU5ko0DWE7M2oQ3ms4z/202f2W4TvRm9uxKdrsWAullfynANLaVMqw=="; + url = "https://registry.npmjs.org/linkify-html/-/linkify-html-4.1.0.tgz"; + sha512 = "cQSNN4i5V1xRjdSUEnXgn855xsl+usD7zBSsNyMSFBf4NlaZFocn7cExJA217azxODeqea79b6fDPXLa7jdkcA=="; }; }; - "linkifyjs-4.0.2" = { + "linkifyjs-4.1.0" = { name = "linkifyjs"; packageName = "linkifyjs"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.0.2.tgz"; - sha512 = "/VSoCZiglX0VMsXmL5PN3lRg45M86lrD9PskdkA2abWaTKap1bIcJ11LS4EE55bcUl9ZOR4eZ792UtQ9E/5xLA=="; + url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.1.0.tgz"; + sha512 = "Ffv8VoY3+ixI1b3aZ3O+jM6x17cOsgwfB1Wq7pkytbo1WlyRp6ZO0YDMqiWT/gQPY/CmtiGuKfzDIVqxh1aCTA=="; }; }; "loader-runner-4.2.0" = { @@ -4108,15 +4171,6 @@ let sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; }; }; - "locate-path-2.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; - sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; - }; - }; "locate-path-5.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -4495,22 +4549,13 @@ let sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; - "object-inspect-1.11.0" = { + "object-inspect-1.12.2" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz"; - sha512 = "jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="; - }; - }; - "object-keys-1.0.12" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.0.12"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz"; - sha512 = "FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; + sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; }; }; "object-keys-1.1.1" = { @@ -4522,13 +4567,13 @@ let sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; - "object.assign-4.1.2" = { + "object.assign-4.1.4" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.2"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; - sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz"; + sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; }; }; "object.entries-1.1.5" = { @@ -4540,13 +4585,13 @@ let sha512 = "TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g=="; }; }; - "object.values-1.1.5" = { + "object.values-1.1.6" = { name = "object.values"; packageName = "object.values"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz"; - sha512 = "QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz"; + sha512 = "FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw=="; }; }; "obuf-1.1.2" = { @@ -4621,15 +4666,6 @@ let sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; }; }; - "p-limit-1.3.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; - sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; - }; - }; "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -4648,15 +4684,6 @@ let sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; }; - "p-locate-2.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; - sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; - }; - }; "p-locate-4.1.0" = { name = "p-locate"; packageName = "p-locate"; @@ -4693,15 +4720,6 @@ let sha512 = "e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA=="; }; }; - "p-try-1.0.0" = { - name = "p-try"; - packageName = "p-try"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; - }; - }; "p-try-2.2.0" = { name = "p-try"; packageName = "p-try"; @@ -4747,15 +4765,6 @@ let sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; }; }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; - }; - }; "path-exists-4.0.0" = { name = "path-exists"; packageName = "path-exists"; @@ -5179,6 +5188,15 @@ let sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg=="; }; }; + "regexp.prototype.flags-1.4.3" = { + name = "regexp.prototype.flags"; + packageName = "regexp.prototype.flags"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; + sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; + }; + }; "regexpp-3.2.0" = { name = "regexpp"; packageName = "regexpp"; @@ -5251,13 +5269,13 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "resolve-1.22.0" = { + "resolve-1.22.1" = { name = "resolve"; packageName = "resolve"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; - sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; + sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; }; }; "resolve-cwd-3.0.0" = { @@ -5350,6 +5368,15 @@ let sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; + "safe-regex-test-1.0.0" = { + name = "safe-regex-test"; + packageName = "safe-regex-test"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"; + sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -5629,22 +5656,22 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; - "string.prototype.trimend-1.0.4" = { + "string.prototype.trimend-1.0.6" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; - sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"; + sha512 = "JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ=="; }; }; - "string.prototype.trimstart-1.0.4" = { + "string.prototype.trimstart-1.0.6" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; - sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"; + sha512 = "omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="; }; }; "string_decoder-1.1.1" = { @@ -5872,6 +5899,15 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; + "typed-array-length-1.0.4" = { + name = "typed-array-length"; + packageName = "typed-array-length"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz"; + sha512 = "KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng=="; + }; + }; "typed-assert-1.0.8" = { name = "typed-assert"; packageName = "typed-assert"; @@ -5881,13 +5917,13 @@ let sha512 = "5NkbXZUlmCE73Fs7gvkp1XXJWHYetPkg60QnQ2NXQmBYNFxbBr2zA8GCtaH4K2s2WhOmSlgiSTmrjrcm5tnM5g=="; }; }; - "unbox-primitive-1.0.1" = { + "unbox-primitive-1.0.2" = { name = "unbox-primitive"; packageName = "unbox-primitive"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; - sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; + url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; + sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; "unicode-canonical-property-names-ecmascript-2.0.0" = { @@ -6070,13 +6106,13 @@ let sha512 = "XEeZUmlVeODclAjCNpWDnjgw+t3WA6gdzs6ENoIAgwO1J1d5p1tezDhtteLUFwcaQaTtayRrsx7GL6oXp/m2Jw=="; }; }; - "vue-multiselect-2.1.6" = { + "vue-multiselect-2.1.7" = { name = "vue-multiselect"; packageName = "vue-multiselect"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.6.tgz"; - sha512 = "s7jmZPlm9FeueJg1RwJtnE9KNPtME/7C8uRWSfp9/yEN4M8XcS/d+bddoyVwVnvFyRh9msFo0HWeW0vTL8Qv+w=="; + url = "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.7.tgz"; + sha512 = "KIegcN+Ntwg3cbkY/jhw2s/+XJUM0Lpi/LcKFYCS8PrZHcWBl2iKCVze7ZCnRj3w8H7/lUJ9v7rj9KQiNxApBw=="; }; }; "vue-resize-1.0.1" = { @@ -6268,6 +6304,15 @@ let sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; + "which-typed-array-1.1.9" = { + name = "which-typed-array"; + packageName = "which-typed-array"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz"; + sha512 = "w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA=="; + }; + }; "wildcard-2.0.0" = { name = "wildcard"; packageName = "wildcard"; @@ -6368,10 +6413,10 @@ let sources."@ampproject/remapping-2.1.1" sources."@babel/code-frame-7.18.6" sources."@babel/compat-data-7.20.5" - (sources."@babel/core-7.20.7" // { + (sources."@babel/core-7.20.12" // { dependencies = [ sources."debug-4.3.4" - sources."json5-2.2.2" + sources."json5-2.2.3" sources."ms-2.1.2" sources."semver-6.3.0" ]; @@ -6407,7 +6452,7 @@ let sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-member-expression-to-functions-7.18.9" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.7" + sources."@babel/helper-module-transforms-7.20.11" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-remap-async-to-generator-7.18.9" @@ -6494,7 +6539,7 @@ let sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" sources."@babel/template-7.20.7" - (sources."@babel/traverse-7.20.7" // { + (sources."@babel/traverse-7.20.12" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -6502,7 +6547,7 @@ let }) sources."@babel/types-7.20.7" sources."@discoveryjs/json-ext-0.5.5" - (sources."@eslint/eslintrc-1.4.0" // { + (sources."@eslint/eslintrc-1.4.1" // { dependencies = [ sources."debug-4.3.3" sources."globals-13.19.0" @@ -6513,7 +6558,7 @@ let sources."@fortawesome/fontawesome-svg-core-6.2.1" sources."@fortawesome/free-brands-svg-icons-6.2.1" sources."@fortawesome/free-solid-svg-icons-6.2.1" - sources."@fortawesome/vue-fontawesome-2.0.9" + sources."@fortawesome/vue-fontawesome-2.0.10" (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ sources."debug-4.3.3" @@ -6603,27 +6648,17 @@ let sources."anymatch-3.1.2" sources."argparse-2.0.1" sources."array-flatten-2.1.2" - (sources."array-includes-3.1.4" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) + sources."array-includes-3.1.6" sources."array-union-1.0.2" sources."array-uniq-1.0.3" - (sources."array.prototype.flat-1.2.5" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) + sources."array.prototype.flat-1.3.1" + sources."array.prototype.flatmap-1.3.1" sources."asynckit-0.4.0" - sources."axios-1.2.2" - (sources."babel-loader-9.1.0" // { + sources."available-typed-arrays-1.0.5" + sources."axios-1.2.6" + (sources."babel-loader-9.1.2" // { dependencies = [ - sources."ajv-8.11.2" + sources."ajv-8.12.0" sources."ajv-keywords-5.1.0" sources."json-schema-traverse-1.0.0" sources."schema-utils-4.0.0" @@ -6659,7 +6694,7 @@ let sources."browserslist-4.21.3" sources."buffer-from-1.1.1" sources."bytes-3.0.0" - sources."call-bind-1.0.0" + sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camel-case-4.1.2" sources."caniuse-lite-1.0.30001399" @@ -6715,7 +6750,7 @@ let sources."deepmerge-4.2.2" sources."default-gateway-6.0.3" sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" (sources."del-4.1.1" // { dependencies = [ sources."pify-4.0.1" @@ -6747,24 +6782,15 @@ let sources."enhanced-resolve-5.10.0" sources."entities-2.2.0" sources."envinfo-7.8.1" - (sources."es-abstract-1.19.1" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - sources."is-callable-1.2.4" - sources."is-negative-zero-2.0.1" - sources."object-keys-1.1.1" - sources."string.prototype.trimend-1.0.4" - sources."string.prototype.trimstart-1.0.4" - ]; - }) + sources."es-abstract-1.21.1" sources."es-module-lexer-0.9.3" + sources."es-set-tostringtag-2.0.1" + sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.30.0" // { + (sources."eslint-8.33.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6774,16 +6800,11 @@ let sources."escape-string-regexp-4.0.0" sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" - sources."find-up-5.0.0" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."has-flag-4.0.0" sources."is-path-inside-3.0.3" - sources."locate-path-6.0.0" sources."ms-2.1.2" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" sources."supports-color-7.2.0" ]; }) @@ -6792,24 +6813,27 @@ let sources."semver-6.3.0" ]; }) - (sources."eslint-import-resolver-node-0.3.6" // { + (sources."eslint-import-resolver-node-0.3.7" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" ]; }) - (sources."eslint-module-utils-2.7.3" // { + (sources."eslint-module-utils-2.7.4" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" ]; }) - (sources."eslint-plugin-import-2.26.0" // { + (sources."eslint-plugin-import-2.27.5" // { dependencies = [ + sources."debug-3.2.7" sources."doctrine-2.1.0" + sources."ms-2.1.3" + sources."semver-6.3.0" ]; }) - (sources."eslint-plugin-vue-9.8.0" // { + (sources."eslint-plugin-vue-9.9.0" // { dependencies = [ sources."debug-4.3.4" sources."eslint-scope-7.1.1" @@ -6875,15 +6899,15 @@ let sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."path-exists-4.0.0" sources."pkg-dir-4.2.0" ]; }) - sources."find-up-2.1.0" + sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" sources."flatted-3.2.4" sources."follow-redirects-1.15.2" + sources."for-each-0.3.3" sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -6891,20 +6915,12 @@ let sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" + sources."function.prototype.name-1.1.5" + sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" - (sources."get-intrinsic-1.0.1" // { - dependencies = [ - sources."has-symbols-1.0.1" - ]; - }) + sources."get-intrinsic-1.1.3" sources."get-stream-6.0.1" - (sources."get-symbol-description-1.0.0" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) + sources."get-symbol-description-1.0.0" sources."glob-7.1.3" (sources."glob-parent-5.1.2" // { dependencies = [ @@ -6913,24 +6929,24 @@ let }) sources."glob-to-regexp-0.4.1" sources."globals-11.12.0" + sources."globalthis-1.0.3" (sources."globby-6.1.0" // { dependencies = [ sources."pify-2.3.0" ]; }) + sources."gopd-1.0.1" sources."graceful-fs-4.2.9" sources."grapheme-splitter-1.0.4" sources."gzip-size-6.0.0" sources."handle-thing-2.0.1" sources."has-1.0.3" - sources."has-bigints-1.0.1" + sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" - (sources."has-tostringtag-1.0.0" // { - dependencies = [ - sources."has-symbols-1.0.2" - ]; - }) + sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" + sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" sources."hash-sum-1.0.2" sources."he-1.2.0" (sources."hpack.js-2.1.6" // { @@ -6956,7 +6972,7 @@ let sources."http-proxy-1.18.1" sources."http-proxy-middleware-2.0.4" sources."human-signals-2.1.0" - sources."humanize-duration-3.27.3" + sources."humanize-duration-3.28.0" sources."iconv-lite-0.4.24" sources."icss-utils-5.1.0" sources."ignore-5.2.0" @@ -6973,55 +6989,40 @@ let sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."path-exists-4.0.0" sources."pkg-dir-4.2.0" ]; }) sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - (sources."internal-slot-1.0.3" // { - dependencies = [ - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) + sources."internal-slot-1.0.4" sources."interpret-2.2.0" sources."ipaddr.js-2.0.1" + sources."is-array-buffer-3.0.1" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" - (sources."is-boolean-object-1.1.2" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) - sources."is-callable-1.1.5" - sources."is-core-module-2.8.1" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.7" + sources."is-core-module-2.11.0" sources."is-date-object-1.0.1" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" + sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" - sources."is-number-object-1.0.6" + sources."is-number-object-1.0.7" sources."is-path-cwd-2.2.0" sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" sources."is-plain-obj-3.0.0" sources."is-plain-object-2.0.4" - (sources."is-regex-1.1.4" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) - sources."is-shared-array-buffer-1.0.1" + sources."is-regex-1.1.4" + sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" sources."is-string-1.0.7" - sources."is-symbol-1.0.2" - sources."is-weakref-1.0.1" + sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" + sources."is-weakref-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -7043,15 +7044,15 @@ let sources."kind-of-6.0.3" sources."klona-2.0.5" sources."levn-0.4.1" - sources."linkify-html-4.0.2" - sources."linkifyjs-4.0.2" + sources."linkify-html-4.1.0" + sources."linkifyjs-4.1.0" sources."loader-runner-4.2.0" (sources."loader-utils-1.4.0" // { dependencies = [ sources."emojis-list-3.0.0" ]; }) - sources."locate-path-2.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash-es-4.17.21" sources."lodash.debounce-4.0.8" @@ -7094,28 +7095,11 @@ let sources."npm-run-path-4.0.1" sources."nth-check-2.0.1" sources."object-assign-4.1.1" - sources."object-inspect-1.11.0" - sources."object-keys-1.0.12" - (sources."object.assign-4.1.2" // { - dependencies = [ - sources."has-symbols-1.0.2" - sources."object-keys-1.1.1" - ]; - }) - (sources."object.entries-1.1.5" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) - (sources."object.values-1.1.5" // { - dependencies = [ - sources."call-bind-1.0.2" - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) + sources."object-inspect-1.12.2" + sources."object-keys-1.1.1" + sources."object.assign-4.1.4" + sources."object.entries-1.1.5" + sources."object.values-1.1.6" sources."obuf-1.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -7124,16 +7108,15 @@ let sources."open-8.4.0" sources."opener-1.5.2" sources."optionator-0.9.1" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."p-map-2.1.0" sources."p-retry-4.6.1" - sources."p-try-1.0.0" sources."param-case-3.0.4" sources."parent-module-1.0.1" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-3.1.1" @@ -7180,6 +7163,7 @@ let sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.15.0" + sources."regexp.prototype.flags-1.4.3" sources."regexpp-3.2.0" sources."regexpu-core-5.1.0" sources."regjsgen-0.6.0" @@ -7192,7 +7176,7 @@ let sources."renderkid-3.0.0" sources."require-from-string-2.0.2" sources."requires-port-1.0.0" - sources."resolve-1.22.0" + sources."resolve-1.22.1" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."retry-0.13.1" @@ -7200,6 +7184,7 @@ let sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" + sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" sources."sass-1.57.1" sources."sass-loader-13.2.0" @@ -7230,12 +7215,7 @@ let sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - (sources."side-channel-1.0.4" // { - dependencies = [ - sources."get-intrinsic-1.1.1" - sources."has-symbols-1.0.2" - ]; - }) + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."sirv-1.0.17" sources."slash-4.0.0" @@ -7255,6 +7235,8 @@ let ]; }) sources."statuses-1.5.0" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" @@ -7287,12 +7269,9 @@ let sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."type-is-1.6.18" + sources."typed-array-length-1.0.4" sources."typed-assert-1.0.8" - (sources."unbox-primitive-1.0.1" // { - dependencies = [ - sources."has-symbols-1.0.2" - ]; - }) + sources."unbox-primitive-1.0.2" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.0.0" @@ -7328,7 +7307,7 @@ let sources."vue-hot-reload-api-2.3.4" sources."vue-loader-15.10.1" sources."vue-meta-2.4.0" - sources."vue-multiselect-2.1.6" + sources."vue-multiselect-2.1.7" sources."vue-resize-1.0.1" sources."vue-router-3.6.5" sources."vue-snotify-3.2.1" @@ -7378,12 +7357,8 @@ let sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" sources."which-2.0.2" - (sources."which-boxed-primitive-1.0.2" // { - dependencies = [ - sources."has-symbols-1.0.2" - sources."is-symbol-1.0.4" - ]; - }) + sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.9" sources."wildcard-2.0.0" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix index 48541402d4bca..4142814cf0219 100644 --- a/pkgs/applications/misc/ablog/default.nix +++ b/pkgs/applications/misc/ablog/default.nix @@ -6,11 +6,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "ablog"; - version = "0.10.33"; + version = "0.10.33.post1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vCkLX64aPAem0QvKI1iUNAHWEJZlAOIb1DA9U7xPJkU="; + sha256 = "sha256-+vrVQ4sItCXrSCzNXyKk6/6oDBOyfyD7iNWzmcbE/BQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index ae4a49d7e3a42..5ec64fc0a55e3 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.29.1"; + version = "0.30.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-NyIAOkOX9s9dN6m/5hfMhy4tSENPCDk2w/F8z+J6qqk="; + sha256 = "sha256-LifJc5mLbnt5wBXGM1n1uice0B6mCY80LYf3kEFJy90="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index d7dde2a77ff51..78d353ce2a85c 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1n4xiic8lqnv3mqi7wpdv866gyyakax71gffv3n9427rmcld465i"; }; - NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; + env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index d91f769e95450..ac3e9c7c5a1d5 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An offline thesaurus based on WordNet"; - homepage = "http://artha.sourceforge.net"; + homepage = "https://artha.sourceforge.net"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index e90ac480eb19f..45a5227404ce4 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An audio resampling library"; - homepage = "http://soxr.sourceforge.net"; + homepage = "https://soxr.sourceforge.net"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index c34872de4cc59..8617e3454239b 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -42,7 +42,14 @@ stdenv.mkDerivation rec { # Relative paths. "BINDIR=/bin" "PERLDIR=/share/perl5" - "MODSDIR=/lib/" + "MODSDIR=/lib" # At runtime, AMC will test for that dir before + # defaulting to the "portable" strategy we use, so this test + # *must* fail. *But* this variable cannot be set to anything but + # "/lib" , because that name is hardcoded in the main executable + # and this variable controls both both the path AMC will check at + # runtime, AND the path where the actual modules will be stored at + # build-time. This has been reported upstream as + # https://project.auto-multiple-choice.net/issues/872 "TEXDIR=/tex/latex/" # what texlive.combine expects "TEXDOCDIR=/share/doc/texmf/" # TODO where to put this? "MAN1DIR=/share/man/man1" diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index 94775b97baee7..97bd2a1f21ca1 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/pkgs/applications/misc/bb/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; # error: 'regparm' is not valid on this platform - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-D__STRICT_ANSI__"; meta = with lib; { diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 429097842630a..01374737f585d 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -87,10 +87,10 @@ stdenv.mkDerivation rec { '' else '' substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' '') + - (if hipSupport then '' + (lib.optionalString hipSupport '' substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${hip}/lib/libamdhip64.so"' substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${hip}/bin"' - '' else ""); + ''); cmakeFlags = [ @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { "-DOPTIX_ROOT_DIR=${optix}" ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}"; + env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}"; # Since some dependencies are built with gcc 6, we need gcc 6's # libstdc++ in our RPATH. Sigh. diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 7fcd3e37481f0..4f7052f9156fc 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -29,13 +29,13 @@ python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "50.2"; + version = "51.5"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; rev = version; - sha256 = "sha256-+r/r3vExnvYQIicKAEmwZ+eRSep6kWte5k7gu9jC67w="; + sha256 = "sha256-8VF/CD0Wu2eV6wOpj/M6peKDthFWlcg+1NzzTSIH4S8="; }; patches = [ ./vulkan_icd.patch ]; @@ -60,6 +60,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ + pathvalidate pycurl pyyaml requests @@ -72,7 +73,6 @@ python3Packages.buildPythonApplication rec { chardet certifi idna - pillow orjson icoextract ] ++ [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index acfe1d9284e53..8a031a220068f 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -22,6 +22,7 @@ , qtbase , qtwayland , removeReferencesTo +, speechd , sqlite , wrapQtAppsHook , xdg-utils @@ -57,8 +58,6 @@ stdenv.mkDerivation rec { prePatch = '' sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \ setup/build.py - sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip.platform_tag}\"]/g" \ - setup/build.py # Remove unneeded files and libs rm -rf src/odf resources/calibre-portable.* @@ -121,6 +120,7 @@ stdenv.mkDerivation rec { regex sip setuptools + speechd zeroconf jeepney pycryptodome @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" - ${python3Packages.python.interpreter} setup.py install --root=$out \ + ${python3Packages.python.pythonForBuild.interpreter} setup.py install --root=$out \ --prefix=$out \ --libdir=$out/lib \ --staging-root=$out \ diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 2c369e64b5d23..9576ee2ebc6c7 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { # avoid build failures like: # ld: stats.o:/build/cataract-675e647/src/stats.h:24: multiple definition of # `stats_images'; cgg.o:/build/cataract-675e647/src/stats.h:24: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' mkdir $out/{bin,share} -p diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 598138ee3de43..77e42cda4d235 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-1uxgiVJGdTE8R0gEQ515zxoKXSs5lTGAURNlgJYMuMI="; + sha256 = "sha256-lTjpvh0bl4Fk+d3mcDvVQY3Ef6UYE23qoS60nltVcsU="; }; - vendorSha256 = "sha256-ouqA4Rg03M9dAUu2Uxmvez7LJTcrqYvqPNVQQmqwoFQ="; + vendorSha256 = "sha256-TNxAtx+fT6CEpa2g/tNl9sCwt3kAmNq7G870TPt2MQ4="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 954d16ce3e73c..a66b4cec245eb 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ artturin ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. platforms = platforms.linux; + mainProgram = "copyq"; }; } diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index 408838a0a284d..fb3e149bc8e84 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { name = "cotp"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-SbS+ch7/45kZb49jW2mnRWQruLrfrNfeZFqEPHQKGUg="; + hash = "sha256-DIb/lgJxwg+QuqzN/0YoUV1iZwRqh6PAN0KRK7TbWDs="; }; - cargoHash = "sha256-2lIR3K4/hr4XSmNGFd/dhwoFOtEB9KSnUrZkcaCyc9k="; + cargoHash = "sha256-uvH4mdI8ya/MJJngXQ98oXjG7JjUdvPwIzvJrdwlOEE="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index 343848e673db5..2d719e321fe65 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -38,9 +38,13 @@ in pythonPackages.buildPythonApplication rec { patches = [ (fetchpatch { - url = "https://github.com/coursera-dl/coursera-dl/pull/789.patch"; + url = "https://github.com/coursera-dl/coursera-dl/commit/c8796e567698be166cb15f54e095140c1a9b567e.patch"; sha256 = "sha256:07ca6zdyw3ypv7yzfv2kzmjvv86h0rwzllcg0zky27qppqz917bv"; }) + (fetchpatch { + url = "https://github.com/coursera-dl/coursera-dl/commit/6c221706ba828285ca7a30a08708e63e3891b36f.patch"; + sha256 = "sha256-/AKFvBPInSq/lsz+G0jVSl/ukVgCnt66oePAb+66AjI="; + }) ]; meta = with lib; { diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 4da0af251d5aa..7ec45226785f6 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "crow-translate"; - version = "2.10.1"; + version = "2.10.3"; src = fetchzip { url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; - hash = "sha256-xRXNT/IybcynS5S71XFFsx3PoLXDBcKuz81ybxoVtV4="; + hash = "sha256-K6mYzR4EIBHd0w/6Dpx4ldX4iDFszmfSLT6jNTfJlDQ="; }; patches = [ diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 3912e8d221e91..3b2473795088f 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "3.0.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-UPphXaxq/Hnt1U3J+lgwa0lp3vX1B/Ou8eqD9rHe3sw="; + sha256 = "sha256-67augXXZsriXdndrCFUFWZbL+rVKgTPAyqlbZua2Ul4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/darkman/default.nix b/pkgs/applications/misc/darkman/default.nix index 04b1af9bc2aea..a20b8ab72625b 100644 --- a/pkgs/applications/misc/darkman/default.nix +++ b/pkgs/applications/misc/darkman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "darkman"; - version = "1.4.0"; + version = "1.5.4"; src = fetchFromGitLab { owner = "WhyNotHugo"; repo = "darkman"; rev = "v${version}"; - sha256 = "sha256-Q/pjQmlyREl32C0LiwypEz1qBw2AeBOZbUIwNP392Sc="; + sha256 = "sha256-6SNXVe6EfVwcXH9O6BxNw+v4/uhKhCtVS3XE2GTc2Sc="; }; - vendorSha256 = "09rjqw6v1jaf0mhmycw9mcay9q0y1fya2azj8216gdgkl48ics08"; + vendorSha256 = "sha256-xEPmNnaDwFU4l2G4cMvtNeQ9KneF5g9ViQSFrDkrafY="; nativeBuildInputs = [ scdoc ]; diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index cbcebae31237f..8e627af02872c 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -6,16 +6,22 @@ python3.pkgs.buildPythonApplication rec { pname = "dbx"; - version = "0.7.6"; + version = "0.8.8"; format = "setuptools"; src = fetchFromGitHub { owner = "databrickslabs"; repo = "dbx"; - rev = "v${version}"; - hash = "sha256-P/cniy0xYaDoUbKdvV7KCubCpmOAhYp3cg2VBRA+a6I="; + rev = "refs/tags/v${version}"; + hash = "sha256-nx6fz+atlnB/KxdznnZArHpyv41cuBDQauG0irq1Zyc="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "mlflow-skinny>=1.28.0,<3.0.0" "mlflow" \ + --replace "rich==12.6.0" "rich" + ''; + propagatedBuildInputs = with python3.pkgs; [ aiohttp click @@ -34,6 +40,19 @@ python3.pkgs.buildPythonApplication rec { watchdog ] ++ typer.optional-dependencies.all; + passthru.optional-dependencies = with python3.pkgs; { + aws = [ + boto3 + ]; + azure = [ + azure-storage-blob + azure-identity + ]; + gcp = [ + google-cloud-storage + ]; + }; + nativeCheckInputs = [ git ] ++ (with python3.pkgs; [ @@ -43,12 +62,6 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]); - postPatch = '' - substituteInPlace setup.py \ - --replace "mlflow-skinny>=1.28.0,<=2.0.0" "mlflow" \ - --replace "rich==12.5.1" "rich" - ''; - preCheck = '' export HOME=$(mktemp -d) export PATH="$PATH:$out/bin" @@ -73,6 +86,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "CLI tool for advanced Databricks jobs management"; homepage = "https://github.com/databrickslabs/dbx"; + changelog = "https://github.com/databrickslabs/dbx/blob/v${version}/CHANGELOG.md"; license = licenses.databricks-dbx; maintainers = with maintainers; [ GuillaumeDesforges ]; }; diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/applications/misc/diffuse/default.nix index fa6825bf9d62a..866ed16d44bd9 100644 --- a/pkgs/applications/misc/diffuse/default.nix +++ b/pkgs/applications/misc/diffuse/default.nix @@ -45,6 +45,11 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ]; + preConfigure = '' + # app bundle for macos + substituteInPlace src/diffuse/meson.build data/icons/meson.build --replace "/Applications" "$out/Applications"; + ''; + mesonFlags = [ "-Db_ndebug=true" ]; @@ -63,6 +68,6 @@ python3.pkgs.buildPythonApplication rec { description = "Graphical tool for merging and comparing text files"; license = licenses.gpl2; maintainers = with maintainers; [ k3a ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 97feebefa5d34..ad85c9c79d1d2 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files"; - homepage = "http://djvu.sourceforge.net"; + homepage = "https://djvu.sourceforge.net"; license = licenses.gpl2Plus; maintainers = with maintainers; [ Anton-Latukha ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 02455cf8f20e1..541b18914bf12 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://eaglemode.sourceforge.net"; + homepage = "https://eaglemode.sourceforge.net"; description = "Zoomable User Interface"; changelog = "https://eaglemode.sourceforge.net/ChangeLog.html"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 40b4569d11f51..40f67c02c7522 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -7,20 +7,11 @@ , zbar , secp256k1 , enableQt ? true -# for updater.nix -, writeScript -, common-updater-scripts -, bash -, coreutils -, curl -, gnugrep -, gnupg -, gnused -, nix +, callPackage }: let - version = "4.3.3"; + version = "4.3.4"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -37,7 +28,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-40GfOKBTAi8RAsAVrG9rv1Jr5IqM+1yro6YYRsSULxw="; + sha256 = "sha256-0xYGTCk+Sk7LP+E9r2Y7UJZsfbobLe6Yb+x5ZRCN40Y="; postFetch = '' mv $out ./all @@ -53,7 +44,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-NPXGfbEjT9l88ZnGbDcE3+oGxThTzW7YfesBzssGsbc="; + sha256 = "sha256-+Z4NZK/unFN6mxCuMleHBxAoD+U1PzVk3/ZnZRmOOxo="; }; postUnpack = '' @@ -125,20 +116,7 @@ python3.pkgs.buildPythonApplication { $out/bin/electrum help >/dev/null ''; - passthru.updateScript = import ./update.nix { - inherit lib; - inherit - writeScript - common-updater-scripts - bash - coreutils - curl - gnupg - gnugrep - gnused - nix - ; - }; + passthru.updateScript = callPackage ./update.nix { }; meta = with lib; { description = "Lightweight Bitcoin wallet"; diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix index 8828b6e38e187..6beae458d2930 100644 --- a/pkgs/applications/misc/eureka-editor/default.nix +++ b/pkgs/applications/misc/eureka-editor/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://eureka-editor.sourceforge.net"; + homepage = "https://eureka-editor.sourceforge.net"; description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index e4a5e3dd914b5..fef4f8ce78773 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.4.35"; + version = "6.4.36"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-ewtWy8D8qFRQTxZ3lfq1MtWlTVp9O24+NqM/NKCWCgE="; + sha256 = "sha256-cA1DODjT4p4wRFKuxWshh09TjsJBE/3LslE5xfLtwjo="; }; buildInputs = [ openssl python3 ]; diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 27e3ea0aced37..9b12b9bbd520e 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.23.0"; + version = "1.23.2"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-SAyR7SeMFh2twLr8QqKzALlMFLv/oAfySN5+cSNALis="; + sha256 = "sha256-dSlpCmVtF4H9d2DcOBkybrQz39QRlBCTTuGPA9yH8is="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/foxitreader/default.nix b/pkgs/applications/misc/foxitreader/default.nix deleted file mode 100644 index c6ed7bc1ad3ff..0000000000000 --- a/pkgs/applications/misc/foxitreader/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ mkDerivation, lib, fetchzip, libarchive, autoPatchelfHook, libsecret, libGL, zlib, openssl, qtbase, qtwebkit, qtxmlpatterns }: - -mkDerivation rec { - pname = "foxitreader"; - version = "2.4.4.0911"; - - src = fetchzip { - url = "https://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/linux/${lib.versions.major version}.x/${lib.versions.majorMinor version}/en_us/FoxitReader.enu.setup.${version}.x64.run.tar.gz"; - sha256 = "0ff4xs9ipc7sswq0czfhpsd7qw7niw0zsf9wgsqhbbgzcpbdhcb7"; - stripRoot = false; - }; - - buildInputs = [ libGL libsecret openssl qtbase qtwebkit qtxmlpatterns zlib ]; - - nativeBuildInputs = [ autoPatchelfHook libarchive ]; - - buildPhase = '' - runHook preBuild - - input_file=$src/*.run - mkdir -p extracted - # Look for all 7z files and extract them - grep --only-matching --byte-offset --binary \ - --text -P '7z\xBC\xAF\x27\x1C\x00\x03' $input_file | cut -d: -f1 | - while read position; do - tail -c +$(($position + 1)) $input_file > file.7z - bsdtar xf file.7z -C extracted - done - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - cd extracted - - cp -r \ - CollectStrategy.txt \ - cpdf_settings \ - fxplugins \ - lang \ - resource \ - run \ - stamps \ - welcome \ - Wrappers \ - $out/lib/ - - patchelf $out/lib/fxplugins/librms.so \ - --replace-needed libssl.so.10 libssl.so \ - --replace-needed libcrypto.so.10 libcrypto.so - - # FIXME: Doing this with one invocation is broken right now - patchelf $out/lib/fxplugins/librmscrypto.so \ - --replace-needed libssl.so.10 libssl.so - patchelf $out/lib/fxplugins/librmscrypto.so \ - --replace-needed libcrypto.so.10 libcrypto.so - - install -D -m 755 FoxitReader -t $out/bin - - # Install icon and desktop files - install -D -m 644 images/FoxitReader.png -t $out/share/pixmaps/ - install -D -m 644 FoxitReader.desktop -t $out/share/applications/ - echo Exec=FoxitReader %F >> $out/share/applications/FoxitReader.desktop - - runHook postInstall - ''; - - qtWrapperArgs = [ "--set appname FoxitReader" "--set selfpath $out/lib" ]; - - meta = with lib; { - description = "A viewer for PDF documents"; - homepage = "https://www.foxitsoftware.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ p-h rhoriguchi ]; - }; -} diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index f570a044309e6..4e215f30fc312 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "gImageReader"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner= "manisandro"; repo = "gImageReader"; rev = "v${version}"; - sha256 = "sha256-lJ4wPLxVN3NERnru8vLreiWMEUip6xeCXAfoT8DcfiQ="; + sha256 = "sha256-vW4FbviMHBiJ3rwJY/yS7JDOoCT72nGV6jEeo+k6ylU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 883ebc7970538..4da566bcfc82b 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.24.4"; + version = "1.24.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-g+nbHpbo6O4zoDJm6MRwCXY9pM73NV7RKR59s+8LM10="; + sha256 = "sha256-P71JiGI9PpWMAlgk5TwQa/h3AUEZSEZ6/MahY+IIy9M="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gcfflasher/default.nix b/pkgs/applications/misc/gcfflasher/default.nix new file mode 100644 index 0000000000000..14bc6ad012e06 --- /dev/null +++ b/pkgs/applications/misc/gcfflasher/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libgpiod +, cmake +}: + +stdenv.mkDerivation rec { + pname = "gcfflasher"; + version = "4.0.3-beta"; + + src = fetchFromGitHub { + owner = "dresden-elektronik"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-m+iDBfsHo+PLYd3K8JaKwhIXcnj+Q8w7gIgmHp+0plk="; + }; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'main_windows.c' 'main_posix.c' + ''; + + buildInputs = lib.optionals stdenv.isLinux [ + libgpiod + ]; + + installPhase = '' + runHook preInstall + install -Dm0755 GCFFlasher $out/bin/GCFFlasher + runHook postInstall + ''; + + meta = with lib; { + description = "CFFlasher is the tool to program the firmware of dresden elektronik's Zigbee products"; + license = licenses.bsd3; + homepage = "https://github.com/dresden-elektronik/gcfflasher"; + maintainers = with maintainers; [ fleaz ]; + }; +} diff --git a/pkgs/applications/misc/genxword/default.nix b/pkgs/applications/misc/genxword/default.nix index f443618c685ac..5ba67ecddcdb1 100644 --- a/pkgs/applications/misc/genxword/default.nix +++ b/pkgs/applications/misc/genxword/default.nix @@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ - gobject-introspection pango gtksourceview3 ]; diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index 6ac5f2327f023..dd091563fde34 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; - NIX_CFLAGS_COMPILE = builtins.toString ( + env.NIX_CFLAGS_COMPILE = builtins.toString ( [ "-Wno-error=deprecated-declarations" ] ++ lib.optionals (!stdenv.cc.isClang) [ "-Wno-error=format-truncation" diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index 47d56288ed2fa..363e6fadee41a 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -28,7 +28,7 @@ , isocodes , gtksourceview , gtksourceviewmm -, postgresql +, postgresql_11 , gobject-introspection , yelp-tools , wrapGAppsHook @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { python3.pkgs.pygobject3 gtksourceview gtksourceviewmm - postgresql # for pg_config + postgresql_11 # for pg_config ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 953aad85ae863..a8465538b50ad 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { # ld: gmtp-preferences.o:src/main.h:72: multiple definition of # `scrolledwindowMain'; gmtp-about.o:src/main.h:72: first defined here # TODO: can be removed when 1.4.0 is released. - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preFixup = '' gappsWrapperArgs+=(--add-flags "--datapath $out/share"); diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix index 2aebbf5194a21..c1cd58a50e47d 100644 --- a/pkgs/applications/misc/gnome-firmware/default.nix +++ b/pkgs/applications/misc/gnome-firmware/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "gnome-firmware"; - version = "42.2"; + version = "43.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "gnome-firmware"; rev = version; - sha256 = "L0R2lXU69I6NI7Srq5s+8N9261Ic8B7FVaaXNjz2Ll0="; + sha256 = "oplypNSj028cVBn+eJxNm5pJltp7Cw5Oto/L39pI0vA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch b/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch index f8f725f7f6807..f410d0f18b2bf 100644 --- a/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch +++ b/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch @@ -1,24 +1,5 @@ -From 8befa137776786829508f23dd33ab37e2b95a895 Mon Sep 17 00:00:00 2001 -From: Poncho <poncho@spahan.ch> -Date: Mon, 7 Sep 2020 09:39:49 +0200 -Subject: [PATCH] Fix building with bison 3.7 - -Bison 3.7 changes how header files are included [1][2], in that instead of -copying and inserting the contents of a file, the file itself is included -(by default as '"basename.h"'). - -[1] https://lists.gnu.org/archive/html/info-gnu/2020-07/msg00006.html -[2] https://www.gnu.org/software/bison/manual/html_node/_0025define-Summary.html - -Close: https://github.com/GoldenCheetah/GoldenCheetah/issues/3586 ---- - src/Core/DataFilter.y | 3 +++ - src/Core/RideDB.y | 2 ++ - src/FileIO/JsonRideFile.y | 3 +++ - 3 files changed, 8 insertions(+) - diff --git a/src/Core/DataFilter.y b/src/Core/DataFilter.y -index 7c5e481b0..142e80a5c 100644 +index 30070f131..15f746a10 100644 --- a/src/Core/DataFilter.y +++ b/src/Core/DataFilter.y @@ -49,6 +49,9 @@ extern Leaf *DataFilterroot; // root node for parsed statement @@ -28,8 +9,8 @@ index 7c5e481b0..142e80a5c 100644 +// generated by the scanner +%define api.header.include {"DataFilter_yacc.h"} + - // Symbol can be meta or metric name - %token <leaf> SYMBOL PYTHON + // Symbol can be meta, metric, variable or function name + %token <string> SYMBOL PYTHON diff --git a/src/Core/RideDB.y b/src/Core/RideDB.y index d6da086bd..f2001e23c 100644 @@ -58,6 +39,21 @@ index 2cbbef9fc..d5c77a779 100644 %pure-parser %lex-param { void *scanner } %parse-param { struct JsonContext *jc } --- -2.34.1 - +diff --git a/src/gcconfig.pri.in b/src/gcconfig.pri.in +index a280bbb6b..07e543372 100644 +--- a/src/gcconfig.pri.in ++++ b/src/gcconfig.pri.in +@@ -75,10 +75,10 @@ + + # Let us know where flex and bison are installed. + # You may need to specify the full path if things don't work. +-#QMAKE_LEX = flex +-#QMAKE_YACC = bison ++QMAKE_LEX = flex ++QMAKE_YACC = bison + # If you are using bison 3.7 or higher, uncomment the line below +-#QMAKE_MOVE = cp ++QMAKE_MOVE = cp + # If you're compiling with nmake and VC then you + # will likely also use win_flex and win_bison + # so uncomment below diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 7f796a2bb0c25..ee25c5e8cc0f3 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, fetchpatch, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas -, bison, flex, zlib, qmake, makeDesktopItem, makeWrapper +, bison, flex, zlib, qmake, makeDesktopItem, wrapQtAppsHook }: let @@ -16,13 +16,13 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.6-DEV2111"; + version = "3.6-RC3"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; - rev = "v${version}"; - sha256 = "17sk89szvaq31bcv6rgfn1bbw132k7w8zlalfb3ayflavdxbk6sa"; + rev = "refs/tags/v${version}"; + hash = "sha256-/LGVDeWJZZXy5r5WxElDuxUagpA/RIwHGRbkcdO8IrE="; }; buildInputs = [ @@ -39,7 +39,7 @@ in mkDerivation rec { gsl blas ]; - nativeBuildInputs = [ flex makeWrapper qmake bison ]; + nativeBuildInputs = [ flex wrapQtAppsHook qmake bison ]; patches = [ # allow building with bison 3.7 @@ -55,11 +55,10 @@ in mkDerivation rec { preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri - echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri - echo 'LIBUSB_INSTALL = ${libusb-compat-0_1}' >> src/gcconfig.pri - echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri - echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri - sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local + sed -i 's,^#QMAKE_LRELEASE.*,QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease,' src/gcconfig.pri + sed -i 's,^#LIBUSB_INSTALL.*,LIBUSB_INSTALL = ${libusb-compat-0_1},' src/gcconfig.pri + sed -i 's,^#LIBUSB_INCLUDE.*,LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include,' src/gcconfig.pri + sed -i 's,^#LIBUSB_LIBS.*,LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb,' src/gcconfig.pri ''; installPhase = '' @@ -76,7 +75,7 @@ in mkDerivation rec { meta = with lib; { description = "Performance software for cyclists, runners and triathletes"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ adamcstephens ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/gometer/default.nix b/pkgs/applications/misc/gometer/default.nix deleted file mode 100644 index 8c68f8672c3b5..0000000000000 --- a/pkgs/applications/misc/gometer/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, rpmextract, wrapGAppsHook, nwjs }: - -stdenv.mkDerivation rec { - pname = "gometer"; - version = "5.2.0"; - - src = fetchurl { - url = "https://gometer-prod-new-apps.s3-accelerate.amazonaws.com/${version}/goMeter-linux64.rpm"; - sha256 = "sha256-E53sVvneW2EMPz9HNCgbGuHnDlVihE+Lf+DkFIP+j28="; - }; - - nativeBuildInputs = [ - rpmextract - wrapGAppsHook - ]; - - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - rpmextract ${src} - ''; - - installPhase = '' - runHook preInstall - - mv usr $out - mv opt $out - - mkdir $out/share/applications - mv $out/opt/goMeter/goMeter.desktop $out/share/applications/gometer.desktop - substituteInPlace $out/share/applications/gometer.desktop \ - --replace '/opt/goMeter/' "" - - makeWrapper ${nwjs}/bin/nw $out/bin/goMeter \ - --add-flags $out/opt/goMeter/package.nw - - runHook postInstall - ''; - - meta = with lib; { - description = "Analytic-Tracking tool for GoLance"; - homepage = "https://golance.com/download-gometer"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ wolfangaukang ]; - }; -} diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 888672b5fa013..60a1e40a614ed 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { # Floating point behavior on i686 causes nmea.test failures. Preventing # extended precision fixes this problem. - NIX_CFLAGS_COMPILE = lib.optional stdenv.isi686 "-ffloat-store"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-ffloat-store"; doCheck = true; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index a03107c2aff2b..e71daa754ab68 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "gpxsee"; - version = "11.11"; + version = "11.12"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-5kT1vcbCc0Fa3ylrcQetth50IQu57upiWRRpub93jlE="; + hash = "sha256-W35KBPYvTKrSi7UnzcUz8MsUwoq8rY5g/+hL1/gVpbI="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 051fee4f6fb62..59f71a3f88c29 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.6.1"; + version = "3.6.2"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-lr3ffyAL8LBj7mt4EmN2Kq2pxvW4P7zd66gU9X4qzJw="; + sha256 = "sha256-c7uwXqmMrWDYZ9CpGuVoo1e5yWHsoNd0zihZKdCTg7E="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 7c32cec721927..53873af2b07a3 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index c3571e01dbcd8..970ddf7660bee 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "heimer"; - version = "3.6.4"; + version = "3.7.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - hash = "sha256-hKVBPSWIbKXMEmk9C7k+3NBqLwYybN6Jql9qigIx4jE="; + hash = "sha256-tcA7+3gp/CFpapCL4yt3xG12sm+LcnRIoB/caJlKF8A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 5a9c5122acc36..3508ff0122593 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { name = "holochain-launcher"; - version = "0.6.0"; + version = "0.9.0"; src = fetchurl { url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; - sha256 = "sha256-o9cUFtq5XUkbC3yFRFiV2k4uWjb+szlE8qV+G9Gve5E="; + sha256 = "sha256-uG7EqM2CKDp+mQQp6wKs0yN0OX8N7O53VaiNcFYh6OY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index 85c65a0eeb4a1..327457a017b31 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/applications/misc/huggle/default.nix @@ -8,7 +8,7 @@ , unzip , wrapQtAppsHook , qtwebengine -, libyamlcpp +, yaml-cpp , libirc }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { which cmake ]; - buildInputs = [ ncurses libyamlcpp qtwebengine libirc ]; + buildInputs = [ ncurses yaml-cpp qtwebengine libirc ]; patches = [ ./00-remove-third-party.patch ./01-extensions.patch ]; postPatch = '' diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 09f9b85e4b71b..49798c843231c 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -57,6 +57,11 @@ stdenv.mkDerivation rec { # Without patched plugin shebangs, some tests like t/rst.t fail # (with docutilsSupport enabled) patchShebangs plugins/* + + # Creating shared git repo fails when running tests in Nix sandbox. + # The error is: "fatal: Could not make /tmp/ikiwiki-test-git.2043/repo/branches/ writable by group". + # Hopefully, not many people use `ikiwiki-makerepo` to create locally shared repositories these days. + substituteInPlace ikiwiki-makerepo --replace "git --bare init --shared" "git --bare init" ''; configurePhase = "perl Makefile.PL PREFIX=$out"; diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix deleted file mode 100644 index d923dc9bfedbd..0000000000000 --- a/pkgs/applications/misc/imag/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv -, rustPlatform -, fetchFromGitHub -, llvmPackages -, openssl -, pkg-config -, installShellFiles -, Security -, gitMinimal -, util-linuxMinimal -}: - -rustPlatform.buildRustPackage rec { - pname = "imag"; - version = "0.10.1"; - - src = fetchFromGitHub { - owner = "matthiasbeyer"; - repo = pname; - rev = "v${version}"; - sha256 = "0f9915f083z5qqcxyavj0w6m973c8m1x7kfb89pah5agryy5mkaq"; - }; - - nativeBuildInputs = [ installShellFiles pkg-config rustPlatform.bindgenHook ]; - buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; - nativeCheckInputs = [ gitMinimal util-linuxMinimal ]; - - cargoSha256 = "1vnrc72g2271i2p847z30kplxmdpi60n3dzpw0s7dahg33g14ai6"; - - checkPhase = '' - export HOME=$TMPDIR - git config --global user.email "nobody@example.com" - git config --global user.name "Nobody" - - # UI tests uses executables directly, so we need to build them before - # launching the tests - cargo build - '' + ( - # CLI uses the presence of a controlling TTY to check if arguments are - # passed in stdin, or in the command-line, so we use script to create - # a PTY for us. - if !stdenv.isDarwin then '' - script -qfec "cargo test --workspace" - '' else '' - script -q "cargo test --workspace" - '' - ); - - postInstall = '' - installShellCompletion target/imag.{bash,fish} --zsh target/_imag - ''; - - meta = with lib; { - description = "Commandline personal information management suite"; - homepage = "https://imag-pim.org/"; - license = licenses.lgpl21; - maintainers = with maintainers; [ Br1ght0ne minijackson ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index 4a3262efa4b1b..e117313861f57 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -1,37 +1,69 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, systemd, inih }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, meson +, ninja +, pkg-config +, cli11 +, hidrd +, inih +, microsoft_gsl +, spdlog +, systemd +}: stdenv.mkDerivation rec { pname = "iptsd"; - version = "0.5.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - sha256 = "sha256-du5TC3I5+hWifjdnaeTj2QPJ6/oTXZqaOrZJkef/USU="; + hash = "sha256-IwvoqmqJTM6xtEp7AzLgT4dZgRsmXYmu6Zivx3oSm+Q="; }; - nativeBuildInputs = [ meson ninja pkg-config ]; + nativeBuildInputs = [ + cmake + meson + ninja + pkg-config + ]; + + dontUseCmakeConfigure = true; - buildInputs = [ systemd inih ]; + buildInputs = [ + cli11 + hidrd + inih + microsoft_gsl + spdlog + systemd + ]; # Original installs udev rules and service config into global paths postPatch = '' - substituteInPlace meson.build \ - --replace "install_dir: unitdir" "install_dir: datadir" \ - --replace "install_dir: rulesdir" "install_dir: datadir" \ + substituteInPlace etc/meson.build \ + --replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \ + --replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'" + substituteInPlace etc/udev/50-ipts.rules \ + --replace "/bin/systemd-escape" "${systemd}/bin/systemd-escape" ''; + mesonFlags = [ "-Dservice_manager=systemd" "-Dsample_config=false" - "-Ddebug_tool=false" + "-Ddebug_tools=" + "-Db_lto=false" # plugin needed to handle lto object -> undefined reference to ... ]; meta = with lib; { + changelog = "https://github.com/linux-surface/iptsd/releases/tag/${src.rev}"; description = "Userspace daemon for Intel Precise Touch & Stylus"; homepage = "https://github.com/linux-surface/iptsd"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ tomberek ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ tomberek dotlambda ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 4cec4a97fe06c..68e03b8902de3 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.9.17"; + version = "2.10.4"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-kdmxSXKHIyVdvVNEoZkSIQlOkTt97bpAdrV0sxhL1Ug="; - x86_64-darwin = "sha256-o3Q5foEuBi4OTHr6mP0ZXOxkkUw/c/jXaZOtztQf0gM="; + x86_64-linux = "sha256-KEEPPtWxaY6+Nu/CE+AVAnaVZ30zmASWiIYaJt4a+3E="; + x86_64-darwin = "sha256-8Rkj1pV6tJygznbfELnAhzhh7ImnTm9dxCxCjYlWdnU="; }.${system} or throwSystem; }; @@ -35,7 +35,7 @@ let Markdown format. ''; homepage = "https://joplinapp.org"; - license = licenses.mit; + license = licenses.agpl3Plus; maintainers = with maintainers; [ hugoreeves ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 9890ea9ad8db6..360c97d4a2978 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18622"; + version = "18646"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-AtV7Lj+z1GOCEl8xUaumYcN848pMsLIfMGmBXved6WU="; + hash = "sha256-nncN1cGpuVy4O3JeH56iQfwZGM5/xs3U/V+gVZbChOE="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-q3Kr0YWe6Jm6wO6h7fMANKLCWKfU0zDpBZjRH662eSg="; + hash = "sha256-ihBEOl6WnIaA7x40D2HTdVIDb30BYnhlh0sQrbNA/SU="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index 34ee81a2dd047..28451b3c2e4fb 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.14.60923"; + version = "0.15.75988"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-9R2eml0MpOZQn8SIs8gN1d1ddQdKmTsPBEWqHCvW8yo="; + sha256 = "sha256-8ldr5FPbnNBlQb4YEbieIu3ZAjCzk5+MKdekq4dsNhc="; stripRoot = false; }; diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix deleted file mode 100644 index 69092b3acd5b3..0000000000000 --- a/pkgs/applications/misc/kanboard/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "kanboard"; - version = "1.2.26"; - - src = fetchFromGitHub { - owner = "kanboard"; - repo = "kanboard"; - rev = "v${version}"; - sha256 = "sha256-/Unxl9Vh9pEWjO89sSviGGPFzUwxdb1mbOfpTFTyRL0="; - }; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/share/kanboard - cp -rv . $out/share/kanboard - ''; - - meta = with lib; { - description = "Kanban project management software"; - homepage = "https://kanboard.org"; - license = licenses.mit; - maintainers = with maintainers; [ lheckemann ]; - }; -} diff --git a/pkgs/applications/misc/kaufkauflist/default.nix b/pkgs/applications/misc/kaufkauflist/default.nix new file mode 100644 index 0000000000000..a0034d203ce35 --- /dev/null +++ b/pkgs/applications/misc/kaufkauflist/default.nix @@ -0,0 +1,51 @@ +{ lib, buildPackages, buildGoModule, fetchFromGitHub, esbuild, buildNpmPackage, fetchFromGitea }: + +let + esbuild' = buildPackages.esbuild.override { + buildGoModule = args: buildPackages.buildGoModule (args // rec { + version = "0.16.15"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-iTAtPHjrBvHweSIiAbkkbBLgjF3v68jipJEzc0I4G04="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + }; +in buildNpmPackage rec { + pname = "kaufkauflist"; + version = "2.0.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "annaaurora"; + repo = "kaufkauflist"; + rev = "v${version}"; + hash = "sha256-oXrb6n1oD27bHt/zPWP0REQyCyZXI8BB57pdR/q42gY="; + }; + + npmDepsHash = "sha256-lSnGLK7+ac/wEpAxlpkZS/kgr9F+8WK+nRjCzkrPJt0="; + + ESBUILD_BINARY_PATH = "${lib.getExe esbuild'}"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/kaufkauflist $out/share/pocketbase + cp -vr build/* $out/share/kaufkauflist/ + cp -v pb_schema.json $out/share/pocketbase/ + + runHook postInstall + ''; + + # Uncomment this when nix-update-script supports Gitea. + #passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://codeberg.org/annaaurora/kaufkauflist"; + description = "A to-do list for shopping or other use cases"; + license = licenses.mit; + maintainers = with maintainers; [ annaaurora ]; + }; +} diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index e062c35e80a67..022eba1fd6cb8 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -4,11 +4,11 @@ let inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; in buildDotnetPackage rec { pname = "keepass"; - version = "2.52"; + version = "2.53.1"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "sha256-6dGCfysen26VGHIHETuNGkqHbPyeWRIEopqJa6AMzXA="; + hash = "sha256-R7KWxlxrhl55nOaDNYwA/cJJl+kd5ZYy6eZVqyrxxnM="; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix deleted file mode 100644 index 86bd7d0849ec4..0000000000000 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }: - -stdenv.mkDerivation rec { - pname = "keepassx2"; - version = "2.0.3"; - - src = fetchurl { - url = "https://www.keepassx.org/releases/${version}/keepassx-${version}.tar.gz"; - sha256 = "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libgcrypt qt4 xorg.libXtst ]; - - meta = { - description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = "https://www.keepassx.org/"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ qknight ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix deleted file mode 100644 index 0fad28d94d3f3..0000000000000 --- a/pkgs/applications/misc/keepassx/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }: - -stdenv.mkDerivation rec { - pname = "keepassx"; - version = "0.4.4"; - - src = fetchurl { - url = "https://www.keepassx.org/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "1i5dq10x28mg7m4c0yacm32xfj4j7imir4ph8x9p0s2ym260c9ry"; - }; - - patches = [ ./random.patch ]; - - buildInputs = [ bzip2 qt4 libX11 xorgproto libXtst ]; - - nativeBuildInputs = [ qmake4Hook ]; - - meta = { - description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = "https://www.keepassx.org/"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ qknight ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/keepassx/random.patch b/pkgs/applications/misc/keepassx/random.patch deleted file mode 100644 index 0a0b26f6e8c95..0000000000000 --- a/pkgs/applications/misc/keepassx/random.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/lib/random.cpp 2014-01-21 21:15:55.829312723 +0000 -+++ b/src/lib/random.cpp 2014-01-21 21:16:36.752535839 +0000 -@@ -28,6 +28,10 @@ - #include <wincrypt.h> - #include <QSysInfo> - #endif -+#ifndef Q_WS_WIN -+ #include <sys/types.h> -+ #include <unistd.h> -+#endif - - #include <QCryptographicHash> - #include <QCursor> diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassxc/darwin.patch index 1ec7db5863635..1ec7db5863635 100644 --- a/pkgs/applications/misc/keepassx/darwin.patch +++ b/pkgs/applications/misc/keepassxc/darwin.patch diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassxc/default.nix index bf386c116d484..3c74b6e917514 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , cmake , qttools -, darwin , asciidoctor , botan2 @@ -25,6 +24,8 @@ , wrapQtAppsHook , zlib +, LocalAuthentication + , withKeePassBrowser ? true , withKeePassFDOSecrets ? true , withKeePassKeeShare ? true @@ -48,11 +49,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s="; }; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ "-Wno-old-style-cast" "-Wno-error" "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" - ]; + ]); NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; @@ -110,7 +111,7 @@ stdenv.mkDerivation rec { readline zlib ] - ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication + ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) LocalAuthentication ++ lib.optional stdenv.isDarwin qtmacextras ++ lib.optional stdenv.isLinux libusb1 ++ lib.optional withKeePassX11 qtx11extras; diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix index c2162b6f0c469..2c8a31acc18a6 100644 --- a/pkgs/applications/misc/keystore-explorer/default.nix +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -1,11 +1,11 @@ { fetchzip, lib, stdenv, jdk, runtimeShell, glib, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "5.5.1"; + version = "5.5.2"; pname = "keystore-explorer"; src = fetchzip { url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-${lib.replaceStrings ["."] [""] version}.zip"; - sha256 = "2C/LkUUuef30PkN7HL0CtcNOjR5uNo9XaCiTatv5hgA="; + sha256 = "sha256-mDi/TSYumCg2hAnMOI2QpdAOSlDMpdJPqzatFotAqUk="; }; # glib is necessary so file dialogs don't hang. diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 0386b25ee422e..2e98be7b558dc 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.28.3"; + version = "0.28.5"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-keC+QLV/iEEGFDdy/Vt2pCr55qbqQzcx3HokdDi+xSU="; + hash = "sha256-fjKxQ3oVtnFwzLeeE6kN0jKE5PIfBZubTF54KO+k/DE="; }; postPatch = '' @@ -45,7 +45,7 @@ mkDerivation rec { mv $out/lib/klayout $out/bin/ ''; - NIX_CFLAGS_COMPILE = [ "-Wno-parentheses" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-parentheses" ]; dontInstall = true; # Installation already happens as part of "build.sh" diff --git a/pkgs/applications/misc/kord/default.nix b/pkgs/applications/misc/kord/default.nix new file mode 100644 index 0000000000000..d42025a643bc0 --- /dev/null +++ b/pkgs/applications/misc/kord/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, alsa-lib +}: + +rustPlatform.buildRustPackage rec { + pname = "kord"; + version = "0.4.2"; + + # kord depends on nightly features + RUSTC_BOOTSTRAP = 1; + + src = fetchFromGitHub { + owner = "twitchax"; + repo = "kord"; + rev = "v${version}"; + sha256 = "sha256-B/UwnbzXI3ER8IMOVtn0ErVqFrkZXKoL+l7ll1AlzDg="; + }; + + cargoHash = "sha256-xhWSycTe72HW3E9meTo4wjOCHDcNq6fUPT6nqHoW9vE="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsa-lib ]; + + meta = with lib; { + description = "A music theory binary and library for Rust"; + homepage = "https://github.com/twitchax/kord"; + maintainers = with maintainers; [ kidsan ]; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index b1d3a5c0d6fce..443a03c2ad229 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -19,8 +19,10 @@ stdenv.mkDerivation rec { src = ./fix-build-bash.patch; }); - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ocaml ]; + buildInputs = [ mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]; dontStrip = true; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index ea855f3d30be6..f0ed6a07e53c3 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,18 +2,18 @@ , stdenv , fetchurl , appimageTools +, appimage-run , makeWrapper -, electron , git }: stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.16"; + version = "0.8.17"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-0tIDoNQoqSn1nYm+YdgzXh34aH1e5N8wl9lqGbQoOeU="; + hash = "sha256-z7v59wXvSIDC7f4IMT8bblPgn+3+J54XqIPzXqWDses="; name = "${pname}-${version}.AppImage"; }; @@ -30,30 +30,23 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/${pname} $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/${pname}/resources/app/icons + cp -a ${appimageContents}/resources/app/icons/logseq.png $out/share/${pname}/resources/app/icons/logseq.png cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop - # remove the `git` in `dugite` because we want the `git` in `nixpkgs` - chmod +w -R $out/share/${pname}/resources/app/node_modules/dugite/git - chmod +w $out/share/${pname}/resources/app/node_modules/dugite - rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git - chmod -w $out/share/${pname}/resources/app/node_modules/dugite + # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs + makeWrapper ${appimage-run}/bin/appimage-run $out/bin/logseq \ + --set "LOCAL_GIT_DIRECTORY" ${git} \ + --add-flags ${src} + # Make the desktop entry run the app using appimage-run substituteInPlace $out/share/applications/${pname}.desktop \ - --replace Exec=Logseq Exec=${pname} \ + --replace Exec=Logseq "Exec=$out/bin/logseq" \ --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png runHook postInstall ''; - postFixup = '' - # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --set "LOCAL_GIT_DIRECTORY" ${git} \ - --add-flags $out/share/${pname}/resources/app - ''; - passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix index eceb9308fc0af..b46c6ea2afa3c 100644 --- a/pkgs/applications/misc/lsd2dsl/default.nix +++ b/pkgs/applications/misc/lsd2dsl/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { buildInputs = [ boost libvorbis libsndfile minizip gtest qtwebkit ]; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; desktopItems = lib.singleton (makeDesktopItem { name = "lsd2dsl"; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index d1a19eeccc5e3..921ae570bca0b 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -11,6 +11,12 @@ mkDerivation rec { sha256 = "sha256-xr7SYzQZiY4Bp8w1AxDX2TS/WRyrcln8JYGqTADq+ng="; }; + # Needed with GCC 12 + postPatch = '' + sed '1i#include <iterator>' -i src/lyxfind.cpp + sed '1i#include <cstring>' -i src/insets/InsetListings.cpp + ''; + # LaTeX is used from $PATH, as people often want to have it with extra pkgs nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index 7c27b3b971461..ce8ebef16a894 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -33,6 +33,14 @@ mkDerivation rec { sha256 = "sha256-q+hiupwlA0PfG+xtomCUp2zv6HQrGgmOd9CU193ucrY="; }; + patches = [ + # FIXME: backport GCC 12 build fix, remove for next release + (fetchpatch { + url = "https://github.com/maliit/framework/commit/86e55980e3025678882cb9c4c78614f86cdc1f04.diff"; + hash = "sha256-5R+sCI05vJX5epu6hcDSWWzlZ8ns1wKEJ+u8xC6d8Xo="; + }) + ]; + buildInputs = [ at-spi2-atk at-spi2-core diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 582d3186eaad2..89179b88a8a00 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "mediaelch"; - version = "2.8.18"; + version = "2.10.0"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "sha256-9kwU9j8YNF/OmzrQaRAlBpW+t/tIpZJw5+pfEoTmCBA="; + sha256 = "sha256-hipOOG+ibfsJZKLcnB6a5+OOvSs4WUdpEY+RiVKJc+k="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index 0fa9ad5e7f0ab..c0958cd235375 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Heuristics-driven menu generator for several window managers"; - homepage = "http://menumaker.sourceforge.net"; + homepage = "https://menumaker.sourceforge.net"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index efa10faf2a0f1..8d88612b728b5 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.4.0"; + version = "2.5.0"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-/Zi82ri61cQHt1D8DjeVHTSeEn9ubQJD931kP0ffiOs="; + hash = "sha256-15qs2EsvEmQQPsarozP4HVpa0/3YJBSZ9M+1s/w5LaA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 1525fb86f8285..f51d9a329cd15 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "1.00.1"; + version = "1.01.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oENMr3d2vFisEFl7gYBQQ0XRBeogAYOfBE5th463laI="; + sha256 = "sha256-6vqYyAJ9p0ey49kc2Tp/HZVv0mePARX2dcmcIG4bcNQ="; }; outputs = [ "out" "udev" ]; @@ -40,7 +40,7 @@ mkDerivation rec { ''; homepage = "https://github.com/mooltipass/moolticute"; license = licenses.gpl3Plus; - maintainers = [ maintainers.kirikaza ]; + maintainers = with maintainers; [ kirikaza hughobrien ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/mps-youtube/default.nix b/pkgs/applications/misc/mps-youtube/default.nix deleted file mode 100644 index b1118cfc59770..0000000000000 --- a/pkgs/applications/misc/mps-youtube/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub }: - -with python3Packages; - -buildPythonApplication rec { - pname = "mps-youtube"; - version = "unstable-2020-01-28"; - - src = fetchFromGitHub { - owner = "mps-youtube"; - repo = "mps-youtube"; - rev = "b808697133ec2ad7654953232d1e841b20aa7cc3"; - sha256 = "0lqprlpc0v092xqkjc0cc395ag45lijwgd34dpg2jy6i0f2szywv"; - }; - - propagatedBuildInputs = [ pafy ]; - - # disabled due to error in loading unittest - # don't know how to make test from: <mps_youtube. ...> - doCheck = false; - - # before check create a directory and redirect XDG_CONFIG_HOME to it - preCheck = '' - mkdir -p check-phase - export XDG_CONFIG_HOME=$(pwd)/check-phase - ''; - - meta = with lib; { - description = "Terminal based YouTube player and downloader"; - homepage = "https://github.com/mps-youtube/mps-youtube"; - license = licenses.gpl3; - maintainers = with maintainers; [ koral odi ]; - }; -} diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index bc6a4817087c1..b4c169b36d8b0 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -46,11 +46,11 @@ let inherit (python3.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.30"; + version = "8.0.32"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "d094b391760948f42a3b879e8473040ae9bb26991eced482eb982a52c8ff8185"; + sha256 = "sha256-ruGdYTG0KPhRnUdlfaZjt1r/tAhA1XeAtjDgu/K9okI="; }; patches = [ @@ -140,8 +140,16 @@ in stdenv.mkDerivation rec { patchShebangs tools/get_wb_version.sh ''; - # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = toString ([ + # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated + "-Wno-error=deprecated-declarations" + ] ++ lib.optionals stdenv.isAarch64 [ + # error: narrowing conversion of '-1' from 'int' to 'char' + "-Wno-error=narrowing" + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but problematic with some old GCCs + "-Wno-error=maybe-uninitialized" + ]); cmakeFlags = [ "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/applications/misc/neo4j-desktop/default.nix index dbc57794eeeca..728463dba609b 100644 --- a/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/pkgs/applications/misc/neo4j-desktop/default.nix @@ -1,12 +1,12 @@ { appimageTools, lib, fetchurl }: let pname = "neo4j-desktop"; - version = "1.4.12"; + version = "1.5.7"; name = "${pname}-${version}"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage"; - hash = "sha256-CfdXus9Zj6Tx6wAXpV2tRdqvJqowgE+NIL04v3fwtJE="; + hash = "sha256-5sIlLPfcoX5I4TBGKR8+WAo/xC6b9RP6ljhyTil1xJM="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index 52ced3b41753a..067af7a081617 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "numberstation"; - version = "1.2.0"; + version = "1.3.0"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = "numberstation"; rev = version; - hash = "sha256-e/KZrBnep5LbzgNnIoZlS5AMxhx4KlmdYDzdldMGVwg="; + hash = "sha256-l4ev47ofBZeUqjJjdhQOHX+mNL9nIHH0mfYdqZW1LMs="; }; postPatch = '' diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 4a3025cec55c4..31adb54ac71fe 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; meta = with lib; { description = "Network UPS Tools"; diff --git a/pkgs/applications/misc/nwg-bar/default.nix b/pkgs/applications/misc/nwg-bar/default.nix index 28e736b008fb4..0d96b3cdc78f7 100644 --- a/pkgs/applications/misc/nwg-bar/default.nix +++ b/pkgs/applications/misc/nwg-bar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nwg-bar"; - version = "unstable-2021-09-23"; + version = "0.1.1"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; - rev = "7dd7df3cd9a9e78fe477e88e0f3cb97309d50ff5"; - sha256 = "sha256-piysF19WDjb/EGI9MBepYrOrQL9C1fsoq05AP8CYN58="; + rev = "v${version}"; + sha256 = "sha256-XeRQhDQeobO1xNThdNgBkoGvnO3PMAxrNwTljC1GKPM="; }; patches = [ ./fix-paths.patch ]; @@ -17,7 +17,7 @@ buildGoModule rec { substituteInPlace tools.go --subst-var out ''; - vendorSha256 = "sha256-dgOwflNRb+11umFykozL8DQ50dLbhbMCmCyKmLlW7rw="; + vendorHash = "sha256-EewEhkX7Bwnz+J1ptO31HKHU4NHo76r4NqMbcrWdiu4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index 2bb14c1b2988c..23edd6e2742f8 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OcOF43SOlseb6UGTxLtGH0MRokZob0x+cczpdJc8Hq4="; + sha256 = "sha256-34C0JmsPuDqR3QGmGf14naGOu9xPtPbpdWUvkbilkqs="; }; vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs="; diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 7724976ebabf5..a7d35325c39f1 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -14,13 +14,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.7.11"; + version = "0.7.17"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Esr1OPyQCCQIOfgkl6RIn93ZaJkF0O2RM9ObIgBlPi4="; + sha256 = "sha256-HGbPBHf5PIjbuMSd/2fFSCLQ/7s1Xbys+KoGXctQOvM="; }; # No tests @@ -56,6 +56,6 @@ python3Packages.buildPythonApplication rec { description = "GTK3-based panel for Sway window manager"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ berbiche ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 51841f9852a57..ba618219bc522 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -2,7 +2,7 @@ , fetchurl , lib , makeWrapper -, electron_18 +, electron , makeDesktopItem , graphicsmagick , writeScript @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.1.9"; + version = "1.1.15"; 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}"; - sha256 = if stdenv.isDarwin then "sha256-x+9WG938YQFP/HF7B9xENOXFSdOrPFOJ1ufxXj3kXps=" else "sha256-dFR7LaDRJwpxrNyPNseGi66gIAHOKf5Au2VXl7SBGSE="; + sha256 = if stdenv.isDarwin then "sha256-8cHNIpgRhEQRRcuM0t6zZNweb92nMe8GopgjYfOLRSA=" else "sha256-rDA0GXQ++QAT4UaT23WkCA5CKCuJsF4ca0g086AiCao="; }; icon = fetchurl { @@ -50,7 +50,7 @@ let installPhase = '' runHook preInstall mkdir -p $out/bin - makeWrapper ${electron_18}/bin/electron $out/bin/obsidian \ + makeWrapper ${electron}/bin/electron $out/bin/obsidian \ --add-flags $out/share/obsidian/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" install -m 444 -D resources/app.asar $out/share/obsidian/app.asar diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 89260c09f7893..4ca54221c2fca 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -5,6 +5,7 @@ , python3 , substituteAll , nix-update-script +, nixosTests # To include additional plugins, pass them here as an overlay. , packageOverrides ? self: super: { } }: @@ -14,6 +15,32 @@ let self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ( [ + ( + # with version 3 of flask-limiter octoprint 1.8.6 fails to start with + # TypeError: Limiter.__init__() got multiple values for argument 'key_func' + self: super: { + flask-limiter = super.flask-limiter.overridePythonAttrs (oldAttrs: rec { + version = "2.6.2"; + src = fetchFromGitHub { + owner = "alisaifee"; + repo = "flask-limiter"; + rev = version; + sha256 = "sha256-eWOdJ7m3cY08ASN/X+7ILJK99iLJJwCY8294fwJiDew="; + }; + }); + flask-babel = super.flask-babel.overridePythonAttrs (oldAttrs: rec { + version = "2.0.0"; + src = super.fetchPypi { + pname = "Flask-Babel"; + inherit version; + sha256 = "sha256-+fr0XNsuGjLqLsFEA1h9QpUQjzUBenghorGsuM/ZJX0="; + }; + nativeBuildInputs = [ ]; + format = "setuptools"; + outputs = [ "out" ]; + }); + } + ) # Built-in dependency ( self: super: { @@ -66,6 +93,10 @@ let # requires octoprint itself during tests doCheck = false; + postPatch = '' + substituteInPlace octoprint_pi_support/__init__.py \ + --replace /usr/bin/vcgencmd ${self.pkgs.libraspberrypi}/bin/vcgencmd + ''; }; } ) @@ -202,6 +233,9 @@ let passthru = { python = self.python; updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) octoprint; + }; }; meta = with lib; { diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 357f4fcd87e56..313f61e28ce02 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -117,9 +117,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ]; - NIX_CFLAGS_COMPILE = lib.optionals (!stdenv.hostPlatform.isx86) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (!stdenv.hostPlatform.isx86) [ "-DSQUISH_USE_SSE=0" - ]; + ]); postInstall = lib.optionals stdenv.isDarwin '' mkdir -p $out/Applications diff --git a/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/pkgs/applications/misc/openrgb-plugins/effects/default.nix new file mode 100644 index 0000000000000..05cdd0ce5cc3a --- /dev/null +++ b/pkgs/applications/misc/openrgb-plugins/effects/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, qtbase +, openrgb +, glib +, openal +, qmake +, pkg-config +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "openrgb-plugin-effects"; + version = "0.8"; + + src = fetchFromGitLab { + owner = "OpenRGBDevelopers"; + repo = "OpenRGBEffectsPlugin"; + rev = "release_${version}"; + hash = "sha256-2F6yeLWgR0wCwIj75+d1Vdk45osqYwRdenK21lcRoOg="; + fetchSubmodules = true; + }; + + patches = [ + # Add install rule + (fetchpatch { + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/commit/75f1b3617d9cabfb3b04a7afc75ce0c1b8514bc0.patch"; + hash = "sha256-X+zMNE3OCZNmUb68S4683r/RbE+CDrI/Jv4BMWPI47E="; + }) + ]; + + postPatch = '' + # Use the source of openrgb from nixpkgs instead of the submodule + rm -r OpenRGB + ln -s ${openrgb.src} OpenRGB + ''; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + glib + openal + ]; + + meta = with lib; { + homepage = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin"; + description = "An effects plugin for OpenRGB"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix new file mode 100644 index 0000000000000..539c203325fbe --- /dev/null +++ b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, qtbase +, openrgb +, glib +, libgtop +, lm_sensors +, qmake +, pkg-config +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "openrgb-plugin-hardwaresync"; + version = "0.8"; + + src = fetchFromGitLab { + owner = "OpenRGBDevelopers"; + repo = "OpenRGBHardwareSyncPlugin"; + rev = "release_${version}"; + hash = "sha256-P+IitP8pQLUkBdMfcNw4fOggqyFfg6lNlnSfUGjddzo="; + }; + + patches = [ + (fetchpatch { + name = "use-pkgconfig"; + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/df2869d679ea43119fb9b174cd0b2cb152022685.patch"; + hash = "sha256-oBtrHwpvB8Z3xYi4ucDSuw+5WijPEbgBW7vLGELFjfw="; + }) + (fetchpatch { + name = "add-install-rule"; + url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/bfbaa0a32ed05112e0cc8b6b2a8229945596e522.patch"; + hash = "sha256-76UMMzeXnyQRCEE1tGPNR5XSHTT480rQDnJ9hWhfIqY="; + }) + ]; + + postPatch = '' + # Use the source of openrgb from nixpkgs instead of the submodule + rmdir OpenRGB + ln -s ${openrgb.src} OpenRGB + # Remove prebuilt stuff + rm -r dependencies/lhwm-cpp-wrapper + ''; + + buildInputs = [ + qtbase + glib + libgtop + lm_sensors + ]; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + meta = with lib; { + homepage = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin"; + description = "Sync your ARGB devices colors with hardware measures (CPU, GPU, fan speed, etc...)"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index ea81b58a2098c..bd1664e85ff51 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools }: +{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools, symlinkJoin, openrgb }: stdenv.mkDerivation rec { pname = "openrgb"; @@ -25,6 +25,29 @@ stdenv.mkDerivation rec { HOME=$TMPDIR $out/bin/openrgb --help > /dev/null ''; + passthru.withPlugins = plugins: + let pluginsDir = symlinkJoin { + name = "openrgb-plugins"; + paths = plugins; + # Remove all library version symlinks except one, + # or they will result in duplicates in the UI. + # We leave the one pointing to the actual library, usually the most + # qualified one (eg. libOpenRGBHardwareSyncPlugin.so.1.0.0). + postBuild = '' + for f in $out/lib/*; do + if [ "$(dirname $(readlink "$f"))" == "." ]; then + rm "$f" + fi + done + ''; + }; + in openrgb.overrideAttrs (old: { + qmakeFlags = old.qmakeFlags or [] ++ [ + # Welcome to Escape Hell, we have backslashes + ''DEFINES+=OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\""${lib.escape ["\\" "\"" " "] (toString pluginsDir)}/lib\\\""'' + ]; + }); + meta = with lib; { description = "Open source RGB lighting control"; homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB"; diff --git a/pkgs/applications/misc/opentrack/aruco.nix b/pkgs/applications/misc/opentrack/aruco.nix index 2c28d0e8d397c..dddbfe78beabe 100644 --- a/pkgs/applications/misc/opentrack/aruco.nix +++ b/pkgs/applications/misc/opentrack/aruco.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ opencv4 ]; - NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3"; + env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3"; preInstall = '' mkdir -p $out/include/aruco diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix index 7be07093cd1d8..b4c455c0ce043 100644 --- a/pkgs/applications/misc/opentrack/default.nix +++ b/pkgs/applications/misc/opentrack/default.nix @@ -42,7 +42,7 @@ in nativeBuildInputs = [cmake pkg-config ninja copyDesktopItems]; buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco]; - NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3"; + env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3"; dontWrapQtApps = true; cmakeFlags = [ diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 29cdac6b8d163..d88c4f549d319 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "43.0"; + version = "43.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "HKdaAMSoUSoJ5KJuszn615RNHtQayjL3D2lickQhglA="; + sha256 = "9ljgSc4WknO4Q0aBBCTW9QkpHwXX7MOnegPZEqo+aEA="; }; patches = [ diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index ffb62dd6c1997..a7366d6136ffe 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -19,7 +19,8 @@ ocamlPackages.buildDunePackage rec { substituteInPlace src/orpie/install.ml.in --replace '@prefix@' $out ''; - buildInputs = with ocamlPackages; [ curses camlp5 num gsl ]; + nativeBuildInputs = [ ocamlPackages.camlp5 ]; + buildInputs = with ocamlPackages; [ curses num gsl ]; meta = { inherit (src.meta) homepage; diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index f9f880050ed68..545ea498002a1 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, libyamlcpp, boost } : +{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, yaml-cpp_0_3, boost } : stdenv.mkDerivation rec { pname = "osm2xmap"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { "INSTALL_MANDIR=${placeholder "out"}/share/man/man1" ]; - NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; + env.NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; - buildInputs = [ libroxml proj_7 libyamlcpp boost ]; + buildInputs = [ libroxml proj_7 yaml-cpp_0_3 boost ]; meta = with lib; { homepage = "https://github.com/sembruk/osm2xmap"; diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 9f416ff75a3c6..bb1c725dff8b3 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -10,21 +10,26 @@ , libzip , libpng , libcotp +, protobuf +, protobufc +, qrencode +, libsecret +, libuuid , zbar }: stdenv.mkDerivation rec { pname = "otpclient"; - version = "2.5.1"; + version = "3.1.4"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VUrLbGaDfPE+Ak20ZCJDmO/sgBzdf4S+SqvyQ7F6SQU="; + sha256 = "sha256-Cz3fxmtpSe7GMGmmSLDG9kDifmIMgCBlBRjX/qardXA="; }; - buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; + buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar protobuf protobufc libsecret qrencode libuuid ]; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; meta = with lib; { diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index c06713c98a66e..ec1ea90cd47ce 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "overmind"; - version = "2.3.0"; + version = "2.4.0"; nativeBuildInputs = [ makeWrapper ]; @@ -14,10 +14,10 @@ buildGoModule rec { owner = "DarthSim"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vmmSsg0JneMseFCcx/no2x/Ghppmyiod8ZAIb4JWW9I="; + sha256 = "sha256-cpsTytV1TbvdR7XUKkp4GPD1qyt1qnmY6qOsge01swE="; }; - vendorSha256 = "sha256-QIKyLknPvmt8yiUCSCIqha8h9ozDGeQnKSM9Vwus0uY="; + vendorHash = "sha256-ndgnFBGtVFc++h+EnA37aY9+zNsO5GDrTECA4TEWPN4="; meta = with lib; { homepage = "https://github.com/DarthSim/overmind"; diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index 3d6e42bd628d6..ba8324a02fb34 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.1.11"; + version = "0.2.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-O4fVEYstDkVHn7fBVOGu1ok9K9xiO9uLx0+vb6qMZoA="; + sha256 = "sha256-J+3wi1nqkxR3ZDfR+F3rvFjUz1DJ7/jhjmcvFdMzWYc="; }; - cargoHash = "sha256-LSMAE24E8Is/ejUE/2vogP0GmpF+9oO2pJoQOZ8OfU8="; + cargoHash = "sha256-oQPCUm/X2vt6wN5AKhtgq8tzQQrp0H42bBK7Az+I9BE="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index cf8e9978c9112..917476023cf78 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, makeDesktopItem, fetchurl, jdk11, wrapGAppsHook, glib }: +{ lib, stdenv, makeDesktopItem, fetchurl, jdk19, wrapGAppsHook, glib }: stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.3.4"; + version = "5.0.3"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "sha256-DYCiK5DgWTu1cm4TRsGDCB3LzVCGVkVzSlG3Jeo2WVI="; + hash = "sha256-NST5d5dzO26ifKStbgD7qNbumUMQhfUFNE472LR1z5k="; }; unpackPhase = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; preFixup = '' - gappsWrapperArgs+=(--set JAVA_HOME "${jdk11}" --set PDFSAM_JAVA_PATH "${jdk11}") + gappsWrapperArgs+=(--set JAVA_HOME "${jdk19}" --set PDFSAM_JAVA_PATH "${jdk19}") ''; installPhase = '' @@ -40,14 +40,14 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://github.com/torakiki/pdfsam"; - description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; - sourceProvenance = with sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - license = licenses.agpl3; - platforms = platforms.all; - maintainers = with maintainers; [ _1000101 ]; + homepage = "https://github.com/torakiki/pdfsam"; + description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + license = licenses.agpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ _1000101 ]; }; } diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index f1ce2219ba891..6162207693bed 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -8,10 +8,11 @@ # - year identifies the year portion of the version, defaults to most recent year. # - pname is either "pdfstudio${year}" or "pdfstudioviewer". -{ program ? "pdfstudio" +{ lib +, stdenv +, program ? "pdfstudio" , year ? "2022" , fetchurl -, libgccjit , callPackage , jdk11 , jdk17 @@ -49,7 +50,7 @@ in sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU="; }; extraBuildInputs = [ - libgccjit #for libstdc++.so.6 and libgomp.so.1 + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk11; }; @@ -62,7 +63,7 @@ in sha256 = "sha256-B3RrftuKsPWUWP9hwnq4i311hgZgwZLqG1pJLdilfQI="; }; extraBuildInputs = [ - libgccjit #for libstdc++.so.6 and libgomp.so.1 + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk17; }; diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 237e229fc54d6..ca2d75eac8536 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -1,28 +1,30 @@ { lib +, stdenv , fetchFromGitHub +, wrapQtAppsHook , pkg-config , qmake -, mkDerivation +, qtwayland , qtsvg , postgresql }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.0-beta1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-5ZIzxo2UvE+aKznF9ZLYFg5z3JkYCB+9rGdVDJl14Hw="; + sha256 = "sha256-SlAYl2x1qdBBwLboO59h1uifF7Q71oX3JyhWwUogdb0="; }; - nativeBuildInputs = [ pkg-config qmake ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ]; # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here. - buildInputs = [ postgresql qtsvg ]; + buildInputs = [ postgresql qtsvg qtwayland ]; meta = with lib; { description = "A database modeling tool for PostgreSQL"; diff --git a/pkgs/applications/misc/pop-launcher/default.nix b/pkgs/applications/misc/pop-launcher/default.nix new file mode 100644 index 0000000000000..ca4a1742e1e1a --- /dev/null +++ b/pkgs/applications/misc/pop-launcher/default.nix @@ -0,0 +1,60 @@ +{ rustPlatform +, fetchFromGitHub +, lib +, fd +, libqalculate +}: + +rustPlatform.buildRustPackage rec { + pname = "pop-launcher"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "launcher"; + rev = version; + sha256 = "sha256-BQAO9IodZxGgV8iBmUaOF0yDbAMVDFslKCqlh3pBnb0="; + }; + + postPatch = '' + substituteInPlace src/lib.rs \ + --replace '/usr/lib/pop-launcher' "$out/share/pop-launcher" + substituteInPlace plugins/src/scripts/mod.rs \ + --replace '/usr/lib/pop-launcher' "$out/share/pop-launcher" + substituteInPlace plugins/src/calc/mod.rs \ + --replace 'Command::new("qalc")' 'Command::new("${libqalculate}/bin/qalc")' + substituteInPlace plugins/src/find/mod.rs \ + --replace 'spawn("fd")' 'spawn("${fd}/bin/fd")' + substituteInPlace plugins/src/terminal/mod.rs \ + --replace '/usr/bin/gnome-terminal' 'gnome-terminal' + ''; + + cargoSha256 = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok="; + + cargoBuildFlags = [ "--package" "pop-launcher-bin" ]; + + postInstall = '' + mv $out/bin/pop-launcher{-bin,} + + plugins_dir=$out/share/pop-launcher/plugins + scripts_dir=$out/share/pop-launcher/scripts + mkdir -p $plugins_dir $scripts_dir + + for plugin in $(find plugins/src -mindepth 1 -maxdepth 1 -type d -printf '%f\n'); do + mkdir $plugins_dir/$plugin + cp plugins/src/$plugin/*.ron $plugins_dir/$plugin + ln -sf $out/bin/pop-launcher $plugins_dir/$plugin/$(echo $plugin | sed 's/_/-/') + done + + for script in scripts/*; do + cp -r $script $scripts_dir + done + ''; + + meta = with lib; { + description = "Modular IPC-based desktop launcher service"; + homepage = "https://github.com/pop-os/launcher"; + license = licenses.mpl20; + maintainers = with maintainers; [ samhug ]; + }; +} diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index b45854a6d180f..2af5e9d692db4 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -1,9 +1,13 @@ { lib, fetchFromGitHub, cacert, openssl, nixosTests -, python39, fetchpatch +, python310, fetchpatch }: let - python3' = python39.override { + dropDevOutput = { outputs, ... }: { + outputs = lib.filter (x: x != "doc") outputs; + }; + + python3' = python310.override { packageOverrides = self: super: { sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.3.24"; @@ -25,6 +29,15 @@ let sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38"; }; }); + flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (old: rec { + version = "2.5.1"; + format = "setuptools"; + src = self.fetchPypi { + pname = "Flask-SQLAlchemy"; + inherit version; + hash = "sha256:2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"; + }; + }); # Taken from by https://github.com/NixOS/nixpkgs/pull/173090/commits/d2c0c7eb4cc91beb0a1adbaf13abc0a526a21708 werkzeug = super.werkzeug.overridePythonAttrs (old: rec { version = "1.0.1"; @@ -44,6 +57,19 @@ let inherit version; sha256 = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y="; }; + patches = [ + # python 3.10 compat fixes. In later upstream releases, but these + # are not compatible with flask 1 which we need here :( + (fetchpatch { + url = "https://github.com/thmo/jinja/commit/1efb4cc918b4f3d097c376596da101de9f76585a.patch"; + sha256 = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU="; + }) + (fetchpatch { + url = "https://github.com/mkrizek/jinja/commit/bd8bad37d1c0e2d8995a44fd88e234f5340afec5.patch"; + sha256 = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA="; + excludes = [ "CHANGES.rst" ]; + }) + ]; }); # Required by jinja2-2.11.3 markupsafe = super.markupsafe.overridePythonAttrs (old: rec { @@ -84,18 +110,62 @@ let nativeCheckInputs = []; doCheck = false; }); + # Requires pytest-httpserver as checkInput now which requires Werkzeug>=2 which is not + # supported by current privacyIDEA. + responses = super.responses.overridePythonAttrs (lib.const { + doCheck = false; + }); + flask-babel = (super.flask-babel.override { + sphinxHook = null; + furo = null; + }).overridePythonAttrs (old: (dropDevOutput old) // rec { + pname = "Flask-Babel"; + version = "2.0.0"; + format = "setuptools"; + src = self.fetchPypi { + inherit pname; + inherit version; + hash = "sha256:f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; + }; + }); + psycopg2 = (super.psycopg2.override { + sphinxHook = null; + sphinx-better-theme = null; + }).overridePythonAttrs dropDevOutput; + hypothesis = super.hypothesis.override { + enableDocumentation = false; + }; + pyjwt = (super.pyjwt.override { + sphinxHook = null; + sphinx-rtd-theme = null; + }).overridePythonAttrs (old: (dropDevOutput old) // { format = "setuptools"; }); + beautifulsoup4 = (super.beautifulsoup4.override { + sphinxHook = null; + }).overridePythonAttrs dropDevOutput; + pydash = (super.pydash.override { + sphinx-rtd-theme = null; + }).overridePythonAttrs (old: rec { + version = "5.1.0"; + src = self.fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-GysFCsG64EnNB/WSCxT6u+UmOPSF2a2h6xFanuv/aDU="; + }; + format = "setuptools"; + doCheck = false; + }); }; }; in python3'.pkgs.buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.7.4"; + version = "3.8.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-QoVL6WJjX6+sN5S/iqV3kcfQ5fWTXkTnf6NpZcw3bGo="; + sha256 = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw="; fetchSubmodules = true; }; @@ -104,17 +174,7 @@ python3'.pkgs.buildPythonPackage rec { defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 - pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt - ]; - - patches = [ - # Apply https://github.com/privacyidea/privacyidea/pull/3304, fixes - # `Exceeds the limit (4300) for integer string conversion` in the tests, - # see https://hydra.nixos.org/build/192932057 - (fetchpatch { - url = "https://github.com/privacyidea/privacyidea/commit/0e28f36c0b3291a361669f4a3a77c294f4564475.patch"; - sha256 = "sha256-QqcO8bkt+I2JKce/xk2ZhzEaLZ3E4uZ4x5W9Kk0pMQQ="; - }) + pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt segno ]; passthru.tests = { inherit (nixosTests) privacyidea; }; @@ -128,6 +188,7 @@ python3'.pkgs.buildPythonPackage rec { # Tries to connect to `fcm.googleapis.com`. "test_02_api_push_poll" + "test_04_decline_auth_request" # Timezone info not available in build sandbox "test_14_convert_timestamp_to_utc" diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 36e95ee8f098d..67c1c7e815c16 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.29.7"; + version = "0.40.2"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-gVXil6Gc65/6VMuONfVyxU6SSV0vCbJKXDvtG4a+pbU="; + hash = "sha256-+09gLeifEFwG2Ou1tQP29hYHhr0Qn0hOKj7p7PB8Jfc="; # 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-fL12Rx/0TF2jjciSHgfIDfrqdQxxm2JiGfgO3Dgz81M="; + vendorHash = "sha256-g82JRmfbKH/XEZx2aLZOcyen23vOxQXR7VyeAYxCSi4="; doCheck = false; diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix new file mode 100644 index 0000000000000..dab36aaeefd20 --- /dev/null +++ b/pkgs/applications/misc/protonup-qt/default.nix @@ -0,0 +1,33 @@ +{ appimageTools, fetchurl, lib }: +let + pname = "protonup-qt"; + version = "2.7.7"; + src = fetchurl { + url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; + sha256 = "sha256-eDi13DYS4Rtj3ouuhRoET1Ctc4D7p50khqXNOSBIvto="; + }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 rec { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/{${pname}-${version},${pname}} + mkdir -p $out/share/{applications,pixmaps} + cp ${appimageContents}/net.davidotek.pupgui2.desktop $out/share/applications/${pname}.desktop + cp ${appimageContents}/net.davidotek.pupgui2.png $out/share/pixmaps/${pname}.png + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=net.davidotek.pupgui2' 'Exec=${pname}' \ + --replace 'Icon=net.davidotek.pupgui2' 'Icon=${pname}' + ''; + + meta = with lib; { + homepage = "https://davidotek.github.io/protonup-qt/"; + description = "Install and manage Proton-GE and Luxtorpeda for Steam and Wine-GE for Lutris with this graphical user interface."; + license = licenses.gpl3; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "protonup-qt"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ michaelBelsanti ]; + }; +} diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index c0a1e7e0217d2..702a7769200dd 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { # 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"; + env.NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes"; # prusa-slicer uses dlopen on `libudev.so` at runtime NIX_LDFLAGS = lib.optionalString withSystemd "-ludev"; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 27f4afb435f83..8e4d5cdc0a557 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, Libsystem , SystemConfiguration , installShellFiles , libiconv @@ -9,20 +10,25 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "2.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = "pueue"; rev = "v${version}"; - hash = "sha256-xUTkjj/PdlgDEp2VMwBuRtF/9iGGiN4FZizdOdcbTag="; + hash = "sha256-5xHY8DOQnOdYqNyfAS2kMuW2vxAuoSe6RaOItnAJCkQ="; }; - cargoSha256 = "sha256-7VdPu+9RYoj4Xfb3J6GLOji7Fqxkk+Fswi4C4q33+jk="; + cargoHash = "sha256-3IOtx1aeth6QBjY6aILtzxhjZddovD7KIKzNhVCabfU="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ] ++ lib.optionals stdenv.isDarwin [ + rustPlatform.bindgenHook + ]; buildInputs = lib.optionals stdenv.isDarwin [ + Libsystem SystemConfiguration libiconv ]; diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index 793e5291d5b58..0220778277c13 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "pure-maps"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "rinigus"; repo = "pure-maps"; rev = version; - hash = "sha256-ZPW2hNnaRfv5aTXqku7hPShN0leOuVEJ3T/OOTzwgXQ="; + hash = "sha256-07Jk5ufYbBAa/UY1B0IoyuOAVt15rGCxCRXu3OeYyWU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/applications/misc/pw-viz/default.nix index f32f60bac1ac2..6d63ccd05eec5 100644 --- a/pkgs/applications/misc/pw-viz/default.nix +++ b/pkgs/applications/misc/pw-viz/default.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { # enables pipewire API deprecated in 0.3.64 # fixes error caused by https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 - NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ]; meta = with lib; { description = "A simple and elegant pipewire graph editor "; diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index dcf941cf03aa0..c630ce06b59b7 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.27.8.7"; + version = "3.27.9.2"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-GWDDZzFDOR96ZpmNDUuE+S9zTMVSYFNJKp8z/Cx3hec="; + sha256 = "sha256-RpyckKXU8WN/bptKp6G5gNVSU3RzNFYnM0eWLf3E2Yg="; }; patches = [ diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 9096a56a42119..e27f2a0bdcae9 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -29,7 +29,7 @@ mkDerivation rec { qmakeFlags = [ "INSTALLROOT=$(out)" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; postPatch = '' patchShebangs . diff --git a/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch b/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch deleted file mode 100644 index 1fbf5ec3f1015..0000000000000 --- a/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix compatibility with Qt 5.15. - -Patch copied from upstream source repository: - -https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - ---- a/sources/model.h 2017-04-19 21:01:25 +0000 -+++ b/sources/model.h 2020-06-09 06:24:11 +0000 -@@ -24,6 +24,7 @@ - #define DOCUMENTMODEL_H - - #include <QList> -+#include <QPainterPath> - #include <QtPlugin> - #include <QWidget> - #include <QVector> - diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index 9480a32aae3d3..7987208b885a4 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -10,23 +10,25 @@ mkDerivation { pname = "qt-box-editor"; - version = "unstable-2019-07-12"; + version = "unstable-2019-07-14"; src = fetchFromGitHub { owner = "zdenop"; repo = "qt-box-editor"; - rev = "75a68b466868ba41ba2886caa796057403fe1901"; - sha256 = "0zwsyy7cnbhy5aazwlkhd9y8bnzlgy1gffqa46abajn4809b95k3"; + rev = "cba2929dabc6c715acd1a282ba161fee914c87f6"; + hash = "sha256-3dWnAu0CLO3atjbC1zJEnL3vzsIEecDDDhW3INMfCv4="; }; buildInputs = [ qtbase qtsvg leptonica tesseract ]; nativeBuildInputs = [ qmake ]; - # remove with next release - # https://github.com/zdenop/qt-box-editor/pull/78 + # https://github.com/zdenop/qt-box-editor/issues/87 postPatch = '' - printf "INSTALLS += target\ntarget.path = $out/bin" >> qt-box-editor.pro + sed -i '/allheaders.h/a#include <leptonica/pix_internal.h>' src/TessTools.h + + substituteInPlace qt-box-editor.pro \ + --replace '-llept' '-lleptonica' ''; meta = with lib; { diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index 2a00cb92b9d1b..e5900a050efc5 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -11,18 +11,19 @@ , ninja , gobject-introspection , gsettings-desktop-schemas +, desktop-file-utils , pantheon , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "regextester"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "artemanufrij"; repo = "regextester"; rev = version; - sha256 = "1xwwv1hccni1mrbl58f7ly4qfq6738vn24bcbl2q346633cd7kx3"; + hash = "sha256-5+gU8DeB99w2h/4vMal2eHkR0305dmRYiY6fsLZzlnc="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { ninja pkg-config wrapGAppsHook + desktop-file-utils ]; buildInputs = [ diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index d19d27153fa01..9616790ba7cfe 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "remnote"; - version = "1.7.6"; + version = "1.8.52"; src = fetchurl { url = "https://download.remnote.io/RemNote-${version}.AppImage"; - sha256 = "sha256-yRUpLev/Fr3mOamkFgevArv2UoXgV4e6zlyv7FaQ4RM="; + sha256 = "sha256-0t4i/4dlZ1tv4kz8eD5cjIuhx0lT8dQbh+bpjqAfqTE="; }; meta = with lib; { diff --git a/pkgs/applications/misc/rofi-bluetooth/default.nix b/pkgs/applications/misc/rofi-bluetooth/default.nix index ed80e5d5af0ea..d9824ca9977a6 100644 --- a/pkgs/applications/misc/rofi-bluetooth/default.nix +++ b/pkgs/applications/misc/rofi-bluetooth/default.nix @@ -2,20 +2,19 @@ , stdenv , fetchFromGitHub , makeWrapper -, rofi-unwrapped , bluez }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rofi-bluetooth"; - version = "unstable-2021-03-05"; + version = "unstable-2023-02-03"; src = fetchFromGitHub { owner = "nickclyde"; - repo = "rofi-bluetooth"; + repo = finalAttrs.pname; # https://github.com/nickclyde/rofi-bluetooth/issues/19 - rev = "893db1f2b549e7bc0e9c62e7670314349a29cdf2"; - sha256 = "sha256-3oROJKEQCuSnLfbJ+JSSc9hcmJTPrLHRQJsrUcaOMss="; + rev = "9d91c048ff129819f4c6e9e48a17bd54343bbffb"; + sha256 = "sha256-1Xe3QFThIvJDCUznDP5ZBzwZEMuqmxpDIV+BcVvQDG8="; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { install -D --target-directory=$out/bin/ ./rofi-bluetooth wrapProgram $out/bin/rofi-bluetooth \ - --prefix PATH ":" ${lib.makeBinPath [ rofi-unwrapped bluez ] } + --prefix PATH ":" ${lib.makeBinPath [ bluez ] } runHook postInstall ''; @@ -38,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ MoritzBoehme ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix index 28602cf0240e9..d6e820e06fc09 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -1,19 +1,20 @@ -{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools }: +{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools, poetry-core }: buildPythonApplication rec { pname = "rofi-rbw"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofi-rbw"; rev = "refs/tags/${version}"; - hash = "sha256-YDL0pMl3BX59kzjuykn0lQHu2RMvPhsBrlSiqdcZAXs="; + hash = "sha256-5K6tofC1bIxxNOQ0jk6NbVoaGGyQImYiUZAaAmkwiTA="; }; nativeBuildInputs = [ setuptools + poetry-core ]; propagatedBuildInputs = [ configargparse ]; @@ -24,7 +25,7 @@ buildPythonApplication rec { description = "Rofi frontend for Bitwarden"; homepage = "https://github.com/fdw/rofi-rbw"; license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ equirosa dit7ya ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index 22356ac1a8dbe..5e2381ccfabc7 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir locale ''; - NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; + env.NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; meta = with lib; { homepage = "https://dushistov.github.io/sdcv/"; diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/applications/misc/shell-genie/default.nix new file mode 100644 index 0000000000000..1429aabcd8068 --- /dev/null +++ b/pkgs/applications/misc/shell-genie/default.nix @@ -0,0 +1,44 @@ +{ lib +, python3 +, fetchFromGitHub +, poetry +}: + +with python3.pkgs; + +buildPythonPackage rec { + pname = "shell-genie"; + version = "unstable-2023-01-27"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dylanjcastillo"; + repo = pname; + rev = "d6da42a4426e6058a0b5ae07837d8c003cd1239e"; + hash = "sha256-MGhQaTcl3KjAJXorOmMRec07LxH02T81rNbV2mYEpRA="; + }; + + nativeBuildInputs = [ + poetry + poetry-core + ]; + + propagatedBuildInputs = [ + colorama + openai + pyperclip + rich + shellingham + typer + ]; + + # No tests available + doCheck = false; + + meta = with lib; { + description = "Describe your shell commands in natural language"; + homepage = "https://github.com/dylanjcastillo/shell-genie"; + license = licenses.unfree; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/misc/shipments/default.nix b/pkgs/applications/misc/shipments/default.nix new file mode 100644 index 0000000000000..5b1332a91d739 --- /dev/null +++ b/pkgs/applications/misc/shipments/default.nix @@ -0,0 +1,49 @@ +{ desktop-file-utils +, fetchurl +, gobject-introspection +, gtk3 +, lib +, libhandy +, meson +, ninja +, pkg-config +, python3 +, stdenv +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "shipments"; + version = "0.3.0"; + + src = fetchurl { + url = "https://git.sr.ht/~martijnbraam/shipments/archive/${version}.tar.gz"; + sha256 = "1znybldx21wjnb8qy6q9p52pi6lfz81743xgrnjmvjji4spwaipf"; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gtk3 + libhandy + (python3.withPackages (ps: with ps; [ + pygobject3 + requests + ])) + ]; + + meta = with lib; { + description = "Postal package tracking application"; + homepage = "https://sr.ht/~martijnbraam/shipments/"; + changelog = "https://git.sr.ht/~martijnbraam/shipments/refs/${version}"; + license = licenses.lgpl3; + maintainers = with maintainers; [ michaelgrahamevans ]; + }; +} diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 6c809ef2af2c9..df2c7b77aee82 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -62,8 +62,9 @@ stdenv.mkDerivation (finalAttrs: { cp pdf_viewer/keys_user.config sioyek.app/Contents/MacOS/ cp tutorial.pdf sioyek.app/Contents/MacOS/ - mkdir -p $out/Applications + mkdir -p $out/Applications $out/bin cp -r sioyek.app $out/Applications + ln -s $out/Applications/sioyek.app/Contents/MacOS/sioyek $out/bin/sioyek '' else '' install -Dm644 tutorial.pdf $out/share/tutorial.pdf cp -r pdf_viewer/shaders $out/share/ diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index 3682325cafff6..a62812a73d17d 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { "-DwxWidgets_LIBRARIES=${wxGTK}/lib" ]; - NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; meta = with lib; { description = "Doom editor"; diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index d336d460d7c57..1df734af5e009 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { "-DwxWidgets_LIBRARIES=${wxGTK}/lib" ]; - NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; meta = with lib; { description = "Doom editor"; diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 9c96cb2444b1d..ac8170ed551ce 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -1,24 +1,34 @@ -{ lib, stdenv, fetchgit, pkg-config, writeText, libX11, conf ? null, patches ? [] }: +{ lib +, stdenv +, fetchgit +, pkg-config +, writeText +, libX11 +, libXau +, libXdmcp +, conf ? null +, patches ? [] +}: stdenv.mkDerivation rec { pname = "slstatus"; - version = "unstable-2019-02-16"; + version = "unstable-2022-12-19"; src = fetchgit { url = "https://git.suckless.org/slstatus"; - rev = "b14e039639ed28005fbb8bddeb5b5fa0c93475ac"; - sha256 = "0kayyhpmppybhwndxgabw48wsk9v8x9xdb05xrly9szkw3jbvgw4"; + rev = "c919def84fd4f52f501548e5f7705b9d56dd1459"; + hash = "sha256-nEIHIO8CAYdtX8GniO6GDEaHj7kEu81b05nCMVdr2SE="; }; configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; + preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h" + '' + makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC) + ''; inherit patches; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 ]; - - makeFlags = [ "CC:=$(CC)" ]; + buildInputs = [ libX11 libXau libXdmcp]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index 90aab7987b389..b6198a9095985 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -5,21 +5,22 @@ , patchelf , makeWrapper , openssl +, libxcrypt }: stdenv.mkDerivation rec { pname = "snowsql"; majorVersion = "1.2"; - version = "${majorVersion}.21"; + version = "${majorVersion}.23"; src = fetchurl { url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/${majorVersion}/linux_x86_64/snowflake-snowsql-${version}-1.x86_64.rpm"; - sha256 = "10pzxqk71amvaz951jl666ia6v0z22bgpvr108l3q62950hhhwmn"; + sha256 = "16zx30l3g5i5ndgxsqlkmkrfzswbczpb3jcya3psq5170i8cfm8f"; }; nativeBuildInputs = [ rpmextract makeWrapper ]; - libPath = lib.makeLibraryPath [ openssl ]; + libPath = lib.makeLibraryPath [ openssl libxcrypt ]; buildCommand = '' mkdir -p $out/bin/ diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 48eb65d8e18cd..acd1337a6693f 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.14.3"; + version = "2.16.1"; src = fetchFromGitHub { owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7bCl8VfkMhoTBnr+O+oBYQeSV2sRwlP/qUkNkYerZdU="; + sha256 = "sha256-Pq8HjmWSfBgieSJejrlw+FiRdq9NxryYPcw++Pdjsuk="; }; vendorSha256 = "sha256-E2Q+mXojMb8E0zSnaCOl9xp5QLeYcuTXjhcp3Hc8gH4="; diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index 1d6373592fbf5..c840bbfe5b845 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -20,7 +20,8 @@ buildDunePackage rec { sha256 = "sha256:0krj5w4y05bcfx7hk9blmap8avl31gp7yi01lpqzs6ync23mvm0x"; }; - buildInputs = [ fmt lwt_ppx menhir ocf_ppx ppx_blob xtmpl_ppx ]; + nativeBuildInputs = [ menhir ]; + buildInputs = [ fmt lwt_ppx ocf_ppx ppx_blob xtmpl_ppx ]; propagatedBuildInputs = [ dune-build-info dune-site diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 6b23e2d492c51..6a97654818121 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -9,16 +9,21 @@ rustPlatform.buildRustPackage rec { pname = "stork"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "jameslittle230"; repo = "stork"; rev = "v${version}"; - sha256 = "sha256-4aNY66y4dY+/MsZZGb5GBIlpZI+bAySff9+BEQUlx9M="; + sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw="; }; - cargoSha256 = "sha256-XyFZSQylBetf9tJLaV97oHbpe0aBadEZ60NyyxK8lfo="; + cargoSha256 = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4="; + + checkFlags = [ + # Fails for 1.6.0, but binary works fine + "--skip=pretty_print_search_results::tests::display_pretty_search_results_given_output" + ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/swaynag-battery/default.nix b/pkgs/applications/misc/swaynag-battery/default.nix index 546b365b3684e..71d15aa065843 100644 --- a/pkgs/applications/misc/swaynag-battery/default.nix +++ b/pkgs/applications/misc/swaynag-battery/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/m00qek/swaynag-battery"; description = "Shows a message when your battery is discharging "; - maintainers = with maintainers; [ asbachb ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 11273fd14d8ec..5d583181ce65e 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { # Hence we use a C definition with NIX_CFLAGS_COMPILE ./use-nix-path-in-autostart.patch ]; - NIX_CFLAGS_COMPILE = "-DEXEC_NIX_PATH=\"${placeholder "out"}/bin/syncthingtray\""; + env.NIX_CFLAGS_COMPILE = "-DEXEC_NIX_PATH=\"${placeholder "out"}/bin/syncthingtray\""; buildInputs = [ qtbase diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 401d4e00db168..90fbdb87fc899 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { ]; # Silences many warnings - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override"; cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF" # NSFilenamesPboardType is deprecated in 10.14+ diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 1afb5117a4bf7..9738b273de292 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-N7faWyM2KExnKr6foO6KIxkFD/pGzw9RJDnADwK/fYU="; + sha256 = "sha256-/RIpnbwLoNDdts18qhYqc8lDqsPoA5GW6z7LaZc5dos="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoSha256 = "sha256-h5kqm3ZyqzJhTjBcuOvaHkwPvF1xerN2eEDFwZAah6g="; + cargoSha256 = "sha256-hxHWfxNGmpX4mWj1ozOhhOyZI9J3aQzv3yvWFst81aU="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix index d2978ec7bd321..ec2ded975fed3 100644 --- a/pkgs/applications/misc/tabula/default.nix +++ b/pkgs/applications/misc/tabula/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.dpaetzel ]; platforms = platforms.all; + broken = true; # on 2022-11-23 this package builds, but produces an executable that fails immediately }; } diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index af8a538a822bd..d732fdde136a3 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -24,14 +24,14 @@ mkDerivation rec { pname = "tellico"; - version = "3.4.5"; + version = "3.4.6"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-XWzSbtyxOkASTwT5b7+hIEwaKe2bEo6ij+CnPbYNEc0="; + hash = "sha256-aHA4DYuxh4vzXL82HRGMPfqS0DGqq/FLMEuhsr4eLko="; }; postPatch = '' diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index 57dbf849a3ae0..8e4a671c4a640 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "23.0.5"; + version = "24.0.10"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-6pXbHkLdJw0+G9lep/tGkbSGAf8AobkQQgvw6gPYlro="; + sha256 = "sha256-0ZXI3KyRgRHUcRiSNn5a4eSy5Kgcl9HAsP79J2L/vW0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index 765462d78acf9..7ade0b042dc99 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.5.5"; + version = "4.5.6"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7FSyW71NWmWmBNQ5QUqMJ4x9WLXpm0kvvjdjzx1yk/M="; + hash = "sha256-h7k/zAYqpCAGn2dW+a3gOF/BN5ywjy/2Yx6THK9zk6k="; }; - vendorHash = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; + vendorHash = "sha256-c7wU9LLRlS9kOhE4yAiKAs/npQe8lvSwPcd+/D8o9rk="; ldflags = [ "-s" diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index 68dc30c900808..b28a740501ba3 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.14.6"; + version = "0.14.8"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-tsPCx/4ap2udfZHRK5ebxRYEBYw2W6EgnDI6P3riV04="; + rev = "refs/tags/v${version}"; + hash = "sha256-8q/dL1Pv25TkL7PESybgIu+0lR0cr6qrK6ItE/r9pbI="; }; - cargoSha256 = "sha256-xpUI8IflLqBrwsU5YccGzQlPUJT46GJa5AdsIv9qfjU="; + cargoHash = "sha256-fOYxOiVpgflwIz9Z6ePhQKDa7DX4D/ZCnPOwq9vWOSk="; nativeBuildInputs = [ perl ]; @@ -20,6 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Realtime ticker data in your terminal"; homepage = "https://github.com/tarkah/tickrs"; + changelog = "https://github.com/tarkah/tickrs/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/applications/misc/tilemaker/default.nix b/pkgs/applications/misc/tilemaker/default.nix index dd05604501e99..a158badc8843c 100644 --- a/pkgs/applications/misc/tilemaker/default.nix +++ b/pkgs/applications/misc/tilemaker/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DPROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"; - NIX_CFLAGS_COMPILE = [ "-DTM_VERSION=${finalAttrs.version}" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DTM_VERSION=${finalAttrs.version}" ]; postInstall = '' installManPage ../docs/man/tilemaker.1 diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index 916dacd5e52af..eebe42890da36 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.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-+V6nV2L1lE5QEkZcDMg9WE3iiBuZN/QTMR+XX/IdjmA="; + hash = "sha256-FWdAMIAoj3/+SQLIan++UpmWH1o3v92FsDw//b5RorM="; }; buildInputs = [ sqlite zlib ]; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index e7a693b4ca49b..50e8a2ea10d8b 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron_21}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ''; meta = with lib; { diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 6f6151d1ea295..6edae3b2eed76 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.33.1"; + version = "0.34.1"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "refs/tags/${version}"; - sha256 = "sha256-qZk42zGHWpeN5rZPFw7xAmDIvhPzqTePU3If+p/L98c="; + sha256 = "sha256-5LTd3FPodYxMm4zZJsAfO0O1Y0AXUxaz+ZtEh6b5Etw="; }; nativeCheckInputs = with python3Packages; [ pytest ]; diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 5791efb9a995a..ff20f89574be4 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "translate-shell"; - version = "0.9.7"; + version = "0.9.7.1"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v${version}"; - sha256 = "sha256-OLbGBP+QHW51mt0sFXf6SqrIYZ0iC/X10F148NAG4A4="; + sha256 = "sha256-ILXE8cSrivYqMruE+xtNIInLdwdRfMX5dneY9Nn12Uk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/ttdl/default.nix b/pkgs/applications/misc/ttdl/default.nix new file mode 100644 index 0000000000000..9f098efef8a08 --- /dev/null +++ b/pkgs/applications/misc/ttdl/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "ttdl"; + version = "3.6.3"; + + src = fetchFromGitHub { + owner = "VladimirMarkelov"; + repo = "ttdl"; + rev = "v${version}"; + sha256 = "sha256-IR0cDXQHnMDI71Vg50atS98YorqAQKc95EF1+m9cxFY="; + }; + + cargoSha256 = "sha256-658mN3R3opjvqfnIDcbh11ZSOTDbpYnhCgGGx46Mrrc="; + + meta = with lib; { + description = "A CLI tool to manage todo lists in todo.txt format"; + homepage = "https://github.com/VladimirMarkelov/ttdl"; + changelog = "https://github.com/VladimirMarkelov/ttdl/blob/v${version}/changelog"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ _3JlOy-PYCCKUi ]; + }; +} diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix new file mode 100644 index 0000000000000..e3daca956c44b --- /dev/null +++ b/pkgs/applications/misc/tuckr/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "tuckr"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "RaphGL"; + repo = "Tuckr"; + rev = version; + sha256 = "sha256-mpI0iAGMIzGGdObH5bfyA3iioNdquzLDZoSWxbAOsJ0="; + }; + + cargoPatches = [ ./update-cargo-lock.diff ]; + + cargoSha256 = "sha256-tm8fS8IWxWF4Vh+3QaCiruglZijdOic34vfAyxflDNM="; + + doCheck = false; # test result: FAILED. 5 passed; 3 failed; + + meta = with lib; { + description = "A super powered replacement for GNU Stow"; + homepage = "https://github.com/RaphGL/Tuckr"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mimame ]; + }; +} diff --git a/pkgs/applications/misc/tuckr/update-cargo-lock.diff b/pkgs/applications/misc/tuckr/update-cargo-lock.diff new file mode 100644 index 0000000000000..45fe445042fbc --- /dev/null +++ b/pkgs/applications/misc/tuckr/update-cargo-lock.diff @@ -0,0 +1,49 @@ +diff --git i/Cargo.lock w/Cargo.lock +index 5f5dd43..d7c8370 100644 +--- i/Cargo.lock ++++ w/Cargo.lock +@@ -107,9 +107,9 @@ dependencies = [ + + [[package]] + name = "clap" +-version = "4.1.4" ++version = "4.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" ++checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" + dependencies = [ + "bitflags", + "clap_derive", +@@ -248,9 +248,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + + [[package]] + name = "hermit-abi" +-version = "0.3.0" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "856b5cb0902c2b6d65d5fd97dfa30f9b70c7538e770b98eab5ed52d8db923e01" ++checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + + [[package]] + name = "inout" +@@ -319,9 +319,9 @@ dependencies = [ + + [[package]] + name = "once_cell" +-version = "1.17.0" ++version = "1.17.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" ++checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + + [[package]] + name = "opaque-debug" +@@ -597,7 +597,7 @@ dependencies = [ + + [[package]] + name = "tuckr" +-version = "0.6.1" ++version = "0.7.0" + dependencies = [ + "chacha20poly1305", + "clap", diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 198ea65001077..16d091aa7b1aa 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-Oypl80UsYRRSIMvHDPSS6rrvzjlxZ/UKDNDGc2Yan+w="; + sha256 = "sha256-AtwwLRZx9O8IWPFgFI/ZK0tbeshEmaKpTQxA1PepnWM="; }; - vendorHash = "sha256-qeYgkF9sIJ0slRarXbCHZ+1JmtZwXDnrJIpRKGOoW5Q="; + vendorHash = "sha256-gPF4XrUqDDJCCY1zrUr3AXDG0uoADR8LBxRP4yolcug="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix deleted file mode 100644 index 690dd9d64ad69..0000000000000 --- a/pkgs/applications/misc/tvbrowser/bin.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, makeDesktopItem }: - -let - desktopItem = makeDesktopItem { - name = "tvbrowser"; - exec = "tvbrowser"; - icon = "tvbrowser"; - comment = "Themeable and easy to use TV Guide"; - desktopName = "TV-Browser"; - genericName = "Electronic TV Program Guide"; - categories = [ "AudioVideo" "TV" "Java" ]; - startupNotify = true; - startupWMClass = "tvbrowser-TVBrowser"; - }; - -in stdenv.mkDerivation rec { - pname = "tvbrowser"; - version = "4.0.1"; - name = "${pname}-bin-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%208%20and%20higher%29/${version}/${pname}_${version}_bin.tar.gz"; - sha256 = "0ahsirf6cazs5wykgbwsc6n35w6jprxyphzqmm7d370n37sb07pm"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/share/java/${pname} - cp -R * $out/share/java/${pname} - rm $out/share/java/${pname}/${pname}.{sh,desktop} - - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications/ - - for i in 16 32 48 128; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - ln -s $out/share/java/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png - done - - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --add-flags "-jar $out/share/java/${pname}/${pname}.jar" \ - --chdir "$out/share/java/${pname}" - ''; - - meta = with lib; { - description = "Electronic TV Program Guide"; - homepage = "https://www.tvbrowser.org/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; - }; -} diff --git a/pkgs/applications/misc/tvbrowser/default.nix b/pkgs/applications/misc/tvbrowser/default.nix new file mode 100644 index 0000000000000..afc810003932c --- /dev/null +++ b/pkgs/applications/misc/tvbrowser/default.nix @@ -0,0 +1,87 @@ +{ lib +, fetchurl +, stdenv +, fetchzip +, ant +, jdk +, makeWrapper +, callPackage +}: + +let + minimalJavaVersion = "11"; + + newsPlugin = fetchurl { + url = "https://www.tvbrowser.org/data/uploads/1372016422809_543/NewsPlugin.jar"; + hash = "sha256-5XoypuMd2AFBE2SJ6EdECuvq6D81HLLuu9UoA9kcKAM="; + }; +in +assert lib.versionAtLeast jdk.version minimalJavaVersion; +stdenv.mkDerivation rec { + pname = "tvbrowser"; + version = "4.2.7"; + + src = fetchzip { + url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%20${minimalJavaVersion}%20and%20higher%29/${version}/${pname}_${version}_src.zip"; + hash = "sha256-dmNfI6T0MU7UtMH+C/2hiAeDwZlFCB4JofQViZezoqI="; + }; + + nativeBuildInputs = [ ant jdk makeWrapper ]; + + buildPhase = '' + runHook preBuild + + ant runtime-linux -Dnewsplugin.url=file://${newsPlugin} + ant tvbrowser-desktop-entry + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/${pname} + cp -R runtime/tvbrowser_linux/* $out/share/${pname} + + mkdir -p $out/share/applications + mv -t $out/share/applications $out/share/${pname}/${pname}.desktop + sed -e 's|=imgs/|='$out'/share/${pname}/imgs/|' \ + -e 's|=${pname}.sh|='$out'/bin/${pname}|' \ + -i $out/share/applications/${pname}.desktop + + for i in 16 32 48 128; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + ln -s $out/share/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png + done + + mkdir -p $out/bin + makeWrapper \ + $out/share/${pname}/${pname}.sh \ + $out/bin/${pname} \ + --prefix PATH : ${jdk}/bin \ + --prefix XDG_DATA_DIRS : $out/share \ + --set PROGRAM_DIR $out/share/${pname} + + runHook postInstall + ''; + + passthru.tests.startwindow = callPackage ./test.nix {}; + + meta = with lib; { + description = "Electronic TV Program Guide"; + downloadPage = "https://www.tvbrowser.org/index.php?id=tv-browser"; + homepage = "https://www.tvbrowser.org/"; + changelog = "https://www.tvbrowser.org/index.php?id=news"; + sourceProvenance = with sourceTypes; [ binaryBytecode fromSource ]; + license = licenses.gpl3Plus; + mainProgram = pname; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau yarny ]; + longDescription = '' + TV-Browser shows TV program data arranged like in printed + TV programs after downloading it from the internet. + Plugins are used to download program data + and to provide additional functionality. + ''; + }; +} diff --git a/pkgs/applications/misc/tvbrowser/test.nix b/pkgs/applications/misc/tvbrowser/test.nix new file mode 100644 index 0000000000000..b5d12ac6bad99 --- /dev/null +++ b/pkgs/applications/misc/tvbrowser/test.nix @@ -0,0 +1,40 @@ +{ lib +, xvfb-run +, tvbrowser +, runCommand +, writeShellApplication +, xorg +}: + +let + testScript = writeShellApplication { + name = "tvbrowser-test-script"; + runtimeInputs = [ xorg.xwininfo tvbrowser ]; + text = '' + function find_tvbrowser_windows { + for window_name in java tvbrowser-TVBrowser 'Setup assistant' ; do + grep -q "$window_name" "$1" || return 1 + done + } + tvbrowser & + for _ in {0..900} ; do + xwininfo -root -tree \ + | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d' \ + | tee window-names + echo + if find_tvbrowser_windows window-names ; then + break + fi + sleep 1 + done + find_tvbrowser_windows window-names + ''; + }; +in +runCommand +"tvbrowser-test" +{ buildInputs = [ xvfb-run ]; } +'' + HOME=$PWD xvfb-run ${lib.getExe testScript} + touch ${placeholder "out"} +'' diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 91ad479f450e1..e28eb1e2ce358 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -43,7 +43,6 @@ python3.pkgs.buildPythonApplication rec { dontWrapGApps = true; buildInputs = [ - gobject-introspection gtk3 libappindicator-gtk3 libnotify diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 95c3153eeb084..839b100383f57 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.13.5"; + version = "0.13.9"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-Tsv2nUlxu/nUsupQgYn1CAy/mrwq14OEFZErgO34thU="; + hash = "sha256-hcAwwu1bp7QJLt+mrUZYK6YeX/uRmfRa8JnUfrTzf3k="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-Zd8/1i9YwVoOoJ1NG5gMGB781IbNBL5lfkrSwYNn9Hg="; + vendorHash = "sha256-BehI6O+WpCcgMGabTFMCpYHN3CIo3Zb5rBQuGLsWRc0="; proxyVendor = true; # Exclude broken impala & hive driver diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index a3af42c0fb847..5d9965c0d14a8 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -21,13 +21,13 @@ python3.pkgs.buildPythonApplication rec { pname = "variety"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "varietywalls"; repo = "variety"; rev = "refs/tags/${version}"; - hash = "sha256-Tm8RXn2S/NDUD3JWeCHKqSFkxZPJdNMojPGnU4WEpr0="; + hash = "sha256-Uln0uoaEZgV9FN3HEBTeFOD7d6RkAQLgQZw7bcgu26A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index fc66c908be70b..a86ddda288bea 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -1,25 +1,24 @@ -{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, makeWrapper }: +{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, chromium, makeWrapper }: buildGoModule rec { pname = "vhs"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-t6n4uID7KTu/BqsmndJOft0ifxZNfv9lfqlzFX0ApKw="; + hash = "sha256-62FS/FBhQNpj3dAfKfIUKY+IJeeaONzqRu7mG49li+o"; }; - vendorHash = "sha256-9nkRr5Jh1nbI+XXbPj9KB0ZbLybv5JUVovpB311fO38="; + vendorHash = "sha256-+BLZ+Ni2dqboqlOEjFNF6oB/vNDlNRCb6AiDH1uSsLw"; nativeBuildInputs = [ installShellFiles makeWrapper ]; - buildInputs = [ ttyd ffmpeg ]; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; postInstall = '' - wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ ffmpeg ttyd ]} + wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ chromium ffmpeg ttyd ]} $out/bin/vhs man > vhs.1 installManPage vhs.1 installShellCompletion --cmd vhs \ @@ -33,6 +32,6 @@ buildGoModule rec { homepage = "https://github.com/charmbracelet/vhs"; changelog = "https://github.com/charmbracelet/vhs/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ maaslalani ]; + maintainers = with maintainers; [ maaslalani penguwin ]; }; } diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix index d133331a0a7b9..5d28029213414 100644 --- a/pkgs/applications/misc/vp/default.nix +++ b/pkgs/applications/misc/vp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL SDL_image ]; - NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL -I${SDL_image}/include/SDL"; + env.NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL -I${SDL_image}/include/SDL"; meta = with lib; { homepage = "https://brlcad.org/~erik/"; diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/applications/misc/watchmate/default.nix index 6cd7be52d5ec5..d7d497174342d 100644 --- a/pkgs/applications/misc/watchmate/default.nix +++ b/pkgs/applications/misc/watchmate/default.nix @@ -1,6 +1,6 @@ { lib , rustPlatform -, fetchFromGitLab +, fetchFromGitHub , pkg-config , gtk4 , libadwaita @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "watchmate"; - version = "0.3.0"; + version = "0.4.2"; - src = fetchFromGitLab { + src = fetchFromGitHub { owner = "azymohliad"; repo = "watchmate"; rev = "v${version}"; - sha256 = "sha256-HyH+9KMbdiJSmjo2NsAvz8rN3JhYKz1nNqfuZufKjQA="; + hash = "sha256-UHlHfDFTQapQcETCvtch72DqelfBYMymMD/zODFtr1c="; }; - cargoSha256 = "sha256-HvuxKPIVwVrcsTKgPwNosF/ar8QL9Jlldq7SBe2nh6o="; + cargoHash = "sha256-QYw/am5cMVbRdx/XQ+lZv2Jo9Aiwd2ypUlo854sm7i4="; nativeBuildInputs = [ pkg-config @@ -46,7 +46,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "PineTime smart watch companion app for Linux phone and desktop"; - homepage = "https://gitlab.com/azymohliad/watchmate"; + homepage = "https://github.com/azymohliad/watchmate"; + changelog = "https://github.com/azymohliad/watchmate/raw/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ chuangzhu ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index 9ae1b348e3d47..499f1b44db4fb 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "waylock"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; rev = "v${version}"; - hash = "sha256-AujBvDy10e5HhezCQcXpBUVlktRKNseLxRKdI+gtH6w="; + hash = "sha256-jl4jSDWvJB6OfBbVXfVQ7gv/aDkN6bBy+/yK+AQDQL0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix index 7541b759e06c3..30ca1836b7405 100644 --- a/pkgs/applications/misc/wcalc/default.nix +++ b/pkgs/applications/misc/wcalc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command line calculator"; - homepage = "http://w-calc.sourceforge.net"; + homepage = "https://w-calc.sourceforge.net"; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index e7a871a171dfb..f743fefc04106 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6dSKambBAi1JHVyhq9xBUx5X6QmjsZCV8lENB55Wzto="; + sha256 = "sha256-DFrA4bx+wSOxmt1CVA1oNiYVmcWeW6wpfR5F1tnhyDY="; }; - vendorSha256 = "sha256-Qe+u0u/NBXpEDvfKAF50Uxu5rh8BLa7N0wJ4bEuKOps="; + vendorHash = "sha256-f82ibPnauUOuZ5D6Rz3Yyt0jiAXvjN8Or3gud+ri6FA="; doCheck = false; diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index 16c6bfac7ed0f..32b53a663d073 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "xchm"; - version = "1.33"; + version = "1.35"; src = fetchFromGitHub { owner = "rzvncj"; repo = "xCHM"; rev = version; - sha256 = "sha256-8HQaXxZQwfBaWc22GivKri1vZEnZ23anSfriCvmLHHw="; + sha256 = "sha256-ZJvlllhF7KPz+v6KEVPyJjiz+4LHM2Br/oqI54a2Ews="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 5fffac0c7772b..823d17ba3664e 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0ilx5mhh91ks7dwvykfyynh53l6vkkignjpwkkss8ss6b2k8gdbj"; }; - NIX_CFLAGS_COMPILE = "-O3"; + env.NIX_CFLAGS_COMPILE = "-O3"; patches = [ (fetchpatch { name = "fix-libmicrohttpd-0-9-71.patch"; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 7635a9ea7e497..05f5b3139026d 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -1,38 +1,69 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl, hwloc +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libuv +, libmicrohttpd +, openssl +, hwloc , donateLevel ? 0 +, darwin }: +let + inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL; +in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.18.1"; + version = "6.19.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-aTyJhPVqq3jGNVozD39RJ4n0FmAKAtPttW9ecoanEzg="; + hash = "sha256-pMI5SqAa9jauwWvc3JpyWQa+pQvntbTrta1p0qjBaoM="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libuv libmicrohttpd openssl hwloc ]; + patches = [ + ./donate-level.patch + ]; - inherit donateLevel; - - patches = [ ./donate-level.patch ]; postPatch = '' substituteAllInPlace src/donate.h + substituteInPlace cmake/OpenSSL.cmake \ + --replace "set(OPENSSL_USE_STATIC_LIBS TRUE)" "set(OPENSSL_USE_STATIC_LIBS FALSE)" ''; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + libuv + libmicrohttpd + openssl + hwloc + ] ++ lib.optionals stdenv.isDarwin [ + Carbon + CoreServices + OpenCL + ]; + + inherit donateLevel; + installPhase = '' + runHook preInstall + install -vD xmrig $out/bin/xmrig + + runHook postInstall ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Monero (XMR) CPU miner"; homepage = "https://github.com/xmrig/xmrig"; license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; maintainers = with maintainers; [ kim0 ]; }; } diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 538bf3507a7bd..0a513fc70581b 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,21 +2,20 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.18.1-mo1"; + version = "6.19.0-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-ZHSDJLZ+5WTqJwSWT05VuN7VAK/aD0dimVFiZ39IWvg="; + sha256 = "sha256-+J6gl/R9Yi8V2nYNuIH/oyplWi8vzfdamELHjp6iS7c="; }; meta = with lib; { - broken = stdenv.isDarwin; description = "A fork of the XMRig CPU miner with support for algorithm switching"; homepage = "https://github.com/MoneroOcean/xmrig"; license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; maintainers = with maintainers; [ j0hax ]; }; }) diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 1040451efae09..461af3ca669e1 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -1,27 +1,54 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libuv +, libmicrohttpd +, openssl +, darwin }: +let + inherit (darwin.apple_sdk_11_0.frameworks) CoreServices IOKit; +in stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "6.18.0"; + version = "6.19.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "sha256-3Tp0wTL3uHs0N4CdlNusvpuam653b6qUZu9/KBT4HOM="; + hash = "sha256-0vmRwe7PQVifm6HxgpPno9mIFcBZFtxqNdDK4V637ds="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libuv libmicrohttpd openssl ]; - postPatch = '' - # Link dynamically against libuuid instead of statically - substituteInPlace CMakeLists.txt --replace uuid.a uuid + # Link dynamically against libraries instead of statically + substituteInPlace CMakeLists.txt \ + --replace uuid.a uuid + substituteInPlace cmake/OpenSSL.cmake \ + --replace "set(OPENSSL_USE_STATIC_LIBS TRUE)" "set(OPENSSL_USE_STATIC_LIBS FALSE)" ''; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + libuv + libmicrohttpd + openssl + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + IOKit + ]; + installPhase = '' + runHook preInstall + install -vD xmrig-proxy $out/bin/xmrig-proxy + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index a664aec45e1f1..5248ed2f60401 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { buildInputs = [ SDL SDL_image SDL_ttf SDL_gfx ]; - NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ]); + env.NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ]); patches = [ ./parse.patch # Fixes compilation error by avoiding redundant definitions. diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/applications/misc/ydict/default.nix index 9440c23681007..078d6abccf501 100644 --- a/pkgs/applications/misc/ydict/default.nix +++ b/pkgs/applications/misc/ydict/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +, mpg123 +}: buildGoModule rec { pname = "ydict"; @@ -13,16 +18,26 @@ buildGoModule rec { vendorSha256 = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs="; - ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X=main.Version=${version}" + ]; + + nativeBuildInputs = [ makeWrapper ]; + + preFixup = '' + wrapProgram $out/bin/${pname} \ + --prefix PATH ":" "${lib.makeBinPath [ mpg123 ]}"; + ''; # has no tests doCheck = false; meta = with lib; { - description = "A command-line Chinese dictionary"; + description = "Yet another command-line Youdao Chinese dictionary"; homepage = "https://github.com/TimothyYe/ydict"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ zendo ]; }; } diff --git a/pkgs/applications/misc/yewtube/default.nix b/pkgs/applications/misc/yewtube/default.nix new file mode 100644 index 0000000000000..c7dc0b6071b04 --- /dev/null +++ b/pkgs/applications/misc/yewtube/default.nix @@ -0,0 +1,48 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "yewtube"; + version = "2.9.2"; + + src = fetchFromGitHub { + owner = "iamtalhaasghar"; + repo = "yewtube"; + rev = "refs/tags/v${version}"; + hash = "sha256-5+0OaoUan9IFEqtMvpvtkfpd7IbFJhG52oROER5TY20="; + }; + + postPatch = '' + # Don't try to detect the version at runtime with pip + substituteInPlace mps_youtube/__init__.py \ + --replace "from pip._vendor import pkg_resources" "" \ + --replace "__version__ =" "__version__ = '${version}' #" + # https://github.com/iamtalhaasghar/yewtube/pull/105 + sed -ie '/pyreadline/d' requirements.txt + ''; + + propagatedBuildInputs = with python3Packages; [ + pyperclip + requests + youtube-search-python + yt-dlp + ]; + + checkInputs = with python3Packages; [ + pytestCheckHook + dbus-python + pygobject3 + ]; + + preCheck = '' + export XDG_CONFIG_HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "mps_youtube" ]; + + meta = with lib; { + description = "Terminal based YouTube player and downloader, forked from mps-youtube"; + homepage = "https://github.com/iamtalhaasghar/yewtube"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz koral ]; + }; +} diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index bac11b6899b37..dde9f3b69862d 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -10,19 +10,19 @@ }: let vendorHashes = { - x86_64-linux = "sha256-BwhWA8N0S55XkljDKPNkDhsj0QSpmJJ5MwEnrPjymS8="; - aarch64-linux = "sha256-T1aGz3+2Sls+rkUVDUo39Ky2igg+dxGSUaf3qpV7ovQ="; + x86_64-linux = "sha256-Upe0cEDG02RJD50Ht9VNMwkelsJHX8zOuJZssAhMuMY="; + aarch64-linux = "sha256-lKER4+gcyFqnCvgBl/qdVBCbUpocWUnXGLXsX82MSy4="; }; in flutter.mkFlutterApp rec { pname = "yubioath-flutter"; - version = "6.0.2"; + version = "6.1.0"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubioath-flutter"; rev = version; - sha256 = "13nh5qpq02c6azfdh4cbzhlrq0hs9is45q5z5cnxg84hrx26hd4k"; + sha256 = "sha256-N9/qwC79mG9r+zMPLHSPjNSQ+srGtnXuKsf0ijtH7CI="; }; passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index 0840aad4f2f06..9034d6d2f6a56 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "zine"; - version = "0.9.0"; + version = "0.11.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Z47BkBTKdzfjBJKjelJFu0tOU5bdjhLviDQ2fJQAlXE="; + sha256 = "sha256-iva66tN7pMW0LAvhTbL0Tmsvsdq1+96VciTlaNoVywI="; }; - cargoSha256 = "sha256-sEIuilAjPZupSJojAu5DLtgToLCgMJKlJXWIAGcLeCQ="; + cargoHash = "sha256-xAA11Og5odn8eNbFNKiRUqLG/MLWPw1WSeNR9zGHs0U="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index f776c2c0388dd..bcd0e1f88b2fc 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -86,11 +86,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "6.0.3"; + version = "6.1.2"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-UDyVPoQM78CKVWXgr08An77QTiFVmRNHwQPGaj1jAIM="; + sha256 = "sha256-nTQDQxXWMHkHgKlr7mIlazH7kW3HJqNLrUATo4s0N1g="; }; # just patch interpreter diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index b1b3a57819725..f2e8a5d3b82c1 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.9.7"; + version = "1.9.9"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-7WiIw2k0ZNm6jFHIiJlKuWFdEhb11qGVot1B50Za/GY="; + hash = "sha256-xaFSqcVVRXy1JYOWGnzoPKLnnxk9NgZ3FIZR3qydOLM="; }; - vendorHash = "sha256-2ezrasgGkMqr+dUF+TfsM5cevLGAFMyq9FlMxzKola8="; + vendorHash = "sha256-ZCIy1cQ62MNLor39Pi0/nU6KsbgG1z7SowMpj9tXLT8="; # 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 7a05c9f9b18d0..b5528c31b4305 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.47.186"; + version = "1.48.171"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-47LkjcC+fEE+cn2m434+9fQ+N2yZSc1eF0gDO7jGfPI="; + sha256 = "sha256-3dFOBl+Iomn8NnCYZ2owrTPQlqqj4LFdtnN4IXhbRps="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 2f39e82f3b240..1eea3e8962f80 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -90,9 +90,7 @@ mkChromiumDerivation (base: rec { license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3; platforms = lib.platforms.linux; mainProgram = "chromium"; - hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium") - then ["aarch64-linux" "x86_64-linux"] - else []; + hydraPlatforms = lib.optionals (channel == "stable" || channel == "ungoogled-chromium") ["aarch64-linux" "x86_64-linux"]; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 413db2cf985c1..0da93d03624fc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -34,6 +34,7 @@ , libva , libdrm, wayland, libxkbcommon # Ozone , curl +, libffi , libepoxy # postPatch: , glibc # gconv + locale @@ -149,6 +150,7 @@ let libdrm wayland mesa.drivers libxkbcommon curl libepoxy + libffi ] ++ lib.optional systemdSupport systemd ++ lib.optionals cupsSupport [ libgcrypt cups ] ++ lib.optional pulseSupport libpulseaudio; @@ -258,8 +260,6 @@ let host_toolchain = "//build/toolchain/linux/unbundle:default"; # Don't build against a sysroot image downloaded from Cloud Storage: use_sysroot = false; - # The default value is hardcoded instead of using pkg-config: - system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; # Because we use a different toolchain / compiler version: treat_warnings_as_errors = false; # We aren't compiling with Chrome's Clang (would enable Chrome-specific @@ -293,11 +293,9 @@ let chrome_pgo_phase = 0; clang_base_path = "${llvmPackages.clang}"; use_qt = false; - # The default has changed to false. We'll build with libwayland from - # Nixpkgs for now but might want to eventually use the bundled libwayland - # as well to avoid incompatibilities (if this continues to be a problem - # from time to time): - use_system_libwayland = true; + # To fix the build as we don't provide libffi_pic.a + # (ld.lld: error: unable to find library -l:libffi_pic.a): + use_system_libffi = true; } // lib.optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; @@ -326,7 +324,7 @@ let # Don't spam warnings about unknown warning options. This is useful because # our Clang is always older than Chromium's and the build logs have a size # of approx. 25 MB without this option (and this saves e.g. 66 %). - NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; + env.NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; buildPhase = let buildCommand = target: '' diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c4f2257d1b2a2..2179722a6e872 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,6 +1,6 @@ { newScope, config, stdenv, fetchurl, makeWrapper , llvmPackages_14, ed, gnugrep, coreutils, xdg-utils -, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit +, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand , lib, libkrb5 @@ -178,7 +178,7 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; - libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 libkrb5 ]; + libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 gtk4 libkrb5 ]; in with lib; '' mkdir -p "$out/bin" diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 752bde8992489..09417129199b5 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,27 +1,27 @@ { "stable": { - "version": "109.0.5414.74", - "sha256": "0pcfaj3n3rjk4va9g0ajlsv1719kdhqcnjdd4piinqxb4qy27vgd", - "sha256bin64": "1qfp9li90p2d6asy60v12h7r4025l01yf3dzcdyihvr0la3bhdrx", + "version": "110.0.5481.177", + "sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv", + "sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2", "deps": { "gn": { - "version": "2022-11-10", + "version": "2022-12-12", "url": "https://gn.googlesource.com/gn", - "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", - "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" + "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", + "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" } }, "chromedriver": { - "version": "109.0.5414.25", - "sha256_linux": "1gybh9nyc2j96ics1898qkrn1aajb2gpjb8l6b2p0hs24iqhjilg", - "sha256_darwin": "1w3sz9sxjkir2wwkzjx870qq04xzf9z7b59m953w33mkfm6zvz71", - "sha256_darwin_aarch64": "1qfg22glac44y5pdzscm2yr6wjnhm7p7pkiadblky27fp13dpyv0" + "version": "110.0.5481.77", + "sha256_linux": "1bdc4n9nz3m6vv0p4qr9v65zarbnkrbh21ivpvl7y7c25m7fxl20", + "sha256_darwin": "1scv9vvy5ybgbgycyz2wrymjhdqnvz0m6lxkax107437anxixs00", + "sha256_darwin_aarch64": "0gqayzhlif6hvsmpx04mxr1bld6kirv5q1n5dg42rc16gv954dkn" } }, "beta": { - "version": "110.0.5481.38", - "sha256": "0y3clfzqnbyz0v53w3ha1kx4jb9skdf22ihs09i8b568dj1m9mwj", - "sha256bin64": "0gvxsgw0ywq8d689g8790fymhksqg744m3j7kg4hcnmiyqdajl0n", + "version": "111.0.5563.41", + "sha256": "0yx5zywbkvdp589906hbwhc2ivzfzd9zvahaxhh8zrh2ar7vqxay", + "sha256bin64": "0vnj0422dvpp42w8vgmip4k8c8k6hpvc84cdfvyhipas47dxvh6w", "deps": { "gn": { "version": "2022-12-12", @@ -32,32 +32,32 @@ } }, "dev": { - "version": "111.0.5545.6", - "sha256": "0c5v7w0fbhrgqialncx0adyyah2026icwrxjwywridah1jrbm90a", - "sha256bin64": "1m3s40hibs3f1j3g2asq102iijjd59xrqqz7iv82za1slnrcbfg5", + "version": "112.0.5596.2", + "sha256": "03s6phrqv3a6vdkig9npkvnpgc8hcfb6fqgxlmlcmhrf9cszvycg", + "sha256bin64": "1an3gmxcfkzfx30ympli8r7p3xp93i8zmvrayvgddvb8xszrbc3c", "deps": { "gn": { - "version": "2022-12-12", + "version": "2023-02-07", "url": "https://gn.googlesource.com/gn", - "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", - "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" + "rev": "edf6ef4b06b42c58292faea78498aff76bdf68ed", + "sha256": "1l3wz5rxg6q4923gxwx7hrrbx8123i7iniw8ihajp7v4qz27xbcp" } } }, "ungoogled-chromium": { - "version": "109.0.5414.87", - "sha256": "1nhqbl4070n3f3j9867j78k8vig69i8m0k0s17z5axqv2qkn76k8", - "sha256bin64": null, + "version": "110.0.5481.177", + "sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv", + "sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2", "deps": { "gn": { - "version": "2022-11-10", + "version": "2022-12-12", "url": "https://gn.googlesource.com/gn", - "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", - "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" + "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", + "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" }, "ungoogled-patches": { - "rev": "109.0.5414.87-1", - "sha256": "0lq0zk21qfm8wvi0fl0gnjm0wnk29dsi8b9qphldwysgla8y8m3j" + "rev": "110.0.5481.177-1", + "sha256": "0rsvkbsrnfkdp3iw4s54kddw8r771h14hf1ivgahmn42yjafkk3n" } } } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index aff0042ded30e..ab79c1bd8f986 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set'; # dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; configureFlags = [ "--enable-ssl=yes" ]; diff --git a/pkgs/applications/networking/browsers/dillong/default.nix b/pkgs/applications/networking/browsers/dillong/default.nix index 7fc7cc07121df..41c72fddef4ca 100644 --- a/pkgs/applications/networking/browsers/dillong/default.nix +++ b/pkgs/applications/networking/browsers/dillong/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set'; # dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { description = "Fork of Dillo, a lightweight web browser"; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 138af6cc511c8..7bf6fdfe0bcb4 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-9OEi4UF/4/IRtccJou3QuevQzWjA6PuU5IVlT7qqGZ0="; + sha256 = "sha256-4+V1j78sjs3/6SnVLO34jCcNuegpZan8Ykd8Gy0vc3k="; }; buildInputs = [ @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { "--enable-nntp" "--enable-256-colors" "--enable-true-color" + "--with-brotli" "--with-lzma" "--with-libev" "--with-terminfo" diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 79afc0ac17d6c..c8a8a85c3724c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,1005 @@ { - version = "109.0b9"; + version = "111.0b6"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ach/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ach/firefox-111.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b948a55f78d7b3a84abc982f2b98ed587111a9e00c4ed170058d1a85bb439374"; + sha256 = "1ee70baaef25a9e412c3c4b57f86bd6875390dc5e342a74aa42a1a8ed6317340"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/af/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/af/firefox-111.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "4d228b9199b9d4a1741196925c17d83a7d32e14556878a7d73cd108197a7c762"; + sha256 = "20c8f0710d6bebcb51fe27e3969048a61e1957a680843751ed9c526668932e5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/an/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/an/firefox-111.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "7f0986afc8a5bfe255014e47ed9e2bb7b92ce07941eae599b28a0acc6d3fe54e"; + sha256 = "3eb9397dfbc37bb54ed8193c3c28eafcf85e3c439b50470a171a591c0ba14049"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ar/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ar/firefox-111.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8e016f41a7e3ed8b56c93593fce6f947903d292eafd72d5ca6518fbd2afb8bcc"; + sha256 = "eaa2b0a1177b476a6e4da80ca11c4719872e649f7bec0ac1006bd347e6b627cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ast/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ast/firefox-111.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0ec22faedfdaa353bb17ea80b3d467fb126b0e85f2c1a0b99907b89d6b56da07"; + sha256 = "637676aa8418dc6f1d3061d2dc2f6a19b80df26b5aa5b04d2fea697c417c75fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/az/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/az/firefox-111.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "03661f5d49915da64adf9b0b5fdd1612c3b718b91610586159936c5c365cc906"; + sha256 = "2e1b4ad6c88cfb4369299b952ee7c1d1ddf97461c82d496b1687a6558d008518"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/be/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/be/firefox-111.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "90ec691576893aecef562eeae9b0c1bdbefdfa6cad6aed8bae8a69aceed96079"; + sha256 = "6d3fac5c4402889a9fab97747e397082a75de3651c450ffde52e61b6a105d09e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/bg/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bg/firefox-111.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a009214ab8dba8ebb423b6cd6a06551f21fd6786ab1ea1f8d3c2ff985ec6e4e1"; + sha256 = "8c0a04a1d4aa8c27a1afd33251dc6b789b82c8cb2a946a4314032ee211a50d62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/bn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bn/firefox-111.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "0e6fa43647b071edf3deb6ecf3866919e81fa2fbfa96e4192393e7161730c853"; + sha256 = "fe5a611afd91bd0724d03ba65acdc5bdef79693771c769bb7ea25ead33d8a61e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/br/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/br/firefox-111.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f039c42dec5c42a823d87c9e75080625574c6b39d2f77c639f7c9acb0b8fe00a"; + sha256 = "10beb0d6cfa7a384090e42827b200eea2bd53454aef1dd9f1a4a49f43d4d82b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/bs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/bs/firefox-111.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "0e05f64d31c83b932d64a9deda1f96316140f554a5394d0af3e128f3ba1ec4f6"; + sha256 = "ec8a5e0ca3484c3d422d87a09f014ab9efc0b0c0e11785233d6da72b649d24e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ca-valencia/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ca-valencia/firefox-111.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "684bbc73582247a088d318148f5af484b005ef8b976cc0b9964cd661e9d1a797"; + sha256 = "15a12109eb1a129fdda1171102aec0bf2e5483d10b0ca3739ec26d6433fe0d33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ca/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ca/firefox-111.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "c457bab76716e4bb2ae68ba65bdee46a4bf158e63c8ea48706426cff947bd689"; + sha256 = "71025d3cb8b72f0110cdf0243164115f188c1a4bd864f6ff17304f2e58190cfa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/cak/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cak/firefox-111.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "35f0afc76c474c1441d53f6c0efde1cfa81082a14d4376bb793a54ca7f336e15"; + sha256 = "1a0eaad50ef10bafcfeba322950fe2d8872c3ea8d2e09146c1cb1c245bc2ddd2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/cs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cs/firefox-111.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "07b58e331695a32ad0aec8a2ebcde5d188687735024ea324e2ca93c6211bc465"; + sha256 = "06a5f8b14a92d611bb9977f7c574e498b1cf83b4a7ccf7c0517bef8cc1b5c4c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/cy/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/cy/firefox-111.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "54160bb1974a1a96e7ea857dc3becc2b09983ae49776e22458b4f7bfc6e29dd7"; + sha256 = "fff902bed4909de9044a6e4217b1525a791a854ea148b0f31f0c7ab06efad667"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/da/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/da/firefox-111.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "65ad803f63edd0ee806f06f18f4d2c18c1c906057a212c56f8884844e5347f2b"; + sha256 = "172fbee0184cb829755b0c681593de7f146156f01b8b5fa1c093549d66b091d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/de/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/de/firefox-111.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "82e167ce22d058d86cde56ad0b3d9fc309f85a535846451d9816e009b78c40b5"; + sha256 = "4f4734b7b68fc3002250cfe3b78cb27925a7267553be5b4c86aaeefea3666f29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/dsb/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/dsb/firefox-111.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8c69525da6122eda1ff2444bd7338fd14d8294a656fee2619832a66342a9c971"; + sha256 = "a29da2c2bbe243fa1b5080962b68b77260d91ea3d16b68c4033c4c683f49d929"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/el/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/el/firefox-111.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "09a0576ccdb7e9388a8d1b107e93df85cb070fcefce70edc7ff0e42f0ad705bf"; + sha256 = "d0aa992170821e77222daaace13d059bb077e53ff38bda23a1218a99e2a4f994"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/en-CA/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-CA/firefox-111.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "9ed6cb1595ac81b78f0aa80eb0a71043ae564071a81b23f0f685c9c27a7b4d47"; + sha256 = "b0e00806bb1d55a0c911b7e022282f3d066158401192fd432bb47e968c9a980c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/en-GB/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-GB/firefox-111.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "18e07a151303426b4439ff475e0fe9893d281318ceda35203be77d14c841fa5b"; + sha256 = "891ca73ee7608902b4a2a0311c615bad9aff1d6514983597202c1baad26b6477"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/en-US/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/en-US/firefox-111.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "42666b7ce609193259d3e8dec2552afdab0d5986159760480801152967751c3e"; + sha256 = "1b8650ac822e3176ef2f47e32a6deca53bb53193289dc1b63562831fad2e70a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/eo/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/eo/firefox-111.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "ba38a011874ad940dbc8d1ffb6f691eb3fb4f14e15d0c707929af82b55c676cf"; + sha256 = "0a8b46212f36890f4e7671f97a400a0a3a18583bd5fc6a112e6bdadc360a910f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-AR/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-AR/firefox-111.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "593cae822d499c7afde80ffb3503489f5292b4c69f6e14da82e264d920b06ebc"; + sha256 = "9e3df1097dec9dd8e624d974bf2266a48ec064f2b1ea3cffd6a7f6fa99672cb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-CL/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-CL/firefox-111.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "eed80c73022ac75364b95556f72177462c381fcdcc66f4e9d2a9cc202e6d22a8"; + sha256 = "f2f91fb924b27f9449cf58439a5216e313f77b1ee607a57ed3ba64473b2c8a9e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-ES/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-ES/firefox-111.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "20c4e5cd93c63117d472d982df1282212fe8ff894ad90bd7ba32c2fcf43afc9c"; + sha256 = "0a6eeed4f58e19f62ba6a35d4ee59190ee3bff0c4a6194c6ce3c2a3b6d75aa74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-MX/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/es-MX/firefox-111.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "437680ccf9a74365dbef29f1414920f0bea138e7628d1eac1fc3a774d667173a"; + sha256 = "b10f6abce1f7e9bb7a2bd0977d2fa4d76b587c868e7636b49f95da5e1e502a94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/et/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/et/firefox-111.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "6952c27c55ef99c82c99b684ba56919f053d6a4fdfca929c0251259f92ce3b01"; + sha256 = "72478742a27db5ba63b06b4f26edc3a03b1719227cb2bb177b965c2805628d25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/eu/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/eu/firefox-111.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9bdb71d4663e2ddfdf1d48965fd6657f905bb939f14910c7675a36743ac6c52e"; + sha256 = "9a232a430c8108bd944395dfaceb1d3f350482cd10f1f3f54e30f86691c52e65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fa/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fa/firefox-111.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7d6fe01c0be2fb3d2f4370a7388db7e9081483697e5a1e3a4daedf58c4e86881"; + sha256 = "180da12ee212d6a4d387f8d365998de80910727d8999a84d3cd23357289af485"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ff/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ff/firefox-111.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "3ecba2eb326f8ab4b60bd1d338c70a10d96f193dfa8a580ce1981f4e478ed66e"; + sha256 = "892750a511be03e2e30e4cc7bb9da509f0ee027b08a7480d01f7d84f912ea648"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fi/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fi/firefox-111.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2faf7574da2d14635dcec25ac9ed9af011d587a41cfdca710162233453019918"; + sha256 = "da3f23947dd3796dd3011dad46bde701f151a777e23290ac1519f9e06b72ec35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fr/firefox-111.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "934a037d582e5a54a7abced26eb13378b44bf7d17c40634c1bbb7ea96d077703"; + sha256 = "9db563609d6d740e60606d1d1abff553c04ae2d8ad7873ec375fd15f6a2e1cf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fy-NL/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fur/firefox-111.0b6.tar.bz2"; + locale = "fur"; + arch = "linux-x86_64"; + sha256 = "e8fefc8bbd9f489b5eaa14c14d8c1456557b1c85fdb9188fc2ec14f7b7a53794"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/fy-NL/firefox-111.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "068a82e5be65d8260450b28f09444d6272d657c36cbf8b5fb60400be79c14233"; + sha256 = "5067b3002fbcdb76b42b452d200d1fcd9cc3cedcab81d4b97aa39541fa93dc65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ga-IE/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ga-IE/firefox-111.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "63577e9e3696105c7d2d3290510c2732d002930cbfe4ede75513e3cb4d9ec26a"; + sha256 = "29ad1bb43e2cf17510fe94a9bbb0f6b03149ae997ecf362cf40a74586787734a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gd/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gd/firefox-111.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "663373cb3a0d15ffb883ac0018f3d50af393986ffde005028a5c599524f4f25e"; + sha256 = "5096da1af9fc8dc358d86512f4ec416e114df0eac1d6f4a0bbae5b2a9bc37906"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gl/firefox-111.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "48e0c828735a0fa9802eed9e49629d8cb95407c3608db18b25d6adf60d3e8e7e"; + sha256 = "e3e68af4c1c4e6a2c5c2328584af7fbac6b1160cbe20face8d02ae713cab735f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gn/firefox-111.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "da30951c841bd55f3a6cf5ec0226b900b9b0db4b1217278ff87bf15f61dcbdcb"; + sha256 = "713b63f6c31f620f2d079147a1c547e3622b31cde6bbb77ac6ab764145a3624f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gu-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/gu-IN/firefox-111.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "c5a3b0697142ea33df51451177992a10a4ab5d1b44ae53838b50f7be9e4d8d24"; + sha256 = "b2b5390fad804c3708f1a4931cfc2d182e4ae27df47fef552a44099119c6b0ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/he/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/he/firefox-111.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "196a01669604ff24673cf986d3abe0f925553f46af63dc70d2dfed097cb11e8c"; + sha256 = "c3287d8e8c3b4431f9b3a1da523d482372f2b461146fc5146e387176f11122bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hi-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hi-IN/firefox-111.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "dd386d0889f1a2cdc2604faf7cb41a93b377dfcca220c1e0c46dfc3a1f17c378"; + sha256 = "af1f514e8014a808659b7f01ec5274db11e5a682342dfabd69ba5338732af465"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hr/firefox-111.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "1b2b58f0492c890b988164dafca86311de1e94ef6e429ecc2e998353eb042da1"; + sha256 = "6039e0b4c76e1a86d0e76eb64682c6e57588b0f385249e2b88cbd280f712c5f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hsb/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hsb/firefox-111.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "66431f173a0b5864650a45266f75df36d21f36915e0986d2496181ce0586a9dd"; + sha256 = "2bc580b09cb87a8bee5f19ad25da43db92c61ee76d68f94ed75ba750f9074c1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hu/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hu/firefox-111.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "38d281c815cff7d248c132613c24bb99e7bd20ac19f53aff525fdd39da08e5ba"; + sha256 = "9f9b0381fe4c044020e9fc1c66203d9d521156b1050ea6ef9b9fd32197333974"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hy-AM/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/hy-AM/firefox-111.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "57310d44addb0911ef0d8e7d4c038f9758d51909fb4a9e4e82883a8a70c76075"; + sha256 = "ab640bb474b99f786546fb198439f3ec9216ca7a1e9d9ff829fe9edc869d5ad8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ia/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ia/firefox-111.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "17371ff0b7d5140dcda675f877eba8b7ba83eca4f189bd7d60700bdca5de37f1"; + sha256 = "6146c01a30e33f05b8e33e9cb296b98c3564a413f4360bf657bd13c1e875a89f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/id/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/id/firefox-111.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a41418278b8d8e6a222d0566448d0c330d025edb9926edb6539c5a21fb91140f"; + sha256 = "58d8cfd0ff22c434aa897d709b7b6d9dd631448b348021641443b50c05116a24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/is/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/is/firefox-111.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "772075ad183f5a6914561f69f9ee8d09972af6f05017282255386791f31200e7"; + sha256 = "ae41be247d71227f68f419b81b547a71625a10ff21e93271598fc38de528d696"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/it/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/it/firefox-111.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "cbc0a9a027bfc8f0e6b184f9614d3d38fd18a13459d3f5b5b7f60105d6ee963c"; + sha256 = "2ce9ca925b47853ae07efe2370bac839b270c867dd650578461f37ffb109a08a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ja/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ja/firefox-111.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "8a3729c31bf4e24044a3b1186ecae173a964f2aa8a7631cd6e3abdded7d0b824"; + sha256 = "36798fe697913dd15c8831fd9ba287c6e9a1ff9bfa7d57ae518055ff5f097ae9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ka/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ka/firefox-111.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0e2e1c2854bf995321533457ae0fd2832f0b0546c6dc48cfa52c628d5d657928"; + sha256 = "74e394513597d01ab3eb9ea373ed1eabe081b7ff3d14a486b5133e05784ee212"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/kab/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kab/firefox-111.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "b1ac75c09a4478caa7511c35df3f91f45d3c8047d5dabeade6f29edddbf6ea7d"; + sha256 = "f20b4c48e5864a32c9b44068618cbf0eaec0f157398a735ef5bd66738c546995"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/kk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kk/firefox-111.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4ddd63e75296b907e1518d099da9334545e8d12e19c63e757f0c4a4b504b8e2b"; + sha256 = "e144c1a15cfa846be6cbf5c0bd2130c515ee36cc5f4748bcc705facd40f812a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/km/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/km/firefox-111.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "84f17f62677718f562ab88948ad3778da1a43c41b8b55210a493cf66f3f0f90d"; + sha256 = "85a71e0baf24a1d0dd856f20b9cba5e03db6acdde4e4d19f4958c37bfdd82b6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/kn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/kn/firefox-111.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "5aa037120a0f3060460e04d0eb2d20fbb280f55de268b6cdc0aaceafd6c3791c"; + sha256 = "744e378a3a3006ddf00aacbb9ca635ca4e7bc98b1b2d63af51a3c9c2f4bf23c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ko/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ko/firefox-111.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "7f30d2f69dac635c5424e8b9077eebb1dadc0e56a45f9641160d4ab396669e7b"; + sha256 = "100a1f77b83d80c319021a185eade6cb21e95036c57290ae7f0c8326c1195b32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/lij/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lij/firefox-111.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "8d0f18632e52509377261d8c2e818d7db39b0fcbabcbf7d192f6e7d4a276cd88"; + sha256 = "e9006a9e8ecdb35b473b34f43088609507e8e5c23656ceb1071ddf7e30254a46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/lt/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lt/firefox-111.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "652d793fae33d4ab5f4928bc3110eb8a3efa785212f37987df12c3a70f1c5632"; + sha256 = "4d1da84d06562f7d81f0a7911ec5b0cf01f59dfa88862602cd8c554bcb8dbde9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/lv/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/lv/firefox-111.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "c26444347b52d226f125bd079fe3669bd931eda59e4734859140ad527f907bbf"; + sha256 = "6b0251405bfde6ec7ce719143d56f74ec0557f5603e491ec78048e2409322c79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/mk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/mk/firefox-111.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "086fb00bcab4ebbc59aa3b703c3e52f2456d0312d33980e1d19c041d8cd84b22"; + sha256 = "100d05845b95841cc7c084cc2657602e1c0520a7e6ae9073c9b8f33dcfbbbc67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/mr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/mr/firefox-111.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "83d9fb93e771c8b70fd3a00c401ce2fbefe0b7ce353622615790d56a9eb723c5"; + sha256 = "b2fd3304bb6a6f0ac370177d244ee14d973abd088152b861b4e583d9a02cd600"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ms/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ms/firefox-111.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ee1db3faa7d2b7d082b025f93961d7081bb13da59d024d8e6019ccae25b702ce"; + sha256 = "0b235d44c0c77bdff0c3a5d24d16c0231145099d36a382c3e25c08f2607f6005"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/my/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/my/firefox-111.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "dfa95a578db544259328fd04596a3259d807f949bc91aa8b795556b17dafc204"; + sha256 = "413625b9d9a7795db98b1597146afbb634405ac1865a56c9eda5c1c0c8ba8a74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/nb-NO/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nb-NO/firefox-111.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d7938fcc2cb97e530aeb061e4426aa73a3b1e180053d208644354df351058733"; + sha256 = "223101645d322985b119597bf750cb811856ec081ca0109736cee556549a4a76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ne-NP/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ne-NP/firefox-111.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "b24984604d50e957451dac478147b5ea1805510c2333d42d8e3434c5fce06215"; + sha256 = "fd664ec6f9f3c7d01c27dd3a538bdceded371a995cc2b4f3f5754014ee50af30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/nl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nl/firefox-111.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "7f391dc89c6bbeecdcca4f7fe214f3711f97ab2796ac21e82c785e33eeb5f6e1"; + sha256 = "a9c71bbc38faf6485292c989a47b35ffdee930f112809c06396359107f2928fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/nn-NO/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/nn-NO/firefox-111.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4a041204cb01998b671a5cac77c468a72149d02d018ec1f5ace7ad9e0132c655"; + sha256 = "67f72c9bfde8f68720e52eb96a986195edcb0fc36eb5b122ac460a6c5506f0be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/oc/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/oc/firefox-111.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "2b1152fdb3af68d9faa76d9c6d3d8fede128bf1688fd69a50b98b7bc0300ac67"; + sha256 = "0bc28ca44d311a409fde1f628fc4f511875d7e56aebc8b234599b755a06f7d1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pa-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pa-IN/firefox-111.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d185ddb3497ae946fe87b808f843db7acf8645833ef3b54ea948197acb3f3885"; + sha256 = "28b367b1b201486bde7ea970ca1e124a1abacf99715b103e79bda7dc779aca02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pl/firefox-111.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "163119ad361e157566be68baf959b62ecee6de303348a8466818826de9b25e64"; + sha256 = "41ccdb0645ca0010dcd96659eaf7cb87eb9ae9fef24f701f196bc9f92c6b1f76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pt-BR/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pt-BR/firefox-111.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ff99006fbc8266a69c270cecb50c56dda5d891517ea9b137b0c76ed288d04f02"; + sha256 = "6ae80689d049c3dbc3b86ba8478815dcc68805f3f9a61afa286d76a4243de66b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pt-PT/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/pt-PT/firefox-111.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2674cfaf4febe771a9a00d292503dc18a296e29b42eacef4ce4e78107190bd1f"; + sha256 = "4f4533b7e443b8cde10baee0a68b3db9cab9762344c4f9376c9ff2aca34c2813"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/rm/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/rm/firefox-111.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "830700c530eef545dee9f7badcd49671c3a0d97581deabea5c909e46950056cf"; + sha256 = "aa5e0cd6774e03884683394450abd7172180058ec02c706ba986ecbe67f387eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ro/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ro/firefox-111.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "864d7cbfde7574d2bd737c40695142f3e40219c0154962b18284cf3d5a2c2427"; + sha256 = "0f73dc37b643df022b3d914f5f544fcbadcbf1bdf85f4abb6d186cdd2ef6b730"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ru/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ru/firefox-111.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "32f3ad6dcfb15e3fd4c6a98ba231e302f8fb71c6edd29b4d820ca93a161ed126"; + sha256 = "bfc9c8fe82bced904268c3cfce53c1b34066879f298ee45944812639eb8cca99"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sc/firefox-111.0b6.tar.bz2"; + locale = "sc"; + arch = "linux-x86_64"; + sha256 = "fbb01fa4b75d25004cc5a79d21ca2013ab0833bd394f42867fba70c0a7091e44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sco/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sco/firefox-111.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "29ec16d715e6272e282df71f4a95738bd3cf0f2060c991665540d77eba73f65c"; + sha256 = "d73b8c6bf55b42e58410205a99d15af98bdbfec550434cd5815451955bd8598a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/si/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/si/firefox-111.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3adb3fbe6a22d63a9c78b30025c5d938b078327d20c1267dfa43fd5204e81c8c"; + sha256 = "f5d030c94c6f9a074ebbd97f18a6c14eeef9b00f73d11421614d1cf7e4b05efe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sk/firefox-111.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "fd2c585fc89c3a7bdad4bb9a14071f6316371482e6c69c916b4c6ecb45b8af18"; + sha256 = "8c6b3810988ba862c2419e583f3d14dd9722dfbf7c1a55d7e72b9d09cd2d46d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sl/firefox-111.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "37f12d5dc272bd897670882400b74e23dbf5905a874ec3c0d0fad971cbdae5ae"; + sha256 = "8aa97c4ce2484735a009399ebeeadc8270fbce1806890ae17e5d42b6bf69338d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/son/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/son/firefox-111.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "6161d139b125a0c5af7b06c1b17f95dd9847b06eed4b256d94a1dee5ea62df74"; + sha256 = "57018f57ba6721ff11b5944e6b1d1825894ddd5b422b6bb3c1730be31437aedd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sq/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sq/firefox-111.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "be76d77a806f97e566ffcf1bcea54dc502d1447d34811ea47b9decd7bc49a243"; + sha256 = "48f5b50ad9f7d96ddc26b091f70c195e7f1abcce1347de74cc994364a47e045b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sr/firefox-111.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "bf9cb5c2d17a00351ea9cb5918625bf4c97ae2497c4452c6c214988e6c1f701f"; + sha256 = "d69e319133bc57559273111e85d573389151e841bc4381b909fa767a4b7fa634"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sv-SE/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/sv-SE/firefox-111.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a551c2dd59af31bd26129a4260ad8c2e79c1af2d2983a5119a6524ab2a56d11e"; + sha256 = "1e06f9e2071c846aa703ee1da367512ba27f5854237e041b6c1f03ef2d8b3c07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/szl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/szl/firefox-111.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "5bf1dc480db4aef779d2ff6c5fb05170bace4154661928384039d3d34b058c3f"; + sha256 = "ffbec68627bb7660a2a5e55982e4405d74d48d56912506aca96ec42198e82337"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ta/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ta/firefox-111.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "90679166c06545d56b086a33eea9882b36e86ff4208be6bbbe469e7aaf651e79"; + sha256 = "add9451aaa5c20c3b963fda1cc0e75eb4ba4b84311f10ba405c10b8392d78ab9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/te/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/te/firefox-111.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "55005551552b1d516db54a0fb27e59f58c478204745355bf249938661ac356ef"; + sha256 = "da0772a5156e0ec08a5ce30c6ee7dc9cefe51cfd72790cbc53d6f2f3eb25a8e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/th/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/th/firefox-111.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "9f2f26564759d6a97a9315c367301fece20b809363deb64c32e97819ae38157b"; + sha256 = "604d1b9e09334a639164dbbf5c3b974cbdfd0607d0823cb154381a406e43997d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/tl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/tl/firefox-111.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9054a8d512665615a66d9855cc69fdf168508b1bd226237d088eea8dcf004a06"; + sha256 = "2e1469c867e54ad1c6ba8504cf594ebb2f7167f619dce35073bc19c42f0db52f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/tr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/tr/firefox-111.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b90beedd15614b07c24702875e56d2648c6b703fa19bb0a1785282c6034af068"; + sha256 = "3310fcff33e6e6c93a17f73ef9a4c7557245e6881b87fef89fba61e24cf18aa6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/trs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/trs/firefox-111.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "40e41ad2dcf06f8143f5b7f27a0e20d7fe32a01e99dcf1d44e183bddb2f81131"; + sha256 = "e9efa109578943b4779a89206ff2d096c4067bc996789d1a5a28885978a9acd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/uk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/uk/firefox-111.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "923a92d67ba1beae95e8af40f734be94dc48aa052672e21e051295d2a04ead60"; + sha256 = "b83faddf077b8c346b5ca76c7e78c23bdcaabd7b2edef2747a89de5eff19179b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ur/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/ur/firefox-111.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "2316371eb6946ec9e108d391a45455cecd38d7795e26133c37b4172ea1977fde"; + sha256 = "610732c62364f6c4a5873ba4003d549011eb424e312795749d76c58fe90c85ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/uz/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/uz/firefox-111.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "5d32a7c3165d177b2986534c133dc376a6c588febd0abe69b111c09a4d990f75"; + sha256 = "d0da17dac024d6cc3e636408f4736f586fc6695dd6b6614166ce4d6cf9321761"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/vi/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/vi/firefox-111.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fb02c22efce62374a11450a08dd344e0ab1a0ddd74060a79c39a6246668ca5e2"; + sha256 = "e90b17a36ea6dcd9189e1c6b0d8f152b0d56a852922ddf9e4ca9abf3bed724dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/xh/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/xh/firefox-111.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "dd91b4dcfc2e067f299b066345960af90d57eb3bd7523b8680b155f285287ff6"; + sha256 = "5d8fd0e91d7c8e3930a4be87560d6293680bd17f7e275ab619b23b772093ec95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/zh-CN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/zh-CN/firefox-111.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "52ef6c7d5c1ac6f63033d9d2d36ccab1c28029d1d0150dc6cb6eaaf90e8b984e"; + sha256 = "e67450564d27eeb7e605b673ccebd86924195a76d6eb7aa52603f1d8e3198f57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/zh-TW/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-x86_64/zh-TW/firefox-111.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "29272c5953ffb2a6726c7da9c73b86ff64094628504270a45f3619f8cbe45f48"; + sha256 = "7822b37160091511fc120ab7c6d11ebaab8cd601e1c4c89931140917a28f6e6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ach/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ach/firefox-111.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "c283396e76a59a009a06b28f8e9f71b2dea929f7fbe3111cc59f75d1e986f6aa"; + sha256 = "67c634da5c832ad7d39088b397d0e34c69837e0e6c36604ffef4ada917df9341"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/af/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/af/firefox-111.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "64e8e61908f821b4157e33ff06e763b89c66e8482d4526c11711957133de7205"; + sha256 = "c08af1538f18f6c19eaad1c830b115ae168db2b5554e223f5be985e57e156e6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/an/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/an/firefox-111.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "bce6d2f4afe2aa8210f495b438786d73c647e2e54625d9cfdc4a93bfa1d4d922"; + sha256 = "922d7f8217b29e2bd22c237b47db29fe510a33587df0281cbc55ed75da17dac3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ar/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ar/firefox-111.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8d1c08f96238565a2c78e626b5e3916897a2b7146eee6cbcb7fd7a54862e2e5c"; + sha256 = "68f64732c29def431f7d87fc90d35e3fcc74f8e284c30ec959f2ef8a5fce4445"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ast/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ast/firefox-111.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "fb02bce602d5122aabf80daaee3a790b90cd1ce553a871ea6e44da4d2283e882"; + sha256 = "423ffa467fd8001614882e36aa26857dcaa9466fdd3a819decd7cd5816ae7ffc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/az/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/az/firefox-111.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "e021af60171b998c37d531c082df022a2c0cf99acb841c2c7235ece8093137c1"; + sha256 = "5d349b29dca8f2e3f8b7f3815811c87e2bdea47c0686dd6bb2272546d4c94586"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/be/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/be/firefox-111.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ad2130cad5b7d216ca6b06be19f8ba906e1d44f30ccb9675656a972e93797618"; + sha256 = "8c9d2818217257bfeca1aff0250530fdaad569436f1c9218fa8ff839bbeb42fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/bg/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bg/firefox-111.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "cab9bea6be83af82ae2d293e03db5164081f438fa026067ee26b1748c89d2eb3"; + sha256 = "1ea72a0bc20a3c5a986ae5d2ec43e6347b0631f21e98ef9d2e5847e76e6686b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/bn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bn/firefox-111.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "cbb0ba2805be954bb894a35bb6e119643992d8bbd7fb4933773c119de73225a9"; + sha256 = "895b803948074af1c6b4fcc12a17594179a5af35d58b3a85ece79e40cea6d56b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/br/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/br/firefox-111.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f8c07354ffb8c865dafa1828e62ee7c0a1e89b1c9e8203e871660368ed68d0e9"; + sha256 = "87c6538c14fb8e51c464df8e3b6999f0fc8cd20ac3b1285d5a0856271f9fd1fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/bs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/bs/firefox-111.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "11a71957066c42418902ea53687303844f9451218768551b23fc3828e74170ba"; + sha256 = "7085d95b9d9afdf17becec98b86a76d815cddb3fe43cbae15831156daeda337d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ca-valencia/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ca-valencia/firefox-111.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "61e8f1b65322fce46cde4d9208c88008578e017c94c1eb5f91630f95b4acd521"; + sha256 = "251524d2ec9988ca5d72128cc4de2ad0aa4a80c576a1517dc27081fe158c99b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ca/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ca/firefox-111.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d2a6295eb35514e2bd289f280fab59148b18f349a6ef0d7d4cbe69247b6c89d4"; + sha256 = "ef87a4bb863140d72542e7cc02172028bac7781f806d0f52d51339acc7d49efa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/cak/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cak/firefox-111.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "336c24aaa28ab1accf2f3ae9195a3ac753f2c3a2ceb3378d04822e866979b530"; + sha256 = "37d34d26264da9ce96829d5c2cb7ab1156c9420043a3d6cea7ef4e87256b9417"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/cs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cs/firefox-111.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "2d81cca9b20dc40358d4b6b482440bd803ad3e3282197ce8e8b46c046fb22fa9"; + sha256 = "463e68256aa98781f77c8a2467f58c40a89ff43ba38d728fba648b4f76da0850"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/cy/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/cy/firefox-111.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8359257b1a67702cd150922f2e27bfc409ddd54ef66f736449c9317c96bc9056"; + sha256 = "a479727e6546452cd4ad14f90fbb48136f336734abf0dc0e92a56065ed4679c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/da/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/da/firefox-111.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "09b338b9d805571611dffe140f950ed5451d1abe9c0b43d2c5b8a3cf2f454adf"; + sha256 = "a39b122fbef49420cbe7c12b0cfda10a061ba644aba36e77971b08bfaa213862"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/de/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/de/firefox-111.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1ef1a33e292e27f75604ab017fdcbd57fd91e6b63070b83dbb11048575bf7015"; + sha256 = "e653f75cb2e7616389e93737a2bba59c7422a11ca7cf7f670fc9c868fc089be2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/dsb/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/dsb/firefox-111.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "937742961306039bffd669c360e5bd3813530ba1eaec3d463b5d7507208caef7"; + sha256 = "d9b02475bf5146d232f8fb2e96b4da93142c2a4090addb9fc8f636d38de021b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/el/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/el/firefox-111.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "eadd17f96c9a20914740700436720c7383ea040cfd49dbee313c9f63cd543e9c"; + sha256 = "dfdc5682800de16e0327549b1f444eff08bf6a4cf5a38d9cb7a6909207afd324"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/en-CA/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-CA/firefox-111.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "246c8c7e12287762e824227396c310295ca44af147102d434bcdadb34a674868"; + sha256 = "81e9791af2c7a896c38a752178b9fbff6da0f95ae84ae0fc0a0b315161b4b8f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/en-GB/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-GB/firefox-111.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "1bc4b65e27ac9ed36670cb30f906125e5ed6416f1e74cce4c27ad66174e268dc"; + sha256 = "59083c9ba66dbd20079d96f24e94fb44d9152dcc973f4e283574de0ca3818dee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/en-US/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/en-US/firefox-111.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "f2f74d4ccaa6d1836cfe35f2066600811669afa661e75923f5efa463f6419b35"; + sha256 = "6fb7a30e23479614dc4f77b728af3736bac41af0a9f45a43ad776d5c0b22e260"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/eo/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/eo/firefox-111.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "03aea5c221f43a03266bfb6dcfa47b1adab597781a7eeb76d97a38addbe01e7e"; + sha256 = "5af5000ff60d6c647317d9026bfe75b2af93fa7078414d9ca7e33d078e894b5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-AR/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-AR/firefox-111.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f33ae2b6c29d3b2d0c3654511791acd8af5d5510b32b5d88cd43986a190f1dfa"; + sha256 = "ec88b3bb69c589cac44b07194904c73dd77b6ccb6cf4f0df5b3d668f70a96968"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-CL/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-CL/firefox-111.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "cad86c57d5bf9b8e29da7b445f2ceb6bfbaaf4cd4d4f10fc17cf636251f96ab8"; + sha256 = "9b459d0782b0e2d7efe60a23bb3f81d546978f5bc8e230644de8fe3618231c06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-ES/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-ES/firefox-111.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "fa77b1256964d833ef2441f7d96849e0b71e3fe46018433798099878c04f0309"; + sha256 = "35f382b4387d8f4b89fd9ea9dd73da1765098f00942714e5de39ff51230a54f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-MX/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/es-MX/firefox-111.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f89936ecc46e466ce51523551fa36e56b9d5fb60869b36f0df50e558897ab35c"; + sha256 = "90d90cb11ca58f16018b270608882754ffcf89503811f4d17ca14645e1935284"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/et/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/et/firefox-111.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "03c8b27bd364f62a76f1c77ea440a5c2e15b7a9fcb494fb2472fec3f9c3ddadc"; + sha256 = "92ee0798472b4c17c0d30145ec4db414ba0f641b1f58904d43726d6cad826149"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/eu/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/eu/firefox-111.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b830123c80c92dbcc6068fb119255558c33781d7a6455cb5632f1d881cc283b6"; + sha256 = "76fb6ee46121973a20a8edc737781980e04ced07761418e0d9d9121eb0209585"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fa/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fa/firefox-111.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ab9b9cb6040d1f2cb8c383f54b86c16e4f3bf0c43fd81e69b926061eea752942"; + sha256 = "ebf40f448c55b455da214a4822c83b55f6a7010101167eeefa0ee7b554802f66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ff/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ff/firefox-111.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "5d35b634780ff8a467cee0a5c9d6a629a82e445822f60d1dac150d4f40af8164"; + sha256 = "861bc300603dae711b152cf20b8be1f6a6247c8e1c87b92dd44c30e71f5437a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fi/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fi/firefox-111.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "dfea0b395fcfa9b6bb20c00fc3522cfa0f52dc398b3344090a2f717fb5305b74"; + sha256 = "4fdd7c7eda0730a168d913f437435dd0f46e3e97a69bfa7b7e3abd3817e81edc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fr/firefox-111.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f75c35f0ed8cbd6c45c93774f5031b0555465473fa85a3b12501b3e91701cbd8"; + sha256 = "3b17ff465c8956ab8baaa71ee3eb7fac5ff12daca655629ed7d50b0ee0500253"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fy-NL/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fur/firefox-111.0b6.tar.bz2"; + locale = "fur"; + arch = "linux-i686"; + sha256 = "efdea88bba602a91e2935f6dd53f874f8ef1fb33ccba045b5392c25650a85637"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/fy-NL/firefox-111.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "4fae4df1046e30117ebcab39f930f2b5e4e4e702a8a786b39d840725885be2e1"; + sha256 = "8c75c2bb5f61b94f9a44027293340532e104b5899f7e4555b27a00d3bb2ad4fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ga-IE/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ga-IE/firefox-111.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "2853ab5a94565fa23097331c3c2ca491b7aac8c52a921a07e3c62fb45ddcfedf"; + sha256 = "21853766ad4f9cb09fe2a5919353dc3ec71e99b1034ded1c82725dfa0d489720"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gd/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gd/firefox-111.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "d4249520b4ad65de6914342ef8fcb37b3d7f5e9a4d1de333a280156735d89fbf"; + sha256 = "86dca0143ddfef6fec63cf70d5dfa5322cca8561f4270cfef936340eec8dd4ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gl/firefox-111.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "193cc568dc201ac86e66c6badb73dff2f00479900fbf3e1f3df0a29c46f7ac5d"; + sha256 = "0bc4e3af051329405f2b660319f8f984c136133b86f54594d96523ad148d98a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gn/firefox-111.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "288aa3ab090e369696f87f2d266b55b6b604611d48de5b0323a8dcf6b8131081"; + sha256 = "d5308fe2d705d127496097e627e0943feae7b6068642733c36d5ef9dfb812678"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gu-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/gu-IN/firefox-111.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "8751c272912bd68d0ba4a4329e31848916794171e76ecf1ec480d9bba87143a8"; + sha256 = "674d7f3f9af1bd63f0ac5bf690c23fb051461259baa4c5fe49f914804291cbcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/he/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/he/firefox-111.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "6263e6a44cffe19c7b3ac15f4c2ec024a9c4ddd6713607db80789fc5f4ef77ec"; + sha256 = "bba2bc622a90f1051ad4ceb74f502580ec30a1b5df56a27d7ed6e3a0fa6797b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hi-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hi-IN/firefox-111.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "8d42e30626c4a2921bdda59511ec26adf9f7fdd669df49c75dfd32ec09203bd9"; + sha256 = "b2dcbbfd89a03fd0408ca292fcf40f879a5df920823aae5a9ee13f57fe22ea01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hr/firefox-111.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9f145d7adc51f2b266d67ec5774451d04727fe86070fbcd7d78c869c4121618e"; + sha256 = "ec0e866ccde7b96ed65f4d0f06bab2e232319a20edd38fcaa19bce650635a4e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hsb/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hsb/firefox-111.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "366403587328bcd5f6554513d0884deebc305597f2f294238afb16c2db4c0bd2"; + sha256 = "d14f7c7b93034f8f2ee6807e64de7f73f600b3071744ec6d5cf1b996ae56b357"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hu/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hu/firefox-111.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5d0cc99b99d43a7ab939cca744b92826d5199b2000a32c5cf34a65341043fa1c"; + sha256 = "6c6fcc5fa0333a589f8a897fdb05957b93016e4afc0c476995ceb148df6454c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hy-AM/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/hy-AM/firefox-111.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "cb5f333b84d36446104a72bd49caec3d43e202464694f9e78337d3e607e1f4a3"; + sha256 = "a3c967dbf2f276a6a2e60e60c5e225211d6372619fc052e11ee4b0132e174cd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ia/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ia/firefox-111.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "ad48fd8343c13624284798179424c2b954740e165c86b62f8c0555a27445e955"; + sha256 = "16f6e527fc617738e7e153b9bc7c012c4bc0b6c242f641465d2db01d48ff89fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/id/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/id/firefox-111.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3729410ceae83654259e8c1f9af7aa6bc1cfa8c96d44a981ca0555b915b54cbb"; + sha256 = "7e27cd38b5defe430189554f929f43be72278c0d5ed010c5ac78920d52993934"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/is/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/is/firefox-111.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b16f8b5d8188167a676f9a4356d7b8fe3430d495957a5b5ee38505752e08aeb7"; + sha256 = "c7faad118878aa68078c850730ebc0abc4d4f199625af975eecc76900e920f4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/it/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/it/firefox-111.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "366dc68de5e29e5ce6777ab654a67c25fbf5681ee42b3cfff68dfc4119d65dd7"; + sha256 = "5b30917c8f689882813f9f25870ea104d780fc476329231cb37b9358ce2c1bc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ja/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ja/firefox-111.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "7ee29129e13769d3ef0b4491c24c3dfff8f483d6f56d1e8ab7524c64579be466"; + sha256 = "a3916d54ad28297316294065b41cfe99237acf29752b9bf8a6ea886ea77000e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ka/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ka/firefox-111.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "1e1a51f53eed441d028eb880a364da796746c2d95951d521820480ba3af19cbd"; + sha256 = "65ca0ebc62d144c0a5f7a8f29544de601487523628544ad8050b8367d02e1f31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/kab/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kab/firefox-111.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "b97d20a23d560195218be01ea0ba5e54ffc01d0a297e920b755ea8e717c3b819"; + sha256 = "af9939e9f2be3b7aa823649e285e027565275d602148f7049001176f2bf3cd56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/kk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kk/firefox-111.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "7fc9e69c16e0c01a31b4e9cc6c7542891537bb3e0033297e6792b4962c540a71"; + sha256 = "536481db78eecb11c9b5dd7e9cdf5cea0fae6593b373aeb6774dc55b97e9e749"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/km/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/km/firefox-111.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "6ca48c5868342eeb3ebad49a36e5e478df83b44a5fa0a5fec3ccc9efb6213207"; + sha256 = "181d1bd71d1cb96370e54bfe678deb50d3884b9042b0b7fb901e65faeee9e3c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/kn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/kn/firefox-111.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "62c44308be90402c05e573103acd768e93439ae1c058610282838677c553e564"; + sha256 = "2c52d62b7a45259460a1198fbc176bafda3c826a5e30d085ec9fae622100fd5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ko/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ko/firefox-111.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2cbe9806e77b05098177fb3e700f74f489395cfb6894737643ddaa820b4cc6b8"; + sha256 = "7cdc34f750e7fcdf68c07169cbd23dfd5225a77a325ab4e5056a5e75be488536"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/lij/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lij/firefox-111.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "6ae2818eacd6353ce0104a41e1a02487bcc852ae650079f17b9c3d24bfa32246"; + sha256 = "dcf20c70faa4fc6434b86418f49658b564a312d7c05045e9d7bbbe08e3412b92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/lt/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lt/firefox-111.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "7d5f0a3b857e3b4927f79f6467efb05d362df1849fb696918ff498b0ec5ec493"; + sha256 = "a0f837de6a7ea9ae287b2bd8aa8d07d3e495489a4a4e25877547ecbd1aa635de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/lv/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/lv/firefox-111.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "5972f0d493c1048f81c3d2e771543649685c436699733e010ca0352720441652"; + sha256 = "29bd052f0fc211f15b0449104047359f0e54a7395b615d1bc0f25a3a1e2f747e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/mk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/mk/firefox-111.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "8b926b986211014b183c2b431a601cff6d41546d0c52164d800590377ca33ffe"; + sha256 = "6cae243bcd0f790ca156f7aa9c6602a0dcf9e482e2fd98890b741729be27c63f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/mr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/mr/firefox-111.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "0db18d1f1b5603160d310bb71037586cd3f850ce547551588715323b8a4591e0"; + sha256 = "42adf4de407edb938b98ed3a27b1491dbe463d42fdf3e63c60a7ce83eaab1d7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ms/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ms/firefox-111.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "6d29e0e308485c5b9ccc561c1ff73dcdd3449d5ec172e87eaa1d4c6414ea562f"; + sha256 = "f1e3e7db826643527896e7d1568a9040ac534327858bad653953e1be9c960e52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/my/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/my/firefox-111.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "69e7e315a8910daa7325007b5deb83cf43fb29ffac66d7e0a8e3eb8a372d771c"; + sha256 = "b1a51f7770ee6c3a23859c90fab894aaa3c2aa36f49c3fb9d520542a9492e044"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/nb-NO/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nb-NO/firefox-111.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f1cedc730d9a71fafd39268f343ede8c4e09f4c70e6f3798e4cc6a62e20bac38"; + sha256 = "9688da318359cbb4e0f37ff0dd7a9ec727dbb9e997ab1c0247cfbfffbb8820f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ne-NP/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ne-NP/firefox-111.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8d04cad68f00675081fa86461b638e566a3e93b113ec824d147ff858d0488f75"; + sha256 = "e5fc128298e297d2d7b6fc788ce1566bfcdf868962441dd4ee11af3acbafb7d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/nl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nl/firefox-111.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "da982c4645969987b5233313f867cc0201db446c38ef6fd3e3dddd1c21cfea6e"; + sha256 = "53e10046449208e44acd8f9cc11d2500cb0be0e0fabc2dc7883cc8347a436aa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/nn-NO/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/nn-NO/firefox-111.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ae24268f96885e4b5153a8ada3cf66bb7059ef006d54c3c69a6cf6a9599bceca"; + sha256 = "a36cbe8b97febd8ad1fdcedace1a0a087dfde07586e207ae92a9f4f7b6fa7538"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/oc/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/oc/firefox-111.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "f764ebc811b12637c081483260f091421afee5af636689b4c99e41c5e8482767"; + sha256 = "46db41b7ae8c30a889131c7f9e1f6adf2af8fe13d872d951134b06a3591e5e27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pa-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pa-IN/firefox-111.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "2d4ac283513a21017f8cdd1a2e7d2914dc1f6b44bd7d1f3cb692d897283fc491"; + sha256 = "b07dfb59d5bdd02ea2e55ab0684bd2d4192e888578670e536b847823f49e7b1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pl/firefox-111.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "385e1993424817038268e41b4c82e5b7676977bbe66f15cadb4de94e02a17d7a"; + sha256 = "1bd366a3ebf1eecc4eeb30e6f43852fe55c00d0db330607d90647fac00cff9fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pt-BR/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pt-BR/firefox-111.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0e43c68826c2d2e86122f610465a71de7ddf86d4e87e438639c28816c6e7215a"; + sha256 = "99cfa9de6bc60f84b5cb44a4e139d3a609cab4f1bec126b4cd6c6c6b287dfbed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pt-PT/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/pt-PT/firefox-111.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "6129db67a61679e1836b09e515481ba64d1c8e4fc81df7216749282a071243f3"; + sha256 = "352fcdad76adf69d708638e81468add5542fe6298ec3b13ba500f8dd7d2a7907"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/rm/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/rm/firefox-111.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "9964cd8d26a4e828d383f179337ad64c7d757f9765adfd8a79b4e7f3b644570c"; + sha256 = "24015a6e677171ea1609cf551e038f10606f34d5c8fdc9f28263e83d219442fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ro/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ro/firefox-111.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "f7586714053c133eb2acd5a299354ff919bfdf1a6e92804df130959140979ace"; + sha256 = "f3fcb0597580ec67a33aee155bc9ad626fd01b40ca8aee9bbd51b372361f09fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ru/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ru/firefox-111.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "33e547e99de3cd5ed363ee9e66c54fddcb52af677b21f2ff8929e3c42732e0ba"; + sha256 = "5fe26295471bf18171b64eb9a5204453556459763b439b7ea0a5afc5b2115b5a"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sc/firefox-111.0b6.tar.bz2"; + locale = "sc"; + arch = "linux-i686"; + sha256 = "295ce6d814f4b7b356ea01da7fd0c83ac443614a21d45da89c0691f0dc914705"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sco/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sco/firefox-111.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "df707abfcabef24d9af77f658b8e01627c69bf242fa57d258cc6d390e858c9e4"; + sha256 = "a1b85d136a2a1086da69592739d8fc1429e34aa7f180c56f3b270630fee8a6a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/si/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/si/firefox-111.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "1959ec07d6db26b4f0846588ec074d24b5543285186fceb32ecbe057acc1b245"; + sha256 = "eed2e61f123ef88c71d2d9a1f0fa6019856c2c0e7cc5d3de760091785741f897"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sk/firefox-111.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a9c235d177001657460acb0adacc3a7d8b30fabefb96680f09002562c9d78718"; + sha256 = "66d6ed76a9e659703b2d586b97a76ae8b7af22dac3a01d4d902cd5747ee3735b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sl/firefox-111.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "da573b4345abf16f193984c5480083c13a65fe2ccb72be245f92e4852dc9a7b1"; + sha256 = "24644a2feda81a5e5f2ad70d420a018a4d36507130699f0175d0e3a9837d3e9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/son/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/son/firefox-111.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "147060d1b9dd3c4c0a31e67303cd08b38caba1b495d2c33e172b1b0480993871"; + sha256 = "a1b5d23e4c1cb67cbdc9842e2ea5878f4b6be9b9899bfa59d0e5689d589f3e0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sq/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sq/firefox-111.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "411c287d77eb774e52ca4bb528852ce4c38f86c5147c322371633277436e5c66"; + sha256 = "879c5b1f90b6fa51a648417e70a770479f844f5fc4cc124b0b7ea68eb458dbe6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sr/firefox-111.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d62d2956beb460c1c6a07429ca18dda1b470d93eecc5bf233712b399155dc670"; + sha256 = "94f19f7e0ef54acbf79d16b1228367704c968aebd10d3b8afaa0379f503ccd4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sv-SE/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/sv-SE/firefox-111.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "e22d8628bf6cb94f139efdd16fe52bef13179611943c047e5802d46ba396e9e5"; + sha256 = "2efa5241fdf5211e8452e5b8c6d07a989fc3585a7ee00b0a60fccdac140ab531"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/szl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/szl/firefox-111.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "60f54f251a528e69d9de932a1aa9af16b29c118b021fb6578a6d679f19f35d24"; + sha256 = "8a18cbed900564fcaa0cf52d6be461f3e7e6146841568006f409fcc8f5241bea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ta/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ta/firefox-111.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "cd521c26658fb537c36f21283e28be09b79198733c2c10b44a0e8e5a56630d5e"; + sha256 = "ef901fe934af0978089b7463f743f583e9f2c46c617234b2206cc5e0c31daaaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/te/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/te/firefox-111.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "93d8363e822e23ea4afe3c649fe92b958f9066d7fc7789f604af99b6f435d693"; + sha256 = "6847dca8150ba6dac5f7082ae518b9fcba129320e93909b9340ce5adeae6540f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/th/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/th/firefox-111.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "bb0d863cf8bbd3bc03d5e4f51af437c5a55736f347998ee1be1e5c0a115d3ce9"; + sha256 = "ac72b502b1fc8cea75ec2b878b957d52fa8fcc29663b7003c334ec6932e5ece5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/tl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/tl/firefox-111.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "66ae66674078504c2d67a5405c407076eab99fea1d5eca0bf4567bf3aa822e15"; + sha256 = "1f2ef4a9dd341c3151c7e66c8d9fc1e0f62f33ec397e3ff399bb56dee89532a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/tr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/tr/firefox-111.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "1c0b9d7368c4f9cb61d713d677408482219febc302ec4d8317e20d5f1d1075e6"; + sha256 = "6026af884fb2f1c899fbd28f99d383ca34fd4e6540c37e08904155df3d6e2907"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/trs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/trs/firefox-111.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "67fae3d8b9a6759f0bee55b97a8846afda2281e94c9ea35f9de9eb427d5398aa"; + sha256 = "36f70f8275de2201ee29387c2724f908ae92a22d8e1c830f5e4572f2d8a8838b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/uk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/uk/firefox-111.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "330897b83e0aaab964f0ddf3a07240ed2e4e5f9dd59595b2b3462c258981cab7"; + sha256 = "f46da613145e3ecbcaff8334fe54e340dbce9b0c4fffa0121958abd6fd1e1445"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ur/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/ur/firefox-111.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "6eebf5cccd785a0eb3d14fccb756cc6b9653dc01f3e48c6a1e4956d4329d1d4b"; + sha256 = "048b6285f5600b2c09a63f5c90c2b8fde0159e6c3bc7f282482bf4e3b0581e78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/uz/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/uz/firefox-111.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "97b82f8be3b0450646a7fb68c6b5cc9812e3618a1f4a26a339b7e9f672cee114"; + sha256 = "21da3f9a45abb3156ca14c399c2b6329801135d37c3e969b0e7f615311649a72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/vi/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/vi/firefox-111.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "28b48033d6e698b643783433b948e8033d06322a6f164facd3bc6dec64e967aa"; + sha256 = "e0e6509645516ae50f044755da40a30685edf2d33ee38d213000507db3a25d34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/xh/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/xh/firefox-111.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "dea53c99e972e709483027174697536f300b1debeea03b653189be61b860a668"; + sha256 = "b8904a816b1f6f3290bb2b9d79e2bbe92d01dd5fef059c7ebe4a70cdcdd4cc74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/zh-CN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/zh-CN/firefox-111.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "dec3dcb0645e170ca312c38f8d91c6f5391316158ad6c0ac2b9eff1d34ff7788"; + sha256 = "307a472ac7ca779883e162a5dd780cc9ef69cd1e09f8aa03f33cb0501960bc32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/zh-TW/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b6/linux-i686/zh-TW/firefox-111.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ea01a8b6dc57617d3006b5f24a21206da765abf93eabec4afa50dbad1f7f9b95"; + sha256 = "ffc5c9f740ef19167a463de5b5a85d75aa9cdad85f0d476734b01350c48de9e3"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 0ad125beb53e1..052e0e149a8ab 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -197,7 +197,7 @@ stdenv.mkDerivation { # update with: # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped passthru.updateScript = import ./update.nix { - inherit pname channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; + inherit pname channel lib writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; baseUrl = if channel == "devedition" then "https://archive.mozilla.org/pub/devedition/releases/" diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index de77cd97f8e46..c5e43821d0b49 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,1005 @@ { - version = "110.0b4"; + version = "111.0b6"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ach/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ach/firefox-111.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "79aef93220d4ac9765eb2b16dde0a10cb375e08b3d0e94397c17a446801aa95c"; + sha256 = "79343be6d57fc75312eac2f0b56066afe6a46ff8b39a7f5324f69343a3528960"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/af/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/af/firefox-111.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "fa1d27a73425be89b34f3bfcebe71b5b29c300b297266b4afe764a7660dfed0d"; + sha256 = "e12e16fc1a4117ae38323fe20a36105ca6ad9abab65835d400c88a1216243ce7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/an/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/an/firefox-111.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "3d67d3eb19a9b6f2f8893734e7386e6725b6e5eb70aad4957e1809228b960ed0"; + sha256 = "fdde843fc3836ff1aaba4045c332c0cfd50106d94450e5afabdd2216f83cc00a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ar/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ar/firefox-111.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "e8177c8011a467d24537de69c0f246f21e2cb4a24384fb1072ab64cfdee7cdab"; + sha256 = "bd122fb367bfa26eccdbceb2253849f1027d35c059ae0b218b76914e9cd0c484"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ast/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ast/firefox-111.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "1c135b7c3ea17d4b9b87e7d12f1f7dfa9c85d71678d001d9cd078708d59e8d34"; + sha256 = "9069477aef9136231df4aa5cd73ff0b7b5deff3b965534c617bea59db55c82e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/az/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/az/firefox-111.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "e1355d18563990ceda932955fdb06bdaef4280630e03a16e2498ac244ba2bafd"; + sha256 = "dc9c51569e18fd6c6eefb6d4347fe9cb0ce2daead07bba8e41ee765ea537ed2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/be/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/be/firefox-111.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "bcd3643714d6ef6b1dd2da4804ad72f06ae5cf91262caf2fc3980d833d280bf6"; + sha256 = "58d45cab0096a7b8d8bf141583daa5e6c2c96e2167b1001441c4cb2002886eb3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/bg/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/bg/firefox-111.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "40937098cdb307fa3375038691c41ea25bdeda96ad1ce403d71ece9a9a11d4c2"; + sha256 = "363ca30356f6ed2671763dce44651f5fb291cac071af236e05f52a344f0c9009"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/bn/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/bn/firefox-111.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "5eef8728e7e992deb4e8d1189e33c082145d500ea138166839b02a09ae58294d"; + sha256 = "bd5448800faff26eb63b4943b81fd161e4c4c129631cbc576b617640821bfdd8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/br/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/br/firefox-111.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c8c947898ddb8ddbd0c7410e9c8835d883b7bfb10d0789a8df0002843f1b9d65"; + sha256 = "d2b3cecda429f65f8503035c14f4394355428d30f4e5362dabb5bdc7b3b15c2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/bs/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/bs/firefox-111.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "f7b50052bd7786cfe339dd7524d6245ed50aacef08e1a398668880edddcb7682"; + sha256 = "a8ef2fa0412450583f42b5878f41cbea376e415d84ec3b3d46c2c90f7eb23a8b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ca-valencia/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ca-valencia/firefox-111.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "9473df4fbaf27848ac09b20d944e40cba52b8af327560c55641f3b0e9a0db317"; + sha256 = "10d1ff2fc9db8f87ec05bb5d57cbb62579bad4fac9f51c5e98e83b0fc5259518"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ca/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ca/firefox-111.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1bd644d485d8d9b50f0a57873f99a631c799ad2b75d54544ef1e7fbf589a37f6"; + sha256 = "b2fbf0dc80d2e4ff2f6c50c23cb2ed7c42494324011ef3b87b1cb8e05b755949"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/cak/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/cak/firefox-111.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "94be93e482c2de595a89ecedbe163d97b8d2cad246f309da18490010f4218bdd"; + sha256 = "2e20e0d97aca5d0bc2b316b91bb0f3404cd9f776fd6ec22ddc8d1223a414345d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/cs/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/cs/firefox-111.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "7a383065cc61d3afb38a53cebbcd1380c76fe8c2677471cd2f4c5205aec1d0e3"; + sha256 = "cc0a7c0bb47cd73bb9e55049d5f0d26efcdabdf39defc0cf02cce99ecbbab4c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/cy/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/cy/firefox-111.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b3852c149fbbc7dd90f3316e1375f2a56e4488ec89bda2f1c5d29fb8dc01ea00"; + sha256 = "e09ea03a0f0304f784f949c643eeca8013a235bc8545d22bf0373cda7e392540"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/da/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/da/firefox-111.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "290e82778a26c99a0cb21272a75ddd0a30fd99c9326d7e182a354999da17f368"; + sha256 = "a5dca2e0bc640c0007d4dd7d1810fb26b6dea2d5e6c569f948eef34d92a40690"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/de/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/de/firefox-111.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6ab2b19451f60318aef65715af7154ce17197fb596810a572d8721e1de39dd13"; + sha256 = "5d0ed39636c08783529b355617170be7490e4782bc59c2a8eaddaf9e9ec32022"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/dsb/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/dsb/firefox-111.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "bd820c0b5485ffaeb8b978e662c5fa3f1b8c9c17cea49a26338160a6e7a4ff3a"; + sha256 = "c64902738be1493e4e5e7cdb4dc1e323bfbcdb2a301f5a8683f72baa2610cc17"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/el/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/el/firefox-111.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "532b738bd86ebf327b06ee00e0b375ad45bf75459c0bcafc093d7cbb73136c12"; + sha256 = "daeeee563649f9ebc62f9c3534bfaabebd16c76db0d3f5d1c190cb19cf80c96a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/en-CA/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/en-CA/firefox-111.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "b5a4c77cb687383b5448879387027f6bc5a40e7eccab58997cd8b9020111a180"; + sha256 = "bf7e35bc0307d76e5fe1f797743c38169556aad60e9e3bcb50feaaff4b9c5699"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/en-GB/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/en-GB/firefox-111.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c872cd171dbe3db7ac2e8b0d8d2dde43a80ba6fce99e8f2508ec0f215ca873cf"; + sha256 = "f529cfad9db2850cc516283ad5fb51fb656372cec8f5ca6363eb6089feb88584"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/en-US/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/en-US/firefox-111.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "716d742eafe2ef95d13021e5cfa1df9f24650522fd988addd9a3d3c8a1f78a52"; + sha256 = "33021304cf1015164faf22ce81b5bc4730c5fdcafcc656a3032f6344e4620920"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/eo/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/eo/firefox-111.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "7fcda871328d6bff9454c2749aa29e05db0cca0a6d42457f9dc55d31993bddf3"; + sha256 = "857ee8a8e47b45cf91808f10bf7135292b3647f0cf5a13496e77a931adf9a194"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/es-AR/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/es-AR/firefox-111.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "d50d47f0f26b11deaeb0aae9f190a89de6118f5dc281ffbb66488e2056f6dc9d"; + sha256 = "d91cb861456f3acaf1ab0ffa2dcbb62afe3505df231f9ecb6d4b1be57ab807c4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/es-CL/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/es-CL/firefox-111.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "b5d4b2d40776fe3df72f8ee9da7772056e81d875115b9e839e228f32214b2f7b"; + sha256 = "f5f45002bb81ee81683d6aaeae09d0c06dcbe745697b92e9334394f89cfc3439"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/es-ES/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/es-ES/firefox-111.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "3ca3254daef1ac127c3665e841914963c12b846a70babe73bc67706aebd31132"; + sha256 = "d5d5d9de061ea450eee4f1cc9b1a27d1531de39b40d034d35c6981fb3a2df8ca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/es-MX/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/es-MX/firefox-111.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "3cbdb1b4a493753b95d0c15bf77711c7c9a2521fa0f5bb5398b4a21aa3fd1ca6"; + sha256 = "886fd74d5a3e4658486391e418b686d42af2de969561c871a86c5b7aa650aea3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/et/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/et/firefox-111.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "db979aba962b4b28c1d9c992496f535f8dd49fc53592cbad9d5868095ce3f57b"; + sha256 = "1e81adba235f1dbbd345f43964fdfc1e04ea28b7f2e1ee190613abaf5cfb9ea8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/eu/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/eu/firefox-111.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8b7941e539d773a82f934047d6d1a961a13ad5a3481dbf4f1a6379e42a0b7f07"; + sha256 = "89505fd1c7eb8343114bc75ac08500ecbf3c5124609325eec64d3466ba004963"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/fa/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/fa/firefox-111.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "85f6ecb803f35a8832bb5a175875d6e50f79c84ee3e0acf7396c9335a513398d"; + sha256 = "8a84e1e596b21be617bbe9a781d5ce719dbdf1b0826930be2eaa45acf4bff138"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ff/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ff/firefox-111.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "11205063e7496360a48ed320d240454175448a02fc720cb7f716a72c48998697"; + sha256 = "e4714ded6ed8c3cabc444fc9ef4cd26105f43acd5fa324f8845508ed4bf01be2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/fi/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/fi/firefox-111.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e00863c7a2e3aaee23591a762c49fb522d1b1dad56a4ad51efd742d999e277a0"; + sha256 = "1e0b577bd51c7f9ea167c3d9cf17fe426e183a558b1b7b01bbb9e525129270a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/fr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/fr/firefox-111.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ba0784ac17f95eaf177a265c5657f43397321d3380eab2187b1d4435114be006"; + sha256 = "b5c0ae7f542b4dc5c84ff6db36c5da6f351e102dc9c558837d53bbd789362988"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/fy-NL/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/fur/firefox-111.0b6.tar.bz2"; + locale = "fur"; + arch = "linux-x86_64"; + sha256 = "d92e9bd09c3cd9ad14b5950747b4bea427c553ec0bf9d698fddb9aadfb062a31"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/fy-NL/firefox-111.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e6e333da9a6b874c31905da2b9466988d8d94cd0eac7098f3cc816cfd36b6bf9"; + sha256 = "900f98acd992f6f1f9dbf8273ea42fb87a7931b45d1e42530b4bafb440d42010"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ga-IE/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ga-IE/firefox-111.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "c684a8628360647bfb582da7506201acb7c655d42a69ab48d2f45b91a235f544"; + sha256 = "603ed695e70f53beb4504f925ea1e3eb6bcfb374c97bb8d47680c1c0bdbe0052"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/gd/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/gd/firefox-111.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "bcec9bcaf9f5ea21d4bdb2b8cf2d1b479bcf4678349eda4ab8015f6a43d0e11e"; + sha256 = "df12f377572508d2fed19002ec2d176ff5f6756b3830c843622e54ad1b5bd400"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/gl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/gl/firefox-111.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "80eb1934b2e90ac41736324cf21241ec303839c13f000cb1e9d1365a70709255"; + sha256 = "75956eb1451453a2b379269725e182f5fe2ca8cde6a705629093e999c6a4fb5b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/gn/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/gn/firefox-111.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "1f2307c7856c83d0dad1ae3675cc08809616c928373e9adafb5a46083fdbb262"; + sha256 = "81fd5b91ca7e3037d65f91a258a74d3af094164ed50df207fde9bfb9a0868cde"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/gu-IN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/gu-IN/firefox-111.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "e04ba6865ad2c2a618c3dce13b0c66b4be4a47629d92a79780fd8946eaa4c029"; + sha256 = "87a60246afd5c848c980512dd304e6ab2ea57443514a82c2a3b5616db89702b0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/he/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/he/firefox-111.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "f502e8823a4b1017dfc1a5786333f68f82704a27c6e87f3a97978a3fb6d5f1eb"; + sha256 = "d00ba776fcc39ed915eff0969e0a0d739e5050fa90941fa7c32a8d33ee714418"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hi-IN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/hi-IN/firefox-111.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "0756e68ebb357dc4c2d0367923e3e6f77da4d0e873d1f7889a79f8ebd0cf527d"; + sha256 = "2febc04c7c53c69d22c502432d2f7b00b1704d11b10f7d0c11e57e6ae01b1523"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/hr/firefox-111.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "19d55919ccf2bbe9a6d651fce8e126c0cffb4a0b254b0635512fb3c82a191b05"; + sha256 = "b3f156e24d2260337e82dfb2fc1d32deca06ef5c8c34507385c7f583ddc78307"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hsb/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/hsb/firefox-111.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2005925a8b0da8e28fff97cca8acf979eb4236100fbd0e6138a2cb4f75a2aff9"; + sha256 = "ef5ee36cffb75ecb0e599b86ff6ee0d2cd776ab1f89384a96d0e6d1248ab6f37"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hu/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/hu/firefox-111.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "45e01f13ff46efcc43fb059107104a1b0ba39126530774d2dd19381e5f6ca5bc"; + sha256 = "0705bc2374fc6cb67e7054d518d08bd201bebd4c3988d753c63d0d9e867020a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/hy-AM/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/hy-AM/firefox-111.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "624c487076433db825419dcc9f7ee5e45b0995350835ac43e276e0a616d8d862"; + sha256 = "7f4aec0a342481472413fd269378ce2eae3e7612b600696cfcf3754a31cc5e8a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ia/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ia/firefox-111.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "600b3303131b986656e5f6c06a01430010a940763b4a2d38c521cb640cfc36f6"; + sha256 = "3bb51c475cc2884c3c5f42396b08b08519c2515f8b2464d555dda75860ddadf5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/id/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/id/firefox-111.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "272f9cd916ba70711f94f09afe3caad5d7b25c9b31bc50a7f6dc07a52074e6cd"; + sha256 = "6af8db5d1f13513a6752c9e2967f4bbc70108001440ce51c8a924953dd24eebd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/is/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/is/firefox-111.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d45d8343dc3c65c7d7561f17b8cb2c9f4eccd5b8eb242a4a53696e38ed05159f"; + sha256 = "6fd7028fa5f9b1e84da90238e7da72e22d69b69b4351c0cd9f904c3ecb437a76"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/it/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/it/firefox-111.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "32be61fa1d7061c5012147f58626b1ceb2dcce9daa1ecb71dd573aef00bb32f7"; + sha256 = "f38532bbc0c1bbc24826239e4fdfab68c41ac7ca0f4562723e2e614762768177"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ja/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ja/firefox-111.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a01627875673579adf0f5c9819d33c0b901558034a6878b2871d91b9ebaa31c3"; + sha256 = "214563479cf1b06883bb06da594f2bd32168e3c95152d3476752a2e5a84fa800"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ka/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ka/firefox-111.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "b2c0a63cfdc32afe89ef513674316435f176b1657f2f6f6abfc7f0527cac07a5"; + sha256 = "145366e2f23bdc7ee3b953fcab4a6b9e7d019261dc874789ec0686493b6e89e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/kab/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/kab/firefox-111.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "6bedeafafb5c746f39fe97bbd383d258d03275b842e14aa80c087d628540717f"; + sha256 = "3f05363b352da502d06bbfb508a14a342b92cdaf27d27769a05eb8568d83c069"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/kk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/kk/firefox-111.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "aa82ec6a68e1a3ba17947f38d8c8244403587afb81d3624fa35ade0b9143ee28"; + sha256 = "afc2a37ddfd6861f0c47708a5f355f72ab4b725bc4da656d4a86068c7cb6f0b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/km/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/km/firefox-111.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2ab1e3a97061736126616e74465f0c0c3008806957bec58047c808bf3cbc99dd"; + sha256 = "00bf51d9206e5d75e7480727ca4d1fb5e1ced0a4e6cb060ccb3dc0353b5e2374"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/kn/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/kn/firefox-111.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "f495b6252bdd160aff2c79478c4845b7968b298200f348d20a10e815fe022816"; + sha256 = "6990e205998640d462f12ede43a136ee4b4af00adb629322d1ff3624cf82b524"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ko/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ko/firefox-111.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d98f599ee71646eeee3007be682f74a52bcaeb77684c217d06ea6d0743dcbd4e"; + sha256 = "7fa30c8d668a7daaf7ea92a8d3c27d62f5e54ee0c025f93326ae7296b807fc87"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/lij/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/lij/firefox-111.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "d95e2cc6209c050528247404b65c0269c74a49d0aeb667eeb0c54cc892e1e7a6"; + sha256 = "d2737c1d051b5a21cfdd2d2cd0b72fdff2303256147544fd6de477c04f0db126"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/lt/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/lt/firefox-111.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "cfbc237a6b1a3ae245bcadb4a7dfc6424d1033d7bbc4c30e131c1a4297bd39ab"; + sha256 = "4aaa6e8a0018f90ddd78c20180e9bee8f5996d05a2363a953f4b847d837108ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/lv/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/lv/firefox-111.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "706220e213b96ef2dcdbdb115b1f53c8f2c125955603bb55b4a36163b9f2abd3"; + sha256 = "129583618dde24e4dfe87dd1f3a93f8d798b2747303e9d8a4f8799d6ecb25626"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/mk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/mk/firefox-111.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "c1897fc0f200c7d4a359da03bc3770938d1b4f1bf815b9c3a2f5fabe85a82c95"; + sha256 = "56ac9ea05833f5751622ca7237ebf7a2afd431935714139c13878951d3a1601f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/mr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/mr/firefox-111.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "cf3114bc3188480ebbe0413e7330dbe59f62776bcccdef3b5b793956cc11f5f5"; + sha256 = "67abd72132d0a822651d61ece861f0f2cafb628eef752f36a4e89ee66a763fe4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ms/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ms/firefox-111.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6b8a2c7ccbb27c582531eec4592713032eb5166ad96ddfe3e5c684704e8eee28"; + sha256 = "4bdf399a5197427d6418b7b3ca3ea027bf18c44a5b3993b2656740ff503590c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/my/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/my/firefox-111.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "571d0b56beaf78209e1996fa0fbe4aa2653ebc5e8edcdb47addd154a9219c959"; + sha256 = "1b369804d91cc6db02d8999586f9733e4aeea5aaaa9d9770098a17123511639d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/nb-NO/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/nb-NO/firefox-111.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b0a0d1126cb0213b2d22a786fb838b39eed5cb8b56e372f641b365941c1f8454"; + sha256 = "748b1a7d23e077628a555b01fe1f06aea3b96c60bbfcc6c1fc61f8d4be3c1297"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ne-NP/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ne-NP/firefox-111.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "a6baf499beebf302ad6dc519bca3d65c4fff689630bd99322a1f03c83d2f2b04"; + sha256 = "7fc566570e5ff2a2e12e3d196aedd65e7f95852799d4db95bccfa7a0fe58795a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/nl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/nl/firefox-111.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "793a35069d829db2fd1bcdaa5ded586ce9feeb3ca56ba1fd6e858f1213de6322"; + sha256 = "a261f3d0c217c8c363f7ea49c07ac3b12461cb1803f76246b5f4ae09d8f8eed7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/nn-NO/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/nn-NO/firefox-111.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "ea1582727d42c5b6f6da3d94ca1219c12dd5af0de9f99edd95045370e1dcdb0f"; + sha256 = "5ddb517b3b179cbb47821da4633c1f1307d79bdcad953674b913aee489a17ac7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/oc/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/oc/firefox-111.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "a168cab442c45ba88d47d9987c0daf24b88ba30d24296aa4676bda707e42c31c"; + sha256 = "81cf6660ffbc86871f8e379e06397ddedb13beaae7f3ee1e455b707460dcc68c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/pa-IN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/pa-IN/firefox-111.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "809f5ccdce6b742700efde23f94ddf2cfea24269bda990bdaf6693f9fbfe91aa"; + sha256 = "22cb3dff379c19f0c5bc4c0ba3d1ed9a8e554b56f8456349362275702b3a7a73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/pl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/pl/firefox-111.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "846738b0c957cf70d4fc6867aa6b0a40dad339369ec83ad9c5df973d7ebfe536"; + sha256 = "47319b8dd806721e0a3adab372e305bf93086db1e403b73fa9b4fd35173bf729"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/pt-BR/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/pt-BR/firefox-111.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "5ca2253640fde7a7a20975e6e83ba3ff089d484effb8999dad84cde861f93742"; + sha256 = "029042b4288567ca90c94d2c305c16257c9cfccc24414546e1b464add69fd3bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/pt-PT/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/pt-PT/firefox-111.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "9bfbc283ac2e353f5b06c6b4156b84f9c7bc761a394369d21487ca25dc62897a"; + sha256 = "af9a793b0088891f57a0c4af492ea751e8cb8331f1581571c577991ac1342e5f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/rm/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/rm/firefox-111.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "f0f2e77eb84222e0c0e562dae0be17fd64b3fc7980d84092bdb3e8174979ab7d"; + sha256 = "82763824851dde5e65d2b1775d00ae5d18fd8978157d49d3f08226229947ed93"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ro/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ro/firefox-111.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "14e789655e9ee9e55d57c102740c51d1144047c2e8b6822f827be65d89f29ca8"; + sha256 = "04a87d15c7aef1329cd3aef77dce903e27f0293fa2523a102352d7a0adbc05b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ru/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ru/firefox-111.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7460a7604204d6a126bffa083c23db82ce6cf926e51c3b602c2571926d2d7183"; + sha256 = "4223743e19623f30bd6e7e6c1700ee1a40c8e14946f54fb72b8ece58b2e2833d"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sc/firefox-111.0b6.tar.bz2"; + locale = "sc"; + arch = "linux-x86_64"; + sha256 = "48ade5b272075fe71c6d5610468f4982eba7af8d6374eec2679ff51aa42b210f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sco/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sco/firefox-111.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "cc20511f344395da551848e7b8622af33b4c2ba22670332b8334da753edd9ca3"; + sha256 = "23ad580377f7269b2066bc96bb5085f3ef0358b0d83d3c067bfc342848856643"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/si/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/si/firefox-111.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "fcd5ff2aca96ae655ea60d453195037aa75c6622d2786c477414e8483e7d7c46"; + sha256 = "c1cce239a1336c350ff17ee6db6ff4b6cd3677003f243d66c9a9cca093987b92"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sk/firefox-111.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1925a202a2f280884f0b7e25dc3e88816cd2f4903d3047da6696bd207513150c"; + sha256 = "e358778984f0060f6898b25a2826d8952b6a1268a7fe4918399d7718b991960d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sl/firefox-111.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "072e1818082dfbc677743accbce10e68d9e480561459906bff7720317edd63ec"; + sha256 = "0900f59d1162b2567416dfb4acfa4ce5aae8673d84317ba7c8eef1d85e901351"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/son/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/son/firefox-111.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "e722a643ab7819b96f44e64cdaa7aba66b71556493a7afd18764dea7a67bb7ec"; + sha256 = "c4df1db9499c01e5553cad8c30aae0bbc40b541fcce550e8be9672b2b0bb0748"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sq/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sq/firefox-111.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "74ed35e88aba30f23a4184ad16f31fd5907afe97e3705367e2710b7c666712e7"; + sha256 = "644bdddbe422309d7d7fda840a6e741d5c9348921f3597e55b718dbfc6fa7fc5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sr/firefox-111.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "18c3454af47dabc69eaf96fc9223c9d97f7702e0ad4783508a29898d43087c24"; + sha256 = "c96dbe075b9dccc0c306b50789d53e83044936107daa1f84ea44251d8ef1bbcc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/sv-SE/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/sv-SE/firefox-111.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "c9328ac05170f9d2de8228e7396f567f873514b9402d8e3e54dfec8b6dd17bf5"; + sha256 = "caa1b01d79d99ba970a8dc2bc1e6ac8a8213a3bbc4aa90357cfbedb3a715ab90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/szl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/szl/firefox-111.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "2272695f8f355115c8e98e9c7d08bf875736dd32df3287a5a876dc48da942342"; + sha256 = "440bafb42b2ec3d884cd16941e05002fcb02dd026087f138c38636834c408342"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ta/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ta/firefox-111.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "32a7ffbf1e08cffdc7a2dda2ca80c3e4760eda205a15870168c628d0b4991757"; + sha256 = "8d71745bcfd45edf58dc37d1dd624a5151725d332e393826485626e14d0b7d2f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/te/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/te/firefox-111.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "de8e18e7722184f95ba294fd0b425a341a2d91956a7e20ff06664485b8dafd35"; + sha256 = "c1ab0e55c0d8bf854558250f644582fa48dc28cc5cd9276d4ce7a13fb1231ab1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/th/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/th/firefox-111.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "cebb719fc885dd17c9d1d66abc8760647b53b27e8d478ebab33f8983a83f644d"; + sha256 = "82dbd5a6984419d1e912bd9d79bd7bfee178cf6029277b49cf766b23ba0476a7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/tl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/tl/firefox-111.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "08fc5f815505c637625f9b74786347dd439dec29e658df5a66c003ad0f86b4a4"; + sha256 = "312f1a7f80158f929cb7d953529ade1a415ad1d890024445fc64861478b8e07d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/tr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/tr/firefox-111.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d581cbae7f241af8a186b6cb18f3410c6eaba6eb45142ea1ae1441aee41f242f"; + sha256 = "e20cbce0d4e26a8584330c9b1176783acc9b060118b980cd0a527bc03b5bdeca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/trs/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/trs/firefox-111.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "b4b65c806e520a0a330dffc95a3ce2a6cd66dee21c51e1920c4206bd6c536f55"; + sha256 = "0a4a71d39c3530fbc5582637514f2638e8ba18148654f85c84b29e3d40d5d386"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/uk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/uk/firefox-111.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "f892034091072a6d5f2a188231ddf1916d07043d23e5f939c0f49b7cac5507e5"; + sha256 = "b83b8a0d8f1e0c5f56103c927e87d6d75b2710c141e38b04c29c07dba4994d6f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/ur/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/ur/firefox-111.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "2694b8f790584bb95c922193fdb427d7734d451a24ebd8317ce95e042bc69e6a"; + sha256 = "87c09a71bd3ea30b4ae9c4f7ddf403bbf2739f8012411ab0ae9470ed57ea9ff6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/uz/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/uz/firefox-111.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e5e6fa9a717b11c8b0058920509f04b6192cd4cd4e3d0ebbcfb333425f2ea712"; + sha256 = "20da141cec9223c21403701179e7953a90ce78853287238f98d72b302dfb4b85"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/vi/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/vi/firefox-111.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "988d9b206b1429fb3702ad90839c5744b81d517578ae73a289f63ad64caf8528"; + sha256 = "62238b0170466e28d618bc5b77034e9debfa56722a334eeb94dbc4915f7465e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/xh/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/xh/firefox-111.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "b441faabb6cb56d8c95217ab04e9c01d56beefd6f93782354d5d6f1cf9883f87"; + sha256 = "43c3b26c5d3869910daeae378386bf2db9082d4b4c2234b057b6a5098f387f91"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/zh-CN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/zh-CN/firefox-111.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "bae64efd20a0d663646cda2622c9eb2a7202cfd5d889456f4b5d050c21e57940"; + sha256 = "3437f410734870f2debb1560c435c1f8f8c6856f25947575404744e8e81a0e4f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-x86_64/zh-TW/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-x86_64/zh-TW/firefox-111.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "118b3fc9452d3cd11b3808b554561a29802922f22cb9484f45ad7717234623bb"; + sha256 = "804de772fd007aa9327f3271f78f44c4f0589258edbf091d994a9a37e9f12dcf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ach/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ach/firefox-111.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "26f7fd835de5984a40baac0811cd4a5953b302d3f2432032b0e5ba6b60d914e8"; + sha256 = "cc0592a1a93c09e61d7e4cf3b02d83d9d629163d3be6ff0ab84c614764a01adc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/af/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/af/firefox-111.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "bfe3928a795da58b373a13e0f586e6f845193c85bc124a1d6b53cb6e42b2255c"; + sha256 = "b6f8fd79fbc2f6f69213a603097baa3d21875052eee5c6a58cd5c28429eec74f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/an/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/an/firefox-111.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "264e9cbe27578446119afa5b6ad393fa63f61404a0e2045101979674e4f129c6"; + sha256 = "d3b38d8b5e76f5ed89934d6b07255e394371c47e4adaa2878386d8458f2093b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ar/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ar/firefox-111.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e15f110344582c732182d17615975825ad1abd67a0b65dbf6fd5f2aa1869ce5b"; + sha256 = "db513dd13874625b440f580a01faf76a04044fbb275c298329151db69992ea2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ast/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ast/firefox-111.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "71d88036fd99b8407a10572035ee69f1aad922a96899ee8a6ff82fb87e561474"; + sha256 = "eb7b6b37507d81eb5e593911a224b59b194297c5eb35b1d2abbf3e5d42bd340c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/az/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/az/firefox-111.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "8ee11b4f3b9f705497ba4e8cf91f9a97afbb37f7bed9e84e832af7e617c65f3f"; + sha256 = "610c52d1b951716ebd296e9d6149c9a47bb2080f81aa5a6c5b2cefa827477ac0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/be/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/be/firefox-111.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "fe3c0070de7156dfed3bd8d83c2a7932edd8e917ecd525784206c740da0360b8"; + sha256 = "8640e059847b22cdde3c9010ac99da1803d6cf914360860ee4de1999b2e518cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/bg/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/bg/firefox-111.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "8ca7a4c913b560ed79596f2013eb94b8a3a0ba6fe264175f19066d92b890c42e"; + sha256 = "48f7705d3ea308746d0f84ccdebabfd0a2f4f9a29dfec70377f25d990dedc7ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/bn/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/bn/firefox-111.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "4e99ade8b0c5c9387103cf1a252d4b198a48d8611e50cf5f9d295c1df550dd1e"; + sha256 = "981596b4573b7d8fdcd0bcf5fefbe78fa0ef2042400bed905242cd4d3db66cdb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/br/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/br/firefox-111.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "09d02313cc51b119ebac24db153638431f62ab1d49ce9ae3e9c1e72d457016fb"; + sha256 = "2cc8253034247002cea8713ce7f6a367aff752e015df2199168aa9675a5cd207"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/bs/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/bs/firefox-111.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "3d6faba008adb139cc3c260faead8555d38ca1ce59f4f4b900b6d3edeb185827"; + sha256 = "e5e5ba20a264ad19533e74f2fc261729a9c0daba889ce8c9935f65b38dbf1b4e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ca-valencia/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ca-valencia/firefox-111.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "9203b546400fc902c856eb9d0e9ca6cc5dc0fd937f5afd6110f5d86f5ca59f1a"; + sha256 = "ba3c38118de6973649cebb8ad12ed1f373d5417191a22c3f912e2fd2c295cf74"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ca/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ca/firefox-111.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "8b153a22185fa8bf3910d077e2baa2221c5b813b299949db2eef1530c6d6a7bc"; + sha256 = "acf63847c815d4668e105ffaa7cf296b54d314302ec35e3b6d743c129a06e487"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/cak/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/cak/firefox-111.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "335bc9e0d6fa9136019d7140d342040a59055af9d3276c0dd101aefadbfdc557"; + sha256 = "6447926a0db5e176252efbe1bed5e765fa72092e95603df54dcaa9aa303fdfeb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/cs/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/cs/firefox-111.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5dcdc99962152ab687eb91c1e94b516b6572bd8dc0bc65ba5edb63e17e27f2df"; + sha256 = "a142e681421675b53a1a839a6f24a62dcf9ca31b7ede9bb849e38f4f5a9b9c74"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/cy/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/cy/firefox-111.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "875d60739f3b52f79107f87069df8d0fa2a2fe369fe55b2db606b894329457a9"; + sha256 = "bf5bf19df4edaf68da1332c41c97f5605f4de36ae721c2ec4bd12675ee013b4a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/da/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/da/firefox-111.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "99c92de7946b369c144d9a1a830749406e1896fe103eda023b8615f02eb27c5d"; + sha256 = "585c4063feec1179f240252c1904f6e61ea70bb421254d108e5771a5b86fef18"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/de/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/de/firefox-111.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "d9c83d5cf21d6f1f3dfbac933b08284d222ca9dce6ee7f0dbe7edc3bec484f5b"; + sha256 = "a11d1d3ffc768c85c3ac6a7b7757560dbc44a9f206f0c7f97edc74c4c391d06b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/dsb/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/dsb/firefox-111.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "bd3adfa6b436ff003029c5f636d71e9ec6efd9d3f12884d496e18fc49d0f749a"; + sha256 = "83bfb2f657311646df9cd42c3ca7b25a9d72db8b76befc2a69786dae33a3dcf3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/el/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/el/firefox-111.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "2d58bf194720337581ef39d9304dd25c76d868c559188b483e5b7bcccff594fd"; + sha256 = "a41c08d523d155046653d428aea6bee17bbfc50ecffa72a6fd2dbc988d594d51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/en-CA/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/en-CA/firefox-111.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "46e49ee6bc243047cbfc6caed78ac7229ce1c25f3454d773b001ab53b70ddf25"; + sha256 = "5e5f0fabffd0bc09b47c0e6707717c6fa4d1169831d98dc3b1aefae791845208"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/en-GB/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/en-GB/firefox-111.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "ed4727ebf052500046bfd0bab3194322715e26b346e3becc1bbc35d6b5cc32f6"; + sha256 = "5595d2f62405cfc38c1e2f9396f42540a483915ec8029ca53f41053d6283f82a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/en-US/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/en-US/firefox-111.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "9f198ea55c49042b411e0dad2e14deed9a83f49139338baed49105238ebc0cf8"; + sha256 = "1c22effc418f1ee60d0cef4f3ebaf2a9c36da85042cee02ccc98d767d78b1306"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/eo/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/eo/firefox-111.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "8c940f0f4d47bd4bcaa06274c882bdb9ab079927c32e40e121edb14d629c80c2"; + sha256 = "1d40421e514e17482b2bd192e8adc74a2746135ad0d3ec030c1ec251c954b982"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/es-AR/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/es-AR/firefox-111.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "2252094fef1422b9ed6d184898c1bcbeafd6b80401d03a052a4ddfbaee8cb0d1"; + sha256 = "bbc37bc6f1e0a743525f1106a2a4162b065d93403a8189f99862e8cea7ae2fc5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/es-CL/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/es-CL/firefox-111.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "61d5d2884cbf7e95dfb642eaab6ff89b51b04c51378e665b45f4bdaed41b9d70"; + sha256 = "0dbb5a2058a3cbf0909ee2394cb593eda3e290439c086b69288efffa84ab6dbc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/es-ES/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/es-ES/firefox-111.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e6babf0af3a058112125b6f576cc089f08e7d93562728c65199a5888413d99ba"; + sha256 = "9227330d8647cb165775f23c0b2b14ef254cf14551ec0ac7734599dd525aafb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/es-MX/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/es-MX/firefox-111.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "c6f51f853aba37d03a3ec86ae8897485571d3f1cfd70fe0c571c68e601631fed"; + sha256 = "1659aab100b94e28db451b3b56dddc76475c2ac1e53baf768df78083afbf20ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/et/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/et/firefox-111.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b5d2ae763e2b504fe9a5179087571dc38d859b66548ccb4bbdd9cede046c650a"; + sha256 = "245ae592f77b7065a120580e9f95c61c01019ce7c0338bd1a92fa13a0a2f8f19"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/eu/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/eu/firefox-111.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "9f61c73b8eb62d64317f28e21e0d9afe638e91193137ed1253ebea0f21ef492d"; + sha256 = "2f6266635f5259d63b2ea59cc825e58ed84f6fa3f336378fd826ee6aec3f7e52"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/fa/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/fa/firefox-111.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "f1907dcaecef5f91467bf483fca9c35d22511fe873deb08885e7155f79340a48"; + sha256 = "8c1b84563fc3ba29c588ee75f5bdbd0569c9a44cccf80e994cd2120af23a768e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ff/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ff/firefox-111.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "74e1fd6a903afd7c80e779f7c4beea9fc14b7f439ecade22fa13aeff00867457"; + sha256 = "8d5e55cad6d93767c08f0b8e1b6b0e730643822d961b4be573b18fd693226d51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/fi/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/fi/firefox-111.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "86e8148af4544ad449e68b89e684b9ed7ea988fb2ffba3e7e1973e6431a96210"; + sha256 = "7e15c2b0fd26b0a86259528a0be427c86a5ebc5815c22823030d027dfcf8c32a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/fr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/fr/firefox-111.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "b91d34fa10d4f5a2415d823a04197042108a6b61c881148995831554cc40019d"; + sha256 = "26559303acce00f7baa88cd1be2d232aea8b21225ed7a7c828809510c2d5cd45"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/fy-NL/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/fur/firefox-111.0b6.tar.bz2"; + locale = "fur"; + arch = "linux-i686"; + sha256 = "2e80ac7c9b1b63e7f45695e81c61fc7a1893d1121f576d61a9bf4d932ce973ea"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/fy-NL/firefox-111.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "c78946f87c910f940b837611e681c718732afe43e801093e49f4fd573a09534b"; + sha256 = "ac9cce1dd985eb6f57af9e9c24e8d685777f50e95a76b4f9bd6810804eef2c55"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ga-IE/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ga-IE/firefox-111.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b804ea25d35a9e5c85e32e7ff282313b0da74e892d7f1c3dcb771cb8a7099a32"; + sha256 = "856125d0e3a2f173bc9582c266f102d6536982192fb8ee236ce91b2b8c36710c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/gd/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/gd/firefox-111.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "7937b23dd5fa96f029e2044ed43eacaa8ac8a709c89edb1f978fd2fdb87b7d93"; + sha256 = "461c838e5b3822ddb9d2d6c554d9ec56bbbaef0a01e935e63b87499e9a140615"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/gl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/gl/firefox-111.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6c4455ced369da61a3182e2ef28fc6d3364e5da6c7a694463bf122e488522b4f"; + sha256 = "800da758f85822c265f4154089f0cb5cc33706ebd6215fc927ed4a1a0303ae81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/gn/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/gn/firefox-111.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "ef3c41617b962333bdc85bf3e3c5c6b798bf8b87dc42c0b3a7fc8efd03baa6e7"; + sha256 = "76eef892b853205c9657c7f428993b1e9c31e15b417ba11cb9ed5ac117bc40a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/gu-IN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/gu-IN/firefox-111.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "ff25c34e72cd93436c0a6c82a48cc1c7bf7c0885e46ea3b75c246536a932c981"; + sha256 = "ce7105246b34f4d58d42aa474648249e5417abf79b4bf71ecbcd1a04e6f15203"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/he/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/he/firefox-111.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "6a216279106adb13ddf196a7bc7e05c61e8984f82ab811fe465abd7cf0af2ad9"; + sha256 = "973037041ae440e3cedecd740079741ca3ef28ca57a9d6ca6adbdfbe77f59ea4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hi-IN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/hi-IN/firefox-111.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "778dd4a7a0f589368dd618fc2d4c7513a97fa209347d30e4f53f54862b52e35f"; + sha256 = "c430d14bff26fee1e1e38fd1892316d2fa70ca82c5f5031c710dee23ceea7ea5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/hr/firefox-111.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "3b5e213b6dd09f9b1b1cfb6fccc57a60f9ac6bcdeb45286964afa3b11ef58ce8"; + sha256 = "dbd5114205347c96ada2397d413dcd152ca4dbe50c1a4969e1e5ca9560d1e199"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hsb/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/hsb/firefox-111.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "e49fb0f6487ef29d7848a185316908f28678650d17146af852382a7315687462"; + sha256 = "9c7c650697f4ad5fb5143b78c4070959a03da11d7ecb8a5aee5269893437299c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hu/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/hu/firefox-111.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "7dfe91a7c668f58aedc8a42b4988ecc6f3d37d3e8a152c6ab6c79f994e4c4944"; + sha256 = "6725cab5997bfdcc618370d58d8f0445998d4e7db56891c768bbb2fb86cf3956"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/hy-AM/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/hy-AM/firefox-111.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "613100fd8c421975fc1abf3a0e08ebf973c0e1af167a98274293b776a5a7fd6c"; + sha256 = "5486dda2bd14885336a57534330520402e046968eb262d8affb18e2d222f7573"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ia/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ia/firefox-111.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "6f38ac594c8fd12372e7db61f3ea5937b84ab39fa2ee30212d9748af4c260194"; + sha256 = "73021b42678989df0b2525d80cb852546ac550d42de20300bd5e35d735ff3929"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/id/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/id/firefox-111.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "fbdb547f865b873b3eac4069a4992b4b7b4ce6c3ce5202f50462c45870ebae25"; + sha256 = "da324b07488ae557a258bf8c4340ce78309f3bf13fe2ace98163ee04b83673d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/is/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/is/firefox-111.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "20eede127ff7c6ccf5905f8c1b7dbad4a1a6921465ef9a20f17dcb1b11f31013"; + sha256 = "b89b53f9879588c37f7b4720c91ade14fc8b08fc37e3754036edc02c066ddf54"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/it/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/it/firefox-111.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "f4cdf1e8a584ea7bf36ba7f4e9455fc603a44ada003630f31030d2248f599ed6"; + sha256 = "2bc7859eaa028eaa7099a92f12b5ec492252717960d3de1fb4ca78424d5da3c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ja/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ja/firefox-111.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9365b6cda1c107cda840c254b4e0be1eea113e1ba0a7310c81a9c1e4ac720b59"; + sha256 = "06ca63f5e6ce74feb421159ea20d378ef6a8e96e78ef090aba3e61d584d10b0c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ka/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ka/firefox-111.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "20a350dc82e3aa8dddcb08374a5f114dd50bac7c6179b9f1e2e1192edda756fe"; + sha256 = "b2db2a1d19b6134fc5c0d1dbd32d9c0e3576bf636a9dc88d24729f8b437bd117"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/kab/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/kab/firefox-111.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c2a7b9b1153fe0f06d619f291b8810f8fe6a18f8e38ba261ae7cbad30419f866"; + sha256 = "24363282e96614d4c2466fd71a318a69059949fdd9700e5edccb417b1d9c8144"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/kk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/kk/firefox-111.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f01ce34e338c1eef4316724b9c219907152e0d866aefc05d3ca7a17687f065b9"; + sha256 = "9104db786b41ebcc8ef305c77f87c8c3a622e7dcfe6442880d219f675d5162bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/km/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/km/firefox-111.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "5324ef86098f6560f26c7623d15cd6fda4232bbabe5bce4c49121e502eb58cc5"; + sha256 = "254d1baf50fd9ef66d0a871fa90a270dc0790694ced5583d9f554c7b2340768b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/kn/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/kn/firefox-111.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "f4912e59d13c357daa5ebf6b97069c2888cb20a4873e98939aac3a1f44c6ae16"; + sha256 = "76d8e13f6034014e6ab0666faa197c2fb561f7435b6bf2a5e0586fd922c3b136"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ko/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ko/firefox-111.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "1478a5a23115ee17de5f00ea86e3b5ddefbfbb6727460155cf0dda414d2171b2"; + sha256 = "98268e5399a66006b0e28f95cfcb0fecb51329e48bb11bf2d98a3c4b6345eda5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/lij/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/lij/firefox-111.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "95878f7c9e74b22cf7ea68878ca2e289c31dc44d711e510564a2c1c0ea8e3784"; + sha256 = "866e7095b9585c411881fd36fdfde2e8b375f14f7d57de9c84b5b4294b7379c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/lt/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/lt/firefox-111.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f65214a0493764ec597572ff4985d9df7a71000a33d048777c1ea7b990f84902"; + sha256 = "add6c3b62d8ce003b628dc665233fec7659483ea7506d8d7c08df73468aaa171"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/lv/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/lv/firefox-111.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "429a92b27a4c5d86c7466bdc383fba97ded97220ff30420497867ab1083d7d29"; + sha256 = "08b81972d6d1f5db1e52eb2ff923bd8fd6f37654cfb17f9db85b81d5433b920c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/mk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/mk/firefox-111.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6cbbcc0ad8f7df2e433c7c5723cf4470c3dde25bad61db319feea04985a28f00"; + sha256 = "7a0b191e649f8188630f4eed27ff447c47379efff5499ba6e81c89a84fbce238"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/mr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/mr/firefox-111.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "00e78268a3130629a49c79be6f35493418b8ba5e0a14e45f194c6be6282eda1c"; + sha256 = "61a81bf0b03a65c64e8c3dc2c123fa105e9884273a3da5889a1020742810a126"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ms/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ms/firefox-111.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e1df53a27e4364c3f4c537a96e9e94a648bc9cf5fbce958a53a943d62f33967d"; + sha256 = "f875b9a324ff37e2a013b3bd99c62a5399f3bb6d3c91168584cc659b4738e864"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/my/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/my/firefox-111.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "f1231e62c3ed74684496d8db44810a5444ee632fdffb0d4c80253449194a35ca"; + sha256 = "873d367a690abc8ba470d92d695fb45704009014bdd5177079df551f6ba3ffdd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/nb-NO/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/nb-NO/firefox-111.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4e13da7c18494f325918c86aab947a97dcc9dba3fb4fc33c49c8e608a0c6de41"; + sha256 = "ab03b377984f1c293439539349d0a9d5ace131c4947b70c28cb27cd473eef9d3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ne-NP/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ne-NP/firefox-111.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "294aaa8041e0936ff098089c377f2df4506a4a28bfcdc494f78fc377f457c145"; + sha256 = "7831c3e07973cb44b7d8452040feaf7f5e36de39c5b1ccc6a2543b73e4f31000"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/nl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/nl/firefox-111.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "02dbb54651a0cb71803984b210bd18575b959d27cb669a2cb50a3c0b3df6c259"; + sha256 = "9d73a2a81983f2b55e240520e928bf9f1672846898550986a328841176156e46"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/nn-NO/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/nn-NO/firefox-111.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "68f072244742c48a8a4ee3e5b473b30a40e6bda1a9cb56351ca0f1d50b323120"; + sha256 = "b1a908878115fe602212ce14b7f2b5db5fb3629134ad9b66fd5502169d05502d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/oc/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/oc/firefox-111.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "e3ce7d08716d48669bbe10edd2b8c7089888d9c830fd301bd0f4d8c51298db85"; + sha256 = "f3f3829a2c291ff4ed30265fdd32a75388e288505c3433711d8c3386d4181bc5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/pa-IN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/pa-IN/firefox-111.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "fbbe7aa90a13fe8ebfcaaa28d2860e32d8c9615c9ebda3edca516b0096993b06"; + sha256 = "a09a72b0c47b691b78716150ee7219b7f64a6c2359dacd122bd020550ebe1fc0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/pl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/pl/firefox-111.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "6a628f50313c1ece6121b3cc291fb82599f0cdd21505db8942dac9df9a3e03d9"; + sha256 = "77ff06b63ab9a92e0f3d3649491cb16e0227509860aefb026798b08644ac36a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/pt-BR/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/pt-BR/firefox-111.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "598913c0a04f7fccf94a28a8bd93ff7de55878b8c17c4157be2e9fbe0b1e6605"; + sha256 = "7b5f6f0e171cf9ff0c476154388ea4f4386e0590eaca597e0f40a7cf6bf76f5f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/pt-PT/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/pt-PT/firefox-111.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "8efa1fedf51bb6013e3865f6f2607f137c783c540b3e21a78a5a5706f2e60fb3"; + sha256 = "dfe82a1301acfdc2cb10d12965e2055a7452114860d05afd50455c95d788feaa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/rm/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/rm/firefox-111.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "49b8163f40ee7be5feac33d06520ee3e3ec9a346099eee5d9f87a4d9f46335ca"; + sha256 = "08eb21e55b897c53feef910b884feae0bb507cb8f961a47fca311e56c2aa9e08"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ro/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ro/firefox-111.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "196c42630e0da49d4f29c7c5b50bc8cd59d26690fa9bb492f0b187fa41998d18"; + sha256 = "07aeac3acf174b117478af10f06d8d3c4a453ba9b2b244a4829c869e0d7b6c67"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ru/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ru/firefox-111.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "fad3db3181124aa604547b2e4ec2322f6777b8076a83dc40c51a405ade162eb9"; + sha256 = "e555e083ea108eb66fcefa41058ff0fd6afc1b4fde2ed507045aaa0a015e64a2"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sc/firefox-111.0b6.tar.bz2"; + locale = "sc"; + arch = "linux-i686"; + sha256 = "1a407fb487c6d8f87f0fc6105bed0e0f3ee30e239b05e5b0407e3fa20d7483df"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sco/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sco/firefox-111.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "c7f0825a39bc1745940f85d9f372a83f510dde41d0a1a751c6d8d21136c47e23"; + sha256 = "5f7430a9b3ca0039dc93deb9a7f1e4cf1b2c3361584637b13834274d943095ae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/si/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/si/firefox-111.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "fda14e47f8152999bf16d3089efea7bbcbc76de01f6f040a95e154ece3763940"; + sha256 = "bcf927095c6ff70ef74f9cb1eeddcc74192dfe6b14c58aa1039991b24f835cc7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sk/firefox-111.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7f4182ba5331880955d62103e5fc1aa39b31b59403de94851c5a9b19be940b8f"; + sha256 = "24f1f1256bb28bdd0e4fcd88d9e6699dba8dbca203eb0526770e4111ec292c51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sl/firefox-111.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "92fc2a31da871010c757efa47e2b6d02516d6a7725e19f06a91379dc95575d69"; + sha256 = "c0fa38495df722a0bcdb486b0a7b339a9c96d882d33dca78961fcde02305ef5d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/son/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/son/firefox-111.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "d4e5627ce9ba22726722e7f3f0b74fd33e36cdfaef47d0d32ca8de29efd01a5e"; + sha256 = "e81863dc6202eae255326e900d90e68fd534e959da8a42e8384cd789425e18dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sq/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sq/firefox-111.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "bc2bd9e3a379778fa86cfa360ab2d61582dd1a05418ce38e65153969071e4a00"; + sha256 = "1d1da4eabd23111fcf9e114d89a5d10c7a1a31dc59a51a0f2404c72a2404b7eb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sr/firefox-111.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "5e9da54d468b2e28b7027be3106449d3c40908a438e90926f71db5f7c33eddf9"; + sha256 = "3b6b42e62602fedb1f2d247830ebd2ff3c2d5d2f9e57448958874097e6ae050b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/sv-SE/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/sv-SE/firefox-111.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "1775502f9436ba19919c2842e368c4dd3e153beed73c95dae630d954948a2808"; + sha256 = "2f222d4ca19c55cffe9eecba8241ac9b8e82ce2e3b967b94cb0257597a4e2e76"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/szl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/szl/firefox-111.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "e7ca52cf7bbce1b8f44e9a75aa3f90e69549807675ab4a0ee14cc0e39e5c9fb8"; + sha256 = "5eec7d31cdd6e4af3aa55ce362a0add47d2710c31797ae8ee913498bd70690ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ta/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ta/firefox-111.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "c9aaed5d80d601a682d9333bc065705f03e9cd16857890284f3028c921a19d1c"; + sha256 = "a20d5928bdcf61db47ebb0ef87d7931bb93cafe006aea7ac21b4605775e0e4d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/te/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/te/firefox-111.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "5d23b2ef116c84a498a5df6ab8c5367d950de698f16af592a4fe57894329481a"; + sha256 = "e2ce41c3a9d17cb09add1c1865706c32ca759d38ec812ab902c1216ca20be207"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/th/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/th/firefox-111.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "58ba6486512c2d5504e9e1b0deb15a75922dd12ddef9207e5313ada949b14014"; + sha256 = "cedc49181da6aef9ba2cb15c182765a0f95d8bcd3d9801366f4a9cd4f78d1bb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/tl/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/tl/firefox-111.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "5bda9db0b83da8d38aa47411714445a3c4c1d39c82a71a10035dc83a7f8462cc"; + sha256 = "db68656eaed16609962bbd4ed8136db81f550e96e2b0aeac55674d1de58fd20c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/tr/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/tr/firefox-111.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "fb17e91526bd4aee9f646352861a2d08a07c16db36f50e0a06bb236901990a17"; + sha256 = "1e35e69f2fe162de0d45adfb66403b9c71f4df9715bd9510299fa719b0b139cc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/trs/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/trs/firefox-111.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "853f318e84a5c9b9fb8d67c30ca4c7f3ce9c3fb6250d13aefd69e1873926e8d3"; + sha256 = "80787de8668a5f9942c340f757b87704ed52140ca6509fd743e8ddf0ba5c4fe1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/uk/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/uk/firefox-111.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "801ea66692410438c30178b609f432ac59322668e890718f0be9a1c127f6b885"; + sha256 = "b8d55172c4faf291b9d9a3af8ee02f47fa6d19a8b7bd335387005977e98eafa8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/ur/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/ur/firefox-111.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "4083fd7d3d30c5d7684fdffc5387d2d0aa202db418f8340e3bdb717b1fa99585"; + sha256 = "644286a0d8374580973ce154af28a4cd951ccc10a10745c93bcc15a2c262e717"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/uz/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/uz/firefox-111.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "94d2658cb0f05f4e47d5aa99a98550617e7ba11c5c17de11d8038d8527faaed9"; + sha256 = "475353fc6b49fb9d1c49e9e426dca565c873d9259cb06a41ef2d5c10b8723c5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/vi/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/vi/firefox-111.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "cdd6fdec6c904148d9a7928fd5206fac05111acb5981298cdbeb49c83f774d89"; + sha256 = "653b40dc5b26b3461ef870b8aee13baf21ac80f93ae7a84f0643b57e2396ada8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/xh/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/xh/firefox-111.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "a4d5f861d320453ccb77144d28d0e18c425b1570609ac986f1a8ef1884d1ec3b"; + sha256 = "997abd4257f3fa096f5c58d942ef3e80df6659ca2d805c6aa339a42582cb2548"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/zh-CN/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/zh-CN/firefox-111.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "beff59117070337fa0a86b1871bb9a563a009ffbf02f805bae2af87f15c24119"; + sha256 = "4f1faf36434d8e05eb1b051f093838ed25ee0ce33d4cf80f3e476125346ece00"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b4/linux-i686/zh-TW/firefox-110.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b6/linux-i686/zh-TW/firefox-111.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "b6775bdeb79f400781dde1773ec008cc7b2f1696006facf5498b2c0c440392a9"; + sha256 = "3b44f459506d34dc47e0636e758add6df20283c717af386b24ab6776525d7eeb"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 5996ef9363fa7..74c92744434e2 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "109.0"; + version = "110.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ach/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ach/firefox-110.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "062f6070782a197d5509b8bc046db13f72260eb45f78a3a33b166c29af2c6438"; + sha256 = "c72ce8417550e30d74ce76385e5261f55f3c1ae62c334e728d16ca75e8a8412f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/af/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/af/firefox-110.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "56fb07597494f85547b279e65222263d103ac2bc78901c3722c59f12d769c47c"; + sha256 = "3bffb9826cbc942c7ca42c09941dd38f5b52200a7f55203a333275e017debd44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/an/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/an/firefox-110.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "ad460c6b6b64401562359f6ac7664dae5c87bc51ff5b5f9db95b117ec41b77d2"; + sha256 = "7f25dcb3f0a4adbfabfd445ce08845925ff349c01f4afe3f79a259c6d9eae9cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ar/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ar/firefox-110.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bdc967b1d2da7e49f0313710a2062a62ffd14a0e3ab8613049909c9a07a3980a"; + sha256 = "41314e2e91927f9489e51607266beac834c844e364ab959673dc4ab21f40c490"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ast/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ast/firefox-110.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b44fe9c2a93d68fd6a20e9f6000eb81635d9bcf78b0f97c526e3e7f216b2e249"; + sha256 = "164934479c770e028dcddbe73396085d216b31d9b3001de76210e3c82f836921"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/az/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/az/firefox-110.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "d9f78c078b1d34928ed6c18a3c0413c6f079979545a381e001a851cc792f75fb"; + sha256 = "2cab918f71127f01a1256f0d5bcaefc14c468cdffa212a9af3f9341d77737ba9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/be/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/be/firefox-110.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "87f5fa2f8560d9f68d8d4d77d16fb3bfb20287c87769065625cd319941cede8f"; + sha256 = "70b301bba2286c9cf9393b62f1e6fd7a9a5958c69ad0070c91928b1ad428f9a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bg/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/bg/firefox-110.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "106d7c1fa3d37b16eaff03503e03dac0bc503d56ce49fc3718417ca3bfe1ab85"; + sha256 = "f1b4d07e3e983fa80216845a9c236a57c0b8cca2d3a343d16d5cd44c38059381"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/bn/firefox-110.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "bc9be31ae2e0c36417df8c86d85f69e22c17ea1b193b214f75137de31fef6aee"; + sha256 = "c5363c0d810c34e4669742b114b1c95c62e5ee9f89158a0e37d2a30d8bfa02c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/br/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/br/firefox-110.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "664fff02c73dd60df2c49ebdc4cdea3a09e999f956dcaef502561dc33f6b4ac2"; + sha256 = "21fef420a858a6e2f3cbe145a274d2660dd59a486dda5fbfd8dc2da1bcd6b6bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/bs/firefox-110.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "547a8e9b82c014ac7098a1eda0900cd3725f5fb185d66ba2beceda1d97e79fa8"; + sha256 = "93ac6bd8c45004f0a6768df878b3274d42ac6124e4fa4abf3fd851a360d7c5b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ca-valencia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ca-valencia/firefox-110.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "b995776faa868cd21b1dd7c8bc2e8e6f17a7c9f032c63c3c259b967d3192ea4c"; + sha256 = "fdff415877cb7a38f293bed3a876cfeff083eccf50408afded0288276a097758"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ca/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ca/firefox-110.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4adbf820fb10f4982294840549ce98e87ec2d65e5b2c693e6d05c0c330167d8b"; + sha256 = "1504757a058e3a634fe633a5fc768bb4240ad15949d6769408fe0bff71a5c17f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cak/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/cak/firefox-110.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b6d11e53a0163e23e3d6519d411b63476cb4cba693df7b41214ca60c813bc575"; + sha256 = "8e791f14a2191c48a0ae92773f8653ab90f54faecbbf81dabc065e608f92a511"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/cs/firefox-110.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4163fb90255d52d860c17f72f7787642c6ff054c169aa6f2e9c6293e0cde109f"; + sha256 = "dd6aa73a0770070b26e9ff9a27f0aa2579b32cfd195f0d65b728c92f63a4c559"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cy/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/cy/firefox-110.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "dac9739e42d38bbca3627591aa2bfbc6655dcc2347a6696d96f040362f56fe68"; + sha256 = "896b82fe251ab1471f4bc9f5c37f1651a9bd38cfb994b03f34a984b46a2fc29c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/da/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/da/firefox-110.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "793ad841ed9da31087e42363878af022fff237a6281a711736a70e732b588de4"; + sha256 = "1a402341c4d8247af3197cd566e07eb367cb7016c85f49e96be0228e22d1a65f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/de/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/de/firefox-110.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "e408d6f72760e031122fec82f3d8dc21b622128650f1fc8ff811c3c696e3c48e"; + sha256 = "94b9783c4b13ee4eab1e8abab2a534582b01463d6661df0d9a56d29448910a10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/dsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/dsb/firefox-110.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "ed4e02c2c324ed25cac1d6cc654d62b5b22670be82dbb3e415783af0e7a7feec"; + sha256 = "a1444709346d8383c512ab3143d4e41fb73cda71cf37aa61ad996f6ba2d074b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/el/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/el/firefox-110.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "3396a7d6d938cc7793bc876e313dd6f57c60042f93883f7bd3bbd79ef97e7e3f"; + sha256 = "d317b8a632f0d2c085d11458744301664d2b0e4d386df9194b7f6ab3b4c7ed24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-CA/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/en-CA/firefox-110.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "40eb2e205a353daec0e0f07f12633c2aba09cee6372e8e3ed78cceed96611cba"; + sha256 = "3d955a100439458b7a668062d75cb79bc0e9543cf51f21fa4c5690865e19ee85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-GB/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/en-GB/firefox-110.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "947b937d27c138ebf79377f17ac9cb5fe89bb59abe123a45ca1c050d13e439ee"; + sha256 = "14debdcb282b095b127d1575c6b205a925ffd08ec0e1980146d51afb037391fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-US/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/en-US/firefox-110.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f19775cc6adecc529003ba0239bd46e94ca70a866f19b071a367905184f6d4f2"; + sha256 = "3b3b615829a5adfaa9c9d7cbad4f1460e317650c73d2efa54823bfe99fa0f7e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/eo/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/eo/firefox-110.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "6a868b2c8d4d544d69c8d3544927b2ed5f478d14d38f00854ef7d7fe3c1b29b0"; + sha256 = "93dd3e6467dfa466138b92e2890bd95d253d780092e9cde155ce93fa4901f4b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-AR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/es-AR/firefox-110.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "81d80d069e36f108191f1072392b438ea5eca11205b9a50d6fb1d2f550c569cf"; + sha256 = "aa7c81d1420dae03592d75d68f7d3d761cd1d2e34e55ab20ad08f4a94229935f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-CL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/es-CL/firefox-110.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "57e2647d0d3b5e3e7b593a0cbb260b1927475cb7ec1f401b0f39e772aaf76570"; + sha256 = "dae84fc91b87bd08f19a33ba0c398c33e54b9c0d64cd77ee3c37500e5e5b9f8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-ES/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/es-ES/firefox-110.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6958018e306b9d64a2f23db4f2ff9cb111123573e6bdcacb8789221dee7e269e"; + sha256 = "55deec771fbb3a6e8653250a2d578df7bee9cf20ad3dd326ddd7833627917f7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-MX/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/es-MX/firefox-110.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "bc69b78e261368d51034daee9d374e38241e228102889710b59af48afe0c9aec"; + sha256 = "ba20aadf9c0137a3832466d3de9183685d37c25bc13de3fc64ee9407ddb92226"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/et/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/et/firefox-110.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "7746ef524a271ed1095c1352b4da1edfc65a66a7f14fb164d90771fd5622d1d5"; + sha256 = "9c58581144a916ae7dcfac8f621a9e406d1a889d007e13ca7f32e969a8da6a4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/eu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/eu/firefox-110.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "321e106491e39a0cbb9f0221a11db8cca1792d3f6135fc52766dc7e4a1adc243"; + sha256 = "39b91be1655603dbf4034766319b0224b20f198f66a6fe43c3ff98c438336f12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fa/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/fa/firefox-110.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "23adbcfc211c0c16a23c5cbd89e0d42845c566a5c3736e82d2a5ff67ac0b6e11"; + sha256 = "3819f09ab89abfc79a8ae4a9d676f778e19f3cfc120d839e8ccd1ef6ece49373"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ff/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ff/firefox-110.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "3c7205f0be5a6018c7fd80bab737233d3c73f9013f2cfe819f4ef9633a264c7d"; + sha256 = "653ecdea0b79d7d489328cea7412dd669d9b25b896746d4a60a9415364923d87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/fi/firefox-110.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "11ce6ca3943c70c8d4f66fc600ad0fa16486739894c5e0621b660067daf06f25"; + sha256 = "10fd36e7667d50cc5ba894e1fdc3ac56162740b29a4534e548ef4a4e1f310ecc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/fr/firefox-110.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "3f39b2aa077f059c63901f530d54bea442dec7ad28cecda60571f9266b48e63a"; + sha256 = "ddfae62fa495609806dca19019fa238a0598509f9655bfc0a8c93d182f15da59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fy-NL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/fy-NL/firefox-110.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "9240fcf0840dc078a9076082dabb46bc16ff02e37de948e9176b6301b4b95bb3"; + sha256 = "1f7caf327e63404450d46ab22500020038db953a0465b5b79773e43220329085"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ga-IE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ga-IE/firefox-110.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "92e6e5a5b1635aedf7be819e0ff31746e9b3b18ea1f7c37dc149f78d806c466b"; + sha256 = "3384a63147182c194e695d806220aa32af8061425ecb37a02fbd7e492110a355"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gd/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/gd/firefox-110.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ff0607125dc57c5c5dffd89dfadfda99ac9a4274c4db2fd69f99bdf238bdef12"; + sha256 = "33bb81bf197174ed0adb11de55b48ca9d14babdcebe95f18cc2b80a3946e1f8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/gl/firefox-110.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b1555fe9a0fd4fd9cf0d492628f88390bed5e1f97ef7debd8ef9fbd934bb2e48"; + sha256 = "a4a0f1b2dec71806eb3e7ad6ba4512453e7c2525996ead9ca60e5394850933fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/gn/firefox-110.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "61cf8d06dc696fff4d2702c9e051e2b6139b74befe8531320898112e6791e350"; + sha256 = "42da1455925d9f4159e418f3af8c4ec6ff339a9b0fdc25de2d88df4b54509efa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gu-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/gu-IN/firefox-110.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3d81bfc292238dd2f47562f97f5712520d3d48dee7a87f97214015920885c44c"; + sha256 = "3f18fecd672dd5c06b2a2513686e07bfc9e52f063b5a00a42dbe984bfdb88069"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/he/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/he/firefox-110.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "f7f8650b94144ac7aca761df3f89f817b58f514f711c42c4d4f56b7a5ab0f028"; + sha256 = "312892d542a391d9bd0b25895ee4db021f0178925972e9a5a5c453d42587dcd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hi-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hi-IN/firefox-110.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "67d8a5d54a07a27d0929d2a1f71780b7d80c44bb5e0ff6e5ffb05f10f112d5f0"; + sha256 = "bc1a49fe3a05d92108757072532fb557bd0e9947ff7c01f57cad8f01a06503b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hr/firefox-110.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "856bcf27f0c2b0c01b91898624836a24fc649e8dea105c3d3d86da14d18a9f68"; + sha256 = "3d8ce1cbb3ebf2ca895f970ee1be35b8c02b177cf9cb7f2493e40666080c6ea5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hsb/firefox-110.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3843d0d353d7514af25c16509584ecc317233d69b02ce542961797143ef92417"; + sha256 = "4e99600d501be843252a7a1f494b7f1c70d4ce464ce04a0a4fe7ece35629bbd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hu/firefox-110.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0e3b6e9849ff77d992868f02fddc44f88da5c15025ffa060a77eec6cf9fe9224"; + sha256 = "bb6367b61be3cc6db54e004f01582a1ff20277dc34eb79a5a5cae38aa84b0ab6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hy-AM/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/hy-AM/firefox-110.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "5b506130d90add811cfd56f8fee26348aac2d6f93a2807a47126afc5472628b3"; + sha256 = "086e6a14870ac92b5b31b61afb8797d5ff3cfa42ed0d70efe7c8950a1a3ee4a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ia/firefox-110.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "98859afffcbdc36a712fd6cb8cbd4bc12e9b61948fd5b4cee719656973326f42"; + sha256 = "46cfd327083006a11f2d483a6dc8bb1cd70cce447b4e0cbe400bd2c0bbe96590"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/id/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/id/firefox-110.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "98b6fe2329be9c4fc275980672f31ae9d61483d7e2ef850856ebd3fc6e90fa10"; + sha256 = "32f23f73a9e531bc477f853c897641b3539dc39e53d5a718bc89a955ff7f9791"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/is/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/is/firefox-110.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "0f699d8558b08864174fa7aaf5beb0ad01cda7362b9cc86594283ef9ca4b0138"; + sha256 = "7b9f2dabf39e68da0e7027d177bd717f5d59f7567b5c3ad77803a32273bf1b7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/it/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/it/firefox-110.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "2c113a10dd45abd677a7abb2b1c64a574d19845c71761e65d44870ae2f593c5c"; + sha256 = "f1a54314f7ffc8ba0371fe2f1f4b178e748a32928f056a36b24757d4faaaf858"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ja/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ja/firefox-110.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a6d1ee0307afbf5fcb6f0ec0c899a2ea1ba67cf548f98c2d508d54c72a88e7d5"; + sha256 = "2fa4839150382a59f80e72ae9939c41a5ec5be262be2816bf1986e644e326603"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ka/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ka/firefox-110.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "7edbcda348b7d51378320d7681d591930cd963c00fcc2b80c22e4902cb30787c"; + sha256 = "453f380f21f68665138c2d45cf5aac474a20aad2739d81b58ebffa54069422f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kab/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/kab/firefox-110.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "74aada0320298c54f607b3096a607fffc8aa7de0015b353cffc1e3b27582c4cc"; + sha256 = "6521279e7a1a6c1b0dfa40cc16a32318fe1321593493b5c3360aeccc0d3d317b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/kk/firefox-110.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4188205963323b35fc89ba17e0fccefe3df50810d7954201a973262f303f5ce2"; + sha256 = "f2230f6e952f55ab1ee9883a9310ac64280b28d9602b09a5a09837c5b7507230"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/km/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/km/firefox-110.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f1a92901fb0c7835ef9112f53f4109b6b82dbd0a571fcf021e791a12f38f6a93"; + sha256 = "1c7d9fbd2bf87cf33655b6fb52615f4014e1737cd130fd71bd669357774693c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/kn/firefox-110.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "47a348c1e5590ba65773fc586d95516c108eebd44a597875a76a4b8d32a4e075"; + sha256 = "e591b6c5bc5235551379bcc99b2ac24a85a9d4da5c10a6561fe3812ade7f6f77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ko/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ko/firefox-110.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "ec61b0e9f07146b797a7f224fb83a1e50751b875be0331dade5386eb916fd3ef"; + sha256 = "8b72677509748f44c45b176005545d5f601c4bde2259134fd7049c864b772005"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lij/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/lij/firefox-110.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2652857e6007ddbb127aeed33fe6a4bdba8ed44888aafe764b81e8e150511bc3"; + sha256 = "796a16bd6443b729e0158d6b628e03a92b144f742d4d4fdb0bb1410a31a6fcb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lt/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/lt/firefox-110.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9163745ad65e5be8d030eae894c6f9d27960abe6203649f3f18add16cbd298a9"; + sha256 = "83cb607213879da84e38930b4f1cb24f9cdc89819a4d88bd47521d8833afe9f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lv/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/lv/firefox-110.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "87ab351a62968471dd16fa4949f0e8fe269223ae03511c03e99b4abe03d6df72"; + sha256 = "0498de6084df452c66f05f3171d42628f41da08772646cc99c32e8672697f3b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/mk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/mk/firefox-110.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "533a3f586cc7c4ca38d4fc8c88c16b9595d859e8d3972387677b55cee603aec1"; + sha256 = "0d876b466dec448a88b5b500ce1ff8cbc644e914ea9fe90f1e3dc06a97a403f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/mr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/mr/firefox-110.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "298f5d07eea30a8dfa5e16b08151c459f72e24a0c17d6a2f8baa842483a78ee6"; + sha256 = "cbee1c85c3c01b9fc6a7a919ccc6c8dbd3dd0e895e4db6031df55d6ac32af9bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ms/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ms/firefox-110.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "07802a9e8c4d9ca8e2a83eecf29979d1c3123ba5f0c280017d0030696477e605"; + sha256 = "3623b41cb35d37c1e197e67d86952b4a16a3d272559fe4e3ff369573fad8b44f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/my/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/my/firefox-110.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "077ad784cbcd2a3663e4c614deaf921d66681ec5b21d5c5e759fb074de17b259"; + sha256 = "26d6639caae14b3232a04984d43e5625e421c022c374380edff1048cd86d5af1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nb-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/nb-NO/firefox-110.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "51d7c62bef495e4ff9e6261fd15001539a104041716d4a97f3195ecae479b233"; + sha256 = "26e90b20bc065c55a18575b48fa1259b6389070de5d0d858820d8db8b95f2afa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ne-NP/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ne-NP/firefox-110.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "2fcb5b5b2c7deaa17ec65878243345fcebb26b38b8d267ee3881f366829f86da"; + sha256 = "4723431192b87bd47b3a2af545b106fce88025a16e9035307fde91215d21d161"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/nl/firefox-110.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4412f358192301406602aecf7341e64ae1e4909b4a0e80701fd73c0a561ba092"; + sha256 = "f0b6bb64108c1166655cafbe152100305b24717d5c197cdef9b9dc18bac40fcc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nn-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/nn-NO/firefox-110.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "8116120da4d557d412100fe5029cc338073f5070d90cdb3e0f9b49242f66c668"; + sha256 = "bfdf81ec059be8e95434c4fa50882fa8be785bd6fcb7af5c33b864bfaf0adbb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/oc/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/oc/firefox-110.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "6e4115e51ec23a42ccb7f6f10caac0040d72d4448141cac68ae8f24b1ad90504"; + sha256 = "7c1361df3ce4c84340d3561d931d1e567599a65f97022b33dc83af2c9db17c62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pa-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/pa-IN/firefox-110.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "640c20ccdeded7f2a25ea0ab72214a4b6f4aa2d937de24853886653684d26b8f"; + sha256 = "0917326d1b70fd5cf3b759f1374eda0d69d538f92fd571df06df4075341dc633"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/pl/firefox-110.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9ac0462dbb62901a5678bda5360b417a56bbe74003e912323ed1a29661cff1b1"; + sha256 = "d754df80e43a6d00309c867e3b926e173ae895d652ee629d6646cb4481531190"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pt-BR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/pt-BR/firefox-110.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "593fbf46826fb0726b25cf1469129d7c3db274e2137966e49c904ee27109e0bd"; + sha256 = "d06263b565d014ee2d71c00fe4b4a4d020efc47a2a8d6dc9687b983e19b8752f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pt-PT/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/pt-PT/firefox-110.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "b96d176444864c0a4814936fa5b0d67fee05739339a5ac01d76735bcee9aeb92"; + sha256 = "72c66f0db72dc4e631a9d9a56e5b4e2d03779326deb501ee42011199148a52e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/rm/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/rm/firefox-110.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "93d375449f6f70b4043790cc66377559d85c5c6039570701e8435cbc76038e72"; + sha256 = "a1e5e8f6d47aa06e9c1d9f55a014a9a117658fed802302d3d9baada236f2807e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ro/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ro/firefox-110.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "fd032aed6dcf2afee5185c68e4661077b12fff708ce47147b8b297886525fb9d"; + sha256 = "977766174f16b7f1173f671d9ac3b13c49cd4a3ac4446796322c94e533148c09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ru/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ru/firefox-110.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "828c606c289b7ce94417626cdf114fed256a0cb247b3f06c46152db777324805"; + sha256 = "c592b9ebf9158496d7c53f010c30934b05f6c24c8ab975bde5cd982e40131666"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sco/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sco/firefox-110.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "0a400cefa3363f357c53ede79d9538fe01ee03b1e6d1a6c9ae67b3ad32207ca7"; + sha256 = "c44f03fb44368f2084ee4fa19b16fb2e2c886ed8289888fbc0a8ac81ae157e2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/si/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/si/firefox-110.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "e414f9004ee3ea08c7f7b39817188fe3e3dec51b2cc258b2a8ea28cf273097e3"; + sha256 = "fc7af71d586bcd77b9773d8d945deb0a8c461d0d244d3a9117c4d6a9eb16748f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sk/firefox-110.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "97da979bde015cf37c7eb45c78e3abdcf7ca7d92b56c322982d8574c1652b9f9"; + sha256 = "f6ca007bf45d7dfd671fd5de3b161da2dd664552d78734024700fc54b396450d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sl/firefox-110.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "016347c5c91e3ff2ceb53782121d8cefa2913464b3876d351cba418bdfe2b30b"; + sha256 = "f79577182cdb35fce6089a54c3773369400d611466dab19355ff52bf705f1053"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/son/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/son/firefox-110.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7a82c207a3ad9b1a23e3885d94c7844714a59e74ca8441894da6e3873184cc46"; + sha256 = "221a3f12335129f3bbb8674b723041154b144b00f752680dd8f1ebc98c2a37f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sq/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sq/firefox-110.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e89444502f35cba552f7ba907fe2ab0aefc9e32cfc9f1d1c826242b131c0a1df"; + sha256 = "86a093a33be1a5f626455012a43c4a50632bbc6ec990a114979da7f3baa38e10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sr/firefox-110.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0d6ac85cd35ee3dff23a7f0d1b973acda106516ef81d6b6e1fc7b6065a61c03e"; + sha256 = "38f947d02fc34c94dcd6cedd38cbfde231ec1131a5dd6faeb34abccd960f1570"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sv-SE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/sv-SE/firefox-110.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "617d72496a921013702ac3a72c6fbedb8fcb1da2a07f674c7ecfe984816fd783"; + sha256 = "707c1ee6d11af079ba860ad86f1f2b54a78c70442e9588d3d2ad807271914bea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/szl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/szl/firefox-110.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "44bb46f6e244f9ea94458ad84dd37545f4d5ddf3b1d7c345e61f256a1a9c8a6a"; + sha256 = "991af9e776cbffdcfd88b4e2ff30660af04a16a0bdedc747d2d95bdf81162267"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ta/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ta/firefox-110.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7a36826a160d9de16d87a18dcbd7ac8106dca32d584d79a3eb8c0ba93a06c345"; + sha256 = "b59fb2732574a1c44047ae8258597585661229dd2222fb53a485d3a219170cf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/te/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/te/firefox-110.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "34fd96347fa0ccda294a2194a4da6f570fe04f3afb19f99369c150273be59fa0"; + sha256 = "9d9266c5a8c2988d7db74677e4d921d26c6b38445580be6caf6baad95ab1fe6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/th/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/th/firefox-110.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "13e4cb908566d2a0a928df5832f704e4f5d9159bf187b919de05e2ef7dbab6ea"; + sha256 = "6392a911799bed85022b659d14cfefc9a28d10fcad968316a888a11d78ef7e00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/tl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/tl/firefox-110.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "67c3fa7c129d81b16ebbbe422361406f63160f5eb0a896237bc2f2b0b2f314aa"; + sha256 = "cac97ac6f2f6eec124219479fca50a0cd9730a3fd6d501285f4a03b1d4f2a9d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/tr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/tr/firefox-110.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bba8a0982c65fec9dfc86bc8103b01f5a120c199bcb22ecf904106c270686d40"; + sha256 = "19874a19ed49e6320ca5f65a9ac9f30352abb0c417b6d637548e48ba4e4c67f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/trs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/trs/firefox-110.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "452654c105453ff942cbb5a893b411d494fe51cd96a08aaf7a034b12859dfdd3"; + sha256 = "15a541c0b28a8af82ce1b736798850016ccf830fcdf3ccb80198e929613c39e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/uk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/uk/firefox-110.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8f4f152b50df0a968fcaf0d9275b5dcf05efa98133133797874cbdeef1fb6b48"; + sha256 = "4afda83040c0353244f55d3e3a498680a1d2b96cc36b97d2b96097d29a87ce1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ur/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/ur/firefox-110.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "152ae600ea8afc8314eef375436eca52045f0db788ba19142f07f330a4a13445"; + sha256 = "ea702e1ed8c412631b5c2e8996bead1a11eb54d865eb1891a7e5346d332c5af0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/uz/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/uz/firefox-110.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ad7863d60cd8cbdb5eba0eed7d982db15e92a426ea2e403cb002c71b14cf540a"; + sha256 = "6173fe2d74b1b5f776a8d1fad92b8a629888a7e7a267d49a9296a4728f46c456"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/vi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/vi/firefox-110.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "32cee9d8f484735a3bad323b2a37fb2fc55dad88a4a493eef777473b56aff922"; + sha256 = "88eaa69fea116db05aa2adf3e0b89b2f5707bd83373f7fcbc72f758ca293a0ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/xh/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/xh/firefox-110.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "00a6d3877213685e35d175df3684b3024a3e0fbc7b284b1cff8ea25a1ee4cb00"; + sha256 = "8869898fa3895eaf2749b414a518f2e281e813771505c1715b077c155ef7c6c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/zh-CN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/zh-CN/firefox-110.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "75241d745d714ee885d73c802900be3606d236aa08683b4ec56887b918555a2a"; + sha256 = "c400f7deba6435524ec1857da4c8824de621270060441721e4d63bb4152c414f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/zh-TW/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-x86_64/zh-TW/firefox-110.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c0ecc79ebb0a989ee976f5c2c9fba5c4d63bf65706635663e2cb83667f7b8a38"; + sha256 = "3d0153abdbe3ff6e6a63d748ebad7974c869b8b862719aa141b5ab3527e7dd85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ach/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ach/firefox-110.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "319dcfcd2957576f02bfd28a192daf0ce87bea110c782890c4f1c7dec05d591e"; + sha256 = "a497c0580b1b85875528ec193d2a784c264b27bb0f386b95b491d12ef6793dc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/af/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/af/firefox-110.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "14214ec48f3aef6381b3a55827d589505236fd9120df43486a39775aaaeba43d"; + sha256 = "4c4ef321fb862c8ed35ae41e3d9997f304059bfda060b1d6cafb4a5cb9d3844f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/an/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/an/firefox-110.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5694505371af1b4589abc4038f7cefe2650b9eb78ef546db83f886ef3ccd6a77"; + sha256 = "3af27b88ac940b664df13283d34a02d8f673a6474642a1c1665af249d6249c19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ar/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ar/firefox-110.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ad21038b033aa55b7c520712f4aab50471deecc681454c7a1cc97f7604444878"; + sha256 = "cd533794dd488430858c800f81adc2d0ca11b6c9c882d6b00eea77cf65d59818"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ast/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ast/firefox-110.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "7f7ea232c8249535b4f1a4f0443627f115740a39755c43e3b296da494c1705ef"; + sha256 = "94859669edd14bf395d298872ab4aa6e75d763c893304c1e97908baa8f84cbc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/az/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/az/firefox-110.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "a37020472cd15d7ecff01ab0a732d26557a3ee665465c54f1e6d623a213f3685"; + sha256 = "5f97dece71f45eea49b09f67d86e42f8a32e4c46f2e6028a3f9570fd976458e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/be/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/be/firefox-110.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "dd7b9fd2d267b503171d3894c238db5cbbbb003bcde623700abd8ce0d81fb8a7"; + sha256 = "c0d5aee80966ba91f56c9d4c5378ff8dcb49ecf1f39734a892aff19d48d1f618"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bg/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/bg/firefox-110.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "c4de3366f58998129beb1def4283fb28bc3b90464a090e3f71198862a8b4af7c"; + sha256 = "427ed2a9c099cad19730f749fadd78a875f36e90e21967664db0d0d78791d821"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/bn/firefox-110.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "30e97ca633178bdd4ef10103c5b7795b0f7f5bc97cd3b3d4e2fd01138ad79fb0"; + sha256 = "b447ceb654fd80ac6f02ec6100d9b05a8e4db3b88ccce18dd73b568f4a8a79bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/br/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/br/firefox-110.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f4ed775564c26f45ec26fa7d1b440b30cca17849f144031929cbe1526f7c630b"; + sha256 = "97c29e25546631441e8e91f5101ebe6b38580baba951ab0cadefef6da100121f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/bs/firefox-110.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "d568367dfa066d2b5eb7ab920fd16f0a66de02468cc548df8883baab27ba4e5c"; + sha256 = "80515bddf58da59418d3cb4c815deb27a32db94d29087ffa2abafcde0d8cb697"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ca-valencia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ca-valencia/firefox-110.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b33df0c70b943f857df218064db9f20ca21381f1217322dbfe4e6fd4f2902d95"; + sha256 = "c72c6c12bdbdbf438565e417dac62ce2fbbd10a69218d63f424a8241186e1277"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ca/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ca/firefox-110.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "78b1e2ed95ac41994e35e94d3df2a61306e24268be86c587f6a7cadb5c62b65e"; + sha256 = "42829bdbf409d8e96c1feae1283fc81d892a8c8c6b7ec9a22eceeceed9c75f60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cak/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/cak/firefox-110.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "2b9210305ad57917402d0a1eabfb188b70f582c44fbc67b84d09d1c23e18988a"; + sha256 = "e304b4f56407efedc4ba830f8a8baa4ecdf1ca597c85be6cf03ef7208a420c63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/cs/firefox-110.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9e4ce61151c0ca0610c83d734bb619d4dce26d40efcf6efb54e42d467a5ae2f1"; + sha256 = "1d8c649087ddb30988b8efaf94d12f287ae6670ea67c3e5602414ed296d01b5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cy/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/cy/firefox-110.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "5cb9864ef458ef304b7a6b40ad71d8131f1ff3c3a215cfeca4e811e14b362927"; + sha256 = "3594d93aa8b4cea7ee5783a2ac7c8d2d19a2b7a75a8f10b5e647564583e4af85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/da/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/da/firefox-110.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "0e6ea695300e68b8b6385e6a5e4022e645133ea1205c7d902ce898d59c913cc9"; + sha256 = "e5358082beb94c367025047503ed28e6fc9daa51b581613e680af561fecb3e71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/de/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/de/firefox-110.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "8ff84702ee8f877d9628d96d828e51e7e9cd333307df8ddb2bbf58d5d8805b78"; + sha256 = "c57baa7af49f8b07b9fe3cb74d3e6110d217c1f0c3fc8c061a7ca6259bd0db85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/dsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/dsb/firefox-110.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "efe721496f5d5567d7ac62d19b0510814c20b6e503c15c1740d50e7fb1a41d44"; + sha256 = "4bd06a4df2243e392c0f9ed7976c38b85ee9cb413e50cafaebdcf48008a1b7c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/el/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/el/firefox-110.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "95a87e1447dccf05fbab815dcebeaa213501a81c8dca244a2f63a1da300cc22a"; + sha256 = "0e322fcf17bc6abd90c135237c199ce9a6979954df947d07fdc926a90e0f751d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-CA/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/en-CA/firefox-110.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a1d3e2f468c8c0776151a7776d6201e39beb37ff845825b1a031b2cf1a04a0da"; + sha256 = "8b4770349802e264d61b228f64db1d2c4200ddde513b6e88277e14c4dce3a5c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-GB/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/en-GB/firefox-110.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "0952eb1ac27fa387678f1d9f6e64a718462652d823bd630ccb1ef39f26369270"; + sha256 = "f36879cb02a912b6b7023a55474a99edc1cbcaa3174c02a23f5c861d91945c25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-US/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/en-US/firefox-110.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "793fbbb013c18956806e9e5d1f67de94a649c3cd8d10b3a75bd388b87ddae916"; + sha256 = "b9c800d918231e74e6ddcf6f5ebf54e94440f03ede36221b061de65e9a7ef1f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/eo/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/eo/firefox-110.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "0cbe5fa5f994171a57ac84a4edb9d63adec71bb13709256c99e2b259458eadbc"; + sha256 = "93a77d6696d8825e1a16eec1c757f7b35434976980dab488ddde7096e3b19efd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-AR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/es-AR/firefox-110.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e6b717709cf8cc3a5dab27b0c1b9082f6d71da77faabeb13248574790a42e1fa"; + sha256 = "cb41a835bf688d08ca346e6bdc12549d63741acc87e2c3d7fc9f11fbaf8f9c32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-CL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/es-CL/firefox-110.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "e2c6016a7e50035e8478fb0eadedd67801f0ded948171fc13586ac46d49bc914"; + sha256 = "622933f73c63dd4da300677ca1aba7729b615ccaad3f820eb66ec5241ffbe4f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-ES/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/es-ES/firefox-110.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "2c41f6d48b07e054514aba80b3a396b70316f0fefff8c31301e5f44e3de74209"; + sha256 = "0659f2594b695a7be000d0b1901e50b58a9d561f57f0ae31ca4c4b3c374f8d3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-MX/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/es-MX/firefox-110.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b51ed9a76071d56cace6e7aece52efeeefa26dc26e1233fc0e2ad64317c9f4ad"; + sha256 = "ce894eae045e3b09c9c6dfa2754c5a03a6e737bc4a3b54a78d48226cd5376048"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/et/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/et/firefox-110.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "8094ece309d8c55bf9432425f2a79f29eee565f7d6dc8080986b088007cfdda5"; + sha256 = "dda98cfd2833dad0ce35be8bfdaa34facb3fe6a68117303f373b099fa65c2b95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/eu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/eu/firefox-110.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "07ed9c2af5a7e5ce0452e4fa4da38daf3d20f5f4f6f059dcfb4ac3b7ffc657b8"; + sha256 = "44c0a2d50e10d826617399abf3d036619576b2f5fa3e97b5443c38736cdaabe9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fa/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/fa/firefox-110.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "0dc870f5bcd2e3411fa6006aed8e2b295d99f6e47e7a3e4a88860d7001401b5a"; + sha256 = "f3e2b415e88ecc7f1b39652ea08d217a6450dbb8c7991ac2fc21012c6bf485fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ff/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ff/firefox-110.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "c319ac17fba19833d16c96f848e0a1e6ddf717922648a7d3776524dc94140b88"; + sha256 = "fa72b60e44b74aef447c491bc3d5691293765d6d29f0226b8cc703ad683924cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/fi/firefox-110.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "98e907dd0d23b45c5f8360e39642e9df062d6c89cb84dea1cd62f70dae2d4d62"; + sha256 = "be6cd6db910aed81fd5ee10f96ec9726b64dcc90301e747f2881acdf04693c21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/fr/firefox-110.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7b56c5b71df91ed86b10a66a30d24ae02ae84d75972ce367c288a27b171082b6"; + sha256 = "813fafbe4ff568297f58a2a6f98274681c643953ecc27266bb91cd83435eacfa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fy-NL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/fy-NL/firefox-110.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "5edaf14de80f9cdcceea8e2f291425a74f714bac482fd83d046ffab6e5ff4530"; + sha256 = "ceed0527d8176a1e04622e7a0d342890591619bb0907eff75f9eae6f8ca912d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ga-IE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ga-IE/firefox-110.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ea2815b2ed95be115252e25d0a1893a5d9f6865c16e7b8f0acdb6f05e9447f9d"; + sha256 = "26be4251150549246fe36db06dda749aa7f653086c8a3d789f296b638013b49b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gd/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/gd/firefox-110.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "c4da99ff08acd9f6af5975223f8fdc675fca53138b1dd089ce1e5d98641624a2"; + sha256 = "abf2fe88921b3b84390e1cb85e0e7dbd0bcfe4f9c3fa20ebf4dac0a3b673caba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/gl/firefox-110.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "e77e5c5e23dd7cfe8d6310b30c4a1e3302ce0d8e5a7ea332eacf5f8735107ff9"; + sha256 = "630ade818c30b683eb68a9da6b56b38f5463aa44ccb2cca0c2fd095a18e5ef32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/gn/firefox-110.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "97fec0c7a9caa8f598ee28b149e8010f39d649c7beffccaeab56757c0d4312d5"; + sha256 = "8765e1a9cb4d63d9488567e9b899576127e58635a2129f31511d00c776ac159e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gu-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/gu-IN/firefox-110.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "7d303a03ec303693f627604e3b419d949a8cf7f903ae813d18c2c5449d9480ac"; + sha256 = "29661684a641a49ad8eca9a2966cd8164ed81a13c17f8308f629730216a1a067"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/he/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/he/firefox-110.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "7f64f45a8654aaf4fd8b29f980b01d0746d205baf498734416667cee3ac3e70c"; + sha256 = "213c1c59fe3d12769e6cc059aae34e00f6427538e0995bba8bfae888ee18c967"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hi-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hi-IN/firefox-110.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "17446de5dbf9c6fdf7b7967f36c329ffeef97faa1fc4c2fdb64f932da30c759c"; + sha256 = "bab8dd86b381dcedfa0d2cf63415c978b89f2575fb2714de8b99057f4b74b9d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hr/firefox-110.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "2059f6e3a10f0bc2f1cff8179d294c75476dbe21b31c5830a7da933a7cd60bb7"; + sha256 = "ae3cd7d66386008e46c23d407e3bb4139161afb4bf7e502f75a13cb04a351ccd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hsb/firefox-110.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "273f47c51638cd3f7dbce9678b52e6a99fba46502bc56587a0eec1b1cbc858ff"; + sha256 = "6e5dd5938957ee83fbd44a2b2ef611a5fa721f310ae2ccee51ec2d58dff3c34d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hu/firefox-110.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "d00e86d775419bb5ac5e9016dd839d41dd8fc9ac73cbef71ac01e9f40b1fd752"; + sha256 = "6e3eda91a7fdecbcd7b0f3e26a08e76363c874349995c4d345fbcdb2ef1137a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hy-AM/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/hy-AM/firefox-110.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e8e877347b98c65294ab695f1074995aa54067b97ab655dcb794b66bff84b7df"; + sha256 = "85ef0cda129576fc12ff3a8ca33fc7ff2094d17ca61598d867118c95149d7b60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ia/firefox-110.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "0cdf2c81a5dc30155c67ae1decf3f36377e732f2a8b0529554241a16e9e7a125"; + sha256 = "1a20c3717c92654cbcd7991f4406c731ccfaac0e65abfbe57fa45e71b5de32b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/id/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/id/firefox-110.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "92604c3f8e4691bfde59cc9f2f22cb1828d0de5efd5ce58bd2e140016116cfb2"; + sha256 = "fc12f3ebed4f5d94cd5477aea7c55d163ea3dbbadfb32882c2ac16e3e756b2bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/is/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/is/firefox-110.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d4cd9389342f390786d4045dfff5e81d6a06cbc3d008c3d0e7fe38ad285111c6"; + sha256 = "3cbd23cdf2489e0675df0c01a35e989157a4643469c9807000a7ae8119f41d84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/it/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/it/firefox-110.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c8d102823192b2b4ebed1b587c87067738227392df6629f865f5294070018c45"; + sha256 = "9944036094f2fcfc6b48dee59c002df040e9d2a0dfe34287863ffc1e7cfee2c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ja/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ja/firefox-110.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e00c6bc9778d92618ed4349f8006667d249f2d621496a7002853ec51064c0b6c"; + sha256 = "37b65e4303424552276b17f132fba8856cab8c45a523946417a07585398266c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ka/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ka/firefox-110.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c0116995e70225b71ca02ace86a571944fe998a748ae6e0c628a2e2525c3d4a6"; + sha256 = "4c2124df9437ba640a31aee0aa24a7ce4e4e65b612784dfc38143ac017e391de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kab/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/kab/firefox-110.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c6c4a7a503ff8c136b7c0dff132b3ae63326aa8c4271dd85f8c10f09755d7c23"; + sha256 = "b6359d6ec95b88a9dfac977bce81dbc1ff2dcdb843ba668dd370169f73897d3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/kk/firefox-110.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "d5b185c6676eb01aa6c10e2b604d385cd2bab24ad19a8f561606b46cae1d90c5"; + sha256 = "258253a0de7ec38faf51bc89d941b96e4cf0cfb7d68a57b02e0da95032868fe0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/km/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/km/firefox-110.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "2e3565182881dab53c55af1f02f09fb77f2c60949f7a7c7fa5d43dd69f3d47b9"; + sha256 = "3ab3aaf86d3d6dda5b8ac5e9752a34505eb9952695c1725ba95f6653da9d0563"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/kn/firefox-110.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "696ad3222dd83d3e5f2351a6b062fde5e6f756403593a37396f95de5db3f6aa2"; + sha256 = "d0f13f2b126600635f2a5302bd4578db4d85cbfac4ff3d9321b2501d78525501"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ko/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ko/firefox-110.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "fe249e81f407cf7bfffd6bd13d828bfddb805a5ce06a0ee8ea7cb1e9273011cd"; + sha256 = "d7954ae5ea973112f82a59b3d0f6c35a1438b015eaecbd1a42c74c9728449dfb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lij/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/lij/firefox-110.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "a1f8cba2592421e82d4d5a13052d2f48bc3217d91d68cd7699182c40a42c49a4"; + sha256 = "0d0dbdc0ddbfcd2ca27d14926c43418b0f6e6b2b5ecfbdeadcab583188fb9626"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lt/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/lt/firefox-110.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "56810f8dcfaf802e9d93f23294d713fd867c48cfd9baf1400a93e0c9dbe09b6e"; + sha256 = "a7e90f262b1b5a4e73fcdc72d773d35d364f440ade826f6dff54f96a6fa0e5b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lv/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/lv/firefox-110.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "47d4b1517b101e62e4aa1e39da57ce53792e024fd0ea2ab06e06182cc83636ed"; + sha256 = "31208554497ba51184aff83c3b269418673199641fcaec355e11c6f39ac77355"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/mk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/mk/firefox-110.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "95644ffb52b917a82b5cfa3a15fa8540f310342fbf840aad367f7b7ba2eb2865"; + sha256 = "2f7ea63676a91811e56c8da29ce0db293b3d79a2cbe1cb1900f485cc952f78d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/mr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/mr/firefox-110.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "5dd79eef34d39d828e0bde386b0a7bc2e34ff65b6e2c84c19c50affd560be86f"; + sha256 = "d4c5b8e644e0d01806c33bef3f56bac5c7d9d7ca10fc89cdb7532d63cf09fb1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ms/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ms/firefox-110.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "1c34352dd995aa5593826ec6509a9a571fef56c7cc5492091037797a264c9079"; + sha256 = "e586b747712997f37e1084b1ab552455a7b7d8a5e236986ce497f076111864b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/my/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/my/firefox-110.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "b6a8f8c5ad88ecb6225f7f1a084d207773cf55cfad23ab75bda3b6de2e1a5b8a"; + sha256 = "4492749d9845e7d64257958b3f7be90e21bfaafdf47de0bde3026ee1c1a4397b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nb-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/nb-NO/firefox-110.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "2bf5f1181ee86090e75679a08e361556facf8c07b06501e8f3c6029798b3334c"; + sha256 = "512de585211758713b9017d999f1bd389c7e8f64791cbbbb8b77b0dec708cc2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ne-NP/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ne-NP/firefox-110.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "3021f8bf36270a7bc708ed790d628ea624daca8f0023d5abdfb5843b83b0573a"; + sha256 = "b1bbd534b48fcf82c68db58ac4d631206f9628b4885313eb2e41304f61133521"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/nl/firefox-110.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f1928dfca113a782f085890bf9dfafaa9baaef79ed8162ceccd6c90cf38990b7"; + sha256 = "890f5d8c186d70b7a74c706a22db62752d698eca7f8bb493b464a21878059685"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nn-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/nn-NO/firefox-110.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "fcc01179902449f16d6724179378d8d8c251fa4dabec4ca78506b750bf7a157f"; + sha256 = "4789bbc6d1f9d34e9f77f6f467012543b641c6551e3b905b67674888eb73f258"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/oc/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/oc/firefox-110.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "ad48b0b59681fcd32ec5d889c4ccd12c9015a446077baf18516b038d4267ca55"; + sha256 = "7a89251628584edded3b81577bac9de3784000bb2378fa9f33c86a5217472381"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pa-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/pa-IN/firefox-110.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "44e54441e9d082a44eb1b1e3a29d65d75658afbf3b4b04fbea427c4d621fb630"; + sha256 = "5c45e48fef737bd3d440bbd9473f663e86bc48fdf7e8f9e20f7b957e0effc03c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/pl/firefox-110.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "fbd8bef9474e6bff05cea3d434b48caacf24b7d74fb7289372cd0ce4d6b3455d"; + sha256 = "18328281d621f732e523e6b6b1c031c8f5cdcf2e5014410609a36a4ea2e816ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pt-BR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/pt-BR/firefox-110.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "dcb42a3248e7bdfd6de2325f0aa287e94f6a78705fb8d42d0b94213df4aafd7d"; + sha256 = "5c2b4415d07437df8c56bb21f745b07e9881bd735bf03eebf9f3d59b69451e41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pt-PT/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/pt-PT/firefox-110.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "95f41a8bd3c7954664fbb42a23d5f5022e36a853d2152ce268f32fb08bc25566"; + sha256 = "97c06bcc8d88e455a050944ee4da28e43c1462679819cfec8c6301e89b92d420"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/rm/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/rm/firefox-110.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "8164d8494080384dc4f78823b777e3d2b8a09b163d5e7847304b7edcf421b94b"; + sha256 = "986dabad36bc830580605acf550c5d80671307a55507edf570105d6a98a9b73b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ro/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ro/firefox-110.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "28269a8aa45459cb0774d1ec859bab026075bc7353f4363b4808c12dac731c35"; + sha256 = "e904d820874191c2f4bbcacdaba2db0265e56a7dc94c719956e916d6af109727"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ru/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ru/firefox-110.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c1f3f0fd7ad91593ed1ceb34d54225e3c1c16f57017c5a406bd1b91b6f9e321f"; + sha256 = "5a33442f83896abe9bfe09294fb4d649a50dd63f8504875ad1687efe2e45fa90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sco/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sco/firefox-110.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "9724c6631121e21d9488fcbaa4ae86ea521b5a61dbb0de2e26bf6af9a9b7c68b"; + sha256 = "ac0c1b81bc2f9943b18acc858a7d9130fa85894c3f4501c49261896da172bbaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/si/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/si/firefox-110.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "33ff8d8ffd16893f068772c98c115389b0a4286d390709495a811dcef01fb8a8"; + sha256 = "ffbb6c83e6c954a210326346b5149fd9ea119e61039c6ba723c1875e57126e21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sk/firefox-110.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "cc34d8293b7166eb96ab4d96cb9bba7e5aa7d4f15f04ddf2d34704c207f48949"; + sha256 = "e4ce32c3d815a986c3e9f2c6884bc921939cd1aeacc618e4c2fb8a6d056b99fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sl/firefox-110.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "1cec19b6eba4aad9aa75ea747bb750333b9a0f335adc125eeef95e5b6fa767be"; + sha256 = "3c368ef7fe1098ab0b92061018bc126a0ca729efcf8036ddcdf9f4f8f2ef9107"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/son/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/son/firefox-110.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "6b4765482ac58f176a52643df225df8b3458003e14a47cbf18cbb36c7e1f34f6"; + sha256 = "155991f47cf0cfee2845450c39d2904ab457e57f764dc72af1f7d719d8ab7321"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sq/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sq/firefox-110.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "817fc0345699467e3f4fb1fdbd850361c66ff5c82aaf93ea9a33d1075f72632b"; + sha256 = "34695ecb1e007a3b35c147b2b69d804a2475f9a57ee897dc5707a17990113b81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sr/firefox-110.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "708c949b5f1bb394b493b990bdf1da3cf9bfebcaa6aba549bcd5858b20e8c1f8"; + sha256 = "a40a83bca5981c89bddc9e8643dd200578cd9369bc840fd043b63b59cb0b53d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sv-SE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/sv-SE/firefox-110.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "39c2407ff8b0bc638ab884faa1f6d86bfe071fb143a63fb81229e5312142213b"; + sha256 = "df03c928121add9d788b981b47a48a4dfe4c81ac24d5eb5d8b79d30fd6e588a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/szl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/szl/firefox-110.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "15fd363256e36bdfab2bad4d1544c191d74a8d4d4a180c9a7d12b5e64a0f0d8f"; + sha256 = "c26f1897068d86b3e43a74000830c23286a4242c33514aa76140e6da45a1eedb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ta/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ta/firefox-110.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "548693e96ac123f33e12c3016dd7b0e7fbb9f3a403dab9682d4498a6d82a00ee"; + sha256 = "1cab202847e085f7b417e3a799fcfb1503d5bf58013c7ac775f919c4cfb65f4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/te/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/te/firefox-110.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e01a856488bf18c4d345db891909fe8813649f463bbf1171c2099de03556ba7a"; + sha256 = "e9bfefccb6684c96ec1e30eaf5975995cd41be87b90d36de1e8c03ccecd161d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/th/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/th/firefox-110.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "c2320b7f67f35778049023cbef382b208b68a0e18ab133fd806b4081a8c49a3a"; + sha256 = "88bfa631eccc7ddcb5de325fe581c0d6757e7e11022d525c1c7641064113c0de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/tl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/tl/firefox-110.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ca5fae50ed972e07a340fd575ff72fb6908e1cf5810e3302fe6de286f2354040"; + sha256 = "18dc381b87a5a9bacbb81fe9ada9d9a73eaed5831b651dd55744ba8414f6fe8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/tr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/tr/firefox-110.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b8d9d4c422db8378d3df478dace847e2ce9c7c7a9250fb9f7f10dc3890f33dba"; + sha256 = "44945fc8f6991017765c5646f572fb7df9ec36b54eab6515e04b835b25ed81eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/trs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/trs/firefox-110.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b40b8f0c453b6ac332b8869491fa201ef015aeac0d1675dd75e4cdffcb8c406c"; + sha256 = "20ba4a1b995d16e14f86f8c8a6c35c50b1634167872e3f2d742c0f950943da72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/uk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/uk/firefox-110.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d0fcdf9bc345bb37906805c123b9f262b14624cf19ff2f25714246d0330818cf"; + sha256 = "933bc001d37e9487a78e11d8eeaa778adc14848083759ce332a21928cf28e034"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ur/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/ur/firefox-110.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e5a34fc5bf63aa6e5ce478204dfd5f598b7ae1af64a52b9b07803b6ab49ece5c"; + sha256 = "3ada62bc4d49378d5d987cfabfdb6c43ed7e7a1f507f2f99ada27a1585479486"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/uz/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/uz/firefox-110.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "dfd51f2d04a3cd1686a7e07860c39d01fe351d8dca6a6952386fd453b8cbc08d"; + sha256 = "fcc2c6a1fccd58cf2a0e4492578f46fc98f57d187816e3c33c4575555b83923a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/vi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/vi/firefox-110.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "338973416fc1724a46ea35725620f0fab14a816914b6d5e1ab6da8cf3edd6733"; + sha256 = "38fd1714da803f7e771937381e0b91ca0bac263a22f9ec5d5680425833493f7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/xh/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/xh/firefox-110.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "8bdb1fb5e397edc1a66d74306cbaf3eb9ef6bdc547ee77543d9615438f6630a4"; + sha256 = "db3ab9606ae8d4bdd8ad741d42676f6aecc5d299c89ff4386543dcaa67e98822"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/zh-CN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/zh-CN/firefox-110.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9f9a94fd32c7ab92f2ccf149ee6f3422d159151b48451b245eebd5fcf46d1632"; + sha256 = "c443537f9d38ccdcc4d9b6ebfea0517aa7950b730a7ad069208baea5f6793e2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/zh-TW/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0/linux-i686/zh-TW/firefox-110.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "a0b5b5d3774fe3d2717271fdaac2fca1723e20340af4ee93e90e8fe32a8eb6a5"; + sha256 = "d71958a211006cf884e69f012ad7628919b23a706f747caaaa86ae6eec13f9ba"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index e5284c4097c9d..60d86d745f1fb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -1,5 +1,6 @@ { pname , channel +, lib , writeScript , xidel , coreutils @@ -46,7 +47,7 @@ in writeScript "update-${pname}" '' grep "^[0-9]" | \ sort --version-sort | \ grep -v "funnelcake" | \ - grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \ + grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${lib.optionalString (!isBeta) "grep -v \"b\" |"} \ tail -1` curl --silent -o $HOME/shasums "$url$version/SHA256SUMS" diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e8deb9fcd9cc7..948b321724894 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -471,6 +471,7 @@ buildStdenv.mkDerivation ({ separateDebugInfo = enableDebugSymbols; enableParallelBuilding = true; + # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; # tests were disabled in configureFlags @@ -524,7 +525,7 @@ buildStdenv.mkDerivation ({ fi # Extract the debug info. - header "separating debug info from $i (build ID $id)" + echo "separating debug info from $i (build ID $id)" mkdir -p "$dst/''${id:0:2}" $OBJCOPY --only-keep-debug "$i" "$dst/''${id:0:2}/''${id:2}.debug" diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index de0ac8eb7a1dc..97087ef1da30d 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = buildMozillaMach rec { pname = "firefox"; - version = "109.0"; + version = "110.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7"; + sha512 = "52a37a8f59a694c4790c0a14cd81fba9e2c982f64e00191afd0897c39ae1d5e25f24cff16f74d0a0b5cdf8e93a9a0974b6042b0de605cf1a533ef4e6a3c0dcf9"; }; meta = { @@ -29,11 +29,11 @@ rec { firefox-esr-102 = buildMozillaMach rec { pname = "firefox-esr-102"; - version = "102.7.0esr"; + version = "102.8.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2a9d212b5d15e1bf7a6156495126cbc9161d2057aeedea8f7a5a0670a19a9b00cf35044075935c8f3c788118856ba2cc00f9b297c5ac713f094857683f7cd13b"; + sha512 = "93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 378fe1f4039b0..6b89e4cd70000 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -15,6 +15,7 @@ , pciutils , sndio , libjack2 +, speechd }: ## configurability of the wrapper itself @@ -30,7 +31,7 @@ let (lib.toUpper (lib.substring 0 1 applicationName) + lib.substring 1 (-1) applicationName) , nameSuffix ? "" , icon ? applicationName - , wmClass ? null + , wmClass ? applicationName , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] , useGlvnd ? true @@ -60,7 +61,7 @@ let smartcardSupport = cfg.smartcardSupport or false; nativeMessagingHosts = - ([ ] + [ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBukubrow or false) bukubrow ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native @@ -69,7 +70,7 @@ let ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts - ); + ; libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg_5 @@ -82,6 +83,7 @@ let ++ lib.optional sndioSupport sndio ++ lib.optional jackSupport libjack2 ++ lib.optional smartcardSupport opensc + ++ lib.optional (cfg.speechSynthesisSupport or false) speechd ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk3 ]; @@ -96,7 +98,7 @@ let usesNixExtensions = nixExtensions != null; - nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []); + nameArray = builtins.map(a: a.name) (lib.optionals usesNixExtensions nixExtensions); requiresSigning = browser ? MOZ_REQUIRE_SIGNING -> toString browser.MOZ_REQUIRE_SIGNING != ""; @@ -112,7 +114,7 @@ let throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" else a - ) (if usesNixExtensions then nixExtensions else []); + ) (lib.optionals usesNixExtensions nixExtensions); enterprisePolicies = { @@ -166,10 +168,10 @@ let inherit pname version; desktopItem = makeDesktopItem ({ - name = applicationName; - exec = "${launcherName} %U"; + name = launcherName; + exec = "${launcherName} --name ${wmClass} %U"; inherit icon; - desktopName = "${desktopName}${nameSuffix}"; + inherit desktopName; startupNotify = true; startupWMClass = wmClass; terminal = false; @@ -401,7 +403,7 @@ let disallowedRequisites = [ stdenv.cc ]; meta = browser.meta // { - description = browser.meta.description; + inherit (browser.meta) description; hydraPlatforms = []; priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package }; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 01cd54cf8ee20..cd770b18b71a7 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups -, dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core +, dbus, gtk3, gtk4, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , libkrb5, libdrm, libglvnd, mesa , libxkbcommon, pipewire, wayland # ozone/wayland @@ -68,9 +68,9 @@ let libxkbcommon pipewire wayland ] ++ lib.optional pulseSupport libpulseaudio ++ lib.optional libvaSupport libva - ++ [ gtk3 ]; + ++ [ gtk3 gtk4 ]; - suffix = if channel != "stable" then "-" + channel else ""; + suffix = lib.optionalString (channel != "stable") "-${channel}"; crashpadHandlerBinary = if lib.versionAtLeast version "94" then "chrome_crashpad_handler" diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 1bba399997f46..da5f183867964 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,28 +10,25 @@ , nixosTests }: -let serenity = fetchFromGitHub { - owner = "SerenityOS"; - repo = "serenity"; - rev = "a0f3e2c9a2b82117aa7c1a3444ad0d31baa070d5"; - hash = "sha256-8Xde59ZfdkTD39mYSv0lfFjBHFDWTUwfozE+Q9Yq6C8="; -}; -in stdenv.mkDerivation { pname = "ladybird"; - version = "unstable-2022-09-29"; + version = "unstable-2023-01-17"; - # Remember to update `serenity` too! src = fetchFromGitHub { owner = "SerenityOS"; - repo = "ladybird"; - rev = "d69ad7332477de33bfd1963026e057d55c6f222d"; - hash = "sha256-XQj2Bohk8F6dGCAManOmmDP5b/SqEeZXZbLDYPfvi2E="; + repo = "serenity"; + rev = "45e85d20b64862df119f643f24e2d500c76c58f3"; + hash = "sha256-n2mLg9wNfdMGsJuGj+ukjto9qYjGOIz4cZjgvMGQUrY="; }; + sourceRoot = "source/Ladybird"; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace "MACOSX_BUNDLE TRUE" "MACOSX_BUNDLE FALSE" + # https://github.com/SerenityOS/serenity/issues/17062 + substituteInPlace main.cpp \ + --replace "./SQLServer/SQLServer" "$out/bin/SQLServer" ''; nativeBuildInputs = [ @@ -47,14 +44,15 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DSERENITY_SOURCE_DIR=${serenity}" # Disable network operations "-DENABLE_TIME_ZONE_DATABASE_DOWNLOAD=false" "-DENABLE_UNICODE_DATABASE_DOWNLOAD=false" ]; - # error: use of undeclared identifier 'aligned_alloc' - NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") [ + env.NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error" + ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") [ + # error: use of undeclared identifier 'aligned_alloc' "-include mm_malloc.h" "-Daligned_alloc=_mm_malloc" ]); diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 0a0eb47b0a192..b91e5b05b6256 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.14.2"; + version = "1.15.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-9onjQ7fRLlL5/1vMtNHjBBcB7Fyk1ERaHg5IwtwbJQg="; + hash = "sha256-NUgDaBRcgYGLKJhSJLT17VZj/mU0w6ySahIYnud5M6Y="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index fe510c7fb9d48..009569f9c5c3c 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "109.0-1", + "packageVersion": "110.0-1", "source": { - "rev": "109.0-1", - "sha256": "18nd0shx1r2y2gn42sa2jlckcymmnx3fkm4fp58c80gcppslh1fs" + "rev": "110.0-1", + "sha256": "1fs8z7b1ly3asmgqc4lnidf8k5apaimc875rqm7rqg360bc1qg2p" }, "firefox": { - "version": "109.0", - "sha512": "9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7" + "version": "110.0", + "sha512": "52a37a8f59a694c4790c0a14cd81fba9e2c982f64e00191afd0897c39ae1d5e25f24cff16f74d0a0b5cdf8e93a9a0974b6042b0de605cf1a533ef4e6a3c0dcf9" } } diff --git a/pkgs/applications/networking/browsers/netsurf/libcss.nix b/pkgs/applications/networking/browsers/netsurf/libcss.nix index 7777bb243fa62..db5a39f22856b 100644 --- a/pkgs/applications/networking/browsers/netsurf/libcss.nix +++ b/pkgs/applications/networking/browsers/netsurf/libcss.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - NIX_CFLAGS_COMPILE= [ "-Wno-error=implicit-fallthrough" "-Wno-error=maybe-uninitialized" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-fallthrough" "-Wno-error=maybe-uninitialized" ]; meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix index 318885bd27214..6a2918fa7d950 100644 --- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix +++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; meta = with lib; { homepage = "https://www.netsurf-browser.org/projects/${libname}/"; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 92afe2f4baa07..e4730e1869f81 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -41,27 +41,30 @@ , at-spi2-core , autoPatchelfHook , wrapGAppsHook +, qt5 +, proprietaryCodecs ? false +, vivaldi-ffmpeg-codecs }: let - mirror = "https://get.geo.opera.com/pub/opera/desktop"; - -in stdenv.mkDerivation rec { - +in +stdenv.mkDerivation rec { pname = "opera"; - version = "90.0.4480.84"; + version = "95.0.4635.37"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-GMcBTY3Ab8lYWv1IPdCeKPZwbY19NPHYmK7ATzvq0cg="; + hash = "sha256-NQv9EVaBPfHygr76neYGACuk8A6Oc1GXAgizMa+jngw="; }; - unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; + unpackPhase = "dpkg-deb -x $src ."; nativeBuildInputs = [ + dpkg autoPatchelfHook wrapGAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -115,16 +118,22 @@ in stdenv.mkDerivation rec { # "Illegal instruction (core dumped)" gtk3 gtk4 + ] ++ lib.optional proprietaryCodecs [ + vivaldi-ffmpeg-codecs ]; + dontWrapQtApps = true; + installPhase = '' - mkdir -p $out - cp -r . $out/ + mkdir -p $out/bin + cp -r usr $out + cp -r usr/share $out/share + ln -s $out/usr/bin/opera $out/bin/opera ''; meta = with lib; { homepage = "https://www.opera.com"; - description = "Web browser"; + description = "Faster, safer and smarter web browser"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix new file mode 100644 index 0000000000000..1f650a2fdd589 --- /dev/null +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -0,0 +1,183 @@ +{ stdenv +, lib +, fetchzip +, alsa-lib +, autoPatchelfHook +, copyDesktopItems +, dbus-glib +, ffmpeg +, gtk2-x11 +, withGTK3 ? true +, gtk3 +, libXt +, libpulseaudio +, makeDesktopItem +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "palemoon-bin"; + version = "32.0.1"; + + src = fetchzip { + urls = [ + "https://rm-eu.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" + "https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" + ]; + hash = if withGTK3 then + "sha256-CSAsZTMIeInuvN7mddiMDtzzNKuYST2zp1XczKAP1mQ=" + else + "sha256-bvdy4tqnuoUxVVz/8zp7VwfS3wH51eKCzXDqgDWMb3A="; + }; + + preferLocalBuild = true; + + strictDeps = true; + + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + wrapGAppsHook + ]; + + buildInputs = [ + alsa-lib + dbus-glib + gtk2-x11 + libXt + stdenv.cc.cc.lib + ] ++ lib.optionals withGTK3 [ + gtk3 + ]; + + desktopItems = [(makeDesktopItem rec { + name = pname; + desktopName = "Pale Moon Web Browser"; + comment = "Browse the World Wide Web"; + keywords = [ + "Internet" + "WWW" + "Browser" + "Web" + "Explorer" + ]; + exec = "palemoon %u"; + terminal = false; + type = "Application"; + icon = "palemoon"; + categories = [ + "Network" + "WebBrowser" + ]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/xml" + "application/rss+xml" + "application/rdf+xml" + "image/gif" + "image/jpeg" + "image/png" + "x-scheme-handler/http" + "x-scheme-handler/https" + "x-scheme-handler/ftp" + "x-scheme-handler/chrome" + "video/webm" + "application/x-xpinstall" + ]; + startupNotify = true; + startupWMClass = "Pale moon"; + extraConfig = { + X-MultipleArgs = "false"; + }; + actions = { + "NewTab" = { + name = "Open new tab"; + exec = "palemoon -new-tab https://start.palemoon.org"; + }; + "NewWindow" = { + name = "Open new window"; + exec = "palemoon -new-window"; + }; + "NewPrivateWindow" = { + name = "Open new private window"; + exec = "palemoon -private-window"; + }; + "ProfileManager" = { + name = "Open the Profile Manager"; + exec = "palemoon --ProfileManager"; + }; + }; + })]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib/palemoon} + cp -R * $out/lib/palemoon/ + + ln -s $out/{lib/palemoon,bin}/palemoon + + for iconpath in chrome/icons/default/default{16,32,48} icons/mozicon128; do + n=''${iconpath//[^0-9]/} + size=$n"x"$n + mkdir -p $out/share/icons/hicolor/$size/apps + ln -s $out/lib/palemoon/browser/"$iconpath".png $out/share/icons/hicolor/$size/apps/palemoon.png + done + + # Disable built-in updater + # https://forum.palemoon.org/viewtopic.php?f=5&t=25073&p=197771#p197747 + # > Please do not take this as permission to change, remove, or alter any other preferences as that is forbidden + # > without express permission according to the Pale Moon Redistribution License. + # > We are allowing this one and **ONLY** one exception in order to properly facilitate [package manager] repacks. + install -Dm644 ${./zz-disableUpdater.js} $out/lib/palemoon/browser/defaults/preferences/zz-disableUpdates.js + + runHook postInstall + ''; + + dontWrapGApps = true; + + preFixup = '' + # Make optional dependencies available + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + ffmpeg + libpulseaudio + ]}" + ) + wrapGApp $out/lib/palemoon/palemoon + ''; + + meta = with lib; { + homepage = "https://www.palemoon.org/"; + description = "An Open Source, Goanna-based web browser focusing on efficiency and customization"; + longDescription = '' + Pale Moon is an Open Source, Goanna-based web browser focusing on + efficiency and customization. + Pale Moon offers you a browsing experience in a browser completely built + from its own, independently developed source that has been forked off from + Firefox/Mozilla code a number of years ago, with carefully selected + features and optimizations to improve the browser's stability and user + experience, while offering full customization and a growing collection of + extensions and themes to make the browser truly your own. + ''; + changelog = "https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/${version}_Release"; + license = [ + licenses.mpl20 + { + fullName = "Pale Moon Redistribution License"; + url = "https://www.palemoon.org/redist.shtml"; + # TODO free, redistributable? Has strict limitations on what modifications may be done & shipped by packagers + } + ]; + maintainers = with maintainers; [ AndersonTorres OPNA2608 ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "palemoon"; + platforms = [ "x86_64-linux" ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 2101306e420fb..231a858ef4fcc 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -40,12 +40,12 @@ assert stdenv.cc.isGNU; assert with lib.strings; ( versionAtLeast stdenv.cc.version "7.1" - && versionOlder stdenv.cc.version "12" + && versionOlder stdenv.cc.version "13" ); stdenv.mkDerivation rec { pname = "palemoon"; - version = "32.0.0"; + version = "32.0.1"; src = fetchFromGitea { domain = "repo.palemoon.org"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { repo = "Pale-Moon"; rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-0N63Xo8cRIHwEXkT8eeot0DgZU7aPirmVq/iHJjlGRw="; + sha256 = "sha256-lz9Ok8i95pVfl4UHy2zWFe9vwJocUvDbueiWdZuz4Bo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/palemoon/zz-disableUpdater.js b/pkgs/applications/networking/browsers/palemoon/zz-disableUpdater.js new file mode 100644 index 0000000000000..50b8a79f627a9 --- /dev/null +++ b/pkgs/applications/networking/browsers/palemoon/zz-disableUpdater.js @@ -0,0 +1,7 @@ +/* https://forum.palemoon.org/viewtopic.php?f=5&t=25073&p=197771#p197747 */ + +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +pref("app.update.enabled", false); diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index 87dc7dcb1d019..40c7fda9dbadf 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "10.0.1"; + version = "13.0.3"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-J0D49VESNgdBEWAf01LkiiU2I01r4PBLyWKpnE9t45Q="; + sha256 = "sha256-wMWO8eRH8O93m4/HaRTdG3DhyCvHWw+s3sAtN+VLBeY="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 43865f051ba24..f89fdf4177049 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -26,6 +26,7 @@ , pulseaudioSupport ? mediaSupport , libpulseaudio , apulse +, alsa-lib # Media support (implies audio support) , mediaSupport ? true @@ -57,6 +58,7 @@ let libPath = lib.makeLibraryPath libPkgs; libPkgs = [ + alsa-lib atk cairo dbus @@ -85,9 +87,9 @@ let fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.5.8"; + version = "12.0.3"; - lang = "en-US"; + lang = "ALL"; srcs = { x86_64-linux = fetchurl { @@ -97,7 +99,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "sha256-/KK9oTijk5dEziAwp5966NaM2V4k1mtBjTJq88Ct7N0="; + hash = "sha256-bOGY/RdwD6O7QIuOiBw7OVnZfpumGGso6hwMJJwN2g0="; }; i686-linux = fetchurl { @@ -107,7 +109,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "sha256-TGdJ5yIeo0YQ4XSsb9lv3vuW6qEjhFe7KBmkjYO6fAc="; + hash = "sha256-t1tnEZtiRig2r8GNJpqT+J0XoxCLMyUsI9tX6aa0lYk="; }; }; in @@ -291,13 +293,9 @@ stdenv.mkDerivation rec { # TBB will fail if ownership is too permissive chmod 0700 "\$HOME/TorBrowser/Data/Tor" - # Initialize the browser profile state. Note that the only data - # copied from the Store payload is the initial bookmark file, which is - # never updated once created. All other files under user's profile - # dir are generated by TBB. + # Initialize the browser profile state. + # All files under user's profile dir are generated by TBB. mkdir -p "\$HOME/TorBrowser/Data/Browser/profile.default" - cp -u --no-preserve=mode,owner "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/bookmarks.html" \ - "\$HOME/TorBrowser/Data/Browser/profile.default/bookmarks.html" # Clear some files if the last known store path is different from the new one : "\''${KNOWN_STORE_PATH:=\$HOME/known-store-path}" @@ -325,6 +323,9 @@ stdenv.mkDerivation rec { # chance that TBB would continue using old font files. rm -rf "\$HOME/.cache/fontconfig" + # Workaround a bug in 12.0.X that Tor directories are not cleaned up and tor gets confused where its socket is + rm -rf \$XDG_RUNTIME_DIR/Tor* + # 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\");" diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 5441c7a58cbdd..5a0e81f4a4b80 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -1,14 +1,17 @@ { mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib }: +let + srcInfo = builtins.fromJSON (builtins.readFile ./pin.json); +in mkYarnPackage rec { pname = "vieb"; - version = "9.5.0"; + inherit (srcInfo) version; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-SWHjzrEvRlTn4HJnT81Le4KsFDypN3QH3F/z7zZ8p3E="; + inherit (srcInfo) sha256; }; packageJSON = ./package.json; @@ -52,11 +55,13 @@ mkYarnPackage rec { distPhase = ":"; # disable useless $out/tarballs directory + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://vieb.dev/"; changelog = "https://github.com/Jelmerro/Vieb/releases/tag/${version}"; description = "Vim Inspired Electron Browser"; - maintainers = with maintainers; [ gebner fortuneteller2k ]; + maintainers = with maintainers; [ gebner fortuneteller2k tejing ]; platforms = platforms.unix; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json index d9ce8e30269c8..28704db5c9e55 100644 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ b/pkgs/applications/networking/browsers/vieb/package.json @@ -1,7 +1,7 @@ { "name": "vieb", "productName": "Vieb", - "version": "9.5.0", + "version": "9.5.1", "description": "Vim Inspired Electron Browser", "main": "app/index.js", "scripts": { @@ -25,9 +25,9 @@ "funding": "https://github.com/sponsors/Jelmerro/", "license": "GPL-3.0-or-later", "devDependencies": { - "electron": "22.0.0", - "electron-builder": "24.0.0-alpha.7", - "eslint": "8.29.0", + "electron": "22.0.3", + "electron-builder": "24.0.0-alpha.10", + "eslint": "8.32.0", "eslint-plugin-sort-keys": "2.3.5", "jest": "29.3.1", "jest-environment-jsdom": "29.3.1", @@ -37,13 +37,13 @@ "webpack-node-externals": "3.0.0" }, "dependencies": { - "@cliqz/adblocker-electron": "1.25.1", - "@cliqz/adblocker-electron-preload": "1.25.1", + "@cliqz/adblocker-electron": "1.25.2", + "@cliqz/adblocker-electron-preload": "1.25.2", "@mozilla/readability": "0.4.2", "darkreader": "4.9.58", "highlight.js": "11.7.0", - "jsdom": "20.0.3", - "marked": "4.2.4", + "jsdom": "21.0.0", + "marked": "4.2.12", "picomatch": "2.3.1" } } diff --git a/pkgs/applications/networking/browsers/vieb/pin.json b/pkgs/applications/networking/browsers/vieb/pin.json new file mode 100644 index 0000000000000..5efefe840559a --- /dev/null +++ b/pkgs/applications/networking/browsers/vieb/pin.json @@ -0,0 +1,4 @@ +{ + "version": "9.5.1", + "sha256": "dUHjhJt0MarRNmDxs989aBTprjt+DUoYd3U05ELc0Tw=" +} diff --git a/pkgs/applications/networking/browsers/vieb/update.sh b/pkgs/applications/networking/browsers/vieb/update.sh new file mode 100755 index 0000000000000..3efc252358919 --- /dev/null +++ b/pkgs/applications/networking/browsers/vieb/update.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash wget jq yarn yarn2nix nix-prefetch-github + +set -euo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" + +if [ "$#" -gt 1 ] || [[ "${1:-}" == -* ]]; then + echo "Regenerates packaging data for the vieb package." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +version="${1:-}" + +if [ -z "$version" ]; then + version="$(wget -O- "https://api.github.com/repos/Jelmerro/Vieb/releases?per_page=1" | jq -r '.[0].tag_name')" +fi + +SRC="https://raw.githubusercontent.com/Jelmerro/Vieb/$version" + +tmpdir="$(mktemp -d --tmpdir update-vieb-XXXXXX)" +pushd "$tmpdir" + +wget "$SRC/package-lock.json" +wget "$SRC/package.json" +yarn import +yarn2nix >yarn.nix + +popd +cp -ft . "$tmpdir/"{package.json,yarn.lock,yarn.nix} +rm -rf "$tmpdir" + +src_hash=$(nix-prefetch-github Jelmerro Vieb --rev "${version}" | jq -r .sha256) + +cat > pin.json << EOF +{ + "version": "$version", + "sha256": "$src_hash" +} +EOF diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock index 135587f6b47ef..d238d1428baf5 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -23,29 +23,29 @@ "@babel/highlight" "^7.18.6" "@babel/compat-data@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733" - integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g== + version "7.20.10" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec" + integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg== "@babel/core@^7.11.6", "@babel/core@^7.12.3": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f" - integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw== + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d" + integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.18.6" "@babel/generator" "^7.20.7" "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-module-transforms" "^7.20.7" + "@babel/helper-module-transforms" "^7.20.11" "@babel/helpers" "^7.20.7" "@babel/parser" "^7.20.7" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" + "@babel/traverse" "^7.20.12" "@babel/types" "^7.20.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.2.1" + json5 "^2.2.2" semver "^6.3.0" "@babel/generator@^7.20.7", "@babel/generator@^7.7.2": @@ -95,10 +95,10 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz#7a6c9a1155bef55e914af574153069c9d9470c43" - integrity sha512-FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA== +"@babel/helper-module-transforms@^7.20.11": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0" + integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg== dependencies: "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-module-imports" "^7.18.6" @@ -106,7 +106,7 @@ "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-validator-identifier" "^7.19.1" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" + "@babel/traverse" "^7.20.10" "@babel/types" "^7.20.7" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0": @@ -273,10 +273,10 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/traverse@^7.20.7", "@babel/traverse@^7.7.2": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.7.tgz#114f992fa989a390896ea72db5220780edab509c" - integrity sha512-xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A== +"@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.7", "@babel/traverse@^7.7.2": + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5" + integrity sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ== dependencies: "@babel/code-frame" "^7.18.6" "@babel/generator" "^7.20.7" @@ -303,45 +303,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.25.1": - version "1.25.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.1.tgz#da81e7838e288a6f0fdb8a97a0df8169accb74a1" - integrity sha512-7gl2VdNPBfj7aPoq34B5miwGcnda/7LCr+BqnpcSOjdLV6jjT2FrNSAKGFvcH23q0HM1IFhYDV6ydTgsdWFCnA== +"@cliqz/adblocker-content@^1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.2.tgz#8835d7307c7829e85a2e38e7e3bfd161024ae4d7" + integrity sha512-Br177fKm/J3yc71m6cLA1OercmfGnZ5avprM/hB1bqZlN7Nt7qjISdZih90jTZ2ljyBVItDoVXOPf4ENlpn0qQ== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.25.1" + "@cliqz/adblocker-extended-selectors" "^1.25.2" -"@cliqz/adblocker-electron-preload@1.25.1", "@cliqz/adblocker-electron-preload@^1.25.1": - version "1.25.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.1.tgz#83bd59d8e94436c451af3525d9902fa5fa1be3ab" - integrity sha512-edNVEqGrXqe/Qwi0D9/V8xmtyeJlhNPaelXilYa1ne7jG/OT7pee+7Vi4BWezl0NQ77WF3/mY9Bj4eJkEO0uiQ== +"@cliqz/adblocker-electron-preload@1.25.2", "@cliqz/adblocker-electron-preload@^1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.2.tgz#67263683cce7cd036dbc0c37761c4f5eed6508ad" + integrity sha512-d2W5/ZSLZtHTgzqdW3gEAoCHJU1o4FYuAEVjB6L7cmV9S0UZRfTBL3wTtO/gzt/wo1LMk4MFAxOqC+riNj6x1g== dependencies: - "@cliqz/adblocker-content" "^1.25.1" + "@cliqz/adblocker-content" "^1.25.2" -"@cliqz/adblocker-electron@1.25.1": - version "1.25.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.1.tgz#44d9034e35c78938a772b10f8096df55a4accc41" - integrity sha512-CKStwRTR2L78EjgmuUpLKkV9s/uVnwQNGr7I/hyMkEROXbGdrN7P5LhwO+kkewccZ+3JtE509PBmZAp0EP71dw== +"@cliqz/adblocker-electron@1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.2.tgz#1b0ec106cc395f5826d97fcfe8fbe4c333d39695" + integrity sha512-GdYrEfhdIALm8Ue07+YONBArlQLuXHryO8UojMcEjDKYC3zp0OOl4ifi/92XpwVXdXSfX0jTavqC7ExLzRHzgQ== dependencies: - "@cliqz/adblocker" "^1.25.1" - "@cliqz/adblocker-electron-preload" "^1.25.1" + "@cliqz/adblocker" "^1.25.2" + "@cliqz/adblocker-electron-preload" "^1.25.2" tldts-experimental "^5.6.21" -"@cliqz/adblocker-extended-selectors@^1.25.1": - version "1.25.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.1.tgz#cfac0080952311399805fe153cd9e7e1331b3c6d" - integrity sha512-4MdMe/YfIok5d8WYVcLR3Ak7vGrmeUV47frgmXEe945luY93vwlzk1NiLYW1JM5Gdm+VePweoS9cJ1/QUTmv+Q== +"@cliqz/adblocker-extended-selectors@^1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.2.tgz#77256c148b1f0a6792c1adad9e8b246cde65b37d" + integrity sha512-acHxeUoR9TwHbgTKLrNt/ZLRxO4M+DkaNheRp86Kd2lfpn/qbN3yAH2k2mTJ/E0rWV5do9m8QRMR1mtB1yNuhQ== -"@cliqz/adblocker@^1.25.1": - version "1.25.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.1.tgz#4d3e8894ce48ad0d0f8b26a4a1003f0676b7f734" - integrity sha512-1C1/ELI94/XewdUj/o1+Q4ziOigMvTZQA05UERfDoKqpJ+0cbrEF/UImrzpX7n+kYsR7xTJvmf+iNM3zS0tfsg== +"@cliqz/adblocker@^1.25.2": + version "1.25.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.2.tgz#f2bd7c48afa650f887ac59a9950bfb220ea8cc52" + integrity sha512-wEgj1ppkrC1JjZyeGQx0Sxfvot9Dt8fuea7vckx07zDdEfvm5ML5WIXyxT8KvEhGB8VuM+KGJpUk05lFUpromw== dependencies: - "@cliqz/adblocker-content" "^1.25.1" - "@cliqz/adblocker-extended-selectors" "^1.25.1" + "@cliqz/adblocker-content" "^1.25.2" + "@cliqz/adblocker-extended-selectors" "^1.25.2" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.197" + "@types/chrome" "^0.0.206" "@types/firefox-webext-browser" "^94.0.0" tldts-experimental "^5.6.21" @@ -359,9 +359,9 @@ integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== "@electron/asar@^3.2.1": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.2.tgz#f6ae4eb4343ad00b994c40db3f09f71f968ff9c0" - integrity sha512-32fMU68x8a6zvxtC1IC/BhPDKTh8rQjdmwEplj3CDpnkcwBzZVN9v/8cK0LJqQ0FOQQVZW8BWZ1S6UU53TYR4w== + version "3.2.3" + resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.3.tgz#f598db50061ae5f90ad651f0255366b4e818000e" + integrity sha512-wmOfE6szYyqZhRIiLH+eyZEp+bGcJI0OD/SCvSUrfBE0jvauyGYO2ZhpWxmNCcDojKu5DYrsVqT5BOCZZ01XIg== dependencies: chromium-pickle-js "^0.2.0" commander "^5.0.0" @@ -438,10 +438,10 @@ minimatch "^3.0.4" plist "^3.0.4" -"@eslint/eslintrc@^1.3.3": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.0.tgz#8ec64e0df3e7a1971ee1ff5158da87389f167a63" - integrity sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A== +"@eslint/eslintrc@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e" + integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -458,7 +458,7 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== -"@humanwhocodes/config-array@^0.11.6": +"@humanwhocodes/config-array@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== @@ -871,12 +871,12 @@ integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== "@types/babel__core@^7.1.14": - version "7.1.20" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.20.tgz#e168cdd612c92a2d335029ed62ac94c95b362359" - integrity sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ== + version "7.20.0" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891" + integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ== dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" "@types/babel__generator" "*" "@types/babel__template" "*" "@types/babel__traverse" "*" @@ -913,10 +913,10 @@ "@types/node" "*" "@types/responselike" "^1.0.0" -"@types/chrome@^0.0.197": - version "0.0.197" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.197.tgz#c1b50cdb72ee40f9bc1411506031a9f8a925ab35" - integrity sha512-m1NfS5bOjaypyqQfaX6CxmJodZVcvj5+Mt/K94EBHkflYjPNmXHAzbxfifdLMa0YM3PDyOxohoTS5ug/e6p5jA== +"@types/chrome@^0.0.206": + version "0.0.206" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.206.tgz#ad1fd9799f368b5993d7c240492d4adaf5efbd8c" + integrity sha512-fQnTFjghPB9S4UzbfublUB6KmsBkvvJeGXGaaoD5Qu+ZxrDUfgJnKN5egLSzDcGAH5YxQubDgbCdNwwUGewQHg== dependencies: "@types/filesystem" "*" "@types/har-format" "*" @@ -944,12 +944,7 @@ "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== - -"@types/estree@^0.0.51": +"@types/estree@*", "@types/estree@^0.0.51": version "0.0.51" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== @@ -987,9 +982,9 @@ "@types/node" "*" "@types/graceful-fs@^4.1.3": - version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" - integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== + version "4.1.6" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae" + integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw== dependencies: "@types/node" "*" @@ -1053,15 +1048,10 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node@*": - version "18.11.17" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz#5c009e1d9c38f4a2a9d45c0b0c493fe6cdb4bcb5" - integrity sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng== - -"@types/node@^16.11.26": - version "16.18.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.10.tgz#d7415ef18c94f8d4e4a82ebcc8b8999f965d8920" - integrity sha512-XU1+v7h81p7145ddPfjv7jtWvkSilpcnON3mQ+bDi9Yuf7OI56efOglXRyXWgQ57xH3fEQgh7WOJMncRHVew5w== +"@types/node@*", "@types/node@^16.11.26": + version "16.18.11" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.11.tgz#cbb15c12ca7c16c85a72b6bdc4d4b01151bb3cae" + integrity sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA== "@types/plist@^3.0.1": version "3.0.2" @@ -1104,9 +1094,9 @@ integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^17.0.16", "@types/yargs@^17.0.8": - version "17.0.17" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.17.tgz#5672e5621f8e0fca13f433a8017aae4b7a2a03e7" - integrity sha512-72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g== + version "17.0.20" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.20.tgz#107f0fcc13bd4a524e352b41c49fe88aab5c54d5" + integrity sha512-eknWrTHofQuPk2iuqDm1waA7V6xPlbgBoaaXEgYkClhLOnB0TtbW+srJaOToAgawPxPlHQzwypFA2bhZaUGP5A== dependencies: "@types/yargs-parser" "*" @@ -1384,10 +1374,10 @@ app-builder-bin@4.0.0: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== -app-builder-lib@24.0.0-alpha.7: - version "24.0.0-alpha.7" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.7.tgz#fe798994f89cfa7f8e6ebfce8e73a816ba32ae16" - integrity sha512-kEzDjym0AV9pO4SX8+RaJX9fmxrrKlDzHxqAN7cxSgDM8BUneMJqeWtf9+Hqv6PMXAvpnRsrSHtNaYgDkhQdFA== +app-builder-lib@24.0.0-alpha.10: + version "24.0.0-alpha.10" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.10.tgz#244803adf93a6279dab09bc8d278c06ebc4f91b4" + integrity sha512-gKrBTbzEChV61mnr9RCjwv8XWUwfdrgj3AAPnQTNEpbGWwgHOuwtBjjYbUHdCm5QXnlGxHBsB1ODmvkPUOL4cg== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -1398,12 +1388,12 @@ app-builder-lib@24.0.0-alpha.7: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "24.0.0-alpha.6" - builder-util-runtime "9.1.2-alpha.1" + builder-util "24.0.0-alpha.8" + builder-util-runtime "9.2.0-alpha.2" chromium-pickle-js "^0.2.0" debug "^4.3.4" ejs "^3.1.8" - electron-publish "24.0.0-alpha.6" + electron-publish "24.0.0-alpha.8" form-data "^4.0.0" fs-extra "^10.1.0" hosted-git-info "^4.1.0" @@ -1631,25 +1621,25 @@ buffer@^5.1.0, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@9.1.2-alpha.1: - version "9.1.2-alpha.1" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.2-alpha.1.tgz#378bf1194325a9b362ccd2c32c8af46ee95f7c94" - integrity sha512-4sbKIB0N9J/pvixX9HYUyRtMZT+cN+bgPJ5NqejyqSPxFzj7IFe1A9K14l5nnfpMVxzUSZVQMerniDeGszZ9OA== +builder-util-runtime@9.2.0-alpha.2: + version "9.2.0-alpha.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.0-alpha.2.tgz#771a2787b247a15297377de23a916e9fc91050e6" + integrity sha512-MFuU0OSYQ4TIa5uMmVis3aJd7i5buaC9qrb0GjGNPD/GVwQ2LqydquqlKSBlptCib6bjSnL15dHsTbD2xWlVqQ== dependencies: debug "^4.3.4" sax "^1.2.4" -builder-util@24.0.0-alpha.6: - version "24.0.0-alpha.6" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.6.tgz#777977507a6f83eb55d2ffbc560f597b5b47269b" - integrity sha512-vSnVMyuZK0RArELPk1dLUdcunZ2Gj0mpAFat73yD5djiihNosXIpIbSO/OFTi2/MV0urlH0giU4DOs9EXaCKtA== +builder-util@24.0.0-alpha.8: + version "24.0.0-alpha.8" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.8.tgz#501de9052228ca8f87d43b53c01009dd069ad466" + integrity sha512-18NtwmgSweocvAV1hp3UMhG67n5NzFcZ1UBb7L38oWchfPfgus4N+aIkVuOYwWG8FvUFcbkm6KT59NVLC2lFqg== dependencies: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.6" "@types/fs-extra" "^9.0.11" app-builder-bin "4.0.0" bluebird-lst "^1.0.9" - builder-util-runtime "9.1.2-alpha.1" + builder-util-runtime "9.2.0-alpha.2" chalk "^4.1.2" cross-spawn "^7.0.3" debug "^4.3.4" @@ -1720,9 +1710,9 @@ camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001400: - version "1.0.30001441" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz#987437b266260b640a23cd18fbddb509d7f69f3e" - integrity sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg== + version "1.0.30001446" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001446.tgz#6d4ba828ab19f49f9bcd14a8430d30feebf1e0c5" + integrity sha512-fEoga4PrImGcwUUGEol/PoFCSBnSkA9drgdkxXkJLsUBOnJ8rs3zDv6ApqYXGQFOyMPsjh79naWhF4DAxbF8rw== chalk@^2.0.0: version "2.4.2" @@ -1762,9 +1752,9 @@ chromium-pickle-js@^0.2.0: integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== ci-info@^3.2.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.0.tgz#6d01b3696c59915b6ce057e4aa4adfc2fa25f5ef" - integrity sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog== + version "3.7.1" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f" + integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w== cjs-module-lexer@^1.0.0: version "1.2.2" @@ -1888,9 +1878,9 @@ commander@^5.0.0: integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== commander@^9.4.1: - version "9.4.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd" - integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw== + version "9.5.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" + integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== compare-version@^0.1.2: version "0.1.2" @@ -2074,14 +2064,14 @@ dir-compare@^3.0.0: buffer-equal "^1.0.0" minimatch "^3.0.4" -dmg-builder@24.0.0-alpha.7: - version "24.0.0-alpha.7" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.7.tgz#03f701547e7e5bf09c2cee3546a87685844efe70" - integrity sha512-5aQvKHvUb3vBjwwRRaYee9kvqKt+LKWFuOh4E750hClRIaYHQBOCxN2Ws0QVUxwZ22kBP+RQ0LS1tfesBGLPsw== +dmg-builder@24.0.0-alpha.10: + version "24.0.0-alpha.10" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.10.tgz#74b3e03c220486ad8a04ad9b8aac6ca6074ceef3" + integrity sha512-kOGq/9Qa0LDndMvG3MYv9oGCIPEwKTdCEIu4y3FtjB7VELvpjC/OoDphxRxLyVFzgb1tMDiAl7GoYIFYC5dkOg== dependencies: - app-builder-lib "24.0.0-alpha.7" - builder-util "24.0.0-alpha.6" - builder-util-runtime "9.1.2-alpha.1" + app-builder-lib "24.0.0-alpha.10" + builder-util "24.0.0-alpha.8" + builder-util-runtime "9.2.0-alpha.2" fs-extra "^10.1.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" @@ -2133,17 +2123,17 @@ ejs@^3.1.8: dependencies: jake "^10.8.5" -electron-builder@24.0.0-alpha.7: - version "24.0.0-alpha.7" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.7.tgz#1c897b334d3fdaac57365a81cdb899fcca7aa697" - integrity sha512-havD3dI5q9C4eWr+mJg82dKS81kYhcDUgBnRU90wxRdjT8R+cxqJxtgk/poJbMJi/qURza9wedAkgQbk48QQLQ== +electron-builder@24.0.0-alpha.10: + version "24.0.0-alpha.10" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.10.tgz#1713da06493bffd02e76a6809b1e7147e0a4339c" + integrity sha512-10HkSuAV2HYW/KrL2AjhLtToFceACq73qAofg87vv4+kSe06dTHeiWCfYxEomFukYd0Vxu5Mvnfg+E4M0qGQrA== dependencies: "@types/yargs" "^17.0.16" - app-builder-lib "24.0.0-alpha.7" - builder-util "24.0.0-alpha.6" - builder-util-runtime "9.1.2-alpha.1" + app-builder-lib "24.0.0-alpha.10" + builder-util "24.0.0-alpha.8" + builder-util-runtime "9.2.0-alpha.2" chalk "^4.1.2" - dmg-builder "24.0.0-alpha.7" + dmg-builder "24.0.0-alpha.10" fs-extra "^10.1.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -2151,14 +2141,14 @@ electron-builder@24.0.0-alpha.7: simple-update-notifier "^1.1.0" yargs "^17.6.2" -electron-publish@24.0.0-alpha.6: - version "24.0.0-alpha.6" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.6.tgz#df6edd7b95eec038b4f287968b9c9af6aaa74cd6" - integrity sha512-ppRriKQuLGK8eZrCveQrf1zB+fV6qcTck6cq4NEC61KyvtQlUdvDV4yGRVmkOO28CYRmhq9w093T93Qc6k/TeQ== +electron-publish@24.0.0-alpha.8: + version "24.0.0-alpha.8" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.8.tgz#d2326a33938ddc73bab83f149dbd9bab67b85804" + integrity sha512-DTu/Waa8UVTbuFXWzSn+Wp7IKJC21sx64eM0mY4b7FESa/6BXQnIiFgaC6DU4b8TLofhFQ1uVgp6g1sFWi9fAQ== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "24.0.0-alpha.6" - builder-util-runtime "9.1.2-alpha.1" + builder-util "24.0.0-alpha.8" + builder-util-runtime "9.2.0-alpha.2" chalk "^4.1.2" fs-extra "^10.1.0" lazy-val "^1.0.5" @@ -2169,10 +2159,10 @@ electron-to-chromium@^1.4.251: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== -electron@22.0.0: - version "22.0.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.0.tgz#ef84ab9cf23aa3f8c2f42a1e8e000ad7fd941058" - integrity sha512-cgRc4wjyM+81A0E8UGv1HNJjL1HBI5cWNh/DUIjzYvoUuiEM0SS0hAH/zaFQ18xOz2ced6Yih8SybpOiOYJhdg== +electron@22.0.3: + version "22.0.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.3.tgz#44806cd053ea2ed35bffefd92143d3fc69d7337d" + integrity sha512-eETrJTINTzlXgQrnJSrKiF2Xdt5EHpxZ6Kk+WUjFCE0zUztdVm+hrngUecqhj8TPFlYScTANzPwRwUIjOChl+g== dependencies: "@electron/get" "^2.0.0" "@types/node" "^16.11.26" @@ -2319,13 +2309,13 @@ eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@8.29.0: - version "8.29.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz#d74a88a20fb44d59c51851625bc4ee8d0ec43f87" - integrity sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg== +eslint@8.32.0: + version "8.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.32.0.tgz#d9690056bb6f1a302bd991e7090f5b68fbaea861" + integrity sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ== dependencies: - "@eslint/eslintrc" "^1.3.3" - "@humanwhocodes/config-array" "^0.11.6" + "@eslint/eslintrc" "^1.4.1" + "@humanwhocodes/config-array" "^0.11.8" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" ajv "^6.10.0" @@ -2344,7 +2334,7 @@ eslint@8.29.0: file-entry-cache "^6.0.1" find-up "^5.0.0" glob-parent "^6.0.2" - globals "^13.15.0" + globals "^13.19.0" grapheme-splitter "^1.0.4" ignore "^5.2.0" import-fresh "^3.0.0" @@ -2480,9 +2470,9 @@ fastest-levenshtein@^1.0.12: integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== fastq@^1.6.0: - version "1.14.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.14.0.tgz#107f69d7295b11e0fccc264e1fc6389f623731ce" - integrity sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg== + version "1.15.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" + integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== dependencies: reusify "^1.0.4" @@ -2634,9 +2624,9 @@ get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" - integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" + integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -2684,9 +2674,9 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: path-is-absolute "^1.0.0" glob@^8.0.1: - version "8.0.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" - integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -2711,7 +2701,7 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.15.0, globals@^13.19.0: +globals@^13.19.0: version "13.19.0" resolved "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz#7a42de8e6ad4f7242fbcca27ea5b23aca367b5c8" integrity sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ== @@ -3471,9 +3461,9 @@ jest@29.3.1: jest-cli "^29.3.1" js-sdsl@^4.1.4: - version "4.2.0" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0" - integrity sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ== + version "4.3.0" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" + integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ== js-tokens@^4.0.0: version "4.0.0" @@ -3495,7 +3485,39 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -jsdom@20.0.3, jsdom@^20.0.0: +jsdom@21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz#33e22f2fc44286e50ac853c7b7656c8864a4ea45" + integrity sha512-AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA== + 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" + +jsdom@^20.0.0: version "20.0.3" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== @@ -3557,10 +3579,10 @@ json-stringify-safe@^5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== -json5@^2.2.0, json5@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" - integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== +json5@^2.2.0, json5@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== jsonfile@^4.0.0: version "4.0.0" @@ -3732,10 +3754,10 @@ makeerror@1.0.12: dependencies: tmpl "1.0.5" -marked@4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.4.tgz#5a4ce6c7a1ae0c952601fce46376ee4cf1797e1c" - integrity sha512-Wcc9ikX7Q5E4BYDPvh1C6QNSxrjC9tBgz+A/vAhp59KXUgachw++uMvMKiSW8oA85nopmPZcEvBoex/YLMsiyA== +marked@4.2.12: + version "4.2.12" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5" + integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw== matcher@^3.0.0: version "3.0.0" @@ -3797,9 +3819,9 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: brace-expansion "^1.1.7" minimatch@^5.0.1, minimatch@^5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz#0939d7d6f0898acbd1508abe534d1929368a8fff" - integrity sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg== + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== dependencies: brace-expansion "^2.0.1" @@ -3874,16 +3896,11 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -ms@2.1.2: +ms@2.1.2, ms@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@^2.0.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - natural-compare@1.4.0, natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -3900,9 +3917,9 @@ neo-async@^2.6.2: integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== node-abi@^3.0.0: - version "3.30.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.30.0.tgz#d84687ad5d24ca81cdfa912a36f2c5c19b137359" - integrity sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw== + version "3.31.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz#dfb2ea3d01188eb80859f69bb4a4354090c1b355" + integrity sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ== dependencies: semver "^7.3.5" @@ -3924,9 +3941,9 @@ node-api-version@^0.1.4: semver "^7.3.5" node-gyp-build@^4.2.1: - version "4.5.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40" - integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg== + version "4.6.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055" + integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ== node-gyp@^9.0.0: version "9.3.1" @@ -4234,9 +4251,9 @@ pump@^3.0.0: once "^1.3.1" punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== querystringify@^2.1.1: version "2.2.0" @@ -4331,9 +4348,9 @@ resolve-from@^5.0.0: integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== resolve.exports@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" - integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== + version "1.1.1" + resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999" + integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ== resolve@^1.20.0: version "1.22.1" @@ -4463,9 +4480,9 @@ serialize-error@^7.0.1: type-fest "^0.13.1" serialize-javascript@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== + version "6.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" + integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== dependencies: randombytes "^2.1.0" @@ -4740,17 +4757,17 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== -tldts-core@^5.7.103: - version "5.7.103" - resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.103.tgz#462fd4b60704ddca9b71bd17c2c59504e6985ca5" - integrity sha512-MdSolgnhJwr2SH6a+5KFAYB8znpYdRLoOFTJmrWslsec9Ne/V3DBrw+BbS1YYQJKGTin6U02Y9CSYxnOpg3vwg== +tldts-core@^5.7.104: + version "5.7.104" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.104.tgz#4313a9663e4085332750a5fb04bfa0b0d91b826d" + integrity sha512-8vhSgc2nzPNT0J7XyCqcOtQ6+ySBn+gsPmj5h95YytIZ7L2Xl40paUmj0T6Uko42HegHGQxXieunHIQuABWSmQ== tldts-experimental@^5.6.21: - version "5.7.103" - resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.103.tgz#a0b15a05c2cec7f0d4935de18dc9ad3fcbe0276f" - integrity sha512-oo9QI0TjXdrlZnDSJMazRJe+nnd0OwXgzRmHcsnyp4k6UxmmlaWEA1iq3RY3EDSKwYEJ+lDnwQeAaGRleU/LEQ== + version "5.7.104" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.104.tgz#f23e526240f674039857b653361f5da549dae758" + integrity sha512-GSFlkgTW0csMjbCCbjd4cnkV6MbUVVxE27S8CS+gN44QZzcygepDSKVyQ81hkwMZrLwDDrOmWEAEhNVJJ6JSBA== dependencies: - tldts-core "^5.7.103" + tldts-core "^5.7.104" tmp-promise@^3.0.2: version "3.0.3" @@ -5094,9 +5111,9 @@ write-file-atomic@^4.0.1: signal-exit "^3.0.7" ws@^8.11.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" - integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== + version "8.12.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" + integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== xml-name-validator@^4.0.0: version "4.0.0" diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index 413a387f14cca..eaf66d689df8e 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -26,19 +26,19 @@ }; } { - name = "_babel_compat_data___compat_data_7.20.5.tgz"; + name = "_babel_compat_data___compat_data_7.20.10.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz"; - sha512 = "KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="; + name = "_babel_compat_data___compat_data_7.20.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz"; + sha512 = "sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg=="; }; } { - name = "_babel_core___core_7.20.7.tgz"; + name = "_babel_core___core_7.20.12.tgz"; path = fetchurl { - name = "_babel_core___core_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz"; - sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw=="; + name = "_babel_core___core_7.20.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz"; + sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; }; } { @@ -90,11 +90,11 @@ }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.20.11.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz"; - sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA=="; + name = "_babel_helper_module_transforms___helper_module_transforms_7.20.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz"; + sha512 = "uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg=="; }; } { @@ -290,11 +290,11 @@ }; } { - name = "_babel_traverse___traverse_7.20.7.tgz"; + name = "_babel_traverse___traverse_7.20.12.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.20.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.7.tgz"; - sha512 = "xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A=="; + name = "_babel_traverse___traverse_7.20.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz"; + sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; }; } { @@ -314,43 +314,43 @@ }; } { - name = "_cliqz_adblocker_content___adblocker_content_1.25.1.tgz"; + name = "_cliqz_adblocker_content___adblocker_content_1.25.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_content___adblocker_content_1.25.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.1.tgz"; - sha512 = "7gl2VdNPBfj7aPoq34B5miwGcnda/7LCr+BqnpcSOjdLV6jjT2FrNSAKGFvcH23q0HM1IFhYDV6ydTgsdWFCnA=="; + name = "_cliqz_adblocker_content___adblocker_content_1.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.25.2.tgz"; + sha512 = "Br177fKm/J3yc71m6cLA1OercmfGnZ5avprM/hB1bqZlN7Nt7qjISdZih90jTZ2ljyBVItDoVXOPf4ENlpn0qQ=="; }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.1.tgz"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.1.tgz"; - sha512 = "edNVEqGrXqe/Qwi0D9/V8xmtyeJlhNPaelXilYa1ne7jG/OT7pee+7Vi4BWezl0NQ77WF3/mY9Bj4eJkEO0uiQ=="; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.25.2.tgz"; + sha512 = "d2W5/ZSLZtHTgzqdW3gEAoCHJU1o4FYuAEVjB6L7cmV9S0UZRfTBL3wTtO/gzt/wo1LMk4MFAxOqC+riNj6x1g=="; }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.25.1.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.25.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron___adblocker_electron_1.25.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.1.tgz"; - sha512 = "CKStwRTR2L78EjgmuUpLKkV9s/uVnwQNGr7I/hyMkEROXbGdrN7P5LhwO+kkewccZ+3JtE509PBmZAp0EP71dw=="; + name = "_cliqz_adblocker_electron___adblocker_electron_1.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.25.2.tgz"; + sha512 = "GdYrEfhdIALm8Ue07+YONBArlQLuXHryO8UojMcEjDKYC3zp0OOl4ifi/92XpwVXdXSfX0jTavqC7ExLzRHzgQ=="; }; } { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.1.tgz"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.1.tgz"; - sha512 = "4MdMe/YfIok5d8WYVcLR3Ak7vGrmeUV47frgmXEe945luY93vwlzk1NiLYW1JM5Gdm+VePweoS9cJ1/QUTmv+Q=="; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.25.2.tgz"; + sha512 = "acHxeUoR9TwHbgTKLrNt/ZLRxO4M+DkaNheRp86Kd2lfpn/qbN3yAH2k2mTJ/E0rWV5do9m8QRMR1mtB1yNuhQ=="; }; } { - name = "_cliqz_adblocker___adblocker_1.25.1.tgz"; + name = "_cliqz_adblocker___adblocker_1.25.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker___adblocker_1.25.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.1.tgz"; - sha512 = "1C1/ELI94/XewdUj/o1+Q4ziOigMvTZQA05UERfDoKqpJ+0cbrEF/UImrzpX7n+kYsR7xTJvmf+iNM3zS0tfsg=="; + name = "_cliqz_adblocker___adblocker_1.25.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.25.2.tgz"; + sha512 = "wEgj1ppkrC1JjZyeGQx0Sxfvot9Dt8fuea7vckx07zDdEfvm5ML5WIXyxT8KvEhGB8VuM+KGJpUk05lFUpromw=="; }; } { @@ -370,11 +370,11 @@ }; } { - name = "_electron_asar___asar_3.2.2.tgz"; + name = "_electron_asar___asar_3.2.3.tgz"; path = fetchurl { - name = "_electron_asar___asar_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.2.tgz"; - sha512 = "32fMU68x8a6zvxtC1IC/BhPDKTh8rQjdmwEplj3CDpnkcwBzZVN9v/8cK0LJqQ0FOQQVZW8BWZ1S6UU53TYR4w=="; + name = "_electron_asar___asar_3.2.3.tgz"; + url = "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.3.tgz"; + sha512 = "wmOfE6szYyqZhRIiLH+eyZEp+bGcJI0OD/SCvSUrfBE0jvauyGYO2ZhpWxmNCcDojKu5DYrsVqT5BOCZZ01XIg=="; }; } { @@ -418,11 +418,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_1.4.0.tgz"; + name = "_eslint_eslintrc___eslintrc_1.4.1.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.0.tgz"; - sha512 = "7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A=="; + name = "_eslint_eslintrc___eslintrc_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"; + sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; }; } { @@ -810,11 +810,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.20.tgz"; + name = "_types_babel__core___babel__core_7.20.0.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.20.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.20.tgz"; - sha512 = "PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ=="; + name = "_types_babel__core___babel__core_7.20.0.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz"; + sha512 = "+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ=="; }; } { @@ -850,11 +850,11 @@ }; } { - name = "_types_chrome___chrome_0.0.197.tgz"; + name = "_types_chrome___chrome_0.0.206.tgz"; path = fetchurl { - name = "_types_chrome___chrome_0.0.197.tgz"; - url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.197.tgz"; - sha512 = "m1NfS5bOjaypyqQfaX6CxmJodZVcvj5+Mt/K94EBHkflYjPNmXHAzbxfifdLMa0YM3PDyOxohoTS5ug/e6p5jA=="; + name = "_types_chrome___chrome_0.0.206.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.206.tgz"; + sha512 = "fQnTFjghPB9S4UzbfublUB6KmsBkvvJeGXGaaoD5Qu+ZxrDUfgJnKN5egLSzDcGAH5YxQubDgbCdNwwUGewQHg=="; }; } { @@ -882,14 +882,6 @@ }; } { - name = "_types_estree___estree_1.0.0.tgz"; - path = fetchurl { - name = "_types_estree___estree_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz"; - sha512 = "WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="; - }; - } - { name = "_types_estree___estree_0.0.51.tgz"; path = fetchurl { name = "_types_estree___estree_0.0.51.tgz"; @@ -938,11 +930,11 @@ }; } { - name = "_types_graceful_fs___graceful_fs_4.1.5.tgz"; + name = "_types_graceful_fs___graceful_fs_4.1.6.tgz"; path = fetchurl { - name = "_types_graceful_fs___graceful_fs_4.1.5.tgz"; - url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz"; - sha512 = "anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw=="; + name = "_types_graceful_fs___graceful_fs_4.1.6.tgz"; + url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz"; + sha512 = "Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw=="; }; } { @@ -1026,19 +1018,11 @@ }; } { - name = "_types_node___node_18.11.17.tgz"; - path = fetchurl { - name = "_types_node___node_18.11.17.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz"; - sha512 = "HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="; - }; - } - { - name = "_types_node___node_16.18.10.tgz"; + name = "_types_node___node_16.18.11.tgz"; path = fetchurl { - name = "_types_node___node_16.18.10.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.10.tgz"; - sha512 = "XU1+v7h81p7145ddPfjv7jtWvkSilpcnON3mQ+bDi9Yuf7OI56efOglXRyXWgQ57xH3fEQgh7WOJMncRHVew5w=="; + name = "_types_node___node_16.18.11.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.11.tgz"; + sha512 = "3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="; }; } { @@ -1098,11 +1082,11 @@ }; } { - name = "_types_yargs___yargs_17.0.17.tgz"; + name = "_types_yargs___yargs_17.0.20.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.17.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.17.tgz"; - sha512 = "72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g=="; + name = "_types_yargs___yargs_17.0.20.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.20.tgz"; + sha512 = "eknWrTHofQuPk2iuqDm1waA7V6xPlbgBoaaXEgYkClhLOnB0TtbW+srJaOToAgawPxPlHQzwypFA2bhZaUGP5A=="; }; } { @@ -1426,11 +1410,11 @@ }; } { - name = "app_builder_lib___app_builder_lib_24.0.0_alpha.7.tgz"; + name = "app_builder_lib___app_builder_lib_24.0.0_alpha.10.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_24.0.0_alpha.7.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.7.tgz"; - sha512 = "kEzDjym0AV9pO4SX8+RaJX9fmxrrKlDzHxqAN7cxSgDM8BUneMJqeWtf9+Hqv6PMXAvpnRsrSHtNaYgDkhQdFA=="; + name = "app_builder_lib___app_builder_lib_24.0.0_alpha.10.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.0.0-alpha.10.tgz"; + sha512 = "gKrBTbzEChV61mnr9RCjwv8XWUwfdrgj3AAPnQTNEpbGWwgHOuwtBjjYbUHdCm5QXnlGxHBsB1ODmvkPUOL4cg=="; }; } { @@ -1674,19 +1658,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_9.1.2_alpha.1.tgz"; + name = "builder_util_runtime___builder_util_runtime_9.2.0_alpha.2.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_9.1.2_alpha.1.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.2-alpha.1.tgz"; - sha512 = "4sbKIB0N9J/pvixX9HYUyRtMZT+cN+bgPJ5NqejyqSPxFzj7IFe1A9K14l5nnfpMVxzUSZVQMerniDeGszZ9OA=="; + name = "builder_util_runtime___builder_util_runtime_9.2.0_alpha.2.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.0-alpha.2.tgz"; + sha512 = "MFuU0OSYQ4TIa5uMmVis3aJd7i5buaC9qrb0GjGNPD/GVwQ2LqydquqlKSBlptCib6bjSnL15dHsTbD2xWlVqQ=="; }; } { - name = "builder_util___builder_util_24.0.0_alpha.6.tgz"; + name = "builder_util___builder_util_24.0.0_alpha.8.tgz"; path = fetchurl { - name = "builder_util___builder_util_24.0.0_alpha.6.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.6.tgz"; - sha512 = "vSnVMyuZK0RArELPk1dLUdcunZ2Gj0mpAFat73yD5djiihNosXIpIbSO/OFTi2/MV0urlH0giU4DOs9EXaCKtA=="; + name = "builder_util___builder_util_24.0.0_alpha.8.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-24.0.0-alpha.8.tgz"; + sha512 = "18NtwmgSweocvAV1hp3UMhG67n5NzFcZ1UBb7L38oWchfPfgus4N+aIkVuOYwWG8FvUFcbkm6KT59NVLC2lFqg=="; }; } { @@ -1738,11 +1722,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001446.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz"; - sha512 = "OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg=="; + name = "caniuse_lite___caniuse_lite_1.0.30001446.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001446.tgz"; + sha512 = "fEoga4PrImGcwUUGEol/PoFCSBnSkA9drgdkxXkJLsUBOnJ8rs3zDv6ApqYXGQFOyMPsjh79naWhF4DAxbF8rw=="; }; } { @@ -1794,11 +1778,11 @@ }; } { - name = "ci_info___ci_info_3.7.0.tgz"; + name = "ci_info___ci_info_3.7.1.tgz"; path = fetchurl { - name = "ci_info___ci_info_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.0.tgz"; - sha512 = "2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog=="; + name = "ci_info___ci_info_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz"; + sha512 = "4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w=="; }; } { @@ -1962,11 +1946,11 @@ }; } { - name = "commander___commander_9.4.1.tgz"; + name = "commander___commander_9.5.0.tgz"; path = fetchurl { - name = "commander___commander_9.4.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz"; - sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; + name = "commander___commander_9.5.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz"; + sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="; }; } { @@ -2218,11 +2202,11 @@ }; } { - name = "dmg_builder___dmg_builder_24.0.0_alpha.7.tgz"; + name = "dmg_builder___dmg_builder_24.0.0_alpha.10.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_24.0.0_alpha.7.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.7.tgz"; - sha512 = "5aQvKHvUb3vBjwwRRaYee9kvqKt+LKWFuOh4E750hClRIaYHQBOCxN2Ws0QVUxwZ22kBP+RQ0LS1tfesBGLPsw=="; + name = "dmg_builder___dmg_builder_24.0.0_alpha.10.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.0.0-alpha.10.tgz"; + sha512 = "kOGq/9Qa0LDndMvG3MYv9oGCIPEwKTdCEIu4y3FtjB7VELvpjC/OoDphxRxLyVFzgb1tMDiAl7GoYIFYC5dkOg=="; }; } { @@ -2274,19 +2258,19 @@ }; } { - name = "electron_builder___electron_builder_24.0.0_alpha.7.tgz"; + name = "electron_builder___electron_builder_24.0.0_alpha.10.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_24.0.0_alpha.7.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.7.tgz"; - sha512 = "havD3dI5q9C4eWr+mJg82dKS81kYhcDUgBnRU90wxRdjT8R+cxqJxtgk/poJbMJi/qURza9wedAkgQbk48QQLQ=="; + name = "electron_builder___electron_builder_24.0.0_alpha.10.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.0.0-alpha.10.tgz"; + sha512 = "10HkSuAV2HYW/KrL2AjhLtToFceACq73qAofg87vv4+kSe06dTHeiWCfYxEomFukYd0Vxu5Mvnfg+E4M0qGQrA=="; }; } { - name = "electron_publish___electron_publish_24.0.0_alpha.6.tgz"; + name = "electron_publish___electron_publish_24.0.0_alpha.8.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_24.0.0_alpha.6.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.6.tgz"; - sha512 = "ppRriKQuLGK8eZrCveQrf1zB+fV6qcTck6cq4NEC61KyvtQlUdvDV4yGRVmkOO28CYRmhq9w093T93Qc6k/TeQ=="; + name = "electron_publish___electron_publish_24.0.0_alpha.8.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.0.0-alpha.8.tgz"; + sha512 = "DTu/Waa8UVTbuFXWzSn+Wp7IKJC21sx64eM0mY4b7FESa/6BXQnIiFgaC6DU4b8TLofhFQ1uVgp6g1sFWi9fAQ=="; }; } { @@ -2298,11 +2282,11 @@ }; } { - name = "electron___electron_22.0.0.tgz"; + name = "electron___electron_22.0.3.tgz"; path = fetchurl { - name = "electron___electron_22.0.0.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-22.0.0.tgz"; - sha512 = "cgRc4wjyM+81A0E8UGv1HNJjL1HBI5cWNh/DUIjzYvoUuiEM0SS0hAH/zaFQ18xOz2ced6Yih8SybpOiOYJhdg=="; + name = "electron___electron_22.0.3.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-22.0.3.tgz"; + sha512 = "eETrJTINTzlXgQrnJSrKiF2Xdt5EHpxZ6Kk+WUjFCE0zUztdVm+hrngUecqhj8TPFlYScTANzPwRwUIjOChl+g=="; }; } { @@ -2490,11 +2474,11 @@ }; } { - name = "eslint___eslint_8.29.0.tgz"; + name = "eslint___eslint_8.32.0.tgz"; path = fetchurl { - name = "eslint___eslint_8.29.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz"; - sha512 = "isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg=="; + name = "eslint___eslint_8.32.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-8.32.0.tgz"; + sha512 = "nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ=="; }; } { @@ -2634,11 +2618,11 @@ }; } { - name = "fastq___fastq_1.14.0.tgz"; + name = "fastq___fastq_1.15.0.tgz"; path = fetchurl { - name = "fastq___fastq_1.14.0.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.14.0.tgz"; - sha512 = "eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg=="; + name = "fastq___fastq_1.15.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz"; + sha512 = "wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw=="; }; } { @@ -2802,11 +2786,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; + name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; - sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; + name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; + sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; }; } { @@ -2858,11 +2842,11 @@ }; } { - name = "glob___glob_8.0.3.tgz"; + name = "glob___glob_8.1.0.tgz"; path = fetchurl { - name = "glob___glob_8.0.3.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz"; - sha512 = "ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ=="; + name = "glob___glob_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz"; + sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; }; } { @@ -3578,11 +3562,11 @@ }; } { - name = "js_sdsl___js_sdsl_4.2.0.tgz"; + name = "js_sdsl___js_sdsl_4.3.0.tgz"; path = fetchurl { - name = "js_sdsl___js_sdsl_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz"; - sha512 = "dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ=="; + name = "js_sdsl___js_sdsl_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz"; + sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; }; } { @@ -3610,6 +3594,14 @@ }; } { + name = "jsdom___jsdom_21.0.0.tgz"; + path = fetchurl { + name = "jsdom___jsdom_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-21.0.0.tgz"; + sha512 = "AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA=="; + }; + } + { name = "jsdom___jsdom_20.0.3.tgz"; path = fetchurl { name = "jsdom___jsdom_20.0.3.tgz"; @@ -3666,11 +3658,11 @@ }; } { - name = "json5___json5_2.2.2.tgz"; + name = "json5___json5_2.2.3.tgz"; path = fetchurl { - name = "json5___json5_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz"; - sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; + name = "json5___json5_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz"; + sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; } { @@ -3866,11 +3858,11 @@ }; } { - name = "marked___marked_4.2.4.tgz"; + name = "marked___marked_4.2.12.tgz"; path = fetchurl { - name = "marked___marked_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/marked/-/marked-4.2.4.tgz"; - sha512 = "Wcc9ikX7Q5E4BYDPvh1C6QNSxrjC9tBgz+A/vAhp59KXUgachw++uMvMKiSW8oA85nopmPZcEvBoex/YLMsiyA=="; + name = "marked___marked_4.2.12.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz"; + sha512 = "yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw=="; }; } { @@ -3954,11 +3946,11 @@ }; } { - name = "minimatch___minimatch_5.1.2.tgz"; + name = "minimatch___minimatch_5.1.6.tgz"; path = fetchurl { - name = "minimatch___minimatch_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz"; - sha512 = "bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg=="; + name = "minimatch___minimatch_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz"; + sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; } { @@ -4050,14 +4042,6 @@ }; } { - name = "ms___ms_2.1.3.tgz"; - path = fetchurl { - name = "ms___ms_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; - sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; - }; - } - { name = "natural_compare___natural_compare_1.4.0.tgz"; path = fetchurl { name = "natural_compare___natural_compare_1.4.0.tgz"; @@ -4082,11 +4066,11 @@ }; } { - name = "node_abi___node_abi_3.30.0.tgz"; + name = "node_abi___node_abi_3.31.0.tgz"; path = fetchurl { - name = "node_abi___node_abi_3.30.0.tgz"; - url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.30.0.tgz"; - sha512 = "qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw=="; + name = "node_abi___node_abi_3.31.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.31.0.tgz"; + sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; }; } { @@ -4114,11 +4098,11 @@ }; } { - name = "node_gyp_build___node_gyp_build_4.5.0.tgz"; + name = "node_gyp_build___node_gyp_build_4.6.0.tgz"; path = fetchurl { - name = "node_gyp_build___node_gyp_build_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; - sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; + name = "node_gyp_build___node_gyp_build_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; + sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; }; } { @@ -4474,11 +4458,11 @@ }; } { - name = "punycode___punycode_2.1.1.tgz"; + name = "punycode___punycode_2.3.0.tgz"; path = fetchurl { - name = "punycode___punycode_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + name = "punycode___punycode_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz"; + sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; }; } { @@ -4602,11 +4586,11 @@ }; } { - name = "resolve.exports___resolve.exports_1.1.0.tgz"; + name = "resolve.exports___resolve.exports_1.1.1.tgz"; path = fetchurl { - name = "resolve.exports___resolve.exports_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz"; - sha512 = "J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="; + name = "resolve.exports___resolve.exports_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz"; + sha512 = "/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ=="; }; } { @@ -4762,11 +4746,11 @@ }; } { - name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + name = "serialize_javascript___serialize_javascript_6.0.1.tgz"; path = fetchurl { - name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; - sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; + name = "serialize_javascript___serialize_javascript_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz"; + sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w=="; }; } { @@ -5090,19 +5074,19 @@ }; } { - name = "tldts_core___tldts_core_5.7.103.tgz"; + name = "tldts_core___tldts_core_5.7.104.tgz"; path = fetchurl { - name = "tldts_core___tldts_core_5.7.103.tgz"; - url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.103.tgz"; - sha512 = "MdSolgnhJwr2SH6a+5KFAYB8znpYdRLoOFTJmrWslsec9Ne/V3DBrw+BbS1YYQJKGTin6U02Y9CSYxnOpg3vwg=="; + name = "tldts_core___tldts_core_5.7.104.tgz"; + url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.104.tgz"; + sha512 = "8vhSgc2nzPNT0J7XyCqcOtQ6+ySBn+gsPmj5h95YytIZ7L2Xl40paUmj0T6Uko42HegHGQxXieunHIQuABWSmQ=="; }; } { - name = "tldts_experimental___tldts_experimental_5.7.103.tgz"; + name = "tldts_experimental___tldts_experimental_5.7.104.tgz"; path = fetchurl { - name = "tldts_experimental___tldts_experimental_5.7.103.tgz"; - url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.103.tgz"; - sha512 = "oo9QI0TjXdrlZnDSJMazRJe+nnd0OwXgzRmHcsnyp4k6UxmmlaWEA1iq3RY3EDSKwYEJ+lDnwQeAaGRleU/LEQ=="; + name = "tldts_experimental___tldts_experimental_5.7.104.tgz"; + url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.104.tgz"; + sha512 = "GSFlkgTW0csMjbCCbjd4cnkV6MbUVVxE27S8CS+gN44QZzcygepDSKVyQ81hkwMZrLwDDrOmWEAEhNVJJ6JSBA=="; }; } { @@ -5482,11 +5466,11 @@ }; } { - name = "ws___ws_8.11.0.tgz"; + name = "ws___ws_8.12.0.tgz"; path = fetchurl { - name = "ws___ws_8.11.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz"; - sha512 = "HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg=="; + name = "ws___ws_8.12.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz"; + sha512 = "kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig=="; }; } { diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ec1e55e3389de..0238fc61bcfaf 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -21,11 +21,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.6.2867.58"; + version = "5.7.2921.53"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb"; - sha256 = "sha256-eRHQaKztf66o9FoCNSRyXS5Ht6d51GTilNO5DxItUCw="; + sha256 = "sha256-qkKCoHJCRji3XfXk71n4BfjFyQpXZ+BariHmbYPAuv8="; }; unpackPhase = '' diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 3657a1e38e7f8..6475480b2191d 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "43.0"; + version = "43.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-fvG9N6HuuO8BMH8MJRquMSe1oEPNmX/pzsJX5yzs1CY="; + hash = "sha256-gHlhbQGtdIjKLMAkTxfc2QOjvNUPGKKL+OK8/vm0Oac="; }; outputs = [ "out" "devdoc" ]; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { xvfb-run ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; mesonFlags = [ "-Dgtk_doc=true" diff --git a/pkgs/applications/networking/circumflex/default.nix b/pkgs/applications/networking/circumflex/default.nix index 0afe9466b4cb5..4dab874fd8484 100644 --- a/pkgs/applications/networking/circumflex/default.nix +++ b/pkgs/applications/networking/circumflex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circumflex"; - version = "2.8"; + version = "2.8.1"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-knN+T/dmIwHLqT3MJBjQhGlSeAu0lE2ZOv6tLqkcwS0="; + hash = "sha256-hFhK1/ck37lfZJ2wpk1MGCfYEANhh8qzTb8m1t7EoBo="; }; - vendorHash = "sha256-Xwek2xlvdGO6C/T0a96RGuMcX7jCbvntEYBf10tvmAo="; + vendorHash = "sha256-rwqY6illp5+h/oHOnVg6QfZ6tRFJOamwqJxQx/zlpyI="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/clash-verge/default.nix b/pkgs/applications/networking/clash-verge/default.nix new file mode 100644 index 0000000000000..96c3a5a2f25f9 --- /dev/null +++ b/pkgs/applications/networking/clash-verge/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchurl +, dpkg +, wrapGAppsHook +, autoPatchelfHook +, openssl +, webkitgtk +, udev +, libappindicator-gtk3 +, libayatana-appindicator +}: + +stdenv.mkDerivation rec { + pname = "clash-verge"; + version = "1.2.3"; + + src = fetchurl { + url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb"; + hash = "sha256-uiw9kcXJ4ZEu+naUbUrgN/zBYE2bSWVPmMQ+HiAP4D4="; + }; + + unpackPhase = "dpkg-deb -x $src ."; + + nativeBuildInputs = [ + dpkg + wrapGAppsHook + autoPatchelfHook + ]; + + buildInputs = [ + openssl + webkitgtk + stdenv.cc.cc + ]; + + runtimeDependencies = [ + (lib.getLib udev) + libappindicator-gtk3 + libayatana-appindicator + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv usr/* $out + + runHook postInstall + ''; + + meta = with lib; { + description = "A Clash GUI based on tauri"; + homepage = "https://github.com/zzzgydi/clash-verge"; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl3Plus; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index e2cc376af297b..518a442329600 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2022.12.1"; + version = "2023.2.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-FXN/UUlzG3+AYYZeKJ6XUG4rD3cPWIx22h3zZpvZhiM="; + hash = "sha256-vhcz/uk1sBt7XytXQYcPreoPfNz7fdPVE+j+FTH7tPc="; }; vendorSha256 = null; @@ -56,6 +56,11 @@ buildGoModule rec { # Expected nil, but got: Could not lookup srv records on _us-v2-origintunneld._tcp.argotunnel.com: lookup _us-v2-origintunneld._tcp.argotunnel.com on [::1]:53: read udp [::1]:49342->[::1]:53: read: connection refused substituteInPlace "supervisor/supervisor_test.go" \ --replace "Test_Initialize_Same_Protocol" "Skip_Initialize_Same_Protocol" + + # Workaround for: manager_test.go:197: + # Should be false + substituteInPlace "datagramsession/manager_test.go" \ + --replace "TestManagerCtxDoneCloseSessions" "SkipManagerCtxDoneCloseSessions" ''; doCheck = !stdenv.isDarwin; diff --git a/pkgs/applications/networking/cluster/acorn/default.nix b/pkgs/applications/networking/cluster/acorn/default.nix index ce0f07f9ec103..cc79ae5d59fec 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.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "acorn-io"; repo = pname; rev = "v${version}"; - hash = "sha256-IzjCYVQ9RhuAmgloue421F43ARviaHW7mTkLhLW/VPM="; + hash = "sha256-9+jI3GBRuX06+aN8C8C3K72kKtQVwmfAwhYLViuERxk="; }; - vendorHash = "sha256-z2ya/CgH9AcxHe73Yt9XWbJqH4OrZWt0bRDsna5hYeo="; + vendorHash = "sha256-t/q94B+ihcHh/XFHs1Z9yQTwoFKv/nkhIDykymGNA2w="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 6d13063bd0560..fb9b6a1d11acf 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -35,16 +35,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-ZG10ruusSywXWn88UqrHVfAWrio2KoK2YoM9qdtMlhU="; + hash = "sha256-qNSnO+wtAKyUJwjIMZaiBUfgaoDFVttp04kTxr4H6po="; }; - vendorHash = "sha256-Tqn5HGhRbN++yAo9JajUMTxFjVLw5QTvsis8wcfRIHw="; + vendorHash = "sha256-75l4YCYC38uX63Uv/MA7HciQ+wumWhTuimL+ctizBCs="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index fedf499d481e4..3ee68ba8283f4 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.4.10"; + version = "0.4.12"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-DUWJDWqB+jyp3/2/eFP1ss2grNtrvUuvGWK0FYTXObc="; + sha256 = "sha256-YYUOW3QWJx+XdrZTaPEGs5TJH2lVUJGPcPYYehR3V0M="; }; - vendorHash = "sha256-4ylOLnpvz/aQIoxVz2z69Rq/x2UG91yMmtSHyquvNq0="; + vendorHash = "sha256-p8Q+oQFbkulcDFdHUoQ1qdO1zsi7XmU/IjnScZogz2g="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 034af9a07e5bc..86af4aef10653 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.5.7"; + version = "2.6.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-hEfPiDbEdmuD/IHM9Tfy0kUkKDpbTZ0HzMjIt/ifcPk="; + sha256 = "sha256-H/jrjU3iIlO75eN2Av/zuGe2G5KbJw9Xj6MCbWgTFEs="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-F5EY1/WWRPBN5fqp2J2mdpIzL1gNKR0ltzSdarT6dFw="; + vendorHash = "sha256-c4KvsHN+2QXk/+MJgRIm5L6LtRe5juUF8rw84aVot38="; # 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 9b0d76a5ac145..11ee9a8b3568e 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.56"; + version = "0.9.0"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-iU0/ovnclq/jwhi1d6zY4tz56ZB7FT0Mbpi2tEjb9QI="; + sha256 = "sha256-0o6keMr+bAAZ3gmaDhsU2r3T8hRxpkbqCnNVLqWvK+k="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-DsLW5l7TxlXRFZDhtRfq5YqVT3XR7EZGNIoPiksHNck="; + vendorHash = "sha256-WuBZj6W3/E9HbvWTBegmJdY+aw43CYyuw1hXF7RXd3A="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index 2fbbc9ad1d24f..a1335641e34e7 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.45"; + version = "1.0.48"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-wYZC4eEvxvHgtb0l+kpP2msQgt8InJu59lgS5cwGxRI="; + sha256 = "sha256-KoW+XKEFoe2QNJPu97MYYZnxbU0Wat8slJjQm/vtmew="; }; - vendorHash = "sha256-42ZTPl4kI+dgr78s9WvLFchQU9uvkMkkio53REjvpbw="; + vendorHash = "sha256-QzTu6/iFK+CS8UXoXSVq3OTuwk/xcHnAX4UpCU/Scpk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index b4c2d6c304e4b..7ff0a0101c970 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.5.0"; + version = "8.6.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-+fQnit2J3WQpir4HldkWKCex6byfp2IqEWCi4oJ5HgU="; + sha256 = "sha256-SApjp6rdyOyZD6onE0aZ1AeiR6XyPUT9SVJJe/ROEQQ="; }; - vendorSha256 = "sha256-Wz5OoCrIY/xEXk+eqXtqtgVGD8oGUPmhzT5mOcZRD8w="; + vendorHash = "sha256-xydewlruZvtWHm0IvVWuvv31+Z7/PLVC9gTZcQLaowk="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index fb755ac679372..3f614815f7a59 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.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-NmTMpTaekUTSMnIFn5e1DnuHehJLM5YToY+QK0hnvXk="; + hash = "sha256-bkjtJidG+UHma15axlLcXtqtWTqesOdHHmH4db5hoAY="; }; - vendorSha256 = "sha256-0C3tQgmu7YQgHyXh8lIYTrLFksCvFQp0uvIhQRuqbYM="; + vendorHash = "sha256-VPeaT4vPhBa6V+Ir+vNRIWgyVBzEgTDSnDtGrxxdZ0c="; subPackages = [ "cmd/clusterctl" ]; @@ -39,6 +39,7 @@ buildGoModule rec { }; meta = with lib; { + changelog = "https://github.com/kubernetes-sigs/cluster-api/releases/tag/${src.rev}"; description = "Kubernetes cluster API tool"; homepage = "https://cluster-api.sigs.k8s.io/"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/crc/default.nix b/pkgs/applications/networking/cluster/crc/default.nix index ed4e2b0583f80..c47062fdfc414 100644 --- a/pkgs/applications/networking/cluster/crc/default.nix +++ b/pkgs/applications/networking/cluster/crc/default.nix @@ -10,22 +10,22 @@ }: let - openShiftVersion = "4.11.18"; + openShiftVersion = "4.12.1"; okdVersion = "4.11.0-0.okd-2022-11-05-030711"; - podmanVersion = "4.2.0"; + podmanVersion = "4.3.1"; writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; in buildGoModule rec { - version = "2.12.0"; + version = "2.14.0"; pname = "crc"; - gitCommit = "ea98bb41e24ad81a319d0aa6c6e1286bc1334c1b"; + gitCommit = "868d96cd4f73dad72df54475c52c65f9741dc240"; modRoot = "cmd/crc"; src = fetchFromGitHub { owner = "crc-org"; repo = "crc"; rev = "v${version}"; - sha256 = "sha256-0e62mQ01pt0kClrEx4ss2T8BN1+0aQiCFPyDg5agbTU"; + sha256 = "sha256-q1OJJTveXoNzW9lohQOY7LVR3jOyiQZX5nHBgRupxTM="; }; vendorSha256 = null; @@ -55,7 +55,6 @@ buildGoModule rec { export HOME=$(mktemp -d) ''; - passthru.tests.version = testers.testVersion { package = crc; command = '' @@ -69,6 +68,6 @@ buildGoModule rec { description = "Manages a local OpenShift 4.x cluster or a Podman VM optimized for testing and development purposes"; homepage = "https://crc.dev"; license = licenses.asl20; - maintainers = with maintainers; [ shikanime tricktron ]; + maintainers = with maintainers; [ matthewpi shikanime tricktron ]; }; } diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index d05b34cd7de94..381cd1d456b53 100644 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 doCheck; + inherit (minikube) version src nativeBuildInputs buildInputs vendorHash doCheck; pname = "docker-machine-hyperkit"; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 9ef43bed2eec8..a35cfab16cd7e 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 doCheck; + inherit (minikube) version src nativeBuildInputs buildInputs vendorHash doCheck; pname = "docker-machine-kvm2"; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 97fff7f9bbb3e..a10761578c487 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.38.3"; - sha256 = "15sx743gbmlmww7jmi56r5nlajg33xmzacyd69hmp46jjxqdckmh"; - manifestsSha256 = "1dmp7gdnwbg4jjc3dq1wp2jn3z3g6lm296b1nf24ndcfmjja58cz"; + version = "0.40.2"; + sha256 = "00rzd9i9dd13wsr2f8y6b7q5zphrfx3bgigfinmzcfdinydv3bm4"; + manifestsSha256 = "05bkqkhyb3mgd68w2zr9bav6dfibfzfw65anzkz269wqrkf0d86k"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-IuOivH9K7e5vNpK44NKegzIEVHS+ihkX89++4DJC+8Q="; + vendorSha256 = "sha256-crFBOWRjgFIm4mrX3Sf9ovodG5t8hhJUbMr2qpIt7LQ="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests @@ -65,7 +65,7 @@ in buildGoModule rec { ''; homepage = "https://fluxcd.io"; license = licenses.asl20; - maintainers = with maintainers; [ bryanasdev000 jlesquembre ]; + maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ]; mainProgram = "flux"; }; } diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh index 2d25eee6f347e..8c80ef9fda344 100755 --- a/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -38,7 +38,9 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then if [ $# -eq 1 ] && [ "$1" = "git" ]; then git switch -c "package-fluxcd-${LATEST_VERSION}" git add "$FLUXCD_PATH"/default.nix - git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}" + git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION} + +Release: https://github.com/fluxcd/flux2/releases/tag/v${LATEST_VERSION}" fi else echo "fluxcd is already up-to-date at $OLD_VERSION" diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 5f8781665f4c1..6f54aba1f0fd3 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.3"; + version = "1.13.8"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-nxClmCY/joLJw87IQx9DvAZLv5LgOLGlp9Unh37OKgg="; + hash = "sha256-mflLB+fdNgOlxq/Y2muIyNZHZPFhL6Px355l9w54zC4="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorHash = "sha256-Lpc/fzOJLIyI2O5DP8K/LBYg6ZA1ixristercAM5VUQ="; + vendorHash = "sha256-sQv6g0Xgs+6jgxacWJwE3dK3GimfiPHly0Z0rvdKNE4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 60f6c3ddb5ea2..12868dcc5afcc 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kubernetes-helm }: buildGoModule rec { pname = "kubernetes-helm"; - version = "3.11.0"; + version = "3.11.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-Pes1p7rTO17Bef6qacsQWJkhb1CWilzmVYQe886EepU="; + sha256 = "sha256-TrjPpKFHMF+dPz9AqXVkYPUNWeWEeH8bA37Dpxr7b8s="; }; vendorSha256 = "sha256-LRMDrBSl5EGQqQt5FUU4JJHqdwfYt5qsVpe76jUQBVI="; @@ -20,12 +20,13 @@ buildGoModule rec { "-X helm.sh/helm/v3/internal/version.gitCommit=${src.rev}" ]; + __darwinAllowLocalNetworking = true; + preCheck = '' # skipping version tests because they require dot git directory substituteInPlace cmd/helm/version_test.go \ --replace "TestVersion" "SkipVersion" - '' + lib.optionalString stdenv.isLinux '' - # skipping plugin tests on linux + # skipping plugin tests substituteInPlace cmd/helm/plugin_test.go \ --replace "TestPluginDynamicCompletion" "SkipPluginDynamicCompletion" \ --replace "TestLoadPlugins" "SkipLoadPlugins" @@ -41,6 +42,12 @@ buildGoModule rec { installShellCompletion helm.{bash,zsh,fish} ''; + passthru.tests.version = testers.testVersion { + package = kubernetes-helm; + command = "helm version"; + version = "v${version}"; + }; + meta = with lib; { homepage = "https://github.com/kubernetes/helm"; description = "A package manager for kubernetes"; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 64fa0f35e543b..c08e12a4de8e2 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - sha256 = "sha256-evFdMM2AilKQPdSCUzKo6RuC4OC4zfjj+JzFvtkSrdk="; + sha256 = "sha256-JeQP2KXoLxkyRZVFcd6Rrz5xyJd+F3plzznAVP3Um8g="; }; - vendorSha256 = "sha256-9i4ryBpaK7mMbsOpIaaZWBRjewD1MtTpf4zJ0yU0KMg="; + vendorSha256 = "sha256-d5NSqCJrk9QhV5gVOKUG/uJxuvt8X8hiQd8yJEoXPL0="; + + ldflags = [ "-s" "-w" "-X github.com/databus23/helm-diff/v3/cmd.Version=${version}" ]; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 7d9135045f179..39a03eceacaaa 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "3.8.3"; + version = "4.2.2"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-FpF/d+e5T6nb0OENaYLY+3ATZ+qcAeih5/yKI+AtfKA="; + hash = "sha256-aqRgny1vU+dxpZpzwL4aSbYfTGrZbRffQy81mMBvnJk="; }; nativeBuildInputs = [ makeWrapper ]; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { # NOTE: helm-secrets is comprised of shell scripts. dontBuild = true; - # NOTE: Remove the install and upgrade hooks. + # NOTE: Fix version string postPatch = '' - sed -i '/^hooks:/,+2 d' plugin.yaml + sed -i 's/^version:.*/version: "${version}"/' plugin.yaml ''; installPhase = '' diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 2a9b047723342..b80c9c81d5d74 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,29 +2,30 @@ buildGoModule rec { pname = "helmfile"; - version = "0.145.2"; + version = "0.151.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-ipGMGby7qUoFJNc+7+Gq+JaBUdxm19NwhklWsTpslVI="; + sha256 = "sha256-hzsxuvHzdjNRqTk4yEBZhT/j1fVCAk+843kY4MsN0AM="; }; - vendorSha256 = "sha256-031Xdr3u35uirDBZhExdh8PMAZa1gfMTC2II8VMbr6Q="; + vendorHash = "sha256-f0K3/xF+nJvlhtLAyLOah2RaZbaEqD8C28cPCLyaCXI="; doCheck = false; subPackages = [ "." ]; - ldflags = [ "-s" "-w" "-X github.com/helmfile/helmfile/pkg/app/version.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X go.szostok.io/version.version=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; postInstall = '' installShellCompletion --cmd helmfile \ - --bash ./autocomplete/helmfile_bash_autocomplete \ - --zsh ./autocomplete/helmfile_zsh_autocomplete + --bash <($out/bin/helmfile completion bash) \ + --fish <($out/bin/helmfile completion fish) \ + --zsh <($out/bin/helmfile completion zsh) ''; meta = { diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index fb268db1810a7..b09d167c24afb 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.16.1"; + version = "3.16.4"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-QhAmedSDBi1aRNmp4LR5Xv4HMzcextzT67g9nxN4eko="; + sha256 = "sha256-8hv68O4U9bPjqqtVOpmY3DwfeTGEZJGVkzIyYhS14aM="; }; - vendorHash = "sha256-bVgYj0e/z57sIvVZXAzLkKqKLa0Pe0CT57Vc7Df1oWE="; + vendorHash = "sha256-aSpv4TGp0YLdk/RYEvfYswlEWnv8sy9iflXGGCcKPHs="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index ec4c1b8a04b4e..a45002e34b704 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.16.1"; + version = "1.17.1"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-IYmNmrUdlp0V+gsAwivkF73VcBBMDcA5QWSnJ+6qKks="; + sha256 = "sha256-6YoznN/wqgmNzBV0ukySwSQvnF4qQeH52uXlEgZTpig="; }; - vendorSha256 = "sha256-yCdCuwiAAdyeLtu4zE7d8RLbqM6FuH9sw0EqDZohQxg="; + vendorHash = "sha256-9A4Du5expdbFKFIrcPTADyRINhiPpsboqsbszg638LY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/k3s/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_23/chart-versions.nix index 8c40604d0f1c6..8c40604d0f1c6 100644 --- a/pkgs/applications/networking/cluster/k3s/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_23/chart-versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_23/default.nix b/pkgs/applications/networking/cluster/k3s/1_23/default.nix new file mode 100644 index 0000000000000..3abe8c6755398 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_23/default.nix @@ -0,0 +1,328 @@ +{ stdenv +, lib +, makeWrapper +, socat +, iptables +, iproute2 +, ipset +, bridge-utils +, btrfs-progs +, conntrack-tools +, buildGoModule +, runc +, rsync +, kmod +, libseccomp +, pkg-config +, ethtool +, util-linux +, fetchFromGitHub +, fetchurl +, fetchzip +, fetchgit +, zstd +, yq-go +, nixosTests +, k3s +, pkgsBuildBuild +}: + +with lib; + +# k3s is a kinda weird derivation. One of the main points of k3s is the +# simplicity of it being one binary that can perform several tasks. +# However, when you have a good package manager (like nix), that doesn't +# actually make much of a difference; you don't really care if it's one binary +# or 10 since with a good package manager, installing and running it is +# identical. +# Since upstream k3s packages itself as one large binary with several +# "personalities" (in the form of subcommands like 'k3s agent' and 'k3s +# kubectl'), it ends up being easiest to mostly mimic upstream packaging, with +# some exceptions. +# K3s also carries patches to some packages (such as containerd and cni +# plugins), so we intentionally use the k3s versions of those binaries for k3s, +# even if the upstream version of those binaries exist in nixpkgs already. In +# the end, that means we have a thick k3s binary that behaves like the upstream +# one for the most part. +# However, k3s also bundles several pieces of unpatched software, from the +# strongswan vpn software, to iptables, to socat, conntrack, busybox, etc. +# Those pieces of software we entirely ignore upstream's handling of, and just +# make sure they're in the path if desired. +let + k3sVersion = "1.23.16+k3s1"; # k3s git tag + k3sCommit = "64b0feeb36c2a26976a364a110f23ebcf971f976"; # k3s git commit at the above version + k3sRepoSha256 = "sha256-H6aaYa5OYAaD5hjSi8+RNXiP1zhRZCgKXQA6eU7AWBk="; + k3sVendorSha256 = "sha256-+xygljXp27NahsHSgoigMANBQCRwGFYwGHQEwlI9YsQ="; + + # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/download#L29-L32 + # see also https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/manifests/traefik.yaml#L8-L16 + # At the time of writing, there are two traefik charts, and that's it + charts = import ./chart-versions.nix; + + # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/version.sh#L54 + k3sRootVersion = "0.12.1"; + k3sRootSha256 = "sha256-xCXbarWztnvW2xn3cGa84hie3OevVZeGEDWh+Uf3RBw="; + + # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/version.sh#L47 + k3sCNIVersion = "1.1.1-k3s1"; + k3sCNISha256 = "sha256-1Br7s+iMtfiPjM0EcNPuFdSlp9dVPjSG1UGuiPUfq5I="; + + # taken from go.mod, the 'github.com/containerd/containerd' line + # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` + # https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/go.mod#L9 + containerdVersion = "1.5.16-k3s2-1-22"; + containerdSha256 = "sha256-PRrp05Jgx368Ox4hTC66lbCInWuex0OtAuCY4l8geqA="; + + # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag + # https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/go.mod#L19 + criCtlVersion = "1.22.0-k3s1"; + + baseMeta = k3s.meta; + + # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 + versionldflags = [ + "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}" + "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}" + "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitTreeState=clean" + "-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z" + "-X k8s.io/component-base/version.gitVersion=v${k3sVersion}" + "-X k8s.io/component-base/version.gitCommit=${k3sCommit}" + "-X k8s.io/component-base/version.gitTreeState=clean" + "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z" + "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}" + "-X github.com/containerd/containerd/version.Version=v${containerdVersion}" + "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" + ]; + + # bundled into the k3s binary + traefikChart = fetchurl charts.traefik; + traefik-crdChart = fetchurl charts.traefik-crd; + + # so, k3s is a complicated thing to package + # This derivation attempts to avoid including any random binaries from the + # internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which + # we don't care about doing, we can add those as build or runtime + # dependencies using a real package manager). + # In addition to those binaries, it's also configuration though (right now + # mostly strongswan configuration), and k3s does use those files. + # As such, we download it in order to grab 'etc' and bundle it into the final + # k3s binary. + k3sRoot = fetchzip { + # Note: marked as apache 2.0 license + url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; + sha256 = k3sRootSha256; + stripRoot = false; + }; + k3sCNIPlugins = buildGoModule rec { + pname = "k3s-cni-plugins"; + version = k3sCNIVersion; + vendorSha256 = null; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "rancher"; + repo = "plugins"; + rev = "v${version}"; + sha256 = k3sCNISha256; + }; + + postInstall = '' + mv $out/bin/plugins $out/bin/cni + ''; + + meta = baseMeta // { + description = "CNI plugins, as patched by rancher for k3s"; + }; + }; + # Grab this separately from a build because it's used by both stages of the + # k3s build. + k3sRepo = fetchgit { + url = "https://github.com/k3s-io/k3s"; + rev = "v${k3sVersion}"; + sha256 = k3sRepoSha256; + }; + # Stage 1 of the k3s build: + # Let's talk about how k3s is structured. + # One of the ideas of k3s is that there's the single "k3s" binary which can + # do everything you need, from running a k3s server, to being a worker node, + # to running kubectl. + # The way that actually works is that k3s is a single go binary that contains + # a bunch of bindata that it unpacks at runtime into directories (either the + # user's home directory or /var/lib/rancher if run as root). + # This bindata includes both binaries and configuration. + # In order to let nixpkgs do all its autostripping/patching/etc, we split this into two derivations. + # First, we build all the binaries that get packed into the thick k3s binary + # (and output them from one derivation so they'll all be suitably patched up). + # Then, we bundle those binaries into our thick k3s binary and use that as + # the final single output. + # This approach was chosen because it ensures the bundled binaries all are + # correctly built to run with nix (we can lean on the existing buildGoModule + # stuff), and we can again lean on that tooling for the final k3s binary too. + # Other alternatives would be to manually run the + # strip/patchelf/remove-references step ourselves in the installPhase of the + # derivation when we've built all the binaries, but haven't bundled them in + # with generated bindata yet. + + k3sServer = buildGoModule rec { + pname = "k3s-server"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libseccomp ]; + + subPackages = [ "cmd/server" ]; + ldflags = versionldflags; + + # create the multicall symlinks for k3s + postInstall = '' + mv $out/bin/server $out/bin/k3s + pushd $out + # taken verbatim from https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/build#L123-L131 + ln -s k3s ./bin/k3s-agent + ln -s k3s ./bin/k3s-server + ln -s k3s ./bin/k3s-etcd-snapshot + ln -s k3s ./bin/k3s-secrets-encrypt + ln -s k3s ./bin/k3s-certificate + ln -s k3s ./bin/k3s-completion + ln -s k3s ./bin/kubectl + ln -s k3s ./bin/crictl + ln -s k3s ./bin/ctr + popd + ''; + + meta = baseMeta // { + description = "The various binaries that get packaged into the final k3s binary"; + }; + }; + k3sContainerd = buildGoModule { + pname = "k3s-containerd"; + version = containerdVersion; + src = fetchFromGitHub { + owner = "k3s-io"; + repo = "containerd"; + rev = "v${containerdVersion}"; + sha256 = containerdSha256; + }; + vendorSha256 = null; + buildInputs = [ btrfs-progs ]; + subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; + ldflags = versionldflags; + }; +in +buildGoModule rec { + pname = "k3s"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + postPatch = '' + # Nix prefers dynamically linked binaries over static binary. + + substituteInPlace scripts/package-cli \ + --replace '"$LDFLAGS $STATIC" -o' \ + '"$LDFLAGS" -o' \ + --replace "STATIC=\"-extldflags \'-static\'\"" \ + "" + + # Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate': + + substituteInPlace scripts/package-cli \ + --replace '"''${GO}" generate' \ + 'GOFLAGS="" \ + GOOS="${pkgsBuildBuild.go.GOOS}" \ + GOARCH="${pkgsBuildBuild.go.GOARCH}" \ + CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \ + "''${GO}" generate' + ''; + + # Important utilities used by the kubelet, see + # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 + # Note the list in that issue is stale and some aren't relevant for k3s. + k3sRuntimeDeps = [ + kmod + socat + iptables + iproute2 + ipset + bridge-utils + ethtool + util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 + conntrack-tools + ]; + + buildInputs = k3sRuntimeDeps; + + nativeBuildInputs = [ + makeWrapper + rsync + yq-go + zstd + ]; + + # embedded in the final k3s cli + propagatedBuildInputs = [ + k3sCNIPlugins + k3sContainerd + k3sServer + runc + ]; + + # We override most of buildPhase due to peculiarities in k3s's build. + # Specifically, it has a 'go generate' which runs part of the package. See + # this comment: + # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 + # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + buildPhase = '' + patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload + + # copy needed 'go generate' inputs into place + mkdir -p ./bin/aux + rsync -a --no-perms ${k3sServer}/bin/ ./bin/ + ln -vsf ${runc}/bin/runc ./bin/runc + ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni + ln -vsf ${k3sContainerd}/bin/* ./bin/ + rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ + mkdir -p ./build/static/charts + + cp ${traefikChart} ./build/static/charts + cp ${traefik-crdChart} ./build/static/charts + + export ARCH=$GOARCH + export DRONE_TAG="v${k3sVersion}" + export DRONE_COMMIT="${k3sCommit}" + # use ./scripts/package-cli to run 'go generate' + 'go build' + + ./scripts/package-cli + mkdir -p $out/bin + ''; + + # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase + doCheck = false; + + installPhase = '' + # wildcard to match the arm64 build too + install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s + wrapProgram $out/bin/k3s \ + --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ + --prefix PATH : "$out/bin" + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null + ''; + + # Fix-Me: Needs to be adapted specifically for 1.23 + # passthru.updateScript = ./update.sh; + + passthru.tests = k3s.passthru.mkTests k3sVersion; + + meta = baseMeta; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_24/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_24/chart-versions.nix new file mode 100644 index 0000000000000..8c40604d0f1c6 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_24/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-20.3.1+up20.3.0.tgz"; + sha256 = "1775vjldvqvhzdbzanxhbaqbmkih09yb91im651q8bc7z5sb9ckn"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-20.3.1+up20.3.0.tgz"; + sha256 = "1rj0f0n0vgjcbzfwzhqmsd501i2f6vw145w9plbp8gwdyzmg2nc6"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_24/default.nix b/pkgs/applications/networking/cluster/k3s/1_24/default.nix new file mode 100644 index 0000000000000..2ff642f351115 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_24/default.nix @@ -0,0 +1,326 @@ +{ stdenv +, lib +, makeWrapper +, socat +, iptables +, iproute2 +, ipset +, bridge-utils +, btrfs-progs +, conntrack-tools +, buildGoModule +, runc +, rsync +, kmod +, libseccomp +, pkg-config +, ethtool +, util-linux +, fetchFromGitHub +, fetchurl +, fetchzip +, fetchgit +, zstd +, yq-go +, nixosTests +, k3s +, pkgsBuildBuild +}: + +# k3s is a kinda weird derivation. One of the main points of k3s is the +# simplicity of it being one binary that can perform several tasks. +# However, when you have a good package manager (like nix), that doesn't +# actually make much of a difference; you don't really care if it's one binary +# or 10 since with a good package manager, installing and running it is +# identical. +# Since upstream k3s packages itself as one large binary with several +# "personalities" (in the form of subcommands like 'k3s agent' and 'k3s +# kubectl'), it ends up being easiest to mostly mimic upstream packaging, with +# some exceptions. +# K3s also carries patches to some packages (such as containerd and cni +# plugins), so we intentionally use the k3s versions of those binaries for k3s, +# even if the upstream version of those binaries exist in nixpkgs already. In +# the end, that means we have a thick k3s binary that behaves like the upstream +# one for the most part. +# However, k3s also bundles several pieces of unpatched software, from the +# strongswan vpn software, to iptables, to socat, conntrack, busybox, etc. +# Those pieces of software we entirely ignore upstream's handling of, and just +# make sure they're in the path if desired. +let + k3sVersion = "1.24.10+k3s1"; # k3s git tag + k3sCommit = "546a94e9ae1c3be6f9c0dcde32a6e6672b035bc8"; # k3s git commit at the above version + k3sRepoSha256 = "sha256-HfkGb3GtR2wQkVIze26aFh6A6W0fegr8ovpSel7oujQ="; + k3sVendorSha256 = "sha256-YAerisDr/knlKPaO2fVMZA4FUpwshFmkpi3mJAmLqKM="; + + # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/scripts/download#L29-L32 + # see also https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/manifests/traefik.yaml#L8-L16 + # At the time of writing, there are two traefik charts, and that's it + charts = import ./chart-versions.nix; + + # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/scripts/version.sh#L56 + k3sRootVersion = "0.12.1"; + k3sRootSha256 = "sha256-xCXbarWztnvW2xn3cGa84hie3OevVZeGEDWh+Uf3RBw="; + + # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/scripts/version.sh#L49 + k3sCNIVersion = "1.1.1-k3s1"; + k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; + + # taken from go.mod, the 'github.com/containerd/containerd' line + # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` + # https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/go.mod#L10 + containerdVersion = "1.5.16-k3s1"; + containerdSha256 = "sha256-dxC44qE1A20Hd2j77Ir9Sla8xncttswWIuGGM/5FWi8="; + + # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag + # https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/go.mod#L18 + criCtlVersion = "1.24.0-k3s1"; + + baseMeta = k3s.meta; + + # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 + versionldflags = [ + "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}" + "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}" + "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitTreeState=clean" + "-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z" + "-X k8s.io/component-base/version.gitVersion=v${k3sVersion}" + "-X k8s.io/component-base/version.gitCommit=${k3sCommit}" + "-X k8s.io/component-base/version.gitTreeState=clean" + "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z" + "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}" + "-X github.com/containerd/containerd/version.Version=v${containerdVersion}" + "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" + ]; + + # bundled into the k3s binary + traefikChart = fetchurl charts.traefik; + traefik-crdChart = fetchurl charts.traefik-crd; + + # so, k3s is a complicated thing to package + # This derivation attempts to avoid including any random binaries from the + # internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which + # we don't care about doing, we can add those as build or runtime + # dependencies using a real package manager). + # In addition to those binaries, it's also configuration though (right now + # mostly strongswan configuration), and k3s does use those files. + # As such, we download it in order to grab 'etc' and bundle it into the final + # k3s binary. + k3sRoot = fetchzip { + # Note: marked as apache 2.0 license + url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; + sha256 = k3sRootSha256; + stripRoot = false; + }; + k3sCNIPlugins = buildGoModule rec { + pname = "k3s-cni-plugins"; + version = k3sCNIVersion; + vendorSha256 = null; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "rancher"; + repo = "plugins"; + rev = "v${version}"; + sha256 = k3sCNISha256; + }; + + postInstall = '' + mv $out/bin/plugins $out/bin/cni + ''; + + meta = baseMeta // { + description = "CNI plugins, as patched by rancher for k3s"; + }; + }; + # Grab this separately from a build because it's used by both stages of the + # k3s build. + k3sRepo = fetchgit { + url = "https://github.com/k3s-io/k3s"; + rev = "v${k3sVersion}"; + sha256 = k3sRepoSha256; + }; + # Stage 1 of the k3s build: + # Let's talk about how k3s is structured. + # One of the ideas of k3s is that there's the single "k3s" binary which can + # do everything you need, from running a k3s server, to being a worker node, + # to running kubectl. + # The way that actually works is that k3s is a single go binary that contains + # a bunch of bindata that it unpacks at runtime into directories (either the + # user's home directory or /var/lib/rancher if run as root). + # This bindata includes both binaries and configuration. + # In order to let nixpkgs do all its autostripping/patching/etc, we split this into two derivations. + # First, we build all the binaries that get packed into the thick k3s binary + # (and output them from one derivation so they'll all be suitably patched up). + # Then, we bundle those binaries into our thick k3s binary and use that as + # the final single output. + # This approach was chosen because it ensures the bundled binaries all are + # correctly built to run with nix (we can lean on the existing buildGoModule + # stuff), and we can again lean on that tooling for the final k3s binary too. + # Other alternatives would be to manually run the + # strip/patchelf/remove-references step ourselves in the installPhase of the + # derivation when we've built all the binaries, but haven't bundled them in + # with generated bindata yet. + + k3sServer = buildGoModule rec { + pname = "k3s-server"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libseccomp ]; + + subPackages = [ "cmd/server" ]; + ldflags = versionldflags; + + # create the multicall symlinks for k3s + postInstall = '' + mv $out/bin/server $out/bin/k3s + pushd $out + # taken verbatim from https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/scripts/build#L123-L131 + ln -s k3s ./bin/k3s-agent + ln -s k3s ./bin/k3s-server + ln -s k3s ./bin/k3s-etcd-snapshot + ln -s k3s ./bin/k3s-secrets-encrypt + ln -s k3s ./bin/k3s-certificate + ln -s k3s ./bin/k3s-completion + ln -s k3s ./bin/kubectl + ln -s k3s ./bin/crictl + ln -s k3s ./bin/ctr + popd + ''; + + meta = baseMeta // { + description = "The various binaries that get packaged into the final k3s binary"; + }; + }; + k3sContainerd = buildGoModule { + pname = "k3s-containerd"; + version = containerdVersion; + src = fetchFromGitHub { + owner = "k3s-io"; + repo = "containerd"; + rev = "v${containerdVersion}"; + sha256 = containerdSha256; + }; + vendorSha256 = null; + buildInputs = [ btrfs-progs ]; + subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; + ldflags = versionldflags; + }; +in +buildGoModule rec { + pname = "k3s"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + postPatch = '' + # Nix prefers dynamically linked binaries over static binary. + + substituteInPlace scripts/package-cli \ + --replace '"$LDFLAGS $STATIC" -o' \ + '"$LDFLAGS" -o' \ + --replace "STATIC=\"-extldflags \'-static\'\"" \ + "" + + # Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate': + + substituteInPlace scripts/package-cli \ + --replace '"''${GO}" generate' \ + 'GOFLAGS="" \ + GOOS="${pkgsBuildBuild.go.GOOS}" \ + GOARCH="${pkgsBuildBuild.go.GOARCH}" \ + CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \ + "''${GO}" generate' + ''; + + # Important utilities used by the kubelet, see + # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 + # Note the list in that issue is stale and some aren't relevant for k3s. + k3sRuntimeDeps = [ + kmod + socat + iptables + iproute2 + ipset + bridge-utils + ethtool + util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 + conntrack-tools + ]; + + buildInputs = k3sRuntimeDeps; + + nativeBuildInputs = [ + makeWrapper + rsync + yq-go + zstd + ]; + + # embedded in the final k3s cli + propagatedBuildInputs = [ + k3sCNIPlugins + k3sContainerd + k3sServer + runc + ]; + + # We override most of buildPhase due to peculiarities in k3s's build. + # Specifically, it has a 'go generate' which runs part of the package. See + # this comment: + # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 + # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + buildPhase = '' + patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload + + # copy needed 'go generate' inputs into place + mkdir -p ./bin/aux + rsync -a --no-perms ${k3sServer}/bin/ ./bin/ + ln -vsf ${runc}/bin/runc ./bin/runc + ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni + ln -vsf ${k3sContainerd}/bin/* ./bin/ + rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ + mkdir -p ./build/static/charts + + cp ${traefikChart} ./build/static/charts + cp ${traefik-crdChart} ./build/static/charts + + export ARCH=$GOARCH + export DRONE_TAG="v${k3sVersion}" + export DRONE_COMMIT="${k3sCommit}" + # use ./scripts/package-cli to run 'go generate' + 'go build' + + ./scripts/package-cli + mkdir -p $out/bin + ''; + + # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase + doCheck = false; + + installPhase = '' + # wildcard to match the arm64 build too + install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s + wrapProgram $out/bin/k3s \ + --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ + --prefix PATH : "$out/bin" + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null + ''; + + # Fix-Me: Needs to be adapted specifically for 1.24 + # passthru.updateScript = ./update.sh; + + passthru.tests = k3s.passthru.mkTests k3sVersion; + + meta = baseMeta; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_25/0001-script-download-strip-downloading-just-package-CRD.patch b/pkgs/applications/networking/cluster/k3s/1_25/0001-script-download-strip-downloading-just-package-CRD.patch new file mode 100644 index 0000000000000..115fd6824772b --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_25/0001-script-download-strip-downloading-just-package-CRD.patch @@ -0,0 +1,41 @@ +From 6f53bd36a40da4c71486e3b79f6e32d53d6eea5d Mon Sep 17 00:00:00 2001 +From: Euan Kemp <euank@euank.com> +Date: Thu, 3 Feb 2022 23:50:40 -0800 +Subject: [PATCH 2/2] scrips/download: strip downloading, just package CRD + +The CRD packaging is a complicated set of commands, so let's reuse it. +--- + scripts/download | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/scripts/download b/scripts/download +index 5effc0562a..82361803ee 100755 +--- a/scripts/download ++++ b/scripts/download +@@ -24,12 +24,6 @@ rm -rf ${CONTAINERD_DIR} + mkdir -p ${CHARTS_DIR} + mkdir -p ${DATA_DIR} + +-curl --compressed -sfL https://github.com/k3s-io/k3s-root/releases/download/${VERSION_ROOT}/k3s-root-${ARCH}.tar | tar xf - --exclude=bin/socat +- +-git clone --single-branch --branch=${VERSION_RUNC} --depth=1 https://github.com/opencontainers/runc ${RUNC_DIR} +- +-git clone --single-branch --branch=${VERSION_CONTAINERD} --depth=1 https://github.com/k3s-io/containerd ${CONTAINERD_DIR} +- + setup_tmp() { + TMP_DIR=$(mktemp -d --tmpdir=${CHARTS_DIR}) + cleanup() { +@@ -44,8 +38,8 @@ setup_tmp() { + + download_and_package_traefik () { + echo "Downloading Traefik Helm chart from ${TRAEFIK_URL}" +- curl -sfL ${TRAEFIK_URL} -o ${TMP_DIR}/${TRAEFIK_FILE} +- code=$? ++ # nixpkgs: copy in our known traefik chart instead ++ cp $TRAEFIK_CHART_FILE ${TMP_DIR}/${TRAEFIK_FILE} + + if [ $code -ne 0 ]; then + echo "Error: Failed to download Traefik Helm chart!" +-- +2.34.1 + diff --git a/pkgs/applications/networking/cluster/k3s/1_25/default.nix b/pkgs/applications/networking/cluster/k3s/1_25/default.nix new file mode 100644 index 0000000000000..5b5fc097e77da --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_25/default.nix @@ -0,0 +1,330 @@ +{ stdenv +, lib +, makeWrapper +, socat +, iptables +, iproute2 +, ipset +, bridge-utils +, btrfs-progs +, conntrack-tools +, buildGoModule +, runc +, rsync +, kmod +, libseccomp +, pkg-config +, ethtool +, util-linux +, fetchFromGitHub +, fetchurl +, fetchzip +, fetchgit +, zstd +, yq-go +, nixosTests +, pkgsBuildBuild +, k3s +}: + +# k3s is a kinda weird derivation. One of the main points of k3s is the +# simplicity of it being one binary that can perform several tasks. +# However, when you have a good package manager (like nix), that doesn't +# actually make much of a difference; you don't really care if it's one binary +# or 10 since with a good package manager, installing and running it is +# identical. +# Since upstream k3s packages itself as one large binary with several +# "personalities" (in the form of subcommands like 'k3s agent' and 'k3s +# kubectl'), it ends up being easiest to mostly mimic upstream packaging, with +# some exceptions. +# K3s also carries patches to some packages (such as containerd and cni +# plugins), so we intentionally use the k3s versions of those binaries for k3s, +# even if the upstream version of those binaries exist in nixpkgs already. In +# the end, that means we have a thick k3s binary that behaves like the upstream +# one for the most part. +# However, k3s also bundles several pieces of unpatched software, from the +# strongswan vpn software, to iptables, to socat, conntrack, busybox, etc. +# Those pieces of software we entirely ignore upstream's handling of, and just +# make sure they're in the path if desired. +let + k3sVersion = "1.25.3+k3s1"; # k3s git tag + k3sCommit = "f2585c1671b31b4b34bddbb3bf4e7d69662b0821"; # k3s git commit at the above version + k3sRepoSha256 = "0zwf3iwjcidx14zw36s1hr0q8wmmbfc0rfqwd7fmpjq597h8zkms"; + k3sVendorSha256 = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ="; + + # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 + # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. + traefikChartVersion = "12.0.0"; + traefikChartSha256 = "1sqmi71fi3ad5dh5fmsp9mv80x6pkgqwi4r9fr8l6i9sdnai6f1a"; + + # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 + k3sRootVersion = "0.11.0"; + k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620"; + + # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 + k3sCNIVersion = "1.1.1-k3s1"; + k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; + + # taken from go.mod, the 'github.com/containerd/containerd' line + # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` + containerdVersion = "1.5.13-k3s2"; + containerdSha256 = "1pfr2ji4aij9js90gf4a3hqnhyw5hshcjdccm62l700j68gs5z97"; + + # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag + criCtlVersion = "1.25.0-k3s1"; + + baseMeta = k3s.meta; + + # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 + versionldflags = [ + "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}" + "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}" + "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitTreeState=clean" + "-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z" + "-X k8s.io/component-base/version.gitVersion=v${k3sVersion}" + "-X k8s.io/component-base/version.gitCommit=${k3sCommit}" + "-X k8s.io/component-base/version.gitTreeState=clean" + "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z" + "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}" + "-X github.com/containerd/containerd/version.Version=v${containerdVersion}" + "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" + ]; + + # bundled into the k3s binary + traefikChart = fetchurl { + url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; + sha256 = traefikChartSha256; + }; + # so, k3s is a complicated thing to package + # This derivation attempts to avoid including any random binaries from the + # internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which + # we don't care about doing, we can add those as build or runtime + # dependencies using a real package manager). + # In addition to those binaries, it's also configuration though (right now + # mostly strongswan configuration), and k3s does use those files. + # As such, we download it in order to grab 'etc' and bundle it into the final + # k3s binary. + k3sRoot = fetchzip { + # Note: marked as apache 2.0 license + url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; + sha256 = k3sRootSha256; + stripRoot = false; + }; + k3sCNIPlugins = buildGoModule rec { + pname = "k3s-cni-plugins"; + version = k3sCNIVersion; + vendorSha256 = null; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "rancher"; + repo = "plugins"; + rev = "v${version}"; + sha256 = k3sCNISha256; + }; + + postInstall = '' + mv $out/bin/plugins $out/bin/cni + ''; + + meta = baseMeta // { + description = "CNI plugins, as patched by rancher for k3s"; + }; + }; + # Grab this separately from a build because it's used by both stages of the + # k3s build. + k3sRepo = fetchgit { + url = "https://github.com/k3s-io/k3s"; + rev = "v${k3sVersion}"; + sha256 = k3sRepoSha256; + }; + # Stage 1 of the k3s build: + # Let's talk about how k3s is structured. + # One of the ideas of k3s is that there's the single "k3s" binary which can + # do everything you need, from running a k3s server, to being a worker node, + # to running kubectl. + # The way that actually works is that k3s is a single go binary that contains + # a bunch of bindata that it unpacks at runtime into directories (either the + # user's home directory or /var/lib/rancher if run as root). + # This bindata includes both binaries and configuration. + # In order to let nixpkgs do all its autostripping/patching/etc, we split this into two derivations. + # First, we build all the binaries that get packed into the thick k3s binary + # (and output them from one derivation so they'll all be suitably patched up). + # Then, we bundle those binaries into our thick k3s binary and use that as + # the final single output. + # This approach was chosen because it ensures the bundled binaries all are + # correctly built to run with nix (we can lean on the existing buildGoModule + # stuff), and we can again lean on that tooling for the final k3s binary too. + # Other alternatives would be to manually run the + # strip/patchelf/remove-references step ourselves in the installPhase of the + # derivation when we've built all the binaries, but haven't bundled them in + # with generated bindata yet. + + k3sServer = buildGoModule rec { + pname = "k3s-server"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libseccomp ]; + + subPackages = [ "cmd/server" ]; + ldflags = versionldflags; + + # create the multicall symlinks for k3s + postInstall = '' + mv $out/bin/server $out/bin/k3s + pushd $out + # taken verbatim from https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/build#L105-L113 + ln -s k3s ./bin/k3s-agent + ln -s k3s ./bin/k3s-server + ln -s k3s ./bin/k3s-etcd-snapshot + ln -s k3s ./bin/k3s-secrets-encrypt + ln -s k3s ./bin/k3s-certificate + ln -s k3s ./bin/kubectl + ln -s k3s ./bin/crictl + ln -s k3s ./bin/ctr + popd + ''; + + meta = baseMeta // { + description = "The various binaries that get packaged into the final k3s binary"; + }; + }; + k3sContainerd = buildGoModule { + pname = "k3s-containerd"; + version = containerdVersion; + src = fetchFromGitHub { + owner = "k3s-io"; + repo = "containerd"; + rev = "v${containerdVersion}"; + sha256 = containerdSha256; + }; + vendorSha256 = null; + buildInputs = [ btrfs-progs ]; + subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; + ldflags = versionldflags; + }; +in +buildGoModule rec { + pname = "k3s"; + version = k3sVersion; + + src = k3sRepo; + vendorSha256 = k3sVendorSha256; + + patches = [ + ./0001-script-download-strip-downloading-just-package-CRD.patch + ]; + + postPatch = '' + # Nix prefers dynamically linked binaries over static binary. + + substituteInPlace scripts/package-cli \ + --replace '"$LDFLAGS $STATIC" -o' \ + '"$LDFLAGS" -o' \ + --replace "STATIC=\"-extldflags \'-static\'\"" \ + "" + + # Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate': + + substituteInPlace scripts/package-cli \ + --replace '"''${GO}" generate' \ + 'GOFLAGS="" \ + GOOS="${pkgsBuildBuild.go.GOOS}" \ + GOARCH="${pkgsBuildBuild.go.GOARCH}" \ + CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \ + "''${GO}" generate' + ''; + + # Important utilities used by the kubelet, see + # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 + # Note the list in that issue is stale and some aren't relevant for k3s. + k3sRuntimeDeps = [ + kmod + socat + iptables + iproute2 + ipset + bridge-utils + ethtool + util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 + conntrack-tools + ]; + + buildInputs = k3sRuntimeDeps; + + nativeBuildInputs = [ + makeWrapper + rsync + yq-go + zstd + ]; + + # embedded in the final k3s cli + propagatedBuildInputs = [ + k3sCNIPlugins + k3sContainerd + k3sServer + runc + ]; + + # We override most of buildPhase due to peculiarities in k3s's build. + # Specifically, it has a 'go generate' which runs part of the package. See + # this comment: + # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 + # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + buildPhase = '' + patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload + + # copy needed 'go generate' inputs into place + mkdir -p ./bin/aux + rsync -a --no-perms ${k3sServer}/bin/ ./bin/ + ln -vsf ${runc}/bin/runc ./bin/runc + ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni + ln -vsf ${k3sContainerd}/bin/* ./bin/ + rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ + mkdir -p ./build/static/charts + # Note, upstream's chart has a 00 suffix. This seems to not matter though, so we're ignoring that naming detail. + export TRAEFIK_CHART_FILE=${traefikChart} + # place the traefik chart using their code since it's complicated + # We trim the actual download, see patches + ./scripts/download + + export ARCH=$GOARCH + export DRONE_TAG="v${k3sVersion}" + export DRONE_COMMIT="${k3sCommit}" + # use ./scripts/package-cli to run 'go generate' + 'go build' + + ./scripts/package-cli + mkdir -p $out/bin + ''; + + # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase + doCheck = false; + + installPhase = '' + # wildcard to match the arm64 build too + install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s + wrapProgram $out/bin/k3s \ + --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ + --prefix PATH : "$out/bin" + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null + ''; + + # Fix-Me: Needs to be adapted specifically for 1.25 + # passthru.updateScript = ./update.sh; + + passthru.tests = k3s.passthru.mkTests k3sVersion; + + meta = baseMeta; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix new file mode 100644 index 0000000000000..8c40604d0f1c6 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_26/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-20.3.1+up20.3.0.tgz"; + sha256 = "1775vjldvqvhzdbzanxhbaqbmkih09yb91im651q8bc7z5sb9ckn"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-20.3.1+up20.3.0.tgz"; + sha256 = "1rj0f0n0vgjcbzfwzhqmsd501i2f6vw145w9plbp8gwdyzmg2nc6"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/1_26/default.nix index 02a65328cfd8f..1b8b5a1b2a645 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_26/default.nix @@ -4,6 +4,7 @@ , socat , iptables , iproute2 +, ipset , bridge-utils , btrfs-progs , conntrack-tools @@ -45,10 +46,10 @@ # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.26.0+k3s2"; # k3s git tag - k3sCommit = "f0ec6a4c127b2c671b271974a2f21783f0e3c525"; # k3s git commit at the above version - k3sRepoSha256 = "0yc2k45s321hjir3c2wabqihk96wbjxp274dpbh9kv3471j89lkm"; - k3sVendorSha256 = "sha256-ptC39SgzCA4CULA+VmcMGlPG8KsLRbWlVI/jQrrF/RU="; + k3sVersion = "1.26.1+k3s1"; # k3s git tag + k3sCommit = "f10af367c3c96863c081ada4018e94e085c9404d"; # k3s git commit at the above version + k3sRepoSha256 = "13h20yb9gyrclhv2r0vv7fnsr73i06686rm6r0pcvy72hw26i848"; + k3sVendorSha256 = "sha256-WvkuXHG6NM9eScuu7qG3HDZbBPAJ6xVPz3RRuAxP994="; # nix generated by update.sh # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32 @@ -65,8 +66,8 @@ let k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; # taken from ./scripts/version.sh VERSION_CONTAINERD - containerdVersion = "1.6.14-k3s1"; - containerdSha256 = "01zs2xbpmww6hdh248px4dlh1n7xy9gzj2b8afyfmv3c2m2alf5p"; + containerdVersion = "1.6.15-k3s1"; + containerdSha256 = "1bzmryqqdpmxl4471wda5q9hqjlgzcmsbwxcwd2ap34qx27my1qd"; # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag criCtlVersion = "1.26.0-rc.0-k3s1"; @@ -75,7 +76,7 @@ let description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank mic92 ]; + maintainers = with maintainers; [ euank mic92 superherointj yajo ]; platforms = platforms.linux; }; @@ -249,6 +250,7 @@ buildGoModule rec { socat iptables iproute2 + ipset bridge-utils ethtool util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 @@ -319,7 +321,14 @@ buildGoModule rec { passthru.updateScript = ./update.sh; - passthru.tests = nixosTests.k3s; + passthru.mkTests = version: + let k3s_version = "k3s_" + lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version); + in { + single-node = nixosTests.k3s.single-node.${k3s_version}; + multi-node = nixosTests.k3s.multi-node.${k3s_version}; + }; + passthru.tests = passthru.mkTests k3sVersion; + meta = baseMeta; } diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/1_26/update.sh index 651d54adc1d5c..651d54adc1d5c 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/1_26/update.sh diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index de9dd27b52646..7c57feacfb782 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.26.7"; + version = "0.27.3"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-TshUQJIwGSqVP+YUJvSHSczvnvzr1kX761oIbfQzVzw="; + sha256 = "sha256-oUn9qQG4rpunfeHgSlY9THkYv1aGWrVmdTZoEWeZJTs="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { tags = [ "netgo" ]; - vendorSha256 = "sha256-W0yU5rMUuO2JtKRZpexsCqIUy3h+2hSDRcq/lp0UHX8="; + vendorHash = "sha256-sQ3D4JUK9epRkDZ7DC+IH+iMaLN+uKM2hZkhqji+0Zc="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix new file mode 100644 index 0000000000000..6bae7297917b0 --- /dev/null +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, lib +, fetchFromGitHub +, buildGoModule +, installShellFiles +, testers +, kaniko +}: + +buildGoModule rec { + pname = "kaniko"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "GoogleContainerTools"; + repo = "kaniko"; + rev = "v${version}"; + hash = "sha256-sPICsDgkijQ7PyeTWQgT553toc4/rWPPo7SY3ptX82U="; + }; + + vendorHash = null; + + ldflags = [ + "-s" "-w" + "-X github.com/GoogleContainerTools/kaniko/pkg/version.version=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + doCheck = false; # requires docker, container-diff (unpackaged yet) + + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + for shell in bash fish zsh; do + $out/bin/executor completion $shell > executor.$shell + installShellCompletion executor.$shell + done + ''; + + passthru.tests.version = testers.testVersion { + package = kaniko; + version = version; + command = "${kaniko}/bin/executor version"; + }; + + meta = { + description = "A tool to build container images from a Dockerfile, inside a container or Kubernetes cluster"; + homepage = "https://github.com/GoogleContainerTools/kaniko"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jk superherointj ]; + mainProgram = "executor"; + }; +} diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index bf35eac948d43..88967da07e784 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "karmor"; - version = "0.11.5"; + version = "0.11.7"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-xVYhZT4yqbSmxGH5DaarXzrGYMS1BuTaQ2T+huWYLBw="; + hash = "sha256-sXiv+aCYuN6GJB+6/G4Z1Oe/fB3OO+jhSvCAFUaiD3g="; }; - vendorHash = "sha256-rlvAQ99/3+3VotyYAR2TgWG8ZdTKUT2XRv4hTF+QFpI="; + vendorHash = "sha256-9yCT9GspX2Tl6dISF8qvDF/Tm2mfwuDH+DrouFmxpj8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix index aefcef2bacccb..6a02127405d3a 100644 --- a/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/pkgs/applications/networking/cluster/kluctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kluctl"; - version = "2.18.4"; + version = "2.19.0"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; rev = "v${version}"; - hash = "sha256-nHfJ7Dt9nAY4fY+U7W46cPRwWSgtGvwdbUjQAynOQdw="; + hash = "sha256-2nAgJj/cMDiE5rw/YixNYQNCWnuC/8EX4BrnXN4Npao="; }; - vendorHash = "sha256-ADYXLcCYmlQim9KvqkXGdEXJ9cACBsRCb3emcmrL0kg="; + vendorHash = "sha256-xBUrY8v4yHtWGaaRXHxQRGdZHzMGoJX2hFLL+0Vb1QY="; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index 7e7bba1d37b39..be8834d05f531 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-capacity"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "robscott"; repo = pname; - sha256 = "sha256-lNpUOA6O9sOBugYp9fDklKo6U2E0nKz1ORr3qO2tibg="; + sha256 = "sha256-zf6e8+jkgJns1c71QLL1gd0zK34X7gJo1gS38A1DPJo="; }; vendorHash = "sha256-qfSya42wZEmJCC7o8zJQEv0BWrxTuBT2Jzcq/AfI+OE="; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 7fd5175e1e481..461b29aed69c2 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.28.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-5IaF7q9Ue+tHkThxYgpkrnEH7xpKBx6cqKf2Zw2mjN4="; + hash = "sha256-41hctulZdFSBc+Yw4p2haR2VNIpa0bwntPCz3WUJyZg="; }; - vendorHash = "sha256-Fh8QlXZ7I3XORjRhf5DIQmqA35LmgWVTN+iZDGaYHD8="; + vendorHash = "sha256-VGLGa1/8sdVC3H4hxpvF/t2YgbRlbeNTJMJb5zwknPw="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix index 031fa0c21b779..995125d250334 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.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "kvaps"; repo = "kubectl-node-shell"; rev = "v${version}"; - sha256 = "sha256-dAsNgvHgquXdb2HhLDYLk9IALneKkOxQxKb7BD90+1E="; + sha256 = "sha256-TCd/VipsUT/h88CevqCLUUjN7wAJKYxxq63IpEF2P1Y="; }; strictDeps = true; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 45f0ee66f61e6..474a27238f205 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.25"; + version = "0.0.27"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-28snlCqvQ0aF7DHjeHWyjOYuy2wHd2EqEDqmst9MQLc="; + sha256 = "sha256-yC0J6uXL0W00o0BGIrrZ9WjThSgIu5fEgQdyH2vZESs="; }; - vendorSha256 = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; + vendorHash = "sha256-QGzaKtku7fm14ijmE68nqgqoX86IgmEsemlQltZECI0="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 96e0e4894ec66..3d569d4bdca80 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-PdrU3kKuoT4MP5N2t4E1PIKZOMu8D0ZbUyMTIi/KZ7g="; + hash = "sha256-u0ievi2Zj5kerTQWhNPkT3HFdLYVwHOigkvWk6Zc3go="; }; vendorHash = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA="; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index a97054a9071fc..0fefba4f5d3de 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.19.4"; + version = "0.19.5"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-okQJBZLIFujHg5Tn/AbCox8mRrump/GjYjyQzkJAtFg="; + sha256 = "sha256-giCFea4uZNztWxQhsYSdh2KtFE0uU0hf/lhGnY9OsIE="; }; - vendorHash = "sha256-Nzef+cfC4Fosm1e1Whpz/BrGqRlcbD0NpyST8V1iwiU="; + vendorHash = "sha256-i8MpQsqD1SBf+qPwYTFDTYDE4mvLdpKUoKML+u1027U="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix new file mode 100644 index 0000000000000..c7abd03ccd7ed --- /dev/null +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -0,0 +1,60 @@ +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kubeshark, nix-update-script }: + +buildGoModule rec { + pname = "kubeshark"; + version = "38.5"; + + src = fetchFromGitHub { + owner = "kubeshark"; + repo = "kubeshark"; + rev = version; + sha256 = "sha256-xu+IcmYNsFBYhb0Grnqyi31LCG/3XhSh1LH8XakQ3Yk="; + }; + + vendorHash = "sha256-o04XIUsHNqOBkvcejASHNz1HDnV6F9t+Q2Hg8eL/Uoc="; + + ldflags = let t = "github.com/kubeshark/kubeshark"; in [ + "-s" "-w" + "-X ${t}/misc.GitCommitHash=${src.rev}" + "-X ${t}/misc.Branch=master" + "-X ${t}/misc.BuildTimestamp=0" + "-X ${t}/misc.Platform=unknown" + "-X ${t}/misc.Ver=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + checkPhase = '' + go test ./... + ''; + doCheck = true; + + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + installShellCompletion --cmd kubeshark \ + --bash <($out/bin/kubeshark completion bash) \ + --fish <($out/bin/kubeshark completion fish) \ + --zsh <($out/bin/kubeshark completion zsh) + ''; + + passthru = { + tests.version = testers.testVersion { + package = kubeshark; + command = "kubeshark version"; + inherit version; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + changelog = "https://github.com/kubeshark/kubeshark/releases/tag/${version}"; + description = "The API Traffic Viewer for Kubernetes"; + homepage = "https://kubeshark.co/"; + license = licenses.asl20; + longDescription = '' + The API traffic viewer for Kubernetes providing real-time, protocol-aware visibility into Kubernetes’ internal network, + Think TCPDump and Wireshark re-invented for Kubernetes + capturing, dissecting and monitoring all traffic and payloads going in, out and across containers, pods, nodes and clusters. + ''; + maintainers = with maintainers; [ bryanasdev000 ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index 53da8b9be29fd..7af197a9992de 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.8.5"; + version = "1.9.0"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-oEy1SNlYHDuZG2urbXEfROwzfNzdbu0Yjsq98Dw+Mws="; + sha256 = "sha256-i8uKhzvU9ftlzgzU4ViYg6z+OUNNHGbiFhFAwDKwtnw="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorSha256 = "sha256-nqJZdMkpJEG6VFCTwGUzXcCZPshJnY2FYHDm3xMlU0g="; + vendorHash = "sha256-BGIh1wzHIk1kSvk/sQ/tDBhGIOOx0o6Dk4LbK9Z1FAQ="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 896c2ac5a0164..7ac3f68b35ee9 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.12.3"; - sha256 = "01vnqhn5lc4pv1rgwmmzzf7ynqc4ss0jysqhjq0m5yzll2k40d8z"; - vendorSha256 = "sha256-7CkeWbgiQIKhuCrJErZrkkx0MD41qxaWAY/18VafLZE="; + version = "2.12.4"; + sha256 = "1nl831xjhxyw1r2zvdxy3455sfn1cnn6970n02q7aalmqgz9rpdd"; + vendorSha256 = "sha256-c7x2vNO6ap5Ecx4+1hKy6PImFuclSQqvkBKr0LPdX4M="; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 4e31f689dd7de..9f3169b88b4eb 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.1.1"; - sha256 = "159myaz0zh0j8vdknxshyvkl1khxbznvls2mk5wyssxqll8b3j32"; - vendorSha256 = "sha256-7+ppFmM+NVnMU6pg2FcaSGqcq429EmrPYgAZfHANtEg="; + version = "23.2.3"; + sha256 = "0lqbsh3237hh1rifi7w3h1mq4m6cnpxvb1h3dxghv5sblyivqfz9"; + vendorSha256 = "sha256-gZ9t10Lj0wXeVBfmxKax9FYrcNL+ZEJOqhQfYw9Qwzw="; } diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index f21ee96ecd33b..a4aec900a4848 100644 --- a/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -20,6 +20,11 @@ buildGoModule rec { env GOFLAGS="" go generate ./jaeger/static env GOFLAGS="" go generate ./multicluster/static env GOFLAGS="" go generate ./viz/static + + # Necessary for building Musl + if [[ $NIX_HARDENING_ENABLE =~ "pie" ]]; then + export GOFLAGS="-buildmode=pie $GOFLAGS" + fi ''; tags = [ diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 997b52434b829..e05e7847cfd48 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.28.0"; + version = "1.29.0"; - vendorSha256 = "sha256-CyIpzwSYHbv96UoQ/SZXOl6v3xn3pvT39ZO+RpVHU5I="; + vendorHash = "sha256-wRCSUDzz+1e4/ijwAnIM8a/AlnNNdVkiz3WO4Nhuy+M="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-Gn/RXZedID0sh5qTcBNg7GeLtI1JZYKXEWg2RZGXlDw="; + sha256 = "sha256-rdcMgL7bzdlxrelui+V1APJik0v/4YyUqj9QlMRq1nI="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index e508ee0006f81..bc57c87b2f87c 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.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i178AN8LDm1SmCx3G8uLmW1+/F3B8DQsrkawSBoefGw="; + hash = "sha256-6AXki9/gJVlHpA3iSS1GqkLWaUqE0c+X8alWdMyCFiU="; }; - vendorSha256 = "sha256-0EWrFc55I3EmrAmmIYdsYtvO6xqDHbo5Uo6XC+NezZI="; + vendorHash = "sha256-28Wt9uQ7+PEWe+RaNv4HLz7HQbO7hXlX3O7s9SooLu8="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index e7bd82971014e..36e86df5626e8 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -75,8 +75,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/lukebfox/nixops-hetznercloud.git"; - rev = "c00533400506d40940f7c1f67bf3973db37d9dd9"; - sha256 = "1xfwhiyay7x1r3q6rxn2f3h0llgwf73vl8fxp0ww13rgny2w0dgj"; + rev = "e14f340f7ffe9e2aa7ffbaac0b8a2e3b4cc116b3"; + sha256 = "0vhapgzhqfk3y8a26ck09g0ilydsbjlx5g77f8bscdqz818lki12"; }; } ); @@ -85,8 +85,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/nix-community/nixops-libvirtd.git"; - rev = "bc3cf1c5c774a80e05991ca040baa2b23e3ecd51"; - sha256 = "06bcxchjgmgfvhg9dzlcdnr4ak0h1rdpfpgbix3z2via2gad8bvj"; + rev = "be1ea32e02d8abb3dbe1b09b7c5a7419a7412991"; + sha256 = "1mklm3lmicvhs0vcib3ss21an45wk24m1mkcwy1zvbpbmvhdz2m4"; }; } ); diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index 3f7ce6a1a49e8..9c65bfd661830 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -29,18 +29,18 @@ files = [ [[package]] name = "boto3" -version = "1.26.45" +version = "1.26.79" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.7" files = [ - {file = "boto3-1.26.45-py3-none-any.whl", hash = "sha256:b1bc7db503dc49bdccf5dada080077056a32af9982afdde84578a109cd741d05"}, - {file = "boto3-1.26.45.tar.gz", hash = "sha256:cc7f652df93e1ce818413fd82ffd645d4f92a64fec67c72946212d3750eaa80f"}, + {file = "boto3-1.26.79-py3-none-any.whl", hash = "sha256:049de631cc03726a14b8eb24ac9ec2a48b0624197796f36166da809fdc9b9a7f"}, + {file = "boto3-1.26.79.tar.gz", hash = "sha256:73d7bd1f16118ef0dfe936e0420cd76b02d1aedb75330ebda51168458ab752ac"}, ] [package.dependencies] -botocore = ">=1.29.45,<1.30.0" +botocore = ">=1.29.79,<1.30.0" jmespath = ">=0.7.1,<2.0.0" s3transfer = ">=0.6.0,<0.7.0" @@ -49,14 +49,14 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.29.45" +version = "1.29.79" description = "Low-level, data-driven core of boto 3." category = "main" optional = false python-versions = ">= 3.7" files = [ - {file = "botocore-1.29.45-py3-none-any.whl", hash = "sha256:a5c0e13f266ee9a74335a1e5d3e377f2baae27226ae23d78f023bae0d18f3161"}, - {file = "botocore-1.29.45.tar.gz", hash = "sha256:62ae03e591ff25555854aa338da35190ffe18c0b1be2ebf5cfb277164233691f"}, + {file = "botocore-1.29.79-py3-none-any.whl", hash = "sha256:5f254f019e8641f8b2ba6dddc1f7541e8c6d25d976802392710b2fc4bac925b1"}, + {file = "botocore-1.29.79.tar.gz", hash = "sha256:c7ded44062bed3b928944cfb09e1578ed3fed0e4c98de4f233f3c2056a8d491e"}, ] [package.dependencies] @@ -65,7 +65,7 @@ python-dateutil = ">=2.1,<3.0.0" urllib3 = ">=1.25.4,<1.27" [package.extras] -crt = ["awscrt (==0.15.3)"] +crt = ["awscrt (==0.16.9)"] [[package]] name = "certifi" @@ -158,19 +158,102 @@ pycparser = "*" [[package]] name = "charset-normalizer" -version = "2.1.1" +version = "3.0.1" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false -python-versions = ">=3.6.0" +python-versions = "*" files = [ - {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"}, - {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"}, + {file = "charset-normalizer-3.0.1.tar.gz", hash = "sha256:ebea339af930f8ca5d7a699b921106c6e29c617fe9606fa7baa043c1cdae326f"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:88600c72ef7587fe1708fd242b385b6ed4b8904976d5da0893e31df8b3480cb6"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c75ffc45f25324e68ab238cb4b5c0a38cd1c3d7f1fb1f72b5541de469e2247db"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:db72b07027db150f468fbada4d85b3b2729a3db39178abf5c543b784c1254539"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62595ab75873d50d57323a91dd03e6966eb79c41fa834b7a1661ed043b2d404d"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ff6f3db31555657f3163b15a6b7c6938d08df7adbfc9dd13d9d19edad678f1e8"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:772b87914ff1152b92a197ef4ea40efe27a378606c39446ded52c8f80f79702e"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70990b9c51340e4044cfc394a81f614f3f90d41397104d226f21e66de668730d"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:292d5e8ba896bbfd6334b096e34bffb56161c81408d6d036a7dfa6929cff8783"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:2edb64ee7bf1ed524a1da60cdcd2e1f6e2b4f66ef7c077680739f1641f62f555"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:31a9ddf4718d10ae04d9b18801bd776693487cbb57d74cc3458a7673f6f34639"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:44ba614de5361b3e5278e1241fda3dc1838deed864b50a10d7ce92983797fa76"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:12db3b2c533c23ab812c2b25934f60383361f8a376ae272665f8e48b88e8e1c6"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c512accbd6ff0270939b9ac214b84fb5ada5f0409c44298361b2f5e13f9aed9e"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-win32.whl", hash = "sha256:502218f52498a36d6bf5ea77081844017bf7982cdbe521ad85e64cabee1b608b"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:601f36512f9e28f029d9481bdaf8e89e5148ac5d89cffd3b05cd533eeb423b59"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0298eafff88c99982a4cf66ba2efa1128e4ddaca0b05eec4c456bbc7db691d8d"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a8d0fc946c784ff7f7c3742310cc8a57c5c6dc31631269876a88b809dbeff3d3"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:87701167f2a5c930b403e9756fab1d31d4d4da52856143b609e30a1ce7160f3c"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:14e76c0f23218b8f46c4d87018ca2e441535aed3632ca134b10239dfb6dadd6b"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c0a590235ccd933d9892c627dec5bc7511ce6ad6c1011fdf5b11363022746c1"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8c7fe7afa480e3e82eed58e0ca89f751cd14d767638e2550c77a92a9e749c317"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:79909e27e8e4fcc9db4addea88aa63f6423ebb171db091fb4373e3312cb6d603"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ac7b6a045b814cf0c47f3623d21ebd88b3e8cf216a14790b455ea7ff0135d18"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:72966d1b297c741541ca8cf1223ff262a6febe52481af742036a0b296e35fa5a"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:f9d0c5c045a3ca9bedfc35dca8526798eb91a07aa7a2c0fee134c6c6f321cbd7"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:5995f0164fa7df59db4746112fec3f49c461dd6b31b841873443bdb077c13cfc"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4a8fcf28c05c1f6d7e177a9a46a1c52798bfe2ad80681d275b10dcf317deaf0b"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:761e8904c07ad053d285670f36dd94e1b6ab7f16ce62b9805c475b7aa1cffde6"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-win32.whl", hash = "sha256:71140351489970dfe5e60fc621ada3e0f41104a5eddaca47a7acb3c1b851d6d3"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:9ab77acb98eba3fd2a85cd160851816bfce6871d944d885febf012713f06659c"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:84c3990934bae40ea69a82034912ffe5a62c60bbf6ec5bc9691419641d7d5c9a"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74292fc76c905c0ef095fe11e188a32ebd03bc38f3f3e9bcb85e4e6db177b7ea"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c95a03c79bbe30eec3ec2b7f076074f4281526724c8685a42872974ef4d36b72"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f4c39b0e3eac288fedc2b43055cfc2ca7a60362d0e5e87a637beac5d801ef478"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:df2c707231459e8a4028eabcd3cfc827befd635b3ef72eada84ab13b52e1574d"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:93ad6d87ac18e2a90b0fe89df7c65263b9a99a0eb98f0a3d2e079f12a0735837"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:59e5686dd847347e55dffcc191a96622f016bc0ad89105e24c14e0d6305acbc6"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:cd6056167405314a4dc3c173943f11249fa0f1b204f8b51ed4bde1a9cd1834dc"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:083c8d17153ecb403e5e1eb76a7ef4babfc2c48d58899c98fcaa04833e7a2f9a"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:f5057856d21e7586765171eac8b9fc3f7d44ef39425f85dbcccb13b3ebea806c"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:7eb33a30d75562222b64f569c642ff3dc6689e09adda43a082208397f016c39a"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-win32.whl", hash = "sha256:95dea361dd73757c6f1c0a1480ac499952c16ac83f7f5f4f84f0658a01b8ef41"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:eaa379fcd227ca235d04152ca6704c7cb55564116f8bc52545ff357628e10602"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3e45867f1f2ab0711d60c6c71746ac53537f1684baa699f4f668d4c6f6ce8e14"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cadaeaba78750d58d3cc6ac4d1fd867da6fc73c88156b7a3212a3cd4819d679d"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:911d8a40b2bef5b8bbae2e36a0b103f142ac53557ab421dc16ac4aafee6f53dc"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:503e65837c71b875ecdd733877d852adbc465bd82c768a067badd953bf1bc5a3"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a60332922359f920193b1d4826953c507a877b523b2395ad7bc716ddd386d866"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:16a8663d6e281208d78806dbe14ee9903715361cf81f6d4309944e4d1e59ac5b"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:a16418ecf1329f71df119e8a65f3aa68004a3f9383821edcb20f0702934d8087"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:9d9153257a3f70d5f69edf2325357251ed20f772b12e593f3b3377b5f78e7ef8"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:02a51034802cbf38db3f89c66fb5d2ec57e6fe7ef2f4a44d070a593c3688667b"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:2e396d70bc4ef5325b72b593a72c8979999aa52fb8bcf03f701c1b03e1166918"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:11b53acf2411c3b09e6af37e4b9005cba376c872503c8f28218c7243582df45d"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-win32.whl", hash = "sha256:0bf2dae5291758b6f84cf923bfaa285632816007db0330002fa1de38bfcb7154"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:2c03cc56021a4bd59be889c2b9257dae13bf55041a3372d3295416f86b295fb5"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:024e606be3ed92216e2b6952ed859d86b4cfa52cd5bc5f050e7dc28f9b43ec42"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4b0d02d7102dd0f997580b51edc4cebcf2ab6397a7edf89f1c73b586c614272c"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:358a7c4cb8ba9b46c453b1dd8d9e431452d5249072e4f56cfda3149f6ab1405e"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81d6741ab457d14fdedc215516665050f3822d3e56508921cc7239f8c8e66a58"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8b8af03d2e37866d023ad0ddea594edefc31e827fee64f8de5611a1dbc373174"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9cf4e8ad252f7c38dd1f676b46514f92dc0ebeb0db5552f5f403509705e24753"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e696f0dd336161fca9adbb846875d40752e6eba585843c768935ba5c9960722b"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c22d3fe05ce11d3671297dc8973267daa0f938b93ec716e12e0f6dee81591dc1"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:109487860ef6a328f3eec66f2bf78b0b72400280d8f8ea05f69c51644ba6521a"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:37f8febc8ec50c14f3ec9637505f28e58d4f66752207ea177c1d67df25da5aed"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:f97e83fa6c25693c7a35de154681fcc257c1c41b38beb0304b9c4d2d9e164479"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a152f5f33d64a6be73f1d30c9cc82dfc73cec6477ec268e7c6e4c7d23c2d2291"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:39049da0ffb96c8cbb65cbf5c5f3ca3168990adf3551bd1dee10c48fce8ae820"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-win32.whl", hash = "sha256:4457ea6774b5611f4bed5eaa5df55f70abde42364d498c5134b7ef4c6958e20e"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:e62164b50f84e20601c1ff8eb55620d2ad25fb81b59e3cd776a1902527a788af"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8eade758719add78ec36dc13201483f8e9b5d940329285edcd5f70c0a9edbd7f"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8499ca8f4502af841f68135133d8258f7b32a53a1d594aa98cc52013fff55678"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3fc1c4a2ffd64890aebdb3f97e1278b0cc72579a08ca4de8cd2c04799a3a22be"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:00d3ffdaafe92a5dc603cb9bd5111aaa36dfa187c8285c543be562e61b755f6b"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c2ac1b08635a8cd4e0cbeaf6f5e922085908d48eb05d44c5ae9eabab148512ca"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f6f45710b4459401609ebebdbcfb34515da4fc2aa886f95107f556ac69a9147e"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ae1de54a77dc0d6d5fcf623290af4266412a7c4be0b1ff7444394f03f5c54e3"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b590df687e3c5ee0deef9fc8c547d81986d9a1b56073d82de008744452d6541"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab5de034a886f616a5668aa5d098af2b5385ed70142090e2a31bcbd0af0fdb3d"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9cb3032517f1627cc012dbc80a8ec976ae76d93ea2b5feaa9d2a5b8882597579"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:608862a7bf6957f2333fc54ab4399e405baad0163dc9f8d99cb236816db169d4"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0f438ae3532723fb6ead77e7c604be7c8374094ef4ee2c5e03a3a17f1fca256c"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:356541bf4381fa35856dafa6a965916e54bed415ad8a24ee6de6e37deccf2786"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-win32.whl", hash = "sha256:39cf9ed17fe3b1bc81f33c9ceb6ce67683ee7526e65fde1447c772afc54a1bb8"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:0a11e971ed097d24c534c037d298ad32c6ce81a45736d31e0ff0ad37ab437d59"}, + {file = "charset_normalizer-3.0.1-py3-none-any.whl", hash = "sha256:7e189e2e1d3ed2f4aebabd2d5b0f931e883676e51c7624826e0a4e5fe8a0bf24"}, ] -[package.extras] -unicode-backport = ["unicodedata2"] - [[package]] name = "cryptography" version = "3.4.8" @@ -212,30 +295,18 @@ ssh = ["bcrypt (>=3.1.5)"] test = ["hypothesis (>=1.11.4,!=3.79.2)", "iso8601", "pretend", "pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pytz"] [[package]] -name = "future" -version = "0.18.2" -description = "Clean single-source support for Python 3 and 2" -category = "main" -optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" -files = [ - {file = "future-0.18.2.tar.gz", hash = "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"}, -] - -[[package]] name = "hcloud" -version = "1.18.0" +version = "1.18.2" description = "Official Hetzner Cloud python library" category = "main" optional = false python-versions = ">3.5" files = [ - {file = "hcloud-1.18.0-py2.py3-none-any.whl", hash = "sha256:4a999b46a9e427df499bba3c70a7ab8da1bd3a95dc8495f7512ac69f8bf8424c"}, - {file = "hcloud-1.18.0.tar.gz", hash = "sha256:a21d940cde8f0c1fd10a0581b0618eb840a6f592404faafdb6070101f4525ff6"}, + {file = "hcloud-1.18.2-py2.py3-none-any.whl", hash = "sha256:fcd73c7aab1d6e729333697e5214b26727775eccdbfb50effd1863c3424caa59"}, + {file = "hcloud-1.18.2.tar.gz", hash = "sha256:37bd5ba56387e3c491c5babd3e08ab91d5f0390cd5e880e4dfea19e21681bc9e"}, ] [package.dependencies] -future = ">=0.17.1" python-dateutil = ">=2.7.5" requests = ">=2.20" @@ -296,13 +367,13 @@ testing-libs = ["simplejson", "ujson"] [[package]] name = "libvirt-python" -version = "8.10.0" +version = "9.0.0" description = "The libvirt virtualization API python binding" category = "main" optional = false python-versions = "*" files = [ - {file = "libvirt-python-8.10.0.tar.gz", hash = "sha256:fc30f136abe0b8228029a90814c8f44ac2947433c12f211363051c57df2d5401"}, + {file = "libvirt-python-9.0.0.tar.gz", hash = "sha256:49702d33fa8cbcae19fa727467a69f7ae2241b3091324085ca1cc752b2b414ce"}, ] [[package]] @@ -454,7 +525,7 @@ resolved_reference = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35" [[package]] name = "nixops-hetznercloud" -version = "0.1.2" +version = "0.1.3" description = "NixOps Hetzner Cloud plugin" category = "main" optional = false @@ -463,7 +534,7 @@ files = [] develop = false [package.dependencies] -hcloud = "1.18.0" +hcloud = "1.18.2" nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} typing-extensions = "^3.7.4" @@ -471,7 +542,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/lukebfox/nixops-hetznercloud.git" reference = "HEAD" -resolved_reference = "c00533400506d40940f7c1f67bf3973db37d9dd9" +resolved_reference = "e14f340f7ffe9e2aa7ffbaac0b8a2e3b4cc116b3" [[package]] name = "nixops-virtd" @@ -479,19 +550,19 @@ version = "1.0" description = "NixOps plugin for virtd" category = "main" optional = false -python-versions = "^3.7" +python-versions = "^3.10" files = [] develop = false [package.dependencies] -libvirt-python = "^8.0" +libvirt-python = "^9.0" nixops = {git = "https://github.com/NixOS/nixops.git"} [package.source] type = "git" url = "https://github.com/nix-community/nixops-libvirtd.git" reference = "HEAD" -resolved_reference = "bc3cf1c5c774a80e05991ca040baa2b23e3ecd51" +resolved_reference = "be1ea32e02d8abb3dbe1b09b7c5a7419a7412991" [[package]] name = "nixopsvbox" @@ -605,19 +676,19 @@ requests = "*" [[package]] name = "requests" -version = "2.28.1" +version = "2.28.2" description = "Python HTTP for Humans." category = "main" optional = false python-versions = ">=3.7, <4" files = [ - {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"}, - {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"}, + {file = "requests-2.28.2-py3-none-any.whl", hash = "sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa"}, + {file = "requests-2.28.2.tar.gz", hash = "sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf"}, ] [package.dependencies] certifi = ">=2017.4.17" -charset-normalizer = ">=2,<3" +charset-normalizer = ">=2,<4" idna = ">=2.5,<4" urllib3 = ">=1.21.1,<1.27" @@ -686,14 +757,14 @@ files = [ [[package]] name = "urllib3" -version = "1.26.13" +version = "1.26.14" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" files = [ - {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"}, - {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"}, + {file = "urllib3-1.26.14-py2.py3-none-any.whl", hash = "sha256:75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1"}, + {file = "urllib3-1.26.14.tar.gz", hash = "sha256:076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72"}, ] [package.extras] diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index faec094807740..ba7f86e9e7d62 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,6 +1,6 @@ { lib , buildGoModule -, buildGo119Module +, buildGo120Module , fetchFromGitHub , nixosTests }: @@ -47,24 +47,24 @@ rec { nomad = nomad_1_4; nomad_1_2 = generic { - buildGoModule = buildGo119Module; - version = "1.2.15"; - sha256 = "sha256-p9yRjSapQAhuHv+slUmYI25bUb1N1A7LBiJOdk1++iI="; - vendorSha256 = "sha256-6d3tE337zVAIkzQzAnV2Ya5xwwhuzmKgtPUJcJ9HRto="; + buildGoModule = buildGo120Module; + version = "1.2.16"; + sha256 = "sha256-fhfUpcG91EgIzJ4mCS7geyIJyTSHS2e8t4yYiI3PqpQ="; + vendorSha256 = "sha256-kwCDsGFw+25Mimgt/cTK/Z2H7Qh5n4rjr3kIBvjcPL8="; }; nomad_1_3 = generic { - buildGoModule = buildGo119Module; - version = "1.3.8"; - sha256 = "sha256-hUmDWgGV8HAXew8SpcbhaiaF9VfBN5mk1W7t5lhnZ9I="; - vendorSha256 = "sha256-IfYobyDFriOldJnNfRK0QVKBfttoZZ1iOkt4cBQxd00="; + buildGoModule = buildGo120Module; + version = "1.3.9"; + sha256 = "sha256-xfoIzLDG/OfqAPQqeLvQZ11uESWFNyOyLP6Imi+S96w="; + vendorSha256 = "sha256-kW0goicoM1lM1NEHPTfozg2EKR1daf33UxT/mVabyfY="; }; nomad_1_4 = generic { - buildGoModule = buildGo119Module; - version = "1.4.3"; - sha256 = "sha256-GQVfrn9VlzfdIj73W3hBpHcevsXZcb6Uj808HUCZUUg="; - vendorSha256 = "sha256-JQRpsQhq5r/QcgFwtnptmvnjBEhdCFrXFrTKkJioL3A="; + buildGoModule = buildGo120Module; + version = "1.4.4"; + sha256 = "sha256-mAimuWolTJ3lMY/ArnLZFu+GZv9ADdGsriXsTcEgdYc="; + vendorSha256 = "sha256-QtP7pzsIBd2S79AUcbOeVG71Mb5qK706rq5DkT41VqM="; passthru.tests.nomad = nixosTests.nomad; }; } diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 9933e8056670a..705b10753ca45 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,55 +1,52 @@ { lib , buildGoModule , fetchFromGitHub -, libkrb5 -, git +, gpgme , installShellFiles , testers , openshift }: - buildGoModule rec { pname = "openshift"; - version = "4.11.0"; - gitCommit = "20dd77d5"; + version = "4.12.0"; + gitCommit = "854f807"; src = fetchFromGitHub { owner = "openshift"; repo = "oc"; - rev = "20dd77d5c889f86b05e2bdd182853ae702852c63"; - sha256 = "wqLo/CKGzeMDJUoI9PUEjJER5hSPu+FmUCJLPZ9PJuw="; + rev = "854f807d8a84dde710c062a5281bca5bc07cb562"; + hash = "sha256-GH3LjAeMIHmFbJoKGoeeNteP4Ma2+kIC5rAxObdziKg="; }; - vendorSha256 = null; + vendorHash = null; - buildInputs = [ libkrb5 ]; + buildInputs = [ gpgme ]; nativeBuildInputs = [ installShellFiles ]; - patchPhase = '' - patchShebangs ./hack - ''; - - buildPhase = '' - # Openshift build require this variables to be set - # unless there is a .git folder which is not the case with fetchFromGitHub - export SOURCE_GIT_COMMIT=${gitCommit} - export SOURCE_GIT_TAG=v${version} - export SOURCE_GIT_TREE_STATE=clean + ldflags = [ + "-s" + "-w" + "-X github.com/openshift/oc/pkg/version.commitFromGit=${gitCommit}" + "-X github.com/openshift/oc/pkg/version.versionFromGit=v${version}" + ]; - make all - ''; - - installPhase = '' - mkdir -p $out/bin - cp oc $out/bin + doCheck = false; + postInstall = '' + # Install man pages. mkdir -p man - ./genman man oc + $out/bin/genman man oc installManPage man/*.1 - installShellCompletion --bash contrib/completions/bash/* - installShellCompletion --zsh contrib/completions/zsh/* + # Remove unwanted tooling. + rm $out/bin/clicheck $out/bin/gendocs $out/bin/genman + + # Install shell completions. + installShellCompletion --cmd oc \ + --bash <($out/bin/oc completion bash) \ + --fish <($out/bin/oc completion fish) \ + --zsh <($out/bin/oc completion zsh) ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index ce363080f4599..029e23330335c 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.4.4"; + version = "2.5.0"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-53VUZHA+yURikVtcXXa/fZqwAqwjukBKS4NQEBBoHew="; + hash = "sha256-Gm/aUkwEbWxj76Q6My1Vw2gRn3+WVG6EJ7PLpQ1F130="; }; - vendorHash = "sha256-k6ODl+whgeeyd8XaOjTDjxfShpOztirjq/Tg98YP8Hs="; + vendorHash = "sha256-MVcbeQ4qAX9zVlT81yZd5xvo1ggVNpCZJozBoql2W9o="; subPackages = [ "src/server/cmd/pachctl" ]; diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index c9af58b1a8a85..768a01b3de83e 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.12.0"; + version = "5.15.1"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-WE/XWNBy5p8PEQ11s8nmW+HoVEkQB9cKoj5ZS8Suvs8="; + sha256 = "sha256-qCWKmn0buITZo86hQncXWuEDQq0rITrCz/aRVR1+Zt4="; }; - vendorHash = "sha256-F5Vh9wPd53bifLStk6wEwidPZvOjN87jn4RxJbSuW4o="; + vendorHash = "sha256-3wtE2Cz+AVF+zfsLH/+6KMHPihYcuYsrzTguHNnwT+U="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 75f14c69bca77..c65c795a173bc 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.10.1"; + version = "0.11.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-GETCwj9T1D6paG56LT/N2YkISE7UBpt/femwvHyHHJE="; + sha256 = "sha256-A1jUlEgjBoiN+NYwpyW/1eYzkCK3UuPID++fu+zGvzk="; }; ldflags = [ @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/derailed/popeye/cmd.commit=${version}" ]; - vendorSha256 = "sha256-ZRDcZbaoGJ8jgSwMXTTcWSv/4dlOoTNcuj/bN4QYHNE="; + vendorHash = "sha256-MEsChBBn0mixgJ7pzRoqAqup75b/mVv6k3OMmzgyLC4="; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/applications/networking/cluster/pv-migrate/default.nix b/pkgs/applications/networking/cluster/pv-migrate/default.nix new file mode 100644 index 0000000000000..73fb42ee373b6 --- /dev/null +++ b/pkgs/applications/networking/cluster/pv-migrate/default.nix @@ -0,0 +1,33 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pv-migrate"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "utkuozdemir"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-M+M2tK40d05AxBmTjYKv5rrebX7g+Za8KX+/Q3aVLwE="; + }; + + subPackages = [ "cmd/pv-migrate" ]; + + vendorHash = "sha256-3uqN6RmkctlE4GuYZQbY6wbHyPBJP15O4Bm0kTtW8qo="; + + ldflags = [ + "-s" + "-w" + "-X main.version=v${version}" + "-X main.commit=${src.rev}" + "-X main.date=1970-01-01-00:00:01" + ]; + + meta = with lib; { + description = "CLI tool to easily migrate Kubernetes persistent volumes "; + homepage = "https://github.com/utkuozdemir/pv-migrate"; + changelog = "https://github.com/utkuozdemir/pv-migrate/releases/tag/${version}"; + license = licenses.afl20; + maintainers = [ maintainers.ivankovnatsky ]; + }; +} diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 877dddfa1e2b2..5ef93e307cfba 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "roxctl"; - version = "3.73.1"; + version = "3.73.2"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-A/jEw29c2WbBlPZZACjI3NjM7a0JxCEob8GOoGx13Hs="; + sha256 = "sha256-5MMSQy7SUFZhUycv1Kfkz46aY2tMldNZOH63wlQjq6o="; }; vendorHash = "sha256-YRNOOn/Ei0rHLZrTtQxlBBn48pePDHllnI65Iil160k="; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 7459bba1697b8..ee045f5782a9a 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-xO4I4fNf14ltiSnFnAhM8VYBw4JKB0RSQziSshZOFBo="; + sha256 = "sha256-tqp2H8aWPBgje1zIK673cbr+DShhTQL9VQ0dEL/he7s="; }; - vendorSha256 = "sha256-tNx1BvZBblyLavFslhqj9DCyfcgbl6HxlZ7zceK1a0w="; + vendorHash = "sha256-ud07lWHwQfAHgVenUApwrfxmTjJKVm+pOExdR9pZFxA="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 255ec944c8dad..4c8cbda6945bc 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.3.2"; + version = "1.3.5"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-o037LemAZhsHVIfAU0yVoNNbJ6g8ehlA4lFLN78Q8dY="; + hash = "sha256-LXAQSz39dtfSN6ks6UYJtXiTjcVz/a+f+JIsgC3MXic="; }; - vendorHash = "sha256-HPuVDfVxbHbNaCRg/D4VeW0finbFB4eageiAzoax1wk="; + vendorHash = "sha256-ctkeEGrh8tzWvEsVhcc2Cl3rAMkYQtcxD1b27ux1QDM="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 010527121e573..29727e0a697df 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-exPFlcbku51Bs/YISRyjl8iwLYRVS9ltRQPpd/QpnWk="; + sha256 = "sha256-RZLmbf9ginMbFAaUKL5mK5HIYQslP8Vu8zdh1OJ1P1Y="; }; - vendorSha256 = "sha256-eo4B2p5Yo1r5jro49mSetp9AFYhcTXbyy7wGuaFwbb0="; + vendorHash = "sha256-g9e0NesI7WdaTHZ57XRlo8as3IWAFlFW4nkyf6+kd40="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index f806a1d35ae84..a78aaf4b56da5 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal-cli"; - version = "1.17.2"; + version = "1.18.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "tctl"; rev = "v${version}"; - hash = "sha256-QID0VtARbJiTIQm2JeaejQ5VpJsAIHfZtws7i2UN8dM="; + hash = "sha256-LcBKkx3mcDOrGT6yJx98CSgxbwskqGPWqOzHWOu6cig="; }; - vendorHash = "sha256-9bgovXVj+qddfDSI4DTaNYH4H8Uc4DZqeVYG5TWXTNw="; + vendorHash = "sha256-BUYEeC5zli++OxVFgECJGqJkbDwglLppSxgo+4AqOb0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 0b1077443a493..9fe3edcbb99c8 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "temporal"; - version = "1.17.5"; + version = "1.20.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "sha256-u8GyaXpiVZdPDoPAqIa+TY+JQFZeSGOLrUy+e3E4kig="; + hash = "sha256-YZzGAOPCljTMmyt1t0gjbgn+IelntCo/275+SjOJiJE="; }; - vendorSha256 = "sha256-MT/BmGTdyEzmXjuwlA6WhLIWlrQz3Wc4Tl5dMI1587Q="; + vendorHash = "sha256-UMqkgQsnOxFcXgbm+oi3JGjqmbwaKEh6s5bzivGVAM8="; + + excludedPackages = [ "./build" ]; CGO_ENABLED = 0; @@ -26,6 +28,7 @@ buildGoModule rec { install -Dm755 "$GOPATH/bin/server" -T $out/bin/temporal-server install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra-tool install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql-tool + install -Dm755 "$GOPATH/bin/tdbg" -T $out/bin/tdbg runHook postInstall ''; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f03732f4c72ce..6e858269bd775 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,24 +1,22 @@ { "aci": { - "deleteVendor": true, - "hash": "sha256-vTDuSZjO3ZHCUBaIYB7fvXvBPYywGJy307x2rCejOzk=", + "hash": "sha256-rgPqf8PopvzXiIOjng7DNOv920MPI81EVMUu3DaS8o4=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", - "proxyVendor": true, "repo": "terraform-provider-aci", - "rev": "v2.6.0", + "rev": "v2.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-dEnQa1GaYrx2jxsRSJWlMmy1hGsXACsp+5PtGmSDL6E=" + "vendorHash": null }, "acme": { - "hash": "sha256-fK34A45plTqtOYGbq8CAtFnyMYOvdOKFycY7X5ZlRRY=", + "hash": "sha256-uyycmae+OAZ/dC4GReEF5xrClQvophLX1/EZv+kpFU4=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "proxyVendor": true, "repo": "terraform-provider-acme", - "rev": "v2.12.0", + "rev": "v2.13.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-L8d2Y4gSmqqmg24lULWrdKSI+194rRTVZyxJAEL+gqM=" + "vendorHash": "sha256-C78RPGpENvn6mBm8xsnl3DXKUQ0xtdN8k25t8USigWE=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -30,29 +28,29 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-8kTT1tD88UZc/ZbunFDF+SlTYM5E3jyQgaBcRBULYlY=", + "hash": "sha256-ahqp63zzO4+TvdXk2e4r3r0VG7Cys3lhE+wkEkjN+vI=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v3.11.0", + "rev": "v4.0.0", "spdx": "MIT", - "vendorHash": "sha256-pCWrJPW39J2SE1U1nQ61XI8/WtB+hqQGu9wKkRNkS1k=" + "vendorHash": "sha256-VAYCx0DHG+J8zzYFP2UyZ+W6cOgi8G+PQktEBOWbjSk=" }, "akamai": { - "hash": "sha256-vna0TVanrfhbELwpD3ZidwkBfB20dM+11Gq6qdZ0MmA=", + "hash": "sha256-xX1SitZZoAznP4atUSrqAC8+dxKRlQ2nnZh6ropzuak=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v3.2.1", + "rev": "v3.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-pz+h8vbdCEgNSH9AoPlIP7zprViAMawXk64SV0wnVPo=" + "vendorHash": "sha256-xIxQxgfOv+/i0gyRtpZaCm22rsK/4ajFNKQpGP5uy0Y=" }, "alicloud": { - "hash": "sha256-sG241dMkFL9YllVGuQ7KlZ8Ta3hz9v8VdyOOcjOKie0=", + "hash": "sha256-Cf3plUhdewlq3MvOqZGcICP0j9R3vg0nZdBMrk/Et7k=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.197.0", + "rev": "v1.199.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -84,23 +82,23 @@ "vendorHash": "sha256-99PwwxVHfRGC0QCQGhifRzqWFOHZ1R7Ge2ou7OjiggQ=" }, "auth0": { - "hash": "sha256-BlMYx6Ockk8YpiA0wCu2tBwhUIznFJ9b4knSeKA6M/g=", + "hash": "sha256-3hAfDzK7iO4D68OsCvuXQx5Gk0VOtoBiw21tBJjDJtQ=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v0.42.0", + "rev": "v0.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-OhtomdRIjKxELnSQGbZvrHAE1ag4VAyuSOMrZvZ5q0s=" + "vendorHash": "sha256-UP9A0lcW5QbTuur1MMjKMlvC8S3nenqs0WjpoqvwEQI=" }, "avi": { - "hash": "sha256-0FcdVd7EGVHZ0iRonoGfjwYgXpJtUhqX5i925Ejhv54=", + "hash": "sha256-mBLdIL4mUI4zA3c9gB4DL1QY0xHW15Q1rO/v1gVYKYU=", "homepage": "https://registry.terraform.io/providers/vmware/avi", "owner": "vmware", "proxyVendor": true, "repo": "terraform-provider-avi", - "rev": "v22.1.2", + "rev": "v22.1.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE=" + "vendorHash": "sha256-0k1BYRQWp4iU9DRwPbluOg3S5VzL981PpFrgiQaYWNw=" }, "aviatrix": { "hash": "sha256-jZXTsCa1TDwdOFGJKX4xM3sB0zfix5nTBuBdBGtwOOs=", @@ -112,29 +110,29 @@ "vendorHash": null }, "aws": { - "hash": "sha256-J+x3D7EpV/Kzp98AuhK8pqR26xhItG+JyfkHKc+2IA0=", + "hash": "sha256-qopoHOcCdOAkgpZq3AvCnsq00sjvNSFdUKzn7SQ0G5k=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.51.0", + "rev": "v4.56.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-iL03vDNHPQTAbTRoEutRtQllFgD1wn7qFleuZ4n99q8=" + "vendorHash": "sha256-OBWwMNDpeoPR6NLIgsjiYGQdePEWDMWGN1Y0nHsecYs=" }, "azuread": { - "hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=", + "hash": "sha256-vfkheaRQoDpItMEFzuDkkOOoVvj07MyCkAaybef71nc=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.33.0", + "rev": "v2.35.0", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-dD2o0b5JQ1bZIBFshe+JkfkO5C0a3OvUwfrO2dgIiO8=", + "hash": "sha256-fCs03D+Z/90w9Hup9Cppcx6irsP+oA0HK72tgVm+ZmA=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.40.0", + "rev": "v3.45.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -148,39 +146,38 @@ "vendorHash": null }, "baiducloud": { - "deleteVendor": true, "hash": "sha256-CYU8PI/gMVC9lMiQaPd/M1SKjvZ6vaj5iBfLDTieZR4=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", "rev": "v1.19.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-3PLBs8LSE5JPtrhmdx+jQsnCrfZQQEUGA7wnf9M72yY=" + "vendorHash": null }, "bigip": { - "hash": "sha256-VntKiBTQxe8lKV8Bb3A0moA/EUzyQQ7CInPjKJL4iBQ=", + "hash": "sha256-nlk3ckrLNtPQ9s8uQ2jvARinPVF+A2T0IUY2rBcUFDk=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.16.1", + "rev": "v1.16.2", "spdx": "MPL-2.0", "vendorHash": null }, "bitbucket": { - "hash": "sha256-4uwMg2DXd7T4WqdfwcZHtsPMTTCqrwSngh01DYW5yko=", + "hash": "sha256-FrKNPpwPCpL7GuPkjYCPqHit/VPJG5Fe0Ew4WMzp1AI=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.30.0", + "rev": "v2.30.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-foMmZbNPLww1MN4UZwuynBDgt2w40aMqVINRw//Q0d0=" + "vendorHash": "sha256-rtPbHItqsgHoHs85QO6Uix2yvJkHE6B2XYMOdcJvoGc=" }, "brightbox": { - "hash": "sha256-ISK6cpE4DVrVzjC0N5BdyR3Z5LfF9qfg/ACTgDP+WqY=", + "hash": "sha256-YmgzzDLNJg7zm8smboI0gE2kOgjb2RwPf5v1CbzgvGA=", "homepage": "https://registry.terraform.io/providers/brightbox/brightbox", "owner": "brightbox", "repo": "terraform-provider-brightbox", - "rev": "v3.2.0", + "rev": "v3.2.1", "spdx": "MPL-2.0", "vendorHash": "sha256-IiP1LvAX8fknB56gJoI75kGGkRIIoSfpmPkoTxujVDU=" }, @@ -213,22 +210,22 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-S4iXhss4ASM4FJdBgElH/3IwpPFjUMy57BXG7C7p5+0=", + "hash": "sha256-xua8ZJjc+y6bzF/I2N752Cv22XAXvOjrH9Du1TdipM0=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.22.1", + "rev": "v1.23.0", "spdx": "MPL-2.0", "vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ=" }, "cloudflare": { - "hash": "sha256-Y48H7P69ORr8U0yXf1HEBqh//oOmWn3Uj8GQ12PsV/M=", + "hash": "sha256-fHugf+nvel/bSyh+l94q0iE7E+ZYBt2qfGSoot9xI8w=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.33.1", + "rev": "v4.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-3JH+4ExREL3vtq6CiQN0G0x08ScrzOf2pTAnsWcGgq8=" + "vendorHash": "sha256-jIQcgGknigQFUkLjLoxUjq+Mqjb085v6Zqgd49Dxivo=" }, "cloudfoundry": { "hash": "sha256-/Zxj9cous0SjYxeDo+8/u61pqDwMGt/UsS/OC1oSR2U=", @@ -240,13 +237,13 @@ "vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA=" }, "cloudinit": { - "hash": "sha256-P4m2ym7p10gwHR9CdPT37OvrgkvOKLG5wxVyYD4UZXs=", + "hash": "sha256-fdtUKD8XC1Y72IzrsCfTZYVYZwLqY3gV2sajiw4Krzw=", "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit", "owner": "hashicorp", "repo": "terraform-provider-cloudinit", - "rev": "v2.2.0", + "rev": "v2.3.2", "spdx": "MPL-2.0", - "vendorHash": null + "vendorHash": "sha256-h4CO3sC41RPSmkTlWUCiRvQ1NRZkT2v1uHFOemvBN8s=" }, "cloudscale": { "hash": "sha256-DQ7yIqA9gII0Ub1C8DEa1AMhQbzRFvsng8TMBGz+qzg=", @@ -286,13 +283,13 @@ "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=" }, "datadog": { - "hash": "sha256-LZYpKwcNvkmpYfhCuZhxfid42IBhRmzfiHZVYu3XAlA=", + "hash": "sha256-gZdjbW2yz3TmnGfCLiveUpTcMeKBUUSV6CnugnkdoZ8=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.20.0", + "rev": "v3.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-IrSQEu3IDFKM9t+3pkygyrrq8KRI8E0BqTui2TR5nFM=" + "vendorHash": "sha256-6aBwtm4p/sJyH9jT7wT+utHIlOSgOilOk0AZSI9RzD8=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", @@ -304,11 +301,11 @@ "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" }, "digitalocean": { - "hash": "sha256-l/p2HStjvxF6UB1SnY3EoGjC/3t5FdlC6LMk7jn11KI=", + "hash": "sha256-ZTt/lfHWD9G/SbZ7mLKPjJAsva5bgRqvvX8Lh1Ci+ts=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.25.2", + "rev": "v2.26.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -322,22 +319,22 @@ "vendorHash": null }, "dns": { - "hash": "sha256-aH9sDqlXSq2dJi0kzGreJZ5V8A0WU0UqTpxWPKn23rM=", + "hash": "sha256-qLKlnw0vnPvxJluvUiBERu1YdtrRklocVw314/lvQT4=", "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", "repo": "terraform-provider-dns", - "rev": "v3.2.3", + "rev": "v3.2.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=" + "vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk=" }, "dnsimple": { - "hash": "sha256-P1mvxRbOSmQknQxFPEyAkpK5eZQq286oceRFbrgYYqg=", + "hash": "sha256-AbNOqxZOrXUxkuScOgrZ3OyEHWpZ8+tsqqXW6lofaMc=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.15.0", + "rev": "v0.16.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=" + "vendorHash": "sha256-rGcCbESdzKGy3I1FcDA3dUbblyG/uk74rizj7INRGPw=" }, "docker": { "hash": "sha256-M2K4N39vtVDA/vMp/s2KYiS/uoE+STf2e6yh6q0CS28=", @@ -358,21 +355,20 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-hU0mqMuB3yvLWJ6ggDvATQeSFdpsEfs/hmvLV6A2Md4=", + "hash": "sha256-aah3f/5Bd+IgXbyJpDhcyklIYHlK3yy16UkYlOprh0c=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", - "proxyVendor": true, "repo": "terraform-provider-equinix", - "rev": "v1.11.1", + "rev": "v1.12.0", "spdx": "MIT", - "vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM=" + "vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo=" }, "exoscale": { - "hash": "sha256-F1tYiEy9eQ7GcgVPNfe6Jy6hXEWdFHGXA6esAnOgiQE=", + "hash": "sha256-XbuVvVOv8k7T/7smr73+lvhFMxKtJkaLN3WgvTWIkrA=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.43.0", + "rev": "v0.46.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -386,11 +382,11 @@ "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=" }, "fastly": { - "hash": "sha256-SaihRh+DuMY9Mcx+PBAUPv0vrWeKGqx437ayLT3kdjI=", + "hash": "sha256-oaBVVbeJdmzkx3hphW9Llh/ZUujo8QNeZd6guDkBiCY=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v3.0.4", + "rev": "v3.1.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -415,51 +411,51 @@ "vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=" }, "gandi": { - "hash": "sha256-mQ4L2XCudyPGDw21jihF7nkSct7/KWAe/txnbtuJ8Lk=", + "hash": "sha256-eVSMjXSYRedig93Tm2ZLpbuJhG3wKSBwfLli7OWs3dU=", "homepage": "https://registry.terraform.io/providers/go-gandi/gandi", "owner": "go-gandi", "repo": "terraform-provider-gandi", - "rev": "v2.2.2", + "rev": "v2.2.3", "spdx": "MPL-2.0", "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-o/kJwByQDXgbazZPoYW4YeV7BK4Bb3pwQhnWMhW4klE=", + "hash": "sha256-GieysqBcXSgHuT13FqDtPPklFPRBREwMrTZZ7QH14pY=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.16.0", + "rev": "v5.18.0", "spdx": "MIT", "vendorHash": null }, "gitlab": { - "hash": "sha256-bCF6BLuzjUZToZKerfsGcav4DD6AWwOrlELxQKygHv4=", + "hash": "sha256-nBmb+wHl6FEHIH/P9SsDCtvDKVHzcL4/iaQwtuSjbVg=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v15.8.0", + "rev": "v15.9.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE=" + "vendorHash": "sha256-yK2M07+FmMEE9YuCJk86qLncHr2ToeZQAzWRQz1lLNM=" }, "google": { - "hash": "sha256-R104jYttXER/Pzd3ePHh9ZOvpcziuVQK0JcFqdbWtG0=", + "hash": "sha256-my7vlk1EBQizQy2i+77Sf4OyOh+64GSDruzCfOc1QTc=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.50.0", + "rev": "v4.55.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" + "vendorHash": "sha256-aYw8D9Zj9QCewiHgW3Ka9zMo7PhzTiZQMuHEaHEf01E=" }, "google-beta": { - "hash": "sha256-OrotSvDNK7PC6nyHEAvmTOYgdYFiHEE8YwfWcOAbPsk=", + "hash": "sha256-uZuoWORRK0Y+r6OM6KhAts7/yPWJDkOtMwELFV/2hYE=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.50.0", + "rev": "v4.55.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" + "vendorHash": "sha256-aYw8D9Zj9QCewiHgW3Ka9zMo7PhzTiZQMuHEaHEf01E=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -471,13 +467,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-K1Pal5Fn6KxIlmcnOW6SNPdOzT9JExwhVRFDVTbaTug=", + "hash": "sha256-4K0Pk7tgnOjFdHpe6SZNSt/wU8OBzdB/y99nibW5bAY=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.34.0", + "rev": "v1.35.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fTc0cNo/ZWUo2tORzDKSDjFsXYIMz+a2+Zsx4fzd3ic=" + "vendorHash": "sha256-oSpAq2834Nt+E8l64YhvuXdfUsoTU5rBr2I8+Yz9tkc=" }, "gridscale": { "hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=", @@ -498,20 +494,20 @@ "vendorHash": "sha256-/dsiIxgW4BxSpRtnD77NqtkxEEAXH1Aj5hDCRSdiDYg=" }, "helm": { - "hash": "sha256-MSBCn4AriAWys2FIYJIGamcaLGx0gtO5IiB/WxcN2rg=", + "hash": "sha256-X9keFjAmV86F/8ktxiv/VrnkHOazP9e/aOC9aRw1A48=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.8.0", + "rev": "v2.9.0", "spdx": "MPL-2.0", "vendorHash": null }, "heroku": { - "hash": "sha256-UGA01N4ToEb3eSKCI2raI3ZXFeRm0MVVXVWgAc7im9g=", + "hash": "sha256-HRwG8VNl13HdibczNDWiCS74vrRImM/g3zn4MgQQx3s=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.10", + "rev": "v5.1.12", "spdx": "MPL-2.0", "vendorHash": null }, @@ -544,11 +540,11 @@ "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { - "hash": "sha256-8H9DgpZukJ6K78H6YITPgWai8lPPb8O1tITRTl/azHw=", + "hash": "sha256-oZUPfhndpht9EuBiltLknblGaMX2M/dD1iOiwDJKgWY=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.44.1", + "rev": "v1.44.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -571,13 +567,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-DvJow7KDyv1wGBw0QIQQ4MoLgQIT8+Cf6fjc7w4W7Ds=", + "hash": "sha256-Qdb5HpamjCNGlqSf3etFv0++Skrk/jm6UVBFsKGU+jw=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.49.0", + "rev": "v1.50.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Vt1AKXJ8KRoDESFvUeZPTjUFm7gwP/Uji4hyU16GhjY=" + "vendorHash": "sha256-JkmfZ9yz3r26j1SHIwnyNA+nYWAy4DoaWEMfFUTzD3Y=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -643,22 +639,22 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-mjxFKCUmXg9CPz/ZZWPr1F8DSUadNroEEwvJgwHYk5s=", + "hash": "sha256-4TUUejEKbnsRmqwdQVhHF+QWW8kReq+ZQQvpcT+YhsQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.17.0", + "rev": "v2.18.1", "spdx": "MPL-2.0", "vendorHash": null }, "launchdarkly": { - "hash": "sha256-AsFtlCIGvlG8c+PilhMhaMowaea/g1+IXYzEiIIbZ44=", + "hash": "sha256-7m5+Fu9UjmGWL4PgYCpI9vMStfmU4oQ1cx+7wAirEbQ=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.9.4", + "rev": "v2.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=" + "vendorHash": "sha256-j8Lit22aWeLvYrq5ao0nIdcVZDSxaAKaW+bxQ/JCSgE=" }, "libvirt": { "hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=", @@ -670,13 +666,13 @@ "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-bwVHrgcxc2W5Lx1aheqkdgwfrFfk4YAhD5bqvHdcxtI=", + "hash": "sha256-uebz6flGALcmRpBYjEEj+X2YFDkTjuaGLdGGD1jY+ns=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v1.29.4", + "rev": "v1.30.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=" + "vendorHash": "sha256-DbhHBmFuuyoWtGqZjXKFMpSP3Xlt5GVEhSvUyWerKtM=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -697,14 +693,13 @@ "vendorHash": "sha256-NXSquRqBaENxWX+ZukDJie/EU+wdEQSxvZQEZqjL+ug=" }, "lxd": { - "hash": "sha256-2YqziG5HZbD/Io/vKYZFZK1PFYVYHOjzHah7s3xEtR0=", + "hash": "sha256-4BDpVWfdSYTKPTCgKIHOqgNaxgdIGjW5yRh9Ezs/0zY=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", - "proxyVendor": true, "repo": "terraform-provider-lxd", - "rev": "v1.9.0", + "rev": "v1.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=" + "vendorHash": "sha256-RVELewqJtH4tuHJWfcLcMH7cM0dr7Yse+UnqrLaNyCc=" }, "mailgun": { "hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=", @@ -734,22 +729,22 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { - "hash": "sha256-QMaK/c4Rv7rChiVVGY8JizqTfLY98HwONyu5qU/LPGQ=", + "hash": "sha256-zfnldsJcr36RMwEcmoDiwko1f+VR9tlPVUe/OVgX4Bc=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v1.10.0", + "rev": "v1.12.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-w/1eNrXK4Zpt80J1FidnhMAD0lhSskHMt/hrdrgfSYw=" + "vendorHash": "sha256-MLhHRMahJjTgQBzYkSaVv6wFm6b+YgpkitBHuj5B6po=" }, "mongodbatlas": { - "hash": "sha256-jYEeJoMqYo5BCsr8pZlowwUPdW/QrCoHiSpDrEGK9QQ=", + "hash": "sha256-OR9bvtg3DoJ4hFP/iqzQ1cFwWZYrUrzykN6sycd0Z6o=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.7.0", + "rev": "v1.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9m+eukHaSdSstWBtjxpgYkgyQVXx0jmKfEz3D9YROO4=" + "vendorHash": "sha256-cvTIFjKYrIohRjUTxGOxgla2t/elj3Aw79kbVdaQbrY=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", @@ -770,13 +765,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-lWjXsIeYpe07+kIHr8qS8SmChs0tnfzxWy/K1KNJ5oo=", + "hash": "sha256-ReVP0droWSP+NWV0kQznfCllL/jx0uQKmaGr+CyR8iQ=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.13.0", + "rev": "v3.15.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Ptjd4A/P2pZL5wP8IGHN385jngfS56w7FN1g/EpknRw=" + "vendorHash": "sha256-aFjsUhdGboN8Hfu2ky6djG0hC/Z9MU2tOWDFXekOGNQ=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", @@ -807,31 +802,31 @@ }, "nutanix": { "deleteVendor": true, - "hash": "sha256-UOny3UfrSrw/h9U9r1qlro4we03lOnUcZBL/bPwDESE=", + "hash": "sha256-PQwP2xIh635pc8nL0qhiUUqaf5Dm8uERFk61LUk6Xmc=", "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.7.1", + "rev": "v1.8.0", "spdx": "MPL-2.0", "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-L8y00f+57hndpVevliJ2kNqpGeNR2Jv/FHbqkAUIRMI=", + "hash": "sha256-6UVsSOAh/JigJkiK+RbHsv7t/IuejouaRL+o8F0ndAo=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.105.0", + "rev": "v4.109.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-+aHlFu49BxdFqrVCEIEqpg+o2i4d5F1uZipc//Qipaw=", + "hash": "sha256-UMQ1YEXYdaLwYZBhGzbikhExW/HT/u4QSNk08vhmbwA=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.40.0", + "rev": "v3.42.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-XwQTtOsg1rktv/Oc+eTJ+Jr+BJvLEQPCaRSeXdXxWB0=" + "vendorHash": "sha256-KWSHVI51YHHF3HXpyd1WB5Za721ak+cFhwDIfvC/ax4=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -843,11 +838,11 @@ "vendorHash": null }, "opennebula": { - "hash": "sha256-+EbEVwgo2HWmVhff7u5ohSJW8wuxK1kvWfvRWRwIP4o=", + "hash": "sha256-r8z5rpSvjNSDuvcRLtnOUFnBFFNAlcvfCbmW6LLHP5E=", "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", "owner": "OpenNebula", "repo": "terraform-provider-opennebula", - "rev": "v1.1.0", + "rev": "v1.1.1", "spdx": "MPL-2.0", "vendorHash": "sha256-zKtBDnvlQHe+q0OZUMUGu1gNsx2wIrIoArtJrt0VaBk=" }, @@ -861,38 +856,38 @@ "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { - "hash": "sha256-D2RPpG1RE+bM7rVvmItczpRExMXK0RaKfJsnifvXRTs=", + "hash": "sha256-UIpzv5Tas5jxpaqg1n0KRoJhYj6vRE6DBQ2u701xgzU=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.32.3", + "rev": "v1.33.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-49ViIxICpvWgpv+uY0NTDvXGJthjH6aT38COfS+AOaQ=" + "vendorHash": "sha256-EbUHKM6fKEZk1ey4qTgAd/20OKJu0DoBF0MAOxB7y64=" }, "opsgenie": { - "hash": "sha256-NMaTTZQyEJ0vb+eDNTGRozTrme78Vo+/GuIR43AeDbU=", + "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.19", + "rev": "v0.6.20", "spdx": "MPL-2.0", "vendorHash": null }, "ovh": { - "hash": "sha256-LcSrs4FUrtp/4tp1xlBPKkfQ3J8FlZ/peL9NcC7XQy4=", + "hash": "sha256-d/G2o1G0cdb5shSv1WG7YBbhNift2sKjUd/Cz9XgvJ8=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.26.0", + "rev": "v0.28.1", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-0gEuIvgiFntP7dHmpkB3IRGMrAI8JbWG0zxiyNdFAiM=", + "hash": "sha256-uicfk05Y8p4jQLG+Z8Cd2kI8rToI++13lsg0JUsm7Ew=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.9.2", + "rev": "v2.11.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -969,13 +964,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-k02p6eoo152SWalGCX4iXhkE5xN55HpQ9A31j7wuIPE=", + "hash": "sha256-rkDNV58mN/7pgQC1WBnrggHtq7q3O7r3v+huB4oPVLM=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.9.1", + "rev": "v2.12.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-FbWLXt7MFn/86NlSwCYpSV/6Ft3xRcESoNcVxM1A4ng=" + "vendorHash": "sha256-zice1rGuZH9kmQJQ8RdIONJXVXu1BIuRUKjTGLPK7Ns=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -987,13 +982,13 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-glIvlf5lWwkdZKn4rxhR+XnBqUdu9RO+loxke07i2c0=", + "hash": "sha256-gZiDFcrQZsOE0R74LYwoitAjuPqPZCPLTEL3giom+c8=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v3.9.0", + "rev": "v3.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=" + "vendorHash": "sha256-+Duf/wdjmw6NBhmy1KmNRJ+ZEjjwtJoXXQCw2lJzxS4=" }, "sentry": { "hash": "sha256-L/aZ4/xCVZk3C6AGglzCj5T9XnoI/uiLbRASNAHwcro=", @@ -1014,13 +1009,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-qzLP+IGZU5bms8zjtcUg9rApZW2+TCF7KrtqSQvr3lw=", + "hash": "sha256-9cGF/uyC/sqCx7Y9aEawkKVJvHE8siGgWRWWf4ok3B0=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v6.20.0", + "rev": "v6.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-zIF5NA5kHXEr3aUleWrCYg8PZTKnrFubaRlALnbTLHQ=" + "vendorHash": "sha256-Iue8P14x8P0lMa85goSF1D5mEeXw6dH1atJQhgbnZ6Y=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1032,13 +1027,13 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-QikYp81omjlSckr/2oXCmAqiJlcMWuR120z86fP/zkE=", + "hash": "sha256-nNv2lo7I5+eFmw+BvRB/DmgNE6iuR3Aq0kxyOeQdiqU=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.55.1", + "rev": "v0.57.0", "spdx": "MIT", - "vendorHash": "sha256-ulgTRY8qQ5oXONkwYtffRl1QMNnbvyn0zYiYqqvwrUU=" + "vendorHash": "sha256-yFk5ap28JluaKkUPfePBuRUEg6/Ma5MrRkmWK6iAGNg=" }, "sops": { "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=", @@ -1050,22 +1045,22 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-2w4Qh9S0YxvcNdgtPLsNEumZiJn3+VH80zwamJW1FWQ=", + "hash": "sha256-mbO0APaGWLHowhs5tDvloUBYKt4+pvx3qqN2gtrAzGY=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.96.0", + "rev": "v1.101.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-SRQWZGyQDbESrpu0tsy6EBfvjY/l89fQexCdhSYPzGI=" + "vendorHash": "sha256-sVNtY2wDGE2ZOB4YNytx0n4V4cbNKoXAv7JCA+Ym3JU=" }, "stackpath": { - "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", + "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", "homepage": "https://registry.terraform.io/providers/stackpath/stackpath", "owner": "stackpath", "repo": "terraform-provider-stackpath", - "rev": "v1.4.0", + "rev": "v1.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Fvku4OB1sdWuvMx/FIHfOJt9STgao0xPDao6b2SYxcQ=" + "vendorHash": "sha256-OGYiynCwbJU2KisS7Y6xmLuBKOtQvh3MWPrvBk/x95U=" }, "statuscake": { "hash": "sha256-PcA0t/G11w9ud+56NdiRXi82ubJ+wpL4XcexT1O2ADw=", @@ -1077,13 +1072,13 @@ "vendorHash": "sha256-0D36uboEHqw968MKqkgARib9R04JH5FlXAfPL8OEpgU=" }, "sumologic": { - "hash": "sha256-4M8h1blefSNNTgt7aL7ecruguEWcZUrzsXGZX3AC2Hc=", + "hash": "sha256-1BwhcyEJs7Xm+p2ChA9K7g+qBzqoh3eyAT9qKMfHB1g=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.20.0", + "rev": "v2.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=" + "vendorHash": "sha256-dpMa+XnfavXO0lXiBZOsU+O+5/3a/IMkfzpQcnD/sSw=" }, "tailscale": { "hash": "sha256-X3YV640d3pLyKm/v88oEhXfYnox+ksrEWKgiJbYl6gk=", @@ -1094,30 +1089,39 @@ "spdx": "MIT", "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw=" }, + "talos": { + "hash": "sha256-Uj4UlxPvI80og/wJPtQgyrejXLcfc6R4IJfsXiVNm+Y=", + "homepage": "https://registry.terraform.io/providers/siderolabs/talos", + "owner": "siderolabs", + "repo": "terraform-provider-talos", + "rev": "v0.1.1", + "spdx": "MPL-2.0", + "vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI=" + }, "tencentcloud": { - "hash": "sha256-CLXW1takpsySUo8lpDe6DzRFczts1zRriHZge5uCb3A=", + "hash": "sha256-aqi6lEGVj0PhIMwUfU/4lu5uGgbU4+R42UhINbHgMjY=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.6", + "rev": "v1.79.12", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-YhsAKyD3YYYWfxIHcAgMxdQc//0WQvXTsa+fVhSCG6U=", + "hash": "sha256-eFyRa4T+CqIeOcEYj4DQP6ypR7AROYrGDYuYSqBfKr0=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.41.0", + "rev": "v0.42.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-LgCS7W6mGGlX4vEhlPYL+Wo/urHv7aiopXWEBoEyL1c=" + "vendorHash": "sha256-bhAoNJSbrpAzw0qCKIm84h6tFqUWT0JeBs1gJpPeJdU=" }, "thunder": { - "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", + "hash": "sha256-GLyGm9Q+ajuQFIni/OCYvYhpj2fiVYHzkPwbofq/DEs=", "homepage": "https://registry.terraform.io/providers/a10networks/thunder", "owner": "a10networks", "repo": "terraform-provider-thunder", - "rev": "v1.0.0", + "rev": "v1.1.0", "spdx": "BSD-2-Clause", "vendorHash": null }, @@ -1159,30 +1163,30 @@ "vendorHash": null }, "ucloud": { - "hash": "sha256-S0pSri0NfxxaYfifUEUVAoEIRPE8y2/sCNdXCLIDGh0=", + "hash": "sha256-Rh1X4AboPlHWikL/PIWTAf0f2/i3vSVsxzDp1kRuNiA=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.34.0", + "rev": "v1.34.1", "spdx": "MPL-2.0", "vendorHash": null }, "utils": { - "hash": "sha256-B2FdeukUD+xuJHBT1Yv9G2txjX/OmkxAGXDUw2HItig=", + "hash": "sha256-nLi6aczJdADzdYNJaZldUOFFjgf3ujDdRrhSCuphIn8=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.6.0", + "rev": "1.7.1", "spdx": "Apache-2.0", - "vendorHash": "sha256-jyGp0HIu+VxZ7n6Cctq6pi6Z7IKZ7W7FeqnGXk9Pt7o=" + "vendorHash": "sha256-yTcroKTdYv0O8cX80A451I1vjYclVjA8P69fsb0wY/U=" }, "vault": { - "hash": "sha256-aNyCUDV1yjpmbPNYlxuJNaiXtG3fJySxRsDLJx/hZ04=", + "hash": "sha256-cYSw5aN7TvVMUY+YnyyosB4HjiosXYB7kDiNDQ258Eg=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.12.0", + "rev": "v3.13.0", "spdx": "MPL-2.0", "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=" }, @@ -1214,29 +1218,29 @@ "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { - "hash": "sha256-lHyrBJz6954te57uKpgrqOVztDsDUSqkHtWXnlG0QUw=", + "hash": "sha256-J+lhKDl8CGpDgdfuv0uWd7yDNiwrWAzoXCxkEidqJH4=", "homepage": "https://registry.terraform.io/providers/vmware/vra7", "owner": "vmware", "repo": "terraform-provider-vra7", - "rev": "v3.0.6", + "rev": "v3.0.7", "spdx": "MPL-2.0", "vendorHash": null }, "vsphere": { - "hash": "sha256-UwhIGK1zQ++IuwAKH9i+Dlu2vvXkMYL+s1P03qKSe3E=", + "hash": "sha256-VScIcK4bInS9yhIYkYRsU8Hhzex9iyVkPiyjnnjshkI=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.2.0", + "rev": "v2.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=" + "vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI=" }, "vultr": { - "hash": "sha256-DfiJgN1R7qW3c13hBabsMizY3mYamIq8AGms1q9kdVU=", + "hash": "sha256-5pI/jLG8UdMxgubvp5SJDW49C6iHKXOtlnr3EuzwtsQ=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.12.0", + "rev": "v2.12.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1250,13 +1254,13 @@ "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=" }, "yandex": { - "hash": "sha256-g3BdCQKBuxrTn/sScJtRMyL2EoiOF5MpMXMM6I++dEg=", + "hash": "sha256-aBWcxC6mHM/3GOjnN/Qi0DNoZjehh5i3C2+XRZ2Igdo=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "proxyVendor": true, "repo": "terraform-provider-yandex", - "rev": "v0.84.0", + "rev": "v0.85.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-q9Rs2yJtI7MVqBcd9wwtyqR9PzmVkhKatbRRZwFm3po=" + "vendorHash": "sha256-eLCFnBGAvH0ZEzOb5xVCY0Yy4U5V407AhpGSFpa9t7I=" } } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 4865ca4901cb8..6a722b80b834c 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -12,18 +12,18 @@ }: let - generic = { version, sha256, vendorSha256 ? null, ... }@attrs: - let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "vendorSha256" ]; + generic = { version, hash, vendorHash ? null, ... }@attrs: + let attrs' = builtins.removeAttrs attrs [ "version" "hash" "vendorHash" ]; in buildGoModule ({ pname = "terraform"; - inherit version vendorSha256; + inherit version vendorHash; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform"; rev = "v${version}"; - inherit sha256; + inherit hash; }; ldflags = [ "-s" "-w" ]; @@ -168,9 +168,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.3.7"; - sha256 = "sha256-z49DXJ9oYObJQWHPeuKvQ6jJtAheYuy0+QmvZ74ZbTQ"; - vendorSha256 = "sha256-fviukVGBkbxFs2fJpEp/tFMymXex7NRQdcGIIA9W88k="; + version = "1.3.9"; + hash = "sha256-gwuUdO9m4Q2tFRLSVTbcsclOq9jcbQU4JV9nIElTkQ4="; + vendorHash = "sha256-CE6jNBvM0980+R0e5brK5lMrkad+91qTt9mp2h3NZyY="; 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 bfe34115719ab..d683fc520a106 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GOYSFhKfe8+9YBNyfCEUDCMssH9cXZi1S/KJTqPgBhY="; + hash = "sha256-6LL/ipDqNoiNWR/H5WzJVsJcgorYx6+jo+TjlfifsDo="; }; vendorHash = "sha256-niU6DGKNhSV+nm+8jIP//AItBu5eWTasyeL/ADvY2zA="; diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/applications/networking/cluster/tfswitch/default.nix index 8719ebebb7681..c8f2fb070fbad 100644 --- a/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "0.13.1300"; + version = "0.13.1308"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = version; - sha256 = "sha256-btvoFllCfwQJNpRWdAB05Cu4JYmT1xynJxDbzO/6LDs="; + sha256 = "sha256-EyA7LwfL3vCNzd2wpyUbrUnvkM0/f7/cQp+jcAcGZsg="; }; - vendorSha256 = "sha256-NX+vzI/Fa/n9ZQjpESes4fNVAmKlA1rqPwSKsL2GEUY="; + vendorHash = "sha256-NX+vzI/Fa/n9ZQjpESes4fNVAmKlA1rqPwSKsL2GEUY="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 19aaa36c7eb69..ebb28798f55ed 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.30.13"; + version = "0.31.2"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W67aQIXp2TOtZuccjQUGC9gNtvdyUNWuU7VM2LOFkCg="; + sha256 = "sha256-Wn7e2g1KPnFgFuRPUh3g0FW/m0qRHV5reO+AZbhbaC8="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index bc4f1959eaace..dcb4dd9eb08d4 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-PBCTVws5N42q68rKcMLW7GgZvdsQgmdlsKMpJ5bCF00="; + sha256 = "sha256-jN45chUeoGJGJWD6Rj6duNE36/QCzPqci8V3h1OHtw4="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorSha256 = "sha256-5Po8TRCE6VP+RcaIJImYjElTMHHS/2JwbrHreeWLxio="; + vendorHash = "sha256-mvVwf4w/65L+F6aiTNf2jmJtaT1EpWCQJ6r9NHUUUqQ="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index e6f6bc1511756..d13e13ca2420b 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.10.5"; + version = "0.11.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oUzWBFoBRwQynWubBzR9xNIyqRXTsH0R+OCyIDz0a9s="; + sha256 = "sha256-FI6QXQ0n/vvzUJTBbPDh9nMyAdcfTzpX79RxQEbFDUs="; }; - vendorSha256 = "sha256-rmDxO1tfpCUh5TXsSmf3DMIqB0NQHuCyizZmnaoZox0="; + vendorHash = "sha256-t8PzimNW7JWvWU3lZHo+b5K3R6he35HhBQPu1hxK51U="; nativeBuildInputs = [ go-bindata installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index cad2c936a3316..13d097c5b4bf9 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.197"; + version = "1.2.202"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-cRpXdV/aHxVxMd54nmf9bMogiC9V8ryvCtSe+6Vx/Hk="; + hash = "sha256-jBsANHQ+l5zD3Liq7V/y+WzFQxRWzOC43UN5ES6D7PE="; }; - vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; + vendorHash = "sha256-SzqGcbfDtBfgnu6CRPyk2tPdwNDhM1RfteKTXVvivw4="; proxyVendor = true; @@ -64,6 +64,10 @@ buildGoModule rec { integration/suites \ pkg/true_git/*test.go \ test/e2e + '' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + # Remove failing tests. + rm -rf \ + cmd/werf/docs/replacers/kubectl/kubectl_test.go '' + lib.optionalString (CGO_ENABLED == 0) '' # A workaround for osusergo. export USER=nixbld diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 243b0d16a25fa..76464c0d980ac 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.11.6"; + version = "0.11.7"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-Me+kmEfvSJs8EPU4D7MwkEyHQuvDmQCSIATxygXws5o="; + hash = "sha256-PMjgEZ7D1peoW5ubOB/QrnmKVZs4/ToIBKH9zBT1J10="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-jI01tdAVdJOj/ocpwCiaANdyYKSLw00bV7ZtU7HvslA="; + vendorHash = "sha256-Ne3+NJsEJKjvkLShJxiiOq/UoORF7ggv/j7ltPgrSfQ="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix index 6b3b7f2843021..ceeeae75a18f4 100644 --- a/pkgs/applications/networking/diswall/default.nix +++ b/pkgs/applications/networking/diswall/default.nix @@ -1,17 +1,24 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Security; +in rustPlatform.buildRustPackage rec { pname = "diswall"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; rev = "v${version}"; - sha256 = "sha256-zT8RRg+Ver7dYtJL9htrZ8nXoD0V7IvdIqHTKDmbZ7c="; + sha256 = "sha256-54iNbMZ+j6ioBTb/okyWZqqe4p6IyapZwc6VdtiAkLs="; }; - cargoSha256 = "sha256-N+w1OiCy3scahFdYI49GpL301t1qNd/X4fdLMoQE/2s="; + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; + + cargoHash = "sha256-stpJNDC+dQQNZdZTihbQWZ66wgdQ+oz8s3Ogb1wxnxY="; doCheck = false; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 2a1bb79b655ed..3e66621b57195 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.24.0"; + version = "3.26.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+fOcFu52f2PiynF0B8r3zAW/ANypXx9inLnf4ZtwI2M="; + sha256 = "sha256-wkPBMFsPLJFfilKuA3bGNn7NtC+wsnXZf+qkVpF2fWc="; }; - vendorSha256 = "sha256-+43UegjFjh86vXjH1A4jbORk8xTDZaJRc41RhFPcESk="; + vendorHash = "sha256-U7RQPrvByTADC2/8O0cvcf0nmDgIeVkuyRGV0fpSCPk="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index a5debadc8005f..57cf5e20bcd5a 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.2.7"; + version = "4.3.2"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-X5hZspl9IekhC8XXpZS285cmVZek2oxIV3tYOz/ZBec="; + sha256 = "sha256-2h9fVah0WZ8X0GsCLtiUWRan1Gkl4WBxuEQ3gx4FFBo="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index 1cd83cda77a96..af2dbd1a9a4f9 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -1,18 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cppcheck, libmrss, libiconv }: +{ lib, stdenv, fetchFromGitHub, libmrss, libiconv }: stdenv.mkDerivation { pname = "rsstail"; version = "2.1"; src = fetchFromGitHub { - sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6"; - rev = "6f2436185372b3f945a4989406c4b6a934fe8a95"; - repo = "rsstail"; owner = "folkertvanheusden"; + repo = "rsstail"; + rev = "6f2436185372b3f945a4989406c4b6a934fe8a95"; + sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6"; }; buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - nativeCheckInputs = [ cppcheck ]; postPatch = '' substituteInPlace Makefile --replace -liconv_hook "" @@ -21,7 +20,8 @@ stdenv.mkDerivation { makeFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; - doCheck = true; + # just runs cppcheck linter + doCheck = false; meta = with lib; { description = "Monitor RSS feeds for new entries"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { RSSTail is more or less an RSS reader: it monitors an RSS feed and if it detects a new entry it'll emit only that new entry. ''; - homepage = "http://www.vanheusden.com/rsstail/"; + homepage = "https://www.vanheusden.com/rsstail/"; license = licenses.gpl2Plus; maintainers = [ maintainers.Necior ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index f14433b6c1799..fbb73dbd968bf 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.21"; + version = "3.5.27"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-VVZvr0h98bWJW9FNFr3/pw7pSqF62hCnr6iv9xSzXf8="; + hash = "sha256-EeQs7WcNpnz2KrgUel9OF9pwW7WzKJrv5pvsZkV4RVg="; }; postPatch = '' diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index 5ef5feb3a16b0..b7e7ab2986552 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -14,13 +14,13 @@ gcc12Stdenv.mkDerivation rec { pname = "freefilesync"; - version = "11.29"; + version = "12.1"; src = fetchFromGitHub { owner = "hkneptune"; repo = "FreeFileSync"; rev = "v${version}"; - sha256 = "sha256-UQ+CWqtcTwMGUTn6t3N+BkXs4qxddZtxDjcq7nz5F6U="; + hash = "sha256-KA3Bn8skJ2gMmihmwlUmN6jXZmfoYY/f4vqbKwvxwgw="; }; # Patches from ROSA Linux @@ -57,7 +57,7 @@ gcc12Stdenv.mkDerivation rec { wxGTK32 ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ # Undef g_object_ref on GLib 2.56+ "-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_54" "-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_54" diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 287e83ffa0500..60c928e0b9cc9 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.62.2"; + version = "3.63.1"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - hash = "sha256-p2cJY1yg6kdPaR9sYLGRM0rzB57xksB8NGUEuqtzjBI="; + hash = "sha256-TgtcD3n0+LykuiHnE7qXuG1bRcRyPeZ7nBDSO/QXo38="; }; configureFlags = [ diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index b62bda3c469f9..20ef4e682c7e9 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -1,24 +1,34 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "gdrive"; - version = "2.1.0"; - rev = version; - - goPackagePath = "github.com/prasmussen/gdrive"; + version = "2.1.1"; src = fetchFromGitHub { - owner = "prasmussen"; - repo = "gdrive"; - sha256 = "0ywm4gdmrqzb1a99vg66a641r74p7lglavcpgkm6cc2gdwzjjfg7"; - inherit rev; + owner = "prasmussen"; + repo = "gdrive"; + rev = version; + hash = "sha256-2dJmGFHfGSroucn4WgiV2NExBs5wtMDe2kX1jDBwbRs="; }; + deleteVendor = true; + vendorHash = "sha256-sHNP1YwnZYu0UfgLx5+gxJmesY8Brt7rr9cptlyk9Bk="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/prasmussen/gdrive/pull/585/commits/faa6fc3dc104236900caa75eb22e9ed2e5ecad42.patch"; + hash = "sha256-W8o2ZfhQFJISHfPavjx9sw5UB6xOZ7qRW4L0bHNddS8="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { - homepage = "https://github.com/prasmussen/gdrive"; + homepage = "https://github.com/prasmussen/gdrive"; description = "A command line utility for interacting with Google Drive"; - platforms = platforms.unix; - license = licenses.mit; + license = licenses.mit; + platforms = platforms.unix; maintainers = [ maintainers.rzetterberg ]; }; } diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/applications/networking/go-graft/default.nix index 7e268e27f1a0f..ec9ca385e1ef8 100644 --- a/pkgs/applications/networking/go-graft/default.nix +++ b/pkgs/applications/networking/go-graft/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "go-graft"; - version = "0.2.15"; + version = "0.2.18"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-INoJcb6XUMvT1E56hC3BGK3Ax+v4jSRpZV12zpjYfMA="; + sha256 = "sha256-07fP3dVFs4MZrFOH/8/4e3LHjFGZd7pNu6J3LBOWAd8="; }; CGO_ENABLED = 0; ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ]; - vendorSha256 = "sha256-kKIekANzLY2TYFyII1/BkKkqPYgmHB9xEfAVhJyI8FI="; + vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 81062c1eb7c55..2367f847d1073 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { }; doCheck = true; - nativeCheckInputs = [ ounit2 ]; + checkInputs = [ ounit2 ]; buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ]; diff --git a/pkgs/applications/networking/gossa/default.nix b/pkgs/applications/networking/gossa/default.nix new file mode 100644 index 0000000000000..4a14571b23ffe --- /dev/null +++ b/pkgs/applications/networking/gossa/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + name = "gossa"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "pldubouilh"; + repo = "gossa"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-eMO9aoI+otGQcvBUJtxciQ7yhUidYizLrDjMVchH3qA="; + }; + + vendorHash = null; + + ldflags = [ "-s" "-w" ]; + + # Tests require a socket connection to be created. + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/pldubouilh/gossa"; + description = "A fast and simple multimedia fileserver"; + license = licenses.mit; + maintainers = with maintainers; [ dsymbol ]; + }; +} diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 46394c107dec0..9a6dd217e5de7 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -3,19 +3,19 @@ }: stdenv.mkDerivation rec { - version = "2.9.18"; + version = "2.9.20"; pname = "snort"; src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz"; - sha256 = "0xrc7crchflfrk4x5dq5zx22zkmgcrbkww5r1pvkc3cyyr18cc6h"; + sha256 = "sha256-KUAOE/U7GDHguLEOwSJKHLqm3BUzpTIqIN2Au4S0mBw="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 49b88c9fd680c..bf7626759b365 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "6.0.8"; + version = "6.0.10"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-JTzjzA35Z62TcdbqjU7tkexZPfPtBOCCKcfPhXgMkaM="; + sha256 = "sha256-Wb/Rv12cFZYib6SBW/dmQ85ZaYhmwQeiYmnEgfElxNc="; }; nativeBuildInputs = [ @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free and open source, mature, fast and robust network threat detection engine"; - homepage = "https://suricata-ids.org"; + homepage = "https://suricata.io"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ magenbluten ]; diff --git a/pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch b/pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch new file mode 100644 index 0000000000000..4784e6790fc3f --- /dev/null +++ b/pkgs/applications/networking/ids/zeek/avoid-broken-tests.patch @@ -0,0 +1,16 @@ +diff --git a/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt b/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt +index bafbabf1..0579f20a 100644 +--- a/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt ++++ b/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt +@@ -188,11 +188,3 @@ install_headers(include hilti) + install_headers(${PROJECT_BINARY_DIR}/include/hilti hilti) + install(CODE "file(REMOVE \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_INCLUDEDIR}/hilti/hilti\")" + )# Get rid of symlink. +- +-##### Tests +- +-add_executable(hilti-toolchain-tests tests/main.cc tests/id-base.cc tests/visitor.cc tests/util.cc) +-hilti_link_executable_in_tree(hilti-toolchain-tests PRIVATE) +-target_link_libraries(hilti-toolchain-tests PRIVATE doctest) +-target_compile_options(hilti-toolchain-tests PRIVATE "-Wall") +-add_test(NAME hilti-toolchain-tests COMMAND ${PROJECT_BINARY_DIR}/bin/hilti-toolchain-tests) diff --git a/pkgs/applications/networking/ids/zeek/broker/0001-Fix-include-path-in-exported-CMake-targets.patch b/pkgs/applications/networking/ids/zeek/broker/0001-Fix-include-path-in-exported-CMake-targets.patch new file mode 100644 index 0000000000000..07b95960ef857 --- /dev/null +++ b/pkgs/applications/networking/ids/zeek/broker/0001-Fix-include-path-in-exported-CMake-targets.patch @@ -0,0 +1,75 @@ +From 889ee4dd9e778511e2fb850e6467f55a331cded9 Mon Sep 17 00:00:00 2001 +From: Tobias Mayer <tobim@fastmail.fm> +Date: Sun, 13 Nov 2022 19:06:00 +0100 +Subject: [PATCH] Fix include path in exported CMake targets + +--- + CMakeLists.txt | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e22b77aa..77a15314 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -209,7 +209,6 @@ if (CAF_ROOT) + else() + find_package(CAF REQUIRED COMPONENTS openssl test io core net) + endif() +- list(APPEND LINK_LIBS CAF::core CAF::io CAF::net) + set(BROKER_USE_EXTERNAL_CAF ON) + else () + message(STATUS "Using bundled CAF") +@@ -243,22 +242,18 @@ endif () + + # Make sure there are no old header versions on disk. + install( +- CODE "MESSAGE(STATUS \"Removing: ${CMAKE_INSTALL_PREFIX}/include/broker\")" +- CODE "file(REMOVE_RECURSE \"${CMAKE_INSTALL_PREFIX}/include/broker\")") ++ CODE "MESSAGE(STATUS \"Removing: ${CMAKE_FULL_INSTALL_INCLUDEDIR}/broker\")" ++ CODE "file(REMOVE_RECURSE \"${CMAKE_FULL_INSTALL_INCLUDEDIR}/broker\")") + + # Install all headers except the files from broker/internal. + install(DIRECTORY include/broker +- DESTINATION include ++ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + FILES_MATCHING PATTERN "*.hh" + PATTERN "include/broker/internal" EXCLUDE) + +-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include) +- +-include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) +- + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.hh.in + ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh DESTINATION include/broker) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/broker") + + if (NOT BROKER_EXTERNAL_SQLITE_TARGET) + include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) +@@ -360,6 +355,11 @@ if (ENABLE_SHARED) + OUTPUT_NAME broker) + target_link_libraries(broker PUBLIC ${LINK_LIBS}) + target_link_libraries(broker PRIVATE CAF::core CAF::io CAF::net) ++ target_include_directories( ++ broker PUBLIC ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> ++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) + install(TARGETS broker + EXPORT BrokerTargets + DESTINATION ${CMAKE_INSTALL_LIBDIR}) +@@ -373,6 +373,11 @@ if (ENABLE_STATIC) + endif() + target_link_libraries(broker_static PUBLIC ${LINK_LIBS}) + target_link_libraries(broker_static PRIVATE CAF::core CAF::io CAF::net) ++ target_include_directories( ++ broker_static PUBLIC ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> ++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) + install(TARGETS broker_static + EXPORT BrokerTargets + DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-- +2.38.1 + diff --git a/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix new file mode 100644 index 0000000000000..cb10e43933aa7 --- /dev/null +++ b/pkgs/applications/networking/ids/zeek/broker/default.nix @@ -0,0 +1,88 @@ +{ stdenv +, lib +, callPackage +, fetchFromGitHub +, cmake +, pkg-config +, python3 +, caf +, openssl +}: +let + inherit (stdenv.hostPlatform) isStatic; + + src-cmake = fetchFromGitHub { + owner = "zeek"; + repo = "cmake"; + rev = "0b7a543554622600bc0a42b57a22f291a4fbd86c"; + hash = "sha256-kaBOBTpfR3XyuF4PW5NQKca/UhXXxJJcXVsErFU1VYY="; + }; + src-3rdparty = fetchFromGitHub { + owner = "zeek"; + repo = "zeek-3rdparty"; + rev = "eb87829547270eab13c223e6de58b25bc9a0282e"; + hash = "sha256-AVaKcRjF5ZiSR8aPSLBzSTeWVwGWW/aSyQJcN0Yhza0="; + }; + caf' = caf.overrideAttrs (old: { + version = "unstable-2022-11-17-zeek"; + src = fetchFromGitHub { + owner = "zeek"; + repo = "actor-framework"; + rev = "dbb68b4573736d7aeb69268cc73aa766c998b3dd"; + hash = "sha256-RV2mKF3B47h/hDgK/D1UJN/ll2G5rcPkHaLVY1/C/Pg="; + }; + checkPhase = '' + runHook preCheck + libcaf_core/caf-core-test + libcaf_io/caf-io-test + libcaf_openssl/caf-openssl-test + libcaf_net/caf-net-test --not-suites='net.*' + runHook postCheck + ''; + }); +in +stdenv.mkDerivation rec { + pname = "zeek-broker"; + version = "2.4.2"; + outputs = [ "out" "py" ]; + + strictDeps = true; + + src = fetchFromGitHub { + owner = "zeek"; + repo = "broker"; + rev = "v${version}"; + hash = "sha256-y07fJEVPDGPv5VThE45SwM342VS6LnEtMvazZHadM/k="; + }; + postUnpack = '' + rmdir $sourceRoot/cmake $sourceRoot/3rdparty + ln -s ${src-cmake} ''${sourceRoot}/cmake + ln -s ${src-3rdparty} ''${sourceRoot}/3rdparty + + # Refuses to build the bindings unless this file is present, but never + # actually uses it. + touch $sourceRoot/bindings/python/3rdparty/pybind11/CMakeLists.txt + ''; + + patches = [ + ./0001-Fix-include-path-in-exported-CMake-targets.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl python3.pkgs.pybind11 ]; + propagatedBuildInputs = [ caf' ]; + + cmakeFlags = [ + "-DCAF_ROOT=${caf'}" + "-DENABLE_STATIC_ONLY:BOOL=${if isStatic then "ON" else "OFF"}" + "-DPY_MOD_INSTALL_DIR=${placeholder "py"}/${python3.sitePackages}/" + ]; + + meta = with lib; { + description = "Zeek's Messaging Library"; + homepage = "https://github.com/zeek/broker"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ tobim ]; + }; +} diff --git a/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch b/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch new file mode 100644 index 0000000000000..18aef601325dc --- /dev/null +++ b/pkgs/applications/networking/ids/zeek/debug-runtime-undef-fortify-source.patch @@ -0,0 +1,26 @@ +diff --git a/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt b/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt +index f154901c..76563717 100644 +--- a/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt ++++ b/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt +@@ -69,7 +69,7 @@ target_compile_definitions(hilti-rt-objects PRIVATE "HILTI_RT_BUILD_TYPE_RELEASE + # Build hilti-rt-debug with debug flags. + string(REPLACE " " ";" cxx_flags_debug ${CMAKE_CXX_FLAGS_DEBUG}) + target_compile_options(hilti-rt-debug-objects PRIVATE ${cxx_flags_debug}) +-target_compile_options(hilti-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall") ++target_compile_options(hilti-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall;-U_FORTIFY_SOURCE") + target_compile_definitions(hilti-rt-debug-objects PRIVATE "HILTI_RT_BUILD_TYPE_DEBUG") + + add_library(hilti-rt-tests-library-dummy1 SHARED src/tests/library-dummy.cc) +diff --git a/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt b/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt +index 20e7d291..9712341f 100644 +--- a/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt ++++ b/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt +@@ -48,7 +48,7 @@ target_link_libraries(spicy-rt-objects PUBLIC hilti-rt-objects) + # Build spicy-rt-debug with debug flags. + string(REPLACE " " ";" cxx_flags_debug ${CMAKE_CXX_FLAGS_DEBUG}) + target_compile_options(spicy-rt-debug-objects PRIVATE ${cxx_flags_debug}) +-target_compile_options(spicy-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall") ++target_compile_options(spicy-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall;-U_FORTIFY_SOURCE") + target_compile_definitions(spicy-rt-debug-objects PRIVATE "HILTI_RT_BUILD_TYPE_DEBUG") + target_link_libraries(spicy-rt-debug-objects PUBLIC hilti-rt-debug-objects) + diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index ddeb03698e953..0bacf8ce03c4c 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -1,10 +1,13 @@ { lib , stdenv +, callPackage , fetchurl , cmake , flex , bison +, spicy-parser-generator , openssl +, libkqueue , libpcap , zlib , file @@ -16,46 +19,69 @@ , gettext , coreutils , ncurses -, caf }: +let + broker = callPackage ./broker { }; +in stdenv.mkDerivation rec { pname = "zeek"; - version = "4.2.2"; + version = "5.1.2"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "sha256-9Q3X24uAmnSnLUAklK+gC0Mu8eh81ZE2h/7uIVc8cAw="; + sha256 = "sha256-1DvXUcTbLBm9UjJXuk8DjGEj+lED+s9D+SNnSqA3bwU="; }; + strictDeps = true; + + patches = [ + ./avoid-broken-tests.patch + ./debug-runtime-undef-fortify-source.patch + ./fix-installation.patch + ]; + nativeBuildInputs = [ bison cmake file flex + python3 ]; buildInputs = [ + broker + spicy-parser-generator curl gperftools + libkqueue libmaxminddb libpcap ncurses openssl - python3 swig zlib ] ++ lib.optionals stdenv.isDarwin [ gettext ]; - outputs = [ "out" "lib" "py" ]; + postPatch = '' + patchShebangs ./auxil/spicy/spicy/scripts + + substituteInPlace auxil/spicy/CMakeLists.txt --replace "hilti-toolchain-tests" "" + substituteInPlace auxil/spicy/spicy/hilti/CMakeLists.txt --replace "hilti-toolchain-tests" "" + ''; cmakeFlags = [ - "-DCAF_ROOT=${caf}" - "-DZEEK_PYTHON_DIR=${placeholder "py"}/lib/${python3.libPrefix}/site-packages" + "-DBroker_ROOT=${broker}" + "-DSPICY_ROOT_DIR=${spicy-parser-generator}" + "-DLIBKQUEUE_ROOT_DIR=${libkqueue}" "-DENABLE_PERFTOOLS=true" "-DINSTALL_AUX_TOOLS=true" + "-DZEEK_ETC_INSTALL_DIR=/etc/zeek" + "-DZEEK_LOG_DIR=/var/log/zeek" + "-DZEEK_STATE_DIR=/var/lib/zeek" + "-DZEEK_SPOOL_DIR=/var/spool/zeek" ]; postInstall = '' @@ -70,6 +96,10 @@ stdenv.mkDerivation rec { done ''; + passthru = { + inherit broker; + }; + meta = with lib; { description = "Network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; diff --git a/pkgs/applications/networking/ids/zeek/fix-installation.patch b/pkgs/applications/networking/ids/zeek/fix-installation.patch new file mode 100644 index 0000000000000..6360a11730517 --- /dev/null +++ b/pkgs/applications/networking/ids/zeek/fix-installation.patch @@ -0,0 +1,28 @@ +From f8c42a712db42cfd00fca75be2ce63c3aad2aad1 Mon Sep 17 00:00:00 2001 +From: Tobias Mayer <tobim@fastmail.fm> +Date: Sun, 13 Nov 2022 21:48:36 +0100 +Subject: [PATCH] Fix installation + +--- + CMakeLists.txt | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 846b65efd..d8b0be169 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -81,11 +81,6 @@ if ( NOT ZEEK_LOG_DIR ) + set(ZEEK_LOG_DIR ${ZEEK_ROOT_DIR}/logs) + endif () + +-install(DIRECTORY DESTINATION ${ZEEK_ETC_INSTALL_DIR}) +-install(DIRECTORY DESTINATION ${ZEEK_STATE_DIR}) +-install(DIRECTORY DESTINATION ${ZEEK_SPOOL_DIR}) +-install(DIRECTORY DESTINATION ${ZEEK_LOG_DIR}) +- + configure_file(zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev) + execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink + "${CMAKE_CURRENT_BINARY_DIR}/zeek-wrapper.in" +-- +2.37.3 + diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index 0c43ffbeea916..6926035588042 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -33,11 +33,13 @@ , systemd , xdg-utils , xorg +, wayland +, pipewire }: stdenv.mkDerivation rec { pname = "armcord"; - version = "3.1.4"; + version = "3.1.6"; src = let @@ -46,11 +48,11 @@ stdenv.mkDerivation rec { { x86_64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; - sha256 = "sha256-B/zDcW43ChhnAnGL+UEAt/QChxxEpv+yMgO7WsUi84k="; + sha256 = "sha256-xCwAkRtsFmGOIyCftjNqUsaw7/PcxSgWGqW/D1NhC5M="; }; aarch64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; - sha256 = "sha256-cFmxs7HeF+jxtmZ827bQbRyuXhQx++x5iTIefZ55928="; + sha256 = "sha256-ka8hwHhMVTXNS1rktTs3yXfXnyxSmRt41IE8z/ftUVc="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -97,6 +99,8 @@ stdenv.mkDerivation rec { xorg.libXScrnSaver xorg.libxshmfence xorg.libXtst + wayland + pipewire ]; sourceRoot = "."; @@ -114,9 +118,9 @@ stdenv.mkDerivation rec { makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \ "''${gappsWrapperArgs[@]}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer }}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ - "''${gappsWrapperArgs[@]}" + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} # Fix desktop link substituteInPlace $out/share/applications/armcord.desktop \ diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index f9756594c5cce..f76a4c984d5ed 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -107,7 +107,9 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; - NIX_CFLAGS_COMPILE = '' -I${librem}/include/rem -I${gsm}/include/gsm + enableParallelBuilding = true; + + env.NIX_CFLAGS_COMPILE = '' -I${librem}/include/rem -I${gsm}/include/gsm -DHAVE_INTTYPES_H -D__GLIBC__ -D__need_timeval -D__need_timespec -D__need_time_t ''; diff --git a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix index 67edd3d1b2748..8613a2585e2c8 100644 --- a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "briar-desktop"; - version = "0.3.1-beta"; + version = "0.4.0-beta"; src = fetchurl { - url = "https://desktop.briarproject.org/jars/linux/0.3.1-beta/briar-desktop-linux-0.3.1-beta.jar"; - sha256 = "841dc198101e6e8aa6b5ab6bd6b80e9c6b2593cb88bc3b2592f947baf963389d"; + url = "https://desktop.briarproject.org/jars/linux/${version}/briar-desktop-linux-${version}.jar"; + hash = "sha256-7zeIWsdPvROHGaf5igodlZss6Gow3kp6PX+QAzmxMnw="; }; dontUnpack = true; @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://code.briarproject.org/briar/briar-desktop"; license = licenses.gpl3; maintainers = with maintainers; [ onny ]; - platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index da4e41bed5852..1c5c35248d590 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.7.0_rc5"; + version = "0.7.0"; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { repo = "chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-5V0ApHxsJaQ0MBhMlv1IxnD9Vq+Yw85jFvlvghhFxNI="; + hash = "sha256-e3lYzQjQx1ndomq4mJ8TmwXoUG3Bjl9JrLuTmjXmRCs="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index d0679a07e024c..142bd5e38272f 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "cinny-desktop"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb"; - sha256 = "sha256-siEAIZ9cCIJZTkeZkvT5yrPjRGoOl7vjU98AUrhgJNw="; + sha256 = "sha256-ibUXNGgc23ndTqQKD0np5EH1T3xipVAmETbIy7akqkg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index e9ae4556588f8..807444696f08f 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - hash = "sha256-Q6f24LRYCxdgAguUVl7jf7srkd2L1IptiBgHJQq2dHE="; + hash = "sha256-BqxEZgI9uxoUpl/CJ2jSWjNIpfP2N392C4h/muBlhZY="; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index bd3d75bd66bbf..f4eb47428b5bb 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,7 +1,7 @@ { lib , buildNpmPackage , copyDesktopItems -, electron_18 +, electron_22 , buildGoModule , esbuild , fetchFromGitHub @@ -21,17 +21,17 @@ let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.106.0"; + version = "1.107.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-S53ghVFb1qDI7MVNbc2ZlHqDN4VRBFQJCJg2J+w0erc="; + hash = "sha256-ISAUZyFrp86ILtRrlowceBQNJ7+tbJReIAe6+u4wwQI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-k4j814Ao7FAyd0w1nH2fuX1cJKjBkhPw0CVZqNU7Hqs="; + hash = "sha256-B4BMxiI3GhsjeD3gYrq5ZpbZ7l77ycrIMWu2sUzZiz4="; }; }); esbuild' = esbuild.override { @@ -48,16 +48,16 @@ let }; in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.34.2"; + version = "1.34.4"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-XOGfKa0eGVZKKKC0Pm2kw48XWWcrxCyDdYzCSKp+wco="; + hash = "sha256-LV8/r6psUZuCEGbaH1nWlrkeNbEYG8R5O1aCxECPH1E="; }; - npmDepsHash = "sha256-ZMXXBDVT5rHTzHOrKAUAezL/1UTMdzbBllG69kxg55M="; + npmDepsHash = "sha256-rdZVvsyCo/6C4+gjytCCn9Qcl+chc6U+6orkcM59I8U="; nativeBuildInputs = [ makeWrapper @@ -105,7 +105,7 @@ in buildNpmPackage rec { $out/lib/node_modules/deltachat-desktop/html-dist/fonts done - makeWrapper ${electron_18}/bin/electron $out/bin/deltachat \ + makeWrapper ${electron_22}/bin/electron $out/bin/deltachat \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ --add-flags $out/lib/node_modules/deltachat-desktop @@ -129,8 +129,6 @@ in buildNpmPackage rec { ]; }); - passthru.updateScript = ./update.sh; - meta = with lib; { description = "Email-based instant messaging for Desktop"; homepage = "https://github.com/deltachat/deltachat-desktop"; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh deleted file mode 100755 index f31279cf4f0ea..0000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ /dev/null @@ -1,32 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch prefetch-npm-deps - -set -euo pipefail -cd "$(dirname "$0")" - -owner=deltachat -repo=deltachat-desktop -nixpkgs=../../../../.. - -rev=$( - curl -s "https://api.github.com/repos/$owner/$repo/releases" | - jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output -) -ver=$(echo "$rev" | sed 's/^v//') -old_ver=$(tac default.nix | sed -n 's/.*\bversion = "\(.*\)".*/\1/p' | head -1) -if [ "$ver" = "$old_ver" ]; then - echo "Up to date: $ver" - exit -fi -echo "$old_ver -> $ver" - -hash=$(nix-prefetch -f "$nixpkgs" deltachat-desktop --rev "$rev") -tac default.nix \ - | sed -e "0,/version = \".*\"/s//version = \"$ver\"/" \ - -e "0,/hash = \".*\"/s//hash = \"${hash//\//\\/}\"/" \ - | tac \ - | sponge default.nix - -src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link) -hash=$(prefetch-npm-deps $src/package-lock.json) -sed -i "s,npmDepsHash = \".*\",npmDepsHash = \"$hash\"," default.nix diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 72e546286bf5a..d9288c4a44645 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,37 +1,48 @@ { lib, stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext -, gobject-introspection, gnome, glib, gdk-pixbuf, gtk3, glib-networking -, xorg, libXdmcp, libxkbcommon +, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking +, libadwaita , libnotify, libsoup, libgee -, librsvg, libsignal-protocol-c +, libsignal-protocol-c , libgcrypt -, libepoxy -, at-spi2-core , sqlite -, dbus , gpgme -, pcre +, pcre2 , qrencode , icu , gspell -, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good, webrtc-audio-processing - }: +, srtp +, libnice +, gnutls +, gstreamer +, gst-plugins-base +, gst-plugins-good +, gst-plugins-bad +, gst-vaapi +, webrtc-audio-processing +}: stdenv.mkDerivation rec { pname = "dino"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "sha256-wjSgs1mUMV7j/8ZeXqWs8aOeWvJHwKziUfbtOC1HS3s="; + sha256 = "sha256-FZ7MVeVxIzxzSQi5G9y+nn487pKLcXEZV1JK9mCY2MQ="; }; + postPatch = '' + # don't overwrite manually set version information + substituteInPlace CMakeLists.txt \ + --replace "include(ComputeVersion)" "" + ''; + nativeBuildInputs = [ vala cmake - ninja + ninja # https://github.com/dino/dino/issues/230 pkg-config wrapGAppsHook gettext @@ -40,40 +51,45 @@ stdenv.mkDerivation rec { buildInputs = [ qrencode gobject-introspection - glib-networking glib + glib-networking # required for TLS support + libadwaita libgee - gnome.adwaita-icon-theme sqlite gdk-pixbuf - gtk3 + gtk4 libnotify gpgme libgcrypt libsoup - pcre - libepoxy - at-spi2-core - dbus + pcre2 icu libsignal-protocol-c - librsvg gspell srtp libnice gnutls gstreamer gst-plugins-base - gst-plugins-good + gst-plugins-good # contains rtpbin, required for VP9 + gst-plugins-bad # required for H264, MSDK + gst-vaapi # required for VAAPI webrtc-audio-processing - ] ++ lib.optionals (!stdenv.isDarwin) [ - xorg.libxcb - xorg.libpthreadstubs - libXdmcp - libxkbcommon ]; - cmakeFlags = ["-DBUILD_TESTS=yes"]; + cmakeFlags = [ + "-DBUILD_TESTS=true" + "-DRTP_ENABLE_H264=true" + "-DRTP_ENABLE_MSDK=true" + "-DRTP_ENABLE_VAAPI=true" + "-DRTP_ENABLE_VP9=true" + "-DVERSION_FOUND=true" + "-DVERSION_IS_RELEASE=true" + "-DVERSION_FULL=${version}" + ]; + + # Undefined symbols for architecture arm64: "_gpg_strerror" + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lgpg-error"; doCheck = true; checkPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index a6d7bf7276e38..8777bd2495456 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,9 +1,9 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.24"; - ptb = "0.0.38"; - canary = "0.0.145"; + stable = "0.0.25"; + ptb = "0.0.39"; + canary = "0.0.148"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -14,15 +14,15 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-SG+34ft0mTqtg9rFiI60N6JIONyqF8c8SlnRcn5a4Xc="; + sha256 = "sha256-WBcmy9fwGPq3Vs1+7lIOR7OiW/d0kZNIKp4Q5NRYBCw="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "bPg7ZNQQxEpRSpp8j5/XLBDEJyId8mDGxS6tqkzzI1s="; + sha256 = "LoDg3iwK18rDszU/dQEK0/J8DIxrqydsfflZo8IARks="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-TF+7SnCTsbh+Z8AeEESEFVLSpD3c5HOAwpU1UBuB1BU="; + sha256 = "sha256-2ZrSDyPj3AHriCWZ/bb303H3J97TTun//WjmInNEmwk="; }; }; x86_64-darwin = { diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 362d7a096bfb2..6e462ef24dbe1 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, nodejs, python3, callPackage, removeReferencesTo -, fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }: +, pkg-config, libsecret, xcbuild, Security, AppKit, fetchNpmDeps, npmHooks }: let pinData = lib.importJSON ./pin.json; @@ -15,39 +15,26 @@ in stdenv.mkDerivation rec { sha256 = pinData.srcHash; }; - nativeBuildInputs = [ nodejs python3 yarn pkg-config ] + nativeBuildInputs = [ + nodejs python3 pkg-config + npmHooks.npmConfigHook + ] ++ lib.optional stdenv.isDarwin xcbuild; + buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; - npm_config_nodedir = nodejs; - - yarnOfflineCache = fetchYarnDeps { - yarnLock = ./yarn.lock; - sha256 = pinData.yarnHash; + npmDeps = fetchNpmDeps { + inherit src; + hash = pinData.npmHash; }; - buildPhase = '' - runHook preBuild - cp ${./yarn.lock} ./yarn.lock - chmod u+w . ./yarn.lock - export HOME=$PWD/tmp - mkdir -p $HOME - yarn config --offline set yarn-offline-mirror $yarnOfflineCache - ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/ - node_modules/.bin/node-gyp rebuild - runHook postBuild - ''; - doCheck = false; installPhase = '' runHook preInstall shopt -s extglob rm -rf node_modules - rm -rf $HOME mkdir -p $out cp -r ./!(build) $out install -D -t $out/build/Release build/Release/keytar.node diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/pin.json b/pkgs/applications/networking/instant-messengers/element/keytar/pin.json index fa2e95d4e1a07..dc7420ab45435 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/keytar/pin.json @@ -1,5 +1,5 @@ { - "version": "7.7.0", - "srcHash": "sd6h+vDJGvmXFhOm4MDAljb4dAOMBB8W1IL7JSfJWyo=", - "yarnHash": "1m75hvl06mcj260hicbmv75p94h73gw5d24zpm5wxwc0q8v8wzfl" + "version": "7.9.0", + "srcHash": "Mnl0Im2hZJXJEtyXb5rgMntekkUAnOG2MN1bwfgh0eg=", + "npmHash": "sha256-ldfRWV+HXBdBYO2ZiGbVFSHV4/bMG43U7w+sJ4kpVUY=" } diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh b/pkgs/applications/networking/instant-messengers/element/keytar/update.sh index d18cc7d0e8bf8..0ddfa02472639 100755 --- a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/keytar/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn +#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-npm-deps if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the keytar package." @@ -22,10 +22,8 @@ SRC="https://raw.githubusercontent.com/atom/node-keytar/v$version" wget "$SRC/package-lock.json" wget "$SRC/package.json" -rm -f yarn.lock -yarn import +npm_hash=$(prefetch-npm-deps package-lock.json) rm -rf node_modules package.json package-lock.json -yarn_hash=$(prefetch-yarn-deps yarn.lock) src_hash=$(nix-prefetch-github atom node-keytar --rev v${version} | jq -r .sha256) @@ -33,6 +31,6 @@ cat > pin.json << EOF { "version": "$version", "srcHash": "$src_hash", - "yarnHash": "$yarn_hash" + "npmHash": "$npm_hash" } EOF diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock b/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock deleted file mode 100644 index 5a3abec6ded8c..0000000000000 --- a/pkgs/applications/networking/instant-messengers/element/keytar/yarn.lock +++ /dev/null @@ -1,2531 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@ungap/promise-all-settled@1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" - integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== - -abbrev@1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" - integrity sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8= - -after@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" - integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= - -ajv@^6.12.3: - version "6.12.4" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" - integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ== - 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" - -amdefine@>=0.0.4: - version "1.0.1" - resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= - -ansi-colors@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -ansi@^0.3.0, ansi@~0.3.0, ansi@~0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" - integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= - -anymatch@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -aproba@^1.0.3: - version "1.1.2" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1" - integrity sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw== - -are-we-there-yet@~1.0.0: - version "1.0.6" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz#a2d28c93102aa6cc96245a26cb954de06ec53f0c" - integrity sha1-otKMkxAqpsyWJFomy5VN4G7FPww= - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.0 || ^1.1.13" - -are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" - integrity sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0= - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - -array-index@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9" - integrity sha1-7FanSe4QPk4Ix5C5w1PfFgVbl/k= - dependencies: - debug "^2.2.0" - es6-symbol "^3.0.2" - -asn1@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" - integrity sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y= - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= - -assertion-error@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" - integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= - -aws4@^1.8.0: - version "1.10.1" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428" - integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA== - -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-core@^6.26.0, babel-core@^6.26.3: - version "6.26.3" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" - integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA== - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.1" - debug "^2.6.9" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.8" - slash "^1.0.0" - source-map "^0.5.7" - -babel-generator@^6.26.0: - version "6.26.1" - resolved "https://registry.yarnpkg.com/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" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk= - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-remap-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs= - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helpers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI= - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU= - -babel-plugin-transform-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E= - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-functions "^6.8.0" - babel-runtime "^6.22.0" - -babel-register@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - integrity sha1-btAhFz4vy0htestFxgCahW9kcHE= - dependencies: - babel-core "^6.26.0" - babel-runtime "^6.26.0" - core-js "^2.5.0" - home-or-tmp "^2.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - source-map-support "^0.4.15" - -babel-runtime@^6.22.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b" - integrity sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs= - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.10.0" - -babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= - 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.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= - 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.24.1: - version "6.25.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e" - integrity sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4= - dependencies: - babel-runtime "^6.22.0" - esutils "^2.0.2" - lodash "^4.2.0" - to-fast-properties "^1.0.1" - -babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= - -base64-js@^1.3.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= - dependencies: - tweetnacl "^0.14.3" - -big-integer@^1.6.17: - version "1.6.48" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e" - integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w== - -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -binary@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" - integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk= - dependencies: - buffers "~0.1.1" - chainsaw "~0.1.0" - -bl@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" - integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -bl@~3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f" - integrity sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ== - dependencies: - readable-stream "^3.0.1" - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= - dependencies: - inherits "~2.0.0" - -bluebird@^3: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - -bluebird@~3.4.1: - version "3.4.7" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" - integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM= - -brace-expansion@^1.1.7: - version "1.1.8" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" - integrity sha1-wHshHHyVLsH479Uad+8NHTmQopI= - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -browser-stdout@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" - integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== - -buffer-from@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0" - integrity sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg== - -buffer-indexof-polyfill@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz#d2732135c5999c64b277fcf9b1abe3498254729c" - integrity sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A== - -buffer-shims@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" - integrity sha1-mXjOMXOIxkmth5MCjDR37wRKi1E= - -buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -buffers@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" - integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s= - -camelcase@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" - integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= - -camelcase@^6.0.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" - integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - -chai@^4.2.0: - version "4.3.4" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.4.tgz#b55e655b31e1eac7099be4c08c21964fce2e6c49" - integrity sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA== - dependencies: - assertion-error "^1.1.0" - check-error "^1.0.2" - deep-eql "^3.0.1" - get-func-name "^2.0.0" - pathval "^1.1.1" - type-detect "^4.0.5" - -chainsaw@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" - integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg= - dependencies: - traverse ">=0.3.0 <0.4" - -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - 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@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -check-error@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" - integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= - -chokidar@3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== - dependencies: - anymatch "~3.1.1" - braces "~3.0.2" - glob-parent "~5.1.0" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.5.0" - optionalDependencies: - fsevents "~2.3.1" - -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - -cliui@^3.0.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -cmake-js@~5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-5.2.0.tgz#6d72014269a5d23a754a6d170cde9ed2d75eb411" - integrity sha512-/HLhzoBEOLKGdE1FLwH5ggzRt67AWTb4IErg4rm+bTC+R0DKUobojDyp17dSswDVPosdoPmHXjKxbJiyBZfQeg== - dependencies: - bluebird "^3" - debug "^4" - fs-extra "^5.0.0" - is-iojs "^1.0.1" - lodash "^4" - memory-stream "0" - npmlog "^1.2.0" - rc "^1.2.7" - request "^2.54.0" - semver "^5.0.3" - splitargs "0" - tar "^4" - traceur "0.0.x" - unzipper "^0.8.13" - url-join "0" - which "^1.0.9" - yargs "^3.6.0" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -colors@~0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc" - integrity sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w= - -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@2.9.x, commander@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= - dependencies: - graceful-readlink ">= 1.0.0" - -commander@~2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.2.0.tgz#175ad4b9317f3ff615f201c1e57224f55a3e91df" - integrity sha1-F1rUuTF/P/YV8gHB5XIk9Vo+kd8= - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - -convert-source-map@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" - integrity sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU= - -core-js@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e" - integrity sha1-TekR5mew6ukSTjQlS1OupvxhjT4= - -core-js@^2.5.0: - version "2.5.7" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e" - integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw== - -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - -d@1, d@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" - integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA== - dependencies: - es5-ext "^0.10.50" - type "^1.0.1" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= - dependencies: - assert-plus "^1.0.0" - -debug@4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -debug@^2.2.0, debug@^2.6.8, debug@^2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@^4: - version "4.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" - integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== - dependencies: - ms "2.1.2" - -decamelize@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - -decamelize@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" - integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== - -decompress-response@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" - integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== - dependencies: - mimic-response "^2.0.0" - -deep-eql@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df" - integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw== - dependencies: - type-detect "^4.0.0" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg= - dependencies: - repeating "^2.0.0" - -detect-libc@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - -diff@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== - -duplexer2@~0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" - integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds= - dependencies: - readable-stream "~1.1.9" - -duplexer2@~0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" - integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= - dependencies: - readable-stream "^2.0.2" - -each-series-async@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/each-series-async/-/each-series-async-1.0.1.tgz#7e3f8dfa5af934663960e5a17561362909b34328" - integrity sha512-G4zip/Ewpwr6JQxW7+2RNgkPd09h/UNec5UlvA/xKwl4qf5blyBNK6a/zjQc3MojgsxaOb93B9v3T92QU6IMVg== - -ecc-jsbn@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" - integrity sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU= - dependencies: - jsbn "~0.1.0" - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -end-of-stream@^1.1.0, end-of-stream@^1.4.1: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - -env-paths@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" - integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== - -es5-ext@^0.10.35, es5-ext@^0.10.50: - version "0.10.53" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" - integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== - dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.3" - next-tick "~1.0.0" - -es6-iterator@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" - integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= - dependencies: - d "1" - es5-ext "^0.10.35" - es6-symbol "^3.1.1" - -es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" - integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== - dependencies: - d "^1.0.1" - ext "^1.1.2" - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-string-regexp@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -escape-string-regexp@^1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= - -execspawn@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/execspawn/-/execspawn-1.0.1.tgz#8286f9dde7cecde7905fbdc04e24f368f23f8da6" - integrity sha1-gob53efOzeeQX73ATiTzaPI/jaY= - dependencies: - util-extend "^1.0.1" - -expand-template@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" - integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== - -ext@^1.1.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" - integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A== - dependencies: - type "^2.0.0" - -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -extsprintf@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" - integrity sha1-4QgOBljjALBilJkMxw4VAiNf1VA= - -fast-deep-equal@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -find-up@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -flat@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" - integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= - -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - -fs-extra@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" - integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - -fs-minipass@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.0.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -fsevents@~2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -fstream@^1.0.0, fstream@^1.0.12, fstream@~1.0.10: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" - integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - -gauge@~1.2.0, gauge@~1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" - integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM= - dependencies: - ansi "^0.3.0" - has-unicode "^2.0.0" - lodash.pad "^4.1.0" - lodash.padend "^4.1.0" - lodash.padstart "^4.1.0" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-func-name@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" - integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - dependencies: - assert-plus "^1.0.0" - -ghreleases@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/ghreleases/-/ghreleases-3.0.2.tgz#1bdb6d31ec03a24a0d80f58f5e9a84a4db725818" - integrity sha512-QiR9mIYvRG7hd8JuQYoxeBNOelVuTp2DpdiByRywbCDBSJufK9Vq7VuhD8B+5uviMxZx2AEkCzye61Us9gYgnw== - dependencies: - after "~0.8.1" - ghrepos "~2.1.0" - ghutils "~3.2.0" - lodash.uniq "^4.5.0" - simple-mime "~0.1.0" - url-template "~2.0.6" - -ghrepos@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ghrepos/-/ghrepos-2.1.0.tgz#abaf558b690b722c70c7ad45076f6f9be8e495e1" - integrity sha512-6GM0ohSDTAv7xD6GsKfxJiV/CajoofRyUwu0E8l29d1o6lFAUxmmyMP/FH33afA20ZrXzxxcTtN6TsYvudMoAg== - dependencies: - ghutils "~3.2.0" - -ghutils@~3.2.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/ghutils/-/ghutils-3.2.6.tgz#d43986e267da02787464d97a6489659e4609bb1f" - integrity sha512-WpYHgLQkqU7Cv147wKUEThyj6qKHCdnAG2CL9RRsRQImVdLGdVqblJ3JUnj3ToQwgm1ALPS+FXgR0448AgGPUg== - dependencies: - jsonist "~2.1.0" - xtend "~4.0.1" - -github-from-package@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" - integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= - -glob-parent@~5.1.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -"glob@3 || 4 || 5 || 6 || 7", glob@7.1.6, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - 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" - -glob@5.0.x: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== - -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.2, graceful-fs@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" - integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== - -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= - -growl@1.10.5: - version "1.10.5" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" - integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= - -har-validator@~5.1.3: - version "5.1.5" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" - integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== - dependencies: - ajv "^6.12.3" - har-schema "^2.0.0" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - dependencies: - ansi-regex "^2.0.0" - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - -he@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== - -home-or-tmp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg= - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.1" - -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -hyperquest@~2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/hyperquest/-/hyperquest-2.1.3.tgz#523127d7a343181b40bf324e231d2576edf52633" - integrity sha512-fUuDOrB47PqNK/BAMOS13v41UoaqIxqSLHX6CAbOD7OfT+/GCWO1/vPLfTNutOeXrv1ikuaZ3yux+33Z9vh+rw== - dependencies: - buffer-from "^0.1.1" - duplexer2 "~0.0.2" - through2 "~0.6.3" - -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - -inherits@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -ini@~1.3.0: - version "1.3.7" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" - integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== - -invariant@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" - integrity sha1-nh9WrArNtr8wMwbzOL47IErmA2A= - dependencies: - loose-envify "^1.0.0" - -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= - -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - dependencies: - is-extglob "^2.1.1" - -is-iojs@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-iojs/-/is-iojs-1.1.0.tgz#4c11033b5d5d94d6eab3775dedc9be7d008325f1" - integrity sha1-TBEDO11dlNbqs3dd7cm+fQCDJfE= - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-plain-obj@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= - -js-tokens@^3.0.0, js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= - -js-yaml@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" - integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== - dependencies: - argparse "^2.0.1" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - -json5@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= - optionalDependencies: - graceful-fs "^4.1.6" - -jsonist@~2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/jsonist/-/jsonist-2.1.2.tgz#c1377311e8fc857abe7aa3df197116a911f95324" - integrity sha512-8yqmWJAC2VaYoSKQAbsfgCpGY5o/1etWzx6ZxaZrC4iGaHrHUZEo+a2MyF8w+2uTavTlHdLWaZUoR19UfBstxQ== - dependencies: - bl "~3.0.0" - hyperquest "~2.1.3" - json-stringify-safe "~5.0.1" - xtend "~4.0.1" - -jsprim@^1.2.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918" - integrity sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg= - dependencies: - assert-plus "1.0.0" - extsprintf "1.0.2" - json-schema "0.2.3" - verror "1.3.6" - -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= - dependencies: - invert-kv "^1.0.0" - -listenercount@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937" - integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc= - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -lodash.pad@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" - integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA= - -lodash.padend@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e" - integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4= - -lodash.padstart@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" - integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= - -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= - -lodash@^4, lodash@^4.17.4, lodash@^4.2.0: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== - -log-symbols@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" - integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA== - dependencies: - chalk "^4.0.0" - -loose-envify@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" - integrity sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg= - dependencies: - js-tokens "^3.0.0" - -memory-stream@0: - version "0.0.3" - resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-0.0.3.tgz#ebe8dd1c3b8bc38c0e7941e9ddd5aebe6b4de83f" - integrity sha1-6+jdHDuLw4wOeUHp3dWuvmtN6D8= - dependencies: - readable-stream "~1.0.26-2" - -mime-db@1.44.0: - version "1.44.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" - integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== - -mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.27" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" - integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== - dependencies: - mime-db "1.44.0" - -mimic-response@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" - integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== - -"minimatch@2 || 3", minimatch@3, minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimist@^1.1.2, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - -minipass@^3.0.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" - integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== - dependencies: - yallist "^4.0.0" - -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - -minizlib@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - dependencies: - minipass "^3.0.0" - yallist "^4.0.0" - -mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" - integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== - -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - -mkdirp@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -mocha@^8.0.1: - version "8.3.2" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.3.2.tgz#53406f195fa86fbdebe71f8b1c6fb23221d69fcc" - integrity sha512-UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg== - dependencies: - "@ungap/promise-all-settled" "1.1.2" - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.1" - debug "4.3.1" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.1.6" - growl "1.10.5" - he "1.2.0" - js-yaml "4.0.0" - log-symbols "4.0.0" - minimatch "3.0.4" - ms "2.1.3" - nanoid "3.1.20" - serialize-javascript "5.0.1" - strip-json-comments "3.1.1" - supports-color "8.1.1" - which "2.0.2" - wide-align "1.1.3" - workerpool "6.1.0" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -nanoid@3.1.20: - version "3.1.20" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" - integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== - -napi-build-utils@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" - integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== - -next-tick@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" - integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= - -node-abi@^2.2.0, node-abi@^2.21.0: - version "2.21.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.21.0.tgz#c2dc9ebad6f4f53d6ea9b531e7b8faad81041d48" - integrity sha512-smhrivuPqEM3H5LmnY3KU6HfYv0u4QklgAxfFyRNujKUzbUcYZ+Jc2EhukB9SRcD2VpqhxM7n/MIcp1Ua1/JMg== - dependencies: - semver "^5.4.1" - -node-addon-api@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239" - integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw== - -node-cpplint@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/node-cpplint/-/node-cpplint-0.4.0.tgz#35827fe7b95ccceff0cd7f46ede4cba44b8ef88c" - integrity sha1-NYJ/57lczO/wzX9G7eTLpEuO+Iw= - dependencies: - colors "~0.6.2" - commander "~2.2.0" - -node-gyp@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-6.1.0.tgz#64e31c61a4695ad304c1d5b82cf6b7c79cc79f3f" - integrity sha512-h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.2" - mkdirp "^0.5.1" - nopt "^4.0.1" - npmlog "^4.1.2" - request "^2.88.0" - rimraf "^2.6.3" - semver "^5.7.1" - tar "^4.4.12" - which "^1.3.1" - -node-gyp@^7.0.0: - version "7.1.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" - integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.3" - nopt "^5.0.0" - npmlog "^4.1.2" - request "^2.88.2" - rimraf "^3.0.2" - semver "^7.3.2" - tar "^6.0.2" - which "^2.0.2" - -node-ninja@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/node-ninja/-/node-ninja-1.0.2.tgz#20a09e57b92e2df591993d4bf098ac3e727062b6" - integrity sha1-IKCeV7kuLfWRmT1L8JisPnJwYrY= - dependencies: - fstream "^1.0.0" - glob "3 || 4 || 5 || 6 || 7" - graceful-fs "^4.1.2" - minimatch "3" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2" - osenv "0" - path-array "^1.0.0" - request "2" - rimraf "2" - semver "2.x || 3.x || 4 || 5" - tar "^2.0.0" - which "1" - -noop-logger@^0.1.0, noop-logger@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" - integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= - -"nopt@2 || 3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= - dependencies: - abbrev "1" - -nopt@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" - integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== - dependencies: - abbrev "1" - osenv "^0.1.4" - -nopt@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" - integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== - dependencies: - abbrev "1" - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -npm-path@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64" - integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw== - dependencies: - which "^1.2.10" - -npm-which@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa" - integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo= - dependencies: - commander "^2.9.0" - npm-path "^2.0.2" - which "^1.2.10" - -"npmlog@0 || 1 || 2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" - integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI= - dependencies: - ansi "~0.3.1" - are-we-there-yet "~1.1.2" - gauge "~1.2.5" - -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.1, npmlog@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -npmlog@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-1.2.1.tgz#28e7be619609b53f7ad1dd300a10d64d716268b6" - integrity sha1-KOe+YZYJtT960d0wChDWTXFiaLY= - dependencies: - ansi "~0.3.0" - are-we-there-yet "~1.0.0" - gauge "~1.2.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - -nw-gyp@^3.6.3: - version "3.6.5" - resolved "https://registry.yarnpkg.com/nw-gyp/-/nw-gyp-3.6.5.tgz#ccce42182229e44e7689da70675b4b8dd0ab0ab3" - integrity sha512-vYrOIYJEKpq9CfaHuiqEjV1rBYgr6uaUrPhPRiznb91LujkAUqGhQ5QqDC1bLdd+zo9jf2H0Zkl2M5zQB7+CuQ== - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - minimatch "^3.0.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request "2" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - -object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= - -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= - dependencies: - lcid "^1.0.0" - -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - -osenv@0, osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -path-array@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271" - integrity sha1-fi8PNfB6IBUSK4aLfqwOssT+wnE= - dependencies: - array-index "^1.0.0" - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -pathval@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" - integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== - -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= - -picomatch@^2.0.4, picomatch@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== - -prebuild-install@^6.0.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.1.tgz#6754fa6c0d55eced7f9e14408ff9e4cba6f097b4" - integrity sha512-M+cKwofFlHa5VpTWub7GLg5RLcunYIcLqtY5pKcls/u7xaAb8FrXZ520qY8rkpYy5xw90tYCyMO0MP5ggzR3Sw== - dependencies: - detect-libc "^1.0.3" - 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 "^2.21.0" - noop-logger "^0.1.1" - npmlog "^4.0.1" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^3.0.3" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - -prebuild@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/prebuild/-/prebuild-10.0.1.tgz#9d46a00f42b60ad1718479cc5e3d1ef4882b7f33" - integrity sha512-x0CkKDmHFwX49rTGEYJwB9jBQwJWxRzwUtP5PA9dP8khFGMm3oSFgYortxdlp0PkxB29EhWGp/KQE5g+adehYg== - dependencies: - cmake-js "~5.2.0" - detect-libc "^1.0.3" - each-series-async "^1.0.1" - execspawn "^1.0.1" - ghreleases "^3.0.2" - github-from-package "0.0.0" - glob "^7.1.6" - minimist "^1.1.2" - mkdirp "^0.5.1" - napi-build-utils "^1.0.1" - node-abi "^2.2.0" - node-gyp "^6.0.1" - node-ninja "^1.0.1" - noop-logger "^0.1.0" - npm-which "^3.0.1" - npmlog "^4.0.1" - nw-gyp "^3.6.3" - rc "^1.0.3" - run-waterfall "^1.1.6" - tar-stream "^2.1.0" - -private@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" - integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== - -process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= - -psl@^1.1.28: - version "1.1.29" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67" - integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ== - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== - -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -rc@^1.0.3, rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.26-2: - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.6: - version "2.3.3" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" - integrity sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readable-stream@~1.1.9: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@~2.1.5: - version "2.1.5" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" - integrity sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA= - dependencies: - buffer-shims "^1.0.0" - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" - integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== - dependencies: - picomatch "^2.2.1" - -regenerator-runtime@^0.10.0: - version "0.10.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" - integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg= - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== - -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= - dependencies: - is-finite "^1.0.0" - -request@2, request@^2.54.0, request@^2.88.0, request@^2.88.2: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - 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" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - -rimraf@2, rimraf@^2.6.3: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -rsvp@^3.0.13: - version "3.6.2" - resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" - integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw== - -run-waterfall@^1.1.6: - version "1.1.7" - resolved "https://registry.yarnpkg.com/run-waterfall/-/run-waterfall-1.1.7.tgz#ae368b549b2f5171f86c2924492cab3352a6e9c5" - integrity sha512-iFPgh7SatHXOG1ClcpdwHI63geV3Hc/iL6crGSyBlH2PY7Rm/za+zoKz6FfY/Qlw5K7JwSol8pseO8fN6CMhhQ== - -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== - -safe-buffer@^5.1.2, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safer-buffer@^2.0.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -"semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.4.1, semver@^5.7.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^4.3.3: - version "4.3.6" - resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" - integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto= - -semver@^7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== - -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= - -serialize-javascript@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" - integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== - dependencies: - randombytes "^2.1.0" - -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -setimmediate@~1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - -signal-exit@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= - -simple-concat@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" - integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== - -simple-get@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" - integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== - dependencies: - decompress-response "^4.2.0" - once "^1.3.1" - simple-concat "^1.0.0" - -simple-mime@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/simple-mime/-/simple-mime-0.1.0.tgz#95f517c4f466d7cff561a71fc9dab2596ea9ef2e" - integrity sha1-lfUXxPRm18/1YacfydqyWW6p7y4= - -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= - -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== - dependencies: - source-map "^0.5.6" - -source-map-support@~0.2.8: - version "0.2.10" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.2.10.tgz#ea5a3900a1c1cb25096a0ae8cc5c2b4b10ded3dc" - integrity sha1-6lo5AKHByyUJagrozFwrSxDe09w= - dependencies: - source-map "0.1.32" - -source-map@0.1.32: - version "0.1.32" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266" - integrity sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY= - dependencies: - amdefine ">=0.0.4" - -source-map@^0.5.6, source-map@^0.5.7: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - -splitargs@0: - version "0.0.7" - resolved "https://registry.yarnpkg.com/splitargs/-/splitargs-0.0.7.tgz#fe9f7ae657371b33b10cb80da143cf8249cf6b3b" - integrity sha1-/p965lc3GzOxDLgNoUPPgknPazs= - -sshpk@^1.7.0: - version "1.14.2" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98" - integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg= - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - dashdash "^1.12.0" - getpass "^0.1.1" - safer-buffer "^2.0.2" - optionalDependencies: - bcrypt-pbkdf "^1.0.0" - ecc-jsbn "~0.1.1" - jsbn "~0.1.0" - tweetnacl "~0.14.0" - -string-width@^1.0.1, string-width@^1.0.2, "string-width@^1.0.2 || 2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string-width@^4.1.0, string-width@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= - -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" - integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" - -strip-json-comments@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - -supports-color@8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -tar-fs@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.1.4" - -tar-stream@^2.1.0, tar-stream@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa" - integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw== - 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" - -tar@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" - integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== - dependencies: - block-stream "*" - fstream "^1.0.12" - inherits "2" - -tar@^4, tar@^4.4.12: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - -tar@^6.0.2: - version "6.0.5" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f" - integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^3.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -through2@~0.6.3: - version "0.6.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= - dependencies: - readable-stream ">=1.0.33-1 <1.1.0-0" - xtend ">=4.0.0 <4.1.0-0" - -to-fast-properties@^1.0.1, to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - -traceur@0.0.x: - version "0.0.111" - resolved "https://registry.yarnpkg.com/traceur/-/traceur-0.0.111.tgz#c04de74d14696c3373427de4fc08ecaf913fc3a1" - integrity sha1-wE3nTRRpbDNzQn3k/Ajsr5E/w6E= - dependencies: - commander "2.9.x" - glob "5.0.x" - rsvp "^3.0.13" - semver "^4.3.3" - source-map-support "~0.2.8" - -"traverse@>=0.3.0 <0.4": - version "0.3.9" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" - integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= - -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - -type-detect@^4.0.0, type-detect@^4.0.5: - version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - -type@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" - integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== - -type@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" - integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -unzipper@^0.8.13: - version "0.8.14" - resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.8.14.tgz#ade0524cd2fc14d11b8de258be22f9d247d3f79b" - integrity sha512-8rFtE7EP5ssOwGpN2dt1Q4njl0N1hUXJ7sSPz0leU2hRdq6+pra57z4YPBlVqm40vcgv6ooKZEAx48fMTv9x4w== - dependencies: - big-integer "^1.6.17" - binary "~0.3.0" - bluebird "~3.4.1" - buffer-indexof-polyfill "~1.0.0" - duplexer2 "~0.1.4" - fstream "~1.0.10" - listenercount "~1.0.1" - readable-stream "~2.1.5" - setimmediate "~1.0.4" - -uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== - dependencies: - punycode "^2.1.0" - -url-join@0: - version "0.0.1" - resolved "https://registry.yarnpkg.com/url-join/-/url-join-0.0.1.tgz#1db48ad422d3402469a87f7d97bdebfe4fb1e3c8" - integrity sha1-HbSK1CLTQCRpqH99l73r/k+x48g= - -url-template@~2.0.6: - version "2.0.8" - resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" - integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE= - -util-deprecate@^1.0.1, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -util-extend@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" - integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8= - -uuid@^3.3.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - -verror@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c" - integrity sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw= - dependencies: - extsprintf "1.0.2" - -which@1, which@^1.0.9, which@^1.2.10, which@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@2.0.2, which@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wide-align@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - -wide-align@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" - integrity sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w== - dependencies: - string-width "^1.0.2" - -window-size@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" - integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY= - -workerpool@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz#a8e038b4c94569596852de7a8ea4228eefdeb37b" - integrity sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg== - -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -"xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - -y18n@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" - integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== - -y18n@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" - integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== - -yallist@^3.0.0, yallist@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yargs-parser@20.2.4, yargs-parser@^20.2.2: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - -yargs-unparser@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" - integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== - dependencies: - camelcase "^6.0.0" - decamelize "^4.0.0" - flat "^5.0.2" - is-plain-obj "^2.1.0" - -yargs@16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - 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" - -yargs@^3.6.0: - version "3.32.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" - integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU= - dependencies: - camelcase "^2.0.1" - cliui "^3.0.3" - decamelize "^1.1.1" - os-locale "^1.4.0" - string-width "^1.0.1" - window-size "^0.1.4" - y18n "^3.2.0" - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index cc0578f71fec9..bf1458c264ebf 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.20", - "desktopSrcHash": "mlB2UvRYzaJ6FWGDOqyZY6NTY7QoWCiCvmFDyWTPuMQ=", - "desktopYarnHash": "0ccwsy9ma7sn6d5f9jfv40dhj0y6aax8msx9bihjdmx989nkkh2m", - "webSrcHash": "55oLS89Pmy4d7DhBQc4i6boQIH2LgujE7kl6QwcKltw=", - "webYarnHash": "1aiq5wvb8cz2a5rc0h11s16fnyak0p9zhzbqwhf1rs6c1gav7777" + "version": "1.11.23", + "desktopSrcHash": "Q3kyAiBvedTy4jiBkYmEJeonRf6HesdpKgmtOT2sYwI=", + "desktopYarnHash": "8lHIkUkFAo7m8XjfnFSAkp4mIKyrXOsnbstRIPXI+vE=", + "webSrcHash": "JOfuzo0DQ0v2rC80/HkucLgc2xsCb3eujaH0fg7j0nI=", + "webYarnHash": "0Cb7TuRFHcQvYbnVAnXOIwt6NXa7ITrMPJnmbUFaPNU=" } diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/pin.json b/pkgs/applications/networking/instant-messengers/element/seshat/pin.json index fdb5afe67a25b..78d5156f54a4b 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/seshat/pin.json @@ -1,6 +1,6 @@ { - "version": "2.3.0", - "srcHash": "JyqtM1CCRgxAAdhgQYaIUYPnxEcDrlW1SjDCmsrPL34=", - "yarnHash": "0bym6i1f0i3bs4fncbiwzwmbxp7j14rz1v4kyvsl02qs97qw1jac", - "cargoHash": "sha256-EjtH96SC2kgan631+wlu9LStGKm6ljCR4x3/WpCTS0E=" + "version": "2.3.3", + "srcHash": "HmKHWFoO8TQ9S/RcJnJ3h85/2uSkqGrgLnX82hkux4Q=", + "yarnHash": "1cbkv8ap7f8vxl5brzqb86d2dyxg555sz67cldrp0vgnk8sq6ibp", + "cargoHash": "sha256-WsgTbQ91aZZV5sIuFVjsccdiXivjtAUC1Zs/4uNk1zU=" } diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/applications/networking/instant-messengers/element/update.sh index b02e1d022393e..976b6cb0ba8fc 100755 --- a/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/update.sh @@ -1,9 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github -# FIXME should fix itself on the next release -> remove the warning if that's the case -echo "WARNING: on the last update, the yarn.lock had to be patched. Please be careful when updating the hashes!" - if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the element packages." echo "Usage: $0 [git release tag]" diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix new file mode 100644 index 0000000000000..a30bfa2dcb02a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, protobuf +, libsecret +, libadwaita +, rustPlatform +, desktop-file-utils +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "flare"; + version = "0.6.0"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "Schmiddiii"; + repo = pname; + rev = version; + hash = "sha256-wY95sXWGDjEy8vvP79XliJOn5GQkAvDmOXKmRz0TPEw="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-J3MGQlPYGjhZKH599vfW2WhkXx+Tdr53PviiVpye4R0="; + }; + + nativeBuildInputs = [ + desktop-file-utils # for update-desktop-database + meson + ninja + pkg-config + wrapGAppsHook4 + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + libadwaita + libsecret + protobuf + ]; + + meta = { + changelog = "https://gitlab.com/Schmiddiii/flare/-/blob/${src.rev}/CHANGELOG.md"; + description = "An unofficial Signal GTK client"; + homepage = "https://gitlab.com/Schmiddiii/flare"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ dotlambda tomfitzhenry ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix index 9203850b63882..360234ba3c699 100644 --- a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # enables pipewire API deprecated in 0.3.64 # fixes error caused by https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 - NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ]; meta = with lib; { description = "Matrix group messaging app (development version)"; diff --git a/pkgs/applications/networking/instant-messengers/jami/client.nix b/pkgs/applications/networking/instant-messengers/jami/client.nix deleted file mode 100644 index f76d9ee9f12a2..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/client.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ version -, src -, jami-meta -, lib -, stdenv -, pkg-config -, cmake -, networkmanager # for libnm -, python3 -, qttools # for translations -, wrapQtAppsHook -, ffmpeg-jami -, jami-daemon -, libnotify -, qt5compat -, qtbase -, qtdeclarative -, qrencode -, qtmultimedia -, qtnetworkauth -, qtsvg -, qtwebengine -, qtwebchannel -, withWebengine ? true -}: - -stdenv.mkDerivation { - pname = "jami-client"; - inherit version src; - - sourceRoot = "source/client-qt"; - - preConfigure = '' - echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h - ''; - - nativeBuildInputs = [ - wrapQtAppsHook - pkg-config - cmake - python3 - qttools - ]; - - buildInputs = [ - ffmpeg-jami - jami-daemon - libnotify - networkmanager - qtbase - qt5compat - qrencode - qtnetworkauth - qtdeclarative - qtmultimedia - qtsvg - qtwebchannel - ] ++ lib.optionals withWebengine [ - qtwebengine - ]; - - cmakeFlags = [ - "-DLIBJAMI_INCLUDE_DIR=${jami-daemon}/include/jami" - "-DLIBJAMI_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces" - ] ++ lib.optionals (!withWebengine) [ - "-DWITH_WEBENGINE=false" - ]; - - qtWrapperArgs = [ - # With wayland the titlebar is not themed and the wmclass is wrong. - "--set-default QT_QPA_PLATFORM xcb" - ]; - - meta = jami-meta // { - description = "The client based on QT" + jami-meta.description; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common b/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common deleted file mode 100644 index 0aac24e24bb67..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common +++ /dev/null @@ -1,156 +0,0 @@ ---disable-everything ---enable-zlib ---enable-gpl ---enable-swscale ---enable-bsfs ---disable-filters ---disable-programs ---disable-postproc ---disable-protocols ---enable-protocol=crypto ---enable-protocol=file ---enable-protocol=rtp ---enable-protocol=srtp ---enable-protocol=tcp ---enable-protocol=udp ---enable-protocol=unix ---enable-protocol=pipe ---disable-demuxers ---disable-muxers ---enable-muxer=rtp ---enable-muxer=g722 ---enable-muxer=g723_1 ---enable-muxer=g726 ---enable-muxer=g726le ---enable-muxer=h263 ---enable-muxer=h264 ---enable-muxer=hevc ---enable-muxer=matroska ---enable-muxer=webm ---enable-muxer=ogg ---enable-muxer=pcm_s16be ---enable-muxer=pcm_s16le ---enable-demuxer=rtp ---enable-demuxer=mjpeg ---enable-demuxer=mjpeg_2000 ---enable-demuxer=mpegvideo ---enable-demuxer=gif ---enable-demuxer=image_jpeg_pipe ---enable-demuxer=image_png_pipe ---enable-demuxer=image_webp_pipe ---enable-demuxer=matroska ---enable-demuxer=m4v ---enable-demuxer=mp3 ---enable-demuxer=ogg ---enable-demuxer=flac ---enable-demuxer=wav ---enable-demuxer=ac3 ---enable-demuxer=g722 ---enable-demuxer=g723_1 ---enable-demuxer=g726 ---enable-demuxer=g726le ---enable-demuxer=pcm_mulaw ---enable-demuxer=pcm_alaw ---enable-demuxer=pcm_s16be ---enable-demuxer=pcm_s16le ---enable-demuxer=h263 ---enable-demuxer=h264 ---enable-demuxer=hevc ---enable-parser=h263 ---enable-parser=h264 ---enable-parser=hevc ---enable-parser=mpeg4video ---enable-parser=vp8 ---enable-parser=vp9 ---enable-parser=opus ---enable-encoder=adpcm_g722 ---enable-decoder=adpcm_g722 ---enable-encoder=adpcm_g726 ---enable-decoder=adpcm_g726 ---enable-encoder=adpcm_g726le ---enable-decoder=adpcm_g726le ---enable-decoder=g729 ---enable-encoder=g723_1 ---enable-decoder=g723_1 ---enable-encoder=rawvideo ---enable-decoder=rawvideo ---enable-encoder=libx264 ---enable-decoder=h264 ---enable-encoder=pcm_alaw ---enable-decoder=pcm_alaw ---enable-encoder=pcm_mulaw ---enable-decoder=pcm_mulaw ---enable-encoder=mpeg4 ---enable-decoder=mpeg4 ---enable-encoder=libvpx_vp8 ---enable-decoder=vp8 ---enable-decoder=vp9 ---enable-encoder=h263 ---enable-encoder=h263p ---enable-decoder=h263 ---enable-encoder=mjpeg ---enable-decoder=mjpeg ---enable-decoder=mjpegb ---enable-libspeex ---enable-libopus ---enable-libvpx ---enable-libx264 ---enable-encoder=libspeex ---enable-decoder=libspeex ---enable-encoder=libopus ---enable-decoder=libopus ---enable-decoder=flac ---enable-decoder=vorbis ---enable-decoder=aac ---enable-decoder=ac3 ---enable-decoder=eac3 ---enable-decoder=mp3 ---enable-decoder=pcm_u24be ---enable-decoder=pcm_u24le ---enable-decoder=pcm_u32be ---enable-decoder=pcm_u32le ---enable-decoder=pcm_u8 ---enable-decoder=pcm_f16le ---enable-decoder=pcm_f24le ---enable-decoder=pcm_f32be ---enable-decoder=pcm_f32le ---enable-decoder=pcm_f64be ---enable-decoder=pcm_f64le ---enable-decoder=pcm_s16be ---enable-decoder=pcm_s16be_planar ---enable-decoder=pcm_s16le ---enable-decoder=pcm_s16le_planar ---enable-decoder=pcm_s24be ---enable-decoder=pcm_s24le ---enable-decoder=pcm_s24le_planar ---enable-decoder=pcm_s32be ---enable-decoder=pcm_s32le ---enable-decoder=pcm_s32le_planar ---enable-decoder=pcm_s64be ---enable-decoder=pcm_s64le ---enable-decoder=pcm_s8 ---enable-decoder=pcm_s8_planar ---enable-decoder=pcm_u16be ---enable-decoder=pcm_u16le ---enable-encoder=gif ---enable-decoder=gif ---enable-encoder=jpegls ---enable-decoder=jpegls ---enable-encoder=ljpeg ---enable-decoder=jpeg2000 ---enable-encoder=png ---enable-decoder=png ---enable-encoder=bmp ---enable-decoder=bmp ---enable-encoder=tiff ---enable-decoder=tiff ---enable-filter=scale ---enable-filter=overlay ---enable-filter=amix ---enable-filter=amerge ---enable-filter=aresample ---enable-filter=format ---enable-filter=aformat ---enable-filter=fps ---enable-filter=transpose ---enable-filter=pad diff --git a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_linux b/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_linux deleted file mode 100644 index 6c40e8d2ea994..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_linux +++ /dev/null @@ -1,18 +0,0 @@ ---enable-pic ---target-os=linux ---enable-indev=v4l2 ---enable-indev=xcbgrab ---enable-vdpau ---enable-hwaccel=h264_vdpau ---enable-hwaccel=mpeg4_vdpau ---enable-vaapi ---enable-hwaccel=h264_vaapi ---enable-hwaccel=mpeg4_vaapi ---enable-hwaccel=h263_vaapi ---enable-hwaccel=vp8_vaapi ---enable-hwaccel=mjpeg_vaapi ---enable-hwaccel=hevc_vaapi ---enable-encoder=h264_vaapi ---enable-encoder=vp8_vaapi ---enable-encoder=mjpeg_vaapi ---enable-encoder=hevc_vaapi diff --git a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_x86 b/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_x86 deleted file mode 100644 index 2043aa3ee2d3c..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_x86 +++ /dev/null @@ -1,10 +0,0 @@ ---enable-cuvid ---enable-ffnvcodec ---enable-nvdec ---enable-nvenc ---enable-hwaccel=h264_nvdec ---enable-hwaccel=hevc_nvdec ---enable-hwaccel=vp8_nvdec ---enable-hwaccel=mjpeg_nvdec ---enable-encoder=h264_nvenc ---enable-encoder=hevc_nvenc diff --git a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches b/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches deleted file mode 100644 index 28f884e66769d..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches +++ /dev/null @@ -1,7 +0,0 @@ -remove-mjpeg-log.patch -change-RTCP-ratio.patch -rtp_ext_abs_send_time.patch -libopusdec-enable-FEC.patch -libopusenc-reload-packet-loss-at-encode.patch -ios-disable-b-frames.patch -screen-sharing-x11-fix.patch diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix deleted file mode 100644 index 131ca7b913c06..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ src -, version -, jami-meta -, stdenv -, autoreconfHook -, pkg-config -, perl # for pod2man -, alsa-lib -, asio -, dbus -, dbus_cplusplus -, ffmpeg-jami -, fmt -, gmp -, gnutls -, http-parser -, jack -, jsoncpp -, libarchive -, libgit2 -, libnatpmp -, libpulseaudio -, libupnp -, libyamlcpp -, msgpack -, opendht-jami -, openssl -, pjsip-jami -, restinio -, secp256k1 -, speex -, udev -, webrtc-audio-processing -, zlib -}: - -stdenv.mkDerivation { - pname = "jami-daemon"; - inherit src version; - sourceRoot = "source/daemon"; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - perl - ]; - - buildInputs = [ - alsa-lib - asio - dbus - dbus_cplusplus - fmt - ffmpeg-jami - gmp - gnutls - http-parser - jack - jsoncpp - libarchive - libgit2 - libnatpmp - libpulseaudio - libupnp - libyamlcpp - msgpack - opendht-jami - openssl - pjsip-jami - restinio - secp256k1 - speex - udev - webrtc-audio-processing - zlib - ]; - - doCheck = false; # The tests fail to compile due to missing headers. - - enableParallelBuilding = true; - - passthru = { - updateScript = ./update.sh; - }; - - meta = jami-meta // { - description = "The daemon" + jami-meta.description; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index ea898c0da8c9d..1c9f581d463b3 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -1,99 +1,95 @@ { stdenv , lib -, callPackage -, fetchFromGitHub -, fetchzip -, fetchpatch +, pkg-config +, fetchFromGitLab +, gitUpdater , ffmpeg_5 -, pjsip -, opendht + +# for daemon +, autoreconfHook +, perl # for pod2man +, alsa-lib +, asio +, dbus +, dbus_cplusplus +, fmt +, gmp +, gnutls +, http-parser , jack +, jsoncpp +, libarchive +, libgit2 +, libnatpmp +, libpulseaudio +, libupnp +, yaml-cpp +, msgpack +, openssl +, restinio +, secp256k1 +, speex , udev -, qt6Packages -}: +, webrtc-audio-processing +, zlib -let - version = "20221220.0956.79e1207"; - - src = fetchzip { - url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - hash = "sha256-AQgz2GqueFG+yK42zJ9MzvP4BddGt0BFb+cIoA6Fif8="; - - stripRoot = false; - postFetch = '' - cd $out - mv jami-project/daemon ./ - mv jami-project/client-qt ./ - mv jami-project/COPYING ./ - rm -r jami-project.rst jami-project - rm daemon/contrib/tarballs/* - ''; - }; +# for client +, cmake +, networkmanager # for libnm +, python3 +, qttools # for translations +, wrapQtAppsHook +, libnotify +, qt5compat +, qtbase +, qtdeclarative +, qrencode +, qtmultimedia +, qtnetworkauth +, qtsvg +, qtwebengine +, qtwebchannel +, withWebengine ? true - jami-meta = with lib; { - homepage = "https://jami.net/"; - description = " for Jami, the free and universal communication platform that respects the privacy and freedoms of its users"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.linsui ]; - }; +# for pjsip +, fetchFromGitHub +, pjsip +# for opendht +, opendht +}: + +let readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); in -rec { - ffmpeg-jami = (ffmpeg_5.override rec { - version = "5.0.1"; - branch = version; - sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY="; - doCheck = false; - }).overrideAttrs (old: - let - patch-src = src + "/daemon/contrib/src/ffmpeg/"; - in - { - patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/ffmpeg_patches)) ++ - # SDL2 recently changed their versioning - [ - (fetchpatch { - url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=e5163b1d34381a3319214a902ef1df923dd2eeba"; - hash = "sha256-nLhP2+34cj5EgpnUrePZp60nYAxmbhZAEDfay4pBVk0="; - }) - ]; - configureFlags = old.configureFlags - ++ (readLinesToList ./config/ffmpeg_args_common) - ++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux) - ++ lib.optionals (stdenv.isx86_32 || stdenv.isx86_64) (readLinesToList ./config/ffmpeg_args_x86); - outputs = [ "out" "doc" ]; - }); +stdenv.mkDerivation rec { + pname = "jami"; + version = "20230206.0"; + + src = fetchFromGitLab { + domain = "git.jami.net"; + owner = "savoirfairelinux"; + repo = "jami-client-qt"; + rev = "stable/${version}"; + hash = "sha256-MQ28UJUvgJoPk65neUgMrG+SxOcfnUl803urEFQ7468="; + fetchSubmodules = true; + }; pjsip-jami = pjsip.overrideAttrs (old: let patch-src = src + "/daemon/contrib/src/pjproject/"; in rec { - version = "eae25732568e600d248aa8c226271ff6b81df170"; + version = "3b78ef1c48732d238ba284cdccb04dc6de79c54f"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "pjproject"; rev = version; - sha256 = "sha256-N7jn4qen+PgFiVkTFi2HSWhx2QPHwAYMtnrpE/ptDVc="; + hash = "sha256-hrm5tDM2jknU/gWMeO6/FhqOvay8bajFid39OiEtAAQ="; }; - patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_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="; - }) - ]; - - 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); @@ -104,11 +100,105 @@ rec { enablePushNotifications = true; }; - jami-daemon = callPackage ./daemon.nix { - inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami; + daemon = stdenv.mkDerivation { + pname = "jami-daemon"; + inherit src version meta; + sourceRoot = "source/daemon"; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + perl + ]; + + buildInputs = [ + alsa-lib + asio + dbus + dbus_cplusplus + fmt + ffmpeg_5 + gmp + gnutls + http-parser + jack + jsoncpp + libarchive + libgit2 + libnatpmp + libpulseaudio + libupnp + yaml-cpp + msgpack + opendht-jami + openssl + pjsip-jami + restinio + secp256k1 + speex + udev + webrtc-audio-processing + zlib + ]; + + enableParallelBuilding = true; }; - jami-client = qt6Packages.callPackage ./client.nix { - inherit version src ffmpeg-jami jami-meta; + preConfigure = '' + echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h + ''; + + nativeBuildInputs = [ + wrapQtAppsHook + pkg-config + cmake + python3 + qttools + ]; + + buildInputs = [ + daemon + ffmpeg_5 + libnotify + networkmanager + qtbase + qt5compat + qrencode + qtnetworkauth + qtdeclarative + qtmultimedia + qtsvg + qtwebchannel + ] ++ lib.optionals withWebengine [ + qtwebengine + ]; + + cmakeFlags = [ + "-DLIBJAMI_INCLUDE_DIR=${daemon}/include/jami" + "-DLIBJAMI_XML_INTERFACES_DIR=${daemon}/share/dbus-1/interfaces" + ] ++ lib.optionals (!withWebengine) [ + "-DWITH_WEBENGINE=false" + ]; + + qtWrapperArgs = [ + # With wayland the titlebar is not themed and the wmclass is wrong. + "--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/"; + }; + + meta = with lib; { + homepage = "https://jami.net/"; + description = "The free and universal communication platform that respects the privacy and freedoms of its users"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.linsui ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/jami/update.sh b/pkgs/applications/networking/instant-messengers/jami/update.sh deleted file mode 100755 index 27472d568c28b..0000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/update.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl gnused common-updater-scripts nix-prefetch - -set -e - -jami_dir=$(readlink -e $(dirname "${BASH_SOURCE[0]}")) - -cd $jami_dir/../../../../.. - -# Update src version and hash -version=$(curl -s 'https://dl.jami.net/release/tarballs/?C=M;O=D' | sed -n -E 's/^.*jami_([0-9.a-f]+)\.tar\.gz.*$/\1/p' | head -n 1) -echo "Latest version: ${version}" - -update-source-version jami-daemon "$version" --file=$jami_dir/default.nix - -src=$(nix-build --no-out-link -A jami-daemon.src) - -config_dir="$jami_dir/config" -mkdir -p $config_dir - -ffmpeg_rules="${src}/daemon/contrib/src/ffmpeg/rules.mak" - -# Update FFmpeg patches -ffmpeg_patches=$(sed -n '/^ffmpeg:/,/^$/p' ${ffmpeg_rules} | sed -n -E 's/.*ffmpeg\/(.*patch).*/\1/p') -echo -e "Patches for FFmpeg:\n${ffmpeg_patches}\n" -echo "${ffmpeg_patches}" > "$config_dir/ffmpeg_patches" - -# Update FFmpeg args -ffmpeg_args_common=$(sed -n '/#disable everything/,/#platform specific options/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -echo -e "Common args for FFmpeg:\n${ffmpeg_args_common}\n" -echo "${ffmpeg_args_common}" > "$config_dir/ffmpeg_args_common" - -ffmpeg_args_linux1=$(sed -n '/ifdef HAVE_LINUX/,/ifdef HAVE_ANDROID/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -ffmpeg_args_linux2=$(sed -n '/# Desktop Linux/,/i386 x86_64/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -echo -e "Linux args for FFmpeg:\n${ffmpeg_args_linux1}\n${ffmpeg_args_linux2}\n" -echo "${ffmpeg_args_linux1}" > "$config_dir/ffmpeg_args_linux" -echo "${ffmpeg_args_linux2}" >> "$config_dir/ffmpeg_args_linux" - -ffmpeg_args_x86=$(sed -n '/i386 x86_64/,/# End Desktop Linux:/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -echo -e "x86 args for FFmpeg:\n${ffmpeg_args_x86}\n" -echo "${ffmpeg_args_x86}" > "$config_dir/ffmpeg_args_x86" - -# Update pjsip patches -pjsip_patches=$(sed -n '/UNPACK/,/HAVE_ANDROID/p' ${src}/daemon/contrib/src/pjproject/rules.mak | sed -n -E 's/.*pjproject\/(00.*patch).*/\1/p') -echo -e "Patches for pjsip:\n${pjsip_patches}\n" -echo "${pjsip_patches}" > "$config_dir/pjsip_patches" - -# Update pjsip version -pjsip_version=$(sed -n -E 's/.*PJPROJECT_VERSION := ([0-9a-f]+).*/\1/p' ${src}/daemon/contrib/src/pjproject/rules.mak) -update-source-version jami.pjsip-jami "$pjsip_version" --file=$jami_dir/default.nix - -pjsip_rules="${src}/daemon/contrib/src/pjproject/rules.mak" - -# Update pjsip args -pjsip_args_common=$(sed -n '/PJPROJECT_OPTIONS :=/,/with-gnutls/p' ${pjsip_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*\\/\1/p') -echo -e "Common args for pjsip:\n${pjsip_args_common}\n" -echo "${pjsip_args_common}" > "$config_dir/pjsip_args_common" - -pjsip_args_linux=$(sed -n '/HAVE_LINUX/,/endif/p' ${pjsip_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -echo -e "Linux args for pjsip:\n${pjsip_args_linux}\n" -echo "${pjsip_args_linux}" > "$config_dir/pjsip_args_linux" diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 0ef6b2e74d7b8..cb634f434d244 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk8 +{ stdenv, lib, fetchFromGitHub, makeDesktopItem, unzip, ant, jdk8 # Optional, Jitsi still runs without, but you may pass null: , alsa-lib, dbus, gtk2, libpulseaudio, openssl, xorg }: @@ -6,11 +6,13 @@ let jdk = jdk8; in stdenv.mkDerivation rec { pname = "jitsi"; - version = "2.10.5550"; + version = "2.11.5633"; - src = fetchurl { - url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip"; - sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d"; + src = fetchFromGitHub { + owner = "jitsi"; + repo = "jitsi"; + rev = "refs/tags/${lib.versions.patch version}"; + hash = "sha256-CN4o0VfHdoUteI2wyJ2hFJ9UsQ2wWUzcvrLMbR/l36M="; }; patches = [ ./jitsi.patch ]; @@ -63,7 +65,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://jitsi.org/"; + homepage = "https://desktop.jitsi.org/"; description = "Open Source Video Calls and Chat"; sourceProvenance = with sourceTypes; [ binaryBytecode diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index baa4613b1731d..06a1d98762f88 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2022-03-20"; + version = "unstable-2023-01-31"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "8cce6d20b49e917929521a13caed30e81037c868"; - hash = "sha256-1L45KodOmvy6pBbBzJwGWMAY7y3+lfxjeXtsH1SdipU="; + rev = "0c9370cfe41ae7f99b4fceced896f66fb4e9195c"; + hash = "sha256-6KSzsPs8tSzVOxGUWj/AvSJihrSwamZgUNGvjnmNnag="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 73d386b379d5e..2869401b5969b 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { pname = "linphone-desktop"; - version = "4.4.10"; + version = "5.0.8"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-V3vycO0kV6RTFZWi6uiCFSNfLq/09dBfyLk/5zw3kRA="; + hash = "sha256-e/0yGHtOHMgPhaF5xELodKS9/v/mbnT3ZpE12lXAocU="; }; patches = [ @@ -54,7 +54,7 @@ mkDerivation rec { postPatch = '' echo "project(linphoneqt VERSION ${version})" >linphone-app/linphoneqt_version.cmake substituteInPlace linphone-app/src/app/AppController.cpp \ - --replace "LINPHONE_QT_GIT_VERSION" "\"${version}\"" + --replace "APPLICATION_SEMVER" "\"${version}\"" ''; # TODO: After linphone-desktop and liblinphone split into separate packages, diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 1535b694231e2..6a1b5086bc936 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -57,7 +57,7 @@ buildPythonApplication rec { description = "Simple but convenient CLI-based Matrix client app for sending and receiving"; homepage = "https://github.com/8go/matrix-commander"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.seb314 ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/nchat/default.nix b/pkgs/applications/networking/instant-messengers/nchat/default.nix new file mode 100644 index 0000000000000..43d2d7e374555 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nchat/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitHub, cmake, gperf +, file, ncurses, openssl, readline, sqlite, zlib +, AppKit, Cocoa, Foundation +}: + +stdenv.mkDerivation rec { + pname = "nchat"; + version = "3.17"; + + src = fetchFromGitHub { + owner = "d99kris"; + repo = "nchat"; + rev = "v${version}"; + hash = "sha256-BtWKt8paI0gCGSzLYN8x3Yp5MUpwCb2vBGcGQG2aumY="; + }; + + postPatch = '' + substituteInPlace lib/tgchat/ext/td/CMakeLists.txt \ + --replace "get_git_head_revision" "#get_git_head_revision" + ''; + + nativeBuildInputs = [ cmake gperf ]; + + buildInputs = [ + file # for libmagic + ncurses + openssl + readline + sqlite + zlib + ] ++ lib.optional stdenv.isDarwin [ AppKit Cocoa Foundation ]; + + cmakeFlags = [ + "-DHAS_WHATSAPP=OFF" # go module build required + ]; + + meta = with lib; { + description = "Terminal-based chat client with support for Telegram and WhatsApp"; + homepage = "https://github.com/d99kris/nchat"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index e6b3d84c7b79d..bbabfedc690ad 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "nheko"; - version = "0.11.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - hash = "sha256-2sN5lVjJ/CPH9U6NfZkAYZUTT+YDgPOy9dTVGp0svkg="; + hash = "sha256-2daXxTbpSUlig47y901JOkWRxbZGH4qrvNMepJbvS3o="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 9845491f235de..0b51d172b7462 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1gjm0z4wa5vi9x1xk43rany5pffrwg958n180ahdj9a7sa8a4hpm"; }; - NIX_CFLAGS_COMPILE = builtins.toString [ + env.NIX_CFLAGS_COMPILE = builtins.toString [ # glib-2.62 deprecations "-DGLIB_DISABLE_DEPRECATION_WARNINGS" # override "-O0 -Werror" set by build system diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix index 36a5a0a7c90a2..1a1fd3b409a66 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tdlib-purple/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DNoVoip=True" ]; # libtgvoip required - NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "-U__ARM_NEON__" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "-U__ARM_NEON__" ]); meta = with lib; { homepage = "https://github.com/ars3niy/tdlib-purple"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index f5d2479bdaa15..d3700a66be789 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -9,16 +9,16 @@ let unwrapped = stdenv.mkDerivation rec { pname = "pidgin"; - version = "2.14.10"; + version = "2.14.12"; src = fetchurl { url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2"; - sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA="; + sha256 = "sha256-KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc="; }; nativeBuildInputs = [ makeWrapper intltool ]; - NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; + env.NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; buildInputs = let python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]); diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index e97b6c5b3ffbc..8f7c42de8abbe 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.0.9"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - sha256 = "sha256-o2ydZodmMAYeU0IiczKNlzY2hgTJbzyJWO/cZSTfAuM="; + sha256 = "sha256-MQBDX4gCpEERdgimAAhKvnN76L1ckpsfWIHZqIsSJOE="; }; desktopItem = (makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json index 3e5af22c824a5..a0e94dc0f1d63 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,9 +1,9 @@ { - "version": "1.11.13-sc.1", - "rev": "v1.11.13-sc.1", - "srcHash": "1yvd0mzw4qz03nf6im2msi1lp1v4ca9zknvb3ls6va11nxr01h3g", - "webYarnHash": "0bmjg9qhd89bdnh398lp257mxdgdd88wj5g3fmc3cavyd6hmgzbn", - "jsSdkYarnHash": "0j0jhbfhq0zabnc4glk2kypn53mi5s09l39i41p0zv7g1riwz7al", - "reactSdkYarnHash": "195ck2k5fhzi1b8grh5c88aiq4i3baqanjx48dam76li2msfxxfn", - "desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5" + "version": "1.11.22-sc.1", + "rev": "v1.11.22-sc.1", + "srcHash": "0di80hjd0d8bsbgbnddbmdjllc7cssgaxy27kd50j4dmw8qll1hv", + "webYarnHash": "182fh1ayh1y98kbg4mn8fxqvljs19b02j4ivvjszm55dcpwfp1df", + "jsSdkYarnHash": "0a8c7y34wh8bk1v35sa1s3s4piqkzvhjrzzapack4kzl1pfn0vix", + "reactSdkYarnHash": "0nhw9vk0yk2v738b2w6jjq5pfib5j66m5maxczhm40zync8b1wmp", + "desktopYarnHash": "0bq24rjf63rkq3jphv7raqaz2fnibmj41z905k5f3l4ln835ndfv" } diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index 0573c7231e271..cf2c44f5f2f2c 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -58,13 +58,18 @@ stdenv.mkDerivation rec { 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 - npx tsc - yarn run i18n - node ./scripts/copy-res.js + yarn --offline run build:ts + yarn --offline run i18n + yarn --offline run build:res popd runHook postBuild @@ -97,10 +102,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - # Do not attempt generating a tarball for element-web again. - # note: `doDist = false;` does not work. - distPhase = ";"; - # The desktop item properties should be kept in sync with data from upstream: # https://github.com/schildichat/element-desktop/blob/sc/package.json desktopItems = [ diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index f8037e1ef47cb..4d46c9870f06b 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.11.6"; + version = "0.11.7"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; - hash = "sha256-DWG67Jr2hDas1aL5Q+9MUjNKNLFpOFLsehYbJfy/rzg="; + hash = "sha256-oN80HQkPpJfhM4WBaRm4ytmhLjSokjEpfMhP6/XnQXs="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 1fba61b8b0c6a..d8f3fcb17939a 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.3.0"; - hash = "sha256-Mg7znebHiREC9QI5T7bWT4QXL8biDVBp0Z6Jgeid/gY="; + version = "6.5.1"; + hash = "sha256-At4ILl6nHltP1TMI5cjK7gE4NENAccS4MPMHXJoGveM="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.4.0-beta.1"; - hash = "sha256-GR7RWFT20i5dx6XYrp73inCOQ2Hj2UjSXf5jmjfDKMU="; + version = "6.6.0-beta.1"; + hash = "sha256-txSvMg7Q+r9UWJMC9Rj2XQ8y1WN3xphMruvOZok/VPk="; }; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 446c483f5bc0d..c3b9caf9ab4bd 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20230109-1"; + version = "20230223-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-wPx1W0eaQHpA/jcZ+A7YFL5FwPqz12j/jPgxa1JeEM8="; + hash = "sha256-tBjMg+aYXmIhS2tw+D5NkBieWKiWwEVBWs6LA3rFaQQ="; }; postPatch = '' @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = [ maintainers.malo ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch index 1d9ca8d838d9c..4a49ff991e6bc 100644 --- a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch +++ b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch @@ -1,4 +1,4 @@ -From 2c126682aaabd7f486dfb2ff75fe29b5d8697060 Mon Sep 17 00:00:00 2001 +From 33d8de9ccce7eecb12542e0fc11131b5101e1aa8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Sat, 26 Feb 2022 12:33:13 +0100 Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD @@ -8,10 +8,10 @@ Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle -index 799e782..caceaac 100644 +index ea3fea1..01e444d 100644 --- a/build.gradle +++ b/build.gradle -@@ -83,6 +83,9 @@ static String getVersion() { +@@ -82,6 +82,9 @@ static String getVersion() { repositories { maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages @@ -21,16 +21,16 @@ index 799e782..caceaac 100644 mavenCentral() } -@@ -104,6 +107,8 @@ dependencies { +@@ -101,6 +104,8 @@ dependencies { + implementation 'io.prometheus:simpleclient:0.16.0' + implementation 'io.prometheus:simpleclient_hotspot:0.16.0' implementation 'io.prometheus:simpleclient_httpserver:0.16.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' - implementation 'io.sentry:sentry:6.4.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.1.0' ++ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' + implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' - } - -@@ -171,4 +176,4 @@ allprojects { + implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'io.sentry:sentry:6.11.0' + testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' +@@ -170,4 +175,4 @@ allprojects { runtime { options = ['--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages'] modules = ['java.base', 'java.management', 'java.naming', 'java.sql', 'java.xml', 'jdk.crypto.ec', 'jdk.httpserver', 'java.desktop', 'jdk.unsupported'] @@ -38,5 +38,5 @@ index 799e782..caceaac 100644 \ No newline at end of file +} -- -2.36.2 +2.38.3 diff --git a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch index 96a7d6d2ef3f3..bf583de53ba26 100644 --- a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch +++ b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch @@ -1,4 +1,4 @@ -From b068af1f3e49dedfb489e3ed957934ff651e98ee Mon Sep 17 00:00:00 2001 +From 4bf0aef4003f7494103a93ae1c2957b2cd32bb59 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Sat, 26 Feb 2022 12:36:15 +0100 Subject: [PATCH 2/2] buildconfig/local deps fixes @@ -8,7 +8,7 @@ Subject: [PATCH 2/2] buildconfig/local deps fixes 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle -index 799e782..6ecef3e 100644 +index ea3fea1..24415d8 100644 --- a/build.gradle +++ b/build.gradle @@ -10,11 +10,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal @@ -35,7 +35,7 @@ index 799e782..6ecef3e 100644 compileJava.options.encoding = 'UTF-8' -@@ -83,7 +93,10 @@ static String getVersion() { +@@ -82,7 +92,10 @@ static String getVersion() { repositories { maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages @@ -47,16 +47,16 @@ index 799e782..6ecef3e 100644 } dependencies { -@@ -104,6 +117,8 @@ dependencies { +@@ -101,6 +114,8 @@ dependencies { + implementation 'io.prometheus:simpleclient:0.16.0' + implementation 'io.prometheus:simpleclient_hotspot:0.16.0' implementation 'io.prometheus:simpleclient_httpserver:0.16.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' - implementation 'io.sentry:sentry:6.4.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.1.0' ++ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' + implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' - } - -@@ -167,8 +182,3 @@ allprojects { + implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' + implementation 'io.sentry:sentry:6.11.0' + testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' +@@ -166,8 +181,3 @@ allprojects { } } } @@ -67,5 +67,5 @@ index 799e782..6ecef3e 100644 -} \ No newline at end of file -- -2.36.2 +2.38.3 diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index a9e023cdf63a9..b15dbbb92bdb2 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -2,15 +2,18 @@ , makeWrapper, fetchpatch, substituteAll, jre_minimal }: +# NOTE: when updating the package, please check if some of the hacks in `deps.installPhase` +# can be removed again! + let pname = "signald"; - version = "0.23.0"; + version = "0.23.2"; src = fetchFromGitLab { owner = pname; repo = pname; rev = version; - sha256 = "sha256-RN0OYjOmVtHKeFkviep952uf3qWuBj8lhcaP1Lk/gDo="; + sha256 = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; }; jre' = jre_minimal.override { @@ -42,11 +45,30 @@ let export GRADLE_USER_HOME=$(mktemp -d) gradle --no-daemon build ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.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 =~ s/okio-jvm/okio/r)}" #e' \ - | sh + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh -x + + # WARNING: don't try this at home and wear safety-goggles while working with this! + # We patch around in the dependency tree to resolve some spurious dependency resolution errors. + # Whenever this package gets updated, please check if some of these hacks are obsolete! + + # Mimic existence of okio-3.2.0.jar. Originally known as okio-jvm-3.2.0 (and renamed), + # but gradle doesn't detect such renames, only fetches the latter and then fails + # in `signald.buildPhase` because it cannot find `okio-3.2.0.jar`. + pushd $out/com/squareup/okio/okio/3.2.0 &>/dev/null + cp -v ../../okio-jvm/3.2.0/okio-jvm-3.2.0.jar okio-3.2.0.jar + popd &>/dev/null + + # For some reason gradle fetches 2.14.1 instead of 2.14.0 here even though 2.14.0 is required + # according to `./gradlew -q dependencies`, so we pretend to have 2.14.0 available here. + # According to the diff in https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.14.0...jackson-dataformats-text-2.14.1 + # the only relevant change is in the code itself (and in the tests/docs), so this seems + # binary-compatible. + cp -v \ + $out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.1/jackson-dataformat-toml-2.14.1.jar \ + $out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.0/jackson-dataformat-toml-2.14.0.jar ''; # Don't move info to share/ forceShare = [ "dummy" ]; @@ -54,12 +76,12 @@ let outputHashMode = "recursive"; # Downloaded jars differ by platform outputHash = { - x86_64-linux = "sha256-ANiNDdTuCuDEH5zUPsrVF6Uegdq3zVsMv+uMtYRX0jE="; - aarch64-linux = "sha256-V9zn4v/ZeLELAwFJ5y7OVAeJwZp4DmHm4KWxE6KpwGs="; + x86_64-linux = "sha256-9DHykkvazVBN2kfw1Pbejizk/R18v5w8lRBHZ4aXL5Q="; + aarch64-linux = "sha256-RgAiRbUojBc+9RN/HpAzzpTjkjZ6q+jebDsqvah5XBw="; }.${stdenv.system} or (throw "Unsupported platform"); }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit pname src version; patches = [ @@ -69,6 +91,11 @@ in stdenv.mkDerivation rec { }) ]; + passthru = { + # Mostly for debugging purposes. + inherit deps; + }; + buildPhase = '' runHook preBuild diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index ff3b74fd7fcd4..23571658a24b7 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -178,7 +178,8 @@ let # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ --replace /usr/bin/ $out/bin/ \ - --replace /usr/share/ $out/share/ + --replace /usr/share/ $out/share/ \ + --replace bin/slack "bin/slack -s" runHook postInstall ''; diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 0036ffc77ca56..177671f21c005 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -46,7 +46,11 @@ let version = versions.linux; src = fetchurl { - url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb"; + urls = [ + "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" + # NOTE: the archive.org timestamp must also be updated if the version changes. + "https://web.archive.org/web/20221130115842if_/https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" + ]; hash = hashes.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index bd2f9e4b3f5ec..f627647e1efb8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -56,6 +56,10 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + ./tg_owt.patch + ]; + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch new file mode 100644 index 0000000000000..05332d51c0473 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch @@ -0,0 +1,23 @@ +--- a/src/modules/include/module_common_types_public.h ++++ b/src/modules/include/module_common_types_public.h +@@ -11,6 +11,7 @@ + #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ + #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ + ++#include <cstdint> + #include <limits> + + #include "absl/types/optional.h" +diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h +index 28c95ea9..790b0b73 100644 +--- a/src/common_video/h265/h265_pps_parser.h ++++ b/src/common_video/h265/h265_pps_parser.h +@@ -13,6 +13,8 @@ + + #include "absl/types/optional.h" + ++#include <stdint.h> ++ + namespace rtc { + class BitBuffer; + } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index a62bf67790bcd..3066a3aa745bd 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -75,7 +75,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.5.3"; + version = "4.6.5"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -84,7 +84,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "060ajv9dd87qs202jr09i842vww1x25mg7vriyvmyw6rz0qf0d8l"; + sha256 = "0c65ry82ffmh1qzc2lnsyjs78r9jllv62p9vglpz0ikg86zf36sk"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index e80ccd2105aa5..713069ff95a3a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , pkg-config, cmake, ninja, yasm , libjpeg, openssl_1_1, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf , openh264, usrsctp, libevent, libvpx @@ -31,6 +31,19 @@ stdenv.mkDerivation { mesa libepoxy libglvnd ]; + patches = [ + # GCC 12 Fix + (fetchpatch { + url = "https://github.com/desktop-app/tg_owt/pull/101/commits/86d2bcd7afb8706663d29e30f65863de5a626142.patch"; + hash = "sha256-iWS0mB8R0vqPU/0qf6Ax54UCAKYDVCPac2mi/VHbFm0="; + }) + # additional fix for GCC 12 + musl + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/tg_owt/gcc12.patch?id=8120df03fa3b6db5b8ff92c7a52b680290ad6e20"; + hash = "sha256-ikgxUH1e7pz0n0pKUemrPXXa4UkECX+w467M9gU68zs="; + }) + ]; + cmakeFlags = [ # Building as a shared library isn't officially supported and may break at any time. "-DBUILD_SHARED_LIBS=OFF" diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix new file mode 100644 index 0000000000000..d032057203122 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -0,0 +1,81 @@ +{ lib, stdenv, buildNpmPackage, fetchFromGitHub, copyDesktopItems +, python3, pipewire, libpulseaudio, xdg-utils, electron_22, makeDesktopItem }: + +buildNpmPackage rec { + name = "webcord"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "SpacingBat3"; + repo = "WebCord"; + rev = "v${version}"; + sha256 = "sha256-Buu7eKmI0UGV/9Kfj+urmDcjBtR9HSwW+mlHaYhfUa4="; + }; + + npmDepsHash = "sha256-PeoOoEljbkHynjZwocCWCTyYvIvSE1gQiABUzIiXEdM="; + + nativeBuildInputs = [ + copyDesktopItems + python3 + ]; + + libPath = lib.makeLibraryPath [ + pipewire + libpulseaudio + ]; + + binPath = lib.makeBinPath [ + xdg-utils + ]; + + # npm install will error when electron tries to download its binary + # we don't need it anyways since we wrap the program with our nixpkgs electron + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + # remove husky commit hooks, errors and aren't needed for packaging + postPatch = '' + rm -rf .husky + ''; + + # override installPhase so we can copy the only folders that matter + installPhase = '' + runHook preInstall + + # Remove dev deps that aren't necessary for running the app + npm prune --omit=dev + + mkdir -p $out/lib/node_modules/webcord + cp -r app node_modules sources package.json $out/lib/node_modules/webcord/ + + install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png + + makeWrapper '${electron_22}/bin/electron' $out/bin/webcord \ + --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \ + --prefix PATH : "${binPath}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \ + --add-flags $out/lib/node_modules/webcord/ + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "webcord"; + exec = "webcord"; + icon = "webcord"; + desktopName = "WebCord"; + comment = meta.description; + categories = [ "Network" "InstantMessaging" ]; + }) + ]; + + meta = with lib; { + description = "A Discord and Fosscord electron-based client implemented without Discord API"; + homepage = "https://github.com/SpacingBat3/WebCord"; + downloadPage = "https://github.com/SpacingBat3/WebCord/releases"; + changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ huantian ]; + platforms = electron_22.meta.platforms; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/applications/networking/instant-messengers/webex/default.nix index f28cc3c25f6ea..a01df75371c85 100644 --- a/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "42.10.0.24000"; + version = "43.2.0.25211"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20221019145240/Webex_ubuntu.7z"; - sha256 = "03b77a3fcce76f04cf684bcdecb3bcce97c5a8b6cc36b40967cc14fa9a46c102"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20230214022524/Webex_ubuntu.7z"; + sha256 = "c58a0da26c8f64302cc612c60980dbd68c074d6d8a567b3d870d7d6d06b420ad"; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index af321660676bc..5bd11cff90ea4 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -30,7 +30,7 @@ , libxkbcommon , udev , zlib -, krb5 +, libkrb5 # Runtime , coreutils , pciutils @@ -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.13.6.14918"; - versions.x86_64-darwin = "5.13.6.14918"; - versions.x86_64-linux = "5.13.5.431"; + versions.aarch64-darwin = "5.13.7.15481"; + versions.x86_64-darwin = "5.13.7.15481"; + versions.x86_64-linux = "5.13.10.1208"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-QY9z1bTKtL32HE4XWnBIvCNmDF+3x5N9BdfqJA+24fA="; + hash = "sha256-lCg8xCEuZSWnd4fieug9xjudE9q6pNICRsbvA4ATVK8="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-eSPKzxDPXCbME0eTTDlfsI5KM5qRm79JTtnGJvpiS98="; + hash = "sha256-jmMpkqUga/KQJfXFbGURcWQudnCKlIi5NGY6LuekjKw="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-R0IMV/+R7AGFy/ZvNyyvIBv10t1x1U1X6jdHoo6UHKY="; + hash = "sha256-GmDWb7HRpf5khA5DAGOD5lx5zSzOdDfTvmcOU/LwN+A="; }; }; @@ -103,11 +103,13 @@ let xorg.libxshmfence xorg.xcbutilimage xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm xorg.libXfixes xorg.libXtst udev zlib - krb5 + libkrb5 ] ++ lib.optional (pulseaudioSupport) libpulseaudio); in diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 241828fdfc3c4..f46283583cd15 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,11 +5,11 @@ let pname = "zulip"; - version = "5.9.4"; + version = "5.9.5"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-gbusyhMgoaQmeWm6dB6pc3kSykD4T97VQcJgcF5KbzM="; + hash = "sha256-w2thmF/UA42j3u3m4L+/onilQhwMOa7IJoOMZ/ERypw="; name="${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 43bc47b17af44..996677f8a11b3 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.0.4"; + version = "1.0.5"; - vendorSha256 = "sha256-krjTtH8C1SGhaKMCtsbA2S9ognImof6mwD+vJ/qbyrM="; + vendorHash = "sha256-sLCgPXyOiGaigcVuwUU4+Lmb7SjopWKhCReBzrZyuRs="; src = fetchFromGitHub { owner = "ipfs-cluster"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-LdcCGUbrS6te03y8R7XJJOcG1j6uU0v8uEMeUHLeidg="; + hash = "sha256-c0COSf4ktFxkPJwzq/0RyG1JvNUvhdWpeRlrbAirGec="; }; meta = with lib; { diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index c144b4bf58531..f6341a4d74470 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }) ]; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=duplicate-decl-specifier"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=duplicate-decl-specifier"; meta = { description = "An IRC proxy (bouncer)"; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 4bc930b12d0af..02927d870c90c 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -43,7 +43,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { }; # Prevent ``undefined reference to `qt_version_tag''' in SSL check - NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; + env.NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ qtbase boost zlib ] diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix index e00a177b673e4..d5a977f65fbe5 100644 --- a/pkgs/applications/networking/irc/senpai/default.nix +++ b/pkgs/applications/networking/irc/senpai/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "senpai"; - version = "unstable-2023-01-03"; + version = "unstable-2023-02-13"; src = fetchFromSourcehut { owner = "~taiite"; repo = "senpai"; - rev = "5414edb01f30ad9480e211030db1bcd858e5f741"; - sha256 = "sha256-GsdU+IBuHhwt8n4SEMCUSUzLQezwVtZ9L/0uF5aculA="; + rev = "1318e784bd2bba3765aee97811a3f0053d3a6723"; + sha256 = "sha256-q167og8S8YbLcREZ7DVbJhjMzx4iO0WgIFkOV2IpieM="; }; vendorSha256 = "sha256-PkoEHQEGKCiNbJsm7ieL65MtEult/wubLreJKA1gGpg="; @@ -32,6 +32,6 @@ buildGoModule rec { description = "Your everyday IRC student"; homepage = "https://ellidri.org/senpai"; license = licenses.isc; - maintainers = with maintainers; [ malvo ]; + maintainers = with maintainers; [ malte-v ]; }; } diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 478b28190ae69..ad460fe6c7782 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -65,7 +65,7 @@ let ++ concatMap (p: p.buildInputs) enabledPlugins ++ extraBuildInputs; - NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" + env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" # Fix '_res_9_init: undefined symbol' error + (lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index 2a686fdd8b9e8..8aea49decb7ea 100644 --- a/pkgs/applications/networking/jnetmap/default.nix +++ b/pkgs/applications/networking/jnetmap/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "jnetmap"; - version = "0.5.4"; + version = "0.5.5"; + versionSuffix = "-703"; src = fetchurl { - url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}.jar"; - sha256 = "0nxsfa600jhazwbabxmr9j37mhwysp0fyrvczhv3f1smiy8rjanl"; + url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}${versionSuffix}.jar"; + sha256 = "sha256-e4Ssm2Sq/v1YZ7ZudAqgQ7Cz2ffwWbSmLFoKhaZvTPg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -15,12 +16,16 @@ stdenv.mkDerivation rec { dontUnpack = true; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" mkdir -p "$out/lib" cp "${src}" "$out/lib/jnetmap.jar" makeWrapper "${jre}/bin/java" "$out/bin/jnetmap" \ --add-flags "-jar \"$out/lib/jnetmap.jar\"" + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index 22ea41ec4343a..4806e3ae4a733 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.35"; + version = "3.1.0"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-tRuT4freMDtFjmZuBV9WD9jQFUat8QAias5d+AN7IVo="; + sha256 = "sha256-n0OtugTjGXk4zCjGPhifY8VinXM6SYkbmX13jBfmV+o="; }; - vendorSha256 = "sha256-2MevXSjjwXDjmiMhiZyv45a3OgDrliVcvHbXGRIOu1s="; + vendorHash = "sha256-vDjBmBLrJNRwcre2OmlIuOcxxQuN6b2eYOXLQap3F/U="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/pkgs/applications/networking/kubo-migrator/all-migrations.nix index a9197c9db5fbc..08a9967de4a0d 100644 --- a/pkgs/applications/networking/kubo-migrator/all-migrations.nix +++ b/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -15,6 +15,19 @@ let inherit (kubo-migrator-unwrapped) src; sourceRoot = "source/${pname}"; vendorSha256 = null; + # Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match + # See https://github.com/ipfs/fs-repo-migrations/pull/163 + postPatch = lib.optionalString (lib.elem pname [ "fs-repo-10-to-11" "fs-repo-11-to-12" ]) '' + substituteInPlace 'vendor/github.com/marten-seemann/qtls-go1-15/common.go' \ + --replace \ + '"container/list"' \ + '"container/list" + "context"' \ + --replace \ + 'config *Config' \ + 'config *Config + ctx context.Context' + ''; doCheck = false; meta = kubo-migrator-unwrapped.meta // { mainProgram = pname; @@ -23,8 +36,9 @@ let }; # Concatenation of the latest repo version and the version of that migration - version = "12.1.0.2"; + version = "13.1.0.0"; + fs-repo-12-to-13 = fs-repo-common "fs-repo-12-to-13" "1.0.0"; fs-repo-11-to-12 = fs-repo-common "fs-repo-11-to-12" "1.0.2"; fs-repo-10-to-11 = fs-repo-common "fs-repo-10-to-11" "1.0.1"; fs-repo-9-to-10 = fs-repo-common "fs-repo-9-to-10" "1.0.1"; @@ -39,6 +53,7 @@ let fs-repo-0-to-1 = fs-repo-common "fs-repo-0-to-1" "1.0.1"; all-migrations = [ + fs-repo-12-to-13 fs-repo-11-to-12 fs-repo-10-to-11 fs-repo-9-to-10 diff --git a/pkgs/applications/networking/kubo-migrator/unwrapped.nix b/pkgs/applications/networking/kubo-migrator/unwrapped.nix index a99ab2b2cbb61..dcf206d5c8aa3 100644 --- a/pkgs/applications/networking/kubo-migrator/unwrapped.nix +++ b/pkgs/applications/networking/kubo-migrator/unwrapped.nix @@ -15,13 +15,13 @@ buildGoModule rec { # The fs-repo-migrations code itself is the same between # the two versions but the migration code, which is built # into separate binaries, is not. - rev = "fs-repo-11-to-12/v1.0.2"; - sha256 = "sha256-CG4utwH+/+Igw+SP3imhl39wijlB53UGtkJG5Mwh+Ik="; + rev = "fs-repo-12-to-13/v1.0.0"; + hash = "sha256-QQone7E2Be+jVfnrwqQ1Ny4jo6mSDHhaY3ErkNdn2f8="; }; sourceRoot = "source/fs-repo-migrations"; - vendorSha256 = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk="; + vendorHash = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk="; doCheck = false; diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index cc19511d87cc9..4e13bdc717c8c 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.6.5"; + version = "1.7.1"; disabled = python3.pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "refs/tags/v${version}"; - hash = "sha256-yKsCM8LZ/GR/bc2WW+Ml1vSroB4iaxh09Az/B+aIVBU="; + hash = "sha256-YYlH9s3iNEIacs8izEnIU32j+2lruQ5JJrjvDIzQjRE="; }; format = "pyproject"; diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index ddc0f4b932ad0..9ffdb16301075 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -12,17 +12,17 @@ buildGoModule rec { pname = "aerc"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromSourcehut { owner = "~rjarry"; repo = "aerc"; rev = version; - hash = "sha256-pUp/hW4Kk3pixGfbQvphLJM9Dc/w01T1KPRewOicPqM="; + hash = "sha256-qC7lNqjgljUqRUp+S7vBVLPyRB3+Ie5UOxuio+Q88hg="; }; proxyVendor = true; - vendorHash = "sha256-Nx+k0PLPIx7Ia0LobXUOw7oOFVz1FXV49haAkRAVOcM="; + vendorHash = "sha256-MVek3TQpE3AChGyQ4z01fLfkcGKJcckmFV21ww9zT7M="; doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch index d5e40edeb6617..9dee3ed33d846 100644 --- a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch +++ b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch @@ -1,8 +1,8 @@ -diff --git a/config/aerc.conf b/config/aerc.conf -index fbbf587..ede1a03 100644 ---- a/config/aerc.conf -+++ b/config/aerc.conf -@@ -107,8 +107,7 @@ next-message-on-delete=true +diff --git i/config/aerc.conf w/config/aerc.conf +index 05ebbf4..db6877b 100644 +--- i/config/aerc.conf ++++ w/config/aerc.conf +@@ -152,8 +152,7 @@ # # ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets # ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets @@ -10,9 +10,9 @@ index fbbf587..ede1a03 100644 -# /usr/share/aerc/stylesets +# @out@/share/aerc/stylesets # - # default: "" - stylesets-dirs= -@@ -254,8 +253,7 @@ new-email= + #stylesets-dirs= + +@@ -445,8 +444,7 @@ message/rfc822=colorize # # ${XDG_CONFIG_HOME:-~/.config}/aerc/templates # ${XDG_DATA_HOME:-~/.local/share}/aerc/templates @@ -20,37 +20,27 @@ index fbbf587..ede1a03 100644 -# /usr/share/aerc/templates +# @out@/share/aerc/templates # - # default: "" - template-dirs= -diff --git a/config/config.go b/config/config.go -index 2120310..92b7655 100644 ---- a/config/config.go -+++ b/config/config.go -@@ -331,8 +331,8 @@ func buildDefaultDirs() []string { + #template-dirs= + +diff --git i/config/config.go w/config/config.go +index 09fb5ef..c73a7ee 100644 +--- i/config/config.go ++++ w/config/config.go +@@ -60,8 +60,7 @@ func buildDefaultDirs() []string { } // Add fixed fallback locations - defaultDirs = append(defaultDirs, "/usr/local/share/aerc") - defaultDirs = append(defaultDirs, "/usr/share/aerc") -+ defaultDirs = append(defaultDirs, "@out@/local/share/aerc") + defaultDirs = append(defaultDirs, "@out@/share/aerc") return defaultDirs } -diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd -index 885c4f8..77a853e 100644 ---- a/doc/aerc-config.5.scd -+++ b/doc/aerc-config.5.scd -@@ -12,7 +12,7 @@ account credentials. We look for these files in your XDG config home plus - "aerc", which defaults to ~/.config/aerc. - - Examples of these config files are typically included with your installation of --aerc and are usually installed in /usr/share/aerc. -+aerc and are usually installed in @out@/share/aerc. - - Each file uses the _ini_ format, and consists of sections with keys and values. - A line beginning with # is considered a comment and ignored, as are empty lines. -@@ -221,8 +221,7 @@ These options are configured in the *[ui]* section of aerc.conf. +diff --git i/doc/aerc-config.5.scd w/doc/aerc-config.5.scd +index d48e38a..39784c4 100644 +--- i/doc/aerc-config.5.scd ++++ w/doc/aerc-config.5.scd +@@ -279,8 +279,7 @@ These options are configured in the *[ui]* section of _aerc.conf_. ``` ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets @@ -59,26 +49,8 @@ index 885c4f8..77a853e 100644 + @out@/share/aerc/stylesets ``` - Default: "" -@@ -381,7 +380,7 @@ against (non-case-sensitive) and a comma, e.g. subject,text will match a - subject which contains "text". Use header,~regex to match against a regex. - - aerc ships with some default filters installed in the share directory (usually --_/usr/share/aerc/filters_). Note that these may have additional dependencies -+_@out@/share/aerc/filters_). Note that these may have additional dependencies - that aerc does not have alone. - - ## TRIGGERS -@@ -407,7 +406,7 @@ and forward commands can be called with the -T flag with the name of the - template name. - - aerc ships with some default templates installed in the share directory (usually --_/usr/share/aerc/templates_). -+_@out@/share/aerc/templates_). - - These options are configured in the *[templates]* section of aerc.conf. - -@@ -419,8 +418,7 @@ These options are configured in the *[templates]* section of aerc.conf. + *styleset-name* = _<string>_ +@@ -822,8 +821,7 @@ These options are configured in the *[templates]* section of _aerc.conf_. ``` ${XDG_CONFIG_HOME:-~/.config}/aerc/templates ${XDG_DATA_HOME:-~/.local/share}/aerc/templates @@ -87,4 +59,26 @@ index 885c4f8..77a853e 100644 + @out@/share/aerc/templates ``` - Default: "" + *new-message* = _<template_name>_ +diff --git i/doc/aerc-templates.7.scd w/doc/aerc-templates.7.scd +index 6c9e319..0ef97ce 100644 +--- i/doc/aerc-templates.7.scd ++++ w/doc/aerc-templates.7.scd +@@ -111,7 +111,7 @@ aerc provides the following additional functions: + Execute external command, provide the second argument to its stdin. + + ``` +- {{exec `/usr/local/share/aerc/filters/html` .OriginalText}} ++ {{exec `@out@/share/aerc/filters/html` .OriginalText}} + ``` + + *toLocal* +@@ -142,7 +142,7 @@ aerc provides the following additional functions: + Example: Automatic HTML parsing for text/html mime type messages + ``` + {{if eq .OriginalMIMEType "text/html"}} +- {{exec `/usr/local/share/aerc/filters/html` .OriginalText | wrap 72 | quote}} ++ {{exec `@out@/share/aerc/filters/html` .OriginalText | wrap 72 | quote}} + {{else}} + {{wrap 72 .OriginalText | quote}} + {{end}} diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index bc27b91a97da9..ac0687900f179 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { outputs = [ "out" "doc" ]; postBuild = '' - ${python3Packages.python.interpreter} setup.py build_sphinx -b html,man + ${python3Packages.python.pythonForBuild.interpreter} setup.py build_sphinx -b html,man ''; postInstall = '' diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 8033a734b981a..49e8852fd0ce4 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.46.3"; + version = "3.46.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "BFnqQFY2OKWllPQt3BzHGRotOCLCEcz/+82LNtMmQCU="; + sha256 = "bLYE99MKkh7MgxA9ZPKOj1+1VcFT9mHSQvayB/9Hy58="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index a5ed92f519e3b..65bb334611a6f 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.46.3"; + version = "3.46.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "riIQdCXTDRejo0w1bNpfQKrXhG12vbYINEUYtdQpwfM="; + sha256 = "eghCMc7SRaNLcT141Dp3Zgyso79S5qT1AwpqCAxpez0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix index 7837393926f63..0a4a4a9d77978 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix @@ -7,10 +7,16 @@ symlinkJoin { nativeBuildInputs = [ makeWrapper ]; postBuild = '' + declare -a schemas; + for plugin in ${toString plugins}; do + for schema in $plugin/share/gsettings-schemas/*; do + schemas+=($schema); + done + done for i in $out/bin/* $out/libexec/**; do if [ ! -d $i ]; then echo wrapping $i - wrapProgram $i --set EDS_EXTRA_PREFIXES "${lib.concatStringsSep ":" plugins}" + wrapProgram $i --set EDS_EXTRA_PREFIXES "${lib.concatStringsSep ":" plugins}" --prefix XDG_DATA_DIRS : "''${schemas[@]}" fi done diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 870477545b53f..d0072a00c5a61 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imapfilter"; - version = "2.7.6"; + version = "2.8.1"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${version}"; - sha256 = "sha256-7B3ebY2QAk+64NycptoMmAo7GxUFOo3a7CH7txV/KTY="; + sha256 = "sha256-nHKZ3skRbDhKWocaw5mbaRnZC37FxFIVd08iFgrEA0s="; }; makeFlags = [ "SSLCAFILE=/etc/ssl/certs/ca-bundle.crt" diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index de82535cd5601..fb852f76045d1 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.2"; nativeBuildInputs = [ installShellFiles makeWrapper ]; - buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ libiconv ruby ]; src = fetchFromGitHub { owner = "leahneukirchen"; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index dfa92fc42c98e..91a424d9eb12e 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -18,6 +18,8 @@ , gssSupport ? true , writeScript }: +assert smimeSupport -> sslSupport; +assert gpgmeSupport -> sslSupport; stdenv.mkDerivation rec { pname = "mutt"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 9bd99c86e773b..fb5d664080496 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -196,7 +196,7 @@ stdenv.mkDerivation { ''; passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { - inherit writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; + inherit lib writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; pname = "thunderbird-bin"; baseName = "thunderbird"; channel = "release"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index ed5c9843f2813..73cd49ec6c0a4 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 = "102.6.1"; + version = "102.8.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/af/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/af/thunderbird-102.8.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "417eb44163275bceea7251e544499f56056a16aa3defe97f9f26df0abaa8fe8b"; + sha256 = "ba2ede548ebecf34dbb9064fa40ffebd1b04c75fe49a9b75e0381b6d1863e448"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ar/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ar/thunderbird-102.8.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9717df3c3020d2b6814eb8ce99eafa62f71f56cbe0d7515044b7ff88c763cf44"; + sha256 = "6ce47dbc702e0557ed4ac1898a18e3aa17af0b7e9f9958410084aba1b765e3f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ast/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ast/thunderbird-102.8.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b6984f90666a29a922e098635504786716c38c0cafe243b5a1d43b64af64d0ee"; + sha256 = "0aa0ceb9067c91ad548edd7f3603fbc61a25b3ef0aba2ec669bf02ddabbd29d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/be/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/be/thunderbird-102.8.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d9060ad38fc5da77c9c709dbc498ce656d20668b16d2c811dc400bf9170aceee"; + sha256 = "4ff2f25a296dc9737a68180b4594ee367d5499189948aa0f03ba273f6c3ce08c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/bg/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/bg/thunderbird-102.8.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "936c52b46c7671a3328e6ebdd9d0ff0e61e761efc0210f0c470893072d04d7a8"; + sha256 = "5100741120ee268ffd7c47fb96130f58d32e4f817e461589216b7613c58fca2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/br/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/br/thunderbird-102.8.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5c82a79835dd1f94b54113c9982e01c1a5cbce09c89a8ca5783407669de35665"; + sha256 = "0b957c10107762463559825bc8ec31b69782cc31254f712515f6e25612acbcce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ca/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ca/thunderbird-102.8.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4461d13cef193613c490eb3194e4a49c8273cd18a6802450c1bec7a239ff3236"; + sha256 = "2c51198833e5f177d3637e965c0d69435abbf26cc75347817c9b2aa1793083cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cak/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/cak/thunderbird-102.8.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "3382850dab21c32bf31b1ba10474a2cb017c16af5d3fc3697fe15dc39ccd9b40"; + sha256 = "d9bec543aacbbd68a5da25d331488639eb9808a38978ecb70c33b014d1883d2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cs/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/cs/thunderbird-102.8.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1d9f24e160547e4af0d6420b443e2c36762a13bfe7a0c552162fac05c08d8b1b"; + sha256 = "cd0c0eea3b9962366d6356f78d0f9add27a124b40306d9fd9dca55e38f6a3880"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cy/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/cy/thunderbird-102.8.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "dcb3a9894021d08f31dc9b5eb14bff17bd4e0ae8009c9f65b444c1ff0aca4d91"; + sha256 = "dce2c89acf985f25f3f3c8be5f4c99078215d7786140ea53ae1436e552c0db6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/da/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/da/thunderbird-102.8.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "0fed9e8faebbeadbeae53aa06a773b412d45adafde237742b93dfd9196c9e9e4"; + sha256 = "b770cd13cb0d4016d594552e953dd64822eee279f780f3c430f2df2edcfffd69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/de/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/de/thunderbird-102.8.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "dd9a22884495c0d1ebb18fd7721688a2e14917684bc176c90578c8008d3836e8"; + sha256 = "b236aaac3efa2141254c604c031bbfc7b111f74aa4eeff195c2b45029a0d9b67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/dsb/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/dsb/thunderbird-102.8.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2a84bf4e6862346bd03a05be6fdbeeb79347890294ec6f93809bedfa089005dd"; + sha256 = "82ace3dc15970a1257cd6dbb2b884a5059ea0e413e78e3a97d6778da2dab13fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/el/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/el/thunderbird-102.8.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "f758bd822941145ba0da6e296f12264329a30c3f1cb5b8ce16f9887ad89caf8b"; + sha256 = "70738ccfcdab51cbd6369656f424a38e497a35fc6a74a4eb6f33bf79db774d49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-CA/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/en-CA/thunderbird-102.8.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "4f0edd405507b23fac31461f9511f35aacd096d92a4b598801f021ac5d3021a8"; + sha256 = "9b5011ce3c43f404ddf9b3d2d6b931cce9b39423ac44503fd52015bd20e217aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-GB/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/en-GB/thunderbird-102.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "15443e7ed39849346c562a67a673fb4bd39e05f8bf616fd7170e9352ea4b5404"; + sha256 = "cb943b6e9fe2562ca5867f559459ae741be0b0a5758988e77de3e5895f33ff7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-US/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/en-US/thunderbird-102.8.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "501c5f0c97e89d5b5fb066b5f480cc3598a1bdc86dfc32482d3bf2c453ed29c3"; + sha256 = "bba8cee22cab7a5134b4478a48117f5e2fff0dd2c7357920010e7f4e4df55728"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-AR/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/es-AR/thunderbird-102.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "c228716b6c6bf78efdbfe877a01d98a697c048ba36b5b692d4a9e4f35c5c8359"; + sha256 = "1346bc8d7d6806f1d7d3fba08954d62d823fa8a645588e1edcbdcb582adb4c6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-ES/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/es-ES/thunderbird-102.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "35ff4ab3acdacaa17c31577f34e791f805f039fff636f696f483e0e77a13cdce"; + sha256 = "414829e3819c3c9c608d6d4ada7e3619326ddab645afec5b87e1c3f9eff308d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-MX/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/es-MX/thunderbird-102.8.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "da0dac340fe0467d48c75ca25a0f0c6ca40e7904969aff5efac7d14b8e2a790e"; + sha256 = "258d9884194c73d91346c49be97e80379f330ad11c8b16c7a3a804ed44bb8b01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/et/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/et/thunderbird-102.8.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "840bef653741da3b19b85c645fed1375ba706dee4bf2e6c8684b9f50a2d54a35"; + sha256 = "e01ea9daab81222ce424ecf498fab0fbefb4ebae8f8f3420a3b324898bfc09be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/eu/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/eu/thunderbird-102.8.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "397a1a04b45f4035338328a52baa2bfc30be9f48fcc76137122d18e0a350fcd3"; + sha256 = "1f53f007d559496a66e7466f86bdbea375d879b760882d1a1df77560c26d204d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fi/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/fi/thunderbird-102.8.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9af605e6b57db7d2c661ecd95f422b613f1819110bd9ceee7b8d4da546fbe069"; + sha256 = "55d8c2cee9fc9da86bba621a6e79aa2f7645f4ec83cf309444c7a3c09c1122a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/fr/thunderbird-102.8.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "44c4a26ba5da3ddd8fb5368529279a50ffc3593f3b7cef35eb903d915d7720c1"; + sha256 = "ef26719a3a616f6e9e597cd110aa05ffaf832a63bc966ed9897a1b0bb6ee818a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fy-NL/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/fy-NL/thunderbird-102.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "74023e7e027554a79362cdaeb8921393e55d902c10653221c7edc9c245646f99"; + sha256 = "c9e30388ef4d54a5e8557668775460b32e6db213eb2beacc96338c5b883653ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ga-IE/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ga-IE/thunderbird-102.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "04f6ea825e23b89ea5f55d5fdf86c11ed7c4f224df2f5fbcb1b800a5f45b22f1"; + sha256 = "84ddd0d3646c31ef1da02f9a5e1cf48ec5dc459668fe36435db5f490eba40502"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/gd/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/gd/thunderbird-102.8.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "fb428e74e80863cc6a69b2f9ede1694daa490637c166c5aacc041fa70943b5b2"; + sha256 = "11befd31b721e7c2a7e02b1d56099553b76dd9a870f7bf045041a353fbaf3fb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/gl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/gl/thunderbird-102.8.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "c548d0f51b881b220dbc8c93a69add3f1b19579236b3e47d0bb3cccdb7d8647d"; + sha256 = "fab4badae04fcee3473937498d4e0672da9b94e1b1c09c4a21c6cbbab42c4a47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/he/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/he/thunderbird-102.8.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "b22faa9d7646eb8efa3fc0e15c966f7286b53c12d72baa534a92ba20432ff8b7"; + sha256 = "d45c0d8f4da3d5e4786aee3ca3f909429838533dfebe52f1cdbff453d891ffd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/hr/thunderbird-102.8.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "05571451a11e827ba451354f97695e449afe85d7c7dcd2c0ff3aea24727272c5"; + sha256 = "a2d1d496ccb94502e4bbe5168709c0c547ee7e45100c7276d5efadc7bf0e8e3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hsb/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/hsb/thunderbird-102.8.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "a3c0f43e1db05456aea23dc1f17b1057eb86124cc14a1ca5e80b71b1518a1fda"; + sha256 = "cc74e62df0255e1f4c89d639851c1984ee19aa1f7eafbfdaf32cae6ed27127ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hu/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/hu/thunderbird-102.8.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "6b0f9ac8947699adc325435be839cb0c08052db330d0d2c8327fce5f4cc2eb22"; + sha256 = "13522a168cadd0ddc06392634745867928116b4fc6fecfd908fee1cf79155f7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hy-AM/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/hy-AM/thunderbird-102.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0150496630287f01ed05dcf9e3dda88a923936e77cac41e2df856d8f4298f240"; + sha256 = "e79f42377015d42d861c1519d0767ca12ff1ea019884e8f9f6afb56a7f8513ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/id/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/id/thunderbird-102.8.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0a2946beef4068a760f139f32782cea1f7ed20d8d577448bed785146394094ed"; + sha256 = "39cddf34e49330204a2926f8aca2b50d88020a0bbd7b2520b5ae1429fc9983ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/is/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/is/thunderbird-102.8.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9e876cd8b01e9ec4c77311c325b807d3318a17c7d4943a42dd1faf6500f222fe"; + sha256 = "2c73156fa3c4b242dc9d409b7b5d911b8b150425d554fb1e3ca8f149705281e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/it/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/it/thunderbird-102.8.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "92a90f181df2b5ef167a0b2fcbc5169615a39287b75a7428650bc679e211c755"; + sha256 = "41974d06b1553751ddae9e6d6d6b4439e0163964b5fa1cae7324ea2a3949ac70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ja/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ja/thunderbird-102.8.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a90c125ee302827c11ba1ec41f6548c7c42c88041713747aa7ecfdb84b307d92"; + sha256 = "42500186b681a7ef81f7d71c864ca515497f3b705f7474d104ee75454ffa8a03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ka/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ka/thunderbird-102.8.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "a26c7070396101c94c35a35aada3869309d19e060f8c4e44ffa77a9cb6d291e4"; + sha256 = "bec232ad6c9f1cf1fc38edd0e9210336a56bf20ea8f61dafd113c8bff9da5117"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/kab/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/kab/thunderbird-102.8.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "4596eec5222f4fc3c9f27c3af1426880ec3846b981b5719bf97decde06f14580"; + sha256 = "e27ce311cc367d4f76b2fc632bb7454569346cb715b50235f4952c8a4aad4931"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/kk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/kk/thunderbird-102.8.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "957df20187a944e587f16426b975e0b25dc274ac6ff0112f8ad96f7b520f35f3"; + sha256 = "711c93de3db1fdca7583a6fe715816eb3fbc24d2024a49e9ed0968b86008ae53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ko/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ko/thunderbird-102.8.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "77cb35952ebd1b14e661d6c67933fe5c28e5670e2a08399227e90e0d1665a149"; + sha256 = "4b02afd65cb37438fd6470e39015a4aee0fb526c640b24c9dda43860740554d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/lt/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/lt/thunderbird-102.8.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fda5d9ee40b2a9266a14969187fe54f5dfa97b3029cd23bb4f74dba31139cb9b"; + sha256 = "38a1ee1acfae532a477f917e977d784ca8e5b8861d1f8b77c769a6a0e75c106c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/lv/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/lv/thunderbird-102.8.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "088a7b5746926614ce27ec42ac8e50dfa573006e76bc2cb2cab8d94b820ed3db"; + sha256 = "26e4095f76e63044b12f578382092ca1e8e540cd808f13f57e6b75ac24900d57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ms/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ms/thunderbird-102.8.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "827c08cdc65fbd81bdd326b2036071d2174d469c72224929af899c3af90cbb1b"; + sha256 = "762b0646a9ca93291ae76951b789b1a23b6fe5b023bf47b3567ab28c118147d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nb-NO/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/nb-NO/thunderbird-102.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "f049be571b8d9b39dae313d370e2510251a0521ab64cb82cb432843fb26c407b"; + sha256 = "5f8d639afa6bccce81a9d475ea3e5db2a9799f325314d8f2ace366e7c919391c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/nl/thunderbird-102.8.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "26fb69eceb626eb7482f67ef0043dd9fa58003b534bf4066aef3d51792ea1834"; + sha256 = "0cc441bf7aa9fede1a6b87e58c4a0eee6881196b68308ddd870215c6f93a3b16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nn-NO/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/nn-NO/thunderbird-102.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4e586bda023baecaee92853a4e6e993e35ce193ca2770071bc22ba2006109898"; + sha256 = "8cc81b524082efe23ee865583cddadce33ae8367d4bfc97cb631bd1599deec14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pa-IN/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/pa-IN/thunderbird-102.8.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8fad3effac8d00d5a07466b94b8d51ad6ecc23552ffec658fef6d127b0b80e4b"; + sha256 = "d2db7a51cc627f60d645bc6c2f3bc01971d4358b99187c27e1ab97a803a465f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/pl/thunderbird-102.8.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7dc544a10b244425e76e341fc1164b52e915fb5e6c12fc755bcca173810827b7"; + sha256 = "97ab876eb3321de7acd899b4d637dd1ba1fbe1ca39a4cb5933b3f27a374848e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pt-BR/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/pt-BR/thunderbird-102.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "7b38735922511f3a03febc10e98fced7880a8874ccb53c3c946d4db225d02823"; + sha256 = "d4107a7fa690926e27c031164a8686d48b7ec85f87e759877b1b611899acd2dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pt-PT/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/pt-PT/thunderbird-102.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4baa786ae442af119a3c9d794a31aedee06839b8dc9551b46028a4578c4086bc"; + sha256 = "8fd0180fc900ac146bc027d0684c32628adf7fed1c3d6ba629d2ce860eba7365"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/rm/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/rm/thunderbird-102.8.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "087b4ecbbf95853ca6937a828f4f806d32f8c56d0feaf0f5e05628e2ca2e3ace"; + sha256 = "67d9639e25d18f3a87fb46837cdd5a5c02a8750288f1ce3c8a9966bd8a27ccd6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ro/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ro/thunderbird-102.8.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d3324a4fc7ab8e00d35fb7d1a4c6567a3a3f1b4c50590ca206eb6d5a6b950842"; + sha256 = "a6647805b9d150e2b122acbd1b68e615685ccc71ffac30969c844a47e8d53871"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ru/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/ru/thunderbird-102.8.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6a2d2daf0f325f8f033869b3fe4e644ba5022244bff1031b35a439e43999cf44"; + sha256 = "49f80efa92dc62e030a77a591767a59dcf79a555a38ea529904779bddd51ed3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/sk/thunderbird-102.8.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "275785c953e5c88adf3b234c604ded4b04a087f28f32bfbf39e0b3a8e1e64c82"; + sha256 = "d0f1eba84c00b072b041cb47f3ad9c743eb9fdb5cf24f2800aaafd1673174ec4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/sl/thunderbird-102.8.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "398725e455f26782f3d44a8165897bc375a9d0b7544e1ee37f70b77898ee4ff9"; + sha256 = "79be6e3e6bf71677ebe697629dddab4e626a057d569f54174b4226a5b89c3fb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sq/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/sq/thunderbird-102.8.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "cd2c03610f93518a95bd75cc0c7fc867b3922aaaf7e891d67dd6562aa4bc3064"; + sha256 = "e038fd9cff2bb4d3b5e4732276de7741e081a9a0c5867025bad0e0f9ea95a34f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/sr/thunderbird-102.8.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "bf380394a724353bf91fae056a00e1e8238a14bd1d221bb47cc2ad6247ec721f"; + sha256 = "400246f1cc4d75b9792e48043dd38b908281a3a1f6bf1f59b3d5c9653f65ad87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sv-SE/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/sv-SE/thunderbird-102.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "8b57f7ed92a353a970c063c9374303c273a190fcc04045a7fb9ed7774a2bbfb6"; + sha256 = "f820013501e8110dc7b7e23516e7fe3888072c45f392424d3dab3441c3c2075b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/th/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/th/thunderbird-102.8.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "99abebff09161c06c5985e74e5e1337153d99d13fa8661abf8e4f1895c12d1ff"; + sha256 = "71c8986491d336851a6eca7e4aa033e749349936321de1811847ebf9e0ccebb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/tr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/tr/thunderbird-102.8.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b17a54aab88fc7c13c3e5551f9b9a14153e124b19d58fef3da28392dd1a18157"; + sha256 = "019156e1d394fd052e7f2d7fcd96058801eb14e4ff61d9e9f907569b129aa2bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/uk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/uk/thunderbird-102.8.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "63565388a50fe92887ec6adbbcb9a2ee9835873fbaee782901b7f7fd8e35500f"; + sha256 = "e37cadef887a0fce4459e91c90d63361115f86d8cc7cb841107771ed378443db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/uz/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/uz/thunderbird-102.8.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ad501a7dd6f98f5b263fd7c71572632088a4801b52ccb6ee37ebf235162fddb1"; + sha256 = "60a4946bc07b76d76f92332234f2d87f70d7b3c4e7f15530a61e602a358e64b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/vi/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/vi/thunderbird-102.8.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fd5d17c2965a94fcc0e2d167d5f202a67a024c0797afcc92481a3413d6445ffe"; + sha256 = "05ed2df59ea6d9265d9133c6bab1858cfb324cb58fdbc9997749bccae653b539"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/zh-CN/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/zh-CN/thunderbird-102.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e666ac3bd0f75b3f7915bfade39b044b69af7f3d5901c0f48311ff614f4d710b"; + sha256 = "c7a01ce36f53cc45d706f6607459807044f098c1d9a3316bad13b834d53fa2eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/zh-TW/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-x86_64/zh-TW/thunderbird-102.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5c85008c1974b961e08065976a28b0897ff9d5199bc69e1c3c403a10d546156b"; + sha256 = "7d85ee85882a0c50ae25a338db564eb404df7eaefce93726a0bf15e6c6988811"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/af/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/af/thunderbird-102.8.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "e8c7b235b856b7c3ff1859acf856c8917d5a1dfc7e4a6d2b9d4736b3709f9150"; + sha256 = "96f298579a357caff8b69aa1c1c485201640ffe05ab6e3adf5cec5f4268250c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ar/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ar/thunderbird-102.8.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8594ee599a9bcd600b679e762956042e71cfcc60d6942f22ec9c3a25a0790f78"; + sha256 = "b382d9665457bf9dda8c5aa38d657e92e534795f4d1a4d42b5a07625e40d02c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ast/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ast/thunderbird-102.8.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "15d81d66cee46104d0ba9af9dd6704b1dfde2c3720a68fd23fe5181b56b2942d"; + sha256 = "00b76108dfde73e07487f841e7167477e938bed167d95132536e9d92bd9ad3f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/be/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/be/thunderbird-102.8.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "07bc7abcc461b68d4bd7015518a4ab0f00486c3104ff04fb195244af826ce99e"; + sha256 = "80b459c031c7d678c28e50ff8f0df864e6be3183551e5677bf280d749712689b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/bg/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/bg/thunderbird-102.8.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "3c3995a3c75d7100d3b5a37de7d96032b41365cc27337af3f90bc01c318c621b"; + sha256 = "1a98a96b8da3d6d6ae642c19a9ce5f29d6f0f9a68a016a60ce179ad080feb40d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/br/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/br/thunderbird-102.8.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a390683e704cafa6b594028c02db0729519688b14284cbf4e23af06d797030b6"; + sha256 = "50f2bb8baa7db5f863f9a05569b45516c217a6454d48a5042442bd59237a79a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ca/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ca/thunderbird-102.8.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "bae799d097b2a072b4f8ecee6dd18b91a07d08f070da39a22dbd669bffa9cb33"; + sha256 = "4ec8300f818e3e623dfd5bb84ba8e5682b1481acbcc24cc40c7c893f7843dad6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cak/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/cak/thunderbird-102.8.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "68af639a2d228cc8925702ab32c8f7e6fd9ed48c83111325d93b477811177f80"; + sha256 = "73e38bb0cc6c77563de93b763e082ec0799c37920b35fac6acc14091ad90bc91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cs/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/cs/thunderbird-102.8.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "191ec59655ec025ca02360710b180899bb3486910b5c6721165b4cc8ec78f9b2"; + sha256 = "3cf10ca513bc83cb327d450ea66ea70d2ed891c7d22f7cbd4bb151d48265ba47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cy/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/cy/thunderbird-102.8.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a65d91c31430b9b0b138014135d23d56e4ecd849aec398539c6dadb63fdbf03c"; + sha256 = "dc530f8efe020b87e257de80e781e86c6b102114eead16e86642964df9d4e290"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/da/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/da/thunderbird-102.8.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "9306558c123903497e2e5ad7968aa69e94b9c4e809f6f5b4d35b9aafcbc75ed0"; + sha256 = "54bcabdff268df1a8f8e4aade54866283da0e031b62def9e535bb6eaa92cc97b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/de/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/de/thunderbird-102.8.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ab06a47e5472db33702187a88bd8a794632809977632bf129f3d980b8a06ceb5"; + sha256 = "8045387afd1c74a2041be37ef67fa8bbdf0e0c05f66a0772d4828fd1ba889caf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/dsb/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/dsb/thunderbird-102.8.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "05adea0c112d5d481990a7960de93c7a61d055f8268cbf617b295f86daaeb5b9"; + sha256 = "b9b708de0e810844bd3573951234a134c29cf122ebf239c0ff74fe51dc3e5a3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/el/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/el/thunderbird-102.8.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "6d4d1913ae19fa528aa6986c617226d30cd46099825afb2bae83b052f5aac490"; + sha256 = "c0beca9e0e4e98c21908029c04b84b8c9e4a08a2f9aef8bf016c98b50410e126"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-CA/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/en-CA/thunderbird-102.8.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9919702fe73038c05cbcdf747126b22b7b4fd62549ad4d1361ef85fe6aa92f71"; + sha256 = "2b3a93b4194a29c38b41cf3ecab924303ff55f475b9a59395971a03a81e7af08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-GB/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/en-GB/thunderbird-102.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "5d8b8bcf27c67d6a0c70bb6754167474e9bd9fb7489f1fd21f3754d27d872326"; + sha256 = "ae3cd3135dfce0be827e1a16f3be6a09301a95c976acbe382be9bb74115b4ad8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-US/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/en-US/thunderbird-102.8.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "b24ea963c7e09d1f69b1297a6f86a7d0462403a9172d81ef47c375141d54cce9"; + sha256 = "c6e2f9c987e9c5987bc555ea6b5647e5048543170d39123e14619b31a087fdad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-AR/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/es-AR/thunderbird-102.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "1617dc229307d42e1a60ea44f359a62f042f53064360dac7ffd59b6a7c90da41"; + sha256 = "a59fd6d68562ad3debb66c2253270edd1b6e87c0f060fc6b73ecb87849d2f965"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-ES/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/es-ES/thunderbird-102.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "9f19e6654ff4e2eab1d9f7ee555da87c270e60cffb820b000b7892583f4faf6f"; + sha256 = "5bc63628e1c4b2735ababbc9732a25f1cfe14137753b547024ca6e4286b71db8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-MX/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/es-MX/thunderbird-102.8.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "7b055cfb21573399df99e4d6884cb4c61ce2221ac8ea463d1d2b7115d97ece2a"; + sha256 = "894aa1d22f69f270657f9dd8448950bf9301e369e28313179bc4708b66b6f014"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/et/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/et/thunderbird-102.8.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "cbeef98898969cd7b858bb127c6ca8b6b9888cda0e230e303a8c4c777a30d151"; + sha256 = "5249066b7d6d19e964c1bbb452749f0a79b11f5d462c208c123c10a7884cf69a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/eu/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/eu/thunderbird-102.8.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "5e8160115595350cf5b0a44e71c09d32fbac65ffda9ac6f22cb5e910d18462c1"; + sha256 = "aed52a4d32b18e95936610af1f2f5830c8c06159e62fbae124396e865deab7cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fi/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/fi/thunderbird-102.8.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "291883c64f376bad4b6345864d10f0e067123589a2b30f38dc24a99b25854949"; + sha256 = "e848d5d478f57e0213be2a550aee1d15c3090b1683c0de28e6ff5c32c9b33753"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/fr/thunderbird-102.8.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7b57f6a1f499a009176cd894df6fa9fd151b707b63aec8dfb62e426a294c53d4"; + sha256 = "7e22ca894d4f742b3555cf1057cd7e97f0968408bce07f21c655b7265026326a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fy-NL/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/fy-NL/thunderbird-102.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6e355a646c8dd77c72fe16c896c25572c9b87c4806364836b3681407bf7941b7"; + sha256 = "5562b6fcf035387ef3f5369fe2edd406cdb6417786a2a044ba8e582fe33094b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ga-IE/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ga-IE/thunderbird-102.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fc2b1fbfc5aeb15082e656c01a71943045233ee593c3e1710440a79f50d4c0cc"; + sha256 = "eaa935bb3a977a10571268ef9c0e30a9560a273bf100dd8bcaf86333b39c4a74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/gd/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/gd/thunderbird-102.8.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "e8be8dba1751fb4633dc5bef4a047b3ff85ed9e799b89669f26f8e0e3125e30a"; + sha256 = "b3c7eb3ddaeb76e1e3dd298962ded700717fb71a600f02c6275839875253a821"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/gl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/gl/thunderbird-102.8.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "78ffb29b73629b7d319bf752471608e3d44624b5b99b6eaea7f241901d623a05"; + sha256 = "642af77ea5002d4d649369e08d55e866cb99fd2f991975a111a79a4b9108cb3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/he/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/he/thunderbird-102.8.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3bb4469702756c39cb70b0639b825e922d769a9aae7e78f296d8188b039499b6"; + sha256 = "d50515d49dc86d39715a8b673dd3e384eb5e4b2210ce62abaa6c5849fee8b29e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/hr/thunderbird-102.8.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "acd95b3717e6b617212c75be3b9e0b193f33cf5e5636d2ea535a720006f7cfe8"; + sha256 = "1fe0639429f6de5e6df096acbdbcb04ec9b83e971c1667cf008e4cfa3830062f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hsb/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/hsb/thunderbird-102.8.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7c65d7f28c713723c58ed62715404224b8f4163a1915f702d125f827e642b509"; + sha256 = "d9655265dd36ad5300e1d5daf471a7d9393e21fa94c8b7c12995c5f9cf955a02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hu/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/hu/thunderbird-102.8.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "6d206289e4e8ef8db85c29ec001b91add5eac67bca3d7f5eb42099cdc9934c6b"; + sha256 = "16f2cb8efce4333fda4daef686956622e24e828c6b8f0493b1025fb3581a6322"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hy-AM/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/hy-AM/thunderbird-102.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "8823ea085d97bedddb4ea16517626dae9747db2450900eaa102139121eacc5fb"; + sha256 = "cd31deaae27fca3afeb71ccd092c13b68a1f9afbfd3cf0bd8e569879d55a0da9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/id/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/id/thunderbird-102.8.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e6fc35cb393f7a0cd63625700e11c313124a2542cebd431159e065c826581176"; + sha256 = "3535fe394cb67f5047e78ae5cf75b8fb0a861fe2a5d942b8ab12961b0ee1ea6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/is/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/is/thunderbird-102.8.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f92db50f2f743436373da51e2f3b9bba7c4f6943254a70e7459ebb7d90dba3a0"; + sha256 = "32066d8612387fc80375f4514b3a01dd7d74eeb7fca6769699f7344b6c8ab3cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/it/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/it/thunderbird-102.8.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "9cbf3eeb035ddd0f60c3404efc79faccb454fe406467a3c66d71b6ad4e87389e"; + sha256 = "f602713708789fe391c638fd9049603b6a9e8303ba2608911569f4fce8c005eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ja/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ja/thunderbird-102.8.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "38c5621f8b32d55b67a79103704541b14599bc67090216a9561ac1cb4c311bd8"; + sha256 = "a95845637e8083a28a207554ac3400eb8fb19b3e31d4a2d1982b96154bdaf945"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ka/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ka/thunderbird-102.8.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "05b906fba741580368f52b7ddbc4772181f4d1fb4ecca20c94bfa0d41364383b"; + sha256 = "d8942afa3552a41fcc12b24295432e0f83721e4df210b1a43096535b3d5944f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/kab/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/kab/thunderbird-102.8.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a225ab4d086e1b21afa6d0d1d8b33434832f37c7bfc4982d2024783111cd7d01"; + sha256 = "d06565f2512596a2b964cc7efc17d67061882966ece76ab1bc1a76991a3f629c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/kk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/kk/thunderbird-102.8.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "38f0349f890702adf3f6854893e3a8bec5d6244ecbd69b86fa839f417a9e86c8"; + sha256 = "273258bf7fd75b25521bb79dcb4f9b5491a7fa8b76eebc6fe82b1f6a3554f9ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ko/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ko/thunderbird-102.8.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d838976ac2902cd6cd055480a1f4b7510abb83cb2448b64fb36d600525a90a88"; + sha256 = "9c6644f489f4b8e7f016df15d8d04d63931a4f47e6136ffd108c250d73494b67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/lt/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/lt/thunderbird-102.8.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "14e66fca1018cdc74b7bb50c46def97b0c6f25d667f869fc0c17d8ac16d7cc5d"; + sha256 = "ac5a4b5da556278928fa795cc47e2db88a5336b2e12bc3a00f9db17e68c41365"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/lv/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/lv/thunderbird-102.8.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6b7fa2d6c712b373f5013f3acf875f8ea8b8fdb582b6759e96469094b375540f"; + sha256 = "d00c5f721bccf20957eefeca50ed1a71251d1672d659e43c809465b303099da3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ms/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ms/thunderbird-102.8.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "fc42cae3d6ba0910df7aaa2c1df8391e70da60a093aaff60287503feaae37260"; + sha256 = "77a17b05cf63e0565c697c23889e84a548397b41f307f1f57d0ca965c1932b24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nb-NO/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/nb-NO/thunderbird-102.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "0ffb1b18c916f9c27e5ba3ab8bb5ee3107e37f983c2645a1955e9a4904cd8c47"; + sha256 = "c4c7b9d061188db625ff7dd7a9f0552583625c9c5fbb77269d8c6018849ee1e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/nl/thunderbird-102.8.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "fcd3a85abbff759ed27c314f0b9d47d1a216ebe9bdaa3926885be81b31fdcc5a"; + sha256 = "474ca230c6749d0de8162268bd18b34f98b10da1aae91ef241f99aeb77f335b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nn-NO/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/nn-NO/thunderbird-102.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "affde5a378f0ac70d48d7e4c75f6b2f680517cb2106a28aa4a53e376349b43d3"; + sha256 = "39a215f35617f2b3ebe6b5215ca231edde9938c047f04928f69966786adb8eea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pa-IN/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/pa-IN/thunderbird-102.8.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "81984847af5c43eeb35870d39eb6e006d8b9df35b5e03135670973ae6f5f7d1d"; + sha256 = "9f3bf27d34cea4c0409c6b0a7861f38650107a3458fc5b3a35806a3c49974fe2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/pl/thunderbird-102.8.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "4710f6042126da09159cb5d465909bea3dff62753b6c5811f8920ca7782bcf73"; + sha256 = "a25766f5c924bcc77499eb87f83ff91f3ac3cdd3a97416827fd0bf7f74b5761e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pt-BR/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/pt-BR/thunderbird-102.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "92c564bb0623a9a258fefdacd7a76a3e636ca5211f962c3b3a68cfb16cc5217a"; + sha256 = "6c5b0f5250b8fed7e5b53c8f3c4b55fa122d4c3360aeb4393d2af3c1f9b11f72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pt-PT/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/pt-PT/thunderbird-102.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "37fb096c984cd78174def41da70d0c352536b1780a817731759f35ac3554e330"; + sha256 = "b0f99ef79a979e45764a59f5ba75a52bffd750586c18caccf44aa5e36c7a90d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/rm/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/rm/thunderbird-102.8.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "b72355afb5333ef44336d4686141a44b4f291edf110c75168070959380bbac58"; + sha256 = "90225e33183ed0bae5e2dbe47c072f703dce5a1673e3b5f0c25acba0ea611af2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ro/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ro/thunderbird-102.8.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "8536fa781ea743fce1379137da66394ce1f79ccce4daf4f9d5e2c28432c94466"; + sha256 = "ca68f9b3fdd149067998240e42ce6d64066b32a4d3455b079e0847ed225d13e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ru/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/ru/thunderbird-102.8.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "69b0d192d7cb04aedff4f356e9520ef6ce5f8125fc2309c60a1e6073dee64cc3"; + sha256 = "880109a31e6d0fa7a66465a1b480e08311438193bb256a0c6d97dcf3788ecf9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/sk/thunderbird-102.8.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0a1c3955f1ccd027a45249b7d0d44f40fa8a47c680dcd0411d04cf8dacfacad2"; + sha256 = "f30784a7b41c4e1d08331f366f390cdacd79542841b486cb84efbc0268ba1ea9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/sl/thunderbird-102.8.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e9659cb2099dd02c1a990914383f75569b01a1f39f1f79c1dd60b24129c0986c"; + sha256 = "e94321812047fdf7015d38bb1001a7ac476e67ffc428451a3f361abe62a7bba5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sq/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/sq/thunderbird-102.8.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "080493bf33a13e2e705d8200f8b6edf4f85ba292881d71df4dd38600fee105da"; + sha256 = "0debbcc0772c8184ceb4b3dd8658a7808f1ac0e7c1b3b83b0229a4283c345223"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/sr/thunderbird-102.8.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "dd1efccc8bfba45aef4e25d872652b39a05de669e57aa30827b09574968f4ab7"; + sha256 = "db48cc5e315519b65cd36b67ed9652397a050fccbebf68e608f5ab64cea4300f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sv-SE/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/sv-SE/thunderbird-102.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f04fee4bbcdcf35c18be80c3a0d5cfde8cd3c918854c254f775272a3a005e2e6"; + sha256 = "cbe5fc9e42a824c8bcc78d1dc20d519b7db4f380a3a897b98f8ef8cfad57cc41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/th/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/th/thunderbird-102.8.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "841d28387ddcc3fdbaec217a8bc987bbed43a735b1d0ffe2eeb8b6fa58458f47"; + sha256 = "0f72fb98688da2dd9b457b747504d7b937d4f8680192ac13e08220f6fb52a48c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/tr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/tr/thunderbird-102.8.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e4d793ff7e738389aabc7ec9d6893e2e4162e63996c36341f64af570b26f5f6a"; + sha256 = "3ac2b0a3e8d65a2101a8a599a349d03250afe343ed82cd81b94f481edc3a5e04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/uk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/uk/thunderbird-102.8.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "03fecaf497d2a4188474e4ee6a0fcf084a32d0903fa041cbe39eab29421f7276"; + sha256 = "30d6b00ddc305022e4dd9a6fe759be5d34df1968108b6ce9165ea3d14bc31dd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/uz/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/uz/thunderbird-102.8.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d463b9108838a61c153ae4a8fc69fb805881589b441206c08e583289ef18c314"; + sha256 = "946be925d11a5721d8c875ffed36f33d51ce46d2797899c0c385c4816cca38d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/vi/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/vi/thunderbird-102.8.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "8f7cb20aa60e27c1b776ea03842f38629044b6ee1c3c49df172c774cc387f409"; + sha256 = "ad260c10d05b5656ff86e24b2ea5df7110840954b84caf388c1af8d55c38ebdc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/zh-CN/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/zh-CN/thunderbird-102.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "90d52ae6329d04ddfa8f37d5f54f98ee0893ece5a7c73c550fbea568538c7485"; + sha256 = "20321d57e7ed909cf6ebdf9e349b6fbd91fb3d3ce4a4b6ba42d28693c3454644"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/zh-TW/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.8.0/linux-i686/zh-TW/thunderbird-102.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "35b625402841a21a128eaf7c92ff277c996d6ff07f269fdf92f0d6cb3e04876c"; + sha256 = "4cab4bd41dc1424f442b141546b0d9b0122afd21fdf0decbee9b6151522bb48a"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 49985ac7bdb25..2b3678de27266 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.6.1"; + version = "102.8.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "06ea2fce76c08609d638435869fddc1c4d7f4b748951ebfb2476b4dba9f1f76d3de2c11e5f62540f297a5d30bb0fc637852d8e57f4fadc2c905f299757949d83"; + sha512 = "2431eb8799184b261609c96bed3c9368bec9035a831aa5f744fa89e48aedb130385b268dd90f03bbddfec449dc3e5fad1b5f8727fe9e11e1d1f123a81b97ddf8"; }; 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 a2972f9bfb961..6b5e8a254c89a 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.106.4"; + version = "3.108.12"; 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"; - sha256 = "sha256-RU2JEFtYOpxqA02YDuB/V4t/ZZ608EHGMPpwxVOzRz4="; + sha256 = "sha256-ZXQCth5nhCkEZI348057cRjzFWl/IEytQmkmBuJzw3w="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 15dc909aa6466..1bda56c542019 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, dpkg , alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, pango, nspr, nss, gtk3, mesa -, xorg, autoPatchelfHook, systemd, libnotify, libappindicator +, libGL, wayland, xorg, autoPatchelfHook, systemd, libnotify, libappindicator , makeWrapper }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { unpackPhase = "dpkg-deb -x $src ."; - runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator ]; + runtimeDependencies = [ (lib.getLib systemd) libGL libnotify libappindicator wayland ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 6a705959a11e4..c9b6ac807a050 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -71,7 +71,7 @@ let ++ lib.optional (!pipewireSupport) "-D pipewire=OFF" ++ lib.optional jackSupport "-D alsa=OFF -D jackaudio=ON"; - NIX_CFLAGS_COMPILE = lib.optional speechdSupport "-I${speechd}/include/speech-dispatcher"; + env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd}/include/speech-dispatcher"; postFixup = '' wrapProgram $out/bin/mumble \ diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 4592d17d348fb..41ff2b74a0640 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -15,16 +15,12 @@ nodePackages.n8n.override { pkgs.postgresql ]; - # Patch minified source with changes from https://github.com/n8n-io/n8n/pull/5052 - preRebuild = '' - patch -p1 -i ${./fix-permissions.diff} - '' + # Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64. # This can supposedly be fixed by building a custom copy of the module from source, but that's way # too much complexity for a setup no one would ever actually run. # # NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch. - lib.optionalString stdenv.isAarch64 '' + preRebuild = lib.optionalString stdenv.isAarch64 '' rm -rf node_modules/oracledb ''; diff --git a/pkgs/applications/networking/n8n/fix-permissions.diff b/pkgs/applications/networking/n8n/fix-permissions.diff deleted file mode 100644 index 81a5a4ee6465d..0000000000000 --- a/pkgs/applications/networking/n8n/fix-permissions.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- a/dist/LoadNodesAndCredentials.js -+++ b/dist/LoadNodesAndCredentials.js -@@ -216,6 +216,7 @@ - const { types } = loader; - this.types.nodes = this.types.nodes.concat(types.nodes); - this.types.credentials = this.types.credentials.concat(types.credentials); -+ let seen = new Set(); - const iconPromises = Object.entries(types).flatMap(([typeName, typesArr]) => typesArr.map((type) => { - var _a; - if (!((_a = type.icon) === null || _a === void 0 ? void 0 : _a.startsWith('file:'))) -@@ -226,7 +227,16 @@ - type.iconUrl = iconUrl; - const source = path_1.default.join(dir, icon); - const destination = path_1.default.join(constants_1.GENERATED_STATIC_DIR, iconUrl); -- return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => (0, promises_1.copyFile)(source, destination)); -+ if (!seen.has(destination)) { -+ seen.add(destination); -+ return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => { -+ await (0, promises_1.copyFile)(source, destination); -+ await (0, promises_1.chmod)(destination, 0o644); -+ }); -+ } -+ else { -+ return Promise.resolve(); -+ } - })); - await Promise.all(iconPromises); - for (const nodeTypeName in loader.nodeTypes) { diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 0e9f619b1ffe2..0b08453a96254 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -40,13 +40,13 @@ let sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ=="; }; }; - "@azure/core-client-1.7.0" = { + "@azure/core-client-1.7.1" = { name = "_at_azure_slash_core-client"; packageName = "@azure/core-client"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.0.tgz"; - sha512 = "fgaLVlF3xGg8JAt7Hl7vkKIJcCAA9NpsvIvb44qaEOW6CaJ+IaHKL7oWe5+oGOVR+y/z2Gd2joyvslqwDvRfTw=="; + url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.1.tgz"; + sha512 = "85igXpc5V7ns6rvMEpLmIcBDftjUgTWD+0tmYPyQEfPfkAwpPTs1X5rhCDsfqvUZGA8Ksid1hdZGu62r6XXeHg=="; }; }; "@azure/core-http-2.3.1" = { @@ -67,22 +67,22 @@ let sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; }; }; - "@azure/core-lro-2.5.0" = { + "@azure/core-lro-2.5.1" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz"; - sha512 = "Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.1.tgz"; + sha512 = "JHQy/bA3NOz2WuzOi5zEk6n/TJdAropupxUT521JIJvW7EXV2YN2SFYZrf/2RHeD28QAClGdynYadZsbmP+nyQ=="; }; }; - "@azure/core-paging-1.4.0" = { + "@azure/core-paging-1.5.0" = { name = "_at_azure_slash_core-paging"; packageName = "@azure/core-paging"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.4.0.tgz"; - sha512 = "tabFtZTg8D9XqZKEfNUOGh63SuYeOxmvH4GDcOJN+R1bZWZ1FZskctgY9Pmuwzhn+0Xvq9rmimK9hsvtLkeBsw=="; + url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.5.0.tgz"; + sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; "@azure/core-rest-pipeline-1.10.1" = { @@ -193,13 +193,22 @@ let sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; }; }; - "@azure/msal-browser-2.32.2" = { + "@azure/msal-browser-2.33.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.32.2"; + version = "2.33.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.33.0.tgz"; + sha512 = "c7CVh1tfUfxiWkEIhoIb11hL4PGo4hz0M+gMy34ATagAKdLK7qyEu/5AXJWAf5lz5eE+vQhm7+LKiuETrcXXGw=="; + }; + }; + "@azure/msal-common-10.0.0" = { + name = "_at_azure_slash_msal-common"; + packageName = "@azure/msal-common"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz"; - sha512 = "1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-10.0.0.tgz"; + sha512 = "/LghpT93jsZLy55QzTsRZWMx6R1Mjc1Aktwps8sKSGE3WbrGwbSsh2uhDlpl6FMcKChYjJ0ochThWwwOodrQNg=="; }; }; "@azure/msal-common-4.5.1" = { @@ -220,15 +229,6 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-common-9.1.1" = { - name = "_at_azure_slash_msal-common"; - packageName = "@azure/msal-common"; - version = "9.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.1.1.tgz"; - sha512 = "we9xR8lvu47fF0h+J8KyXoRy9+G/fPzm3QEa2TrdR3jaVS3LKAyE2qyMuUkNdbVkvzl8Zr9f7l+IUSP22HeqXw=="; - }; - }; "@azure/msal-node-1.0.0-beta.6" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; @@ -238,13 +238,13 @@ let sha512 = "ZQI11Uz1j0HJohb9JZLRD8z0moVcPks1AFW4Q/Gcl67+QvH4aKEJti7fjCcipEEZYb/qzLSO8U6IZgPYytsiJQ=="; }; }; - "@azure/msal-node-1.14.6" = { + "@azure/msal-node-1.15.0" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.6"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz"; - sha512 = "em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.15.0.tgz"; + sha512 = "fwC5M0c8pxOAzmScPbpx7j28YVTDebUaizlVF7bR0xvlU0r3VWW5OobCcr9ybqKS6wGyO7u4EhXJS9rjRWAuwA=="; }; }; "@azure/storage-blob-12.12.0" = { @@ -256,13 +256,13 @@ let sha512 = "o/Mf6lkyYG/eBW4/hXB9864RxVNmAkcKHjsGR6Inlp5hupa3exjSyH2KjO3tLO//YGA+tS+17hM2bxRl9Sn16g=="; }; }; - "@babel/parser-7.20.13" = { + "@babel/parser-7.20.15" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.13"; + version = "7.20.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.13.tgz"; - sha512 = "gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz"; + sha512 = "DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg=="; }; }; "@babel/runtime-7.20.13" = { @@ -292,22 +292,31 @@ let sha512 = "+00smmZBradoGFEkRjliN7BjqPh/Hx0KCHWOEibUmflUqZz2RwBTU0MrVovEEHozhx3AUSGcO/rl3/5f9e9Biw=="; }; }; - "@codemirror/lang-javascript-6.1.2" = { + "@codemirror/lang-css-6.0.2" = { + name = "_at_codemirror_slash_lang-css"; + packageName = "@codemirror/lang-css"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.2.tgz"; + sha512 = "4V4zmUOl2Glx0GWw0HiO1oGD4zvMlIQ3zx5hXOE6ipCjhohig2bhWRAasrZylH9pRNTcl1VMa59Lsl8lZWlTzw=="; + }; + }; + "@codemirror/lang-javascript-6.1.3" = { name = "_at_codemirror_slash_lang-javascript"; packageName = "@codemirror/lang-javascript"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.2.tgz"; - sha512 = "OcwLfZXdQ1OHrLiIcKCn7MqZ7nx205CMKlhe+vL88pe2ymhT9+2P+QhwkYGxMICj8TDHyp8HFKVwpiisUT7iEQ=="; + url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.3.tgz"; + sha512 = "u3JgK9AwfNpyGwRhtzIVxVfH9yOK5ZNswmaN6W+XFuUXzW9o8CGgnSBEcaUgZ0hdLvHQHyM+3+22HKgbItki/w=="; }; }; - "@codemirror/language-6.4.0" = { + "@codemirror/language-6.5.0" = { name = "_at_codemirror_slash_language"; packageName = "@codemirror/language"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/language/-/language-6.4.0.tgz"; - sha512 = "Wzb7GnNj8vnEtbPWiOy9H0m1fBtE28kepQNGLXekU2EEZv43BF865VKITUn+NoV8OpW6gRtvm29YEhqm46927Q=="; + url = "https://registry.npmjs.org/@codemirror/language/-/language-6.5.0.tgz"; + sha512 = "dI+dV/u2klIt0Y9kE3TH9vuBidAB3xuuDPofwzvnW8ZKqJnKTbT3EjyV7DeKcmrRgXMhlPTL7AdH1V5KOCYuHQ=="; }; }; "@codemirror/lint-6.1.0" = { @@ -328,13 +337,13 @@ let sha512 = "69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="; }; }; - "@codemirror/view-6.7.3" = { + "@codemirror/view-6.8.1" = { name = "_at_codemirror_slash_view"; packageName = "@codemirror/view"; - version = "6.7.3"; + version = "6.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/view/-/view-6.7.3.tgz"; - sha512 = "Lt+4POnhXrZFfHOdPzXEHxrzwdy7cjqYlMkOWvoFGi6/bAsjzlFfr0NY3B15B/PGx+cDFgM1hlc12wvYeZbGLw=="; + url = "https://registry.npmjs.org/@codemirror/view/-/view-6.8.1.tgz"; + sha512 = "bXWs42i1mnBexaktPABaEpYbt4FbJMnlesObDLF0GE8poRiNaRgm7H/2NfXfD5Swas1ULdFgONLLs4ncwHuz8g=="; }; }; "@colors/colors-1.5.0" = { @@ -409,13 +418,13 @@ let sha512 = "CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w=="; }; }; - "@fortawesome/fontawesome-common-types-6.2.1" = { + "@fortawesome/fontawesome-common-types-6.3.0" = { name = "_at_fortawesome_slash_fontawesome-common-types"; packageName = "@fortawesome/fontawesome-common-types"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz"; - sha512 = "Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz"; + sha512 = "4BC1NMoacEBzSXRwKjZ/X/gmnbp/HU5Qqat7E8xqorUtBFZS+bwfGH5/wqOC2K6GV0rgEobp3OjGRMa5fK9pFg=="; }; }; "@fortawesome/fontawesome-svg-core-1.3.0" = { @@ -427,13 +436,13 @@ let sha512 = "UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg=="; }; }; - "@fortawesome/free-regular-svg-icons-6.2.1" = { + "@fortawesome/free-regular-svg-icons-6.3.0" = { name = "_at_fortawesome_slash_free-regular-svg-icons"; packageName = "@fortawesome/free-regular-svg-icons"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.1.tgz"; - sha512 = "wiqcNDNom75x+pe88FclpKz7aOSqS2lOivZeicMV5KRwOAeypxEYWAK/0v+7r+LrEY30+qzh8r2XDaEHvoLsMA=="; + url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.3.0.tgz"; + sha512 = "cZnwiVHZ51SVzWHOaNCIA+u9wevZjCuAGSvSYpNlm6A4H4Vhwh8481Bf/5rwheIC3fFKlgXxLKaw8Xeroz8Ntg=="; }; }; "@fortawesome/free-solid-svg-icons-5.15.4" = { @@ -607,6 +616,51 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; + "@jsplumb/browser-ui-5.13.2" = { + name = "_at_jsplumb_slash_browser-ui"; + packageName = "@jsplumb/browser-ui"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/browser-ui/-/browser-ui-5.13.2.tgz"; + sha512 = "BZ76kPtxESMIdhcCtWXPdICMudJyBVzDxaKY4jlne93Zq1T2ErfpNQ3E6f3JZfvoyvlNbKgh0udYkZ7Yg7BmIQ=="; + }; + }; + "@jsplumb/common-5.13.2" = { + name = "_at_jsplumb_slash_common"; + packageName = "@jsplumb/common"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/common/-/common-5.13.2.tgz"; + sha512 = "ZX/EvvYi4HBkRVtsuSSAa/AuAz4p2wr3RrRz6l+r8yeElzX3lrrBx/fkERY2qwZPkKcOoLCr5ezZ7sslVMnl0Q=="; + }; + }; + "@jsplumb/connector-bezier-5.13.2" = { + name = "_at_jsplumb_slash_connector-bezier"; + packageName = "@jsplumb/connector-bezier"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/connector-bezier/-/connector-bezier-5.13.2.tgz"; + sha512 = "AALmOvkiP3ouGag6TGkBcd7SbCewPNwsKu9gku9AZqIq+fFu321zJ2IpfoyCFgkoFFSQjJ9jo1sWBbD3gnEXrg=="; + }; + }; + "@jsplumb/core-5.13.2" = { + name = "_at_jsplumb_slash_core"; + packageName = "@jsplumb/core"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/core/-/core-5.13.2.tgz"; + sha512 = "IODXQzhpq9QEzGKhPir6+ea8m4KeU3gzJsYjIu8oqSQ4jDhvEYF7TvSfeaNgy9sUAMt3OoKCqxCS4ga9J7LS5A=="; + }; + }; + "@jsplumb/util-5.13.2" = { + name = "_at_jsplumb_slash_util"; + packageName = "@jsplumb/util"; + version = "5.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsplumb/util/-/util-5.13.2.tgz"; + sha512 = "POrqlZMOo821oa49Xbxb+pNmnxu0z2oS7FOeklRxKuYXR+7nsP0j9PpXjo8E8Ily4TaP+pdUnatb53vAaONO3g=="; + }; + }; "@kafkajs/confluent-schema-registry-1.0.6" = { name = "_at_kafkajs_slash_confluent-schema-registry"; packageName = "@kafkajs/confluent-schema-registry"; @@ -643,6 +697,15 @@ let sha512 = "SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng=="; }; }; + "@lezer/css-1.1.1" = { + name = "_at_lezer_slash_css"; + packageName = "@lezer/css"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lezer/css/-/css-1.1.1.tgz"; + sha512 = "mSjx+unLLapEqdOYDejnGBokB5+AiJKZVclmud0MKQOKx3DLJ5b5VTCstgDDknR6iIV4gVrN6euzsCnj0A2gQA=="; + }; + }; "@lezer/highlight-1.1.3" = { name = "_at_lezer_slash_highlight"; packageName = "@lezer/highlight"; @@ -652,6 +715,15 @@ let sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw=="; }; }; + "@lezer/html-1.3.1" = { + name = "_at_lezer_slash_html"; + packageName = "@lezer/html"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.1.tgz"; + sha512 = "mxmArW0psdJ3Vd3bZvCbrFpd7gNJgTjqTLhFZfTPo3jsw0STaQ68EWVWBQInv9W8j94XKaL2sbO3qixicFMnYw=="; + }; + }; "@lezer/javascript-1.4.1" = { name = "_at_lezer_slash_javascript"; packageName = "@lezer/javascript"; @@ -661,13 +733,13 @@ let sha512 = "Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA=="; }; }; - "@lezer/lr-1.3.1" = { + "@lezer/lr-1.3.3" = { name = "_at_lezer_slash_lr"; packageName = "@lezer/lr"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.1.tgz"; - sha512 = "+GymJB/+3gThkk2zHwseaJTI5oa4AuOuj1I2LCslAVq1dFZLSX8SAe4ZlJq1TjezteDXtF/+d4qeWz9JvnrG9Q=="; + url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz"; + sha512 = "JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w=="; }; }; "@mapbox/node-pre-gyp-1.0.10" = { @@ -742,13 +814,13 @@ let sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; - "@oclif/command-1.8.21" = { + "@oclif/command-1.8.22" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.8.21"; + version = "1.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.21.tgz"; - sha512 = "kIDrRIbAcicVl+CWMzXeZkg5dRNuF1VI7koyFTAQMNYwRNZpeya5x7XDPr+fh7rDiBL7psnxc3B1+zoOWj96lQ=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.22.tgz"; + sha512 = "lystv7IKsWRmCv6K68jSvHrO/DILUPBDb5GZ3absTA5XTnNXTaMrcwVzTcMPfTf+gCrgIaPPD1bmbRStwfQxFw=="; }; }; "@oclif/config-1.18.6" = { @@ -760,6 +832,15 @@ let sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA=="; }; }; + "@oclif/config-1.18.8" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.18.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.8.tgz"; + sha512 = "FetS52+emaZQui0roFSdbBP8ddBkIezEoH2NcjLJRjqkMGdE9Z1V+jsISVqTYXk2KJ1gAI0CHDXFjJlNBYbJBg=="; + }; + }; "@oclif/core-1.26.1" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; @@ -796,13 +877,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.9" = { + "@oclif/parser-3.8.10" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.9"; + version = "3.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.9.tgz"; - sha512 = "1j/kThdse7yHQz6+c3v8RA1I3gD6+SGt2O7IAb/MAMoxqyBrFQDabQHH2UU4eVFGMLN7U91AiYJp11zJ9LcQAg=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.10.tgz"; + sha512 = "J4l/NcnfbIU84+NNdy6bxq9yJt4joFWNvpk59hq+uaQPUNtjmNJDVGuRvf6GUOxHNgRsVK1JRmd/Ez+v7Z9GqQ=="; }; }; "@oclif/screen-3.0.4" = { @@ -949,49 +1030,49 @@ let sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA=="; }; }; - "@sentry/core-7.33.0" = { + "@sentry/core-7.37.1" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.33.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.33.0.tgz"; - sha512 = "mrSgUnXjxHVi0cVea1lv7gC/Y66ya2a3atCHaPEij/+l+3APg5d0Ixt1zMx5YllMiZKf6wpxlZ0uwXcqdAAw+w=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz"; + sha512 = "eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ=="; }; }; - "@sentry/integrations-7.33.0" = { + "@sentry/integrations-7.37.1" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.33.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.33.0.tgz"; - sha512 = "r67/9R+DaOZETg7gRvOuYPo5XQdzEaE8f7OaET071dUP0kyUBjO74Y7SZxZV/xjBthMXexw5TANHmLVrZQQVag=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.37.1.tgz"; + sha512 = "/7VZXw7/DxZPsGNEaU/gcKRNPtmK75mz9oM71C5UbRDDEdFSEeVq2jG+tOq2lIsd2VQlsAmN3DG5yqiGA9C4eQ=="; }; }; - "@sentry/node-7.33.0" = { + "@sentry/node-7.37.1" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.33.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.33.0.tgz"; - sha512 = "isQVF9LLSG4EZLHiSJ3chgK6f3ZBdGxm8fX6YGm8HWz07CubJddes3yBPLPRNXrRLd7X3SK8pPcK5oc3LIKqAw=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.37.1.tgz"; + sha512 = "nGerngIo5JwinJgl7m0SaL/xI+YRBlhb53gbkuLSAAcnoitBFzbp7LjywsqYFTWuWDIyk7O2t124GNxtolBAgA=="; }; }; - "@sentry/types-7.33.0" = { + "@sentry/types-7.37.1" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.33.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.33.0.tgz"; - sha512 = "5kkmYjtBWSbPxfYGiXdZFPS6xpFBNlXvDqeX4NpCFXz6/LiEDn6tZ61kuCSFb8MZlyqyCX5WsP3aiI2FJfpGIA=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz"; + sha512 = "c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug=="; }; }; - "@sentry/utils-7.33.0" = { + "@sentry/utils-7.37.1" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.33.0"; + version = "7.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.33.0.tgz"; - sha512 = "msp02GV1gOfaN5FjKjWxI00rtbYLXEE5cTGldhs/Dt9KI63dDk1nwPDkSLhg6joqRItAq0thlBh6un717HdWbg=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz"; + sha512 = "/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA=="; }; }; "@servie/events-1.0.0" = { @@ -1012,22 +1093,22 @@ let sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; - "@swc/core-1.3.28" = { + "@swc/core-1.3.35" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.28"; + version = "1.3.35"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.28.tgz"; - sha512 = "yzc61HbAIjHeOYTUW/IgXAywlSviMFymnUiLY7dNUELGHjMVxSp0XnIlPQN4v5UekYbwLEV8+KChaoQRACiQCw=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.35.tgz"; + sha512 = "KmiBin0XSVzJhzX19zTiCqmLslZ40Cl7zqskJcTDeIrRhfgKdiAsxzYUanJgMJIRjYtl9Kcg1V/Ip2o2wL8v3w=="; }; }; - "@swc/wasm-1.3.28" = { + "@swc/wasm-1.3.35" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.28"; + version = "1.3.35"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.28.tgz"; - sha512 = "6RDkQHSi6FxaoPmGnzMq5smYxXlcEec+t6EHrv8rk4emIrnsFjSc2D2PQ0K4xoryJn2NVD3cDbAEVHe6XZX5AQ=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.35.tgz"; + sha512 = "8xBOgl9eziAuqF4HYwYx4Kh6eHfOQECvO0ZMlrFNW0jgE+ntqxcRjBhuzZ6iWb24nifzXbuGLQntbns4IJYJgQ=="; }; }; "@techteamer/ocsp-1.0.0" = { @@ -1111,6 +1192,15 @@ let sha512 = "yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ=="; }; }; + "@types/asn1-0.2.0" = { + name = "_at_types_slash_asn1"; + packageName = "@types/asn1"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/asn1/-/asn1-0.2.0.tgz"; + sha512 = "5TMxIpYbIA9c1J0hYQjQDX3wr+rTgQEAXaW2BI8ECM8FO53wSW4HFZplTalrKSHuZUc76NtXcePRhwuOHqGD5g=="; + }; + }; "@types/big.js-6.1.6" = { name = "_at_types_slash_big.js"; packageName = "@types/big.js"; @@ -1156,22 +1246,13 @@ let sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; }; }; - "@types/express-4.17.16" = { + "@types/express-4.17.17" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.16"; + version = "4.17.17"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.16.tgz"; - sha512 = "LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA=="; - }; - }; - "@types/express-jwt-0.0.42" = { - name = "_at_types_slash_express-jwt"; - packageName = "@types/express-jwt"; - version = "0.0.42"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-jwt/-/express-jwt-0.0.42.tgz"; - sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"; + sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; }; }; "@types/express-serve-static-core-4.17.33" = { @@ -1183,15 +1264,6 @@ let sha512 = "TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA=="; }; }; - "@types/express-unless-2.0.1" = { - name = "_at_types_slash_express-unless"; - packageName = "@types/express-unless"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-unless/-/express-unless-2.0.1.tgz"; - sha512 = "PJLiNw03EjkWDkQbhNjIXXDLObC3eMQhFASDV+WakFbT8eL7YdjlbV6MXd3Av5Lejq499d6pFuV1jyK+EHyG3Q=="; - }; - }; "@types/js-nacl-1.3.1" = { name = "_at_types_slash_js-nacl"; packageName = "@types/js-nacl"; @@ -1210,6 +1282,15 @@ let sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; }; }; + "@types/jsonwebtoken-9.0.1" = { + name = "_at_types_slash_jsonwebtoken"; + packageName = "@types/jsonwebtoken"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz"; + sha512 = "c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw=="; + }; + }; "@types/lodash-4.14.191" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; @@ -1246,13 +1327,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.11.18" = { + "@types/node-18.13.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.18"; + version = "18.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"; - sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz"; + sha512 = "gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg=="; }; }; "@types/node-fetch-2.6.2" = { @@ -1327,6 +1408,15 @@ let sha512 = "7axfYN8SW9pWg78NgenHasSproWQee5rzyPVLC9HpaQSDgNArsnKJD88EaMfi4Pl48AyciO3agYCFqpHS1gLpg=="; }; }; + "@types/triple-beam-1.3.2" = { + name = "_at_types_slash_triple-beam"; + packageName = "@types/triple-beam"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.2.tgz"; + sha512 = "txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g=="; + }; + }; "@types/tunnel-0.0.3" = { name = "_at_types_slash_tunnel"; packageName = "@types/tunnel"; @@ -1336,13 +1426,22 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; - "@types/validator-13.7.11" = { + "@types/uuid-9.0.0" = { + name = "_at_types_slash_uuid"; + packageName = "@types/uuid"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.0.tgz"; + sha512 = "kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q=="; + }; + }; + "@types/validator-13.7.12" = { name = "_at_types_slash_validator"; packageName = "@types/validator"; - version = "13.7.11"; + version = "13.7.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.11.tgz"; - sha512 = "WqTos+CnAKN64YwyBMhgUYhb5VsTNKwUY6AuzG5qu9/pFZJar/RJFMZBXwX7VS+uzYi+lIAr3WkvuWqEI9F2eg=="; + url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.12.tgz"; + sha512 = "YVtyAPqpefU+Mm/qqnOANW6IkqKpCSrarcyV269C8MA8Ux0dbkEuQwM/4CjL47kVEM2LgBef/ETfkH+c6+moFA=="; }; }; "@types/webidl-conversions-7.0.0" = { @@ -1867,13 +1966,13 @@ let sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ=="; }; }; - "aws-sdk-2.1301.0" = { + "aws-sdk-2.1313.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1301.0"; + version = "2.1313.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1301.0.tgz"; - sha512 = "AxCt0GfWV14AWC0yvN3+WEBr45JMu2X3FHb8r3H8EhZjJfHk3hWcDwu6vS5Qd8NFDATlFdWJfyQjPVU1YuaDfw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1313.0.tgz"; + sha512 = "8GMdtV2Uch3HL2c6+P3lNZFTcg/fqq9L3EWYRLb6ljCZvWKTssjdkjSJFDyTReNgeiKV224YRPYQbKpOEz4flQ=="; }; }; "aws-sign2-0.7.0" = { @@ -1993,13 +2092,13 @@ let sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; }; }; - "better-sqlite3-8.0.1" = { + "better-sqlite3-8.1.0" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.0.1.tgz"; - sha512 = "JhTZjpyapA1icCEjIZB4TSSgkGdFgpWZA2Wszg7Cf4JwJwKQmbvuNnJBeR+EYG/Z29OXvR4G//Rbg31BW/Z7Yg=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.1.0.tgz"; + sha512 = "p1m09H+Oi8R9TPj810pdNswMFuVgRNgCJEWypp6jlkOgSwMIrNyuj3hW78xEuBRGok5RzeaUW8aBtTWF3l/TQA=="; }; }; "big-integer-1.6.51" = { @@ -2281,13 +2380,13 @@ let sha512 = "MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg=="; }; }; - "bull-4.10.2" = { + "bull-4.10.4" = { name = "bull"; packageName = "bull"; - version = "4.10.2"; + version = "4.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/bull/-/bull-4.10.2.tgz"; - sha512 = "xa65xtWjQsLqYU/eNaXxq9VRG8xd6qNsQEjR7yjYuae05xKrzbVMVj2QgrYsTMmSs/vsqJjHqHSRRiW1+IkGXQ=="; + url = "https://registry.npmjs.org/bull/-/bull-4.10.4.tgz"; + sha512 = "o9m/7HjS/Or3vqRd59evBlWCXd9Lp+ALppKseoSKHaykK46SmRjAilX98PgmOz1yeVaurt8D5UtvEt4bUjM3eA=="; }; }; "busboy-1.6.0" = { @@ -2632,13 +2731,22 @@ let sha512 = "RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA=="; }; }; - "codemirror-lang-n8n-expression-0.1.0" = { + "codemirror-lang-html-n8n-1.0.0" = { + name = "codemirror-lang-html-n8n"; + packageName = "codemirror-lang-html-n8n"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codemirror-lang-html-n8n/-/codemirror-lang-html-n8n-1.0.0.tgz"; + sha512 = "ofNP6VTDGJ5rue+kTCZlDZdF1PnE0sl2cAkfrsCAd5MlBgDmqTwuFJIkTI6KXOJXs0ucdTYH6QLhy9BSW7EaOQ=="; + }; + }; + "codemirror-lang-n8n-expression-0.2.0" = { name = "codemirror-lang-n8n-expression"; packageName = "codemirror-lang-n8n-expression"; - version = "0.1.0"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemirror-lang-n8n-expression/-/codemirror-lang-n8n-expression-0.1.0.tgz"; - sha512 = "20ss5p0koTu5bfivr1sBHYs7cpjWT2JhVB5gn7TX9WWPt+v/9p9tEcYSOyL/sm+OFuWh698Cgnmrba4efQnMCQ=="; + url = "https://registry.npmjs.org/codemirror-lang-n8n-expression/-/codemirror-lang-n8n-expression-0.2.0.tgz"; + sha512 = "kdlpzevdCpWcpbNcwES9YZy+rDFwWOdO6Z78SWxT6jMhCPmdHQmO+gJ39aXAXlUI7OGLfOBtg1/ONxPjRpEIYQ=="; }; }; "codepage-1.15.0" = { @@ -2875,13 +2983,13 @@ let sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; }; - "content-type-1.0.4" = { + "content-type-1.0.5" = { name = "content-type"; packageName = "content-type"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"; + sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="; }; }; "convict-6.2.4" = { @@ -3307,13 +3415,13 @@ let sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; }; }; - "deepmerge-4.2.2" = { + "deepmerge-4.3.0" = { name = "deepmerge"; packageName = "deepmerge"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; - sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz"; + sha512 = "z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og=="; }; }; "default-user-agent-1.0.0" = { @@ -3334,13 +3442,13 @@ let sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; }; }; - "define-properties-1.1.4" = { + "define-properties-1.2.0" = { name = "define-properties"; packageName = "define-properties"; - version = "1.1.4"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz"; + sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; }; }; "degenerator-3.0.2" = { @@ -3703,15 +3811,6 @@ let sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; }; }; - "entities-2.2.0" = { - name = "entities"; - packageName = "entities"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; - sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; - }; - }; "entities-4.4.0" = { name = "entities"; packageName = "entities"; @@ -3991,6 +4090,15 @@ let sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; }; }; + "express-async-errors-3.1.1" = { + name = "express-async-errors"; + packageName = "express-async-errors"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-async-errors/-/express-async-errors-3.1.1.tgz"; + sha512 = "h6aK1da4tpqWSbyCa3FxB/V6Ehd4EEB15zyQq9qe75OZBp0krinNKuH4rAY+S/U/2I36vdLAUFSjQJ+TFmODng=="; + }; + }; "express-openapi-validator-4.13.8" = { name = "express-openapi-validator"; packageName = "express-openapi-validator"; @@ -4009,15 +4117,6 @@ let sha512 = "tZh2P2p5a8/yxQ5VbRav011Poa4R0mHqdFwn9Swe/obXDe5F0jY9wtRAfNYnqk4LXY7akyvR/nrvAHxQPWUjsQ=="; }; }; - "express-unless-2.1.3" = { - name = "express-unless"; - packageName = "express-unless"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/express-unless/-/express-unless-2.1.3.tgz"; - sha512 = "wj4tLMyCVYuIIKHGt0FhCtIViBcwzWejX0EjNxveAa6dG+0XBCQhMbx+PnkLkFCxLC69qoFrxds4pIyL88inaQ=="; - }; - }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -4576,6 +4675,15 @@ let sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; }; }; + "glob-8.1.0" = { + name = "glob"; + packageName = "glob"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"; + sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; + }; + }; "glob-parent-3.1.0" = { name = "glob-parent"; packageName = "glob-parent"; @@ -4891,13 +4999,13 @@ let sha512 = "4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA=="; }; }; - "http-cache-semantics-4.1.0" = { + "http-cache-semantics-4.1.1" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; }; }; "http-errors-2.0.0" = { @@ -4945,6 +5053,15 @@ let sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; + "humanize-duration-3.28.0" = { + name = "humanize-duration"; + packageName = "humanize-duration"; + version = "3.28.0"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.28.0.tgz"; + sha512 = "jMAxraOOmHuPbffLVDKkEKi/NeG8dMqP8lGRd6Tbf7JgAeG33jjgPWDbXXU7ypCI0o+oNKJFgbSB9FKVdWNI2A=="; + }; + }; "humanize-ms-1.2.1" = { name = "humanize-ms"; packageName = "humanize-ms"; @@ -4981,13 +5098,13 @@ let sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; }; - "ics-2.41.0" = { + "ics-2.44.0" = { name = "ics"; packageName = "ics"; - version = "2.41.0"; + version = "2.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/ics/-/ics-2.41.0.tgz"; - sha512 = "6oleMfOpdBIrZGMNrTutwW7eFwua8lOkymDNxMXlsVF00HghqH+I3S6frt3a2rfjXTlkI0qiY2rnsKP2JQ9vJA=="; + url = "https://registry.npmjs.org/ics/-/ics-2.44.0.tgz"; + sha512 = "JeiPjNeWkd7Qri/wfHqjZCtglVwRJRqy1MEFKn9QzatzxUyCOsx4YARPlLkU8UnPxpg4VtEjR+VRUG+Cvj6bDg=="; }; }; "ieee754-1.1.13" = { @@ -5107,13 +5224,13 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; - "internal-slot-1.0.4" = { + "internal-slot-1.0.5" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"; - sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz"; + sha512 = "Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ=="; }; }; "interpret-1.4.0" = { @@ -5134,13 +5251,13 @@ let sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; - "ioredis-5.2.6" = { + "ioredis-5.3.1" = { name = "ioredis"; packageName = "ioredis"; - version = "5.2.6"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-5.2.6.tgz"; - sha512 = "F1xO+kYIz+TCOccvhThs2pem6sc9uTl9JsZybWpqe4FeCFDmf04XwbLQUGIqi2UWaDUuR61w2dhxx6NJEFehOA=="; + url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.1.tgz"; + sha512 = "C+IBcMysM6v52pTLItYMeV4Hz7uriGtoJdz7SSBDX6u+zwSYGirLdQh3L7t/OItWITcw3gTFMjJReYUwS4zihg=="; }; }; "ip-1.1.8" = { @@ -5638,6 +5755,15 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; + "jose-4.11.4" = { + name = "jose"; + packageName = "jose"; + version = "4.11.4"; + src = fetchurl { + url = "https://registry.npmjs.org/jose/-/jose-4.11.4.tgz"; + sha512 = "94FdcR8felat4vaTJyL/WVdtlWLlsnLMZP8v+A0Vru18K3bQ22vn7TtpVh3JlgBFNIlYOUlGqwp/MjRPOnIyCQ=="; + }; + }; "jquery-3.6.3" = { name = "jquery"; packageName = "jquery"; @@ -5647,13 +5773,13 @@ let sha512 = "bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="; }; }; - "js-base64-3.7.4" = { + "js-base64-3.7.5" = { name = "js-base64"; packageName = "js-base64"; - version = "3.7.4"; + version = "3.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.4.tgz"; - sha512 = "wpM/wi20Tl+3ifTyi0RdDckS4YTD4Lf953mBRrpG8547T7hInHNPEj8+ck4gB8VDcGyeAWFK++Wb/fU1BeavKQ=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz"; + sha512 = "3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="; }; }; "js-md4-0.3.2" = { @@ -5845,15 +5971,6 @@ let sha512 = "tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw=="; }; }; - "jsplumb-2.15.4" = { - name = "jsplumb"; - packageName = "jsplumb"; - version = "2.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/jsplumb/-/jsplumb-2.15.4.tgz"; - sha512 = "QssfhXe0YRxY4V2WHPmKwsE3bPHNj4Vts9oinys66ci+4m9lJvFDcEMDygqueiSFL8Jb8CnFyQC9fvL+YHJS7g=="; - }; - }; "jsprim-1.4.2" = { name = "jsprim"; packageName = "jsprim"; @@ -5881,13 +5998,13 @@ let sha512 = "jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA=="; }; }; - "jwks-rsa-1.12.3" = { + "jwks-rsa-3.0.1" = { name = "jwks-rsa"; packageName = "jwks-rsa"; - version = "1.12.3"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-1.12.3.tgz"; - sha512 = "cFipFDeYYaO9FhhYJcZWX/IyZgc0+g316rcHnDpT2dNRNIE/lMOmWKKqp09TkJoYlNFzrEVODsR4GgXJMgWhnA=="; + url = "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.0.1.tgz"; + sha512 = "UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw=="; }; }; "jws-3.2.2" = { @@ -5926,6 +6043,15 @@ let sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; }; + "ldapts-4.2.2" = { + name = "ldapts"; + packageName = "ldapts"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ldapts/-/ldapts-4.2.2.tgz"; + sha512 = "UHe7BtEhPUFHZZ6XHnRvLHWQrftTap3PgGU0nOLtrFeigZvfpXSsqJ8C9uXNouDV+iDHqoWwplS0eHoDu/GIEQ=="; + }; + }; "leac-0.6.0" = { name = "leac"; packageName = "leac"; @@ -5971,13 +6097,13 @@ let sha512 = "X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw=="; }; }; - "libphonenumber-js-1.10.18" = { + "libphonenumber-js-1.10.19" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.18"; + version = "1.10.19"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.18.tgz"; - sha512 = "NS4ZEgNhwbcPz1gfSXCGFnQm0xEiyTSPRthIuWytDzOiEG9xnZ2FbLyfJC4tI2BMAAXpoWbNxHYH75pa3Dq9og=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.19.tgz"; + sha512 = "MDZ1zLIkfSDZV5xBta3nuvbEOlsnKCPe4z5r3hyup/AXveevkl9A1eSWmLhd2FX4k7pJDe4MrLeQsux0HI/VWg=="; }; }; "libpq-1.8.12" = { @@ -6349,13 +6475,13 @@ let sha512 = "A9SzX4hMKWS25MyalwcOnNoplyHbkNVsjidhTp8ru0Sj23wY9GWBKS8gAIGDSAqeWjIjvE4KBEl24XXAs+v4wQ=="; }; }; - "logform-2.4.2" = { + "logform-2.5.1" = { name = "logform"; packageName = "logform"; - version = "2.4.2"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.4.2.tgz"; - sha512 = "W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw=="; + url = "https://registry.npmjs.org/logform/-/logform-2.5.1.tgz"; + sha512 = "9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg=="; }; }; "long-4.0.0" = { @@ -6430,13 +6556,13 @@ let sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; }; }; - "lru-memoizer-2.1.4" = { + "lru-memoizer-2.2.0" = { name = "lru-memoizer"; packageName = "lru-memoizer"; - version = "2.1.4"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.4.tgz"; - sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ=="; + url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.2.0.tgz"; + sha512 = "QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw=="; }; }; "lru_map-0.3.3" = { @@ -6448,24 +6574,6 @@ let sha512 = "Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ=="; }; }; - "luxon-2.3.2" = { - name = "luxon"; - packageName = "luxon"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.3.2.tgz"; - sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw=="; - }; - }; - "luxon-2.5.2" = { - name = "luxon"; - packageName = "luxon"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.5.2.tgz"; - sha512 = "Yg7/RDp4nedqmLgyH0LwgGRvMEKVzKbUdkBYyCosbHgJ+kaOUx0qzSiSatVc3DFygnirTPYnMM2P5dg2uH1WvA=="; - }; - }; "luxon-3.2.1" = { name = "luxon"; packageName = "luxon"; @@ -6547,6 +6655,15 @@ let sha512 = "TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg=="; }; }; + "markdown-it-13.0.1" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "13.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz"; + sha512 = "lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q=="; + }; + }; "markdown-it-emoji-2.0.2" = { name = "markdown-it-emoji"; packageName = "markdown-it-emoji"; @@ -6745,13 +6862,13 @@ let sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; - "minimist-1.2.7" = { + "minimist-1.2.8" = { name = "minimist"; packageName = "minimist"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"; - sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"; + sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; }; }; "minipass-3.3.6" = { @@ -6763,13 +6880,13 @@ let sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minipass-4.0.0" = { + "minipass-4.0.3" = { name = "minipass"; packageName = "minipass"; - version = "4.0.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz"; - sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-4.0.3.tgz"; + sha512 = "OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw=="; }; }; "minipass-collect-1.0.2" = { @@ -6844,6 +6961,15 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; + "mkdirp-2.1.3" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.3.tgz"; + sha512 = "sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw=="; + }; + }; "mkdirp-classic-0.5.3" = { name = "mkdirp-classic"; packageName = "mkdirp-classic"; @@ -6898,13 +7024,13 @@ let sha512 = "Psm+g3/wHXhjBEktkxXsFMZvd3nemI0r3IPsE0bU+4//PnvNWKkzhZcEsbPcYiWqe8XqXJJEg4Tgtr7Raw67Yw=="; }; }; - "mongodb-4.13.0" = { + "mongodb-4.14.0" = { name = "mongodb"; packageName = "mongodb"; - version = "4.13.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.13.0.tgz"; - sha512 = "+taZ/bV8d1pYuHL4U+gSwkhmDrwkWbH1l4aah4YpmpscMwgFBkufIKxgP/G7m87/NUuQzc2Z75ZTI7ZOyqZLbw=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.14.0.tgz"; + sha512 = "coGKkWXIBczZPr284tYKFLg+KbGPPLlSbdgfKAb6QqCFt5bo5VFZ50O3FFzsw4rnkqjwT6D8Qcoo9nshYKM7Mg=="; }; }; "mongodb-connection-string-url-2.6.0" = { @@ -6970,13 +7096,13 @@ let sha512 = "RjHwP2cCIWQ9iUIk1SziUMb9+jj5mC4OqG2w16E5yig8jySi/TwiFvKlwcjNrPsndph0HtgCtbENnk5julf3yQ=="; }; }; - "msgpackr-1.8.2" = { + "msgpackr-1.8.3" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.2.tgz"; - sha512 = "eLuPeok0DMwsGN23AvuVg32mYpx55tsQnxI87d8V1yZsdT8U5jrWhmCa1INO/joGAFQFfo/eTlM/BxVwLKbBOQ=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.3.tgz"; + sha512 = "m2JefwcKNzoHYXkH/5jzHRxAw7XLWsAdvu0FOJ+OLwwozwOV/J6UA62iLkfIMbg7G8+dIuRwgg6oz+QoQ4YkoA=="; }; }; "mssql-7.3.5" = { @@ -7033,49 +7159,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.151.2" = { + "n8n-core-0.154.1" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.151.2"; + version = "0.154.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.151.2.tgz"; - sha512 = "QIGNeKuRuY+G+kPxDShjXnxVjCMCEbZ6xB530+V30s2MFa+XnEKJtPdLbsCr0j8AUTHqEb/oMkHAoEyPPg8M1g=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.154.1.tgz"; + sha512 = "LpwNxGxGpHrA3fJNeAL7qVAKrXj88MDWuK40JVnLXGgnWjdy9M8Gpz0ucHXBRuN0HxeCpCA+59edNsDUUaBAsQ=="; }; }; - "n8n-design-system-0.51.1" = { + "n8n-design-system-0.53.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.51.1"; + version = "0.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.51.1.tgz"; - sha512 = "zK4UI/LkdRzAGZfL9K7/tZSLjxXTIKgt/72LrgEJ8CGNxYPavk0f7eYTH9Q8tbcLAaMLDjUcbcdzVEWh5YZofA=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.53.0.tgz"; + sha512 = "QTPcnNOv9sp9RzT0I4cuB2lqEmHJrv+TBV1D8mZ3upas7ZMdNVLhGiRM8EgbeQoY5jsKlTA3nagTflNQy8H/tw=="; }; }; - "n8n-editor-ui-0.178.1" = { + "n8n-editor-ui-0.181.1" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.178.1"; + version = "0.181.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.178.1.tgz"; - sha512 = "bpSRVRys6fIAuhsmxQrU2QXP0UaRfGan+wODcZbX8SnWSG90ANN7R++CvS6tfL+i8vKvDzLYFjWlm1y40Esbag=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.181.1.tgz"; + sha512 = "NmkTic2XLgAgx/sKsKd8kPDuEuj7roBXT1uLcFdlz+mnn4LN12GFFyHO6GrOJC3lYA6SY6QQZ475/EpNsMzqLw=="; }; }; - "n8n-nodes-base-0.210.1" = { + "n8n-nodes-base-0.213.1" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.210.1"; + version = "0.213.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.210.1.tgz"; - sha512 = "UvkjbmJoBtgqHMz+ff7AJYnVcRpPLY7rh0OPQSR3B6BQ7lzE9eBaBpfTvtIopxRwKeK3vke9UUb6ztdkgDaBDw=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.213.1.tgz"; + sha512 = "diU4FVseBaJ3wC/57o/snFHv19KMrWv3bxadFfpMDHYN1u6YB4L3GacpNgBE1CLPgGIptlVNhVJ4USInIIVDrw=="; }; }; - "n8n-workflow-0.133.2" = { + "n8n-workflow-0.136.1" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.133.2"; + version = "0.136.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.133.2.tgz"; - sha512 = "XnNmt5idpqb/7nVFtNCS4RQUDMfIslfepl2WJfwa/0jSQYWaJmFWhV0OmIj3mJTWaLaiy1qDjAEaEYZZBaQ69A=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.136.1.tgz"; + sha512 = "Y7v72erInEIlXGjdUzJD/Cj4qagmNx6w5jqLCb/Z/t2VHBEXrBasHAA96leiVwx9VILlaMXMK/p6PJz3NNnpNA=="; }; }; "named-placeholders-1.1.3" = { @@ -7186,13 +7312,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-abi-3.31.0" = { + "node-abi-3.33.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.31.0"; + version = "3.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz"; - sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.33.0.tgz"; + sha512 = "7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog=="; }; }; "node-abort-controller-2.0.0" = { @@ -7204,13 +7330,13 @@ let sha512 = "L8RfEgjBTHAISTuagw51PprVAqNZoG6KSB6LQ6H1bskMVkFs5E71IyjauLBv3XbuomJlguWF/VnRHdJ1gqiAqA=="; }; }; - "node-abort-controller-3.0.1" = { + "node-abort-controller-3.1.1" = { name = "node-abort-controller"; packageName = "node-abort-controller"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz"; - sha512 = "/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw=="; + url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz"; + sha512 = "AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ=="; }; }; "node-addon-api-4.3.0" = { @@ -7231,13 +7357,13 @@ let sha512 = "DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw=="; }; }; - "node-fetch-2.6.8" = { + "node-fetch-2.6.9" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.8"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz"; - sha512 = "RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz"; + sha512 = "DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg=="; }; }; "node-forge-1.3.1" = { @@ -7330,13 +7456,13 @@ let sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ=="; }; }; - "nodemailer-6.9.0" = { + "nodemailer-6.9.1" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.0.tgz"; - sha512 = "jFaCEGTeT3E/m/5R2MHWiyQH3pSARECRUDM+1hokOYc3lQAAG7ASuy+2jIsYVf+RVa9zePopSQwKNVFH8DKUpA=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.1.tgz"; + sha512 = "qHw7dOiU5UKNnQpXktdgQ1d3OFgRAekuvbJLcdG5dnEo/GtcTHRYM7+UfJARdOFU9WUQO8OiIamgWPmiSFHYAA=="; }; }; "nopt-5.0.0" = { @@ -7564,13 +7690,13 @@ let sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; }; }; - "open-8.4.0" = { + "open-8.4.1" = { name = "open"; packageName = "open"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.4.0.tgz"; - sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; + url = "https://registry.npmjs.org/open/-/open-8.4.1.tgz"; + sha512 = "/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg=="; }; }; "openapi-types-10.0.0" = { @@ -8005,6 +8131,15 @@ let sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw=="; }; }; + "pg-8.9.0" = { + name = "pg"; + packageName = "pg"; + version = "8.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz"; + sha512 = "ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg=="; + }; + }; "pg-connection-string-2.5.0" = { name = "pg-connection-string"; packageName = "pg-connection-string"; @@ -8014,13 +8149,13 @@ let sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; - "pg-cursor-2.7.4" = { + "pg-cursor-2.8.0" = { name = "pg-cursor"; packageName = "pg-cursor"; - version = "2.7.4"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.7.4.tgz"; - sha512 = "CNWwOzTTZ9QvphoOL+Wg/7pmVr9GnAWBjPbuK2FRclrB4A/WRO/ssCJ9BlkzIGmmofK2M/LyokNHgsLSn+fMHA=="; + url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.8.0.tgz"; + sha512 = "LrOaEHK+R1C40e+xeri3FTRY/VKp9uTOCVsKtGB7LJ57qbeaphYvWjbVly8AesdT1GfHXYcAnVdExKhW7DKOvA=="; }; }; "pg-int8-1.0.1" = { @@ -8068,22 +8203,22 @@ let sha512 = "BKlHCMCdNUmF6gagVbehRWSEiVcZzPVltEx14OJExR9Iz9/1R6KETDWLLGv2l6yRqYFnEZZy1VDjRhArzeIGrw=="; }; }; - "pg-protocol-1.5.0" = { + "pg-protocol-1.6.0" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz"; + sha512 = "M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="; }; }; - "pg-query-stream-4.2.4" = { + "pg-query-stream-4.3.0" = { name = "pg-query-stream"; packageName = "pg-query-stream"; - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.2.4.tgz"; - sha512 = "Et3gTrWn4C2rj4LVioNq1QDd7aH/3mSJcBm79jZALv3wopvx9bWENtbOYZbHQ6KM+IkfFxs0JF1ZLjMDJ9/N6Q=="; + url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.3.0.tgz"; + sha512 = "+Eer4Y1e43rAaphFNu9/VJKn9nKTApFKCSwVtDjXYnuO4QYqWHOEkApmGJv8gvaU5T6fcuEtjsN24gk+Rx7X9A=="; }; }; "pg-types-1.13.0" = { @@ -8131,13 +8266,13 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; - "pinia-2.0.29" = { + "pinia-2.0.30" = { name = "pinia"; packageName = "pinia"; - version = "2.0.29"; + version = "2.0.30"; src = fetchurl { - url = "https://registry.npmjs.org/pinia/-/pinia-2.0.29.tgz"; - sha512 = "5z/KpFecq/cIgfeTnulJXldiLcTITRkTe3N58RKYSj0Pc1EdR6oyCdnf5A9jLoVwBqX5LtHhd0kGlpzWvk9oiQ=="; + url = "https://registry.npmjs.org/pinia/-/pinia-2.0.30.tgz"; + sha512 = "q6DUmxWwe/mQgg+55QQjykpKC+aGeGdaJV3niminl19V08dE+LRTvSEuqi6/NLSGCKHI49KGL6tMNEOssFiMyA=="; }; }; "popsicle-12.1.0" = { @@ -8257,13 +8392,13 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; - "posthog-node-2.2.3" = { + "posthog-node-2.4.0" = { name = "posthog-node"; packageName = "posthog-node"; - version = "2.2.3"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.2.3.tgz"; - sha512 = "dYlLZhrDus+uRov/Hh+EiRlMoMhRKchNjNa7mNE2iWmKg/ryOTipf0XYKS9UKdki7aU1NzWFhnLe11HF615XuA=="; + url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.4.0.tgz"; + sha512 = "ijenljLS49AzMskyrDsmEbuPUI641I/qUEUfsVTFZYzNcmmiwWCyJu4v51DjzcH/vAda4p44CIhzL2LkROCl2Q=="; }; }; "prebuild-install-7.1.1" = { @@ -8284,6 +8419,15 @@ let sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; }; + "prettier-2.8.4" = { + name = "prettier"; + packageName = "prettier"; + version = "2.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz"; + sha512 = "vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw=="; + }; + }; "pretty-bytes-5.6.0" = { name = "pretty-bytes"; packageName = "pretty-bytes"; @@ -8419,13 +8563,13 @@ let sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; }; }; - "protobufjs-7.2.0" = { + "protobufjs-7.2.2" = { name = "protobufjs"; packageName = "protobufjs"; - version = "7.2.0"; + version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.0.tgz"; - sha512 = "hYCqTDuII4iJ4stZqiuGCSU8xxWl5JeXYpwARGtn/tWcKCAro6h3WQz+xpsNbXW0UYqpmTQFEyFWO0G0Kjt64g=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.2.tgz"; + sha512 = "++PrQIjrom+bFDPpfmqXfAGSQs40116JRrqqyf53dymUMvvb5d/LMRyicRoF1AUKoXVS1/IgJXlEgcpr4gTF3Q=="; }; }; "proxy-addr-2.0.7" = { @@ -9049,13 +9193,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-2.7.0" = { + "sanitize-html-2.7.3" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "2.7.0"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.0.tgz"; - sha512 = "jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.3.tgz"; + sha512 = "jMaHG29ak4miiJ8wgqA1849iInqORgNv7SLfSw9LtfOhEUQ1C0YHKH73R+hgyufBW9ZFeJrb057k9hjlfBCVlw=="; }; }; "sax-1.2.1" = { @@ -9355,13 +9499,13 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.17" = { + "snowflake-sdk-1.6.18" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.17"; + version = "1.6.18"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.17.tgz"; - sha512 = "ui2zRPbXIK3qaW8zuQCy+mHTieN6U5yeoJmKkyhdnh/8qKOqfR9Csj5nv+bXm8Y64kG24sybtIfCzf8C9abUMQ=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.18.tgz"; + sha512 = "QhG1aW1VLOUf4ylwPBMsQaIsKXV0Qp2/3Da5sEq6AK8pUcXnlwZ9d2wa+4+FOtMPrpdyfe8g9/tXH+BIyze3tQ=="; }; }; "socks-2.7.1" = { @@ -9634,6 +9778,15 @@ let sha512 = "KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw=="; }; }; + "stream-browserify-3.0.0" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz"; + sha512 = "H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA=="; + }; + }; "stream-events-1.0.5" = { name = "stream-events"; packageName = "stream-events"; @@ -9661,6 +9814,15 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; + "strict-event-emitter-types-2.0.0" = { + name = "strict-event-emitter-types"; + packageName = "strict-event-emitter-types"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strict-event-emitter-types/-/strict-event-emitter-types-2.0.0.tgz"; + sha512 = "Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA=="; + }; + }; "strict-uri-encode-2.0.0" = { name = "strict-uri-encode"; packageName = "strict-uri-encode"; @@ -10012,13 +10174,22 @@ let sha512 = "a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w=="; }; }; - "tinycolor2-1.5.2" = { + "tinycolor2-1.6.0" = { name = "tinycolor2"; packageName = "tinycolor2"; - version = "1.5.2"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz"; + sha512 = "XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="; + }; + }; + "title-case-3.0.3" = { + name = "title-case"; + packageName = "title-case"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.5.2.tgz"; - sha512 = "h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg=="; + url = "https://registry.npmjs.org/title-case/-/title-case-3.0.3.tgz"; + sha512 = "e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA=="; }; }; "tlds-1.236.0" = { @@ -10192,13 +10363,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.4.1" = { + "tslib-2.5.0" = { name = "tslib"; packageName = "tslib"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz"; - sha512 = "tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"; + sha512 = "336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="; }; }; "tsscmp-1.0.6" = { @@ -10282,13 +10453,13 @@ let sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; }; - "typeorm-0.3.11" = { + "typeorm-0.3.12" = { name = "typeorm"; packageName = "typeorm"; - version = "0.3.11"; + version = "0.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/typeorm/-/typeorm-0.3.11.tgz"; - sha512 = "pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg=="; + url = "https://registry.npmjs.org/typeorm/-/typeorm-0.3.12.tgz"; + sha512 = "sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA=="; }; }; "typeorm-aurora-data-api-driver-2.4.4" = { @@ -10300,13 +10471,13 @@ let sha512 = "EqrdoXr0FbUrAMmkNQQuPwlhUGM7SJnpwUlWTWNlK2mOhOUyM+33fhm1f1hz3nnJJV8fTxzS3kTDq6pkVASLAw=="; }; }; - "typescript-4.9.4" = { + "typescript-4.9.5" = { name = "typescript"; packageName = "typescript"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"; - sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"; + sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; }; }; "uc.micro-1.0.6" = { @@ -10597,6 +10768,15 @@ let sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; + "uuid-9.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"; + sha512 = "MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="; + }; + }; "v-click-outside-3.2.0" = { name = "v-click-outside"; packageName = "v-click-outside"; @@ -10642,13 +10822,13 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; - "vm2-3.9.13" = { + "vm2-3.9.14" = { name = "vm2"; packageName = "vm2"; - version = "3.9.13"; + version = "3.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz"; - sha512 = "0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.14.tgz"; + sha512 = "HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA=="; }; }; "vue-2.6.14" = { @@ -10714,6 +10894,15 @@ let sha512 = "C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA=="; }; }; + "vue-infinite-loading-2.4.5" = { + name = "vue-infinite-loading"; + packageName = "vue-infinite-loading"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-infinite-loading/-/vue-infinite-loading-2.4.5.tgz"; + sha512 = "xhq95Mxun060bRnsOoLE2Be6BR7jYwuC89kDe18+GmCLVrRA/dU0jrGb12Xu6NjmKs+iTW0AA6saSEmEW4cR7g=="; + }; + }; "vue-json-pretty-1.9.3" = { name = "vue-json-pretty"; packageName = "vue-json-pretty"; @@ -10768,6 +10957,15 @@ let sha512 = "N3FYX9Z6rZdTeP3BOBz2LMxlWo9WRmPF6SOsYzz+tEuUH0QjX8UD7c1X95J8pZ7cFvbh9QflVujYQRqRiiwoAg=="; }; }; + "vue2-boring-avatars-0.3.8" = { + name = "vue2-boring-avatars"; + packageName = "vue2-boring-avatars"; + version = "0.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vue2-boring-avatars/-/vue2-boring-avatars-0.3.8.tgz"; + sha512 = "8vNN+zhCIiIMnSQDu0DwhJ11e9r3t4t12dromXmXDtRryBhV58NPn4XgMb4JKrBlfNK92KFrY/cxRy3nzhQfpQ=="; + }; + }; "vue2-teleport-1.0.1" = { name = "vue2-teleport"; packageName = "vue2-teleport"; @@ -10984,6 +11182,15 @@ let sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; + "ws-8.12.0" = { + name = "ws"; + packageName = "ws"; + version = "8.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz"; + sha512 = "kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig=="; + }; + }; "xlsx-0.17.5" = { name = "xlsx"; packageName = "xlsx"; @@ -11179,10 +11386,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.212.1"; + version = "0.215.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.212.1.tgz"; - sha512 = "9i4U/dJ84TEFIkj++nx+u3lLgpOxeco5QjopG+Ejjv6Gd3Jc+oL8MF3opN9v0JWagPX+yOnszol6aN+U4Sl8tA=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.215.1.tgz"; + sha512 = "iJcgw8F8zop+Agyrq5x3xczr/uZSR/ghXltcfZ0D/mLe7RxeWvZk1kg0fxaX+sTBeAu0yhsPvib3EBeTqNTcJg=="; }; dependencies = [ (sources."@acuminous/bitsyntax-0.1.2" // { @@ -11196,108 +11403,65 @@ in sources."js-yaml-4.1.0" ]; }) - (sources."@azure/abort-controller-1.1.0" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/core-auth-1.4.0" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/core-client-1.7.0" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."@azure/abort-controller-1.1.0" + sources."@azure/core-auth-1.4.0" + sources."@azure/core-client-1.7.1" (sources."@azure/core-http-2.3.1" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" sources."tough-cookie-4.1.2" - sources."tslib-2.4.1" sources."universalify-0.2.0" ]; }) sources."@azure/core-http-compat-1.3.0" - (sources."@azure/core-lro-2.5.0" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/core-paging-1.4.0" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/core-rest-pipeline-1.10.1" // { - dependencies = [ - sources."@tootallnate/once-2.0.0" - sources."http-proxy-agent-5.0.0" - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/core-tracing-1.0.1" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/core-util-1.1.1" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."@azure/core-lro-2.5.1" + sources."@azure/core-paging-1.5.0" + sources."@azure/core-rest-pipeline-1.10.1" + sources."@azure/core-tracing-1.0.1" + sources."@azure/core-util-1.1.1" (sources."@azure/identity-2.1.0" // { dependencies = [ sources."jwa-2.0.0" sources."jws-4.0.0" - sources."open-8.4.0" - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/keyvault-keys-4.6.0" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."@azure/logger-1.0.3" // { - dependencies = [ - sources."tslib-2.4.1" + sources."open-8.4.1" ]; }) + sources."@azure/keyvault-keys-4.6.0" + sources."@azure/logger-1.0.3" sources."@azure/ms-rest-azure-env-2.0.0" (sources."@azure/ms-rest-js-2.6.4" // { dependencies = [ sources."form-data-2.5.1" + sources."tslib-1.14.1" ]; }) sources."@azure/ms-rest-nodeauth-3.1.1" - (sources."@azure/msal-browser-2.32.2" // { + (sources."@azure/msal-browser-2.33.0" // { dependencies = [ - sources."@azure/msal-common-9.1.1" + sources."@azure/msal-common-10.0.0" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.14.6" // { + (sources."@azure/msal-node-1.15.0" // { dependencies = [ - sources."@azure/msal-common-9.1.1" + sources."@azure/msal-common-10.0.0" ]; }) (sources."@azure/storage-blob-12.12.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tslib-2.4.1" ]; }) - sources."@babel/parser-7.20.13" + sources."@babel/parser-7.20.15" sources."@babel/runtime-7.20.13" sources."@codemirror/autocomplete-6.4.0" sources."@codemirror/commands-6.2.0" - sources."@codemirror/lang-javascript-6.1.2" - sources."@codemirror/language-6.4.0" + sources."@codemirror/lang-css-6.0.2" + sources."@codemirror/lang-javascript-6.1.3" + sources."@codemirror/language-6.5.0" sources."@codemirror/lint-6.1.0" sources."@codemirror/state-6.2.0" - sources."@codemirror/view-6.7.3" + sources."@codemirror/view-6.8.1" sources."@colors/colors-1.5.0" sources."@cspotcode/source-map-support-0.8.1" sources."@curlconverter/yargs-0.0.2" @@ -11306,9 +11470,9 @@ in sources."@fontsource/open-sans-4.5.14" sources."@fortawesome/fontawesome-common-types-0.3.0" sources."@fortawesome/fontawesome-svg-core-1.3.0" - (sources."@fortawesome/free-regular-svg-icons-6.2.1" // { + (sources."@fortawesome/free-regular-svg-icons-6.3.0" // { dependencies = [ - sources."@fortawesome/fontawesome-common-types-6.2.1" + sources."@fortawesome/fontawesome-common-types-6.3.0" ]; }) (sources."@fortawesome/free-solid-svg-icons-5.15.4" // { @@ -11337,7 +11501,7 @@ in dependencies = [ sources."@grpc/proto-loader-0.7.4" sources."long-5.2.1" - sources."protobufjs-7.2.0" + sources."protobufjs-7.2.2" sources."yargs-16.2.0" ]; }) @@ -11359,13 +11523,20 @@ in sources."@jridgewell/trace-mapping-0.3.9" sources."@js-joda/core-5.5.2" sources."@jsdevtools/ono-7.1.3" + sources."@jsplumb/browser-ui-5.13.2" + sources."@jsplumb/common-5.13.2" + sources."@jsplumb/connector-bezier-5.13.2" + sources."@jsplumb/core-5.13.2" + sources."@jsplumb/util-5.13.2" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@lezer/common-1.0.2" + sources."@lezer/css-1.1.1" sources."@lezer/highlight-1.1.3" + sources."@lezer/html-1.3.1" sources."@lezer/javascript-1.4.1" - sources."@lezer/lr-1.3.1" + sources."@lezer/lr-1.3.3" sources."@mapbox/node-pre-gyp-1.0.10" (sources."@n8n_io/license-sdk-1.8.0" // { dependencies = [ @@ -11382,16 +11553,11 @@ in sources."mkdirp-1.0.4" ]; }) - sources."@oclif/command-1.8.21" - (sources."@oclif/config-1.18.6" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."@oclif/command-1.8.22" + sources."@oclif/config-1.18.8" (sources."@oclif/core-1.26.1" // { dependencies = [ sources."supports-color-8.1.1" - sources."tslib-2.4.1" sources."wrap-ansi-7.0.0" ]; }) @@ -11403,13 +11569,13 @@ in sources."wrap-ansi-7.0.0" ]; }) - sources."@oclif/help-1.0.5" - sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.9" // { + (sources."@oclif/help-1.0.5" // { dependencies = [ - sources."tslib-2.4.1" + sources."@oclif/config-1.18.6" ]; }) + sources."@oclif/linewrap-1.0.0" + sources."@oclif/parser-3.8.10" sources."@oclif/screen-3.0.4" sources."@opentelemetry/api-1.4.0" sources."@protobufjs/aspromise-1.1.2" @@ -11440,39 +11606,55 @@ in sources."domhandler-5.0.3" ]; }) - sources."@sentry/core-7.33.0" - sources."@sentry/integrations-7.33.0" - sources."@sentry/node-7.33.0" - sources."@sentry/types-7.33.0" - sources."@sentry/utils-7.33.0" + (sources."@sentry/core-7.37.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@sentry/integrations-7.37.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@sentry/node-7.37.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."@sentry/types-7.37.1" + (sources."@sentry/utils-7.37.1" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.28" - sources."@swc/wasm-1.3.28" + sources."@swc/core-1.3.35" + sources."@swc/wasm-1.3.35" sources."@techteamer/ocsp-1.0.0" sources."@tediousjs/connection-string-0.3.0" sources."@tokenizer/token-0.3.0" - sources."@tootallnate/once-1.1.2" + sources."@tootallnate/once-2.0.0" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" + sources."@types/asn1-0.2.0" sources."@types/big.js-6.1.6" sources."@types/body-parser-1.19.2" sources."@types/connect-3.4.35" sources."@types/duplexify-3.6.1" sources."@types/es-aggregate-error-1.0.2" - sources."@types/express-4.17.16" - sources."@types/express-jwt-0.0.42" + sources."@types/express-4.17.17" sources."@types/express-serve-static-core-4.17.33" - sources."@types/express-unless-2.0.1" sources."@types/js-nacl-1.3.1" sources."@types/json-schema-7.0.11" + sources."@types/jsonwebtoken-9.0.1" sources."@types/lodash-4.14.191" sources."@types/long-4.0.2" sources."@types/mime-3.0.1" sources."@types/multer-1.4.7" - sources."@types/node-18.11.18" + sources."@types/node-18.13.0" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -11485,8 +11667,10 @@ in sources."@types/stack-trace-0.0.29" sources."@types/stoppable-1.1.1" sources."@types/tough-cookie-2.3.8" + sources."@types/triple-beam-1.3.2" sources."@types/tunnel-0.0.3" - sources."@types/validator-13.7.11" + sources."@types/uuid-9.0.0" + sources."@types/validator-13.7.12" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" sources."@vue/compiler-sfc-2.7.14" @@ -11558,11 +11742,7 @@ in sources."asn1.js-rfc5280-3.0.0" sources."assert-options-0.8.0" sources."assert-plus-1.0.0" - (sources."ast-types-0.13.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."ast-types-0.13.4" sources."async-3.2.4" sources."async-validator-1.8.5" sources."asynckit-0.4.0" @@ -11574,7 +11754,7 @@ in }) sources."available-typed-arrays-1.0.5" sources."avsc-5.7.7" - (sources."aws-sdk-2.1301.0" // { + (sources."aws-sdk-2.1313.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -11605,17 +11785,13 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - sources."better-sqlite3-8.0.1" + sources."better-sqlite3-8.1.0" sources."big-integer-1.6.51" sources."big.js-6.2.1" sources."bignumber.js-2.4.0" sources."binary-extensions-2.2.0" sources."binascii-0.0.2" - (sources."bindings-1.5.0" // { - dependencies = [ - sources."file-uri-to-path-1.0.0" - ]; - }) + sources."bindings-1.5.0" sources."bintrees-1.0.2" (sources."bl-4.1.0" // { dependencies = [ @@ -11643,7 +11819,7 @@ in sources."buffer-more-ints-1.0.0" sources."buffer-writer-2.0.0" sources."bufferutil-4.0.7" - (sources."bull-4.10.2" // { + (sources."bull-4.10.4" // { dependencies = [ sources."cron-parser-4.7.1" ]; @@ -11664,16 +11840,8 @@ in sources."call-me-maybe-1.0.2" sources."callback-stream-1.1.0" sources."callsites-3.1.0" - (sources."camel-case-4.1.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."capital-case-1.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."camel-case-4.1.2" + sources."capital-case-1.0.4" sources."cardinal-2.1.1" sources."caseless-0.12.0" (sources."cfb-1.2.2" // { @@ -11682,11 +11850,7 @@ in ]; }) sources."chalk-4.1.2" - (sources."change-case-4.1.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."change-case-4.1.2" sources."chardet-0.7.0" sources."charenc-0.0.2" (sources."checkpoint-stream-0.1.2" // { @@ -11719,7 +11883,8 @@ in ]; }) sources."cluster-key-slot-1.1.2" - sources."codemirror-lang-n8n-expression-0.1.0" + sources."codemirror-lang-html-n8n-1.0.0" + sources."codemirror-lang-n8n-expression-0.2.0" sources."codepage-1.15.0" (sources."color-3.2.1" // { dependencies = [ @@ -11751,13 +11916,9 @@ in sources."concat-stream-1.6.2" sources."connect-history-api-fallback-1.6.0" sources."console-control-strings-1.1.0" - (sources."constant-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."constant-case-3.0.4" sources."content-disposition-0.5.4" - sources."content-type-1.0.4" + sources."content-type-1.0.5" sources."convict-6.2.4" sources."cookie-0.4.2" (sources."cookie-parser-1.4.6" // { @@ -11804,7 +11965,7 @@ in sources."deepmerge-1.5.2" sources."default-user-agent-1.0.0" sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.4" + sources."define-properties-1.2.0" sources."degenerator-3.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -11821,11 +11982,7 @@ in sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" - (sources."dot-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."dot-case-3.0.4" sources."dotenv-8.6.0" sources."dreamopt-0.6.0" sources."duplexify-3.7.1" @@ -11841,7 +11998,7 @@ in sources."encoding-japanese-2.0.0" sources."end-of-stream-1.4.4" sources."ent-2.2.0" - sources."entities-2.2.0" + sources."entities-2.1.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."es-abstract-1.21.1" @@ -11875,6 +12032,7 @@ in sources."ms-2.0.0" ]; }) + sources."express-async-errors-3.1.1" (sources."express-openapi-validator-4.13.8" // { dependencies = [ sources."media-typer-1.1.0" @@ -11882,7 +12040,6 @@ in ]; }) sources."express-prom-bundle-6.6.0" - sources."express-unless-2.1.3" sources."extend-3.0.2" sources."extend-shallow-2.0.1" (sources."external-editor-3.1.0" // { @@ -11906,7 +12063,7 @@ in }) sources."file-saver-2.0.5" sources."file-type-16.5.4" - sources."file-uri-to-path-2.0.0" + sources."file-uri-to-path-1.0.0" (sources."filelist-1.0.4" // { dependencies = [ sources."minimatch-5.1.6" @@ -11968,6 +12125,8 @@ in sources."get-system-fonts-2.0.2" (sources."get-uri-3.0.2" // { dependencies = [ + sources."@tootallnate/once-1.1.2" + sources."file-uri-to-path-2.0.0" sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."universalify-0.1.2" @@ -12029,18 +12188,14 @@ in sources."has-unicode-2.0.1" sources."hdb-pool-0.1.6" sources."he-1.2.0" - (sources."header-case-2.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."header-case-2.0.4" sources."heap-0.2.7" sources."help-me-1.1.0" sources."highlight.js-10.7.3" sources."homedir-polyfill-1.0.3" (sources."html-to-text-9.0.3" // { dependencies = [ - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" sources."dom-serializer-2.0.0" sources."domhandler-5.0.3" sources."domutils-3.0.1" @@ -12049,15 +12204,16 @@ in ]; }) sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" - sources."http-proxy-agent-4.0.1" + sources."http-proxy-agent-5.0.0" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" + sources."humanize-duration-3.28.0" sources."humanize-ms-1.2.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.6.3" - sources."ics-2.41.0" + sources."ics-2.44.0" sources."ieee754-1.2.1" sources."ignore-5.2.4" (sources."imap-0.8.19" // { @@ -12080,9 +12236,9 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."inquirer-7.3.3" - sources."internal-slot-1.0.4" + sources."internal-slot-1.0.5" sources."interpret-1.4.0" - (sources."ioredis-5.2.6" // { + (sources."ioredis-5.3.1" // { dependencies = [ sources."denque-2.1.0" ]; @@ -12139,8 +12295,9 @@ in sources."jake-10.8.5" sources."jmespath-0.16.0" sources."join-component-1.1.0" + sources."jose-4.11.4" sources."jquery-3.6.3" - sources."js-base64-3.7.4" + sources."js-base64-3.7.5" sources."js-md4-0.3.2" sources."js-nacl-1.4.0" sources."js-yaml-3.14.1" @@ -12166,24 +12323,23 @@ in }) sources."jsonschema-1.4.1" sources."jsonwebtoken-9.0.0" - sources."jsplumb-2.15.4" sources."jsprim-1.4.2" sources."jwa-1.4.1" - (sources."jwks-rsa-1.12.3" // { - dependencies = [ - sources."jsonwebtoken-8.5.1" - sources."semver-5.7.1" - ]; - }) + sources."jwks-rsa-3.0.1" sources."jws-3.2.2" sources."kafkajs-1.16.0" sources."kuler-2.0.0" + (sources."ldapts-4.2.2" // { + dependencies = [ + sources."uuid-9.0.0" + ]; + }) sources."leac-0.6.0" sources."leven-2.1.0" sources."levn-0.3.0" sources."libbase64-1.2.1" sources."libmime-5.2.0" - sources."libphonenumber-js-1.10.18" + sources."libphonenumber-js-1.10.19" sources."libpq-1.8.12" sources."libqp-2.0.1" sources."lie-3.1.1" @@ -12228,16 +12384,12 @@ in sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" sources."lodash.zipobject-4.1.3" - sources."logform-2.4.2" + sources."logform-2.5.1" sources."long-4.0.0" sources."lossless-json-1.0.5" - (sources."lower-case-2.0.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."lower-case-2.0.2" sources."lru-cache-4.0.2" - sources."lru-memoizer-2.1.4" + sources."lru-memoizer-2.2.0" sources."lru_map-0.3.3" sources."luxon-3.2.1" (sources."mailparser-3.6.3" // { @@ -12256,6 +12408,8 @@ in sources."make-error-cause-2.3.0" (sources."make-fetch-happen-9.1.0" // { dependencies = [ + sources."@tootallnate/once-1.1.2" + sources."http-proxy-agent-4.0.1" sources."lru-cache-6.0.0" sources."minipass-3.3.6" sources."socks-proxy-agent-6.2.1" @@ -12263,12 +12417,7 @@ in ]; }) sources."mappersmith-2.41.0" - (sources."markdown-it-12.3.2" // { - dependencies = [ - sources."argparse-2.0.1" - sources."entities-2.1.0" - ]; - }) + sources."markdown-it-13.0.1" sources."markdown-it-emoji-2.0.2" sources."markdown-it-link-attributes-4.0.1" sources."markdown-it-task-lists-2.1.1" @@ -12292,12 +12441,8 @@ in sources."brace-expansion-1.1.11" ]; }) - sources."minimist-1.2.7" - (sources."minipass-4.0.0" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minimist-1.2.8" + sources."minipass-4.0.3" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -12345,7 +12490,7 @@ in sources."moment-2.29.4" sources."moment-timezone-0.5.40" sources."monaco-editor-0.33.0" - sources."mongodb-4.13.0" + sources."mongodb-4.14.0" (sources."mongodb-connection-string-url-2.6.0" // { dependencies = [ sources."tr46-3.0.0" @@ -12357,12 +12502,17 @@ in dependencies = [ sources."concat-stream-2.0.0" sources."readable-stream-3.6.0" + sources."ws-7.5.9" ]; }) sources."mqtt-packet-6.10.0" sources."ms-2.1.2" - sources."msal-1.4.17" - sources."msgpackr-1.8.2" + (sources."msal-1.4.17" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."msgpackr-1.8.3" (sources."mssql-8.1.4" // { dependencies = [ sources."commander-9.5.0" @@ -12378,27 +12528,28 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.151.2" // { + (sources."n8n-core-0.154.1" // { dependencies = [ sources."concat-stream-2.0.0" sources."readable-stream-3.6.0" ]; }) - sources."n8n-design-system-0.51.1" - (sources."n8n-editor-ui-0.178.1" // { + (sources."n8n-design-system-0.53.0" // { dependencies = [ - sources."luxon-2.5.2" + sources."argparse-2.0.1" + sources."markdown-it-12.3.2" + sources."vue2-boring-avatars-0.3.8" ]; }) - (sources."n8n-nodes-base-0.210.1" // { + sources."n8n-editor-ui-0.181.1" + (sources."n8n-nodes-base-0.213.1" // { dependencies = [ sources."chokidar-3.5.2" - sources."luxon-2.3.2" ]; }) - (sources."n8n-workflow-0.133.2" // { + (sources."n8n-workflow-0.136.1" // { dependencies = [ - sources."luxon-2.3.2" + sources."ast-types-0.15.2" ]; }) (sources."named-placeholders-1.1.3" // { @@ -12416,16 +12567,12 @@ in sources."neo-async-2.6.2" sources."netmask-2.0.2" sources."nice-try-1.0.5" - (sources."no-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - sources."node-abi-3.31.0" - sources."node-abort-controller-3.0.1" + sources."no-case-3.0.4" + sources."node-abi-3.33.0" + sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" - sources."node-fetch-2.6.8" + sources."node-fetch-2.6.9" sources."node-forge-1.3.1" (sources."node-gyp-8.4.1" // { dependencies = [ @@ -12451,7 +12598,7 @@ in sources."node-rsa-1.1.1" sources."node-ssh-12.0.5" sources."nodeify-1.0.1" - sources."nodemailer-6.9.0" + sources."nodemailer-6.9.1" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-wheel-1.0.1" @@ -12489,18 +12636,19 @@ in sources."p-map-2.1.0" sources."p-queue-6.6.2" sources."p-timeout-3.2.0" - sources."pac-proxy-agent-5.0.0" - (sources."pac-resolver-5.0.1" // { + (sources."pac-proxy-agent-5.0.0" // { dependencies = [ - sources."ip-1.1.8" + sources."@tootallnate/once-1.1.2" + sources."http-proxy-agent-4.0.1" ]; }) - sources."packet-reader-1.0.0" - (sources."param-case-3.0.4" // { + (sources."pac-resolver-5.0.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."ip-1.1.8" ]; }) + sources."packet-reader-1.0.0" + sources."param-case-3.0.4" sources."parse-github-url-1.0.2" sources."parse-passwd-1.0.0" sources."parse-srcset-1.0.2" @@ -12508,11 +12656,7 @@ in sources."parse5-htmlparser2-tree-adapter-6.0.1" sources."parseley-0.11.0" sources."parseurl-1.3.3" - (sources."pascal-case-3.1.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."pascal-case-3.1.2" sources."passport-0.6.0" sources."passport-cookie-1.0.9" sources."passport-jwt-4.0.1" @@ -12522,11 +12666,7 @@ in sources."ansi-escapes-3.2.0" ]; }) - (sources."path-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."path-case-3.0.4" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" @@ -12543,9 +12683,9 @@ in sources."peberminta-0.8.0" sources."peek-readable-4.1.0" sources."performance-now-2.1.0" - sources."pg-8.8.0" + sources."pg-8.9.0" sources."pg-connection-string-2.5.0" - sources."pg-cursor-2.7.4" + sources."pg-cursor-2.8.0" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" (sources."pg-native-3.0.1" // { @@ -12558,9 +12698,13 @@ in ]; }) sources."pg-pool-3.5.2" - sources."pg-promise-10.15.4" - sources."pg-protocol-1.5.0" - sources."pg-query-stream-4.2.4" + (sources."pg-promise-10.15.4" // { + dependencies = [ + sources."pg-8.8.0" + ]; + }) + sources."pg-protocol-1.6.0" + sources."pg-query-stream-4.3.0" sources."pg-types-2.2.0" (sources."pgpass-1.0.5" // { dependencies = [ @@ -12569,7 +12713,7 @@ in }) sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."pinia-2.0.29" + sources."pinia-2.0.30" sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" sources."popsicle-cookie-jar-1.0.0" @@ -12582,13 +12726,14 @@ in sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" - (sources."posthog-node-2.2.3" // { + (sources."posthog-node-2.4.0" // { dependencies = [ sources."axios-0.27.2" ]; }) sources."prebuild-install-7.1.1" sources."prelude-ls-1.1.2" + sources."prettier-2.8.4" sources."pretty-bytes-5.6.0" sources."printj-1.1.2" sources."prismjs-1.29.0" @@ -12607,6 +12752,8 @@ in sources."proxy-addr-2.0.7" (sources."proxy-agent-5.0.0" // { dependencies = [ + sources."@tootallnate/once-1.1.2" + sources."http-proxy-agent-4.0.1" sources."lru-cache-5.1.1" sources."yallist-3.1.1" ]; @@ -12651,7 +12798,6 @@ in (sources."recast-0.21.5" // { dependencies = [ sources."ast-types-0.15.2" - sources."tslib-2.4.1" ]; }) sources."rechoir-0.6.2" @@ -12705,14 +12851,18 @@ in sources."rss-parser-3.12.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-6.6.7" + (sources."rxjs-6.6.7" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."safe-buffer-5.2.1" sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-2.4.2" sources."safer-buffer-2.1.2" - (sources."sanitize-html-2.7.0" // { + (sources."sanitize-html-2.7.3" // { dependencies = [ - sources."deepmerge-4.2.2" + sources."deepmerge-4.3.0" ]; }) sources."sax-1.2.4" @@ -12735,11 +12885,7 @@ in sources."ms-2.1.3" ]; }) - (sources."sentence-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."sentence-case-3.0.4" sources."seq-queue-0.0.5" sources."serialize-javascript-5.0.1" sources."serve-static-1.15.0" @@ -12765,18 +12911,12 @@ in sources."simple-swizzle-0.2.2" sources."slash-3.0.0" sources."smart-buffer-4.2.0" - (sources."snake-case-3.0.4" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."snowflake-sdk-1.6.17" // { + sources."snake-case-3.0.4" + (sources."snowflake-sdk-1.6.18" // { dependencies = [ sources."axios-0.27.2" sources."debug-3.2.7" - sources."jsonwebtoken-8.5.1" sources."mkdirp-1.0.4" - sources."semver-5.7.1" sources."tmp-0.2.1" sources."uuid-3.4.0" ]; @@ -12820,9 +12960,15 @@ in sources."statuses-2.0.1" sources."stealthy-require-1.1.1" sources."stoppable-1.1.0" + (sources."stream-browserify-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."stream-events-1.0.5" sources."stream-shift-1.0.1" sources."streamsearch-1.1.0" + sources."strict-event-emitter-types-2.0.0" sources."strict-uri-encode-2.0.0" sources."string-similarity-4.0.4" sources."string-width-4.2.3" @@ -12871,12 +13017,7 @@ in sources."sprintf-js-1.1.2" ]; }) - (sources."teeny-request-7.2.0" // { - dependencies = [ - sources."@tootallnate/once-2.0.0" - sources."http-proxy-agent-5.0.0" - ]; - }) + sources."teeny-request-7.2.0" sources."test-console-2.0.0" sources."text-hex-1.0.0" sources."thenify-3.3.1" @@ -12887,7 +13028,8 @@ in sources."through2-filter-3.0.0" sources."throwback-4.1.0" sources."timeago.js-4.0.2" - sources."tinycolor2-1.5.2" + sources."tinycolor2-1.6.0" + sources."title-case-3.0.3" sources."tlds-1.236.0" sources."tmp-0.0.33" (sources."tmp-promise-3.0.3" // { @@ -12913,7 +13055,7 @@ in sources."triple-beam-1.3.0" sources."ts-expect-1.3.0" sources."ts-node-10.9.1" - sources."tslib-1.14.1" + sources."tslib-2.5.0" sources."tsscmp-1.0.6" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" @@ -12923,12 +13065,20 @@ in sources."type-is-1.6.18" sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" - (sources."typeorm-0.3.11" // { + (sources."typeorm-0.3.12" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.12" - sources."@azure/identity-1.5.2" + (sources."@azure/identity-1.5.2" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) sources."@azure/msal-common-4.5.1" - sources."@azure/msal-node-1.0.0-beta.6" + (sources."@azure/msal-node-1.0.0-beta.6" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) sources."@js-joda/core-3.2.0" sources."argparse-2.0.1" sources."bl-2.2.1" @@ -12936,6 +13086,7 @@ in sources."buffer-6.0.3" sources."cliui-8.0.1" sources."dotenv-16.0.3" + sources."glob-8.1.0" sources."js-yaml-4.1.0" sources."jsbi-3.2.5" (sources."jsonwebtoken-8.5.1" // { @@ -12945,7 +13096,8 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."mkdirp-1.0.4" + sources."minimatch-5.1.6" + sources."mkdirp-2.1.3" sources."mongodb-3.7.3" sources."mssql-7.3.5" sources."node-abort-controller-2.0.0" @@ -12957,14 +13109,14 @@ in sources."bl-5.1.0" ]; }) - sources."tslib-2.4.1" + sources."uuid-9.0.0" sources."wrap-ansi-7.0.0" sources."yargs-17.6.2" sources."yargs-parser-21.1.1" ]; }) sources."typeorm-aurora-data-api-driver-2.4.4" - sources."typescript-4.9.4" + sources."typescript-4.9.5" sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" @@ -12976,16 +13128,8 @@ in sources."unique-stream-2.3.1" sources."universalify-2.0.0" sources."unpipe-1.0.0" - (sources."upper-case-2.0.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) - (sources."upper-case-first-2.0.2" // { - dependencies = [ - sources."tslib-2.4.1" - ]; - }) + sources."upper-case-2.0.2" + sources."upper-case-first-2.0.2" sources."uri-js-4.4.1" (sources."url-0.10.3" // { dependencies = [ @@ -13026,13 +13170,14 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.13" + sources."vm2-3.9.14" sources."vue-2.7.14" sources."vue-agile-2.0.0" sources."vue-color-2.8.1" sources."vue-demi-0.13.11" sources."vue-fragment-1.5.1" sources."vue-i18n-8.28.2" + sources."vue-infinite-loading-2.4.5" sources."vue-json-pretty-1.9.3" sources."vue-prism-editor-0.3.0" sources."vue-router-3.6.5" @@ -13070,7 +13215,7 @@ in sources."wordwrap-1.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."ws-8.12.0" sources."xlsx-0.17.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix index 50949da7539a9..0b6d71b3adc9f 100644 --- a/pkgs/applications/networking/nali/default.nix +++ b/pkgs/applications/networking/nali/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nali"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "zu1k"; repo = "nali"; rev = "v${version}"; - sha256 = "sha256-NHTS9YajVjyAjSEQxMqyyY2Hwd30pjnIthZ+1jroqTE="; + sha256 = "sha256-ZJnQiTcfvxHFgRNytQANs/lF4hy0S0cXOy8IuGECYi0="; }; - vendorSha256 = "sha256-1sXG/xEzPVN1aRCsYqUee9aidT+ognZszOC7SR8YArw="; + vendorHash = "sha256-TLij88IksL0+pARKVhEhPg6qUPAXMlL2DWJk4ynahUs="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index b1fb3b2054f5f..b29d9f494b042 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-slang=${slang.dev}" "--with-ssl=${openssl.dev}" + "--with-slrnpull" ]; buildInputs = [ slang ncurses openssl ]; diff --git a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch b/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch index ab7cb9bffa45d..260a7dd4ddd7e 100644 --- a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch +++ b/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch @@ -8,18 +8,13 @@ Subject: [PATCH] Explicitly copy dbus files into the store dir 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt -index 1f35335..7f76951 100644 +index 2e7349ef7..512d4b188 100644 --- a/shell_integration/libcloudproviders/CMakeLists.txt +++ b/shell_integration/libcloudproviders/CMakeLists.txt -@@ -19,7 +19,7 @@ MACRO(PKGCONFIG_GETVAR _package _var _output_variable) - ENDMACRO(PKGCONFIG_GETVAR _package _var _output_variable) - +@@ -1,5 +1,6 @@ macro(dbus_add_activation_service _sources) -- PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir) + pkg_get_variable(_install_dir dbus-1 session_bus_services_dir) + set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service") foreach (_i ${_sources}) get_filename_component(_service_file ${_i} ABSOLUTE) string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i}) --- -2.19.2 - diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index e409551f1232d..6355f2418b668 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.6.6"; + version = "3.7.3"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-P3LSgrcMZZM0OY3yQz8t3Cf5spJJTB+JTIpoT9U3+xc="; + sha256 = "sha256-SzQdT2BJ0iIMTScJ7ft47oKd+na5MlOx5xRB1SQ7CBc="; }; patches = [ diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index b6f93ede05eee..c17c65e14fe2f 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.38.0"; + version = "1.39.4"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-dJ/3MBEsA8M4pfE+GPT/bNnK3n4fL3Hwk0umgMTJAfY="; + sha256 = "sha256-7inMloKU/AL4s/p171xCzs4p4+AcLsvsbVsELK9vhFc="; }; - vendorSha256 = "sha256-pCta8FzGVpl9fvnnjQ7/e2x/HolXAuxnz0vwKejGk98="; + vendorHash = "sha256-pCta8FzGVpl9fvnnjQ7/e2x/HolXAuxnz0vwKejGk98="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/applications/networking/novnc/default.nix b/pkgs/applications/networking/novnc/default.nix index 818e8764dd99f..17d32b84a78f6 100644 --- a/pkgs/applications/networking/novnc/default.nix +++ b/pkgs/applications/networking/novnc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "novnc"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "novnc"; repo = "noVNC"; rev = "v${version}"; - sha256 = "sha256-Z+bks7kcwj+Z3uf/t0u25DnGOM60QhSH6uuoIi59jqU="; + sha256 = "sha256-G7Rtv7pQFR9UrzhYXDyBf+FRqtjo5NAXU7m/HeXhI1k="; }; patches = with python3.pkgs; [ diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index cad7339fe081f..773ec444edf92 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: serve_pdf.o:offrss.h:75: multiple definition of `cgi_url_path'; # offrss.o:offrss.h:75: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; configurePhase = '' substituteInPlace Makefile \ diff --git a/pkgs/applications/networking/p2p/dht/default.nix b/pkgs/applications/networking/p2p/dht/default.nix index b1d01f82876eb..6765c029ffe25 100644 --- a/pkgs/applications/networking/p2p/dht/default.nix +++ b/pkgs/applications/networking/p2p/dht/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "dht"; - version = "0.25"; + version = "0.27"; src = fetchFromGitHub { - # Use transmission fork from post-0.25-transmission branch + # Use transmission fork from post-0.27-transmission branch owner = "transmission"; repo = pname; - rev = "25e12bb39eea3d433602de6390796fec8a8f3620"; - sha256 = "fksi8WBQPydgSlISaZMMnxzt4xN7/Hh7aN6QQ+g/L7s="; + rev = "015585510e402a057ec17142711ba2b568b5fd62"; + sha256 = "m4utcxqE3Mn5L4IQ9UfuJXj2KkXXnqKBGqh7kHHGMJQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index fda9d87681a95..1291caa088ff8 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -27,13 +27,9 @@ stdenv.mkDerivation rec { '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4' ''; - buildInputs = (with ocamlPackages; [ - ocaml - camlp4 - num - ]) ++ [ - zlib - ]; + strictDeps = true; + nativeBuildInputs = with ocamlPackages; [ ocaml camlp4]; + buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ]; meta = { broken = stdenv.isDarwin; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 319a5e7f0dc80..999d2fa5dd659 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,14 +10,14 @@ assert guiSupport -> (dbus != null); assert trackerSearch -> (python3 != null); mkDerivation rec { - pname = "qbittorrent"; - version = "4.4.5"; + pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; + version = "4.5.2"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-EgRDNOJ4szdZA5ipOuGy2R0oVdjWcuqPU3ecU3ZNK3g="; + hash = "sha256-U0JDLLyIrMBqP4EqRAj48sdv9Om9cwdx4vP/0Ob1QB8="; }; enableParallelBuilding = true; @@ -43,8 +43,8 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications,bin} - cp -R src/qbittorrent.app $out/Applications - makeWrapper $out/{Applications/qbittorrent.app/Contents/MacOS,bin}/qbittorrent + cp -R src/${pname}.app $out/Applications + makeWrapper $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname} ''; meta = with lib; { diff --git a/pkgs/applications/networking/p2p/storrent/default.nix b/pkgs/applications/networking/p2p/storrent/default.nix index 4c96200cc6860..a21a9fef38550 100644 --- a/pkgs/applications/networking/p2p/storrent/default.nix +++ b/pkgs/applications/networking/p2p/storrent/default.nix @@ -1,22 +1,25 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - pname = "storrent-unstable"; - version = "2021-10-10"; + pname = "storrent"; + version = "unstable-2023-01-14"; src = fetchFromGitHub { owner = "jech"; repo = "storrent"; - rev = "681733cf74de08bea251ada672ea8c666eb1b679"; - sha256 = "0grrqgawswb44fahf40060jl691rlyccwlqkljvgy8mzzw1kjzj4"; + rev = "86270ee777a19a521f8898a179485e0347f90ce0"; + hash = "sha256-JYNtuyk4hhe1jZgY/5Bz91Ropdw/U7n1VKHYkdUjZ0I="; }; - vendorSha256 = "0sz2fz7bqgwd5i7sacyxs7bmb8ly6xrxrakqi9c446vzlkh898hj"; + vendorHash = "sha256-iPKZPXsa6ya29N/u9QYd5LAm42+FtHZLGStRDxsAxe4="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://github.com/jech/storrent"; description = "An implementation of the BitTorrent protocol that is optimised for streaming media"; license = licenses.mit; + platforms = platforms.linux; maintainers = [ maintainers.marsam ]; }; } diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 8d605877a62ea..8f44d79f817dd 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchurl , cmake , pkg-config , openssl @@ -46,6 +47,14 @@ in stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + # fix build with openssl 3.0 + (fetchurl { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-p2p/transmission/files/transmission-3.00-openssl-3.patch"; + hash = "sha256-peVrkGck8AfbC9uYNfv1CIu1alIewpca7A6kRXjVlVs="; + }) + ]; + outputs = [ "out" "apparmor" ]; cmakeFlags = diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix index 75e7981af5b2d..e1a2a38264477 100644 --- a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix +++ b/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { ]; buildPhase = '' - ${python3Packages.python.interpreter} -O -m compileall . + ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall . ''; installPhase = '' diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index 02b0c91e2da9a..07ea1707526d1 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ]; buildPhase = '' - ${python3Packages.python.interpreter} -O -m compileall . + ${python3Packages.python.pythonForBuild.interpreter} -O -m compileall . ''; installPhase = '' diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 13175aaca6713..caba7159214ea 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,12 +38,12 @@ let pname = "pcloud"; - version = "1.10.0"; - code = "XZCy4sVZGb7r8VpDE4SCv2QI3OYx1HYChIvy"; + version = "1.10.1"; + code = "XZwHPTVZ7J1WFU374k8BqSWO2519y4aGFdAV"; # 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-kzID1y/jVuqFfD/PIUR2TFa0AvxKVcfNQ4ZXiHx0gRk="; + hash = "sha256-Mum1SL/EZ7iFK9e3o+T0CxkAQ0FkjSBy2FEUDonxtTI="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index eae9a8a3d87a0..33747e2d669b2 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -4,8 +4,11 @@ , fetchpatch , openssl , libsamplerate +, swig , alsa-lib , AppKit +, python3 +, pythonSupport ? true }: stdenv.mkDerivation rec { @@ -33,6 +36,9 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = + lib.optionals pythonSupport [ swig python3 ]; + buildInputs = [ openssl libsamplerate ] ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional stdenv.isDarwin AppKit; @@ -41,11 +47,24 @@ stdenv.mkDerivation rec { export LD=$CC ''; + postBuild = lib.optionalString pythonSupport '' + make -C pjsip-apps/src/swig/python + ''; + + outputs = [ "out" ] + ++ lib.optional pythonSupport "py"; + + configureFlags = [ "--enable-shared" ]; + postInstall = '' mkdir -p $out/bin cp pjsip-apps/bin/pjsua-* $out/bin/pjsua mkdir -p $out/share/${pname}-${version}/samples cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples + '' + lib.optionalString pythonSupport '' + (cd pjsip-apps/src/swig/python && \ + python setup.py install --prefix=$py + ) ''; # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 1fc698fe19003..fe0112a4aaef0 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -9,13 +9,7 @@ let hash = "sha256-e11u0jdJr+2TDXvBAPlDfnuuDwSfBq+JtvnDUTNKp/c="; }; - python = python3.override { - packageOverrides = self: super: { - # The bravado-core dependency is incompatible with jschonschema 4.0: - # https://github.com/Yelp/bravado-core/pull/385 - jsonschema = super.jsonschema_3; - }; - }; + python = python3; pythonDeps = with python.pkgs; [ flask flask_assets flask-login flask-sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index bdf75f6440e2e..5dc7779e12e90 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,44 +2,51 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "2.3.0"; + version = "3.0.18"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; - rev = "br-${version}"; - sha256 = "sha256-7p+Q6/BphE/dxNQe+gfcIty6TAWHUcPpvSJWfmf4OQg="; + rev = "v${version}"; + hash = "sha256-0gQnMhjwW2NEJwafqndStQ33dIu82lW6ntXFRCpbmm4="; }; - vendorSha256 = "sha256-dhrn6xQ0IJzBYeO6ko2PUCO+idopC2An0ylqCnx5jKg="; + vendorHash = "sha256-lHMcVcaoBwjE2ikEZPeZexC5XvhkAtvHnDci7UAa4vg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsecret ]; - buildPhase = '' - runHook preBuild + proxyVendor = true; # Bridge uses some C headers so we have to enable proxyVendor + preBuild = '' patchShebangs ./utils/ - make BUILD_TIME= -j$NIX_BUILD_CORES build-nogui - - runHook postBuild + (cd ./utils/ && ./credits.sh bridge) ''; - installPhase = '' - runHook preInstall - - install -Dm555 proton-bridge $out/bin/protonmail-bridge - - runHook postInstall + ldflags = + let constants = "github.com/ProtonMail/proton-bridge/v3/internal/constants"; in + [ + "-X ${constants}.Version=${version}" + "-X ${constants}.Revision=${src.rev}" + "-X ${constants}.buildTime=unknown" + "-X ${constants}.FullAppName=ProtonMailBridge" # Should be "Proton Mail Bridge", but quoting doesn't seems to work in nix's ldflags + ]; + + subPackages = [ + "cmd/Desktop-Bridge" + ]; + + postInstall = '' + mv $out/bin/Desktop-Bridge $out/bin/bridge # The cli is named like that in the upstream repo ''; meta = with lib; { homepage = "https://github.com/ProtonMail/proton-bridge"; - changelog = "https://github.com/ProtonMail/proton-bridge/blob/master/Changelog.md"; + changelog = "https://github.com/ProtonMail/proton-bridge/blob/${src.rev}/Changelog.md"; downloadPage = "https://github.com/ProtonMail/proton-bridge/releases"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lightdiscord ]; + maintainers = with maintainers; [ mrfreezeex ]; description = "Use your ProtonMail account with your local e-mail client"; longDescription = '' An application that runs on your computer in the background and seamlessly encrypts diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index 3e6dfb1a7d22e..af55fef18c738 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -2,7 +2,7 @@ , stdenv , mkDerivation , fetchFromGitHub -, qmake +, symlinkJoin , qttools , cmake , clang_8 @@ -14,29 +14,40 @@ , libGL , zlib , curl +, v2ray +, v2ray-geoip, v2ray-domain-list-community +, assets ? [ v2ray-geoip v2ray-domain-list-community ] }: mkDerivation rec { pname = "qv2ray"; - version = "2.7.0"; + version = "unstable-2022-09-25"; src = fetchFromGitHub { owner = "Qv2ray"; repo = "Qv2ray"; - rev = "v${version}"; - sha256 = "sha256-afFTGX/zrnwq/p5p1kj+ANU4WeN7jNq3ieeW+c+GO5M="; + rev = "fb44fb1421941ab192229ff133bc28feeb4a8ce5"; + sha256 = "sha256-TngDgLXKyAoQFnXpBNaz4QjfkVwfZyuQwatdhEiI57U="; fetchSubmodules = true; }; - patchPhase = lib.optionals stdenv.isDarwin '' + postPatch = lib.optionals stdenv.isDarwin '' substituteInPlace cmake/platforms/macos.cmake \ --replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt ''; + assetsDrv = symlinkJoin { + name = "v2ray-assets"; + paths = assets; + }; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DQV2RAY_DISABLE_AUTO_UPDATE=on" + "-DQV2RAY_USE_V5_CORE=on" "-DQV2RAY_TRANSLATION_PATH=${placeholder "out"}/share/qv2ray/lang" + "-DQV2RAY_DEFAULT_VASSETS_PATH='${assetsDrv}/share/v2ray'" + "-DQV2RAY_DEFAULT_VCORE_PATH='${v2ray}/bin/v2ray'" ]; preConfigure = '' @@ -55,21 +66,19 @@ mkDerivation rec { nativeBuildInputs = [ cmake - - # The default clang_7 will result in reproducible ICE. - clang_8 - pkg-config - qmake qttools curl - ]; + # The default clang_7 will result in reproducible ICE. + ] ++ lib.optional (stdenv.isDarwin) clang_8; meta = with lib; { description = "An GUI frontend to v2ray"; - homepage = "https://qv2ray.github.io/en/"; - license = licenses.gpl3; - maintainers = with maintainers; [ poscat ]; + homepage = "https://github.com/Qv2ray/Qv2ray"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ poscat rewine ]; platforms = platforms.all; + # never built on aarch64-darwin, x86_64-darwin since update to unstable-2022-09-25 + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 4acc2c57f19fb..78f8b1a2a0c8f 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -14,58 +14,14 @@ let # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/ supportedVersions = lib.mapAttrs mkVersionInfo { - "21.09.0" = { - major = "21"; - minor = "9"; + "23.02.0" = { + major = "23"; + minor = "2"; patch = "0"; - x64hash = "d58d5cbbcb5ace95b75b1400061d475b8e72dbdf5f03abacea6d39686991f848"; - x86hash = "c646c52889e88aa0bb051070076763d5407f21fb6ad6dfcb0fe635ac01180c51"; - x64suffix = "25"; - x86suffix = "25"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2109.html"; - }; - - "21.12.0" = { - major = "21"; - minor = "12"; - patch = "0"; - x64hash = "de81deab648e1ebe0ddb12aa9591c8014d7fad4eba0db768f25eb156330bb34d"; - x86hash = "3746cdbe26727f7f6fb85fbe5f3e6df0322d79bb66e3a70158b22cb4f6b6b292"; - x64suffix = "18"; - x86suffix = "18"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2112.html"; - }; - - "22.05.0" = { - major = "22"; - minor = "5"; - patch = "0"; - x64hash = "49786fd3b5361b1f42b7bb0e36572a209e95acb1335737da5216345b6420f053"; - x86hash = "f2dc1fd64e5314b62ba87f384958c2bbd48b06b55bed10345cddb05fdc8cffa1"; - x64suffix = "16"; - x86suffix = "16"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest2.html"; - }; - - "22.07.0" = { - major = "22"; - minor = "7"; - patch = "0"; - x64hash = "ba88490e457e0fe6c610778396e40293067173c182f2343c8c1fda5e2444985c"; - x86hash = "ed9ff8b3be968cacaf6121c783326091899b987e53fac1aafae68ea3e5883403"; - x64suffix = "14"; - x86suffix = "14"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-OLD1.html"; - }; - - "22.12.0" = { - major = "22"; - minor = "12"; - patch = "0"; - x64hash = "3ec5a3d5526a6bac17bb977b173542f5bdd535a53baa6dca80c83a0d61229d74"; - x86hash = "b73f90fe51bbb7391c188a394ea614b67f128ed0d9481bd7824cbcadc0338dae"; - x64suffix = "12"; - x86suffix = "12"; + x64hash = "d0030a4782ba4b2628139635a12a7de044a4eb36906ef1eadb05b6ea77c1a7bc"; + x86hash = "39228fc8dd69adca4e56991c1ebc0832fec183c3ab5abd2d65c66b39b634391b"; + x64suffix = "10"; + x86suffix = "10"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index a35e5b03f4a9d..dd1842e7d4773 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -70,13 +70,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-I9xJWHoY8fZ5T9zca77gFciC+7JdD6fMwV16giiY4FU="; + sha256 = "sha256-4sq3LblFRWCBREudtzg+o9wjstm58gPzBq7QAwlWvEg="; }; postPatch = '' @@ -175,11 +175,11 @@ stdenv.mkDerivation rec { WITH_X11 = true; }; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" "-include AudioToolbox/AudioToolbox.h" - ]; + ]); NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ "-framework AudioToolbox" diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 6249cce973ef5..4d8c1ee9dc40e 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; preConfigure = lib.optionalString stdenv.hostPlatform.isUnix '' perl mkfiles.pl diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index f127d7c53d32b..759388cbd4253 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -26,11 +26,11 @@ mkDerivation rec { pname = "teamviewer"; # teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime outputs = [ "out" "dev" ]; - version = "15.35.7"; + version = "15.38.3"; src = fetchurl { - url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-KNUhe0c6Th2pW7+Lmo62FYdOv+8t7Z5/eQkYPN8eusc="; + url = "https://dl.tvcdn.de/download/linux/version_${lib.versions.major version}x/teamviewer_${version}_amd64.deb"; + sha256 = "sha256-+GGpGV8rl15VQvPRA2PWngQI4VoxCrZ0ArEm9FgdOVE="; }; unpackPhase = '' diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 18c0c3e73de63..c5095d8fd43e9 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WKtflN6DyzumOMEx+iX0AoIyGRN4nXUckmW/9Z2EW+Q="; + sha256 = "sha256-yNWTTjlmMCMTed1SiRep3iUxchQya1GnTVoub1cpR14="; }; strictDeps = true; diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index a35f918ff5a06..0203128e6bad5 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "rymdport"; - version = "3.2.0"; + version = "3.3.2"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-kAEkeRAS+gMjdriop4tQcqc+GldldxOn+QwgWTl8XB0="; + hash = "sha256-UATtfJPpB0twIh6vsgfMSbu9S0F36l+PQgpWYDBmy4M="; }; - vendorHash = "sha256-rZHM0HwiTNbUuJmlNOHg/XoYxqrKt59l5BL/vjm4Hfk="; + vendorHash = "sha256-XJracr2oblyVid6QKri0EUr5LrEgA3w27PPqbqWcNh8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index 31af7b140f2c7..677405c5a295b 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -20,14 +20,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "seahub"; - version = "9.0.6"; + version = "9.0.10"; format = "other"; src = fetchFromGitHub { owner = "haiwen"; repo = "seahub"; - rev = "876b7ba9b680fc668e89706aff535593772ae921"; # using a fixed revision because upstream may re-tag releases :/ - sha256 = "sha256-GHvJlm5DVt3IVJnqJu8YobNNqbjdPd08s4DCdQQRQds="; + rev = "5971bf25fe67d94ec4d9f53b785c15a098113620"; # using a fixed revision because upstream may re-tag releases :/ + sha256 = "sha256-7Exvm3EShb/1EqwA4wzWB9zCdv0P/ISmjKSoqtOMnqk="; }; dontBuild = true; @@ -61,6 +61,8 @@ python.pkgs.buildPythonApplication rec { pysearpc seaserv gunicorn + markdown + bleach ]; installPhase = '' diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index f51c8d051a51f..ee75ee6df6483 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.40"; + version = "3.43"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-eU1RnLjPSAdtv+EqVnIpOLsDfBjx4WHFnHHkGZfr130="; + hash = "sha256-u2HGawshd2OdkchgpZUN6P2fTBSwJk+RjHAYYEpPgCg="; }; - vendorHash = "sha256-tKq5QEd7f4q7q2EDNjNrlatQ7+lXF9ya9L0iTP/AXSo="; + vendorHash = "sha256-Q6B+iqUb97ZayjYDe4OOhkWj1Cxy+ILQxxEU2Jw/Als="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index a3c79fd9560b7..a51f88ad5f7e8 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; # TODO: Remove after the next release (0.8.4 should work without this): - NIX_CFLAGS_COMPILE = [ "-I${harfbuzz.dev}/include/harfbuzz" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${harfbuzz.dev}/include/harfbuzz" ]; meta = with lib; { description = "Comprehensive suite for man in the middle attacks"; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 452263f0742f8..47687bb544c26 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -9,7 +9,7 @@ assert withQt -> qt5 != null; let - version = "4.0.2"; + version = "4.0.3"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-81kVaZ8vmyjdshEgLUDsiYTlg008kRSDFEpJhLpEQR0="; + sha256 = "sha256-bFHhW8wK+5NzTmhtv/NU/9FZ9XC9KQS8u61vP+t+lRE="; }; cmakeFlags = [ @@ -34,7 +34,7 @@ in stdenv.mkDerivation { ]; # Avoid referencing -dev paths because of debug assertions. - NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DQT_NO_DEBUG" ]; nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config python3 perl ] ++ lib.optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/applications/networking/sniffnet/default.nix index 6dc59e1432ab3..a5c0c73fac92a 100644 --- a/pkgs/applications/networking/sniffnet/default.nix +++ b/pkgs/applications/networking/sniffnet/default.nix @@ -1,9 +1,11 @@ { lib , rustPlatform -, fetchCrate +, fetchFromGitHub , pkg-config , libpcap , stdenv +, alsa-lib +, expat , fontconfig , libGL , xorg @@ -12,20 +14,24 @@ rustPlatform.buildRustPackage rec { pname = "sniffnet"; - version = "1.0.1"; + version = "1.1.1"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-8K774j04BOEuJjnFYjaSctPwBrKYYKqjFS2+PyxJ2FM="; + src = fetchFromGitHub { + owner = "gyulyvgc"; + repo = "sniffnet"; + rev = "v${version}"; + hash = "sha256-o971F3JxZUfTCaLRPYxCsU5UZ2VcvZftVEl/sZAQwpA="; }; - cargoSha256 = "sha256-096i4wDdoJCICd0L2QNY+7cKHQnijK22zj4XaQNuko8="; + cargoHash = "sha256-Otn5FvZZkzO0MHiopjU2/+redyusituDQb7DT5bdbPE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + expat fontconfig libGL xorg.libX11 @@ -34,6 +40,7 @@ rustPlatform.buildRustPackage rec { xorg.libXrandr ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit + rustPlatform.bindgenHook ]; postFixup = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/networking/soju/default.nix b/pkgs/applications/networking/soju/default.nix index ae424a1fe50a1..58ffecef723a8 100644 --- a/pkgs/applications/networking/soju/default.nix +++ b/pkgs/applications/networking/soju/default.nix @@ -60,6 +60,6 @@ buildGoModule rec { homepage = "https://soju.im"; changelog = "https://git.sr.ht/~emersion/soju/refs/${src.rev}"; license = licenses.agpl3Only; - maintainers = with maintainers; [ azahi malvo ]; + maintainers = with maintainers; [ azahi malte-v ]; }; } diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 97ee3ed586252..7c0b8dc0747e8 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -2,40 +2,45 @@ , stdenv , fetchFromGitHub , ocamlPackages -, fontschumachermisc -, xset -, makeWrapper , ncurses -, gnugrep , copyDesktopItems , makeDesktopItem +, wrapGAppsHook +, glib +, gsettings-desktop-schemas +, zlib , enableX11 ? true +, Cocoa }: stdenv.mkDerivation rec { pname = "unison"; - version = "2.52.1"; + version = "2.53.0"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "sha256-taA8eZ/wOe9uMccXVYfe34/XzWgqYKA3tLZnIOahOrQ="; + sha256 = "sha256-4Lyn1UecpVIhoEXIFu35XK4aoAfYGPCZ9L4ZY7224yo="; }; - nativeBuildInputs = [ makeWrapper ] + strictDeps = true; + + nativeBuildInputs = [ glib wrapGAppsHook ocamlPackages.ocaml ] ++ lib.optional enableX11 copyDesktopItems; - buildInputs = [ ocamlPackages.ocaml ncurses ]; + buildInputs = [ gsettings-desktop-schemas ncurses zlib ] + ++ lib.optional stdenv.isDarwin Cocoa; preBuild = lib.optionalString enableX11 '' - sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml + sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk3}"/lib/ocaml/*/site-lib/lablgtk3)|" src/Makefile.OCaml + sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.cairo2}"/lib/ocaml/*/site-lib/cairo2)|" src/Makefile.OCaml '' + '' echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile ''; makeFlags = [ "INSTALLDIR=$(out)/bin/" - "UISTYLE=${if enableX11 then "gtk2" else "text"}" + "UISTYLE=${if enableX11 then "gtk3" else "text"}" ] ++ lib.optional (!ocamlPackages.ocaml.nativeCompilers) "NATIVE=false"; preInstall = '' @@ -43,11 +48,6 @@ stdenv.mkDerivation rec { ''; postInstall = lib.optionalString enableX11 '' - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" - done - install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg ''; diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index f24e1255d5e81..6c6dddee1735e 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-2022-07-08"; + version = "unstable-2022-12-19"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "8f01b7558a80e5f08b06244d2821c3eb5c1d6e9b"; - sha256 = "sha256-ozii7EA3j3F/o+lE2mPsUY5lrm3OOtK75gjGkrvoaQ0="; + rev = "6a122f24deb4f2ff6c6f97b6a803301a7f7b666c"; + sha256 = "sha256-fH4Inqy7DfMJbW1FYWanScLATu8cZA1n+Vas8ee3xwA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index e74084e14c524..d221324b205b6 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,16 +1,16 @@ -{ buildGoModule, stdenv, lib, procps, fetchFromGitHub, nixosTests }: +{ pkgsBuildBuild, go, buildGoModule, stdenv, lib, procps, fetchFromGitHub, nixosTests }: let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-Z4YVU45na4BgIbN/IlORpTCuf2EuSuOyppDRzswn3EI="; + hash = "sha256-Jbg56Nn+5ZjIv1KZrThkqWY+P13MglLE78E6jc0rbY0="; }; vendorHash = "sha256-q63iaRxJRvPY0Np20O6JmdMEjSg/kxRneBfs8fRTwXk="; @@ -22,7 +22,12 @@ let buildPhase = '' runHook preBuild - go run build.go -no-upgrade -version v${version} build ${target} + ( + export GOOS="${pkgsBuildBuild.go.GOOS}" GOARCH="${pkgsBuildBuild.go.GOARCH}" CC=$CC_FOR_BUILD + go build build.go + go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto + ) + ./build -goos ${go.GOOS} -goarch ${go.GOARCH} -no-upgrade -version v${version} build ${target} runHook postBuild ''; diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index dea70ffacdce1..850692f185474 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -2,7 +2,7 @@ let pname = "synology-drive-client"; baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient"; - version = "3.2.0-13258"; + version = "3.2.1-13272"; buildNumber = with lib; last (splitString "-" version); meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; @@ -29,7 +29,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-jnMwhirZphguW+hluhzD9aXDTQ9RuJgAtjh+Iy23c3w="; + sha256 = "sha256-olORBipyAv3jYQ7Gv8i4dHoCAdMcTcJR72/UYCPAVt0="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -59,7 +59,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "0hv0vgbvgqhzayc4przqhnkyvsykhw40hrwk6imvla00nix853wy"; + sha256 = "sha256-oNo/2Fim63xiWiVuY99Q18dHOPHydQJr7C9tib8LLOE="; }; nativeBuildInputs = [ cpio xar undmg ]; diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index e349cf0db1410..dd37e32b36e42 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "7.45.3"; + version = "7.56.1"; src = fetchurl { # find the latest version with @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_123.snap"; - sha512 = "1a43ece6ccb0f5a7b29a3ff0c41f27b0d82bd90214cc3d0b88dbd57ecaf2f59c092906e7ed377e3d04f2fc418027f7a0cb7f2e4458ef619663b84b080581c375"; + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_144.snap"; + sha512 = "aad9ab72ad3dcbb897fa99139b83993770c243f49e8784c34ac38603f0d76578374723e756c4f51ea2d0a39f6b9c7738e7ce070a8ddfa11f8cf831260563f6d9"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index 0c47fc323a645..23c7916354fd7 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/pkgs/applications/networking/warp/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "warp"; - version = "0.3.2"; + version = "0.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = "v${version}"; - hash = "sha256-oKkZC9fi5xPnLTI00MnG2gMjzMZHMNFI77ztbR4KQo4="; + hash = "sha256-c8X0kedfM8DPTEQAbh8cXIfEvxG2cdUD3twVHs0/k7U"; }; postPatch = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-sbyAyjxpol2SBxoLUsiPGfkP2diBPgJW0vEDHYWgmLU="; + hash = "sha256-TS/Q6T3bPjkk1bfINTR6bcPy8fnbAxbKJUrx2pYsPWY="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "Fast and secure file transfer"; homepage = "https://apps.gnome.org/app/app.drey.Warp"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/wgnord/default.nix b/pkgs/applications/networking/wgnord/default.nix new file mode 100644 index 0000000000000..b338cab2b3c46 --- /dev/null +++ b/pkgs/applications/networking/wgnord/default.nix @@ -0,0 +1,65 @@ +{ bash +, coreutils +, curl +, fetchFromGitHub +, gnugrep +, gnused +, iproute2 +, jq +, lib +, resholve +, wireguard-tools +}: + +resholve.mkDerivation rec { + pname = "wgnord"; + version = "0.1.10"; + + src = fetchFromGitHub { + owner = "phirecc"; + repo = pname; + rev = version; + hash = "sha256-T7dAEgi4tGvrzBABGLzKHhpCx0bxSCtTVI5iJJqJGlE="; + }; + + postPatch = '' + substituteInPlace wgnord \ + --replace '$conf_dir/countries.txt' "$out/share/countries.txt" \ + --replace '$conf_dir/countries_iso31662.txt' "$out/share/countries_iso31662.txt" + ''; + + dontBuild = true; + + installPhase = '' + install -Dm 755 wgnord -t $out/bin/ + install -Dm 644 countries.txt -t $out/share/ + install -Dm 644 countries_iso31662.txt -t $out/share/ + ''; + + solutions.default = { + scripts = [ "bin/wgnord" ]; + interpreter = "${bash}/bin/sh"; + inputs = [ + coreutils + curl + gnugrep + gnused + iproute2 + jq + wireguard-tools + ]; + fix.aliases = true; # curl command in an alias + execer = [ + "cannot:${iproute2}/bin/ip" + "cannot:${wireguard-tools}/bin/wg-quick" + ]; + }; + + meta = with lib; { + description = "A NordVPN Wireguard (NordLynx) client in POSIX shell"; + homepage = "https://github.com/phirecc/wgnord"; + changelog = "https://github.com/phirecc/wgnord/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ urandom ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index d0b71ee92cf89..e8910d9509294 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -6,18 +6,19 @@ , copyDesktopItems , makeDesktopItem , gtk3 -, openssl +, openssl_1_1 , xdg-user-dirs , keybinder3 }: stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.0.9"; + version = "0.1.0"; src = fetchzip { - url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz"; - sha256 = "sha256-E75ZqenCs5zWBERYoIrWc2v5CyjGKLrfsae1RCi/qNQ="; + url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz"; + sha256 = "sha256-WuEwhJ1YhbldFfisfUsp3GCV2vQy9oTam6BkL/7QEgI="; + stripRoot = false; }; nativeBuildInputs = [ @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - openssl + openssl_1_1 keybinder3 ]; @@ -38,6 +39,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + mv AppFlowy/* ./ + mkdir -p $out/opt/ mkdir -p $out/bin/ diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index 0a00ac1463b5b..c490be238112a 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -25,7 +25,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ - gobject-introspection gtksourceview3 libappindicator-gtk3 libnotify diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 57b23ea95d164..302419fdcefcf 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -69,7 +69,7 @@ mkDerivation rec { propagatedUserEnvPkgs = [ kproperty ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; qtWrapperArgs = [ "--prefix PATH : ${lib.getBin pstoedit}/bin" diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 5828ac35fc3f4..0c14eedd47ae9 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -2,17 +2,15 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.23.1"; + version = "1.24"; format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-Uw8UIJa+Dtsy+o31I1ynLyhZrFNX42NFRXu1O2ISbzU="; + hash = "sha256-Ep+8O93L/CG4qcBFzCBMRasK/ySp8+cU59LcyZRTJtg="; }; - pythonRelaxDeps = [ "cheroot" ]; - - nativeBuildInputs = with python3.pkgs; [ setuptools-scm pythonRelaxDepsHook ]; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ babel @@ -20,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { cheroot click flask - flaskbabel + flask-babel jaraco_functools jinja2 markdown2 diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 700a94429964d..65a2d579d3f7b 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -80,6 +80,11 @@ stdenv.mkDerivation rec { # guile warning GUILE_AUTO_COMPILE="0"; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + # Needed with GCC 12 but breaks on darwin (with clang) or older gcc + "-Wno-error=use-after-free" + ]); + # `make check` target does not define its prerequisites but expects them to # have already been built. The list of targets below was built through trial # and error based on failing tests. diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index e93be60741bb3..785b069c9a5b5 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.53"; + version = "1.12.55"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "VWjkyNzqu5Ao8TYdEEVSL5Xwpx2qWelzy90tObrdTwI="; + sha256 = "xpoJzRkLYirMpHa7w9TAPWjXzPWbumG/A2zmCIX5+2U="; }; configureFlags = [ "--disable-component" ]; diff --git a/pkgs/applications/office/iotas/default.nix b/pkgs/applications/office/iotas/default.nix new file mode 100644 index 0000000000000..acec5f7cabf74 --- /dev/null +++ b/pkgs/applications/office/iotas/default.nix @@ -0,0 +1,76 @@ +{ lib +, python3 +, fetchFromGitLab +, meson +, ninja +, pkg-config +, gobject-introspection +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +, glib +, gtk4 +, librsvg +, libsecret +, libadwaita +, gtksourceview5 +, webkitgtk_5_0 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "iotas"; + version = "0.1.9"; + format = "other"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "cheywood"; + repo = pname; + rev = version; + hash = "sha256-TdsqxpJq2+hoLHcJ58JQ20TWerZMXL3wkT9oIlVkrk4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + librsvg + libsecret + libadwaita + gtksourceview5 + webkitgtk_5_0 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + pygtkspellcheck + requests + markdown-it-py + linkify-it-py + mdit-py-plugins + ]; + + # prevent double wrapping + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Simple note taking with mobile-first design and Nextcloud sync"; + homepage = "https://gitlab.gnome.org/cheywood/iotas"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/office/karlender/default.nix b/pkgs/applications/office/karlender/default.nix index 6917e2ab94b15..ebbb0bbd9f93b 100644 --- a/pkgs/applications/office/karlender/default.nix +++ b/pkgs/applications/office/karlender/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "karlender"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitLab { owner = "floers"; repo = pname; rev = "v${version}"; - hash = "sha256-WuTxsnYXudciTBH1RFHsIYNIHeoeZ+rI2JhYBYPUziw="; + hash = "sha256-lmNG9B2uO/zitOY/cNjnLRjCn6mSJ3CIpXIXpChDi9A="; }; - cargoHash = "sha256-eHEISCHh1jWCy3LwVuCx4LXfNLe1A4drHusyayoS+Ho="; + cargoHash = "sha256-foxl8pqRqEbVwUWUGHmaTGazrwLQxcDJ/RvJE9wIszg="; nativeBuildInputs = [ pkg-config @@ -35,6 +35,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace src/domain/time.rs --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + substituteInPlace build.rs --replace "// gra::build" "gra::build" ''; postInstall = '' diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix index 861ec4d99ef04..e3e3106b83021 100644 --- a/pkgs/applications/office/kbibtex/default.nix +++ b/pkgs/applications/office/kbibtex/default.nix @@ -5,6 +5,7 @@ , extra-cmake-modules , shared-mime-info # Qt +, qtnetworkauth , qtxmlpatterns , qtwebengine , qca-qt5 @@ -28,11 +29,13 @@ mkDerivation rec { pname = "kbibtex"; - version = "0.9.2"; + version = "0.9.3.1"; - src = fetchurl { - url = "mirror://kde/stable/KBibTeX/${version}/kbibtex-${version}.tar.xz"; - sha256 = "09xcdx363z9hps3wbr1kx96a6q6678y8pg8r3apyps4xm7xm31nr"; + src = let + majorMinorPatch = lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version)); + in fetchurl { + url = "mirror://kde/stable/KBibTeX/${majorMinorPatch}/kbibtex-${version}.tar.xz"; + hash = "sha256-kH/E5xv9dmzM7WrIMlGCo4y0Xv/7XHowELJP3OJz8kQ="; }; nativeBuildInputs = [ @@ -41,6 +44,7 @@ mkDerivation rec { ]; buildInputs = [ + qtnetworkauth qtxmlpatterns qtwebengine qca-qt5 diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index dfab08ace2d90..3b39f88add753 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; # Hidden dependency that wasn't included in CMakeLists.txt: - NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; + env.NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; nativeBuildInputs = [ doxygen extra-cmake-modules graphviz kdoctools diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index e885e03c1cd2a..181c627f238cd 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -1,30 +1,34 @@ -{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3 -, fetchpatch, installShellFiles, texinfo, gnused, usePython ? true }: +{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3, gpgme +, installShellFiles, texinfo, gnused, usePython ? false, gpgmeSupport ? false }: stdenv.mkDerivation rec { pname = "ledger"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger"; rev = "v${version}"; - sha256 = "0x6jxwss3wwzbzlwmnwb8yzjk8f9wfawif4f1b74z2qg6hc4r7f6"; + hash = "sha256-0hN6Hpmgwb3naV2K1fxX0OyH0IyCQAh1nZ9TMNAutic="; }; - outputs = [ "out" "dev" "py" ]; + outputs = [ "out" "dev" ] ++ lib.optionals usePython [ "py" ]; buildInputs = [ - (boost.override { enablePython = usePython; python = python3; }) gmp mpfr libedit gnused - ] ++ lib.optional usePython python3; + ] ++ lib.optionals gpgmeSupport [ + gpgme + ] ++ (if usePython + then [ python3 (boost.override { enablePython = true; python = python3; }) ] + else [ boost ]); nativeBuildInputs = [ cmake texinfo installShellFiles ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_DOCS:BOOL=ON" - (lib.optionalString usePython "-DUSE_PYTHON=true") + "-DUSE_PYTHON:BOOL=${if usePython then "ON" else "OFF"}" + "-DUSE_GPGME:BOOL=${if gpgmeSupport then "ON" else "OFF"}" ]; # by default, it will query the python interpreter for it's sitepackages location @@ -34,22 +38,6 @@ stdenv.mkDerivation rec { --replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${placeholder "py"}/${python3.sitePackages}"' ''; - patches = [ - # Add support for $XDG_CONFIG_HOME. Remove with the next release - (fetchpatch { - url = "https://github.com/ledger/ledger/commit/c79674649dee7577d6061e3d0776922257520fd0.patch"; - sha256 = "sha256-vwVQnY9EUCXPzhDJ4PSOmQStb9eF6H0yAOiEmL6sAlk="; - excludes = [ "doc/NEWS.md" ]; - }) - - # Fix included bug with boost >= 1.76. Remove with the next release - (fetchpatch { - url = "https://github.com/ledger/ledger/commit/1cb9b84fdecc5604bd1172cdd781859ff3871a52.patch"; - sha256 = "sha256-ipVkRcTmnEvpfyPgMzLVJ9Sz8QxHeCURQI5dX8xh758="; - excludes = [ "test/regress/*" ]; - }) - ]; - installTargets = [ "doc" "install" ]; postInstall = '' @@ -57,17 +45,16 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; + homepage = "https://www.ledger-cli.org/"; + changelog = "https://github.com/ledger/ledger/raw/v${version}/NEWS.md"; license = licenses.bsd3; - longDescription = '' Ledger is a powerful, double-entry accounting system that is accessed from the UNIX command-line. This may put off some users, as there is no flashy UI, but for those who want unparalleled reporting access to their data, there really is no alternative. ''; - platforms = platforms.all; maintainers = with maintainers; [ jwiegley marsam ]; }; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index fdf76152a6521..8fa7d6d78a74a 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -110,6 +110,7 @@ , wrapQtAppsHook ? null , variant ? "fresh" , symlinkJoin +, postgresql } @ args: assert builtins.elem variant [ "fresh" "still" ]; @@ -175,7 +176,7 @@ in outputs = [ "out" "dev" ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h "-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 ]; @@ -404,6 +405,7 @@ in "--with-system-libwps" "--with-system-openldap" "--with-system-coinmp" + "--with-system-postgresql" # Without these, configure does not finish "--without-junit" @@ -418,7 +420,6 @@ in # I imagine this helps. Copied from go-oo. # Modified on every upgrade, though "--disable-odk" - "--disable-postgresql-sdbc" "--disable-firebird-sdbc" "--without-fonts" "--without-doxygen" @@ -546,6 +547,7 @@ in pam perl poppler + postgresql python3 sane-backends unixODBC diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index b84502170bf13..e1f39e8964c5e 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -10,26 +10,29 @@ , wrapGAppsHook , curl , sqlite -, wxGTK +, wxGTK32 , gtk3 -, libobjc +, darwin }: stdenv.mkDerivation rec { pname = "money-manager-ex"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "moneymanagerex"; repo = "moneymanagerex"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-0zUZBkdFLvc32gkGqu0pYlVsHuwjhaVZzu9acSmNfu8="; + hash = "sha256-TQgJ2Q4Z7+OtwuwkfPBgm2BmMKML9nmyFLSkmKJ1RE4="; }; postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' substituteInPlace src/platfdep_mac.mm \ --replace "appearance.name == NSAppearanceNameDarkAqua" "NO" + '' + lib.optionalString (stdenv.isLinux && !stdenv.isx86_64) '' + substituteInPlace 3rd/CMakeLists.txt \ + --replace "-msse4.2 -maes" "" ''; nativeBuildInputs = [ @@ -46,14 +49,16 @@ stdenv.mkDerivation rec { buildInputs = [ curl sqlite - wxGTK + wxGTK32 gtk3 ] ++ lib.optionals stdenv.isDarwin [ - libobjc + darwin.libobjc ]; - NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-deprecated-copy" "-Wno-old-style-cast" + "-Wno-unused-parameter" ]); postInstall = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 7065343378f1e..a6bb64bbdf7c9 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.5.16"; + version = "2.6.6"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-U77yOgQNSj1p3WZbwkyq0Ui2UrXeuAv5sD7L+ZI2x24="; + sha256 = "sha256-hmZeXQneKh3Kca/Goct3KP5q+Ce6lpYWDqFfqbcT644="; }; nativeBuildInputs = [ @@ -19,9 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; - dontBuild = true; - dontConfigure = true; - unpackCmd = '' dpkg-deb -x ${src} ./morgen-${pname} ''; @@ -37,7 +34,7 @@ stdenv.mkDerivation rec { # 2. Fixes startup script substituteInPlace $TMP/work/dist/main.js \ --replace "process.resourcesPath,\"todesktop-runtime-config.json" "\"$out/opt/Morgen/resources/todesktop-runtime-config.json" \ - --replace "Exec=\"+process.execPath+\"" "Exec=$out/bin/morgen" + --replace "Exec=\".concat(process.execPath," "Exec=\".concat(\"$out/bin/morgen\"," asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" $out/opt/Morgen/resources/app.asar substituteInPlace $out/share/applications/morgen.desktop \ diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index 62e97670c2b60..e2dfb12c92f94 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/default.nix @@ -12,6 +12,7 @@ , dconf , dpkg , fontconfig +, gcc-unwrapped , gdk-pixbuf , glib , glibc @@ -66,6 +67,7 @@ let runtimeLibs = lib.makeLibraryPath [ curl glibc + gcc-unwrapped.lib libudev0-shim pulseaudio ]; diff --git a/pkgs/applications/office/p3x-onenote/default.nix b/pkgs/applications/office/p3x-onenote/default.nix index 43b511c74a6bb..b2554cea7a698 100644 --- a/pkgs/applications/office/p3x-onenote/default.nix +++ b/pkgs/applications/office/p3x-onenote/default.nix @@ -46,6 +46,6 @@ appimageTools.wrapType2 rec { description = "Linux Electron Onenote - A Linux compatible version of OneNote"; license = licenses.mit; maintainers = with maintainers; [ tiagolobocastro ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/office/paper-note/default.nix b/pkgs/applications/office/paper-note/default.nix index 18ab6250d028b..e9fdd485befdc 100644 --- a/pkgs/applications/office/paper-note/default.nix +++ b/pkgs/applications/office/paper-note/default.nix @@ -44,13 +44,15 @@ stdenv.mkDerivation rec { gtksourceview5 ]; - postInstall = '' - ln -s $out/bin/io.posidon.Paper $out/bin/paper + postPatch = '' + substituteInPlace src/meson.build \ + --replace "1.2.0" "${libadwaita.version}" ''; meta = with lib; { - description = "Take notes in Markdown"; - homepage = "https://posidon.io/paper/"; + description = "A pretty note-taking app for GNOME"; + homepage = "https://gitlab.com/posidon_software/paper"; + mainProgram = "io.posidon.Paper"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ j0lol ]; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index c87e54e091543..f4535b59cf89e 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -1,6 +1,8 @@ { lib -, fetchurl +, fetchFromGitHub +, buildNpmPackage , nixosTests +, gettext , python3 , ghostscript , imagemagickBig @@ -12,10 +14,18 @@ , unpaper , poppler_utils , liberation_ttf -, fetchFromGitHub }: let + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "paperless-ngx"; + repo = "paperless-ngx"; + rev = "refs/tags/v${version}"; + hash = "sha256-aIJWEZD98tjfNDQjQfxRR1kOJ4P/fxZP8sw1dKy7apw="; + }; + # Use specific package versions required by paperless-ngx python = python3.override { packageOverrides = self: super: { @@ -78,36 +88,67 @@ let unpaper poppler_utils ]; + + frontend = buildNpmPackage { + pname = "paperless-ngx-frontend"; + inherit version src; + + npmDepsHash = "sha256-es9x7KR5S7E8KjYWq8ie/EwlAy6zrDvySYQi1vy08Wc="; + + nativeBuildInputs = [ + python3 + ]; + + postPatch = '' + cd src-ui + ''; + + CYPRESS_INSTALL_BINARY = "0"; + NG_CLI_ANALYTICS = "false"; + + npmBuildFlags = [ + "--" "--configuration" "production" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/paperless-ui + mv ../src/documents/static/frontend $out/lib/paperless-ui/ + runHook postInstall + ''; + }; in -python.pkgs.pythonPackages.buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "paperless-ngx"; - version = "1.11.3"; + format = "other"; - # Fetch the release tarball instead of a git ref because it contains the prebuilt frontend - src = fetchurl { - url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz"; - hash = "sha256-wGNkdczgV+UDd9ZO+BXMSWotpetE/+c/jJAAH+6SXps="; - }; + inherit version src; - format = "other"; + nativeBuildInputs = [ + gettext + ]; - propagatedBuildInputs = with python.pkgs.pythonPackages; [ + propagatedBuildInputs = with python.pkgs; [ aioredis - arrow + amqp + anyio asgiref async-timeout attrs autobahn automat + billiard bleach - blessed celery certifi cffi channels-redis channels - chardet + charset-normalizer click + click-didyoumean + click-plugins + click-repl coloredlogs concurrent-log-handler constantly @@ -116,20 +157,19 @@ python.pkgs.pythonPackages.buildPythonApplication rec { dateparser django-celery-results django-cors-headers + django-compression-middleware django-extensions django-filter - django-picklefield django djangorestframework filelock - fuzzywuzzy gunicorn h11 hiredis httptools humanfriendly + humanize hyperlink - imagehash idna imap-tools img2pdf @@ -140,9 +180,11 @@ python.pkgs.pythonPackages.buildPythonApplication rec { langdetect lxml msgpack + mysqlclient nltk numpy ocrmypdf + packaging pathvalidate pdf2image pdfminer-six @@ -150,6 +192,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { pillow pluggy portalocker + prompt-toolkit psycopg2 pyasn1-modules pyasn1 @@ -158,7 +201,6 @@ python.pkgs.pythonPackages.buildPythonApplication rec { python-dateutil python-dotenv python-gnupg - levenshtein python-magic pytz pyyaml @@ -171,36 +213,51 @@ python.pkgs.pythonPackages.buildPythonApplication rec { scikit-learn scipy service-identity - six - sortedcontainers + setproctitle + sniffio sqlparse threadpoolctl tika + tornado tqdm - twisted.optional-dependencies.tls + twisted txaio + tzdata tzlocal urllib3 uvicorn uvloop + vine watchdog - watchgod + watchfiles wcwidth + webencodings websockets whitenoise whoosh + zipp zope_interface - ]; + ] + ++ redis.optional-dependencies.hiredis + ++ twisted.optional-dependencies.tls + ++ uvicorn.optional-dependencies.standard; - # Compile manually because `pythonRecompileBytecodeHook` only works for - # files in `python.sitePackages` postBuild = '' - ${python.interpreter} -OO -m compileall src + # Compile manually because `pythonRecompileBytecodeHook` only works + # for files in `python.sitePackages` + ${python.pythonForBuild.interpreter} -OO -m compileall src + + # Collect static files + ${python.pythonForBuild.interpreter} src/manage.py collectstatic --clear --no-input + + # Compile string translations using gettext + ${python.pythonForBuild.interpreter} src/manage.py compilemessages ''; installPhase = '' - mkdir -p $out/lib - cp -r . $out/lib/paperless-ngx + 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" \ @@ -210,12 +267,17 @@ python.pkgs.pythonPackages.buildPythonApplication rec { --prefix PATH : "${path}" ''; - nativeCheckInputs = with python.pkgs.pythonPackages; [ + postFixup = '' + # Remove tests with samples (~14M) + find $out/lib/paperless-ngx -type d -name tests -exec rm -rv {} + + ''; + + nativeCheckInputs = with python.pkgs; [ + factory_boy + imagehash pytest-django pytest-env - pytest-sugar pytest-xdist - factory_boy pytestCheckHook ]; @@ -234,7 +296,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { # Disable unneeded code coverage test substituteInPlace src/setup.cfg \ - --replace "--cov --cov-report=html" "" + --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 \ @@ -250,13 +312,14 @@ python.pkgs.pythonPackages.buildPythonApplication rec { ]; passthru = { - inherit python path; + inherit python path frontend; tests = { inherit (nixosTests) paperless; }; }; meta = with lib; { description = "Tool to scan, index, and archive all of your physical documents"; homepage = "https://paperless-ngx.readthedocs.io/"; + changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ lukegb gador erikarvstedt ]; }; diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index ee621df4d8379..ca6cab2c1e4f8 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -11,6 +11,7 @@ , fabulous , getkey , psutil +, shared-mime-info , pkgs }: @@ -39,6 +40,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + shared-mime-info openpaperwork-gtk ]; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 980a4aabf7ab5..6323c2c417b85 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "2M2eMP54F3RRDMBuAZ1gBiBoMmTRJaHTUwtTjj4ZU+4="; + sha256 = "/5k+zUtTE+Dr879xbHDCAYrqlEJLsbkcRSG3GbA/PCg="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/office/pdfmm/default.nix b/pkgs/applications/office/pdfmm/default.nix new file mode 100644 index 0000000000000..1a61f786de2fe --- /dev/null +++ b/pkgs/applications/office/pdfmm/default.nix @@ -0,0 +1,57 @@ +{ bash +, coreutils +, fetchFromGitHub +, ghostscript +, glibc +, gnome +, gnused +, lib +, resholve +, xorg +}: + +resholve.mkDerivation rec { + pname = "pdfmm"; + version = "unstable-2019-01-24"; + + src = fetchFromGitHub { + owner = "jpfleury"; + repo = pname; + rev = "45ee7796659d23bb030bf06647f1af85e1d2b52d"; + hash = "sha256-TOISD/2g7MwnLrtpMnfr2Ln0IiwlJVNavWl4eh/uwN0="; + }; + + dontBuild = true; + + installPhase = '' + install -Dm 0755 pdfmm $out/bin/pdfmm + ''; + + solutions.default = { + scripts = [ + "bin/pdfmm" + ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + ghostscript + glibc + gnome.zenity + gnused + xorg.xmessage + ]; + execer = [ + "cannot:${glibc.bin}/bin/locale" + "cannot:${gnome.zenity}/bin/zenity" + "cannot:${xorg.xmessage}/bin/xmessage" + ]; + keep."$toutLu" = true; + }; + + meta = with lib; { + description = "Graphical assistant to reduce the size of a PDF file"; + homepage = "https://github.com/jpfleury/pdfmm"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index e0bfa57b1e8d3..e602e6e5af7f4 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.60.2"; + version = "0.61.3"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-jSRZZufGi1wmdT7LeNutkO74bqln8uJ5TSEDCJyfPB4="; + hash = "sha256-OtFHTZQ+K3CQPEcuirvp8MmW9IC5lEpg42A6FSZVTTA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 99f5e0e249f63..c8829981e4a3b 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -17,14 +17,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.1.1"; + version = "23.2.4"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-BMisfFMy3kNoZHCYbGqzT9hxzVpKBUN6fSOilPw9O1w="; + sha256 = "sha256-ZliVhnO9fK/6k4Ga86ZSmhzQ3YKziAab19oZs9Pteic="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/office/qpdfview/default.nix index db5995149c082..6cc26c95a05b5 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/office/qpdfview/default.nix @@ -12,19 +12,21 @@ , file , ghostscript }: + mkDerivation rec { pname = "qpdfview"; - version = "0.4.18"; + version = "0.5.0"; src = fetchurl { - url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256 = "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"; + url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-0.5.tar.gz"; + hash = "sha256-RO/EQKRhy911eps5bxRh7novQ2ToHfVb0CIfkQIZvpk="; }; - # apply upstream fix for qt5.15 https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - patches = [ ./qpdfview-qt515-compat.patch ]; + nativeBuildInputs = [ + qmake + pkg-config + ]; - nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qtsvg @@ -35,6 +37,7 @@ mkDerivation rec { file ghostscript ]; + preConfigure = '' qmakeFlags+=(*.pro) ''; diff --git a/pkgs/applications/office/rime-cli/default.nix b/pkgs/applications/office/rime-cli/default.nix new file mode 100644 index 0000000000000..5dd412a450224 --- /dev/null +++ b/pkgs/applications/office/rime-cli/default.nix @@ -0,0 +1,23 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "rime-cli"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "puddinging"; + repo = pname; + rev = "v${version}"; + hash = "sha256-CI0Jva7oA/zUGatv+wCdByqbTBNQRw+4clr8IDKX6HQ="; + }; + + vendorHash = null; + + meta = with lib; { + homepage = "https://github.com/puddinging/rime-cli"; + changelog = "https://github.com/puddinging/rime-cli/releases/tag/v${version}"; + description = "A command line tool to add customized vocabulary for Rime IME"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index fc1087ab2d933..9b7c58ef5c938 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.12.1"; + version = "7.12.2"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-zMw6C7kyO8yDLF2vrRlBqcgzcfM4TR7/fJPHPaixw6Y="; + sha256 = "sha256-iWKe4l3n5e0CWd2h+tUtbPfmTznJb+UuKo3shAUDs1E="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/teapot/default.nix b/pkgs/applications/office/teapot/default.nix index d2d44511bc63f..209fa7c4556b8 100644 --- a/pkgs/applications/office/teapot/default.nix +++ b/pkgs/applications/office/teapot/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; # By no known reason libtirpc is not detected - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; cmakeConfigureFlags = [ diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 50db368073d14..7794116ecd46d 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -67,6 +67,7 @@ python3.pkgs.buildPythonApplication rec { # Testing of the CLI part and output "test_color_due_dates" "test_color_flag" + "test_datetime_serialization" # Will be fixed in versions after 4.1.0 "test_default_command" "test_main" "test_missing_cache_dir" @@ -74,8 +75,6 @@ python3.pkgs.buildPythonApplication rec { "test_xdg_existant" # Tests are sensitive to performance "test_sorting_fields" - ] ++ lib.optionals stdenv.isDarwin [ - "test_sorting_fields" ]; pythonImportsCheck = [ diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 5566906919a8d..a18307c77548c 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-01-23"; + version = "unstable-2023-02-25"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "f676cba7f9749825744ec705ee58b9fbea47db51"; - sha256 = "Zx1fGicCuX+HJm2QFSYQhcd9Ibg3qj5h9NPlSNNVLag="; + rev = "e2acd675e6aeac609ae071aa169b2661c1fbd862"; + sha256 = "y7y9DQ6oy/1EuLl4FAkRJd0zzMRm/2OOvnfWtwpf8AU="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { Cocoa ]; - NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\""; + env.NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\""; postInstall = lib.optionalString stdenv.isDarwin '' shopt -s extglob diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 08084bfbf7ac8..35b9b694c0918 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, copyDesktopItems, libxshmfence, wrapGAppsHook }: +{ lib, callPackage, ... }: let metaCommon = with lib; { @@ -7,117 +7,11 @@ let license = licenses.agpl3Plus; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ fliegendewurst ]; + maintainers = with maintainers; [ fliegendewurst eliandoran ]; }; - - version = "0.58.7"; - - desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - desktopSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c"; - - serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "0xr474z7wz0z4rqvk5rhv6xh51mdysr8zw86fs8fk7av0fdqxyka"; - in { - trilium-desktop = stdenv.mkDerivation rec { - pname = "trilium-desktop"; - inherit version; - meta = metaCommon // { - mainProgram = "trilium"; - }; - - src = fetchurl desktopSource; - - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - wrapGAppsHook - copyDesktopItems - ]; - - buildInputs = atomEnv.packages ++ [ libxshmfence ]; - - desktopItems = [ - (makeDesktopItem { - name = "Trilium"; - exec = "trilium"; - icon = "trilium"; - comment = meta.description; - desktopName = "Trilium Notes"; - categories = [ "Office" ]; - }) - ]; - - # Remove trilium-portable.sh, so trilium knows it is packaged making it stop auto generating a desktop item on launch - postPatch = '' - rm ./trilium-portable.sh - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/share/trilium - mkdir -p $out/share/icons/hicolor/128x128/apps - - cp -r ./* $out/share/trilium - ln -s $out/share/trilium/trilium $out/bin/trilium - - ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png - runHook postInstall - ''; - - # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) - ''; + trilium-desktop = callPackage ./desktop.nix { metaCommon = metaCommon; }; + trilium-server = callPackage ./server.nix { metaCommon = metaCommon; }; - dontStrip = true; - - passthru.updateScript = ./update.sh; - }; - - - trilium-server = stdenv.mkDerivation rec { - pname = "trilium-server"; - inherit version; - meta = metaCommon; - - src = fetchurl serverSource; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ - stdenv.cc.cc.lib - ]; - - patches = [ - # patch logger to use console instead of rolling files - ./0001-Use-console-logger-instead-of-rolling-files.patch - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/share/trilium-server - - cp -r ./* $out/share/trilium-server - runHook postInstall - ''; - - postFixup = '' - cat > $out/bin/trilium-server <<EOF - #!${stdenv.cc.shell} - cd $out/share/trilium-server - exec ./node/bin/node src/www - EOF - chmod a+x $out/bin/trilium-server - ''; - - passthru.tests = { - trilium-server = nixosTests.trilium-server; - }; - }; } diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix new file mode 100644 index 0000000000000..e48355660cb21 --- /dev/null +++ b/pkgs/applications/office/trilium/desktop.nix @@ -0,0 +1,89 @@ +{ stdenv, lib, unzip, autoPatchelfHook +, fetchurl, atomEnv, makeWrapper +, makeDesktopItem, copyDesktopItems, wrapGAppsHook, libxshmfence +, metaCommon +}: + +let + pname = "trilium-desktop"; + version = "0.58.8"; + + linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; + linuxSource.sha256 = "03v4a135brj2z1gj2y611pi7szfhr62xxj0qhki0mychypvdfx7i"; + + darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; + darwinSource.sha256 = "0ncf2cl62hn2ja72fw10s40rzkgcwy77ggs29zpgjjlp9hkk3v8q"; + + meta = metaCommon // { + mainProgram = "trilium"; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; + + linux = stdenv.mkDerivation rec { + pname = "trilium-desktop"; + inherit version; + + src = fetchurl linuxSource; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + wrapGAppsHook + copyDesktopItems + ]; + + buildInputs = atomEnv.packages ++ [ libxshmfence ]; + + desktopItems = [ + (makeDesktopItem { + name = "Trilium"; + exec = "trilium"; + icon = "trilium"; + comment = meta.description; + desktopName = "Trilium Notes"; + categories = [ "Office" ]; + }) + ]; + + # Remove trilium-portable.sh, so trilium knows it is packaged making it stop auto generating a desktop item on launch + postPatch = '' + rm ./trilium-portable.sh + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mkdir -p $out/share/trilium + mkdir -p $out/share/icons/hicolor/128x128/apps + + cp -r ./* $out/share/trilium + ln -s $out/share/trilium/trilium $out/bin/trilium + + ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png + runHook postInstall + ''; + + # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) + ''; + + dontStrip = true; + + passthru.updateScript = ./update.sh; + }; + + darwin = stdenv.mkDerivation { + inherit pname version meta; + + src = fetchurl darwinSource; + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; + }; + +in + if stdenv.isDarwin then darwin else linux diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix new file mode 100644 index 0000000000000..78bae4f4655b8 --- /dev/null +++ b/pkgs/applications/office/trilium/server.nix @@ -0,0 +1,51 @@ +{ stdenv, lib, autoPatchelfHook, fetchurl, nixosTests +, metaCommon }: + +let + serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; + serverSource.sha256 = "0mkbmb26y99rc22bpxlc3gdgv84rj7wvsva741gw2z0cb3jh4ziv"; + version = "0.58.8"; +in stdenv.mkDerivation rec { + pname = "trilium-server"; + inherit version; + meta = metaCommon // { + platforms = [ "x86_64-linux" ]; + }; + + src = fetchurl serverSource; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + ]; + + patches = [ + # patch logger to use console instead of rolling files + ./0001-Use-console-logger-instead-of-rolling-files.patch + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mkdir -p $out/share/trilium-server + + cp -r ./* $out/share/trilium-server + runHook postInstall + ''; + + postFixup = '' + cat > $out/bin/trilium-server <<EOF + #!${stdenv.cc.shell} + cd $out/share/trilium-server + exec ./node/bin/node src/www + EOF + chmod a+x $out/bin/trilium-server + ''; + + passthru.tests = { + trilium-server = nixosTests.trilium-server; + }; +} diff --git a/pkgs/applications/office/trilium/update.sh b/pkgs/applications/office/trilium/update.sh index 02af29dace2f4..e292609e3f759 100755 --- a/pkgs/applications/office/trilium/update.sh +++ b/pkgs/applications/office/trilium/update.sh @@ -4,15 +4,20 @@ set -euo pipefail cd $(dirname "${BASH_SOURCE[0]}") +setKV () { + sed -i "s|$2 = \".*\"|$2 = \"${3:-}\"|" $1 +} + version=$(curl -s --show-error "https://api.github.com/repos/zadam/trilium/releases/latest" | jq -r '.tag_name' | tail -c +2) +# Update desktop application sha256_linux64=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz) -sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz) +sha256_darwin64=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip) +setKV ./desktop.nix version $version +setKV ./desktop.nix linuxSource.sha256 $sha256_linux64 +setKV ./desktop.nix darwinSource.sha256 $sha256_darwin64 -setKV () { - sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix -} - -setKV version $version -setKV desktopSource.sha256 $sha256_linux64 -setKV serverSource.sha256 $sha256_linux64_server +# Update server +sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz) +setKV ./server.nix version $version +setKV ./server.nix serverSource.sha256 $sha256_linux64_server diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 0b086160e50ce..3647d8ea8e22f 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; # To be able to find <Xft.h> - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; # Binaries look for LuaFileSystem library (lfs.so) at runtime postInstall = '' diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 2dc24570b7210..f16e4cf146c6f 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.20"; + version = "6.0.22"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-HsAvodqio3GJ9TK1pt4WwlEZEAo52ocH0r7cf9IQe9w="; + sha256 = "sha256-OXlX4E5C6UEDR3+fDYB3O5isO8vABpd6hvrq+4kZ1iA="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/plasma-mobile/angelfish.nix index 8158e4d6ea6e8..7a7e48d736d0c 100644 --- a/pkgs/applications/plasma-mobile/angelfish.nix +++ b/pkgs/applications/plasma-mobile/angelfish.nix @@ -3,11 +3,12 @@ , cmake , corrosion , extra-cmake-modules -, gcc11 +, gcc12 , kconfig , kcoreaddons , kdbusaddons , ki18n +, kirigami-addons , kirigami2 , knotifications , kpurpose @@ -19,8 +20,8 @@ , srcs # These must be updated in tandem with package updates. -, cargoShaForVersion ? "22.11" -, cargoSha256 ? "sha256-l1+nRXGt6Oga9yFJ3sVNitUN4XNcVjT1bJwi2XlleF4=" +, cargoShaForVersion ? "23.01.0" +, cargoSha256 ? "sha256-dIXA875HsG56baHrTWw9L560n4s0wRv6Ag/2oj1x0gk=" }: # Guard against incomplete updates. @@ -45,7 +46,7 @@ mkDerivation rec { cmake corrosion extra-cmake-modules - gcc11 # doesn't build with GCC 9 from stdenv on aarch64 + gcc12 # doesn't build with GCC 9 from stdenv on aarch64 ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo @@ -57,6 +58,7 @@ mkDerivation rec { kcoreaddons kdbusaddons ki18n + kirigami-addons kirigami2 knotifications kpurpose diff --git a/pkgs/applications/plasma-mobile/audiotube.nix b/pkgs/applications/plasma-mobile/audiotube.nix index cb87fe0ed24db..14bfc6d18917e 100644 --- a/pkgs/applications/plasma-mobile/audiotube.nix +++ b/pkgs/applications/plasma-mobile/audiotube.nix @@ -2,7 +2,7 @@ , mkDerivation , extra-cmake-modules -, gcc11 +, gcc12 , wrapGAppsHook , gst_all_1 @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook - gcc11 # doesn't build with GCC 9 from stdenv on aarch64 + gcc12 # doesn't build with GCC 9 from stdenv on aarch64 python3Packages.wrapPython python3Packages.pybind11 ]; diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 86a4f1d10071a..9efbaa6033950 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -78,6 +78,7 @@ let plasma-phonebook = callPackage ./plasma-phonebook.nix {}; plasma-settings = callPackage ./plasma-settings.nix {}; plasmatube = callPackage ./plasmatube {}; + qmlkonsole = callPackage ./qmlkonsole.nix {}; spacebar = callPackage ./spacebar.nix { inherit srcs; }; tokodon = callPackage ./tokodon.nix {}; }; diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh index 96bb4eb0907c2..ffcf74a5f7154 100644 --- a/pkgs/applications/plasma-mobile/fetch.sh +++ b/pkgs/applications/plasma-mobile/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.11/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/23.01.0/ -A '*.tar.xz' ) diff --git a/pkgs/applications/plasma-mobile/kasts.nix b/pkgs/applications/plasma-mobile/kasts.nix index 1903bf259baea..59b455398203d 100644 --- a/pkgs/applications/plasma-mobile/kasts.nix +++ b/pkgs/applications/plasma-mobile/kasts.nix @@ -9,6 +9,7 @@ , kconfig , kcoreaddons , ki18n +, kirigami-addons , kirigami2 , networkmanager-qt , qtkeychain @@ -40,6 +41,7 @@ mkDerivation rec { kconfig kcoreaddons ki18n + kirigami-addons kirigami2 networkmanager-qt qtkeychain diff --git a/pkgs/applications/plasma-mobile/kweather.nix b/pkgs/applications/plasma-mobile/kweather.nix index 49dcb1db99f7b..d6a1f999ce651 100644 --- a/pkgs/applications/plasma-mobile/kweather.nix +++ b/pkgs/applications/plasma-mobile/kweather.nix @@ -5,6 +5,7 @@ , extra-cmake-modules , kconfig +, kholidays , ki18n , kirigami-addons , kirigami2 @@ -26,6 +27,7 @@ mkDerivation rec { buildInputs = [ kconfig + kholidays ki18n kirigami-addons kirigami2 diff --git a/pkgs/applications/plasma-mobile/neochat.nix b/pkgs/applications/plasma-mobile/neochat.nix index 2f655d5a9e09c..8b3da82b8b885 100644 --- a/pkgs/applications/plasma-mobile/neochat.nix +++ b/pkgs/applications/plasma-mobile/neochat.nix @@ -1,4 +1,4 @@ -{ gcc11Stdenv +{ gcc12Stdenv , lib , srcs @@ -31,7 +31,7 @@ }: # Workaround for AArch64 not using GCC11 yet. -gcc11Stdenv.mkDerivation rec { +gcc12Stdenv.mkDerivation rec { pname = "neochat"; inherit (srcs.neochat) version src; diff --git a/pkgs/applications/plasma-mobile/plasmatube/default.nix b/pkgs/applications/plasma-mobile/plasmatube/default.nix index 81041b22931dc..c9753babeaaf0 100644 --- a/pkgs/applications/plasma-mobile/plasmatube/default.nix +++ b/pkgs/applications/plasma-mobile/plasmatube/default.nix @@ -8,6 +8,7 @@ , kdeclarative , ki18n , kirigami2 +, mpv , qtmultimedia , qtquickcontrols2 , yt-dlp @@ -26,6 +27,7 @@ mkDerivation { kdeclarative ki18n kirigami2 + mpv qtmultimedia qtquickcontrols2 ] ++ (with gst_all_1; [ diff --git a/pkgs/applications/plasma-mobile/qmlkonsole.nix b/pkgs/applications/plasma-mobile/qmlkonsole.nix new file mode 100644 index 0000000000000..da892fb47c0e4 --- /dev/null +++ b/pkgs/applications/plasma-mobile/qmlkonsole.nix @@ -0,0 +1,42 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules + +, kconfig +, ki18n +, kirigami-addons +, kirigami2 +, kcoreaddons +, qtquickcontrols2 +, kwindowsystem +, qmltermwidget +}: + +mkDerivation { + pname = "qmlkonsole"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kconfig + ki18n + kirigami-addons + kirigami2 + qtquickcontrols2 + kcoreaddons + kwindowsystem + qmltermwidget + ]; + + meta = with lib; { + description = "Terminal app for Plasma Mobile"; + homepage = "https://invent.kde.org/plasma-mobile/qmlkonsole"; + license = with licenses; [ gpl2Plus gpl3Plus cc0 ]; + maintainers = with maintainers; [ balsoft ]; + }; +} diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix index 7ec5541f48c8e..c120851e5b2e0 100644 --- a/pkgs/applications/plasma-mobile/spacebar.nix +++ b/pkgs/applications/plasma-mobile/spacebar.nix @@ -1,6 +1,6 @@ { lib , mkDerivation -, gcc11Stdenv +, gcc12Stdenv , srcs , cmake @@ -12,6 +12,7 @@ , kcontacts , ki18n , kio +, kirigami-addons , kirigami2 , knotifications , kpeople @@ -23,8 +24,8 @@ , qtquickcontrols2 }: -# Workaround for AArch64 not using GCC11 yet. -gcc11Stdenv.mkDerivation rec { +# Workaround for AArch64 still using GCC9. +gcc12Stdenv.mkDerivation rec { pname = "spacebar"; inherit (srcs.spacebar) version src; @@ -40,6 +41,7 @@ gcc11Stdenv.mkDerivation rec { kcontacts ki18n kio + kirigami-addons kirigami2 knotifications kpeople diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix index a30966847a59d..42e0612cf8cb0 100644 --- a/pkgs/applications/plasma-mobile/srcs.nix +++ b/pkgs/applications/plasma-mobile/srcs.nix @@ -4,195 +4,187 @@ { alligator = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/alligator-22.11.tar.xz"; - sha256 = "02hg42mmvykq71my6wbgc3yri4c3mr4bp73b7p21j1b8m3x0ycsl"; - name = "alligator-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/alligator-23.01.0.tar.xz"; + sha256 = "00vcj8dvzqj9vhq60ygqj62vx26lnai1j7117q0klp8wc9vngbvc"; + name = "alligator-23.01.0.tar.xz"; }; }; angelfish = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/angelfish-22.11.tar.xz"; - sha256 = "07gp6468c7rhf3hzzk6qyz4kcah0s1wnn5r3mx7qmg777xaans9y"; - name = "angelfish-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/angelfish-23.01.0.tar.xz"; + sha256 = "1pzms8xj57r8cv400fbcj9f4v8bs8xlws0f8zgak57jw5yxs073p"; + name = "angelfish-23.01.0.tar.xz"; }; }; audiotube = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/audiotube-22.11.tar.xz"; - sha256 = "0ga7ag8v9l91j5rrn02kk73zl29lwigcql1xfh7yw5cnky3xd13q"; - name = "audiotube-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/audiotube-23.01.0.tar.xz"; + sha256 = "0cjyjqin8zmgav3wf96zv2kr0ifn4xk4il1l5ybwf4k73qg1387x"; + name = "audiotube-23.01.0.tar.xz"; }; }; calindori = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/calindori-22.11.tar.xz"; - sha256 = "1mgdd61zmnjbpcwkaq2aiawksf1s86b05sq502by6gpdrwndhb5c"; - name = "calindori-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/calindori-23.01.0.tar.xz"; + sha256 = "0jhrxsh6gd20qpq68n2lspfkgq3bam46j6m10jnm3zckb190pfhl"; + name = "calindori-23.01.0.tar.xz"; }; }; kalk = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kalk-22.11.tar.xz"; - sha256 = "0ri39455341nw6bn0lphky6n2b4ib9g4i24f6gzc0adnbhbpxdiq"; - name = "kalk-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kalk-23.01.0.tar.xz"; + sha256 = "1d5xlinrwjyxfr7ibxjjgbqmy69w6sgxxdpfn1x1wccnjfld4zqf"; + name = "kalk-23.01.0.tar.xz"; }; }; kasts = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kasts-22.11.tar.xz"; - sha256 = "049700i15cw07c6053iml1q3h5mni24kdf8nvkdafdafhslb84i9"; - name = "kasts-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kasts-23.01.0.tar.xz"; + sha256 = "09xvgd5vdmniqlnaxrim9d0rpv2qkdz91jq168gzl1kczl26pivf"; + name = "kasts-23.01.0.tar.xz"; }; }; kclock = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kclock-22.11.tar.xz"; - sha256 = "02v64zfbv1g3q4w79d0r8rxqiqsnxms7dgkjv09bp1gl1asqx354"; - name = "kclock-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kclock-23.01.0.tar.xz"; + sha256 = "0fxda2cqi9qqj2lkzs08jr8i35jzzy5z76k2mbz2qyfmby7hsz1r"; + name = "kclock-23.01.0.tar.xz"; }; }; keysmith = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/keysmith-22.11.tar.xz"; - sha256 = "1aimsgwk80yvncbsjnaxvr6aj8y4g40dpwfv0qi0k7b3xkrmqdk5"; - name = "keysmith-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/keysmith-23.01.0.tar.xz"; + sha256 = "0m5gbf3rw1l6qx5aphr57726p6v5nl2g718ainxa689p075smfbf"; + name = "keysmith-23.01.0.tar.xz"; }; }; khealthcertificate = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/khealthcertificate-22.11.tar.xz"; - sha256 = "0gw6j70k0nvbfb1vfj8b64vfipdckzd8hqqmp9vrmsg7y8g8n0hi"; - name = "khealthcertificate-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/khealthcertificate-23.01.0.tar.xz"; + sha256 = "193agd3jg029vcq1h5hdg3gw6zgqcmszl6ffcrid0ajbbiic4pbm"; + name = "khealthcertificate-23.01.0.tar.xz"; }; }; koko = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/koko-22.11.tar.xz"; - sha256 = "1jqjjd9spyppdbijdnvci742wj80p10pfbjp1hyc0y4zdjic67bv"; - name = "koko-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/koko-23.01.0.tar.xz"; + sha256 = "1bfbfwavphj3bnf8icnakbdaa6a7i0fgyhs8xa73clwig54fk4np"; + name = "koko-23.01.0.tar.xz"; }; }; kongress = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kongress-22.11.tar.xz"; - sha256 = "03r8xck9vxl3al3f5v6g0yzqzs3yxl3lg7zg73ik22q6z2rb1adb"; - name = "kongress-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kongress-23.01.0.tar.xz"; + sha256 = "0yma1b44sjnvhsw31r5bndrpj2sjgwgchpzc8bf9380l6an9k4r5"; + name = "kongress-23.01.0.tar.xz"; }; }; krecorder = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/krecorder-22.11.tar.xz"; - sha256 = "1wiihcp1c0wc7ssj9hj18rnzf8synaxmq6b0m2m286x4zibl50wb"; - name = "krecorder-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/krecorder-23.01.0.tar.xz"; + sha256 = "0aja3w8qbp96h43igajs068s89gf6nn7zwf6c813rbyqzl350phn"; + name = "krecorder-23.01.0.tar.xz"; }; }; ktrip = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/ktrip-22.11.tar.xz"; - sha256 = "07mjf9jpj20ixhswy4byqy3m4sr1qylwlvq2prabn11j42ahpsy7"; - name = "ktrip-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/ktrip-23.01.0.tar.xz"; + sha256 = "1l69fd1hhclm9212h6zm4nhkc0dg2wl47jw7wl9s6vy3xvmysihm"; + name = "ktrip-23.01.0.tar.xz"; }; }; kweather = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/kweather-22.11.tar.xz"; - sha256 = "0sqc74yp5hvrjagax6nj0gm4qvbxqr66706yh12abcn9gpl33ndl"; - name = "kweather-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/kweather-23.01.0.tar.xz"; + sha256 = "1hcb8jzx2bwcyxphya7kx7q2yri1w0k2753xiibw1hlgmb3qzr7s"; + name = "kweather-23.01.0.tar.xz"; }; }; neochat = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/neochat-22.11.tar.xz"; - sha256 = "1gnhk9hww05bc4y8jd4sg3146c6m96ds2saajrnzyc6963j2ndi5"; - name = "neochat-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/neochat-23.01.0.tar.xz"; + sha256 = "0pkas8whwy1ih4sx9vaa7k55iiiy955dh4d53i4l1d0sjdf8pysd"; + name = "neochat-23.01.0.tar.xz"; }; }; plasma-dialer = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/plasma-dialer-22.11.tar.xz"; - sha256 = "1qx7xmvfszpsrb2jylnwfs8rhr09kxvy5vnyzzcds248ljh5l6dy"; - name = "plasma-dialer-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-dialer-23.01.0.tar.xz"; + sha256 = "0n9g3jf71lpcwlwr1ia1i6kh0kiv2vizssni1df3cwskd7hivn7h"; + name = "plasma-dialer-23.01.0.tar.xz"; }; }; plasma-phonebook = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/plasma-phonebook-22.11.tar.xz"; - sha256 = "02sj6v18w63ixy0c93fm4j9n4q98497qrb509q84618gry4cazly"; - name = "plasma-phonebook-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-phonebook-23.01.0.tar.xz"; + sha256 = "0pprfgims9h6g1xw48w66bqkmqp7qp7gkc7k4zbj3lgmmnwh6z9i"; + name = "plasma-phonebook-23.01.0.tar.xz"; }; }; plasma-settings = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/plasma-settings-22.11.tar.xz"; - sha256 = "0pg71plcbn4zkwxwcvay9swaa5xn3mnljdpnh4i8f86x2pa1pq5j"; - name = "plasma-settings-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/plasma-settings-23.01.0.tar.xz"; + sha256 = "0fz0zjyh15ma6kv79pm0gc92iz6gikxyr4afkyzabzk9559dv1p7"; + name = "plasma-settings-23.01.0.tar.xz"; }; }; plasmatube = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/plasmatube-22.11.tar.xz"; - sha256 = "0vgxvyw4yl91kaj9cnjf455mpj4a5rh5f1z0in8k9p2jbs8wmjil"; - name = "plasmatube-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/plasmatube-23.01.0.tar.xz"; + sha256 = "06hwa1m6gaacjmcyssa63vw43cgx096x9aj87rv1z9k9qsv2qgfj"; + name = "plasmatube-23.01.0.tar.xz"; }; }; qmlkonsole = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/qmlkonsole-22.11.tar.xz"; - sha256 = "03hwyrl6rb7yidw0nadis6csb6snpfv137j46rbpl35vrqrnrh5i"; - name = "qmlkonsole-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/qmlkonsole-23.01.0.tar.xz"; + sha256 = "07h2pkz9h5lm232jasf6znf0i2p5c5qxnjac1d51qf8rfm0fp1q3"; + name = "qmlkonsole-23.01.0.tar.xz"; }; }; spacebar = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/spacebar-22.11.tar.xz"; - sha256 = "1q0nyfvssiz5i19wyk4pvazax3vvk945cmknw4l51mpcc3hnc1v5"; - name = "spacebar-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/spacebar-23.01.0.tar.xz"; + sha256 = "0srwvbnb80cgxkjjq2ch1lrbki7m169i86hig41h368wr9nmjnsl"; + name = "spacebar-23.01.0.tar.xz"; }; }; telly-skout = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/telly-skout-22.11.tar.xz"; - sha256 = "0sfdia4jwcv24z5d3qykqv7ncr2c5v7ywq471nggwpcr22bwzn6x"; - name = "telly-skout-22.11.tar.xz"; - }; - }; - tokodon = { - version = "22.11"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/tokodon-22.11.tar.xz"; - sha256 = "0afrqih1bkgg0xqr81sq9q3glyhy8347p8vzddl42zsxax9wki59"; - name = "tokodon-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/telly-skout-23.01.0.tar.xz"; + sha256 = "1wcabca1wlxjna4bd1blpwh7hi1wrcmn8bc06g8mpdzm8756d7sk"; + name = "telly-skout-23.01.0.tar.xz"; }; }; vakzination = { - version = "22.11"; + version = "23.01.0"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.11/vakzination-22.11.tar.xz"; - sha256 = "0587p5q9v0lh3nz00dfa8kym36xcgcg8n4alnchk6kr8c479kmk6"; - name = "vakzination-22.11.tar.xz"; + url = "${mirror}/stable/plasma-mobile/23.01.0/vakzination-23.01.0.tar.xz"; + sha256 = "1lx46r46xq18a1pxa6qhnwks43w022fkbrvylb84ycy59djq371n"; + name = "vakzination-23.01.0.tar.xz"; }; }; } diff --git a/pkgs/applications/plasma-mobile/tokodon.nix b/pkgs/applications/plasma-mobile/tokodon.nix index a412835c8ccd1..f93336d40fa8c 100644 --- a/pkgs/applications/plasma-mobile/tokodon.nix +++ b/pkgs/applications/plasma-mobile/tokodon.nix @@ -34,14 +34,14 @@ libsForQt5.mkDerivation rec { pname = "tokodon"; - version = "22.11.2"; + version = "23.01.0"; # NOTE: the tokodon point release was not uploaded to the Plasma Mobile gear repo. src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = pname; rev = "v${version}"; - hash = "sha256-uE9iHZDfpn1NTCeJPgsp2WBe0curdguTUbMTrkrmJ6M="; + hash = "sha256-iJRyKEFdoWtZLZ/nkMvy2S7EF+JRHXi3O0DswfrClDU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index ceb0f7661c8e3..641bda8fb8618 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -1,18 +1,19 @@ { lib , stdenvNoCC , fetchFromGitHub +, nix-update-script , nixosTests , php}: stdenvNoCC.mkDerivation rec { name = "cloudlog"; - version = "2.3.3"; + version = "2.4"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - sha256 = "sha256-9m7BuUNdGeKqi8pzeW2J9zpxShulpynCwJJGkRFkBa4="; + sha256 = "sha256-aF1f6EmlcUgZOkHJgrW6P923QW56vWMH8CZ4cnYiiSk="; }; postPath = '' @@ -25,8 +26,11 @@ stdenvNoCC.mkDerivation rec { cp -R ./* $out ''; - passthru.tests = { - inherit (nixosTests) cloudlog; + passthru = { + tests = { + inherit (nixosTests) cloudlog; + }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index a67b48c840be1..defed4dc431ac 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { hackrf ] ++ lib.optional stdenv.isLinux limesuite; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration -Wno-int-conversion"; buildFlags = [ "dump1090" "view1090" ]; diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 549df5d9b5ddd..f6c7531ab3c71 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "fldigi"; - version = "4.1.23"; + version = "4.1.25"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-42bh/J/DQ/V9ORKKZgOmlvhyNR7UjbqPPD0Wi9ofyo0="; + sha256 = "sha256-TsS/OS2mXwqsk+E+9MEoETIHRWks8Hg/qw8WRmAxB2M="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/applications/radio/flex-ncat/default.nix index e06b241905d3a..5425c6b73ac8e 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.1-20221007.1"; + version = "0.2-20230126.0"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nCAT"; rev = "v${version}"; - hash = "sha256-9rxI3wsqjhaH7DD1Go/8s0r6jXaE15Z9PPtbsnsfrM0="; + hash = "sha256-2taQQVTgAFyqtS06zZ+4Qmr/JIqU6mxNQYvxt+L/Mtc="; }; - vendorSha256 = "sha256-lnJtFixgv4ke4Knavb+XKFPzHCiAPhNtfZS3SRVvY2g="; + vendorHash = "sha256-Tv6sbfWNOHYwA7v1SpNeM9aHs+3DSFv4V4qxllxrzJc="; meta = with lib; { homepage = "https://github.com/kc2g-flex-tools/nCAT"; diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix index 477953ab26fde..b1bda9fadce35 100644 --- a/pkgs/applications/radio/flex-ndax/default.nix +++ b/pkgs/applications/radio/flex-ndax/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "flex-ndax"; - version = "0.2-20221007.1"; + version = "0.3-20230126.0"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nDAX"; rev = "v${version}"; - hash = "sha256-QldbiJnCjWrlXEPvyAqV5Xwz9YvsnVobVy/E/OB0A1k="; + hash = "sha256-co2S3DrdGeoNneqNyifd+Z1z5TshyD+FgHkiSRqK3SQ="; }; buildInputs = [ libpulseaudio ]; - vendorSha256 = "sha256-eHy8oFYicVONQr31LQQ9b5auzeBoIzbszw2buKaBQbQ="; + vendorHash = "sha256-eHy8oFYicVONQr31LQQ9b5auzeBoIzbszw2buKaBQbQ="; meta = with lib; { broken = stdenv.isDarwin; diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 06cb2776a0b34..605a916c6b4da 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -69,9 +69,9 @@ stdenv.mkDerivation rec { "-DUNITTEST=ON" ] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ]; - NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-DAPPLE_OLD_XCODE" - ]; + ]); doCheck = true; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 6ca669a8fe948..e06e3437281cf 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -49,12 +49,12 @@ , versionAttr ? { major = "3.10"; minor = "5"; - patch = "0"; + patch = "1"; } }: let - sourceSha256 = "sha256-NP7OH4kRulWpWxyHudIzCJPfjiiilgnhBlixmwOj70I="; + sourceSha256 = "sha256-D5Bsj70IHFOLPZQbaxkGdx7Lz94bXhCfnNfhZb3dDp4="; featuresInfo = { # Needed always basic = { diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index ff6aaf35bea09..bdbc22cb787d3 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -37,20 +37,18 @@ rec { ); nativeBuildInputs = lib.flatten (lib.mapAttrsToList ( feat: info: ( - if hasFeature feat then - (if builtins.hasAttr "native" info then info.native else []) ++ - (if builtins.hasAttr "pythonNative" info then info.pythonNative else []) - else - [] + lib.optionals (hasFeature feat) ( + (lib.optionals (builtins.hasAttr "native" info) info.native) ++ + (lib.optionals (builtins.hasAttr "pythonNative" info) info.pythonNative) + ) ) ) featuresInfo); buildInputs = lib.flatten (lib.mapAttrsToList ( feat: info: ( - if hasFeature feat then - (if builtins.hasAttr "runtime" info then info.runtime else []) ++ - (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) - else - [] + lib.optionals (hasFeature feat) ( + (lib.optionals (builtins.hasAttr "runtime" info) info.runtime) ++ + (lib.optionals (builtins.hasAttr "pythonRuntime" info) info.pythonRuntime) + ) ) ) featuresInfo); cmakeFlags = lib.mapAttrsToList ( diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 926022353e41f..c38c89fc459b1 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -41,12 +41,9 @@ let ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) ++ lib.flatten (lib.mapAttrsToList ( feat: info: ( - if unwrapped.hasFeature feat then - (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) - else - [] + lib.optionals ((unwrapped.hasFeature feat) && (builtins.hasAttr "pythonRuntime" info)) info.pythonRuntime ) - ) unwrapped.featuresInfo) + ) unwrapped.featuresInfo) ; pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs); diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix index cfb1f367ad80f..9a48854ccc699 100644 --- a/pkgs/applications/radio/gridtracker/default.nix +++ b/pkgs/applications/radio/gridtracker/default.nix @@ -1,18 +1,19 @@ { lib , stdenv , fetchFromGitLab +, nix-update-script , nwjs }: stdenv.mkDerivation rec { pname = "gridtracker"; - version = "1.23.0110"; + version = "1.23.0206"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker"; rev = "v${version}"; - sha256 = "sha256-yQWdBNt7maYTzroB+P1hsGIeivkP+soR3/b847HLYZY="; + sha256 = "sha256-XWjKJga9aQrMb0ZfA4ElsPU1CfMwFtwYSK1vjgtlKes="; }; postPatch = '' @@ -27,6 +28,8 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "NO_DIST_INSTALL=1" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "An amateur radio companion to WSJT-X or JTDX"; longDescription = '' diff --git a/pkgs/applications/radio/guglielmo/default.nix b/pkgs/applications/radio/guglielmo/default.nix index 404ec7aa96a19..41d1407a9af3c 100644 --- a/pkgs/applications/radio/guglielmo/default.nix +++ b/pkgs/applications/radio/guglielmo/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub, cmake, pkg-config , airspy -, librtlsdr +, rtl-sdr , fdk_aac , faad2 , fftwFloat @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ airspy - librtlsdr + rtl-sdr fdk_aac faad2 fftwFloat @@ -42,7 +42,7 @@ mkDerivation rec { postFixup = '' # guglielmo opens SDR libraries at run time - patchelf --add-rpath "${airspy}/lib:${librtlsdr}/lib" $out/bin/.guglielmo-wrapped + patchelf --add-rpath "${airspy}/lib:${rtl-sdr}/lib" $out/bin/.guglielmo-wrapped ''; meta = with lib; { diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index 1180f5a941ae7..647f3efd6706c 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hackrf"; - version = "2022.09.1"; + version = "2023.01.1"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "hackrf"; rev = "v${version}"; - sha256 = "sha256-c+9DEMxioIbEDNTdLSOnxX1zpFk07K9rlGP9goEJMlU="; + sha256 = "sha256-zvSSCNtqHOZVlrBggjgxEyUTqTiAIAhdzUkm4Pm9b3k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix new file mode 100644 index 0000000000000..aa89d88197510 --- /dev/null +++ b/pkgs/applications/radio/qdmr/default.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + writeText, + cmake, + libxslt, + docbook_xsl_ns, + wrapQtAppsHook, + libusb1, + qtlocation, + qtserialport, + qttools, + qtbase, + yaml-cpp, +}: + +let + inherit (stdenv) isLinux; +in + +stdenv.mkDerivation rec { + pname = "qdmr"; + version = "0.11.2"; + + src = fetchFromGitHub { + owner = "hmatuschek"; + repo = "qdmr"; + rev = "v${version}"; + sha256 = "sha256-zT31tzsm5OM99vz8DzGCdPmnemiwiJpKccYwECnUgOQ="; + }; + + nativeBuildInputs = [ + cmake + libxslt + wrapQtAppsHook + installShellFiles + ]; + + buildInputs = [ + libusb1 + qtlocation + qtserialport + qttools + qtbase + yaml-cpp + ]; + + postPatch = lib.optionalString isLinux '' + substituteInPlace doc/docbook_man.debian.xsl \ + --replace /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook\.xsl ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl + ''; + + cmakeFlags = [ "-DBUILD_MAN=ON" ]; + + postInstall = '' + installManPage doc/dmrconf.1 doc/qdmr.1 + mkdir -p "$out/etc/udev/rules.d" + cp ${src}/dist/99-qdmr.rules $out/etc/udev/rules.d/ + ''; + + meta = { + description = "GUI application and command line tool for programming DMR radios"; + homepage = "https://dm3mat.darc.de/qdmr/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ janik _0x4A6F ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index 75fb91d5ce6a4..34e83ab95ca23 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -1,18 +1,18 @@ -{ lib, python38Packages, fetchPypi -, fftw, alsa-lib, pulseaudio, wxPython_4_0 }: +{ lib, python39Packages, fetchPypi +, fftw, alsa-lib, pulseaudio, pyusb, wxPython_4_0 }: -python38Packages.buildPythonApplication rec { +python39Packages.buildPythonApplication rec { pname = "quisk"; - version = "4.1.73"; + version = "4.2.17"; src = fetchPypi { inherit pname version; - sha256 = "37dfb02a32341025c086b07d66ddf1608d4ee1ae1c62fb51f87c97662f13e0d8"; + sha256 = "sha256-eF/3++wRG0JulVTT+GvtqleBPkzLSZeu+RfHDI1xfOY="; }; buildInputs = [ fftw alsa-lib pulseaudio ]; - propagatedBuildInputs = [ wxPython_4_0 ]; + propagatedBuildInputs = [ pyusb wxPython_4_0 ]; doCheck = false; diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index d8180750c7a1c..722a0565e0de5 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "librtlsdr"; repo = "librtlsdr"; rev = "v${version}"; - sha256 = "1fgxlkgmdchbrf0nn98ivjr6css5hak3608nr4xrf2qzf7xy2kdk"; + hash = "sha256-s03h+3EfC5c7yRYBM6aCRWtmstwRJWuBywuyVt+k/bk="; }; postPatch = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ libusb1 ]; + propagatedBuildInputs = [ libusb1 ]; cmakeFlags = lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index fa3f566b3f0c1..392088eca95f4 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -42,13 +42,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "7.8.6"; + version = "7.10.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-tLU2OHFf1PPNRr1t3MWWCKnvILp1DW0k4TAxrXWI2X4="; + sha256 = "sha256-hsYt7zGG6CSWeQ9A3GPt65efjZGPu33O5pIhnZjFgmY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/radio/sdrpp/default.nix b/pkgs/applications/radio/sdrpp/default.nix index f2bb7920ea43d..9926fab1a7469 100644 --- a/pkgs/applications/radio/sdrpp/default.nix +++ b/pkgs/applications/radio/sdrpp/default.nix @@ -8,7 +8,7 @@ , hackrf_source ? true, hackrf , limesdr_source ? false, limesuite , sddc_source ? false -, rtl_sdr_source ? true, librtlsdr, libusb1 +, rtl_sdr_source ? true, rtl-sdr, libusb1 , rtl_tcp_source ? true , sdrplay_source ? false, sdrplay , soapy_source ? true, soapysdr @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ++ lib.optional bladerf_source libbladeRF ++ lib.optional hackrf_source hackrf ++ lib.optional limesdr_source limesuite - ++ lib.optionals rtl_sdr_source [ librtlsdr libusb1 ] + ++ lib.optionals rtl_sdr_source [ rtl-sdr libusb1 ] ++ lib.optional sdrplay_source sdrplay ++ lib.optional soapy_source soapysdr ++ lib.optionals plutosdr_source [ libiio libad9361 ] @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { OPT_BUILD_RIGCTL_SERVER = rigctl_server; }; - NIX_CFLAGS_COMPILE = "-fpermissive"; + env.NIX_CFLAGS_COMPILE = "-fpermissive"; hardeningDisable = lib.optional stdenv.cc.isClang "format"; diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix index 95f429aef43e0..ebb34b0a0ce55 100644 --- a/pkgs/applications/radio/soapyremote/default.nix +++ b/pkgs/applications/radio/soapyremote/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-include sys/select.h" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-include sys/select.h" ]); meta = with lib; { homepage = "https://github.com/pothosware/SoapyRemote"; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index adf997773eccf..59a1e0f59acc4 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -5,7 +5,8 @@ , python ? null , ncurses, swig2 , extraPackages ? [] -} : +, testers +}: let @@ -14,7 +15,7 @@ let modulesPath = "lib/SoapySDR/modules" + modulesVersion; extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; -in stdenv.mkDerivation { +in stdenv.mkDerivation (finalAttrs: { pname = "soapysdr"; inherit version; @@ -58,12 +59,15 @@ in stdenv.mkDerivation { done ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://github.com/pothosware/SoapySDR"; description = "Vendor and platform neutral SDR support library"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; mainProgram = "SoapySDRUtil"; + pkgConfigModules = [ "SoapySDR" ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index 3fd066ec7b7bb..80121db69c010 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { These change the parameters used when sounding the Morse code. cw reports any errors in embedded commands ''; - homepage = "http://unixcw.sourceforge.net"; + homepage = "https://unixcw.sourceforge.net"; maintainers = [ maintainers.mafo ]; license = licenses.gpl2; platforms=platforms.linux; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 93836cee28197..3dd7a5422537e 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.9.3"; + version = "2.9.4"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-TrvyPcpSMACrbKPVOjxHsVsC28LmruiVO/CyCPh0KZ8="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Hi0VqBtGeaXMsibxbHk+2FN8mzfpmkuDr37JRW4Fp+s="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index d47bd418f513d..fe2b915e93adc 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 hamlib ]; diff --git a/pkgs/applications/science/astronomy/astrolog/default.nix b/pkgs/applications/science/astronomy/astrolog/default.nix index 26d0639ae67f2..743a58e9e053d 100644 --- a/pkgs/applications/science/astronomy/astrolog/default.nix +++ b/pkgs/applications/science/astronomy/astrolog/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ xorg.libX11 ]; - NIX_CFLAGS_COMPILE = "-Wno-format-security"; + env.NIX_CFLAGS_COMPILE = "-Wno-format-security"; installPhase = let diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 703416f074aa8..64e3f8713b2f8 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "oct22b"; - version = "20221001_b"; + srcVersion = "feb23a"; + version = "20230201_a"; pname = "gildas"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "sha256-MGfU2gzBbJ8ITpU7OiwCaHbi8s9Y6gvcAvSUuEZjfqk="; + sha256 = "sha256-A6jtcC8QMtJ7YcNaPiOjwNPDGPAjmRA3jZLEt5iBONE="; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); - patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./python-ldflags.patch ]; + patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; NIX_LDFLAGS = lib.optionalString stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); diff --git a/pkgs/applications/science/astronomy/gildas/python-ldflags.patch b/pkgs/applications/science/astronomy/gildas/python-ldflags.patch deleted file mode 100644 index 3bbcb9f36e990..0000000000000 --- a/pkgs/applications/science/astronomy/gildas/python-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN gildas-src-oct22b/admin/python-config-ldflags.py gildas-src-oct22b.patched/admin/python-config-ldflags.py ---- gildas-src-oct22b/admin/python-config-ldflags.py 2022-10-03 14:16:33.000000000 +0200 -+++ gildas-src-oct22b.patched/admin/python-config-ldflags.py 2022-10-19 22:03:53.000000000 +0200 -@@ -32,7 +32,7 @@ - libs.insert(0, '-L' + getvar('LIBDIR')) - - # Framework (specific for Mac) --if not getvar('PYTHONFRAMEWORK'): -- libs.extend(getvar('LINKFORSHARED').split()) -+#if not getvar('PYTHONFRAMEWORK'): -+# libs.extend(getvar('LINKFORSHARED').split()) - - print(' '.join(libs)) diff --git a/pkgs/applications/science/astronomy/gprojector/default.nix b/pkgs/applications/science/astronomy/gprojector/default.nix index f5fa5f1d1e4b8..5fd698788cc97 100644 --- a/pkgs/applications/science/astronomy/gprojector/default.nix +++ b/pkgs/applications/science/astronomy/gprojector/default.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "gprojector"; - version = "3.0.4"; + version = "3.0.6"; src = fetchzip { url = "https://www.giss.nasa.gov/tools/gprojector/download/G.ProjectorJ-${version}.tgz"; - sha256 = "sha256-6EixVNRgYnuY9INb7gAyBzo125DhPEUPD+pGxjzmhy8="; + sha256 = "sha256-aw/p6mbTJl023d46NUZV3pnP4WVdYqZTFmgGlHEKfq0="; }; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index d74ad2c4e8788..3769948fd3eff 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.6.1"; + version = "3.6.3"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-WWbtfqvGd13+a41z8/MjlchllpuhLX08nu15OlYUeuI="; + sha256 = "sha256-sve9q4iM/Y8+K64Ceby/KGx5Un5G0o5cCnIxJkXTgug="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 8c0cb2be32b9d..94aa92a1b713f 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { }) ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with lib; { description = "Renders an image of the earth or other planets into the X root window"; - homepage = "http://xplanet.sourceforge.net"; + homepage = "https://xplanet.sourceforge.net"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus sander ]; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index e117af03b57dd..4c5f3162febdb 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk_8, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk, Cocoa }: stdenv.mkDerivation rec { - pname = "ANTs"; + pname = "ANTs"; version = "2.4.3"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "sha256-S4HYhsqof27UXEYjKvbod8N7PkZDmwLdwcEAvJD0W5g="; }; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ itk vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; diff --git a/pkgs/applications/science/biology/bayescan/default.nix b/pkgs/applications/science/biology/bayescan/default.nix index cd5bb3210364e..e715ff4b45b06 100644 --- a/pkgs/applications/science/biology/bayescan/default.nix +++ b/pkgs/applications/science/biology/bayescan/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp -r ../*pdf ../input_examples ../"R functions" $out/share/doc/bayescan ''; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; meta = with lib; { description = "Detecting natural selection from population-based genetic data"; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 719f450650029..993afff5965e9 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.16"; + version = "1.17"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-kL9kfJrXnhCiQ7gFjIc94Ff9cBLiUNWuZXSDl4ei7NY="; + sha256 = "sha256-AfddjnAdhbLHWRckEgCcwE8pthYWrOL6dRFhI95Flsw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/bowtie/default.nix b/pkgs/applications/science/biology/bowtie/default.nix index ccb797d8a227e..bec263a2d9315 100644 --- a/pkgs/applications/science/biology/bowtie/default.nix +++ b/pkgs/applications/science/biology/bowtie/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An ultrafast memory-efficient short read aligner"; license = licenses.artistic2; - homepage = "http://bowtie-bio.sourceforge.net"; + homepage = "https://bowtie-bio.sourceforge.net"; maintainers = with maintainers; [ prusnak ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 42ce5f934e826..3eef648372555 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++11" (lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing") ]; diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index 90eef027a8425..cbde1647db9bf 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -4,7 +4,7 @@ , substituteAll , cmake , openjpeg -, libyamlcpp +, yaml-cpp , batchVersion ? false , withJpegLs ? true , withOpenJpeg ? true @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals batchVersion [ libyamlcpp ] + buildInputs = lib.optionals batchVersion [ yaml-cpp ] ++ lib.optionals withOpenJpeg [ openjpeg openjpeg.dev ]; cmakeFlags = lib.optionals batchVersion [ "-DBATCH_VERSION=ON" - "-DYAML-CPP_DIR=${libyamlcpp}/lib/cmake/yaml-cpp" + "-DYAML-CPP_DIR=${yaml-cpp}/lib/cmake/yaml-cpp" ] ++ lib.optionals withJpegLs [ "-DUSE_JPEGLS=ON" ] ++ lib.optionals withOpenJpeg [ diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 8073b1bea1634..241585b3579ed 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diamond"; - version = "2.0.15"; + version = "2.1.3"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "17z9vwj58i1zc22gv4qscx0dk3nxf5ix443gxsibh3a5zsnc6dkg"; + sha256 = "sha256-gvPftUSH+Gnn8LQeORpv7jjHewUKSeo2FVNcoaE2GKU="; }; diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index 9aa655932d35a..c555a30b15a8d 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "eggnog-mapper"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "eggnogdb"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Fn7hJhZG/T8f2nP+ltl1/FBFwXz0Kxz/4mIma/Z0bnE="; + hash = "sha256-6R2gl2l2Cl/eva0g+kxDLBI2+5T9cFTgaGMsEfeDVU0="; }; postPatch = '' diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix index 5c2f09a4faefa..0ceaab4ab46be 100644 --- a/pkgs/applications/science/biology/freebayes/default.nix +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: foomatic_rip-options.o:/build/foomatic-filters-4.0.17/options.c:49: multiple definition of `cupsfilter'; # foomatic_rip-foomaticrip.o:/build/foomatic-filters-4.0.17/foomaticrip.c:158: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' install -vD bin/freebayes bin/bamleftalign scripts/* -t $out/bin diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index f6d767235b7ff..ec97f0e6aa31d 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.15.5"; + version = "2.16.0"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; - sha256 = "sha256-AKKMtR0hU2O84mRJxxsXNCYHeW8d6t3XJpzOKKaxAWw="; + sha256 = "sha256-pfFUtPgHzTWMm3sh4un8SwSYF8HM30HbAQznxlu4Irw="; }; installPhase = '' diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/applications/science/biology/inormalize/default.nix index 8ea115c6b25df..b4999193e177e 100644 --- a/pkgs/applications/science/biology/inormalize/default.nix +++ b/pkgs/applications/science/biology/inormalize/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "inormalize"; - name = "${pname}-2014-10-21"; + version = "unstable-2014-10-21"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index fe2b773fb0e30..0104a5506bc6a 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -1,20 +1,35 @@ -{ lib, stdenv, fetchFromGitLab, unzip, zlib, python3, parallel }: +{ lib +, stdenv +, fetchFromGitLab +, unzip +, zlib +, python3 +, parallel +}: stdenv.mkDerivation rec { pname = "last"; - version = "1422"; + version = "1447"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; - rev = version; - sha256 = "sha256-3OhttOd6qgO6d+sbVkZj8i/K6bJTvlMyfa3E4mIpt24="; + rev = "refs/tags/${version}"; + hash = "sha256-zts1F2tFeBP7CQifpc2M4i6duK8FA7hQXTOizv8/kWM="; }; - nativeBuildInputs = [ unzip ]; - buildInputs = [ zlib python3 ]; + nativeBuildInputs = [ + unzip + ]; - makeFlags = [ "prefix=${placeholder "out"}" ]; + buildInputs = [ + zlib + python3 + ]; + + makeFlags = [ + "prefix=${placeholder "out"}" + ]; postFixup = '' for f in $out/bin/parallel-* ; do diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/applications/science/biology/minc-widgets/default.nix index e8aef4138b05e..42178722b5517 100644 --- a/pkgs/applications/science/biology/minc-widgets/default.nix +++ b/pkgs/applications/science/biology/minc-widgets/default.nix @@ -4,8 +4,7 @@ stdenv.mkDerivation rec { pname = "minc-widgets"; - name = "${pname}-2016-04-20"; - + version = "unstable-2016-04-20"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/applications/science/biology/minia/default.nix b/pkgs/applications/science/biology/minia/default.nix index 6b6bc300e0d9f..023a05d7504f9 100644 --- a/pkgs/applications/science/biology/minia/default.nix +++ b/pkgs/applications/science/biology/minia/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./no-bundle.patch ]; - NIX_CFLAGS_COMPILE = [ "-Wformat" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wformat" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ hdf5 boost ]; diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix new file mode 100644 index 0000000000000..f26f06a1f298b --- /dev/null +++ b/pkgs/applications/science/biology/nest/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, fetchFromGitHub +, testers +, cmake +, gsl +, libtool +, findutils +, llvmPackages +, mpi +, nest +, pkg-config +, boost +, python3 +, readline +, autoPatchelfHook +, withPython ? false +, withMpi ? false +}: + +stdenv.mkDerivation rec { + pname = "nest"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "nest"; + repo = "nest-simulator"; + rev = "v${version}"; + sha256 = "sha256-wmn5LOOHlSuyPdV6O6v7j10dxdcvqpym6MfveZdL+dU="; + }; + + postPatch = '' + patchShebangs cmake/CheckFiles/check_return_val.sh + # fix PyNEST installation path + # it expects CMAKE_INSTALL_LIBDIR to be relative + substituteInPlace cmake/ProcessOptions.cmake \ + --replace "\''${CMAKE_INSTALL_LIBDIR}/python" "lib/python" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + findutils + ]; + + buildInputs = [ + gsl + readline + libtool # libltdl + boost + ] ++ lib.optionals withPython [ + python3 + python3.pkgs.cython + ] ++ lib.optional withMpi mpi + ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + + propagatedBuildInputs = with python3.pkgs; [ + numpy + ]; + + cmakeFlags = [ + "-Dwith-python=${if withPython then "ON" else "OFF"}" + "-Dwith-mpi=${if withMpi then "ON" else "OFF"}" + "-Dwith-openmp=ON" + ]; + + postInstall = '' + # Alternative to autoPatchElf, moves libraries where + # Nest expects them to be + find $out/lib/nest -type f -exec ln -s {} $out/lib \; + ''; + + passthru.tests.version = testers.testVersion { + package = nest; + command = "nest --version"; + }; + + meta = with lib; { + description = "NEST is a command line tool for simulating neural networks"; + homepage = "https://www.nest-simulator.org/"; + license = licenses.gpl2; + maintainers = with maintainers; [ jiegec davidcromp ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index a35d586b9ac3f..115def63a3097 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -1,94 +1,104 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, pkg-config -, automake -, autoconf -, libtool -, ncurses , readline -, which -, python ? null -, useMpi ? false +, xorg , mpi -, iv +, cmake +, bison +, flex +, git +, perl +, gsl +, xcbuild +, python3 +, useMpi ? false +, useIv ? true +, useCore ? false +, useRx3d ? false }: + stdenv.mkDerivation rec { - pname = "neuron${lib.optionalString useMpi "-mpi"}"; - version = "7.5"; + pname = "neuron"; + version = "8.2.2"; - nativeBuildInputs = [ which pkg-config automake autoconf libtool ]; - buildInputs = [ ncurses readline python iv ] - ++ lib.optional useMpi mpi; + # format is for pythonModule conversion + format = "other"; - src = fetchurl { - url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz"; - sha256 = "0f26v3qvzblcdjg7isq0m9j2q8q7x3vhmkfllv8lsr3gyj44lljf"; - }; + nativeBuildInputs = [ + cmake + bison + flex + git + ] ++ lib.optional useCore [ perl gsl ] + ++ lib.optional stdenv.isDarwin [ xcbuild ]; - patches = (lib.optionals (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]); + buildInputs = lib.optional useIv [ + xorg.libX11.dev + xorg.libXcomposite.dev + xorg.libXext.dev + ]; - # With LLVM 3.8 and above, clang (really libc++) gets upset if you attempt to redefine these... - postPatch = lib.optionalString stdenv.cc.isClang '' - substituteInPlace src/gnu/neuron_gnu_builtin.h \ - --replace 'double abs(double arg);' "" \ - --replace 'float abs(float arg);' "" \ - --replace 'short abs(short arg);' "" \ - --replace 'long abs(long arg);' "" - '' + lib.optionalString stdenv.isDarwin '' - # we are darwin, but we don't have all the quirks the source wants to compensate for - substituteInPlace src/nrnpython/setup.py.in --replace 'readline="edit"' 'readline="readline"' - for f in src/nrnpython/*.[ch] ; do - substituteInPlace $f --replace "<Python/Python.h>" "<Python.h>" - done - ''; + propagatedBuildInputs = [ + readline + python3 + python3.pkgs.wheel + python3.pkgs.setuptools + python3.pkgs.scikit-build + python3.pkgs.matplotlib + ] ++ lib.optional useMpi [ + mpi + ] ++ lib.optional useMpi [ + python3.pkgs.mpi4py + ] ++ lib.optional useRx3d [ + python3.pkgs.cython + python3.pkgs.numpy + ]; - enableParallelBuilding = true; + patches = [ ./neuron_darwin_rpath.patch ]; - ## neuron install by default everything under prefix/${host_arch}/* - ## override this to support nix standard file hierarchy - ## without issues: install everything under prefix/ - preConfigure = '' - ./build.sh - export prefix="''${prefix} --exec-prefix=''${out}" + # Patch build shells for cmake (bin, src, cmake) and submodules (external) + postPatch = '' + patchShebangs ./bin ./src ./external ./cmake + sed -e 's#DESTDIR =#DESTDIR = '"$out"'#' -i external/coreneuron/extra/nrnivmodl_core_makefile.in ''; - configureFlags = with lib; - [ "--with-readline=${readline}" "--with-iv=${iv}" ] - ++ optionals (python != null) [ "--with-nrnpython=${python.interpreter}" ] - ++ (if useMpi then ["--with-mpi" "--with-paranrn"] - else ["--without-mpi"]); + cmakeFlags = [ + "-DNRN_ENABLE_INTERVIEWS=${if useIv then "ON" else "OFF"}" + "-DNRN_ENABLE_MPI=${if useMpi then "ON" else "OFF"}" + "-DNRN_ENABLE_CORENEURON=${if useCore then "ON" else "OFF"}" + "-DNRN_ENABLE_RX3D=${if useRx3d then "ON" else "OFF"}" + ]; - - postInstall = lib.optionalString (python != null) '' - ## standardise python neuron install dir if any - if [[ -d $out/lib/python ]]; then - mkdir -p ''${out}/${python.sitePackages} - mv ''${out}/lib/python/* ''${out}/${python.sitePackages}/ - fi + postInstall = '' + mkdir -p $out/${python3.sitePackages} + mv $out/lib/python/* $out/${python3.sitePackages}/ + rm -rf $out/lib/python build + for entry in $out/lib/*.so; do + # remove references to build + patchelf --set-rpath $(patchelf --print-rpath $entry | tr ':' '\n' | sed '/^\/build/d' | tr '\n' ':') $entry + done ''; - propagatedBuildInputs = [ readline ncurses which libtool ]; + src = fetchurl { + url = "https://github.com/neuronsimulator/nrn/releases/download/${version}/full-src-package-${version}.tar.gz"; + sha256 = "sha256-orGeBxu3pu4AyAW5P1EGJv8G0dOUZcSOjpUaloqicZU="; + }; meta = with lib; { - broken = stdenv.isDarwin; description = "Simulation environment for empirically-based simulations of neurons and networks of neurons"; - - longDescription = "NEURON is a simulation environment for developing and exercising models of - neurons and networks of neurons. It is particularly well-suited to problems where - cable properties of cells play an important role, possibly including extracellular - potential close to the membrane), and where cell membrane properties are complex, - involving many ion-specific channels, ion accumulation, and second messengers"; - - sourceProvenance = with sourceTypes; [ - fromSource - ] ++ lib.optionals (python != null) [ - binaryNativeCode # "geometry3d" bundled libraries - ]; - license = licenses.bsd3; - homepage = "http://www.neuron.yale.edu/neuron"; - maintainers = [ maintainers.adev ]; - # source claims it's only tested for x86 and powerpc - platforms = platforms.x86_64 ++ platforms.i686; + longDescription = '' + NEURON is a simulation environment for developing and exercising models of + neurons and networks of neurons. It is particularly well-suited to problems where + cable properties of cells play an important role, possibly including extracellular + potential close to the membrane), and where cell membrane properties are complex, + involving many ion-specific channels, ion accumulation, and second messengers + ''; + sourceProvenance = with sourceTypes; [ fromSource ]; + license = licenses.bsd3; + homepage = "http://www.neuron.yale.edu/neuron"; + maintainers = with maintainers; [ adev davidcromp ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch b/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch deleted file mode 100644 index 923bffb1c338e..0000000000000 --- a/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- nrn-7.4/src/mac/Makefile.am 2015-11-12 21:42:45.000000000 +0100 -+++ nrn-7.4.new/src/mac/Makefile.am 2016-08-24 17:43:39.000000000 +0200 -@@ -15,18 +15,8 @@ - host_cpu = @host_cpu@ - - if MAC_DARWIN --carbon = @enable_carbon@ - bin_SCRIPTS = $(launch_scripts) - install: install-am --if UniversalMacBinary -- $(CC) -arch ppc -o aoutppc -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon -- $(CC) -arch i386 -o aouti386 -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon -- lipo aouti386 aoutppc -create -output a.out --else -- gcc -g -arch i386 -Dncpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon -- --endif -- carbon=$(carbon) sh $(srcdir)/launch_inst.sh "$(host_cpu)" "$(DESTDIR)$(prefix)" "$(srcdir)" - for i in $(S) ; do \ - sed "s/^CPU.*/CPU=\"$(host_cpu)\"/" < $(DESTDIR)$(bindir)/$$i > temp; \ - mv temp $(DESTDIR)$(bindir)/$$i; \ diff --git a/pkgs/applications/science/biology/neuron/neuron_darwin_rpath.patch b/pkgs/applications/science/biology/neuron/neuron_darwin_rpath.patch new file mode 100644 index 0000000000000..1b0fa2670782a --- /dev/null +++ b/pkgs/applications/science/biology/neuron/neuron_darwin_rpath.patch @@ -0,0 +1,11 @@ +--- a/src/nrnpython/setup.py.in ++++ b/src/nrnpython/setup.py.in +@@ -124,7 +124,7 @@ libdirs = [destdir + get_escaped_path("@NRN_LIBDIR@"), + rpath_prefix_flag='-Wl,-R' + extra_link_args = [@NRN_LINK_FLAGS_COMMA_SEPARATED_STRINGS@] + @MAC_DARWIN_FALSE@extra_link_args += [rpath_prefix_flag+lib_path for lib_path in libdirs] +-@MAC_DARWIN_TRUE@extra_link_args.append("-Wl,-rpath,@loader_path/../../") ++@MAC_DARWIN_TRUE@extra_link_args.append("-Wl,-rpath,@loader_path/../../../") + @MAC_DARWIN_TRUE@extra_link_args.append("-Wl,-rpath,%s" % ivlibdir) + + # as neuron module will be built during make, add build/lib diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix index d5f625893e925..0be59bcd726a0 100644 --- a/pkgs/applications/science/biology/niftyreg/default.nix +++ b/pkgs/applications/science/biology/niftyreg/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07v9v9s41lvw72wpb1jgh2nzanyc994779bd35p76vg8mzifmprl"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=narrowing" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix index 659b1e97f200f..c2948087d8ed7 100644 --- a/pkgs/applications/science/biology/octopus/default.nix +++ b/pkgs/applications/science/biology/octopus/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-VaUr63v7mzhh4VBghH7a7qrqOYwl6vucmmKzTi9yAjY="; }) ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=deprecated-declarations" + ]; + postInstall = '' mkdir $out/bin mv $out/octopus $out/bin diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index 66ba244cacd68..871c76dc6e31b 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: /build/ccKomtcd.o:(.bss+0x4544): multiple definition of `SeqTypes'; # /build/ccx7EsgU.o:(.bss+0x2a0dfdc): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preBuild = '' cd ./src/ diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index b21ef2d71d6c2..00fd0ff0083e0 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preBuild = '' sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h - ${if stdenv.cc.isClang then "sed -i 's|g++|clang++|g' Makefile.std" else ""} + ${lib.optionalString stdenv.cc.isClang "sed -i 's|g++|clang++|g' Makefile.std"} makeFlagsArray+=( ZLIB=-lz diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index 0a33c97673196..e5ee4b53089f6 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { --replace "/bin/bash" "${bash}/bin/bash" mkdir -p "$out/${python.sitePackages}" export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python.interpreter} setup.py install \ + ${python.pythonForBuild.interpreter} setup.py install \ --install-lib=$out/${python.sitePackages} \ --prefix="$out" ''; diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/applications/science/biology/seaview/default.nix index 9cfa7cb933b0c..640d2f5ae4160 100644 --- a/pkgs/applications/science/biology/seaview/default.nix +++ b/pkgs/applications/science/biology/seaview/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { Gouy M., Guindon S. & Gascuel O. (2010) SeaView version 4 : a multiplatform graphical user interface for sequence alignment and phylogenetic tree building. Molecular Biology and Evolution 27(2):221-224. ''; - homepage = "http://doua.prabi.fr/software/seaview"; + homepage = "https://doua.prabi.fr/software/seaview"; license = licenses.gpl3; maintainers = [ maintainers.iimog ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index 5fcb367ce5cb1..04ef7c2e062ba 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.60"; + version = "2.62"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-ppKG7Z1TyLwUyqRnGYk3QWPJqKeNcW04GMW7myPFSNM="; + sha256 = "sha256-7uhQVLC/AEPAPUdm3+vABoIwG4uhNy/EngjsrZjT0Ts="; }; buildInputs = [ zlib ]; diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix index 8585f3770fbcd..9730601e4e7d1 100644 --- a/pkgs/applications/science/biology/strelka/default.nix +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib python2 ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=maybe-uninitialized" "-Wno-error=pessimizing-move" ]; diff --git a/pkgs/applications/science/biology/svaba/default.nix b/pkgs/applications/science/biology/svaba/default.nix index b1a174aaf882d..441c7ed6dcc3d 100644 --- a/pkgs/applications/science/biology/svaba/default.nix +++ b/pkgs/applications/science/biology/svaba/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: ./libfml.a(rle.o):/build/source/SeqLib/fermi-lite/rle.h:33: multiple definition of # `rle_auxtab'; ./libfml.a(misc.o):/build/source/SeqLib/fermi-lite/rle.h:33: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/biology/tandem-aligner/default.nix b/pkgs/applications/science/biology/tandem-aligner/default.nix index f74ba9d2e4434..53daffbe0677e 100644 --- a/pkgs/applications/science/biology/tandem-aligner/default.nix +++ b/pkgs/applications/science/biology/tandem-aligner/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , zlib }: @@ -16,6 +17,15 @@ stdenv.mkDerivation { hash = "sha256-iMDj1HZ8LzmZckuAM3lbG3eSJSd/5JGVA6SBs7+AgX8="; }; + patches = [ + (fetchpatch { + # https://github.com/seryrzu/tandem_aligner/pull/4 + url = "https://github.com/seryrzu/tandem_aligner/commit/8b516c94f90aaa9cb84278aa811285d4204b03a9.patch"; + hash = "sha256-kD46SykXklG/avK0+sc61YKFw9Bes8ZgFAjVXmcpN8k="; + stripLen = 1; + }) + ]; + sourceRoot = "source/tandem_aligner"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix index 8b9b086b77b28..2c0cad05596a5 100644 --- a/pkgs/applications/science/biology/varscan/default.nix +++ b/pkgs/applications/science/biology/varscan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "varscan"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { url = "https://github.com/dkoboldt/varscan/raw/master/VarScan.v${version}.jar"; - sha256 = "sha256-+yO3KrZ2+1qJvQIJHCtsmv8hC5a+4E2d7mrvTYtygU0="; + sha256 = "sha256-q4jkkKTqXHiaAPRThqo82i43+B4NaHUUuMyefW6tgg0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index c6339bab1228e..547123b67957c 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config doxygen ]; - NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h"; + env.NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h"; patches = [ (fetchurl { diff --git a/pkgs/applications/science/chemistry/chemtool/default.nix b/pkgs/applications/science/chemistry/chemtool/default.nix index 37057e1c604a4..fe2d658b5a44f 100644 --- a/pkgs/applications/science/chemistry/chemtool/default.nix +++ b/pkgs/applications/science/chemistry/chemtool/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Otherwise built fails as: # ld: inout.o:/build/chemtool-1.6.14/ct1.h:279: multiple definition of # `outtype'; draw.o:/build/chemtool-1.6.14/ct1.h:279: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preFixup = '' gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ fig2dev ]}") diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix index dc41019d364b0..260b1e24a082f 100644 --- a/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/pkgs/applications/science/chemistry/d-seams/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchFromGitHub, fetchpatch, catch2, rang, fmt, libyamlcpp, cmake +{ clangStdenv, fetchFromGitHub, fetchpatch, catch2, rang, fmt, yaml-cpp, cmake , eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }: clangStdenv.mkDerivation rec { @@ -20,7 +20,7 @@ clangStdenv.mkDerivation rec { }) ]; nativeBuildInputs = [ cmake lua luaPackages.luafilesystem ]; - buildInputs = [ fmt rang libyamlcpp eigen catch2 boost gsl liblapack blas ]; + buildInputs = [ fmt rang yaml-cpp eigen catch2 boost gsl liblapack blas ]; meta = with lib; { description = diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index b5b5be84c8ec1..98f7ccbfee02a 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 = "14.32.83"; + version = "16.1.3"; 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"; - sha256 = "sha256-otvaDPdGRmtUfWfy7m+CJOyDOFuW/AExbskYnYEikY8="; + sha256 = "sha256-k1F4OaER9vg8GIi4eqppeh2f0MtlcBSfd4zkewFp2As="; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/mopac/default.nix b/pkgs/applications/science/chemistry/mopac/default.nix new file mode 100644 index 0000000000000..d2b2b558bb78a --- /dev/null +++ b/pkgs/applications/science/chemistry/mopac/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, gfortran +, fetchFromGitHub +, cmake +, blas +, lapack +, python3Packages +}: + +assert blas.isILP64 == lapack.isILP64; + +stdenv.mkDerivation rec { + pname = "mopac"; + version = "22.0.6"; + + src = fetchFromGitHub { + owner = "openmopac"; + repo = pname; + rev = "v${version}"; + hash = "sha256-j4AP3tki+Ep9Pv+pDg8TwCiJvpF2j5npW3Kpat+7gGg="; + }; + + nativeBuildInputs = [ gfortran cmake ]; + + buildInputs = [ blas lapack ]; + + checkInputs = with python3Packages; [ python numpy ]; + + doCheck = true; + + preCheck = '' + export OMP_NUM_THREADS=2 + ''; + + meta = with lib; { + description = "Semiempirical quantum chemistry"; + homepage = "https://github.com/openmopac/mopac"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ sheepforce markuskowa ]; + }; +} diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix new file mode 100644 index 0000000000000..1e76a30595346 --- /dev/null +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -0,0 +1,194 @@ +{ lib +, stdenv +, pkgs +, fetchFromGitHub +, fetchpatch +, which +, openssh +, gcc +, gfortran +, perl +, mpi +, blas +, lapack +, python3 +, tcsh +, bash +, automake +, autoconf +, libtool +, makeWrapper +}: + +assert blas.isILP64 == lapack.isILP64; + +let + versionGA = "5.7.2"; # Fixed by nwchem + + ga_src = fetchFromGitHub { + owner = "GlobalArrays"; + repo = "ga"; + rev = "v${versionGA}"; + sha256 = "0c1y9a5jpdw9nafzfmvjcln1xc2gklskaly0r1alm18ng9zng33i"; + }; + +in +stdenv.mkDerivation rec { + pname = "nwchem"; + version = "7.0.2"; + + src = fetchFromGitHub { + owner = "nwchemgit"; + repo = "nwchem"; + rev = "v${version}-release"; + sha256 = "1ckhcjaw1hzdsmm1x2fva27c4rs3r0h82qivg72v53idz880hbp3"; + }; + + patches = [ + # Fix Python 3.10 compatibility + (fetchpatch { + name = "python3.10"; + url = "https://github.com/nwchemgit/nwchem/commit/638401361c6f294164a4f820ff867a62ac836fd5.patch"; + sha256 = "sha256-yUZb3wWYZm1dX0HwvffksFwhVdb7ix1p8ooJnqiSgEg="; + }) + ]; + + nativeBuildInputs = [ + perl + automake + autoconf + libtool + makeWrapper + gfortran + which + ]; + buildInputs = [ + tcsh + openssh + blas + lapack + python3 + ]; + propagatedBuildInputs = [ mpi ]; + propagatedUserEnvPkgs = [ mpi ]; + + postUnpack = '' + cp -r ${ga_src}/ source/src/tools/ga-${versionGA} + chmod -R u+w source/src/tools/ga-${versionGA} + ''; + + postPatch = '' + find -type f -executable -exec sed -i "s:/bin/csh:${tcsh}/bin/tcsh:" \{} \; + find -type f -name "GNUmakefile" -exec sed -i "s:/usr/bin/gcc:${gcc}/bin/gcc:" \{} \; + find -type f -name "GNUmakefile" -exec sed -i "s:/bin/rm:rm:" \{} \; + find -type f -executable -exec sed -i "s:/bin/rm:rm:" \{} \; + find -type f -name "makelib.h" -exec sed -i "s:/bin/rm:rm:" \{} \; + + # Overwrite script, skipping the download + echo -e '#!/bin/sh\n cd ga-${versionGA};autoreconf -ivf' > src/tools/get-tools-github + + patchShebangs ./ + ''; + + # There is no configure script. Instead the build is controlled via + # environment variables passed to the Makefile + configurePhase = '' + runHook preConfigure + + # config parameters + export NWCHEM_TARGET="LINUX64" + + export ARMCI_NETWORK="MPI-PR" + export USE_MPI="y" + export USE_MPIF="y" + + export NWCHEM_MODULES="all python" + + export USE_PYTHONCONFIG="y" + export USE_PYTHON64="n" + export PYTHONLIBTYPE="so" + export PYTHONHOME="${python3}" + export PYTHONVERSION=${lib.versions.majorMinor python3.version} + + export BLASOPT="-L${blas}/lib -lblas" + export LAPACK_LIB="-L${lapack}/lib -llapack" + export BLAS_SIZE=${if blas.isILP64 then "8" else "4"} + + # extra TCE related options + export MRCC_METHODS="y" + export EACCSD="y" + export IPCCSD="y" + + export NWCHEM_TOP="$(pwd)" + + runHook postConfigure + ''; + + enableParallelBuilding = true; + + preBuild = '' + ln -s ${ga_src} src/tools/ga-${versionGA}.tar.gz + cd src + make nwchem_config + ${lib.optionalString (!blas.isILP64) "make 64_to_32"} + ''; + + postBuild = '' + cd $NWCHEM_TOP/src/util + make version + make + cd $NWCHEM_TOP/src + make link + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/nwchem + + cp $NWCHEM_TOP/bin/LINUX64/nwchem $out/bin/nwchem + cp -r $NWCHEM_TOP/src/data $out/share/nwchem/ + cp -r $NWCHEM_TOP/src/basis/libraries $out/share/nwchem/data + cp -r $NWCHEM_TOP/src/nwpw/libraryps $out/share/nwchem/data + cp -r $NWCHEM_TOP/QA $out/share/nwchem + + wrapProgram $out/bin/nwchem \ + --set-default NWCHEM_BASIS_LIBRARY $out/share/nwchem/data/libraries/ + + cat > $out/share/nwchem/nwchemrc << EOF + nwchem_basis_library $out/share/nwchem/data/libraries/ + nwchem_nwpw_library $out/share/nwchem//data/libraryps/ + ffield amber + amber_1 $out/share/nwchem/data/amber_s/ + amber_2 $out/share/nwchem/data/amber_q/ + amber_3 $out/share/nwchem/data/amber_x/ + amber_4 $out/share/nwchem/data/amber_u/ + spce $out/share/nwchem/data/solvents/spce.rst + charmm_s $out/share/nwchem/data/charmm_s/ + charmm_x $out/share/nwchem/data/charmm_x/ + EOF + ''; + + doCheck = false; + + doInstallCheck = true; + installCheckPhase = '' + export OMP_NUM_THREADS=1 + + # Fix to make mpich run in a sandbox + export HYDRA_IFACE=lo + export OMPI_MCA_rmaps_base_oversubscribe=1 + + # run a simple water test + mpirun -np 2 $out/bin/nwchem $out/share/nwchem/QA/tests/h2o/h2o.nw > h2o.out + grep "Total SCF energy" h2o.out | grep 76.010538 + ''; + + passthru = { inherit mpi; }; + + meta = with lib; { + description = "Open Source High-Performance Computational Chemistry"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ sheepforce markuskowa ]; + homepage = "https://nwchemgit.github.io"; + license = licenses.ecl20; + }; +} diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index d0058c8650d81..cc145baef037a 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { ]; configureFlags = with lib; [ - "--with-yaml-prefix=${libyaml}" + "--with-yaml-prefix=${lib.getDev libyaml}" "--with-blas=-lblas" "--with-lapack=-llapack" - "--with-fftw-prefix=${fftw.dev}" - "--with-gsl-prefix=${gsl}" - "--with-libxc-prefix=${libxc}" + "--with-fftw-prefix=${lib.getDev fftw}" + "--with-gsl-prefix=${lib.getDev gsl}" + "--with-libxc-prefix=${lib.getDev libxc}" "--enable-openmp" ] ++ optional enableFma "--enable-fma3" ++ optional enableFma4 "--enable-fma4" diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 4ad0380ef1e31..15a1e3158233f 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ qt5.wrapQtAppsHook ]; buildInputs = [ python3Packages.numpy python3Packages.pyqt5 glew glm libpng libxml2 freetype msgpack netcdf ]; - NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; + env.NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; hardeningDisable = [ "format" ]; installPhase = '' diff --git a/pkgs/applications/science/chemistry/wxmacmolplt/default.nix b/pkgs/applications/science/chemistry/wxmacmolplt/default.nix new file mode 100644 index 0000000000000..455588ee17d18 --- /dev/null +++ b/pkgs/applications/science/chemistry/wxmacmolplt/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchFromGitHub +, wxGTK32 +, libGL +, libGLU +, pkg-config +, xorg +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "wxmacmolplt"; + version = "7.7.2"; + + src = fetchFromGitHub { + owner = "brettbode"; + repo = pname; + rev = "v${version}"; + hash = "sha256-sNxCjIEJUrDWtcUqBQqvanNfgNQ7T4cabYy+x9D1U+Q="; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ + wxGTK32 + libGL + libGLU + xorg.libX11 + xorg.libX11.dev + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Graphical user inteface for GAMESS-US"; + homepage = "https://brettbode.github.io/wxmacmolplt/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ sheepforce markuskowa ]; + }; +} diff --git a/pkgs/applications/science/computer-architecture/timeloop/default.nix b/pkgs/applications/science/computer-architecture/timeloop/default.nix index e1ed24be78350..4e794aaa29e24 100644 --- a/pkgs/applications/science/computer-architecture/timeloop/default.nix +++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix @@ -5,7 +5,7 @@ , libconfig , boost , libyaml -, libyamlcpp +, yaml-cpp , ncurses , gpm , enableAccelergy ? true @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { libconfig boost libyaml - libyamlcpp + yaml-cpp ncurses accelergy ] ++ lib.optionals stdenv.isLinux [ gpm ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { #link-time optimization fails on darwin #see https://github.com/NixOS/nixpkgs/issues/19098 - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-fno-lto"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto"; postPatch = '' # use nix ar/ranlib diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix index 9645e5426ab11..2e882aff361dc 100644 --- a/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -15,13 +15,13 @@ mkDerivation { pname = "appcsxcad"; - version = "unstable-2020-01-04"; + version = "unstable-2023-01-06"; src = fetchFromGitHub { owner = "thliebig"; repo = "AppCSXCAD"; - rev = "de8c271ec8b57e80233cb2a432e3d7fd54d30876"; - sha256 = "0shnfa0if3w588a68gr82qi6k7ldg1j2921fnzji90mmay21birp"; + rev = "379ede4b8e00c11e8d0fb724c35547991b30c423"; + hash = "sha256-L0ZEyovnfMzM7JuITBuhb4tJ2Aqgw52IiKEfEGq7Yo0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/applications/science/electronics/csxcad/default.nix index d9953a7857390..f6b0ff93fff5e 100644 --- a/pkgs/applications/science/electronics/csxcad/default.nix +++ b/pkgs/applications/science/electronics/csxcad/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "csxcad"; - version = "unstable-2020-02-08"; + version = "unstable-2022-05-18"; src = fetchFromGitHub { owner = "thliebig"; repo = "CSXCAD"; - rev = "ef6e40931dbd80e0959f37c8e9614c437bf7e518"; - sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb"; + rev = "cd9decb4d9cebe3c8bf115e2c0ee73f730f22da1"; + sha256 = "1604amhvp7dm8ych7gwzxwawqvb9hpjglk5ffd4qm0y3k6r89arn"; }; patches = [./searchPath.patch ]; diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix index 0515809dffebb..72b931f1d11cc 100644 --- a/pkgs/applications/science/electronics/digital/default.nix +++ b/pkgs/applications/science/electronics/digital/default.nix @@ -4,8 +4,8 @@ let pkgDescription = "A digital logic designer and circuit simulator."; - version = "0.29"; - buildDate = "2022-02-11T18:10:34+01:00"; # v0.29 commit date + version = "0.30"; + buildDate = "2023-02-03T08:00:56+01:00"; # v0.30 commit date desktopItem = makeDesktopItem { type = "Application"; @@ -24,7 +24,8 @@ let # inspect the .git folder to find the version number we are building, we then # provide that version number manually as a property. # (see https://github.com/hneemann/Digital/issues/289#issuecomment-513721481) - mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate}"; + # Also use the commit date as a build and output timestamp. + mvnOptions = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}"; in stdenv.mkDerivation rec { pname = "digital"; @@ -33,20 +34,16 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hneemann"; repo = "Digital"; - rev = "287dd939d6f2d4d02c0d883c6178c3425c28d39c"; - sha256 = "o5gaExUTTbk6WgQVw7/IeXhpNkj1BLkwD752snQqjIg="; + rev = "932791eb6486d04f2ea938d83bcdb71b56d3a3f6"; + sha256 = "cDykYlcFvDLFBy9UnX07iCR2LCq28SNU+h9vRT/AoJM="; }; - # Use fixed dates in the pom.xml and upgrade the jar and assembly plugins to - # a version where they support reproducible builds - patches = [ ./pom.xml.patch ]; - # Fetching maven dependencies from "central" needs the network at build phase, # we do that in this extra derivation that explicitely specifies its # outputHash to ensure determinism. mavenDeps = stdenv.mkDerivation { name = "${pname}-${version}-maven-deps"; - inherit src nativeBuildInputs version patches postPatch; + inherit src nativeBuildInputs version; dontFixup = true; buildPhase = '' mvn package ${mvnOptions} -Dmaven.repo.local=$out @@ -62,15 +59,11 @@ stdenv.mkDerivation rec { ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "X5ppGUVwNQrMnjzD4Kin1Xmt4O3x+qr7jK4jr6E8tCI="; + outputHash = "1Cgw+5V2E/RENMRMm368+2yvY7y6v9gTlo+LRgrCXcE="; }; nativeBuildInputs = [ copyDesktopItems maven makeWrapper ]; - postPatch = '' - substituteInPlace pom.xml --subst-var-by buildDate "${buildDate}" - ''; - buildPhase = '' mvn package --offline ${mvnOptions} -Dmaven.repo.local=${mavenDeps} ''; diff --git a/pkgs/applications/science/electronics/digital/pom.xml.patch b/pkgs/applications/science/electronics/digital/pom.xml.patch deleted file mode 100644 index cdc5a777c49d1..0000000000000 --- a/pkgs/applications/science/electronics/digital/pom.xml.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index d5f8330b4..58ed18b63 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -129,7 +130,7 @@ - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> -- <version>2.5</version> -+ <version>3.2.0</version> - <configuration> - <archive> - <manifest> -@@ -188,6 +189,7 @@ - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> -+ <version>3.2.0</version> - <configuration> - <finalName>Digital</finalName> - <appendAssemblyId>false</appendAssemblyId> -@@ -202,7 +204,7 @@ - </manifest> - <manifestEntries> - <Build-SCM-Revision>${git.commit.id.describe}</Build-SCM-Revision> -- <Build-Time>${maven.build.timestamp}</Build-Time> -+ <Build-Time>@buildDate@</Build-Time> - <SplashScreen-Image>icons/splash.png</SplashScreen-Image> - </manifestEntries> - </archive> diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index 1f6679625ec77..25efbd754b2a5 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -1,10 +1,36 @@ { lib -, python3Packages +, stdenv +, python3 , fetchFromBitbucket , fetchpatch +, substituteAll +, geos }: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + shapely = super.shapely.overridePythonAttrs (old: rec { + version = "1.8.4"; + src = self.fetchPypi { + pname = "Shapely"; + inherit version; + hash = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; + }; + # Environment variable used in shapely/_buildcfg.py + GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; + patches = [ + # Patch to search form GOES .so/.dylib files in a Nix-aware way + (substituteAll { + src = ./shapely-library-paths.patch; + libgeos_c = GEOS_LIBRARY_PATH; + libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; + }) + ]; + }); + }; + }; +in python.pkgs.buildPythonApplication rec { pname = "flatcam"; version = "8.5"; @@ -15,7 +41,7 @@ python3Packages.buildPythonApplication rec { sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ matplotlib numpy packaging diff --git a/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch b/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch new file mode 100644 index 0000000000000..d095eada9d6e1 --- /dev/null +++ b/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch @@ -0,0 +1,31 @@ +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/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index b1244b79a89f8..138d45c787cdd 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: postscript.o:postscript.h:29: multiple definition of # `postscript_params'; fped.o:postscript.h:29: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; # This uses '/bin/bash', '/usr/local' and 'lex' by default makeFlags = [ diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 22b65f2da313a..fdda4b2b0af2c 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { cp -a ${parts}/* parts/ ''; - NIX_CFLAGS_COMPILE = "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip"; + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip"; qmakeFlags = [ "phoenix.pro" diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 57a832fed2423..cc03a2e8c8196 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "VCD/Waveform viewer for Unix and Win32"; - homepage = "http://gtkwave.sourceforge.net"; + homepage = "https://gtkwave.sourceforge.net"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ thoughtpolice jiegec ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index d7250db07b491..697c27842081d 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -22,6 +22,7 @@ , libXdmcp , lndir , unixODBC +, fetchpatch , util-linux , libselinux @@ -34,6 +35,7 @@ , at-spi2-core , libXtst , pcre2 +, libdeflate , swig4 , python @@ -50,7 +52,6 @@ , withNgspice , withScripting , withI18n -, withPCM , debug , sanitizeAddress , sanitizeThreads @@ -71,16 +72,28 @@ stdenv.mkDerivation rec { patches = [ # upstream issue 12941 (attempted to upstream, but appreciably unacceptable) ./writable.patch + ] + ++ optionals (stable) # the 2 wxGTK ones should in the next stable point release + [ + (fetchpatch { # for wxGTK 3.2.2.1's .1 field + name = "support wxWidgets subrelease field"; + url = "https://gitlab.com/kicad/code/kicad/-/commit/b536580119c59fde78e38d8d6388f2540ecb6cf9.diff"; + hash = "sha256-F+J5oZO0BsT1VWKpx0KGA7ecn5/PBgCw8uiScihM+54="; + }) + (fetchpatch { # for wxGTK 3.2.2.1's .1 field, but for wxPython + name = "relax wxPython check to just major.minor"; + url = "https://gitlab.com/kicad/code/kicad/-/commit/1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c.diff"; + hash = "sha256-CGNgxZ7QiVLkaauNl7Pmcl152lwyDZqA/HSyFdOswwU="; + }) ]; # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here - postPatch = if (!stable) then '' + postPatch = lib.optionalString (!stable) '' substituteInPlace cmake/KiCadVersion.cmake \ --replace "unknown" "${builtins.substring 0 10 src.rev}" - '' - else ""; + ''; makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; @@ -88,6 +101,7 @@ stdenv.mkDerivation rec { # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DKICAD_USE_EGL=ON" + "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" # upstream issue 12491 ] ++ optionals (withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=ON" @@ -117,12 +131,6 @@ stdenv.mkDerivation rec { ] ++ optionals (withI18n) [ "-DKICAD_BUILD_I18N=ON" - ] - ++ optionals (!withPCM && stable) [ - "-DKICAD_PCM=OFF" - ] - ++ optionals (!stable) [ # upstream issue 12491 - "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" ]; nativeBuildInputs = [ @@ -167,8 +175,9 @@ stdenv.mkDerivation rec { boost swig4 python + unixODBC + libdeflate ] - ++ optional (!stable) unixODBC ++ optional (withScripting) wxPython ++ optional (withNgspice) libngspice ++ optional (withOCC) opencascade-occt diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 6aeb63d671148..c7eb9d69522c9 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -15,7 +15,7 @@ , pname ? "kicad" , stable ? true , withOCC ? true -, withNgspice ? true +, withNgspice ? !stdenv.isDarwin , libngspice , withScripting ? true , python3 @@ -24,7 +24,6 @@ , sanitizeThreads ? false , with3d ? true , withI18n ? true -, withPCM ? true # Plugin and Content Manager , srcs ? { } }: @@ -118,7 +117,7 @@ stdenv.mkDerivation rec { inherit stable baseName; inherit kicadSrc kicadVersion; inherit wxGTK python wxPython; - inherit withOCC withNgspice withScripting withI18n withPCM; + inherit withOCC withNgspice withScripting withI18n; inherit debug sanitizeAddress sanitizeThreads; }; @@ -150,15 +149,15 @@ stdenv.mkDerivation rec { "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules" # required to open a bug report link in firefox-wayland "--set-default MOZ_DBUS_REMOTE 1" - "--set-default KICAD6_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" - "--set-default KICAD6_SYMBOL_DIR ${symbols}/share/kicad/symbols" - "--set-default KICAD6_TEMPLATE_DIR ${templates}/share/kicad/template" - "--prefix KICAD6_TEMPLATE_DIR : ${symbols}/share/kicad/template" - "--prefix KICAD6_TEMPLATE_DIR : ${footprints}/share/kicad/template" + "--set-default KICAD7_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" + "--set-default KICAD7_SYMBOL_DIR ${symbols}/share/kicad/symbols" + "--set-default KICAD7_TEMPLATE_DIR ${templates}/share/kicad/template" + "--prefix KICAD7_TEMPLATE_DIR : ${symbols}/share/kicad/template" + "--prefix KICAD7_TEMPLATE_DIR : ${footprints}/share/kicad/template" ] ++ optionals (with3d) [ - "--set-default KICAD6_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" + "--set-default KICAD7_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" ] ++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] @@ -170,8 +169,9 @@ stdenv.mkDerivation rec { # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? installPhase = let + bin = if stdenv.isDarwin then "*.app/Contents/MacOS" else "bin"; tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; - utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" ]; + utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad-cli" ]; in (concatStringsSep "\n" (flatten [ @@ -181,13 +181,13 @@ stdenv.mkDerivation rec { # wrap each of the directly usable tools (map - (tool: "makeWrapper ${base}/bin/${tool} $out/bin/${tool} $makeWrapperArgs" + (tool: "makeWrapper ${base}/${bin}/${tool} $out/bin/${tool} $makeWrapperArgs" + optionalString (withScripting) " --set PYTHONPATH \"$program_PYTHONPATH\"" ) tools) # link in the CLI utils - (map (util: "ln -s ${base}/bin/${util} $out/bin/${util}") utils) + (map (util: "ln -s ${base}/${bin}/${util} $out/bin/${util}") utils) "runHook postInstall" ]) @@ -213,7 +213,7 @@ stdenv.mkDerivation rec { description = (if (stable) then "Open Source Electronics Design Automation suite" else "Open Source EDA suite, development build") - + (if (!with3d) then ", without 3D models" else ""); + + (lib.optionalString (!with3d) ", without 3D models"); homepage = "https://www.kicad.org/"; longDescription = '' KiCad is an open source software suite for Electronic Design Automation. @@ -223,6 +223,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ evils kiwi ]; # kicad is cross platform platforms = lib.platforms.all; + broken = stdenv.isDarwin; hydraPlatforms = if (with3d) then [ ] else platforms; # We can't download the 3d models on Hydra, diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 811a405853634..4562e8447624f 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,45 +3,45 @@ { "kicad" = { kicadVersion = { - version = "6.0.10"; + version = "7.0.0"; src = { - rev = "86aedd382b4ece39e27bef209e81792915103704"; - sha256 = "0pz8d96imc0q3nh7npr5zf0jkzi94wchvw57spcrgqfac9yrld3q"; + rev = "da2b9df05c3ccd5ec104cf8cd8ded34f5dd25216"; + sha256 = "1zgpj1rvf97qv36hg4dja46pbzyixlh2g04wlh7cizcrs16b9mzw"; }; }; libVersion = { - version = "6.0.10"; + version = "7.0.0"; libSources = { - symbols.rev = "3ec40517b37d78faf7ff5504c81362420c4b601f"; - symbols.sha256 = "1fwnr8x345jbifk71rhyd4b88c4ijp2rcw3pmivnwfb444hbr1lp"; - templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; - templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "24671f7754c74dfa528e6b62ebef33b161aa4ab6"; - footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h"; - packages3d.rev = "417c4ea884a0d1501061f511730604890bbb0a35"; - packages3d.sha256 = "0nmvfchp25i4bkx6yf7fz1rwy7w6whj2w7mlp02ag3w5v4f137vz"; + symbols.rev = "08a25991d07924b263cbf87c6e513feac2b2169f"; + symbols.sha256 = "1r87xr1453dpfglkg1m4p5d7kcv9gxls1anwk3vp2yppnwz24ydm"; + templates.rev = "66d76556d9e81f8a5be74457686d211c666ed200"; + templates.sha256 = "02i279269mhq7wjhb1yqk90820ncssxl9n7b20qr2r4fmm7jpvxv"; + footprints.rev = "a0388d07e4a37e8db13a716efb3ad4750c839f9c"; + footprints.sha256 = "1akhifnjm8jvqsvscn2rr1wpzrls73bpdc6sk40355r1in2djmry"; + packages3d.rev = "bbee2295519bcf469d97f5e06bcf7175cddd2037"; + packages3d.sha256 = "1qw5xm0wbhv6gqvd8mn0jp4abjbizrkx79r6y8f6911mkzi47r6n"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2022-12-19"; + version = "2023-02-14"; src = { - rev = "a3a2e2e5b1981ebfbb60f1e8e40bd02625d33692"; - sha256 = "1584n2gn68vdyzlm9805ln1bdgzf831j5l4v29z08dkbi2sl3rg0"; + rev = "29c4482bc898f627cebcd5f64e063e8a813a5445"; + sha256 = "1hs1p79skmrn2k7qrpnkynzkk2g8ry20lqivzfqg87c56rd1522y"; }; }; libVersion = { - version = "2022-12-19"; + version = "2023-02-14"; libSources = { - symbols.rev = "2fa69d6d1dce065f8d0998733f66d2cd7db31b9e"; - symbols.sha256 = "1kp8v0q1pirpi4v485j5bg72jpnxglbpgxjxda6kvq8d2124pwlb"; - templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1"; - templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "24671f7754c74dfa528e6b62ebef33b161aa4ab6"; - footprints.sha256 = "1rs05n1wjb2w3x7xqkkijbdxyw3fj0fph8znvnsxp9bgwaaipd4h"; - packages3d.rev = "7aeaa02a2e7438fbbe94a00ca321366a39dc1267"; - packages3d.sha256 = "13wfcm7fgsgl3a0g00ra3v35c8wqw9yzgdiai54f1m77r2cr7bhp"; + symbols.rev = "3ad8b98287ddf528ce8ff07bbe70aed85cb4410a"; + symbols.sha256 = "1p0wa3bhw2qgdvb5vzwvrbhkb6sqpc93d754rbcs2xh79d75l9nn"; + templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a"; + templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; + footprints.rev = "a168dd18ea63c2df948c2de3026dc19730cb70cf"; + footprints.sha256 = "0y3cl9fcyi8z4yrn0kfgfy28gn9ngrdvnpgbpwykbbp8fpx401nk"; + packages3d.rev = "a0919e5e805157bccd65af313806de3833c1673e"; + packages3d.sha256 = "1yizw9g3skz7i9x9iwbnn3gk3lnh10krf6xg32plb2plxfynz3cw"; }; }; }; diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index edee5946d9460..fc68969bd498a 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { patchShebangs scripts/* ''; - NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; patches = [ ./0001-strip-bin-prefix.patch diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index 22950326e8674..84551eeb6311f 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -2,19 +2,30 @@ lib, python3, fetchFromGitHub, + fetchpatch, wrapQtAppsHook, }: python3.pkgs.buildPythonApplication rec { pname = "nanovna-saver"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "NanoVNA-Saver"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-wKKjMcOx7NS2VAIk3OTAj7KWE1+CeAzctdgdidT+HMA="; + rev = "v${version}"; + sha256 = "sha256-CLfgDQt2rOXtWwvEhlXEstPp28nFhuhiAPYL6EjZVu4="; }; + # Fix for https://github.com/NanoVNA-Saver/nanovna-saver/issues/579 + # Try dropping the patch in the next release after v0.5.4 + patches = [ + (fetchpatch { + name = "remote-changelog-from-setup-py.patch"; + url = "https://github.com/NanoVNA-Saver/${pname}/commit/d654ea0441939e4e1c599d1333b587a185394fbe.diff"; + sha256 = "sha256-ifOhiWD0EYyQZRKp2W3G6crmWslca+/21APmhpfP/xE="; + }) + ]; + nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -47,6 +58,6 @@ python3.pkgs.buildPythonApplication rec { generally display and analyze the resulting data. ''; license = licenses.gpl3Only; - maintainers = with maintainers; [ zaninime ]; + maintainers = with maintainers; [ zaninime tmarkus ]; }; } diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index 97571eeb36b45..cff9809b03065 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -8,19 +8,20 @@ , which , elfutils , libelf +, libffi , llvm , zlib }: stdenv.mkDerivation rec { pname = "nvc"; - version = "1.7.2"; + version = "1.8.2"; src = fetchFromGitHub { owner = "nickg"; repo = pname; rev = "r${version}"; - sha256 = "sha256-7N11S7OiAogyuNqrf7R5NZyVbiXgXxJ5t6lwBzL0YAU="; + hash = "sha256-s7QgufD3sQ6sZh2H78E8x0dMidHRKHUm8tASXoKK3xk="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + libffi llvm zlib ] ++ [ diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/applications/science/electronics/openboardview/default.nix index d4aa6e6dfc0b5..9fd9d56295d88 100644 --- a/pkgs/applications/science/electronics/openboardview/default.nix +++ b/pkgs/applications/science/electronics/openboardview/default.nix @@ -9,8 +9,12 @@ , fontconfig , gtk3 , wrapGAppsHook +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "openboardview"; version = "9.0.3"; @@ -24,11 +28,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config python3 wrapGAppsHook ]; - buildInputs = [ SDL2 fontconfig gtk3 ]; + buildInputs = [ SDL2 fontconfig gtk3 ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; postPatch = '' substituteInPlace src/openboardview/CMakeLists.txt \ --replace "SDL2::SDL2main" "" + substituteInPlace CMakeLists.txt --replace "fixup_bundle" "#fixup_bundle" ''; cmakeFlags = [ @@ -37,9 +44,12 @@ stdenv.mkDerivation rec { ]; dontWrapGApps = true; - postFixup = '' - wrapGApp "$out/bin/${pname}" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]} + postFixup = lib.optionalString stdenv.isDarwin '' + mkdir -p "$out/Applications" + mv "$out/openboardview.app" "$out/Applications/OpenBoardView.app" + '' + lib.optionalString (!stdenv.isDarwin) '' + wrapGApp "$out/bin/${pname}" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]} ''; passthru.updateScript = gitUpdater { @@ -50,7 +60,7 @@ stdenv.mkDerivation rec { description = "Linux SDL/ImGui edition software for viewing .brd files"; homepage = "https://github.com/OpenBoardView/OpenBoardView"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ k3a ]; }; } diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index a5f2cf394b44f..eeb10b3a5a1dc 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Integrated circuit simulator"; - homepage = "http://qucs.sourceforge.net"; + homepage = "https://qucs.sourceforge.net"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 33d145c007566..e77f6aeeb29b2 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchFromGitHub , perl, flex, bison, python3, autoconf -, which, cmake +, which, cmake, help2man }: stdenv.mkDerivation rec { pname = "verilator"; - version = "5.002"; + version = "5.006"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-RNoKAEF7zl+WqqbxGP/VvdQqQP8VI3hoQku3b/g0XpU="; + hash = "sha256-PA8hbE6XECapuaO5YcgEodOoxSDqpMucdijJBBb7fZg="; }; enableParallelBuilding = true; buildInputs = [ perl ]; - nativeBuildInputs = [ flex bison python3 autoconf ]; + nativeBuildInputs = [ flex bison python3 autoconf help2man ]; nativeCheckInputs = [ which ]; doCheck = stdenv.isLinux; # darwin tests are broken for now... @@ -24,14 +24,8 @@ stdenv.mkDerivation rec { preConfigure = "autoconf"; - preCheck = '' - patchShebangs \ - src/flexfix \ - src/vlcovgen \ - bin/verilator \ - bin/verilator_coverage \ - test_regress/driver.pl \ - test_regress/t/*.pl + postPatch = '' + patchShebangs bin/* src/{flexfix,vlcovgen} test_regress/{driver.pl,t/*.pl} ''; meta = with lib; { diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 7a9f58a0c6e34..9f9224b5543cd 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Oscilloscope through the sound card"; - homepage = "http://xoscope.sourceforge.net"; + homepage = "https://xoscope.sourceforge.net"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 6a20a68324f1e..6ac9dd64982f1 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "unstable-2022-11-09"; + version = "unstable-2023-02-04"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "be9a35c0363174a7cef21d55ed80d92a9ef95ab1"; - hash = "sha256-IN9YgJONcC55N89OXMrMuNuznTdjXNWxR0IngH8OWC8="; + rev = "a8f0ef2368aa56b3ad20a52298a02e63b2a93e2d"; + hash = "sha256-48i6AKQhMG5hcnkS0vejOy1PqFbeb6FpU7Yx0rEvHDI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 3d752b7d7b931..1d0c72359cfcc 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-/eOiebMFHgrurtrSHPlgZO3xmmxBOUmyAzswXZLd3Yc="; }; - buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]); + strictDeps = true; + + nativeBuildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]); installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index d4f0ac3e5044a..c627b8a3c8f5a 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -13,11 +13,19 @@ stdenv.mkDerivation { sha256 = "sha256-W/BDhbng5iYuiB7desMKvRtDFdhoaxiJNvNvtbLlA6E="; }; - buildInputs = [ dune_2 ] ++ (with ocamlPackages; [ - ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir menhirLib mtime sedlex yojson - ]); + strictDeps = true; - buildPhase = "dune build --profile=release"; + nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_2 ]; + + buildInputs = with ocamlPackages; [ + ansiterminal cairo2 cmdliner fmt logs menhirLib mtime sedlex yojson + ]; + + buildPhase = '' + runHook preBuild + dune build --profile=release ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} + runHook postBuild + ''; installPhase = '' dune install --prefix $out --libdir $OCAMLFIND_DESTDIR diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 7077d56f8069b..75288b5ff80bf 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -9,8 +9,8 @@ let src = fetchFromGitHub { owner = "OCamlPro"; repo = pname; - rev = version; - sha256 = "sha256-8pJ/1UAbheQaLFs5Uubmmf5D0oFJiPxF6e2WTZgRyAc="; + rev = "refs/tags/${version}"; + hash = "sha256-8pJ/1UAbheQaLFs5Uubmmf5D0oFJiPxF6e2WTZgRyAc="; }; in diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index f6f43f1b0bb30..38fef51c56e6d 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib boost.out boost.dev ]; - NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] + env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] # Squelch endless stream of warnings on same few things ++ lib.optionals stdenv.cc.isClang [ "-Wno-empty-body" diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 4009761e8dc3c..ddfa999fcc7e3 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.74.0"; + version = "5.76.1"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-n4a/0Ak2psHDCXykVSPYavuIl22uq2ZP7LUcdSzg1ow="; + sha256 = "sha256-OVOoAfoqev33c7pIzBGK9HD+zgji/+BWKD33RYJaSDc="; }; nativeBuildInputs = [ @@ -60,9 +60,13 @@ stdenv.mkDerivation rec { --prefix PATH : "$out/share/cbmc" \ ''; - # fix "argument unused during compilation" - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang - "-Wno-unused-command-line-argument"; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ + # Needed with GCC 12 but breaks on darwin (with clang) + "-Wno-error=maybe-uninitialized" + ] ++ lib.optionals stdenv.cc.isClang [ + # fix "argument unused during compilation" + "-Wno-unused-command-line-argument" + ]); # TODO: add jbmc support cmakeFlags = [ "-DWITH_JBMC=OFF" "-Dsat_impl=cadical" "-Dcadical_INCLUDE_DIR=${cadical.dev}/include" ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 8a40216c3ecba..49c9fc47fef26 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -66,10 +66,10 @@ let buildIde = args.buildIde or (!coqAtLeast "8.14"); ideFlags = optionalString (buildIde && !coqAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; - csdpPatch = if csdp != null then '' + csdpPatch = lib.optionalString (csdp != null) '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" - '' else ""; + ''; ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages else with versions; switch coq-version [ { case = range "8.16" "8.17"; out = ocamlPackages_4_14; } @@ -91,7 +91,7 @@ self = stdenv.mkDerivation { passthru = { inherit coq-version; inherit ocamlPackages ocamlNativeBuildInputs; - inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs; + inherit ocamlPropagatedBuildInputs; # For compatibility inherit (ocamlPackages) ocaml camlp5 findlib num ; emacsBufferSetup = pkgs: '' @@ -158,7 +158,7 @@ self = stdenv.mkDerivation { UNAME=$(type -tp uname) RM=$(type -tp rm) substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - ${if !coqAtLeast "8.7" then "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\"" else ""} + ${lib.optionalString (!coqAtLeast "8.7") "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\""} ${csdpPatch} ''; @@ -196,7 +196,7 @@ self = stdenv.mkDerivation { categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; }); - postInstall = let suffix = if coqAtLeast "8.14" then "-core" else ""; in optionalString (!coqAtLeast "8.17") '' + postInstall = let suffix = optionalString (coqAtLeast "8.14") "-core"; in optionalString (!coqAtLeast "8.17") '' cp bin/votour $out/bin/ '' + '' ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix} @@ -227,12 +227,12 @@ if coqAtLeast "8.17" then self.overrideAttrs(_: { buildPhase = '' runHook preBuild make dunestrap - dune build -p coq-core,coq-stdlib,coq,coqide-server${if buildIde then ",coqide" else ""} -j $NIX_BUILD_CORES + dune build -p coq-core,coq-stdlib,coq,coqide-server${lib.optionalString buildIde ",coqide"} -j $NIX_BUILD_CORES runHook postBuild ''; installPhase = '' runHook preInstall - dune install --prefix $out coq-core coq-stdlib coq coqide-server${if buildIde then " coqide" else ""} + dune install --prefix $out coq-core coq-stdlib coq coqide-server${lib.optionalString buildIde " coqide"} runHook postInstall ''; }) else self diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 33de2d27dc90b..cd04d612b5290 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -1,32 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, xxd, boost, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +, boost +}: stdenv.mkDerivation rec { pname = "cryptominisat"; - version = "5.8.0"; + version = "5.11.4"; src = fetchFromGitHub { - owner = "msoos"; - repo = "cryptominisat"; - rev = version; - sha256 = "00hmxdlyhn7pwk9jlvc5g0l5z5xqfchjzf5jgn3pkj9xhl8yqq50"; + owner = "msoos"; + repo = "cryptominisat"; + rev = version; + hash = "sha256-7JNfFKSYWgyyNnWNzXGLqWRwSW+5r6PBMelKeAmx8sc="; }; - patches = [ - (fetchpatch { - # https://github.com/msoos/cryptominisat/pull/621 - url = "https://github.com/msoos/cryptominisat/commit/11a97003b0bfbfb61ed6c4e640212110d390c28c.patch"; - sha256 = "0hdy345bwcbxz0jl1jdxfa6mmfh77s2pz9rnncsr0jzk11b3j0cw"; - }) - ]; - buildInputs = [ python3 boost ]; - nativeBuildInputs = [ cmake xxd ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { description = "An advanced SAT Solver"; - homepage = "https://github.com/msoos/cryptominisat"; - license = licenses.mit; + homepage = "https://github.com/msoos/cryptominisat"; + license = licenses.mit; maintainers = with maintainers; [ mic92 ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 195dd98aa3b4a..f056b3e433fbc 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-F5eVN5ATYo9Ivpi2eYh96ktuTWUeoqgWMR4BqHu8EFs="; }; - buildInputs = [ ocaml ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml ]; /* Fix up the frontend to load the 'default' cryptoverif library ** from under $out/libexec. By default, it expects to find the files diff --git a/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch b/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch new file mode 100644 index 0000000000000..a97665c2f86c4 --- /dev/null +++ b/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch @@ -0,0 +1,39 @@ +Per https://bodhi.fedoraproject.org/updates/FEDORA-2022-dc47174c36: + +This update fixes a failure to build with source with bash 5.2. Bash's +`patsub_replacement` feature makes ampersand a special character when doing +variable substitution, which was not previously the case. This update instructs +bash to turn off the new behavior. + +The patch itself is adapted from +https://src.fedoraproject.org/rpms/cvc4/blob/f7c24c6ad72a8812d244313f13032fa23d393315/f/cvc4-bash-patsub-replacement.patch. +--- a/src/expr/mkexpr 2020-06-19 10:59:27.000000000 -0600 ++++ b/src/expr/mkexpr 2022-10-11 14:28:31.120453409 -0600 +@@ -16,6 +16,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + filename=`basename "$1" | sed 's,_template,,'` + +--- a/src/expr/mkkind 2020-06-19 10:59:27.000000000 -0600 ++++ b/src/expr/mkkind 2022-10-11 14:34:17.008996126 -0600 +@@ -15,6 +15,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + filename=`basename "$1" | sed 's,_template,,'` + +--- a/src/expr/mkmetakind 2020-06-19 10:59:27.000000000 -0600 ++++ b/src/expr/mkmetakind 2022-10-11 14:34:32.248020036 -0600 +@@ -18,6 +18,7 @@ + # + + copyright=2010-2014 ++shopt -u patsub_replacement + + cat <<EOF + /********************* */ diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 873c3ca57c0c9..e9f04d2044dc7 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { patch -p1 -i ${./minisat-fenv.patch} -d src/prop/bvminisat ''; + patches = [ + ./cvc4-bash-patsub-replacement.patch + ]; + preConfigure = '' patchShebangs ./src/ ''; diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix index 5bce776771d35..f0cb044b3beb3 100644 --- a/pkgs/applications/science/logic/cvc5/default.nix +++ b/pkgs/applications/science/logic/cvc5/default.nix @@ -1,18 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, cadical, symfpu, gmp, git, python3, gtest, libantlr3c, antlr3_4, boost, jdk }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, flex, cadical, symfpu, gmp, python3, gtest, libantlr3c, antlr3_4, boost, jdk }: stdenv.mkDerivation rec { pname = "cvc5"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; rev = "cvc5-${version}"; - sha256 = "sha256-CVXK6yehfUrSbo8R1Dk1oc/siCtmV9DjEp6q+aLuVQA="; + hash = "sha256-1yJZtPZ4nMg9Kn3jHpN8b5XeFZ8ZeVLrKYWh7Rp3/oQ="; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ cadical.dev symfpu gmp git python3 python3.pkgs.toml gtest libantlr3c antlr3_4 boost jdk ]; + nativeBuildInputs = [ pkg-config cmake flex ]; + buildInputs = [ + cadical.dev symfpu gmp gtest libantlr3c antlr3_4 boost jdk + (python3.withPackages (ps: with ps; [ pyparsing toml ])) + ]; preConfigure = '' patchShebangs ./src/ diff --git a/pkgs/applications/science/logic/ekrhyper/default.nix b/pkgs/applications/science/logic/ekrhyper/default.nix index d6d9bb11a9a0a..187cbc9a92ae4 100644 --- a/pkgs/applications/science/logic/ekrhyper/default.nix +++ b/pkgs/applications/science/logic/ekrhyper/default.nix @@ -9,10 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-fEe0DIMGj7wO+79/BZf45kykgyTXpbZJsyFSt31XqpM="; }; - buildInputs = [ - ocaml - perl - ]; + strictDeps = true; + nativeBuildInputs = [ ocaml perl ]; setSourceRoot = "export sourceRoot=$(echo */ekrh/src/)"; preInstall = "export INSTALLDIR=$out"; postInstall = ''for i in "$out/casc"/*; do ln -s "$i" "$out/bin/ekrh-casc-$(basename $i)"; done ''; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index e66fe992e189a..4c105a40e20db 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -38,7 +38,9 @@ stdenv.mkDerivation { }) ]; - buildInputs = [ ocaml camlp5 ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml camlp5 ]; propagatedBuildInputs = [ num ]; installPhase = '' diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index ff88586e0353b..6485681e3313f 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0lik8p7ayhjwpkln1iwf0ri84ramhch74j5nj6z7ph6wfi92pgg8"; }; - buildInputs = [ ocaml eprover zlib ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml eprover ]; + buildInputs = [ zlib ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index 024e6e526c4e4..898e344f2a453 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { ]; # Silence various warnings during the compilation of fortified bitcode. - NIX_CFLAGS_COMPILE = ["-Wno-macro-redefined"]; + env.NIX_CFLAGS_COMPILE = toString ["-Wno-macro-redefined"]; prePatch = '' patchShebangs . diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index cbc85c5544ccd..4087763aa0c54 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "sha256:1b2q7vsz6s9ighypsigqjm1mzjiq3xgnz5id5ssb4rh9zm190r82"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ eprover ocaml camlp4 perl zlib ]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper eprover ocaml camlp4 perl ]; + buildInputs = [ zlib ]; patches = [ (fetchpatch { url = "https://github.com/niklasso/minisat/commit/7eb6015313561a2586032574788fcb133eeaa19f.patch"; diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index bbc96b2b681cc..a00c565fb4e06 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -11,8 +11,11 @@ stdenv.mkDerivation rec { hash = "sha256-GzeEiok5kigcmfqf/K/UxvlKkl55zy0vOyiRZ2HyMiE="; }; - nativeBuildInputs = [ pkg-config opaline ]; - buildInputs = with ocamlPackages; [ ocaml findlib ocamlgraph ]; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config opaline ] ++ (with ocamlPackages; [ findlib ocaml ]); + buildInputs = with ocamlPackages; [ ocamlgraph ]; installTargets = "ott.install"; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 2606b94f4bbb5..4e65c018d1a20 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses ] ++ (with ocamlPackages; [ - ocaml findlib camlp5 lablgtk ]); + strictDeps = true; + + nativeBuildInputs = [ pkg-config ] ++ (with ocamlPackages; [ ocaml findlib camlp5 ]); + buildInputs = [ ncurses ] ++ (with ocamlPackages; [ lablgtk ]); dontAddPrefix = true; configureFlags = [ "--prefix" "$(out)" ]; diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix index b6d15162fec35..57220aa523cf8 100644 --- a/pkgs/applications/science/logic/proverif/default.nix +++ b/pkgs/applications/science/logic/proverif/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "sha256:0xgwnp59779xc40sb7ck8rmfn620pilxyq79l3bymj9m7z0mwvm9"; }; - buildInputs = with ocamlPackages; [ ocaml findlib ]; + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ]; buildPhase = "./build -nointeract"; installPhase = '' diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 648ebee6550c0..af11cd0d6d8f9 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -3,8 +3,11 @@ stdenv.mkDerivation rec { pname = "satallax"; version = "2.7"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml zlib which eprover coq ]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ocaml which eprover coq ]; + buildInputs = [ zlib ]; + src = fetchurl { url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz"; sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib"; @@ -46,7 +49,7 @@ stdenv.mkDerivation rec { ''; # error: invalid suffix on literal; C++11 requires a space between literal and identifier - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-reserved-user-defined-literal"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-reserved-user-defined-literal"; installPhase = '' mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax" diff --git a/pkgs/applications/science/logic/statverif/default.nix b/pkgs/applications/science/logic/statverif/default.nix index 07365eef33fac..1f62389775517 100644 --- a/pkgs/applications/science/logic/statverif/default.nix +++ b/pkgs/applications/science/logic/statverif/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "113jjhi1qkcggbsmbw8fa9ln8vs7vy2r288szks7rn0jjn0wxmbw"; }; - buildInputs = [ ocaml ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml ]; patchPhase = "patch -p1 < ${pf-patch}"; buildPhase = "./build"; diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index 14b3055ab36b0..59afbc094e40d 100644 --- a/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "c296998acd14d5b93a8d5be7ee178007ef179957465966576bda26944b1b7fca"; }; - buildInputs = [ ocaml isabelle cvc3 perl wget which ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml isabelle cvc3 perl wget which ]; installPhase = '' mkdir -pv "$out" diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 8ca2a6baa8890..55b59ff2e3b06 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -10,8 +10,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-vNR7WeiSvg+763GcovoZBFDfncekJMeqNegP4fVw06I="; }; + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ + ocaml findlib menhir + # Coq Support + coqPackages.coq + ]; + buildInputs = with ocamlPackages; [ - ocaml findlib ocamlgraph zarith menhir + ocamlgraph zarith # Emacs compilation of why3.el emacs # Documentation diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index fb14723241b81..83fbb6d6546b0 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high-performance theorem prover and SMT solver"; - homepage = "http://yices.csl.sri.com"; + homepage = "https://yices.csl.sri.com"; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 75cfa2568f85a..f810a5a56739a 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -18,23 +18,26 @@ assert ocamlBindings -> ocaml != null && findlib != null && zarith != null; with lib; -let common = { version, sha256, patches ? [ ] }: +let common = { version, sha256, patches ? [ ], tag ? "z3" }: stdenv.mkDerivation rec { pname = "z3"; inherit version sha256 patches; src = fetchFromGitHub { owner = "Z3Prover"; repo = pname; - rev = "z3-${version}"; + rev = "${tag}-${version}"; sha256 = sha256; }; - nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ python ] + strictDeps = true; + + nativeBuildInputs = [ python ] + ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ++ optional javaBindings jdk - ++ optionals ocamlBindings [ ocaml findlib zarith ] + ++ optionals ocamlBindings [ ocaml findlib ] ; - propagatedBuildInputs = [ python.pkgs.setuptools ]; + propagatedBuildInputs = [ python.pkgs.setuptools ] + ++ optionals ocamlBindings [ zarith ]; enableParallelBuilding = true; postPatch = optionalString ocamlBindings '' @@ -44,7 +47,7 @@ let common = { version, sha256, patches ? [ ] }: configurePhase = concatStringsSep " " ( - [ "${python.interpreter} scripts/mk_make.py --prefix=$out" ] + [ "${python.pythonForBuild.interpreter} scripts/mk_make.py --prefix=$out" ] ++ optional javaBindings "--java" ++ optional ocamlBindings "--ml" ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" @@ -92,4 +95,9 @@ in version = "4.8.15"; sha256 = "0xkwqz0y5d1lfb6kfqy8wn8n2dqalzf4c8ghmjsajc1bpdl70yc5"; }; + z3_4_8_5 = common { + tag = "Z3"; + version = "4.8.5"; + sha256 = "sha256-ytG5O9HczbIVJAiIGZfUXC/MuYH7d7yLApaeTRlKXoc="; + }; } diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index 1644ca3d1433c..6b76eea33cefa 100644 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "finalfrontier"; - version = "0.9.4"; + version = "unstable-2022-01-06"; src = fetchFromGitHub { owner = "finalfusion"; repo = pname; - rev = version; - sha256 = "1lvwv238p8hrl4sc5pmnvaargl2dd25p44gxl3kibq5ng03afd0n"; + rev = "2461fb1dde13b73039926aa66606e470907a1b59"; + sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4="; }; - cargoSha256 = "0lhcazcih48gc23q484h344bzz7p3lh189ljhswdyph2i11caarp"; + cargoSha256 = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index 9479011d5f149..ad22d57882ed6 100755 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -26,12 +26,12 @@ buildPythonApplication rec { pname = "streamlit"; - version = "1.16.0"; + version = "1.18.1"; format = "wheel"; # source currently requires pipenv src = fetchPypi { inherit pname version format; - hash = "sha256-TBNWIe3m646dbnOMxUltkNZr23g0Dqsestvxl4zHr4A="; + hash = "sha256-lO2QfM/G+4M55f8JCZBwk10SkMp4gXb68KncHm90k7g="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 83acfcfe9c37d..580de87bdb23f 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -8,15 +8,18 @@ # R as of writing does not support outputting both .so and .a files; it outputs: # --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored , static ? false +, testers }: assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "R"; version = "4.2.2"; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; sha256 = "sha256-D/YrQuxRr6VxPK7nxP3noMRZQLo5vvjFyUh/7wyVPfU="; }; @@ -97,6 +100,8 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "http://www.r-project.org/"; description = "Free software environment for statistical computing and graphics"; @@ -121,8 +126,9 @@ stdenv.mkDerivation rec { user-defined recursive functions and input and output facilities. ''; + pkgConfigModules = [ "libR" ]; platforms = platforms.all; maintainers = with maintainers; [ jbedo ] ++ teams.sage.members; }; -} +}) diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix index fe68d9d245c52..4fccc3a464039 100644 --- a/pkgs/applications/science/math/bliss/default.nix +++ b/pkgs/applications/science/math/bliss/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "An open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs"; homepage = "http://www.tcs.hut.fi/Software/bliss/"; license = licenses.lgpl3; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index d6c95633dd520..ed6836afbd92a 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -21,7 +21,13 @@ }: let - inherit (cudaPackages) cudatoolkit cudnn nccl; + inherit (cudaPackages) cudatoolkit nccl; + # 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_5; in assert leveldbSupport -> (leveldb != null && snappy != null); diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index d521da2f114cd..75dbccced193c 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.14.1.2"; + version = "2.14.1.3"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/v${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-3o8jKmEYxNQtExOkjqTVU24mtSok+T/RnRw6goNzThM="; + sha256 = "sha256-5aAvYzjAkpLZGf9UE+Ta18Io9EwP769yYlVykiH4qd0="; }; postPatch = '' diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index 4b0ae6f8ac9d9..7a89fdd73c848 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack spooles blas lapack ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${spooles}/include/spooles" "-std=legacy" ]; diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index bffd208f9ef61..f885dae444ba6 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { OMPI_CXX = "g++"; # Uses some deprecated tensorflow functions - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; buildInputs = [ openblas opencv3 libzip boost protobuf mpi ] ++ lib.optional cudaSupport cudatoolkit diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 507fa0815298b..42e17c70673e6 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -36,7 +36,7 @@ lib.fix (eukleides: stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: eukleides_build/triangle.o:(.bss+0x28): multiple definition of `A'; # eukleides_build/quadrilateral.o:(.bss+0x18): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preInstall = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 677e7d9a0d96c..7a466f8c000c5 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -134,8 +134,6 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/192548#discussion_r992824942 rm -r "$out/share/gap/pkg" cp -ar pkg tst "$out/share/gap" - - makeWrapper "$out/lib/gap/gap" "$out/bin/gap" --add-flags "-l $out/share/gap" ''; preFixup = '' diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 7357f024c90d4..1b5a0622f4e29 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ginac"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-J84Wrt/nRlGyI725JGwAWWt/+b9yeg06Rz9GcADaxJI="; + sha256 = "sha256-wks3oecJ9mDQl4eH6GszSAPNKOwXaJzzbd/zgAc+omE="; }; propagatedBuildInputs = [ cln ]; diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index a2624c29662e4..315433feb1c2a 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gretl is a cross-platform software package for econometric analysis, written in the C programming language. ''; - homepage = "http://gretl.sourceforge.net"; + homepage = "https://gretl.sourceforge.net"; license = licenses.gpl3; maintainers = with maintainers; [ dmrauh ]; platforms = with platforms; all; diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index f4c117267d568..6a1bc86abced3 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Mixed Integer Linear Programming (MILP) solver"; - homepage = "http://lpsolve.sourceforge.net"; + homepage = "https://lpsolve.sourceforge.net"; license = licenses.gpl2Plus; maintainers = with maintainers; [ smironov ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index dcba888ce2fb1..c1a329c608864 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -50,10 +50,16 @@ stdenv.mkDerivation rec { "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" - "-DMXNET_CUDA_ARCH=${cudaFlags.cudaCapabilitiesSemiColonString}" + "-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.cudaRealArches}" ] else [ "-DUSE_CUDA=OFF" ]) ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=maybe-uninitialized" + "-Wno-error=uninitialized" + ]; + postPatch = '' substituteInPlace 3rdparty/mkldnn/tests/CMakeLists.txt \ --replace "/bin/bash" "${bash}/bin/bash" diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 91cf4ae4f3894..41dff3adede5a 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , gmp , libX11 , libpthreadstubs @@ -14,7 +15,7 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.15.1"; + version = "2.15.2"; src = fetchurl { urls = [ @@ -22,9 +23,18 @@ stdenv.mkDerivation rec { # old versions are at the url below "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" ]; - hash = "sha256-RUGdt3xmhb7mfkLg7LeOGe9WK+eq/GN8ikGXDy6Qnj0="; + hash = "sha256-sEYoER7iKHZRmksc2vsy/rqjTq+iT56B9Y+NBX++4N0="; }; + patches = [ + # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2441 + (fetchpatch { + name = "fix-find_isogenous_from_Atkin.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pari/patches/bug2441.patch?id=9.8.rc0"; + hash = "sha256-DvOUFlFDnopN+MJY6GYRPNabuoHPFch/nNn+49ygznc="; + }) + ]; + buildInputs = [ gmp libX11 diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index d9921e68edb11..bbfc8aed44284 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; sourceRoot = "."; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; buildPhase = '' g++ Pers.cpp -O3 -fpermissive -o perseus ''; diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index 0eecff0a17989..4dc11db532fdf 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "polymake"; - version = "4.8"; + version = "4.9"; src = fetchurl { # "The minimal version is a packager friendly version which omits # the bundled sources of cdd, lrs, libnormaliz, nauty and jReality." url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2"; - sha256 = "sha256-GfsAypJBpHwpvoEl/IzJ1gQfeMcYwB7oNe01xWJ+86w="; + sha256 = "sha256-BMkLgms6JsWmPhi+MZv/Eqie8BKL+KaPtk3xBZSyWfM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/programmer-calculator/default.nix b/pkgs/applications/science/math/programmer-calculator/default.nix index e9c7cb985cb9b..ee48a1d0f1a3e 100644 --- a/pkgs/applications/science/math/programmer-calculator/default.nix +++ b/pkgs/applications/science/math/programmer-calculator/default.nix @@ -2,13 +2,13 @@ gccStdenv.mkDerivation rec { pname = "programmer-calculator"; - version = "2.2"; + version = "3.0"; src = fetchFromGitHub { owner = "alt-romes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JQcYCYKdjdy8U2XMFzqTH9kAQ7CFv0r+sC1YfuAm7p8="; + sha256 = "sha256-9mv8Jac6j3fKWLLCu1Bd/T5dbegUB8rRgsj9MaQhFDw="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix index bb945b06ba137..e58674f344971 100644 --- a/pkgs/applications/science/math/readstat/default.nix +++ b/pkgs/applications/science/math/readstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "readstat"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "WizardMac"; repo = "ReadStat"; rev = "v${version}"; - sha256 = "1r04lq45h1yn34v1mgfiqjfzyaqv4axqlby0nkandamcsqyhc7y4"; + sha256 = "sha256-4lRJgZPB2gfaQ9fQKvDDpGhy1eDNT/nT1QmeZlCmCis="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/science/math/sage/README.md b/pkgs/applications/science/math/sage/README.md index c3a81c2109ee4..c4de5da45dbf0 100644 --- a/pkgs/applications/science/math/sage/README.md +++ b/pkgs/applications/science/math/sage/README.md @@ -10,7 +10,7 @@ First you should find out which change to nixpkgs is at fault (if you don't alre If the build broke as a result of a package update, try those solutions in order: -- search the [sage trac](https://trac.sagemath.org/) for keywords like "Upgrade <package>". Maybe somebody has already proposed a patch that fixes the issue. You can then add a `fetchpatch` to `sage-src.nix`. +- search the [sage GitHub repo](https://github.com/sagemath/sage) for keywords like "Upgrade <package>". Maybe somebody has already proposed a patch that fixes the issue. You can then add a `fetchpatch` to `sage-src.nix`. - check if [gentoo](https://github.com/cschwan/sage-on-gentoo/tree/master/sci-mathematics/sage), [debian](https://salsa.debian.org/science-team/sagemath/tree/master/debian) or [arch linux](https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath) already solved the problem. You can then again add a `fetchpatch` to `sage-src.nix`. If applicable you should also [propose the patch upstream](#proposing-a-sage-patch). @@ -19,7 +19,7 @@ If the build broke as a result of a package update, try those solutions in order ``` [user@localhost ~]$ git clone https://github.com/sagemath/sage.git [user@localhost ~]$ cd sage -[user@localhost sage]$ git checkout 8.2 # substitute the relevant version here +[user@localhost sage]$ git checkout 9.8 # substitute the relevant version here ``` Then make the needed changes and generate a patch with `git diff`: @@ -29,42 +29,10 @@ Then make the needed changes and generate a patch with `git diff`: [user@localhost ~]$ git diff -u > /path/to/nixpkgs/pkgs/applications/science/math/sage/patches/name-of-patch.patch ``` -Now just add the patch to `sage-src.nix` and test your changes. If they fix the problem, [propose them upstream](#proposing-a-sage-patch) and add a link to the trac ticket. +Now just add the patch to `sage-src.nix` and test your changes. If they fix the problem, submit a PR upstream (refer to sages [Developer's Guide](http://doc.sagemath.org/html/en/developer/index.html) for further details). - pin the package version in `default.nix` and add a note that explains why that is necessary. - -## Proposing a sage patch - -You can [login the sage trac using GitHub](https://trac.sagemath.org/login). Your username will then be `gh-<your-github-name>`. The only other way is to request a trac account via email. After that refer to [git the hard way](http://doc.sagemath.org/html/en/developer/manual_git.html#chapter-manual-git) in the sage documentation. The "easy way" requires a non-GitHub account (requested via email) and a special tool. The "hard way" is really not all that hard if you're a bit familiar with git. - -Here's the gist, assuming you want to use ssh key authentication. First, [add your public ssh key](https://trac.sagemath.org/prefs/sshkeys). Then: - -``` -[user@localhost ~]$ git clone https://github.com/sagemath/sage.git -[user@localhost ~]$ cd sage -[user@localhost sage]$ git remote add trac git@trac.sagemath.org:sage.git -t master -[user@localhost sage]$ git checkout -b u/gh-<your-github-username>/<your-branch-name> develop -[user@localhost sage]$ <make changes> -[user@localhost sage]$ git add . -[user@localhost sage]$ git commit -[user@localhost sage]$ git show # review your changes -[user@localhost sage]$ git push --set-upstream trac u/gh-<your-github-username>/<your-branch-name> -``` - -You now created a branch on the trac server (you *must* follow the naming scheme as you only have push access to branches with the `u/gh-<your-github-username>/` prefix). -Now you can [create a new trac ticket](https://trac.sagemath.org/newticket). -- Write a description of the change -- set the type and component as appropriate -- write your real name in the "Authors" field -- write `u/gh-<your-github-username>/<your-branch-name>` in the "Branch" field -- click "Create ticket" -- click "Modify" on the top right of your ticket (for some reason you can only change the ticket status after you have created it) -- set the ticket status from `new` to `needs_review` -- click "Save changes" - -Refer to sages [Developer's Guide](http://doc.sagemath.org/html/en/developer/index.html) for further details. - ## I want to update sage You'll need to change the `version` field in `sage-src.nix`. Afterwards just try to build and let nix tell you which patches no longer apply (hopefully because they were adopted upstream). Remove those. @@ -74,5 +42,5 @@ If the problem is not obvious, you can try to first update sage to an intermedia ## Well, that didn't help! -If you couldn't fix the problem, create a GitHub issue on the nixpkgs repo and ping @timokau (or whoever is listed in the `maintainers` list of the sage package). +If you couldn't fix the problem, create a GitHub issue on the nixpkgs repo and ping the sage maintainers (as listed in the sage package). Describe what you did and why it didn't work. Afterwards it would be great if you help the next guy out and improve this documentation! diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index 1f8b33f687384..39d358a1f9a83 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -35,7 +35,8 @@ writeTextFile rec { export GRAPHS_DATA_DIR='${graphs}/share/graphs' export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves' export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes' - export GAP_ROOT_DIR='${gap}/share/gap' + export GAP_LIB_DIR='${gap}/lib/gap' + export GAP_SHARE_DIR='${gap}/share/gap' export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/' export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs" export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona" diff --git a/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch b/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch deleted file mode 100644 index 40bbbe23f1a3f..0000000000000 --- a/pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/sage/geometry/polyhedron/backend_normaliz.py b/src/sage/geometry/polyhedron/backend_normaliz.py -index 86b89632a5..ca8a43b248 100644 ---- a/src/sage/geometry/polyhedron/backend_normaliz.py -+++ b/src/sage/geometry/polyhedron/backend_normaliz.py -@@ -53,7 +53,7 @@ def _number_field_elements_from_algebraics_list_of_lists_of_lists(listss, **kwds - 1.732050807568878? - sage: from sage.geometry.polyhedron.backend_normaliz import _number_field_elements_from_algebraics_list_of_lists_of_lists - sage: K, results, hom = _number_field_elements_from_algebraics_list_of_lists_of_lists([[[rt2], [1]], [[rt3]], [[1], []]]); results # optional - sage.rings.number_field -- [[[-a^3 + 3*a], [1]], [[-a^2 + 2]], [[1], []]] -+ [[[-a^3 + 3*a], [1]], [[a^2 - 2]], [[1], []]] - """ - from sage.rings.qqbar import number_field_elements_from_algebraics - numbers = [] -diff --git a/src/sage/lfunctions/pari.py b/src/sage/lfunctions/pari.py -index d2b20f1891..6c31efe239 100644 ---- a/src/sage/lfunctions/pari.py -+++ b/src/sage/lfunctions/pari.py -@@ -339,7 +339,7 @@ def lfun_eta_quotient(scalings, exponents): - 0.0374412812685155 - - sage: lfun_eta_quotient([6],[4]) -- [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4])]], 0, [0, 1], 2, 36, 1] -+ [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4]), 0]], 0, [0, 1], 2, 36, 1] - - sage: lfun_eta_quotient([2,1,4], [5,-2,-2]) - Traceback (most recent call last): diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index d68a2c8a107ac..5e18b7415632e 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -57,14 +57,14 @@ let ); in stdenv.mkDerivation rec { - version = "9.7"; + version = "9.8"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "sha256-MYpCp18wqKwCa+tcJ7He14p1FXDlVm1vubQqQS9g3LY="; + sha256 = "sha256-dDbrzJXsOBARYfJz0r7n3LbaoXHnx7Acz6HBa95NV9o="; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -89,14 +89,6 @@ stdenv.mkDerivation rec { # To help debug the transient error in # https://trac.sagemath.org/ticket/23087 when it next occurs. ./patches/configurationpy-error-verbose.patch - - # https://trac.sagemath.org/ticket/33907 - (fetchSageDiff { - name = "interfaces-expectpy-intermittent.patch"; - base = "9.8.beta6"; - rev = "6f5c1c2fc8bcfb5e6555716d05ce70511795ffa1"; - sha256 = "sha256-z8FQxtrk62MHzPjrUTad+fMAE6XV8GTsLWKgGOM3zBg="; - }) ]; # Patches needed because of package updates. We could just pin the versions of @@ -119,28 +111,12 @@ stdenv.mkDerivation rec { # adapted from https://trac.sagemath.org/ticket/23712#comment:22 ./patches/tachyon-renamed-focallength.patch - # https://trac.sagemath.org/ticket/34118 - (fetchSageDiff { - name = "sympy-1.11-upgrade.patch"; - base = "9.7"; - rev = "52815744bde2b682245b6f985a112f7cb8666056"; - sha256 = "sha256-gv6z6JkQ6S6oCJQNkVgcPVvzlplyvR1nC7pWmcUiSc0="; - }) - - # https://trac.sagemath.org/ticket/34460 - (fetchSageDiff { - name = "ipywidgets-8-upgrade.patch"; - base = "9.7"; - rev = "2816dbacb342398a23bb3099e20c92c8020ab0fa"; - sha256 = "sha256-tCOsMxXwPkRg3FJGVvTqDzlWdra78UfDY6nci0Nr9GI="; - }) - # https://trac.sagemath.org/ticket/34391 (fetchSageDiff { name = "gap-4.12-upgrade.patch"; - base = "9.8.beta2"; - rev = "eb8cd42feb58963adba67599bf6e311e03424328"; - sha256 = "sha256-0dKewOZe2n3PqSdxCJt18FkqwTdrD0VA5MXAMiTW8Tw="; + base = "9.8.beta7"; + rev = "dd4a17281adcda74e11f998ef519b6bd0dafb043"; + sha256 = "sha256-UQT9DO9xd5hh5RucvUkIm+rggPKu8bc1YaSI6LVYH98="; }) # https://trac.sagemath.org/ticket/34701 @@ -151,46 +127,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-9BhQLFB3wUhiXRQsK9L+I62lSjvTfrqMNi7QUIQvH4U="; }) - # https://trac.sagemath.org/ticket/34537 - (fetchSageDiff { - name = "pari-2.15.1-upgrade.patch"; - squashed = true; - base = "54cd6fe6de52aee5a433e0569e8c370618cb2047"; # 9.8.beta1 - rev = "1e86aa26790d84bf066eca67f98a60a8aa3d4d3a"; - sha256 = "sha256-LUgcMqrKXWb72Kxl0n6MV5unLXlQSeG8ncN41F7TRSc="; - excludes = ["build/*" - "src/sage/geometry/polyhedron/base_number_field.py" - "src/sage/geometry/polyhedron/backend_normaliz.py" - "src/sage/lfunctions/pari.py"]; - }) - # Some files were excluded from the above patch due to - # conflicts. The patch below contains rebased versions. - ./patches/pari-2.15.1-upgrade-rebased.patch - - # https://trac.sagemath.org/ticket/34668 - (fetchSageDiff { - name = "matplotlib-3.6-upgrade.patch"; - base = "9.8.beta2"; - rev = "5501e0de0dca1cff0355326dd42bd8c7e5749568"; - sha256 = "sha256-ceJkVaecIsZewN8v/3gPQXFbFjv5Akz6zEFg/ToXdek="; - }) - - # https://trac.sagemath.org/ticket/34693 - (fetchSageDiff { - name = "matplotlib-3.6-docbuilding.patch"; - base = "9.8.beta4"; - rev = "64589686c261d33e6b5aff2589bcae8af004bcc6"; - sha256 = "sha256-j5AMY1TmhP+HBBBYaFZSkABJ5vtwe6iP2LRfGEgSm8Q="; - }) - - # https://trac.sagemath.org/ticket/34615 - (fetchSageDiff { - name = "sphinx-5.2-upgrade.patch"; - base = "9.8.beta1"; - rev = "8f8af65e54d3a9962cfab40f15dc23f4e955b43f"; - sha256 = "sha256-yhDdyxnXSSkqLcuOPBWSEBc26rk1Od3gLcWW8S2p8bY="; - }) - # temporarily paper over https://github.com/jupyter-widgets/ipywidgets/issues/3669 ./patches/ipywidgets-on_submit-deprecationwarning.patch diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 79d4f78082e09..4910f5e8bf1d2 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -18,7 +18,7 @@ let src = sage-with-env.env.lib.src; runAllTests = files == null; testArgs = if runAllTests then "--all" else testFileList; - patienceSpecifier = if longTests then "--long" else ""; + patienceSpecifier = lib.optionalString longTests "--long"; timeSpecifier = if timeLimit == null then "" else "--short ${toString timeLimit}"; relpathToArg = relpath: lib.escapeShellArg "${src}/${relpath}"; # paths need to be absolute testFileList = lib.concatStringsSep " " (map relpathToArg files); diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 59e64bd0b8eff..f6da20531385b 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, undmg, makeWrapper, xorg }: +{ lib +, stdenv +, fetchurl +, makeWrapper +, undmg +, autoPatchelfHook +, alsa-lib +, ncurses5 +, xorg +}: let pname = "scilab-bin"; @@ -26,88 +35,69 @@ let platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2Only; + mainProgram = "scilab"; }; darwin = stdenv.mkDerivation rec { inherit pname version src meta; - nativeBuildInputs = [ undmg makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + undmg + ]; sourceRoot = "scilab-${version}.app"; installPhase = '' + runHook preInstall + mkdir -p $out/{Applications/scilab.app,bin} cp -R . $out/Applications/scilab.app makeWrapper $out/{Applications/scilab.app/Contents/MacOS,bin}/scilab + + runHook postInstall ''; }; linux = stdenv.mkDerivation rec { inherit pname version src meta; - libPath = lib.makeLibraryPath [ - stdenv.cc.cc - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst - xorg.libXxf86vm - ]; - - fixupPhase = '' - sed -i 's|\$(/bin/|$(|g' bin/scilab - sed -i 's|/usr/bin/||g' bin/scilab - - sci="$out/opt/scilab-${version}" - fullLibPath="$sci/lib/scilab:$sci/lib/thirdparty:$libPath" - fullLibPath="$fullLibPath:$sci/lib/thirdparty/redist" - - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$fullLibPath" bin/scilab-bin - find . -name '*.so' -type f | while read file; do - patchelf --set-rpath "$fullLibPath" "$file" 2>/dev/null - done - ''; - - installPhase = '' - mkdir -p "$out/opt/scilab-${version}" - cp -r . "$out/opt/scilab-${version}/" - - # Create bin/ dir - mkdir "$out/bin" - - # Creating executable symlinks - ln -s "$out/opt/scilab-${version}/bin/scilab" "$out/bin/scilab" - ln -s "$out/opt/scilab-${version}/bin/scilab-cli" "$out/bin/scilab-cli" - ln -s "$out/opt/scilab-${version}/bin/scilab-adv-cli" "$out/bin/scilab-adv-cli" + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + alsa-lib + ncurses5 + stdenv.cc.cc + ] ++ (with xorg; [ + libX11 + libXcursor + libXext + libXft + libXi + libXrandr + libXrender + libXtst + libXxf86vm + ]); - # Creating desktop config dir - mkdir -p "$out/share/applications" - - # Moving desktop config files - mv $out/opt/scilab-${version}/share/applications/*.desktop $out/share/applications - - # Fixing Exec paths and launching each app with a terminal - sed -i -e "s|Exec=|Exec=$out/opt/scilab-${version}/bin/|g" \ - -e "s|Terminal=.*$|Terminal=true|g" $out/share/applications/*.desktop - - # Moving icons to the appropriate locations - for path in $out/opt/scilab-${version}/share/icons/hicolor/*/*/* - do - newpath=$(echo $path | sed 's|/opt/scilab-${version}||g') - filename=$(echo $path | sed 's|.*/||g') - dir=$(echo $newpath | sed "s|$filename||g") - mkdir -p $dir - mv $path $newpath - done - - # Removing emptied folders - rm -rf $out/opt/scilab-${version}/share/{applications,icons} - - # Moving other share/ folders - mv $out/opt/scilab-${version}/share/{appdata,locale,mime} $out/share - ''; + installPhase = '' + runHook preInstall + + mkdir -p $out + mv -t $out bin include lib share thirdparty + sed -i \ + -e 's|\$(/bin/|$(|g' \ + -e 's|/usr/bin/||g' \ + $out/bin/{scilab,xcos} + sed -i \ + -e "s|Exec=|Exec=$out/bin/|g" \ + -e "s|Terminal=.*$|Terminal=true|g" \ + $out/share/applications/*.desktop + + runHook postInstall + ''; }; in if stdenv.isDarwin then darwin else linux diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 3ca1501e382e6..e41d851cf7e87 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -166,7 +166,7 @@ stdenv.mkDerivation rec { # https://www.singular.uni-kl.de:8002/trac/ticket/837 platforms = subtractLists platforms.i686 platforms.unix; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 - homepage = "http://www.singular.uni-kl.de"; + homepage = "https://www.singular.uni-kl.de"; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; mainProgram = "Singular"; }; diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index f6d9f4510faf8..7c28f65f3bf7b 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20221201130942"; + version = "3.1.20230213100550"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PeddmHMJYtj/AAItmUVeyETizF7SKzkJ3bXYkeZU+xs="; + hash = "sha256-BtHkIVadcccnYYX8lRqiCzO+/qFeBaZfdUuu6qrjysk="; }; postPatch = '' diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index a4aa6457d608d..5ec7973065d2f 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { swig3 ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++11" ]; diff --git a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix index 088fa83b7d92e..ffa0a158ac95a 100644 --- a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix +++ b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix @@ -16,7 +16,7 @@ let # getAttr-like helper for optional append to string: # "Hello" + appendByAttr "a" " " {a = "world";} = "Hello world" # "Hello" + appendByAttr "a" " " {} = "Hello" - appendByAttr = attr: sep: x: if hasAttr attr x then sep + (getAttr attr x) else ""; + appendByAttr = attr: sep: x: lib.optionalString (hasAttr attr x) (sep + (getAttr attr x)); # Are there any OM dependencies at all? ifDeps = length pkg.omdeps != 0; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 1c173b75238ce..f9bcfa5df73c5 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -4,6 +4,8 @@ , libpng ? null , eigen ? null , libtiff ? null +, ceres-solver +, enableShared ? !stdenv.hostPlatform.isStatic , enableExamples ? false , enableDocs ? false }: @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ]; + buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ceres-solver ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -27,7 +29,8 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DOpenMVG_BUILD_EXAMPLES=${if enableExamples then "ON" else "OFF"}" "-DOpenMVG_BUILD_DOC=${if enableDocs then "ON" else "OFF"}" - ]; + "-DTARGET_ARCHITECTURE=generic" + ] ++ lib.optional enableShared "-DOpenMVG_BUILD_SHARED=ON"; cmakeDir = "./src"; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 031f1655b0af3..fde756181cca4 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,4 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, eigen, opencv, cgal, ceres-solver, boost, vcg, glfw, zstd }: +{ lib +, boost +, breakpad +, ceres-solver +, cgal +, cmake +, eigen +, fetchFromGitHub +, glfw +, gmp +, libjpeg +, libpng +, libtiff +, mpfr +, opencv +, openmp +, pkg-config +, stdenv +, vcg +, zstd +}: let boostWithZstd = boost.overrideAttrs (old: { @@ -20,10 +40,38 @@ stdenv.mkDerivation rec { # SSE is enabled by default cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF"; - buildInputs = [ eigen opencv cgal ceres-solver vcg glfw boostWithZstd ]; + buildInputs = [ + boostWithZstd + breakpad + ceres-solver + cgal + eigen + glfw + gmp + libjpeg + libpng + libtiff + mpfr + opencv + openmp + vcg + ]; nativeBuildInputs = [ cmake pkg-config ]; + postInstall = '' + mv $out/bin/OpenMVS/* $out/bin + rmdir $out/bin/OpenMVS + rm $out/bin/Tests + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + ctest + runHook postCheck + ''; + meta = { description = "Open Multi-View Stereo reconstruction library"; homepage = "https://github.com/cdcseacave/openMVS"; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index af6aed851e09c..cfda819a42ca7 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -207,6 +207,7 @@ stdenv.mkDerivation rec { "-Druntime_cxxmodules=OFF" ]; + # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; # Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}. diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 5093a586a85af..cdc5bc855731b 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2022.4"; + version = "2023"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "sha256-xRG+YC/ylAIGW1CQaEHe+YdSY5uSqV8bChBg2bXicpc="; + sha256 = "sha256-rJLG2nL7vMpBT9io2Xnlbs8XxMHNq+0tpc+05yd7e6g="; }; nativeBuildInputs = [ cmake ]; @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.gromacs.org"; + homepage = "https://www.gromacs.org"; license = licenses.gpl2; description = "Molecular dynamics software package"; longDescription = '' diff --git a/pkgs/applications/science/physics/dawncut/default.nix b/pkgs/applications/science/physics/dawncut/default.nix index 8c0bc1ae6394a..5c17837d2e952 100644 --- a/pkgs/applications/science/physics/dawncut/default.nix +++ b/pkgs/applications/science/physics/dawncut/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontConfigure = true; - NIX_CFLAGS_COMPILE="-std=c++98"; + env.NIX_CFLAGS_COMPILE = "-std=c++98"; installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index a203db1204cb3..9221f4bcdbdd1 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtkWithQt5}: +{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtk_8_withQt5}: stdenv.mkDerivation rec { pname = "elmerfem"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libGL libGLU opencascade - vtkWithQt5 + vtk_8_withQt5 ]; preConfigure = '' diff --git a/pkgs/applications/science/physics/nnpdf/default.nix b/pkgs/applications/science/physics/nnpdf/default.nix index bc9e3c7e90cd1..ec29c02054df2 100644 --- a/pkgs/applications/science/physics/nnpdf/default.nix +++ b/pkgs/applications/science/physics/nnpdf/default.nix @@ -1,14 +1,13 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , apfel , gsl , lhapdf , libarchive -, libyamlcpp +, yaml-cpp , python3 , sqlite , swig @@ -16,22 +15,15 @@ stdenv.mkDerivation rec { pname = "nnpdf"; - version = "4.0.4"; + version = "4.0.6"; src = fetchFromGitHub { owner = "NNPDF"; repo = pname; rev = version; - sha256 = "sha256-Alx4W0TkPzJBsnRXcKBrlEU6jWTnOjrji/IPk+dNCw0="; + hash = "sha256-mwOMNlYFhHZq/wakO1/HGwcxvKGKh5OyFa2D9d3Y3IA="; }; - patches = [ - (fetchpatch { - url = "https://github.com/NNPDF/nnpdf/commit/7943b62a91d3a41fd4f6366b18881d50695f4b45.diff"; - hash = "sha256-UXhTO7vZgJiY8h3bgjg7SQC0gMUQsYQ/V/PgtCEQ7VU="; - }) - ]; - postPatch = '' for file in CMakeLists.txt buildmaster/CMakeLists.txt; do substituteInPlace $file \ @@ -49,7 +41,7 @@ stdenv.mkDerivation rec { gsl lhapdf libarchive - libyamlcpp + yaml-cpp python3 python3.pkgs.numpy sqlite diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 4e6f6626602f9..1852ef3ff1c8e 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -13,7 +13,7 @@ , lhapdf , libtirpc , libyaml -, libyamlcpp +, yaml-cpp , pkg-config , qcdnum , root @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gfortran pkg-config ]; buildInputs = - [ apfel blas ceres-solver lhapdf lapack libyaml root qcdnum gsl libyamlcpp zlib ] + [ apfel blas ceres-solver lhapdf lapack libyaml root qcdnum gsl yaml-cpp zlib ] ++ lib.optionals ("5" == lib.versions.major root.version) [ apfelgrid applgrid ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ] ++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc ; - NIX_CFLAGS_COMPILE = lib.optional (stdenv.hostPlatform.libc == "glibc") "-I${libtirpc.dev}/include/tirpc"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-I${libtirpc.dev}/include/tirpc"; NIX_LDFLAGS = lib.optional (stdenv.hostPlatform.libc == "glibc") "-ltirpc"; # workaround wrong library IDs diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 271274126b754..a76327b854b0d 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { inherit pname; - version = "10.8.0"; + version = "10.9.0"; src = fetchurl { url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64-portable.zip"; - sha256 = "sha256-Xn0ga2Z1UKd++TriL47ulV6idVTNBR8uiSW7FnL7r1g="; + sha256 = "sha256-9FzMyBIR2u1zXHtTWJABM6RF1+OyjYdEPlRwtig9blI="; }; nativeBuildInputs = [ wrapGAppsHook unzip ]; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index c037e41d74c6f..56d68fcd474be 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -19,7 +19,9 @@ , libwpd , libxslt , lyx +, makeWrapper , perl +, perlPackages , pkg-config , poppler_utils , python3Packages @@ -55,7 +57,7 @@ mkDerivation rec { "--without-inotify" ]); - NIX_CFLAGS_COMPILE = [ "-DNIXPKGS" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-DNIXPKGS" ]; patches = [ # fix "No/bad main configuration file" error @@ -66,6 +68,7 @@ mkDerivation rec { file pkg-config python3Packages.setuptools + makeWrapper which ]; @@ -73,6 +76,7 @@ mkDerivation rec { bison chmlib python3Packages.python + python3Packages.mutagen xapian zlib ] ++ lib.optional withGui [ @@ -111,6 +115,10 @@ mkDerivation rec { substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl fi done + wrapProgram $out/share/recoll/filters/rclaudio.py \ + --prefix PYTHONPATH : $PYTHONPATH + wrapProgram $out/share/recoll/filters/rclimg \ + --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}" '' + lib.optionalString stdenv.isLinux '' substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' '' + lib.optionalString (stdenv.isDarwin && withGui) '' @@ -130,6 +138,6 @@ mkDerivation rec { changelog = "https://www.lesbonscomptes.com/recoll/pages/release-${version}.html"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ jcumming ]; + maintainers = with maintainers; [ jcumming ehmry ]; }; } diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index f4ec3126976e1..cf9e8ec05fd47 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib -, defusedxml, future, packaging, psutil, setuptools +, defusedxml, future, ujson, packaging, psutil, setuptools # Optional dependencies: , bottle, pysnmp , hddtemp @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.3.0"; + version = "3.3.1"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "refs/tags/v${version}"; - sha256 = "sha256-4EZjr8oW5759U20YS6eWVZ0pelTCDj75FBc7IkAzd3M="; + sha256 = "sha256-93fghrNktcz+YyPkRl6ZiSZC+3a5TDql6eFZMy6veJc="; }; # On Darwin this package segfaults due to mismatch of pure and impure @@ -36,6 +36,7 @@ buildPythonApplication rec { bottle defusedxml future + ujson netifaces packaging psutil diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index db7a37e2be34d..eb8d892dd62e3 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-w4c9rVO54mrjUX2iRxUQ7PHqE+8D+BqBgHMK2X9nI0g="; + sha256 = "sha256-+B3h7ydN+ISElpOMMCcKORYnq1MaMhvr+4I2qHJ26As="; fetchSubmodules = true; }; diff --git a/pkgs/applications/system/zxfer/default.nix b/pkgs/applications/system/zxfer/default.nix new file mode 100644 index 0000000000000..b62c1262430ca --- /dev/null +++ b/pkgs/applications/system/zxfer/default.nix @@ -0,0 +1,86 @@ +{ lib +, bash +, fetchFromGitHub +, installShellFiles +, coreutils +, gawk +, gnugrep +, gnused +, openssh +, resholve +, rsync +, which +, zfs +}: + +resholve.mkDerivation rec { + pname = "zxfer"; + version = "1.1.7"; + + src = fetchFromGitHub { + owner = "allanjude"; + repo = pname; + rev = "v${version}"; + hash = "sha256-11SQJcD3GqPYBIgaycyKkc62/diVKPuuj2Or97j+NZY="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + # these may point to paths on remote systems, calculated at runtime, thus we cannot fix them + # we can only set their initial values, and let them remain dynamic + postPatch = '' + substituteInPlace zxfer \ + --replace 'LCAT=""' 'LCAT=${coreutils}/bin/cat' \ + --replace 'LZFS=$( which zfs )' 'LZFS=${zfs}/bin/zfs' + ''; + + installPhase = '' + runHook preInstall + + installManPage zxfer.1m zxfer.8 + install -Dm755 zxfer -t $out/bin/ + + runHook postInstall + ''; + + solutions.default = { + scripts = [ "bin/zxfer" ]; + interpreter = "${bash}/bin/sh"; + inputs = [ + coreutils + gawk + gnugrep + gnused + openssh + rsync + which + ]; + fake.external = [ + "kldload" # bsd builtin + "kldstat" # bsd builtin + "svcadm" # solaris builtin + ]; + keep = { + "$LCAT" = true; + "$LZFS" = true; + "$PROGRESS_DIALOG" = true; + "$RZFS" = true; + "$input_optionts" = true; + "$option_O" = true; + "$option_T" = true; + }; + fix = { + "$AWK" = [ "awk" ]; + "$RSYNC" = [ "rsync" ]; + }; + execer = [ "cannot:${rsync}/bin/rsync" ]; + }; + + meta = with lib; { + description = "A popular script for managing ZFS snapshot replication"; + homepage = "https://github.com/allanjude/zxfer"; + changelog = "https://github.com/allanjude/zxfer/releases/tag/v${version}"; + license = licenses.bsd2; + maintainers = with lib.maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index a736e836cb62e..0e74c2046c055 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -13,7 +13,7 @@ , fmt , microsoft_gsl , range-v3 -, libyamlcpp +, yaml-cpp , ncurses , file , darwin @@ -64,7 +64,7 @@ mkDerivation rec { fmt microsoft_gsl range-v3 - libyamlcpp + yaml-cpp ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.libs.utmp ]; preConfigure = '' diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 7ae2825f175a7..bd80a15d0562a 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -18,7 +18,7 @@ , wayland-scanner , pkg-config , utf8proc -, allowPgo ? true +, allowPgo ? !stdenv.hostPlatform.isMusl , python3 # for PGO # for clang stdenv check , foot diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 85ee654a989a0..95c4f0f71541a 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -1,72 +1,50 @@ { lib , stdenv , fetchurl -, fetchpatch , gettext , gnome , libgtop -, gtk3 -, libhandy +, gtk4 +, libadwaita , pcre2 -, vte -, appstream-glib +, vte-gtk4 , desktop-file-utils -, git , meson , ninja , pkg-config -, python3 -, sassc -, wrapGAppsHook +, wrapGAppsHook4 , nixosTests }: stdenv.mkDerivation rec { pname = "gnome-console"; - # Do not upgrade until https://gitlab.gnome.org/GNOME/vte/-/issues/2584 is resolved! - version = "42.2"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk="; + sha256 = "uWQkhaN6cOgswQVTsOJoF1a6Nh/15MvzGC8VAjH+qZ4="; }; - patches = [ - (fetchpatch { - name = "fix-clang-build-issues.patch"; - url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch"; - sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs="; - }) - ]; - - buildInputs = [ - gettext - libgtop - gtk3 - libhandy - pcre2 - vte - ]; - nativeBuildInputs = [ - appstream-glib desktop-file-utils - git + gettext meson ninja pkg-config - python3 - sassc - wrapGAppsHook + wrapGAppsHook4 ]; - mesonFlags = [ - "-Dnautilus=disabled" + buildInputs = [ + libgtop + gtk4 + libadwaita + pcre2 + vte-gtk4 ]; passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gnome-console"; }; }; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index aad2c367b91fd..07980f8375aa9 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libunistring +{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring , harfbuzz, fontconfig, pkg-config, ncurses, imagemagick , libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor , libxkbcommon, libXi, libXext, wayland-protocols, wayland @@ -21,20 +21,23 @@ , zsh , fish , nixosTests +, go +, buildGoModule }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.26.5"; + version = "0.27.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UloBlV26HnkvbzP/NynlPI77z09MBEVgtrg5SeTmwB4="; + hash = "sha256-/K/5T15kULTQP1FCLnyrKfhlQjIStayutaxLjmHjHes="; }; + vendorHash = "sha256-JLPPNOsoq+ErLhELsX3z3YehYfgp7OGXEXlP3IVcM5k="; buildInputs = [ harfbuzz @@ -67,21 +70,15 @@ buildPythonApplication rec { sphinx-copybutton sphinxext-opengraph sphinx-inline-tabs + go ] ++ lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. ]; - outputs = [ "out" "terminfo" "shell_integration" ]; + outputs = [ "out" "terminfo" "shell_integration" "kitten" ]; patches = [ - # Fix clone-in-kitty not working on bash >= 5.2 - # TODO: Removed on kitty release > 0.26.5 - (fetchpatch { - url = "https://github.com/kovidgoyal/kitty/commit/51bba9110e9920afbefeb981e43d0c1728051b5e.patch"; - sha256 = "sha256-1aSU4aU6j1/om0LsceGfhH1Hdzp+pPaNeWAi7U6VcP4="; - }) - # Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`. ./fix-test_ssh_env_vars.patch @@ -99,7 +96,20 @@ buildPythonApplication rec { # Causes build failure due to warning hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - dontConfigure = true; + CGO_ENABLED = 0; + GOFLAGS = "-trimpath"; + + configurePhase = let + goModules = (buildGoModule { + pname = "kitty-go-modules"; + inherit src vendorHash version; + }).go-modules; + in '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH="$TMPDIR/go" + export GOPROXY=off + cp -r --reflink=auto ${goModules} vendor + ''; buildPhase = let commonOptions = '' @@ -114,17 +124,17 @@ buildPythonApplication rec { runHook preBuild ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } ${if stdenv.isDarwin then '' - ${python.interpreter} setup.py build ${darwinOptions} + ${python.pythonForBuild.interpreter} setup.py build ${darwinOptions} make docs - ${python.interpreter} setup.py kitty.app ${darwinOptions} + ${python.pythonForBuild.interpreter} setup.py kitty.app ${darwinOptions} '' else '' - ${python.interpreter} setup.py build-launcher - ${python.interpreter} setup.py linux-package \ + ${python.pythonForBuild.interpreter} setup.py linux-package \ --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ --canberra-library='${libcanberra}/lib/libcanberra.so' \ --fontconfig-library='${fontconfig.lib}/lib/libfontconfig.so' \ ${commonOptions} + ${python.pythonForBuild.interpreter} setup.py build-launcher ''} runHook postBuild ''; @@ -169,15 +179,19 @@ buildPythonApplication rec { installPhase = '' runHook preInstall mkdir -p $out + mkdir -p $kitten/bin ${if stdenv.isDarwin then '' mkdir "$out/bin" ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" + ln -s ../Applications/kitty.app/Contents/MacOS/kitten "$out/bin/kitten" + cp ./kitty.app/Contents/MacOS/kitten "$kitten/bin/kitten" mkdir "$out/Applications" cp -r kitty.app "$out/Applications/kitty.app" installManPage 'docs/_build/man/kitty.1' '' else '' cp -r linux-package/{bin,share,lib} $out + cp linux-package/bin/kitten $kitten/bin/kitten ''} wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}" diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 7cc1b23a60ac7..54c9f9467636f 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 - gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 keybinder3 libnotify python3 diff --git a/pkgs/applications/terminal-emulators/tym/default.nix b/pkgs/applications/terminal-emulators/tym/default.nix index b85133e7aecb1..3dcf23170209c 100644 --- a/pkgs/applications/terminal-emulators/tym/default.nix +++ b/pkgs/applications/terminal-emulators/tym/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tym"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "endaaman"; repo = "${pname}"; rev = "${version}"; - sha256 = "sha256-ufIYJgbHmSJJbnx4hyDx0DmIjaGCxKXtiekcXcyka14="; + sha256 = "sha256-5pXNOuMT2/G+m6XoTrwNTCGNfISLLy0wQpVPhQJzs4s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index cece7cb8a01e6..15a605a328466 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -2,6 +2,7 @@ , rustPlatform , lib , fetchFromGitHub +, fetchpatch , ncurses , perl , pkg-config @@ -26,6 +27,7 @@ , UserNotifications , nixosTests , runCommand +, vulkan-loader }: rustPlatform.buildRustPackage rec { @@ -40,12 +42,12 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-1gnP2Dn4nkhxelUsXMay2VGvgvMjkdEKhFK5AAST++s="; }; - # Rust 1.65 does better at enum packing (according to - # 40e08fafe2f6e5b0c70d55996a0814d6813442ef), but Nixpkgs doesn't have 1.65 - # yet (still in staging), so skip these tests for now. - checkFlags = [ - "--skip=escape::action_size" - "--skip=surface::line::storage::test::memory_usage" + patches = [ + # fix build with rust 1.67 + (fetchpatch { + url = "https://github.com/wez/wezterm/commit/36519f0d90e1875fb4b3f11f6cbf94c7d716ef78.patch"; + sha256 = "sha256-sOGFmDan1uO1xOBCpvlGrSotjfw01MjRg0KVqa5omig="; + }) ]; postPatch = '' @@ -105,7 +107,10 @@ rustPlatform.buildRustPackage rec { ''; preFixup = lib.optionalString stdenv.isLinux '' - patchelf --add-needed "${libGL}/lib/libEGL.so.1" $out/bin/wezterm-gui + patchelf \ + --add-needed "${libGL}/lib/libEGL.so.1" \ + --add-needed "${vulkan-loader}/lib/libvulkan.so.1" \ + $out/bin/wezterm-gui '' + lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" OUT_APP="$out/Applications/WezTerm.app" @@ -122,9 +127,7 @@ rustPlatform.buildRustPackage rec { }; terminfo = runCommand "wezterm-terminfo" { - nativeBuildInputs = [ - ncurses - ]; + nativeBuildInputs = [ ncurses ]; } '' mkdir -p $out/share/terminfo $out/nix-support tic -x -o $out/share/terminfo ${src}/termwiz/data/wezterm.terminfo @@ -132,10 +135,9 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; + description = "GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; homepage = "https://wezfurlong.org/wezterm"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 24a698ba80358..a5c98cb7df812 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "377"; + version = "378"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-2xCP56Rdjtl+YEchtYRDtHNknmHiY2Mb+HWfhhipkLI="; + hash = "sha256-ZJ37/V7dDtnkfPjk2VO0sNPDC8KAFm38T/0Ulz/sPpI="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index f7ba075114b7f..927bd7acaa946 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -26,14 +26,13 @@ buildPythonApplication rec { pname = "commitizen"; - version = "2.39.1"; + version = "2.42.1"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - hash = "sha256-QQIYyg2zwV7cfFxGHVsLiTRBgTGs3O7OJcmURvfY3LQ="; - deepClone = true; + hash = "sha256-lrZfMqmslwx3B2WkvFosm3EmCHgpZEA/fOzR6UYf6f8="; }; format = "pyproject"; diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index a60aa27a8439c..0167f09ad5ba0 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ + # Needed with GCC 12 + "-Wno-error=maybe-uninitialized" + ]); + preInstall = '' mkdir -p $out/bin ''; diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index e00853393e058..8693e6d208fad 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -1,32 +1,42 @@ -{ lib -, stdenv -, buildGoPackage +{ bash +, buildGoModule +, common-updater-scripts +, coreutils +, curl , fetchurl -, makeWrapper , git -, bash , gzip +, jq +, lib +, makeWrapper +, nix +, nixosTests , openssh , pam , pamSupport ? true , sqliteSupport ? true +, stdenv +, writeShellApplication }: -buildGoPackage rec { +buildGoModule rec { pname = "forgejo"; - version = "1.18.2-1"; + version = "1.18.5-0"; src = fetchurl { name = "${pname}-src-${version}.tar.gz"; # see https://codeberg.org/forgejo/forgejo/releases - url = "https://codeberg.org/attachments/44ff6fcb-1515-4bba-85bf-3d3795ced2f7"; - hash = "sha256-XSh17AwPtC+Y24lgjjXJzT/uBHg+0hWZ2RZ/eNF4mCY="; + url = "https://codeberg.org/attachments/bb93c0c9-98c4-465c-bcff-e07ac3ee72a3"; + hash = "sha256-jyaJ7W/K1Nn44ZhyJHZD+dKObU3hYx6mmDzvbvrR7gw="; }; + vendorHash = null; + + subPackages = [ "." ]; + outputs = [ "out" "data" ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional pamSupport pam; patches = [ @@ -39,28 +49,71 @@ buildGoPackage rec { tags = lib.optional pamSupport "pam" ++ lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ]; + ldflags = [ + "-s" + "-w" "-X main.Version=${version}" "-X 'main.Tags=${lib.concatStringsSep " " tags}'" ]; postInstall = '' mkdir $data - cp -R ./go/src/${goPackagePath}/{public,templates,options} $data + cp -R ./{public,templates,options} $data mkdir -p $out - cp -R ./go/src/${goPackagePath}/options/locale $out/locale + cp -R ./options/locale $out/locale wrapProgram $out/bin/gitea \ --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; - goPackagePath = "code.gitea.io/gitea"; + passthru.tests = nixosTests.forgejo; + + passthru.updateScript = lib.getExe (writeShellApplication { + name = "update-forgejo"; + runtimeInputs = [ + common-updater-scripts + coreutils + curl + jq + nix + ]; + text = '' + releases=$(curl "https://codeberg.org/api/v1/repos/forgejo/forgejo/releases?draft=false&pre-release=false&limit=1" \ + --silent \ + --header "accept: application/json") + + stable=$(jq '.[0] + | .tag_name[1:] as $version + | ("forgejo-src-\($version).tar.gz") as $filename + | { $version, html_url } + (.assets | map(select(.name | startswith($filename)) | {(.name | split(".") | last): .browser_download_url}) | add)' \ + <<< "$releases") + + archive_url=$(jq -r .gz <<< "$stable") + checksum_url=$(jq -r .sha256 <<< "$stable") + release_url=$(jq -r .html_url <<< "$stable") + version=$(jq -r .version <<< "$stable") + + if [[ "${version}" = "$version" ]]; then + echo "No new version found (already at $version)" + exit 0 + fi + + echo "Release: $release_url" + + sha256=$(curl "$checksum_url" --silent | cut --delimiter " " --fields 1) + sri_hash=$(nix hash to-sri --type sha256 "$sha256") + + update-source-version "${pname}" "$version" "$sri_hash" "$archive_url" + ''; + }); meta = with lib; { description = "A self-hosted lightweight software forge"; homepage = "https://forgejo.org"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ indeednotjames urandom ]; broken = stdenv.isDarwin; + mainProgram = "gitea"; }; } diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 335a899b4da10..f505ebdfeb860 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.6.2"; + version = "3.7.0"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "sha256-/OckQD6r9WSMx9Vt44eFpzsacH6VMa6NJX6sj2HBQSs="; + sha256 = "sha256-pbOe7ZN0IM4PTdRywGCyGJ7GIyPudbVJ3QokVP1bazo="; }; buildCommand = '' diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index dcce6f7f3c002..0df0669c41da7 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -12,7 +12,7 @@ let pname = "gfold"; - version = "4.2.0"; + version = "4.3.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "sha256-cH4FhXrdT0ejpyt8G2rSGw9WE9sfOXRkSA9+FVwRmtQ="; + sha256 = "sha256-jlUGtTtoJ3DQbs4VEDUbYyl+s9S+bLTQ+GM6OQg6MNo="; }; - cargoSha256 = "sha256-NmVmqBzRUdumWQ9MzolZTo0VQW9JTjIyYRwUTzGiQZ4="; + cargoHash = "sha256-Mrqg0wOG3JHDdGMZMcFsifpazOukZeoMPrQh4vIfQyU="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 284da7b4fae28..3f154f0350c4d 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.22.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-kebBochGagpg26Q2bkpUTPMYYwwBpBVx2+ZtsErJWYk="; + hash = "sha256-91TmPIjFOCeZmbobn3mIJis5qofJFmNGuX19+Cyo8Ck="; }; - vendorSha256 = "sha256-OjTl43UQGGHqCrw0kMBShuS8aonjWczfzQGmGJLhdrU="; + vendorHash = "sha256-NiXC0ooUkAqFCLp3eRBpryazQU94gSnw0gYFwQNeCo4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/ghq/default.nix b/pkgs/applications/version-management/ghq/default.nix index 26632abe4694b..b9bfc6f745ec7 100644 --- a/pkgs/applications/version-management/ghq/default.nix +++ b/pkgs/applications/version-management/ghq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghq"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "sha256-tGublfC6EeY3T/45lxmsm5zsmlgq/guS64OutAWy6AY="; + sha256 = "sha256-dUW5eZODHkhhzC21uA9jFnwb9Q+9/t7o0K/nGbsZH84="; }; - vendorSha256 = "sha256-ZUnnvZERWXnOs4hybw8JDlGdM7QFaMfs6o3SYy0UwTM="; + vendorHash = "sha256-Q3sIXt8srGI1ZFUdQ+x6I6Tc07HqyH0Hyu4kBe64uRs="; doCheck = false; diff --git a/pkgs/applications/version-management/git-chglog/default.nix b/pkgs/applications/version-management/git-chglog/default.nix index b427acf960ec7..ad0d64a6ef62a 100644 --- a/pkgs/applications/version-management/git-chglog/default.nix +++ b/pkgs/applications/version-management/git-chglog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-chglog"; - version = "0.15.1"; + version = "0.15.4"; src = fetchFromGitHub { owner = "git-chglog"; repo = "git-chglog"; rev = "v${version}"; - sha256 = "sha256-UlhJ004ceXpdB/9296cL2sbBYsjV8D+3YS1vmFgnko8="; + sha256 = "sha256-rTJn2vUrEnmG2japqCxHv3BR9MpmMfpMLO2FBP6ONbw="; }; - vendorSha256 = "sha256-FLFPcmkrhZ+/UX1xpexsDv3cgC/Ocj4qTFJOX+rmdyQ="; + vendorHash = "sha256-skhEHpSnxOTZrL8XLlQZL3s224mg8XRINKJnatYCQko="; ldflags = [ "-s" "-w" "-X=main.Version=v${version}" ]; diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix index fb4ebea2480f5..e9959cd42deee 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -1,9 +1,6 @@ -{ lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: +{ stdenv, lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: -let - inherit (python3Packages) buildPythonApplication pyqt5 sip_4 pyinotify qtpy; - -in buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-cola"; version = "4.1.0"; @@ -14,11 +11,23 @@ in buildPythonApplication rec { hash = "sha256-s+acQo9b+ZQ31qXBf0m8ajXYuYEQzNybmX9nw+c0DQY="; }; - buildInputs = [ git gettext ]; - propagatedBuildInputs = [ pyqt5 sip_4 pyinotify qtpy ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + # TODO: remove in the next release since upstream removed pytest-flake8 + # https://github.com/git-cola/git-cola/commit/6c5c5c6c888ee1a095fc1ca5521af9a03b833205 + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--flake8" "" + ''; + + propagatedBuildInputs = with python3Packages; [ git pyqt5 qtpy send2trash ]; + nativeBuildInputs = [ gettext qt5.wrapQtAppsHook ]; + nativeCheckInputs = with python3Packages; [ git pytestCheckHook ]; - doCheck = false; + disabledTestPaths = [ + "qtpy/" + "contrib/win32" + ] ++ lib.optionals stdenv.isDarwin [ + "cola/inotify.py" + ]; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") @@ -28,7 +37,6 @@ in buildPythonApplication rec { homepage = "https://github.com/git-cola/git-cola"; description = "A sleek and powerful Git GUI"; license = licenses.gpl2; - platforms = platforms.linux; maintainers = [ maintainers.bobvanderlinden ]; }; } diff --git a/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-credential-keepassxc/default.nix index 27998f1c9c15b..e9b4d75bf64ac 100644 --- a/pkgs/applications/version-management/git-credential-keepassxc/default.nix +++ b/pkgs/applications/version-management/git-credential-keepassxc/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-credential-keepassxc"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Frederick888"; repo = "git-credential-keepassxc"; rev = "v${version}"; - hash = "sha256-ZpysJ+xs3IenqAdoswG0OkzxzuNPSKkqlutGxn4VRw8="; + hash = "sha256-siVSZke+anVTaLiJVyDEKvgX+VmS0axa+4721nlgmiw="; }; - cargoHash = "sha256-IPsMlVfgwoFEQlXmW4gnt16WNF5W6akobUVct/iF42E="; + cargoHash = "sha256-QMAAKkjWgM/UiOfkNMLQxyGEYYmiSvE0Pd8fZXYyN48="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 24fc850b31b08..885f6d1355e93 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.14.3"; + version = "3.15.2"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-VOny8r00JYUT4Z7LukvWTH9ZTn86vn2Dc1YhPmtdE5s="; + hash = "sha256-hIm3JDLXUTwjuVfAHvZBWFBJNOAVWyfl/X4A6B0OoXg="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 69fb89604bb79..8bd9d315d0059 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.30"; + version = "2.31"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-Ck+Q7sHhMqUWu6WeA3DhY+svMxH2sU0WvmyvZ5qsW+E="; + sha256 = "sha256-Xr5VH7iMboh2F2iBqjIo+PNmWcC/GCYJp3PrPbeyefQ="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/git-subset/default.nix b/pkgs/applications/version-management/git-subset/default.nix deleted file mode 100644 index 53db1c01eefb7..0000000000000 --- a/pkgs/applications/version-management/git-subset/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl, libiconv, Security }: - -rustPlatform.buildRustPackage rec { - pname = "git-subset"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "jasonwhite"; - repo = pname; - rev = "v${version}"; - sha256 = "02z2r0kcd0nnn1zjslp6xxam5ddbhrmzn67qzxhlamsw0p9vvkbb"; - }; - - cargoSha256 = "0lc9m9prmhr4ipjh95cfczvlmpp9scryksvqd49h4acyr904n7ry"; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl libiconv Security ]; - - meta = with lib; { - description = "Super fast Git tree filtering"; - homepage = "https://github.com/jasonwhite/git-subset"; - license = licenses.mit; - maintainers = [ maintainers.marsam ]; - }; -} diff --git a/pkgs/applications/version-management/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix index 0ef5a678ee8ef..a7dbf0c6ba4bc 100644 --- a/pkgs/applications/version-management/git-trim/default.nix +++ b/pkgs/applications/version-management/git-trim/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, libgit2 +, IOKit +, CoreFoundation +, fetchpatch +}: rustPlatform.buildRustPackage rec { pname = "git-trim"; @@ -11,11 +21,22 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-XAO3Qg5I2lYZVNx4+Z5jKHRIFdNwBJsUQwJXFb4CbvM="; }; - cargoHash = "sha256-KCLMb8NXxjscrmKXkP/RbV+LsJqOG7zaClJGFiQ4o9k="; + cargoHash = "sha256-mS8kNkZs8jX99ryG4XkU+U/iWIIcmET2vOfG1YNNZFU="; + + cargoPatches = [ + # Update git2 https://github.com/foriequal0/git-trim/pull/202 + (fetchpatch { + url = "https://github.com/foriequal0/git-trim/commit/4355cd1d6f605455087c4d7ad16bfb92ffee941f.patch"; + sha256 = "sha256-C1pX4oe9ZCgvqYTBJeSjMdr0KFyjv2PNVMJDlwCAngY="; + }) + ]; + + OPENSSL_NO_VENDOR = 1; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ openssl libgit2 ] + ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; postInstall = '' install -Dm644 -t $out/share/man/man1/ docs/git-trim.1 diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 56f7e697ec87b..ef1b8db97b03f 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.39.0"; + version = "2.39.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-uhmbE/tamco97JF7C9c2vA61qd+Hc31DXt398Q1pJls="; + sha256 = "R1918Tc7LNTkOHBhhRdZZtXBH2jE2x5IwmJXxD3c8tY="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 3126dde505499..3141d08cdcece 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, buildGoPackage +, buildGoModule , fetchurl , makeWrapper , git @@ -13,16 +13,18 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "gitea"; - version = "1.18.3"; + version = "1.18.5"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-jqjpbDgcmwZoc/ovgburFeeta9mAJOmz7yrvmUKAwRU="; + hash = "sha256-OGPn4fknYfzmuAi6CL8m/Ih4uRNraVDmpBm20qT3lKk="; }; + vendorHash = null; + patches = [ ./static-root-path.patch ]; @@ -31,37 +33,34 @@ buildGoPackage rec { substituteInPlace modules/setting/setting.go --subst-var data ''; + subPackages = [ "." ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional pamSupport pam; - preBuild = - let - tags = lib.optional pamSupport "pam" - ++ lib.optional sqliteSupport "sqlite sqlite_unlock_notify"; - tagsString = lib.concatStringsSep " " tags; - in - '' - export buildFlagsArray=( - -tags="${tagsString}" - -ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"' - ) - ''; + tags = lib.optional pamSupport "pam" + ++ lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ]; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + "-X 'main.Tags=${lib.concatStringsSep " " tags}'" + ]; outputs = [ "out" "data" ]; postInstall = '' mkdir $data - cp -R ./go/src/${goPackagePath}/{public,templates,options} $data + cp -R ./{public,templates,options} $data mkdir -p $out - cp -R ./go/src/${goPackagePath}/options/locale $out/locale + cp -R ./options/locale $out/locale wrapProgram $out/bin/gitea \ --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; - goPackagePath = "code.gitea.io/gitea"; - passthru.tests = nixosTests.gitea; meta = with lib; { diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 2b6018dfe4460..434da9188ef78 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.0.0"; + version = "9.1.1"; 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-I6iIg+RBTz5HyommAvDuQBBURjMm04t31o5OZNCrYGc="; + sha256 = "sha256-CbIKdErthpMnVIuv+EJsWBRixMDG8h9aQ2XcmqpzKUc="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "1dhswjzyjrfz4psjji53fjpvb8845lv44qqc6ncfv1ljx9ky828r"; + sha256 = "sha256-J6ruK1UE0A9VG1tUHeSUDEL4wqRmUnOH8ftKHIIQuVc="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - sha256 = "0jzcwx1z240rr08qc6vbasn51bcadz2jl3vm3jwgjpfdwypnsvk1"; + sha256 = "sha256-cjz/pbV+uV6tbhj3NXDfZ93hgxFtNYhFIh6+jG4pFtU="; }; }; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index a36dc3bc2503c..63d22703d284c 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.7.5", - "repo_hash": "sha256-zo1b82y114NpX43rJAWQmUhORM1kQxyiSnonqPUQJmY=", - "yarn_hash": "086v3lr4hnz8z8pla1d3mi2smldidmx2z2cmffn830ianpqkk83l", + "version": "15.8.3", + "repo_hash": "sha256-kODF5qalf8PClbsTgcqm5X2uTXpFA8N9FW+2HCPKxD0=", + "yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.7.5-ee", + "rev": "v15.8.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.7.5", - "GITLAB_PAGES_VERSION": "15.7.5", - "GITLAB_SHELL_VERSION": "14.14.0", - "GITLAB_WORKHORSE_VERSION": "15.7.5" + "GITALY_SERVER_VERSION": "15.8.3", + "GITLAB_PAGES_VERSION": "15.8.3", + "GITLAB_SHELL_VERSION": "14.15.0", + "GITLAB_WORKHORSE_VERSION": "15.8.3" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index da95241d34c4b..2b90a2e0cdaf0 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -80,7 +80,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -90,7 +90,7 @@ GEM minitest (5.16.3) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.13.8) + nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.20.0) @@ -112,15 +112,15 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (4.0.7) - racc (1.6.0) + racc (1.6.1) rack (2.2.4) rack-test (2.0.2) rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) rainbow (3.0.0) rbtrace (0.4.14) ffi (>= 1.0.6) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 9f217aa65f34c..aab5bfbd6a6fe 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.7.5"; + version = "15.8.3"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,10 +22,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-FT77MUcErc/16tChwyNczCLtADTOEzKKTsTlhLI6aV8="; + sha256 = "sha256-jH5cbhoRgFsWJhXhKvdee4n77W2l+GSHGM2NElJTEy8="; }; - vendorSha256 = "sha256-UEEM0mv7d0gmDcsSKbeh4JcTnX4f5oogZnhRpqaNxwY="; + vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index f7471a12b008d..f3a4a082f205c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -317,10 +317,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; - version = "2.19.0"; + version = "2.19.1"; }; memoizable = { dependencies = ["thread_safe"]; @@ -385,10 +385,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.10"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -494,10 +494,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; rack = { groups = ["default"]; @@ -537,10 +537,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; + sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.4"; }; rainbow = { source = { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 74fd1ab320e02..25e2a0642423a 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.14.0"; + version = "14.15.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-zXRLaEy2Q+mm1GLjLB1AxRtBxXAoLw6PA1YOJfvVhoc="; + sha256 = "sha256-GDhYBL5LT3r6UIjDDY3LV5VgcBch190hYLPb6uMWETs="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-mhmM33cXJbqVJ1jY82Mi/nWzz7HXdxxSsFNQknFkwpQ="; + vendorSha256 = "sha256-2DpQNJw67ipIW3ctHDJthuDrKNZCYvjXGlDxzBEMGWs="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b164076c28b69..252be4e563137 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.7.5"; + version = "15.8.3"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-TrLc5L4kLAdu1CEM3ezw6hhF6Icy3rXkFyUaVTUQ6X4="; + vendorSha256 = "sha256-0FWR6cIV/0R2OrOAKhvuVnIY3Hkw4CIjyBUeF/paumw="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 417dc56637da3..96517b56ff918 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -5,7 +5,7 @@ source 'https://rubygems.org' if ENV['BUNDLER_CHECKSUM_VERIFICATION_OPT_IN'] # this verification is still experimental $LOAD_PATH.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__)) require 'bundler-checksum' - Bundler::Checksum.patch! + BundlerChecksum.patch! end gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false @@ -37,7 +37,7 @@ gem 'view_component', '~> 2.74.1' gem 'default_value_for', '~> 3.4.0' # Supported DBs -gem 'pg', '~> 1.4.3' +gem 'pg', '~> 1.4.5' gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.1' @@ -84,7 +84,7 @@ gem 'gssapi', group: :kerberos gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # Spam and anti-bot protection -gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' +gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' gem 'akismet', '~> 3.0' gem 'invisible_captcha', '~> 2.0.0' @@ -113,7 +113,7 @@ gem 'gpgme', '~> 2.0.22' # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' -gem 'net-ldap', '~> 0.16.3' +gem 'net-ldap', '~> 0.17.1' # API gem 'grape', '~> 1.5.2' @@ -200,7 +200,7 @@ gem 'diffy', '~> 3.4' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.2.4' +gem 'rack', '~> 2.2.6', '>= 2.2.6.2' # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' @@ -304,7 +304,7 @@ gem 'fast_blank' gem 'gitlab-chronic', '~> 0.10.5' gem 'gitlab_chronic_duration', '~> 0.10.6.2' -gem 'rack-proxy', '~> 0.7.4' +gem 'rack-proxy', '~> 0.7.6' gem 'sassc-rails', '~> 2.1.0' gem 'autoprefixer-rails', '10.2.5.1' @@ -358,12 +358,12 @@ gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.2.6', require: false + gem 'lefthook', '~> 1.2.7', require: false gem 'rubocop' gem 'solargraph', '~> 0.47.2', require: false gem 'letter_opener_web', '~> 2.0.0' - gem 'lookbook', '~> 1.2', '>= 1.2.1' + gem 'lookbook', '~> 1.4', '>= 1.4.5' # Better errors handler gem 'better_errors', '~> 2.9.1' @@ -395,7 +395,7 @@ group :development, :test do gem 'spring', '~> 4.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 9.1.0', require: false + gem 'gitlab-styles', '~> 9.2.0', require: false gem 'haml_lint', '~> 0.40.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -538,7 +538,7 @@ gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: f gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' # File encryption -gem 'lockbox', '~> 0.6.2' +gem 'lockbox', '~> 1.1.1' # Email validation gem 'valid_email', '~> 0.1' @@ -574,6 +574,7 @@ gem 'arr-pm', '~> 0.0.12' # Apple plist parsing gem 'CFPropertyList' +gem 'app_store_connect' # For phone verification gem 'telesignenterprise', '~> 2.2' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 087d4d8aeec04..ea1771e5af3bd 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -172,6 +172,9 @@ GEM apollo_upload_server (2.1.0) actionpack (>= 4.2) graphql (>= 1.8) + app_store_connect (0.29.0) + activesupport (>= 6.0.0) + jwt (>= 1.4, <= 2.5.0) arr-pm (0.0.12) asana (0.10.13) faraday (~> 1.0) @@ -598,7 +601,7 @@ GEM gitlab-sidekiq-fetcher (0.9.0) json (>= 2.5) sidekiq (~> 6.1) - gitlab-styles (9.1.0) + gitlab-styles (9.2.0) rubocop (~> 1.38.0) rubocop-gitlab-security (~> 0.1.1) rubocop-graphql (~> 0.14) @@ -832,7 +835,7 @@ GEM kramdown (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.2.6) + lefthook (1.2.7) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -861,7 +864,7 @@ GEM ffi-compiler (~> 1.0) rake (~> 13.0) locale (2.1.3) - lockbox (0.6.2) + lockbox (1.1.1) lograge (0.11.2) actionpack (>= 4) activesupport (>= 4) @@ -870,7 +873,7 @@ GEM loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lookbook (1.2.1) + lookbook (1.4.5) actioncable activemodel css_parser @@ -930,7 +933,7 @@ GEM nenv (0.3.0) net-http-persistent (4.0.1) connection_pool (~> 2.2) - net-ldap (0.16.3) + net-ldap (0.17.1) net-ntp (2.1.3) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) @@ -1068,7 +1071,7 @@ GEM tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.4.3) + pg (1.4.5) pg_query (2.2.0) google-protobuf (>= 3.19.2) plist (3.6.0) @@ -1108,7 +1111,7 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) racc (1.6.1) - rack (2.2.4) + rack (2.2.6.2) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.6.1) @@ -1123,7 +1126,7 @@ GEM rack (>= 2.1.0) rack-protection (2.2.2) rack - rack-proxy (0.7.4) + rack-proxy (0.7.6) rack rack-test (2.0.2) rack (>= 1.3) @@ -1150,8 +1153,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) @@ -1174,7 +1177,7 @@ GEM rchardet (1.8.0) rdoc (6.3.2) re2 (1.6.0) - recaptcha (4.13.1) + recaptcha (5.12.3) json recursive-open-struct (1.1.3) redcarpet (3.5.1) @@ -1274,14 +1277,14 @@ GEM rubocop (>= 0.51) rubocop-graphql (0.18.0) rubocop (>= 0.87, < 2) - rubocop-performance (1.15.0) + rubocop-performance (1.15.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.17.2) + rubocop-rails (2.17.3) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.15.0) + rubocop-rspec (2.16.0) rubocop (~> 1.33) ruby-fogbugz (0.3.0) crack (~> 0.4) @@ -1581,6 +1584,7 @@ DEPENDENCIES addressable (~> 2.8) akismet (~> 3.0) apollo_upload_server (~> 2.1.0) + app_store_connect arr-pm (~> 0.0.12) asana (~> 0.10.13) asciidoctor (~> 2.0.17) @@ -1672,7 +1676,7 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.10.0) gitlab-sidekiq-fetcher (= 0.9.0) - gitlab-styles (~> 9.1.0) + gitlab-styles (~> 9.2.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.2.0) gon (~> 6.4.0) @@ -1716,15 +1720,15 @@ DEPENDENCIES knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.9.3)! - lefthook (~> 1.2.6) + lefthook (~> 1.2.7) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) listen (~> 3.7) - lockbox (~> 0.6.2) + lockbox (~> 1.1.1) lograge (~> 0.5) loofah (~> 2.19.1) - lookbook (~> 1.2, >= 1.2.1) + lookbook (~> 1.4, >= 1.4.5) lru_redux mail (= 2.7.1) mail-smtp_pool (~> 0.1.0)! @@ -1734,7 +1738,7 @@ DEPENDENCIES mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) - net-ldap (~> 0.16.3) + net-ldap (~> 0.17.1) net-ntp nokogiri (~> 1.13.10) oauth2 (~> 2.0) @@ -1767,7 +1771,7 @@ DEPENDENCIES parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.4.3) + pg (~> 1.4.5) pg_query (~> 2.2) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) @@ -1777,11 +1781,11 @@ DEPENDENCIES pry-shell (~> 0.5.1) puma (~> 5.6.5) puma_worker_killer (~> 0.3.1) - rack (~> 2.2.4) + rack (~> 2.2.6, >= 2.2.6.2) rack-attack (~> 6.6.1) rack-cors (~> 1.1.1) rack-oauth2 (~> 1.21.3) - rack-proxy (~> 0.7.4) + rack-proxy (~> 0.7.6) rack-timeout (~> 0.6.3) rails (~> 6.1.6.1) rails-controller-testing @@ -1790,7 +1794,7 @@ DEPENDENCIES rbtrace (~> 0.4) rdoc (~> 6.3.2) re2 (~> 1.6.0) - recaptcha (~> 4.11) + recaptcha (~> 5.12) redis (~> 4.8.0) redis-actionpack (~> 5.3.0) redis-namespace (~> 1.9.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 968d07704fcb9..269318a0961d1 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -206,6 +206,17 @@ src: }; version = "2.1.0"; }; + app_store_connect = { + dependencies = ["activesupport" "jwt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03s3x8b6ifjrqk9ian59i9yyxxl65ykvbb4r424j2hjsh8iskmq1"; + type = "gem"; + }; + version = "0.29.0"; + }; arr-pm = { groups = ["default"]; platforms = []; @@ -2177,10 +2188,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ch27hxbby16jxvxg1jq3sqdbd3gg7ss4ymxn3yhsjy7gyglxza6"; + sha256 = "196fhlbhhanpbn5iriccp7m04xgkq7swyk07im50q7z05pxyf1ki"; type = "gem"; }; - version = "9.1.0"; + version = "9.2.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -3098,10 +3109,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qyylcc57pcf8mwm9dvlzkfjxcpbypnp4q21ni05s7wxalxb12ld"; + sha256 = "18vcakjkb5fhavq9s6j7zwjc14c652361qws5g1slqb300anfww2"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; letter_opener = { dependencies = ["launchy"]; @@ -3194,10 +3205,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6w327y8d7dr0d7zw6p7hmlwh0hcvb7pkc7xxyf5mn3fmw6fdh1"; + sha256 = "1h1a3h3rfv3094pn5zn7d3c066dmhx9i380mhqa1qyagqla6pw8a"; type = "gem"; }; - version = "0.6.2"; + version = "1.1.1"; }; lograge = { dependencies = ["actionpack" "activesupport" "railties" "request_store"]; @@ -3227,10 +3238,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mv5q4gpgzklwrgp7s7mhi0gb7x739qhyrni2n96i2vr4nv48a3l"; + sha256 = "1nww5h9frmbjfpfy2nb296vn78xnq1qg0lq3lsn52ky8s8rb65dw"; type = "gem"; }; - version = "1.2.1"; + version = "1.4.5"; }; lru_redux = { groups = ["default"]; @@ -3581,10 +3592,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; + sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; type = "gem"; }; - version = "0.16.3"; + version = "0.17.1"; }; net-ntp = { groups = ["default"]; @@ -4153,10 +4164,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb"; + sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.5"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -4358,10 +4369,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; + sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.6.2"; }; rack-accept = { dependencies = ["rack"]; @@ -4424,10 +4435,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m6j2xk3s3ps3r9vqgwq3flyij9jgkyzanmgiifid8yqhcskgfx8"; + sha256 = "1a62439xwn5v6hsl9s11hdk4wj58czhcbg7lminv23mnkc0ca147"; type = "gem"; }; - version = "0.7.4"; + version = "0.7.6"; }; rack-test = { dependencies = ["rack"]; @@ -4489,10 +4500,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; + sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.4"; }; rails-i18n = { dependencies = ["i18n" "railties"]; @@ -4614,10 +4625,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w"; + sha256 = "1vmpppgdy64qa16bvkss0xyzmyyzxv5hwzvc1i6saw4yvm58kl9p"; type = "gem"; }; - version = "4.13.1"; + version = "5.12.3"; }; recursive-open-struct = { groups = ["default"]; @@ -5020,10 +5031,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h06a2asg8pjq7l0k885126n60y54rgw0qr957qarpv7qligzn4c"; + sha256 = "00ld0hfm2x5hzms9xhkyjfxs8afsmlg1kf0mklk68cq4wwwihkwd"; type = "gem"; }; - version = "1.15.0"; + version = "1.15.1"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -5031,10 +5042,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "052viwgi7dbbnq0pxihz1k72dwhph8gw4v2zzw057w42l39hhh6i"; + sha256 = "1bv51vwcg5m4v35n7653xclw9vv3ifvgbhvc2l79wz2p76ipm1bx"; type = "gem"; }; - version = "2.17.2"; + version = "2.17.3"; }; rubocop-rspec = { dependencies = ["rubocop"]; @@ -5042,10 +5053,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pj53m5zcrgyhb2zsjxqsav9sm9s8jh0mgk8c1qckaxy3dkwfxm4"; + sha256 = "1rpcww107xq6aj5wkypzjj346jaxhqal33wmhlwb9gc2h425yg5k"; type = "gem"; }; - version = "2.15.0"; + version = "2.16.0"; }; ruby-fogbugz = { dependencies = ["crack" "multipart-post"]; diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/applications/version-management/gitmux/default.nix index 7e66985bb8864..2b25c5e52775e 100644 --- a/pkgs/applications/version-management/gitmux/default.nix +++ b/pkgs/applications/version-management/gitmux/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitmux"; - version = "0.7.10"; + version = "0.9.1"; src = fetchFromGitHub { owner = "arl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kBrE3jU7N8+kdT4tqC6gIGPz3soagStzLy5Iz4vNFI0="; + sha256 = "sha256-QbQykbZo8fMyCMd0MF7CGrPFECN0ehcTGGLeQXbnlxw="; }; - vendorSha256 = "sha256-V6xe+19NiHYIIN4rgkyzdP4eGnRXo0aW4fVbdlIcvig="; + vendorHash = "sha256-talZSkf8lQXwXKdkQliHFv2K+42BFtcg13oB5Szkff0="; # GitHub source does contain a regression test for the module # but it requires networking as it git clones a repo from github diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index d2a51c94727a2..708703b64d2d3 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -7,26 +7,27 @@ , libiconv , Security , SystemConfiguration +, curl , openssl }: rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.19.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "sha256-GGXujTn5Xb63vKIycj5o9+PCsMN1Kp3RCSg1wiM31qA="; + sha256 = "sha256-PetU/cUWFZWl1OoSObI7wwqJLexWPTP6ynNSyPXjvMc="; }; - cargoSha256 = "sha256-MAZhrd9CtFOIAaUUbXplBo+eo6Zaws2LIRkPoX4HztE="; + cargoHash = "sha256-A7gwC9EQ+5GVciGsL9uPbZ6nThPfku3ZNH8qQwfI0QQ="; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = if stdenv.isDarwin + buildInputs = [ curl ] ++ (if stdenv.isDarwin then [ libiconv Security SystemConfiguration ] - else [ openssl ]; + else [ openssl ]); # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/applications/version-management/glab/default.nix b/pkgs/applications/version-management/glab/default.nix index 9d6bbbd13f67c..a789a35f7a5d7 100644 --- a/pkgs/applications/version-management/glab/default.nix +++ b/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.24.1"; + version = "1.25.3"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-CUchYPMBTINkMJg8TC8rKMVkrcj/Gy+ZxV7jbtMFvpg="; + hash = "sha256-x/VH6cRrJZ2t2iftBPC86FcgIwjRNzV11MwLG2y+Paw="; }; - vendorSha256 = "sha256-NuK63ibb1t+HnSR/gCFS7HWVtfGLazVx2M+qxRNCR1I="; + vendorHash = "sha256-FZ1CiR8Rj/sMoCnQm6ArGQfRTlvmD14EZDmufnlTSTk="; ldflags = [ "-s" diff --git a/pkgs/applications/version-management/glitter/default.nix b/pkgs/applications/version-management/glitter/default.nix index 5786ebc8a6507..c99403889d54a 100644 --- a/pkgs/applications/version-management/glitter/default.nix +++ b/pkgs/applications/version-management/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.6.3"; + version = "1.6.5"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xrQqeRJfBEcjX0tkULg+94R7+mWWn6QeKIfZiDp+Vt8="; + sha256 = "sha256-sMAHVXpgAhZYUpl75JRtKhTqt/sQkSkoEzk7aGV1vcQ="; }; - cargoSha256 = "sha256-GQ7Bns+FPj4jl2dBXnMrmcKIYcZTLZc1WvaHgKGj/gU="; + cargoSha256 = "sha256-CaWpGNP7Jsv/3dks0LVbZXoD/9HqJmOzaD0ejT5xSqA="; nativeCheckInputs = [ git diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 0549169ed1b6e..824d0e0560485 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -8,16 +8,16 @@ with lib; buildGoModule rec { pname = "gogs"; - version = "0.12.10"; + version = "0.13.0"; src = fetchFromGitHub { owner = "gogs"; repo = "gogs"; rev = "v${version}"; - sha256 = "sha256-EFGC94aIMW7AYJpgaHBT4W7BjXd+oijMqQPH40rIvlg="; + sha256 = "sha256-UfxE+NaqDr3XUXpvlV989Iwjq/lsAwpMTDAPkcOmma8="; }; - vendorSha256 = "sha256-5AnQ7zF2UK1HNoyr6gwFdVv+KMJEGkjKPpDEpUXckUg="; + vendorSha256 = "sha256-ISJOEJ1DWO4nnMpDuZ36Nq528LhgekDh3XUF8adlj2w="; subPackages = [ "." ]; diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 7db96739b2b53..e601b1165f5d8 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.82"; + version = "0.83"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-Lb0WZ4gTuG/GBAnEh9ff/K0ciwjDX3cmEhItMyJ/lmI="; + sha256 = "sha256-kNhU6OR9IUNPL72D90nhq2X5vmVW7YUmpnq/EOUvG/8="; }; nativeBuildInputs = [ pkg-config bison ]; diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index d198b528f2ad9..36c67568020c7 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - sha256 = "sha256-ajBL2o5i4UmclL/s9eEVtn/p51/F4gsClmcYBrAZ+1o="; + sha256 = "sha256-FczlSBlLhLIamLiY4cGVAoHx0/sxx+tykICzedFbbx8="; }; - cargoSha256 = "sha256-RgF2StIMfFzbp0azG4yRPvzrZ4kczWtOWVd+KTTPbRw="; + cargoHash = "sha256-PydDgXp47KUSLvAQgfO+09lrzTnBjzGd+zA5f/jZfRc="; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/applications/version-management/lab/default.nix b/pkgs/applications/version-management/lab/default.nix index 754fa778fed90..38531775b99e9 100644 --- a/pkgs/applications/version-management/lab/default.nix +++ b/pkgs/applications/version-management/lab/default.nix @@ -22,14 +22,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' - # make xdg-open overrideable at runtime - wrapProgram $out/bin/lab \ - --prefix PATH ":" "${lib.makeBinPath [ git ]}" \ - --suffix PATH ":" "${lib.makeBinPath [ xdg-utils ]}" + # create shell completions before wrapProgram so that lab detects the right path for itself installShellCompletion --cmd lab \ --bash <($out/bin/lab completion bash) \ --fish <($out/bin/lab completion fish) \ --zsh <($out/bin/lab completion zsh) + # make xdg-open overrideable at runtime + wrapProgram $out/bin/lab \ + --suffix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/lefthook/default.nix b/pkgs/applications/version-management/lefthook/default.nix index 3e1f002f9776d..06c7c6c4d9410 100644 --- a/pkgs/applications/version-management/lefthook/default.nix +++ b/pkgs/applications/version-management/lefthook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lefthook"; - version = "1.2.7"; + version = "1.2.9"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-bsPTOv1s/kU6UUxmmPpYC5Y9/YeR6LnuL09j1x5e3Es="; + sha256 = "sha256-MYeQMgac1bqqN2QPz2KO55w7++3MnsRFm/ziSm6e2Rw="; }; - vendorHash = "sha256-Dx9OL1D4VNfVQ0NUJr9aq54PXHecgMMtLg7GMFnQFCI="; + vendorHash = "sha256-VeR/lyrQrjXWvHdxpG4H+XPlAud9rrlzX8GqhVzn1sg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 20edc2af502b7..2e71206aff231 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { version = "1.0.2"; pname = "monotone-viz"; - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 camlp4]; + nativeBuildInputs = [ pkg-config makeWrapper ocaml camlp4 ]; + buildInputs = [ lablgtk libgnomecanvas glib graphviz_2_0 ]; src = fetchurl { url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz"; sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk"; diff --git a/pkgs/applications/version-management/radicle-cli/default.nix b/pkgs/applications/version-management/radicle-cli/default.nix index f74ae1cf37a3b..213243f1851ca 100644 --- a/pkgs/applications/version-management/radicle-cli/default.nix +++ b/pkgs/applications/version-management/radicle-cli/default.nix @@ -10,7 +10,10 @@ , openssl , libusb1 , AppKit +, git , openssh +, testers +, radicle-cli }: rustPlatform.buildRustPackage rec { @@ -50,11 +53,18 @@ rustPlatform.buildRustPackage rec { done ''; - nativeCheckInputs = [ openssh ]; + nativeCheckInputs = [ + git + openssh + ]; preCheck = '' eval $(ssh-agent) ''; + passthru.tests = { + version = testers.testVersion { package = radicle-cli; }; + }; + meta = { description = "Command-line tooling for Radicle, a decentralized code collaboration network"; homepage = "https://radicle.xyz"; diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 0027af3defe90..5c1499139ca0e 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK30 subversion apr aprutil python3 ]; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; configureFlags = [ "--with-svn-include=${subversion.dev}/include" diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 5f2f9aab2b3c3..40d909c8e0282 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.diffutils buildPackages.ed ]; - NIX_CFLAGS_COMPILE = "-std=c99"; + env.NIX_CFLAGS_COMPILE = "-std=c99"; hardeningDisable = lib.optional stdenv.cc.isClang "format"; diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock index cd4fee2194559..ff91d07e87be2 100644 --- a/pkgs/applications/version-management/sapling/Cargo.lock +++ b/pkgs/applications/version-management/sapling/Cargo.lock @@ -4,9 +4,11 @@ version = 3 [[package]] name = "abomonation" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e72913c99b1f927aa7bd59a41518fdd9995f63ffc8760f211609e0241c4fb2" +version = "0.7.3+smallvec1" +source = "git+https://github.com/markbt/abomonation?rev=0f43346d2afa2aedc64d61f3f4273e8d1e454642#0f43346d2afa2aedc64d61f3f4273e8d1e454642" +dependencies = [ + "smallvec", +] [[package]] name = "abomonation_derive" @@ -86,9 +88,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "arc-swap" @@ -148,7 +150,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -165,7 +167,7 @@ dependencies = [ name = "async-runtime" version = "0.1.0" dependencies = [ - "futures 0.3.25", + "futures 0.3.26", "num_cpus", "once_cell", "tokio", @@ -173,9 +175,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.61" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" +checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2", "quote", @@ -448,9 +450,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -470,9 +472,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" dependencies = [ "memchr", "serde", @@ -484,14 +486,14 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ccc76d50a81d3a49665c71444ecefed1d1386477cb700c6fb7db517454fe1ff" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", ] [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -511,9 +513,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" dependencies = [ "serde", ] @@ -540,6 +542,15 @@ dependencies = [ ] [[package]] +name = "camino" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" +dependencies = [ + "serde", +] + +[[package]] name = "cassowary" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -576,9 +587,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] @@ -604,7 +615,7 @@ dependencies = [ "async-trait", "configmodel", "fail", - "futures 0.3.25", + "futures 0.3.26", "io", "manifest", "manifest-tree", @@ -688,7 +699,7 @@ version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ - "heck 0.4.0", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", @@ -773,12 +784,12 @@ dependencies = [ [[package]] name = "cloned" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" [[package]] name = "codegen_includer_proc_macro" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "quote", ] @@ -822,6 +833,7 @@ version = "0.1.0" dependencies = [ "anyhow", "filetime", + "futures 0.3.26", "hostcaps", "identity", "lazy_static", @@ -829,11 +841,13 @@ dependencies = [ "mime", "regex", "reqwest", + "reqwest-eventsource", "rust-ini", "serde", "serde_json", "tempfile", "thiserror", + "tokio", ] [[package]] @@ -854,9 +868,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ "crossbeam-utils 0.8.14", ] @@ -870,7 +884,7 @@ dependencies = [ "codegen_includer_proc_macro", "const-cstr", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "once_cell", "ref-cast", "serde", @@ -890,7 +904,7 @@ dependencies = [ "codegen_includer_proc_macro", "const-cstr", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "once_cell", "ref-cast", "serde", @@ -964,14 +978,14 @@ dependencies = [ [[package]] name = "console" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -1039,7 +1053,7 @@ dependencies = [ "async-runtime", "cpython", "cpython_ext", - "futures 0.3.25", + "futures 0.3.26", "itertools 0.10.5", "tokio", ] @@ -1384,9 +1398,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" +checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" dependencies = [ "cc", "cxxbridge-flags", @@ -1396,9 +1410,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" +checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" dependencies = [ "cc", "codespan-reporting", @@ -1411,15 +1425,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" +checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" [[package]] name = "cxxbridge-macro" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" +checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" dependencies = [ "proc-macro2", "quote", @@ -1439,22 +1453,21 @@ dependencies = [ "drawdag", "fail", "fs2", - "futures 0.3.25", + "futures 0.3.26", "indexedlog", "indexmap", - "itertools 0.10.5", "mincode", "minibytes", "nonblocking", "once_cell", "quickcheck", "rand 0.8.5", + "renderdag", "serde", "tempfile", "thiserror", "tokio", "tracing", - "unicode-width", "vlqencoding", ] @@ -1478,7 +1491,6 @@ dependencies = [ "abomonation_derive", "minibytes", "quickcheck", - "quickcheck_arbitrary_derive", "serde", ] @@ -1492,7 +1504,7 @@ dependencies = [ "hashbrown 0.12.3", "lock_api", "once_cell", - "parking_lot_core 0.9.6", + "parking_lot_core 0.9.7", "rayon", "serde", ] @@ -1624,7 +1636,7 @@ dependencies = [ "dag", "edenapi_trait", "fail", - "futures 0.3.25", + "futures 0.3.26", "http", "identity", "manifest-tree", @@ -1663,12 +1675,12 @@ dependencies = [ "async-runtime", "async-trait", "auth", - "bytes 1.3.0", + "bytes 1.4.0", "chrono", "configmodel", "edenapi_trait", "edenapi_types", - "futures 0.3.25", + "futures 0.3.26", "hg-http", "http-client", "itertools 0.10.5", @@ -1701,7 +1713,7 @@ dependencies = [ "crossbeam 0.8.2", "edenapi", "edenapi_types", - "futures 0.3.25", + "futures 0.3.26", "itertools 0.10.5", "minibytes", "tokio", @@ -1717,7 +1729,7 @@ dependencies = [ "async-trait", "configmodel", "edenapi_types", - "futures 0.3.25", + "futures 0.3.26", "http", "http-client", "minibytes", @@ -1732,7 +1744,7 @@ name = "edenapi_types" version = "0.1.0" dependencies = [ "anyhow", - "bytes 1.3.0", + "bytes 1.4.0", "dag-types", "insta_ext", "paste", @@ -1773,9 +1785,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -1794,9 +1806,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if 1.0.0", ] @@ -1807,7 +1819,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ - "heck 0.4.0", + "heck 0.4.1", "proc-macro2", "quote", "syn", @@ -1876,6 +1888,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "eventsource-stream" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74fef4569247a5f429d9156b9d0a2599914385dd189c539334c625d8099d90ab" +dependencies = [ + "futures-core", + "nom 7.1.3", + "pin-project-lite", +] + +[[package]] name = "exchange" version = "0.1.0" dependencies = [ @@ -1931,14 +1954,14 @@ dependencies = [ [[package]] name = "fb303_core" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#0b9b58848f96c78f65513457c15292b81dc6b91e" +source = "git+https://github.com/facebook/fb303.git?branch=main#d35b962b6f3dc787ed64c8d6b1b49a986e69f4d0" dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", "const-cstr", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "once_cell", "ref-cast", "serde", @@ -1952,7 +1975,7 @@ dependencies = [ [[package]] name = "fbinit" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "fbinit_macros", "quickcheck", @@ -1961,7 +1984,7 @@ dependencies = [ [[package]] name = "fbinit_macros" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "proc-macro2", "quote", @@ -1971,14 +1994,15 @@ dependencies = [ [[package]] name = "fbthrift" version = "0.0.1+unstable" -source = "git+https://github.com/facebook/fbthrift.git?branch=main#46238c81c2c30ec8e9907203922218e4ecfd4cbb" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5641439382254134d192ca8fe3c9af23f87b5fa" dependencies = [ "anyhow", "async-trait", "base64 0.11.0", "bufsize", - "bytes 1.3.0", - "futures 0.3.25", + "bytes 1.4.0", + "camino", + "futures 0.3.26", "ghost", "num-derive", "num-traits", @@ -1991,24 +2015,24 @@ dependencies = [ [[package]] name = "fbthrift_framed" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "byteorder", - "bytes 1.3.0", + "bytes 1.4.0", "tokio-util 0.6.10", ] [[package]] name = "fbthrift_socket" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "anyhow", - "bytes 1.3.0", + "bytes 1.4.0", "fbthrift", "fbthrift_framed", "fbthrift_util", - "futures 0.3.25", + "futures 0.3.26", "tokio", "tokio-tower", "tokio-util 0.6.10", @@ -2018,7 +2042,7 @@ dependencies = [ [[package]] name = "fbthrift_util" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "tokio", ] @@ -2043,7 +2067,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -2200,9 +2224,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" dependencies = [ "futures-channel", "futures-core", @@ -2219,16 +2243,16 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f444c45a1cb86f2a7e301469fd50a82084a60dadc25d94529a8312276ecb71a" dependencies = [ - "futures 0.3.25", + "futures 0.3.26", "futures-timer", "pin-utils", ] [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -2236,15 +2260,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" dependencies = [ "futures-core", "futures-task", @@ -2253,9 +2277,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" [[package]] name = "futures-lite" @@ -2274,9 +2298,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", @@ -2285,15 +2309,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-timer" @@ -2303,9 +2327,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2405,7 +2429,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "futures 0.3.25", + "futures 0.3.26", "git2", "minibytes", "storemodel", @@ -2425,7 +2449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", - "bstr 1.1.0", + "bstr 1.2.0", "fnv", "log", "regex", @@ -2437,7 +2461,7 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "fnv", "futures-core", "futures-sink", @@ -2485,9 +2509,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -2615,7 +2639,7 @@ dependencies = [ "async-trait", "dag", "edenapi", - "futures 0.3.25", + "futures 0.3.26", "gitdag", "metalog", "minibytes", @@ -2669,7 +2693,7 @@ dependencies = [ [[package]] name = "hostcaps" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "lazy_static", ] @@ -2677,7 +2701,7 @@ dependencies = [ [[package]] name = "hostname" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "anyhow", "hostname 0.3.1", @@ -2700,7 +2724,7 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "fnv", "itoa 1.0.5", ] @@ -2711,7 +2735,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "http", "pin-project-lite", ] @@ -2728,7 +2752,7 @@ dependencies = [ "curl", "curl-sys", "env_logger 0.7.1", - "futures 0.3.25", + "futures 0.3.26", "http", "lru-cache", "maplit", @@ -2780,11 +2804,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "futures-channel", "futures-core", "futures-util", @@ -2821,7 +2845,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "hyper", "native-tls", "tokio", @@ -2887,9 +2911,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05705bc64e0b66a806c3740bd6578ea66051b157ec42dc219c785cbf185aef3" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" dependencies = [ "globset", "lazy_static", @@ -3004,12 +3028,12 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -3080,9 +3104,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -3140,9 +3164,9 @@ checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libgit2-sys" -version = "0.13.4+1.4.2" +version = "0.13.5+1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fa6563431ede25f5cc7f6d803c6afbc1c5d3ad3d4925d12c882bf2b526f5d1" +checksum = "51e5ea06c26926f1002dd553fded6cfcdc9784c1f60feeb58368b4d9b07b6dba" dependencies = [ "cc", "libc", @@ -3305,7 +3329,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", - "futures 0.3.25", + "futures 0.3.26", "futures-batch", "manifest", "minibench", @@ -3347,9 +3371,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "maybe-uninit" @@ -3441,7 +3465,7 @@ dependencies = [ name = "metrics" version = "0.1.0" dependencies = [ - "futures 0.3.25", + "futures 0.3.26", "once_cell", ] @@ -3498,13 +3522,19 @@ version = "0.1.0" name = "minibytes" version = "0.1.0" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "memmap", "quickcheck", "serde", ] [[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.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3555,7 +3585,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -3645,11 +3675,10 @@ dependencies = [ "bitflags", "dag", "drawdag", - "futures 0.3.25", + "futures 0.3.26", "indexedlog", "rand 0.8.5", "rand_chacha 0.3.1", - "renderdag", "tempdir", "types", "vlqencoding", @@ -3735,10 +3764,20 @@ dependencies = [ ] [[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 = "nonblocking" version = "0.1.0" dependencies = [ - "futures 0.3.25", + "futures 0.3.26", ] [[package]] @@ -3981,7 +4020,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.6", + "parking_lot_core 0.9.7", ] [[package]] @@ -4000,15 +4039,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -4070,9 +4109,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a" +checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f" dependencies = [ "thiserror", "ucd-trie", @@ -4080,9 +4119,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241cda393b0cdd65e62e07e12454f1f25d57017dcc514b1514cd3c4645e3a0a6" +checksum = "8bf026e2d0581559db66d837fe5242320f525d85c76283c61f4d51a1238d65ea" dependencies = [ "pest", "pest_generator", @@ -4090,9 +4129,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46b53634d8c8196302953c74d5352f33d0c512a9499bd2ce468fc9f4128fa27c" +checksum = "2b27bd18aa01d91c8ed2b61ea23406a676b42d82609c6e2581fba42f0c15f17f" dependencies = [ "pest", "pest_meta", @@ -4103,9 +4142,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef4f1332a8d4678b41966bb4cc1d0676880e84183a1ecc3f4b69f03e99c7a51" +checksum = "9f02b677c1859756359fc9983c2e56a0237f18624a3789528804406b7e915e5d" dependencies = [ "once_cell", "pest", @@ -4114,15 +4153,6 @@ dependencies = [ [[package]] name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_shared 0.8.0", -] - -[[package]] -name = "phf" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" @@ -4142,22 +4172,12 @@ dependencies = [ [[package]] name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", + "phf_generator", + "phf_shared 0.11.1", ] [[package]] @@ -4176,7 +4196,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" dependencies = [ - "phf_generator 0.11.1", + "phf_generator", "phf_shared 0.11.1", "proc-macro2", "quote", @@ -4185,15 +4205,6 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" @@ -4314,7 +4325,7 @@ dependencies = [ "libc", "log", "wepoll-ffi", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -4369,9 +4380,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] @@ -4524,13 +4535,12 @@ dependencies = [ "cpython", "cpython_ext", "dag", - "futures 0.3.25", + "futures 0.3.26", "hgcommits", "minibytes", "parking_lot 0.11.2", "pyedenapi", "pymetalog", - "renderdag", "storemodel", ] @@ -4599,7 +4609,7 @@ dependencies = [ "edenapi", "edenapi_ext", "edenapi_types", - "futures 0.3.25", + "futures 0.3.26", "minibytes", "progress-model", "pyconfigloader", @@ -4896,7 +4906,7 @@ dependencies = [ "configmodel", "cpython", "cpython_ext", - "futures 0.3.25", + "futures 0.3.26", "io", "minibytes", "parking_lot 0.11.2", @@ -5075,7 +5085,7 @@ dependencies = [ [[package]] name = "quickcheck_arbitrary_derive" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "proc-macro2", "quickcheck", @@ -5138,7 +5148,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg", ] [[package]] @@ -5215,15 +5224,6 @@ dependencies = [ ] [[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] name = "rayon" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5235,9 +5235,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" dependencies = [ "crossbeam-channel 0.5.6", "crossbeam-deque 0.8.2", @@ -5340,7 +5340,12 @@ dependencies = [ name = "renderdag" version = "0.1.0" dependencies = [ + "bitflags", "dag", + "itertools 0.10.5", + "nonblocking", + "serde", + "unicode-width", ] [[package]] @@ -5401,7 +5406,7 @@ version = "0.11.11" source = "git+https://github.com/vmagro/reqwest?rev=f9490c06756a9d35ab874c44657db790a87af80b#f9490c06756a9d35ab874c44657db790a87af80b" dependencies = [ "base64 0.13.1", - "bytes 1.3.0", + "bytes 1.4.0", "encoding_rs", "futures-core", "futures-util", @@ -5441,6 +5446,22 @@ dependencies = [ ] [[package]] +name = "reqwest-eventsource" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f03f570355882dd8d15acc3a313841e6e90eddbc76a93c748fd82cc13ba9f51" +dependencies = [ + "eventsource-stream", + "futures-core", + "futures-timer", + "mime", + "nom 7.1.3", + "pin-project-lite", + "reqwest", + "thiserror", +] + +[[package]] name = "resolv-conf" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5466,7 +5487,7 @@ dependencies = [ "edenapi", "edenapi_types", "fbinit", - "futures 0.3.25", + "futures 0.3.26", "hex", "hg-http", "hg-metrics", @@ -5613,16 +5634,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.6" +version = "0.36.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -5685,7 +5706,7 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -5700,6 +5721,7 @@ dependencies = [ "log", "serde", "thiserror", + "tokio", "toml", ] @@ -5727,9 +5749,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags", "core-foundation", @@ -5740,9 +5762,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -5788,20 +5810,20 @@ version = "0.1.0" [[package]] name = "serde_bser" version = "0.3.1" -source = "git+https://github.com/facebook/watchman.git?branch=main#d21cc8bb48e1e03e7f0327b6ddbf28d76523ad1b" +source = "git+https://github.com/facebook/watchman.git?branch=main#5cba53852d5970c5fa6c5ffe8f35afc908b77279" dependencies = [ "anyhow", "byteorder", - "bytes 1.3.0", + "bytes 1.4.0", "serde", "thiserror", ] [[package]] name = "serde_bytes" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" +checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" dependencies = [ "serde", ] @@ -5829,9 +5851,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a" dependencies = [ "itoa 1.0.5", "ryu", @@ -6037,7 +6059,7 @@ dependencies = [ [[package]] name = "sorted_vector_map" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "itertools 0.10.5", "quickcheck", @@ -6048,7 +6070,7 @@ name = "sparse" version = "0.1.0" dependencies = [ "anyhow", - "futures 0.3.25", + "futures 0.3.26", "globset", "once_cell", "pathmatcher", @@ -6111,7 +6133,7 @@ dependencies = [ "anyhow", "async-trait", "auto_impl", - "futures 0.3.25", + "futures 0.3.26", "minibytes", "types", ] @@ -6154,7 +6176,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "futures 0.3.25", + "futures 0.3.26", "pin-project 0.4.30", "tokio", ] @@ -6284,9 +6306,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -6308,19 +6330,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" dependencies = [ "rustix", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] name = "terminfo" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e" +checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" dependencies = [ - "dirs 2.0.2", + "dirs 4.0.0", "fnv", - "nom", - "phf 0.8.0", + "nom 5.1.2", + "phf 0.11.1", "phf_codegen", ] @@ -6458,7 +6480,7 @@ dependencies = [ "const-cstr", "fb303_core", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "once_cell", "ref-cast", "serde", @@ -6479,7 +6501,7 @@ dependencies = [ "config_thrift", "fb303_core", "fbthrift", - "futures 0.3.25", + "futures 0.3.26", "thiserror", "thrift", ] @@ -6487,7 +6509,7 @@ dependencies = [ [[package]] name = "thrift_compiler" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "anyhow", "clap 2.34.0", @@ -6555,18 +6577,18 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.24.1" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", - "bytes 1.3.0", + "bytes 1.4.0", "libc", "memchr", "mio 0.8.5", @@ -6577,7 +6599,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -6655,10 +6677,10 @@ dependencies = [ [[package]] name = "tokio-uds-compat" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#2c560e8df63ad0228d6fa4fb1d7611d4477cd0b7" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#885afcb11d04db1fd59d1e2acdd18cc095f45eb2" dependencies = [ "async-io", - "futures 0.3.25", + "futures 0.3.26", "tokio", "tracing", "uds_windows", @@ -6670,7 +6692,7 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "futures-core", "futures-io", "futures-sink", @@ -6686,7 +6708,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ - "bytes 1.3.0", + "bytes 1.4.0", "futures-core", "futures-sink", "pin-project-lite", @@ -6881,6 +6903,7 @@ dependencies = [ "anyhow", "bitflags", "byteorder", + "fs2", "identity", "itertools 0.10.5", "pretty_assertions", @@ -6889,7 +6912,7 @@ dependencies = [ "rand_chacha 0.3.1", "repolock", "sha2 0.10.6", - "tempdir", + "tempfile", "thiserror", "tracing", "twox-hash", @@ -7028,9 +7051,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" @@ -7049,9 +7072,9 @@ dependencies = [ [[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" @@ -7255,9 +7278,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -7265,9 +7288,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", @@ -7280,9 +7303,9 @@ dependencies = [ [[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", "js-sys", @@ -7292,9 +7315,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7302,9 +7325,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", @@ -7315,18 +7338,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "watchman_client" version = "0.8.0" -source = "git+https://github.com/facebook/watchman.git?branch=main#d21cc8bb48e1e03e7f0327b6ddbf28d76523ad1b" +source = "git+https://github.com/facebook/watchman.git?branch=main#5cba53852d5970c5fa6c5ffe8f35afc908b77279" dependencies = [ "anyhow", - "bytes 1.3.0", - "futures 0.3.25", + "bytes 1.4.0", + "futures 0.3.26", "maplit", "serde", "serde_bser", @@ -7338,9 +7361,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -7422,9 +7445,9 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -7496,6 +7519,30 @@ dependencies = [ ] [[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" @@ -7556,7 +7603,7 @@ dependencies = [ "configmodel", "crossbeam 0.8.2", "edenfs_client", - "futures 0.3.25", + "futures 0.3.26", "identity", "io", "manifest", @@ -7650,9 +7697,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.5+zstd.1.5.2" +version = "2.0.6+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" +checksum = "68a3f9792c0c3dc6c165840a75f47ae1f4da402c2d006881129579f6597e801b" dependencies = [ "cc", "libc", diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 8873e8c4718ee..80cc6bf9e9360 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -43,7 +43,7 @@ let owner = "facebook"; repo = "sapling"; rev = version; - hash = "sha256-zlvb+qn9SSBPZmlF8KwKTWyKj94FGOafSMRMNLsccOU"; + hash = "sha256-WOvkw+vuU/9vWgxCx7ogawQWCr1O7E70uw/LhuLiSzE"; }; addonsSrc = "${src}/addons"; @@ -51,7 +51,7 @@ let # Fetches the Yarn modules in Nix to to be used as an offline cache yarnOfflineCache = fetchYarnDeps { yarnLock = "${addonsSrc}/yarn.lock"; - sha256 = "sha256-+29WAgSXVciHhLMN04yfKiWCpjM3Vo54nUdTP6owSLs"; + sha256 = "sha256-haeVRO5JBStrO7fjI9WhC5xZwX0IlZR1wxh0Q+m/UQM"; }; # Builds the NodeJS server that runs with `sl web` @@ -88,111 +88,94 @@ let runHook postInstall ''; }; - - # Builds the main `sl` binary and its Python extensions - sapling = python3Packages.buildPythonPackage { - pname = "sapling-main"; - inherit src version; - - sourceRoot = "source/eden/scm"; - - # Upstream does not commit Cargo.lock - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "cloned-0.1.0" = "sha256-DYQTK722wgeDUJtOVXHLt42G6gpe6A62rET+JH+bPKU="; - "deltae-0.3.0" = "sha256-a9Skaqs+tVTw8x83jga+INBr+TdaMmo35Bf2wbfR6zs="; - "fb303_core-0.0.0" = "sha256-YEFNTYvtgp8nc/1O7AbdyxCD3Xx2xCjbS17fTTEsUL0="; - "fbthrift-0.0.1+unstable" = "sha256-mDoYhXOzQIDqP7XdmiBbmq5VmAKAgggTNH/kW2kHv4k="; - "reqwest-0.11.11" = "sha256-uhc8XhkGW22XDNo0qreWdXeFF2cslOOZHfTRQ30IBcE="; - "serde_bser-0.3.1" = "sha256-/zn1NfXWytXvnalkgPsg9BdujVV97PGkXwmPtQGVeCc="; - }; - }; - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - - # Since the derivation builder doesn't have network access to remain pure, - # fetch the artifacts manually and link them. Then replace the hardcoded URLs - # with filesystem paths for the curl calls. - postUnpack = '' - mkdir $sourceRoot/hack_pydeps - ${lib.concatStrings (map (li: "ln -s ${fetchurl li} $sourceRoot/hack_pydeps/${baseNameOf li.url}\n") links)} - sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py - ''; - - # Now, copy the "sl web" (aka edenscm-isl) results into the output of this - # package, so that the command can actually work. NOTES: - # - # 1) This applies on all systems (so no conditional a la postFixup) - # 2) This doesn't require any kind of fixup itself, so we leave it out - # of postFixup for that reason, too - # 3) If asked, we optionally patch in a hardcoded path to the 'nodejs' package, - # so that 'sl web' always works - # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB - preFixup = '' - sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages - chmod +w $sitepackages - cp -r ${isl} $sitepackages/edenscm-isl - '' + lib.optionalString (!enableMinimal) '' - chmod +w $sitepackages/edenscm-isl/run-isl - substituteInPlace $sitepackages/edenscm-isl/run-isl \ - --replace 'NODE=node' 'NODE=${nodejs}/bin/node' - ''; - - postFixup = lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/sl \ - --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" - ''; - - nativeBuildInputs = [ - curl - pkg-config - ] ++ (with rustPlatform; [ - myCargoSetupHook - rust.cargo - rust.rustc - ]); - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - curl - libiconv - CoreFoundation - CoreServices - Security - ]; - - doCheck = false; - - HGNAME = "sl"; - SAPLING_OSS_BUILD = "true"; - SAPLING_VERSION = version; - SAPLING_VERSION_HASH = versionHash; - }; in -stdenv.mkDerivation { +# Builds the main `sl` binary and its Python extensions +python3Packages.buildPythonApplication { pname = "sapling"; - inherit version; - - dontUnpack = true; + inherit src version; + + sourceRoot = "source/eden/scm"; + + # Upstream does not commit Cargo.lock + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; + "cloned-0.1.0" = "sha256-ZWO3/+O3Oc2Zg99seJ40CInrW1+3rFvL5HjIxhjDW5I="; + "deltae-0.3.0" = "sha256-a9Skaqs+tVTw8x83jga+INBr+TdaMmo35Bf2wbfR6zs="; + "fb303_core-0.0.0" = "sha256-LEib4QL5sMCUyQ9yGWnsOmO6hmlDaE80nfmrTC8elu0="; + "fbthrift-0.0.1+unstable" = "sha256-4SjdZzG6UP8OY7/Qy7ebdKOg1WdZ2USG6wJ7YhA/PxU="; + "reqwest-0.11.11" = "sha256-uhc8XhkGW22XDNo0qreWdXeFF2cslOOZHfTRQ30IBcE="; + "serde_bser-0.3.1" = "sha256-uW7qXEn0p7m6uo5r+rD3TDH/Lf1cBMWml0TbhysgDH8="; + }; + }; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; - installPhase = '' - runHook preInstall + # Since the derivation builder doesn't have network access to remain pure, + # fetch the artifacts manually and link them. Then replace the hardcoded URLs + # with filesystem paths for the curl calls. + postUnpack = '' + mkdir $sourceRoot/hack_pydeps + ${lib.concatStrings (map (li: "ln -s ${fetchurl li} $sourceRoot/hack_pydeps/${baseNameOf li.url}\n") links)} + sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py + ''; - mkdir -p $out - cp -r ${sapling}/* $out + # Now, copy the "sl web" (aka edenscm-isl) results into the output of this + # package, so that the command can actually work. NOTES: + # + # 1) This applies on all systems (so no conditional a la postFixup) + # 2) This doesn't require any kind of fixup itself, so we leave it out + # of postFixup for that reason, too + # 3) If asked, we optionally patch in a hardcoded path to the 'nodejs' package, + # so that 'sl web' always works + # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB + preFixup = '' + sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages + chmod +w $sitepackages + cp -r ${isl} $sitepackages/edenscm-isl + '' + lib.optionalString (!enableMinimal) '' + chmod +w $sitepackages/edenscm-isl/run-isl + substituteInPlace $sitepackages/edenscm-isl/run-isl \ + --replace 'NODE=node' 'NODE=${nodejs}/bin/node' + ''; - runHook postInstall + postFixup = lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/sl \ + --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" ''; + nativeBuildInputs = [ + curl + pkg-config + ] ++ (with rustPlatform; [ + myCargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + curl + libiconv + CoreFoundation + CoreServices + Security + ]; + + HGNAME = "sl"; + SAPLING_OSS_BUILD = "true"; + SAPLING_VERSION = version; + SAPLING_VERSION_HASH = versionHash; + # just a simple check phase, until we have a running test suite. this should # help catch issues like lack of a LOCALE_ARCHIVE setting (see GH PR #202760) doCheck = true; - checkPhase = '' + installCheckPhase = '' echo -n "testing sapling version; should be \"${version}\"... " - ${sapling}/bin/sl version | grep -qw "${version}" + $out/bin/sl version | grep -qw "${version}" echo "OK!" ''; diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json index 9cbcd71cbcf7c..eeedd64b95063 100644 --- a/pkgs/applications/version-management/sapling/deps.json +++ b/pkgs/applications/version-management/sapling/deps.json @@ -73,6 +73,6 @@ "url": "https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0/Cython-0.29.32.tar.gz" } ], - "version": "0.2.20221222-152408-ha6a66d09", - "versionHash": "14601963598499040874" + "version": "0.2.20230124-180750-hf8cd450a", + "versionHash": "5465836048527734544" } diff --git a/pkgs/applications/version-management/scriv/default.nix b/pkgs/applications/version-management/scriv/default.nix new file mode 100644 index 0000000000000..b49969317ef3a --- /dev/null +++ b/pkgs/applications/version-management/scriv/default.nix @@ -0,0 +1,57 @@ +{ lib +, python3 +, fetchPypi +, pandoc +, git +, scriv +, testers +}: + +python3.pkgs.buildPythonApplication rec { + pname = "scriv"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-u2HDD+pzFYpNGMKLu1eCHDCCRWg++w2Je9ReSnhWtHI="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + attrs + click + click-log + jinja2 + requests + ] ++ lib.optionals (python3.pythonOlder "3.11") [ + tomli + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + coverage + freezegun + pudb + pytest-mock + responses + pyyaml + + pandoc + git + ]; + disabledTests = [ + # assumes we have checked out the full repo (including remotes) + "test_real_get_github_repos" + ]; + + passthru.tests = { + version = testers.testVersion { package = scriv; }; + }; + + meta = { + description = "Command-line tool for helping developers maintain useful changelogs."; + homepage = "https://github.com/nedbat/scriv"; + changelog = "https://github.com/nedbat/scriv/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ amesgen ]; + }; +} diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index a9aabd7a87da0..32dc11d4527d2 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "22.1.3"; + version = "22.1.4"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "sha256-TnpjRFInqmlY02fGi7oxoS4P1DzahryFvNLitJ5NjM4="; + sha256 = "sha256-e5bgIA7dblRDWvwC2dqRFR+Sp6uMAWQbhlMqG8a4vZk="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 7faca39e2fe4f..9c9f6f4033301 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -2,6 +2,7 @@ , callPackage , recurseIntoAttrs , nixosTests +, config }: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` @@ -28,12 +29,10 @@ let }; }; in -with python.pkgs; recurseIntoAttrs { +with python.pkgs; recurseIntoAttrs ({ inherit python; coresrht = toPythonApplication srht; buildsrht = toPythonApplication buildsrht; - # Added 2022-10-29 - dispatchsrht = throw "dispatch is deprecated. See https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/ for more information."; gitsrht = toPythonApplication gitsrht; hgsrht = toPythonApplication hgsrht; hubsrht = toPythonApplication hubsrht; @@ -46,4 +45,7 @@ with python.pkgs; recurseIntoAttrs { passthru.tests = { nixos-sourcehut = nixosTests.sourcehut; }; -} +} // lib.optionalAttrs config.allowAliases { + # Added 2022-10-29 + dispatchsrht = throw "dispatch is deprecated. See https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/ for more information."; +}) diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index cba7be9531732..258f03eb78315 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-m4mN+vDEKPHRavtI9CbszOOdJcLYa+XqlzEyPvPXE0g="; + sha256 = "sha256-6wA2dnUUgS6HNQo2vMFqoT+seZHqcNLoTN+f5+Ok1AQ="; }; - cargoHash = "sha256-USOYXb6/hEE9HVz5YcNZPY5yuvDxbrH4YyZxY7XNAto="; + cargoHash = "sha256-XkRnbfTaCo0J1+yOOvIxhDTjtaZURkjFOPWsFRk8iNU="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index ceee5d6b48868..2bed38959c139 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2079"; - x64sha256 = "y4ocLXxxEkGaw9O/vhX9MJnc56QgK37YPJkUwK2YS0U="; + buildVersion = "2083"; + x64sha256 = "bWHbP8j228jUDr1XDLRciq7hcET6o6Udr/lLODXRudc="; } {}; sublime-merge-dev = common { - buildVersion = "2081"; - x64sha256 = "QzJP25KxczmrR5PZ9ujRSM3V+TrKqiH82plo1bTv48s="; + buildVersion = "2082"; + x64sha256 = "Gl1BrLTSDLRTgrYQW/99o0XRjSIxvnNYRIViZEidcsM="; dev = true; } {}; } diff --git a/pkgs/applications/version-management/tig/default.nix b/pkgs/applications/version-management/tig/default.nix index cfce8a35f9e12..ada5f9fea6409 100644 --- a/pkgs/applications/version-management/tig/default.nix +++ b/pkgs/applications/version-management/tig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.7"; + version = "2.5.8"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-D5NQaxkGhwyBoScI7fZxnSHC0ABmsUeRf8pZCKooV3w="; + sha256 = "sha256-VuuqR5fj0YvqIfVPH7N3rpAfIbcTwOx9W3H60saCToQ="; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 32c2e14da1cf6..73a2035c31fb5 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -29,7 +29,7 @@ to support their use in yadm. resholve.mkDerivation rec { pname = "yadm"; - version = "3.2.1"; + version = "3.2.2"; nativeBuildInputs = [ installShellFiles ]; @@ -37,7 +37,7 @@ resholve.mkDerivation rec { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - hash = "sha256:0h3gxhdf32g21xx9si0lv0sa4ipb1k0n5qpln0w2vipvfgakn5mn"; + hash = "sha256-GcuqMlE8oef9+LIqKoCotktU7GcgPBE9CTVrZ8bKhv4="; }; dontConfigure = true; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 079fb1792e180..bb2d5822a22e1 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { --replace "NSUInteger" "size_t" ''; - NIX_CFLAGS_COMPILE = "-I${luajit52}/include"; + env.NIX_CFLAGS_COMPILE = "-I${luajit52}/include"; NIX_CFLAGS_LINK = "-L${luajit52}/lib"; configurePhase = '' diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index 07a0a5803ca0e..80da93e5a2281 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -4,21 +4,21 @@ , lib , gnugrep , gnused -, curl -, openssl +, wget +, fzf , mpv , aria2 }: stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "3.4"; + version = "4.1"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - sha256 = "sha256-Xb7MNL7YKbvyRR5ZppUfCYeYpjNAiJWNOjIFk5fUvpY="; + hash = "sha256-8fpOCyv/XafrVy76jtazRoHW2gidjikgnRdaWzh8kY8="; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { install -Dm755 ani-cli $out/bin/ani-cli wrapProgram $out/bin/ani-cli \ - --prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl openssl mpv aria2 ]} + --prefix PATH : ${lib.makeBinPath [ gnugrep gnused wget fzf mpv aria2 ]} runHook postInstall ''; diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index d7ad9846306a5..e3a97197d1049 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ./autogen.sh --prefix=$out ''; - NIX_CFLAGS_COMPILE = builtins.concatStringsSep " " [ + env.NIX_CFLAGS_COMPILE = builtins.concatStringsSep " " [ "-Wno-error=deprecated-declarations" "-Wno-error=incompatible-pointer-types" ]; diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index 26954375aff5b..3d62384634707 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-usVAKBkdd8uz9cD5eLd0hnwGonOJLscRdc+iWDlNXVc="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = '' + # https://github.com/CCExtractor/ccextractor/issues/1467 + sed -i '/allheaders.h/a#include <leptonica/pix_internal.h>' src/lib_ccx/ocr.c + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/CMakeLists.txt \ --replace 'add_definitions(-DGPAC_CONFIG_LINUX)' 'add_definitions(-DGPAC_CONFIG_DARWIN)' ''; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 0ce0623ec9d9e..972a68e04f03f 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation { pname = "cinelerra-cv"; - version = "unstable-2021-02-14"; + version = "unstable-2023-01-29"; src = fetchFromGitHub { owner = "cinelerra-cv-team"; repo = "cinelerra-cv"; - rev = "7d0e8ede557d0cdf3606e0a8d97166a22f88d89e"; - sha256 = "0n84y2wp47y89drc48cm1609gads5c6saw6c6bqcf5c5wcg1yfbj"; + rev = "bb00ac6b70fcf3cf419348b56f9b264bc01c1a89"; + sha256 = "11965kb3d7xcvlcf8p7jlzk9swk5i78x7wja4s3043wlzmqmwv0q"; }; preConfigure = '' diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 540339f05a561..d4e35ac484183 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: subtitles.o:src/coriander.h:110: multiple definition of # `main_window'; main.o:src/coriander.h:110: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = '' cp ${automake}/share/automake-*/mkinstalldirs . diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 42c1d40b61256..39af3876bf6ff 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -165,6 +165,7 @@ buildFHSUserEnv { writeText "davinci-wrapper" '' export QT_XKB_CONFIG_ROOT="${xkeyboard_config}/share/X11/xkb" + export QT_PLUGIN_PATH="${davinci}/libs/plugins:$QT_PLUGIN_PATH" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${davinci}/libs ${davinci}/bin/resolve '' diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index a63671accec4e..bab41b11bee94 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: mpris-interface.o:src/playlist.h:32: multiple definition of # `plclose'; gui.o:src/playlist.h:32: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { description = "Gnome MPlayer, a simple GUI for MPlayer"; diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 6390558013f58..afc97cd7e1a9f 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, zlib }: stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.2.0"; pname = "gpac"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - sha256 = "sha256-MIX32lSqf/lrz9240h4wMIQp/heUmwvDJz8WN08yf6c="; + sha256 = "sha256-m2qXTXLGgAyU9y6GEk4Hp/7Al57IPRSqImJatIcwswQ="; }; - postPatch = '' - substituteInPlace Makefile --replace 'dh_link' 'ln -s' - ''; + patches = [ + (fetchpatch { + name = "CVE-2023-0358.patch"; + url = "https://github.com/gpac/gpac/commit/9971fb125cf91cefd081a080c417b90bbe4a467b.patch"; + sha256 = "sha256-0PDQXahbJCOo1JJAC0T0N1u2mqmwAkdm87wXMJnBicM="; + }) + ]; # this is the bare minimum configuration, as I'm only interested in MP4Box # For most other functionality, this should probably be extended @@ -41,14 +45,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = with maintainers; [ bluescreen303 mgdelacroix ]; platforms = platforms.linux; - knownVulnerabilities = [ - "CVE-2022-1035" - "CVE-2022-1172" - "CVE-2022-1222" - "CVE-2022-1795" - "CVE-2022-2453" - "CVE-2022-2454" - "CVE-2022-2549" - ]; }; } diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 7c06f6ddb8598..bd15099b26bac 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -25,7 +25,7 @@ , numactl , writeText # Processing, video codecs, containers -, ffmpeg-full +, ffmpeg_5-full , nv-codec-headers , libogg , x264 @@ -34,6 +34,7 @@ , libtheora , dav1d , zimg +, svt-av1 # Codecs, audio , libopus , lame @@ -84,57 +85,55 @@ }: let - version = "1.5.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "HandBrake"; repo = "HandBrake"; rev = version; - sha256 = "1kk11zl1mk37d4cvbc75gfndmma7vy3vkp4gmkyl92kiz6zadhyy"; + sha256 = "sha256-0MJ1inMNA6s8l2S0wnpM2c7FxOoOHxs9u4E/rgKfjJo="; }; # Handbrake maintains a set of ffmpeg patches. In particular, these # patches are required for subtitle timing to work correctly. See: # https://github.com/HandBrake/HandBrake/issues/4029 - ffmpeg-version = "4.4.1"; - ffmpeg-hb = ffmpeg-full.overrideAttrs (old: { + ffmpeg-version = "5.1.1"; + ffmpeg-hb = ffmpeg_5-full.overrideAttrs (old: { version = ffmpeg-version; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${ffmpeg-version}.tar.bz2"; - hash = "sha256-j8nyCsXtlRFanihWR63Q7t1cwamKA5raFMEyRS+YrEI="; + hash = "sha256-zQ4W+QNCEmbVzN3t97g7nldUrvS596fwbOnkyALwVFs="; }; - patches = old.patches or [] ++ [ - "${src}/contrib/ffmpeg/A01-qsv-scale-fix-green-stripes.patch" - "${src}/contrib/ffmpeg/A02-qsv-interpolation.patch" - "${src}/contrib/ffmpeg/A03-qsv-dx11-ffmpeg44.patch" - "${src}/contrib/ffmpeg/A04-configure-ensure-the-right-libmfx-version-is-used-wh.patch" - "${src}/contrib/ffmpeg/A05-qsv-add-includedir-mfx-to-the-search-path-for-old-ve.patch" - "${src}/contrib/ffmpeg/A06-qsv-load-user-plugin-for-MFX_VERSION-2.0.patch" - "${src}/contrib/ffmpeg/A07-qsv-build-audio-related-code-when-MFX_VERSION-2.0.patch" - "${src}/contrib/ffmpeg/A08-qsvenc-don-t-support-multi-frame-encode-when-MFX_VER.patch" - "${src}/contrib/ffmpeg/A09-qsvenc-don-t-support-MFX_RATECONTROL_LA_EXT-when-MFX.patch" - "${src}/contrib/ffmpeg/A10-qsv-don-t-support-OPAQUE-memory-when-MFX_VERSION-2.0.patch" - "${src}/contrib/ffmpeg/A11-qsv-opaque-deinterlace.patch" - "${src}/contrib/ffmpeg/A12-qsv-opaque-vpp.patch" - "${src}/contrib/ffmpeg/A13-qsv-opaque-hwcontext_qsv.patch" - "${src}/contrib/ffmpeg/A14-configure-check-mfxdefs.h-instead-of-mfxvp9.h-for-MF.patch" - "${src}/contrib/ffmpeg/A15-configure-allow-user-to-build-FFmpeg-against-oneVPL.patch" - "${src}/contrib/ffmpeg/A16-qsv-add-macro-QSV_ONEVPL-for-the-oneVPL-SDK.patch" - "${src}/contrib/ffmpeg/A17-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch" - "${src}/contrib/ffmpeg/A18-qsv-new-method-hwcontext_qsv.patch" - "${src}/contrib/ffmpeg/A19-qsv-fix-session-for-d3d11-device.patch" - "${src}/contrib/ffmpeg/A20-mov-read-name-track-tag-written-by-movenc.patch" - "${src}/contrib/ffmpeg/A21-movenc-write-3gpp-track-titl-tag.patch" - "${src}/contrib/ffmpeg/A22-mov-read-3gpp-udta-tags.patch" - "${src}/contrib/ffmpeg/A23-movenc-write-3gpp-track-names-tags-for-all-available.patch" - "${src}/contrib/ffmpeg/A24-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch" - "${src}/contrib/ffmpeg/A25-dvdsubdec-fix-processing-of-partial-packets.patch" - "${src}/contrib/ffmpeg/A26-ccaption_dec-return-number-of-bytes-used.patch" - "${src}/contrib/ffmpeg/A27-dvdsubdec-return-number-of-bytes-used.patch" - "${src}/contrib/ffmpeg/A28-dvdsubdec-use-pts-of-initial-packet.patch" - "${src}/contrib/ffmpeg/A29-matroskaenc-aac-extradata-updated.patch" - "${src}/contrib/ffmpeg/A30-ccaption_dec-fix-pts-in-real_time-mode.patch" - "${src}/contrib/ffmpeg/A32-qsv-fix-decode-10bit-hdr.patch" + patches = old.patches or [ ] ++ [ + "${src}/contrib/ffmpeg/A01-qsv-libavfilter-qsvvpp-change-the-output-frame-s-width-a.patch" + "${src}/contrib/ffmpeg/A02-qsv-configure-ensure-enable-libmfx-uses-libmfx-1.x.patch" + "${src}/contrib/ffmpeg/A03-qsv-configure-fix-the-check-for-MFX_CODEC_VP9.patch" + "${src}/contrib/ffmpeg/A04-qsv-remove-mfx-prefix-from-mfx-headers.patch" + "${src}/contrib/ffmpeg/A05-qsv-load-user-plugin-for-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A06-qsv-build-audio-related-code-when-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A07-qsvenc-support-multi-frame-encode-when-MFX_VERSION-2.patch" + "${src}/contrib/ffmpeg/A08-qsvenc-support-MFX_RATECONTROL_LA_EXT-when-MFX_VERSI.patch" + "${src}/contrib/ffmpeg/A09-qsv-support-OPAQUE-memory-when-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A10-qsv-configure-add-enable-libvpl-option.patch" + "${src}/contrib/ffmpeg/A11-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch" + "${src}/contrib/ffmpeg/A12-qsv-fix-decode-10bit-hdr.patch" + "${src}/contrib/ffmpeg/A13-mov-read-name-track-tag-written-by-movenc.patch" + "${src}/contrib/ffmpeg/A14-movenc-write-3gpp-track-titl-tag.patch" + "${src}/contrib/ffmpeg/A15-mov-read-3gpp-udta-tags.patch" + "${src}/contrib/ffmpeg/A16-movenc-write-3gpp-track-names-tags-for-all-available.patch" + "${src}/contrib/ffmpeg/A17-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch" + "${src}/contrib/ffmpeg/A18-dvdsubdec-fix-processing-of-partial-packets.patch" + "${src}/contrib/ffmpeg/A19-ccaption_dec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A20-dvdsubdec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A21-dvdsubdec-use-pts-of-initial-packet.patch" + "${src}/contrib/ffmpeg/A22-matroskaenc-aac-extradata-updated.patch" + "${src}/contrib/ffmpeg/A23-ccaption_dec-fix-pts-in-real_time-mode.patch" + "${src}/contrib/ffmpeg/A24-fix-eac3-dowmix.patch" + "${src}/contrib/ffmpeg/A25-enable-truehd-pass.patch" + "${src}/contrib/ffmpeg/A26-Update-the-min-version-to-1.4.23.0-for-AMF-SDK.patch" + "${src}/contrib/ffmpeg/A27-avcodec-amfenc-Fixes-the-color-information-in-the-ou.patch" + "${src}/contrib/ffmpeg/A28-avcodec-amfenc-HDR-metadata.patch" + "${src}/contrib/ffmpeg/A30-svt-av1-backports.patch" ]; }); @@ -151,148 +150,151 @@ let inherit (lib) optional optionals optionalString versions; in -let self = stdenv.mkDerivation rec { - pname = "handbrake"; - inherit version src; +let + self = stdenv.mkDerivation rec { + pname = "handbrake"; + inherit version src; - postPatch = '' - install -Dm444 ${versionFile} ${versionFile.name} + postPatch = '' + install -Dm444 ${versionFile} ${versionFile.name} - patchShebangs scripts + patchShebangs scripts - substituteInPlace libhb/hb.c \ - --replace 'return hb_version;' 'return "${version}";' + substituteInPlace libhb/hb.c \ + --replace 'return hb_version;' 'return "${version}";' - # Force using nixpkgs dependencies - sed -i '/MODULES += contrib/d' make/include/main.defs - sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ - -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ - -i make/configure.py - '' + optionalString stdenv.isDarwin '' - # Use the Nix-provided libxml2 instead of the patched version available on - # the Handbrake website. - substituteInPlace libhb/module.defs \ - --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 + # Force using nixpkgs dependencies + sed -i '/MODULES += contrib/d' make/include/main.defs + sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ + -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ + -i make/configure.py + '' + optionalString stdenv.isDarwin '' + # Use the Nix-provided libxml2 instead of the patched version available on + # the Handbrake website. + substituteInPlace libhb/module.defs \ + --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 - # Prevent the configure script from failing if xcodebuild isn't available, - # which it isn't in the Nix context. (The actual build goes fine without - # xcodebuild.) - sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py - '' + optionalString stdenv.isLinux '' - # Use the Nix-provided libxml2 instead of the system-provided one. - substituteInPlace libhb/module.defs \ - --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 - ''; + # Prevent the configure script from failing if xcodebuild isn't available, + # which it isn't in the Nix context. (The actual build goes fine without + # xcodebuild.) + sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py + '' + optionalString stdenv.isLinux '' + # Use the Nix-provided libxml2 instead of the system-provided one. + substituteInPlace libhb/module.defs \ + --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 + ''; - nativeBuildInputs = [ - autoconf - automake - libtool - m4 - pkg-config - python3 - ] - ++ optionals useGtk [ intltool wrapGAppsHook ]; + nativeBuildInputs = [ + autoconf + automake + libtool + m4 + pkg-config + python3 + ] + ++ optionals useGtk [ intltool wrapGAppsHook ]; - buildInputs = [ - a52dec - dav1d - ffmpeg-hb - fontconfig - freetype - fribidi - harfbuzz - jansson - lame - libass - libbluray - libdvdcss - libdvdnav - libdvdread - libiconv - libjpeg_turbo - libogg - libopus - libsamplerate - libtheora - libvorbis - libvpx - libxml2 - speex - x264 - x265 - xz - zimg - ] - ++ optional (!stdenv.isDarwin) numactl - ++ optionals useGtk [ - dbus-glib - glib - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - gtk3 - hicolor-icon-theme - libappindicator-gtk3 - libgudev - libnotify - udev - ] - ++ optional useFdk fdk_aac - ++ optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] - # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, - # look at ./make/configure.py search "enable_nvenc" - ++ optional stdenv.isLinux nv-codec-headers; + buildInputs = [ + a52dec + dav1d + ffmpeg-hb + fontconfig + freetype + fribidi + harfbuzz + jansson + lame + libass + libbluray + libdvdcss + libdvdnav + libdvdread + libiconv + libjpeg_turbo + libogg + libopus + libsamplerate + libtheora + libvorbis + libvpx + libxml2 + speex + svt-av1 + x264 + x265 + xz + zimg + ] + ++ optional (!stdenv.isDarwin) numactl + ++ optionals useGtk [ + dbus-glib + glib + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + gtk3 + hicolor-icon-theme + libappindicator-gtk3 + libgudev + libnotify + udev + ] + ++ optional useFdk fdk_aac + ++ optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] + # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, + # look at ./make/configure.py search "enable_nvenc" + ++ optional stdenv.isLinux nv-codec-headers; - configureFlags = [ - "--disable-df-fetch" - "--disable-df-verify" - "--disable-gtk-update-checks" - ] - ++ optional (!useGtk) "--disable-gtk" - ++ optional useFdk "--enable-fdk-aac" - ++ optional stdenv.isDarwin "--disable-xcode" - ++ optional stdenv.hostPlatform.isx86 "--harden"; + configureFlags = [ + "--disable-df-fetch" + "--disable-df-verify" + "--disable-gtk-update-checks" + ] + ++ optional (!useGtk) "--disable-gtk" + ++ optional useFdk "--enable-fdk-aac" + ++ optional stdenv.isDarwin "--disable-xcode" + ++ optional stdenv.hostPlatform.isx86 "--harden"; - # NOTE: 2018-12-27: Check NixOS HandBrake test if changing - NIX_LDFLAGS = [ "-lx265" ]; + # NOTE: 2018-12-27: Check NixOS HandBrake test if changing + NIX_LDFLAGS = [ "-lx265" ]; - makeFlags = [ "--directory=build" ]; + makeFlags = [ "--directory=build" ]; - passthru.tests = { - basic-conversion = - let - # Big Buck Bunny example, licensed under CC Attribution 3.0. - testMkv = fetchurl { - url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true"; - sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9"; - }; - in - runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } '' - mkdir -p $out - cd $out - HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160 - test -e test.mp4 - HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160 - test -e test.mkv - ''; - version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; }; - }; + passthru.tests = { + basic-conversion = + let + # Big Buck Bunny example, licensed under CC Attribution 3.0. + testMkv = fetchurl { + url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true"; + sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9"; + }; + in + runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } '' + mkdir -p $out + cd $out + HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160 + test -e test.mp4 + HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160 + test -e test.mkv + ''; + version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; }; + }; - meta = with lib; { - homepage = "https://handbrake.fr/"; - description = "A tool for converting video files and ripping DVDs"; - longDescription = '' - Tool for converting and remuxing video files - into selection of modern and widely supported codecs - and containers. Very versatile and customizable. - Package provides: - CLI - `HandbrakeCLI` - GTK GUI - `ghb` - ''; - license = licenses.gpl2Only; - maintainers = with maintainers; [ Anton-Latukha wmertens ]; - platforms = with platforms; unix; - broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; + meta = with lib; { + homepage = "https://handbrake.fr/"; + description = "A tool for converting video files and ripping DVDs"; + longDescription = '' + Tool for converting and remuxing video files + into selection of modern and widely supported codecs + and containers. Very versatile and customizable. + Package provides: + CLI - `HandbrakeCLI` + GTK GUI - `ghb` + ''; + license = licenses.gpl2Only; + maintainers = with maintainers; [ Anton-Latukha wmertens ]; + platforms = with platforms; unix; + broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; + }; }; -}; -in self +in +self diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index a776fabc9a790..25fac4fba61de 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "haruna"; - version = "0.10.0"; + version = "0.10.3"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-UU8tbaZz7udDulh+PHPZDc3rm1MvK4dafPgXL50apMI="; + hash = "sha256-kXafPUcWWvadGbcN4PAtXlFmfll/mSpwu2Sbh6Gxx4w="; domain = "invent.kde.org"; }; diff --git a/pkgs/applications/video/hdhomerun-config-gui/default.nix b/pkgs/applications/video/hdhomerun-config-gui/default.nix index 32f4267d9fcc1..12689bedcbd38 100644 --- a/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "hdhomerun-config-gui"; - version = "20210224"; + version = "20221205"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${version}.tgz"; diff --git a/pkgs/applications/video/imagination/default.nix b/pkgs/applications/video/imagination/default.nix index 732d8f547ff69..804265bcb5456 100644 --- a/pkgs/applications/video/imagination/default.nix +++ b/pkgs/applications/video/imagination/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight and simple DVD slide show maker"; - homepage = "http://imagination.sourceforge.net"; + homepage = "https://imagination.sourceforge.net"; license = licenses.gpl3Only; maintainers = with maintainers; [ austinbutler ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 4f2b4ef440f76..d6379550e884f 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -28,13 +28,13 @@ mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-piMqI4qxcNUSNC+0JE2KZ/cvlNgtxUOnSfrcWnBVzC0="; + sha256 = "sha256-/FqxZd0cFSfkeBQmZ2gU+5FUZZ+WbQ8c2IjaZ4/uGt8="; }; patches = [ diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 02c58925558e6..c1e0488c01425 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -18,11 +18,11 @@ buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "2.2.0"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0="; + sha256 = "sha256-hz6uIzlVuocSZRDYLnJ3/OZ4UDNlavJFky4CuyggANI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kaffeine/default.nix b/pkgs/applications/video/kaffeine/default.nix index 6cbce01f61f67..02263f46e0f4b 100644 --- a/pkgs/applications/video/kaffeine/default.nix +++ b/pkgs/applications/video/kaffeine/default.nix @@ -5,6 +5,7 @@ , cmake , extra-cmake-modules , libvlc +, libv4l , libX11 , kidletime , kdelibs4support @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ libvlc + libv4l libX11 kidletime qtx11extras diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index bec74dd46a975..1053ca11cb3c4 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "arteplussept"; namespace = "plugin.video.arteplussept"; - version = "1.1.1"; + version = "1.1.8"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - hash = "sha256-IYodi0Uz16Qg4MHCz/K06pEXblrsBxHD25fb6LrW8To="; + hash = "sha256-1f+oEHEhSsDMXH7WssSVjjuDjK3UNyMiNhaw7mh/xjI="; }; propagatedBuildInputs = [ @@ -23,7 +23,7 @@ buildKodiAddon rec { }; meta = with lib; { - homepage = "https://github.com/known-as-bmf/plugin.video.arteplussept"; + homepage = "https://github.com/thomas-ernest/plugin.video.arteplussept"; description = "Watch videos available on Arte+7"; license = licenses.mit; maintainers = teams.kodi.members; diff --git a/pkgs/applications/video/kodi/addons/invidious/default.nix b/pkgs/applications/video/kodi/addons/invidious/default.nix index c2885ba03a0a1..f219a3fd1fdfb 100644 --- a/pkgs/applications/video/kodi/addons/invidious/default.nix +++ b/pkgs/applications/video/kodi/addons/invidious/default.nix @@ -1,13 +1,18 @@ -{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: buildKodiAddon rec { pname = "invidious"; namespace = "plugin.video.invidious"; - version = "0.1.0+matrix.1"; + version = "unstable-2022-11-28"; - src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-4z2/YTso5KV6JHS/DOXll2lKOoVnW1i5MnpmV6ESXbM="; + # video search doesn't work for the version on kodi.tv + # if the result contains channels + # https://github.com/TheAssassin/kodi-invidious-plugin/issues/17 + src = fetchFromGitHub { + owner = "TheAssassin"; + repo = "kodi-invidious-plugin"; + rev = "85b66525632d94630c9301d9c490fc002a335d77"; + hash = "sha256-DpsAQUOUYCs3rpWwsk82+00KME4J+Iocu/v781dyyws="; }; propagatedBuildInputs = [ @@ -18,9 +23,6 @@ buildKodiAddon rec { passthru = { pythonPath = "resources/lib"; - updateScript = addonUpdateScript { - attrPath = "kodi.packages.invidious"; - }; }; meta = with lib; { diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index d083f1eda20a9..110c48c1e4abb 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -14,21 +14,21 @@ }: let - version = "1.17.2"; + version = "1.17.3"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "sha256-gACMzJ7oZCk/INSeJaV7GnF9hy/6F9d0QDLp5jPiF4k="; + sha256 = "1cd633bfb381faa4f22ab57f6b75053c1b18997c223ed7988896c8c15cd1bee0"; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "sha256-qD+Kuz8j3vDch4PlNQYqdbffL3YSKRqKg6IfkLk/LaQ="; + sha256 = "16be3ee29c1dd3d5292f793e9f5efbcd30a59bf035de79586e9afbfa98a6a4cb"; }; in mkDerivation { diff --git a/pkgs/applications/video/mirakurun/default.nix b/pkgs/applications/video/mirakurun/default.nix index d0d52ade25ad9..bc36039224758 100644 --- a/pkgs/applications/video/mirakurun/default.nix +++ b/pkgs/applications/video/mirakurun/default.nix @@ -39,6 +39,9 @@ stdenvNoCC.mkDerivation rec { yarnLock = ./yarn.lock; packageJSON = ./package.json; + # workaround for https://github.com/webpack/webpack/issues/14532 + NODE_OPTIONS = "--openssl-legacy-provider"; + patches = [ # NOTE: fixes for hardcoded paths and assumptions about filesystem # permissions @@ -86,8 +89,9 @@ stdenvNoCC.mkDerivation rec { yarn2nix; }; - meta = { + meta = with lib; { inherit (mirakurun.meta) description platforms; - maintainers = with lib.maintainers; [ midchildan ]; + license = licenses.asl20; + maintainers = with maintainers; [ midchildan ]; }; } diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 9f91cc0c3c08b..372bc52044e70 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "mpc-qt"; - version = "22.02"; + version = "23.02"; src = fetchFromGitHub { owner = "mpc-qt"; repo = "mpc-qt"; rev = "v${version}"; - sha256 = "sha256-DRbNDrWnaTT4A0dRFAv9MX/MDwV/rXIw+R8fQJmVN+g="; + sha256 = "sha256-b8efsdWWpwoaiX+oQhHK15KxD6JpvPhESTxCR2kS7Mk="; }; nativeBuildInputs = [ pkg-config qmake qttools ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 7f6fd0b286f49..28e0d1d469a07 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -80,17 +80,17 @@ let inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (self: { pname = "mpv"; - version = "0.35.0"; + version = "0.35.1"; outputs = [ "out" "dev" "man" ]; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; - rev = "v${version}"; - sha256 = "sha256-U3NDSxlX4/WkoHFkOvpcwPMwfwTnSpCw0QI5yLMK08o="; + rev = "v${self.version}"; + sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM="; }; postPatch = '' @@ -216,8 +216,9 @@ in stdenv.mkDerivation rec { mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both. ''; + changelog = "https://github.com/mpv-player/mpv/releases/tag/v${self.version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 4052c968d2ba0..af033781ac2c4 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mpvacious"; - version = "0.18"; + version = "0.20"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-FiYEpZVaeJQVSXa9obFYSKNVASJolOBm5D3faOlCzNY="; + sha256 = "sha256-9Lf7MVaJ5eC5Gb1PdGBvtENU8AAVq2jsUkY3wJfztt8="; }; postPatch = '' diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 0c46b4c2ba858..35f5fcb549f1d 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -3,13 +3,13 @@ # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` stdenvNoCC.mkDerivation { pname = "mpv_sponsorblock"; - version = "unstable-2022-09-24"; + version = "unstable-2023-01-30"; src = fetchFromGitHub { owner = "po5"; repo = "mpv_sponsorblock"; - rev = "248d108c1280e05de551c42867aebb72cf0c83b9"; - sha256 = "1aacchyci34xyx7rcyd2r02i4rlqq8q61l6dcci8yd4g4hjiqqld"; + rev = "7785c1477103f2fafabfd65fdcf28ef26e6d7f0d"; + sha256 = "sha256-iUXaTWWFEdxhxClu2NYbQcThlvYty3A2dEYGooeAVAQ="; }; dontBuild = true; diff --git a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix new file mode 100644 index 0000000000000..811b49e8714bc --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix @@ -0,0 +1,36 @@ +{ lib , buildNpmPackage , fetchFromGitHub, nodejs }: + +buildNpmPackage rec { + pname = "webtorrent-mpv-hook"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "mrxdst"; + repo = pname; + rev = "v${version}"; + hash = "sha256-AFKX31kriacXygZy0Mw+QwO+SwFEu13687mJ/WeAoKY="; + }; + + 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",' "" + rm -rf src/bin.ts + ''; + + npmDepsHash = "sha256-GpNUJ5ZCgMjSYLqsIE/RwkTSFT3uAhxrHPe7XvGDRHE="; + makeCacheWritable = true; + + postInstall = '' + mkdir -p $out/share/mpv/scripts/ + ln -s $out/lib/node_modules/webtorrent-mpv-hook/build/webtorrent.js $out/share/mpv/scripts/ + ''; + passthru.scriptName = "webtorrent.js"; + + meta = { + description = "Adds a hook that allows mpv to stream torrents"; + homepage = "https://github.com/mrxdst/webtorrent-mpv-hook"; + maintainers = [ lib.maintainers.chuangzhu ]; + license = lib.licenses.isc; + }; +} diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fa6167b9c1184..2ac85084b4130 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { pname = "obs-studio"; - version = "29.0.0"; + version = "29.0.2"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "sha256-c+G02k4AACaYfa5Zhsanr6AU3vNbopDMcYtuny/d25Y="; + sha256 = "sha256-TIUSjyPEsKRNTSLQXuLJGEgD989hJ5GhOsqJ4nkKVsY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index ad37c503c0ab9..c796b2d84fa05 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -22,7 +22,7 @@ obs-multi-rtmp = qt6Packages.callPackage ./obs-multi-rtmp { }; - obs-ndi = qt6Packages.callPackage ./obs-ndi.nix { }; + obs-ndi = qt6Packages.callPackage ./obs-ndi { }; obs-nvfbc = callPackage ./obs-nvfbc.nix { }; @@ -30,6 +30,8 @@ obs-source-record = callPackage ./obs-source-record.nix { }; + obs-vaapi = callPackage ./obs-vaapi { }; + obs-vkcapture = callPackage ./obs-vkcapture.nix { obs-vkcapture32 = pkgsi686Linux.obs-studio-plugins.obs-vkcapture; }; diff --git a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix index cd7548846fa25..b581dc4402227 100644 --- a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix +++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio libbfd SDL2 ]; - NIX_CFLAGS_COMPILE = "-mavx"; + env.NIX_CFLAGS_COMPILE = "-mavx"; installPhase = '' mkdir -p $out/lib/obs-plugins/ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index 70b6790a58a88..e58220bce7e81 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "obs-gstreamer"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "fzwoch"; - repo = "obs-gstreamer"; + repo = pname; rev = "v${version}"; - hash = "sha256-zP1MMoXLp+gp0fjVbWi/Wse6I8u9/K2IeSew3OjkCkE="; + hash = "sha256-C4yee7hzkSOjIeaacLaTGPzZ1qYdYtHK5a3m9gz2pPI="; }; nativeBuildInputs = [ pkg-config meson ninja ]; @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { # - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin; # - without gst-plugins-base it won't even show proper errors in logs; # - Without gst-plugins-bad it won't find element "h264parse"; - # - gst-vaapi adds "VA-API" to "Encoder type"; # - gst-plugins-ugly adds "x264" to "Encoder type"; # Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help. passthru.obsWrapperArguments = @@ -36,11 +35,15 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-bad - gst-plugins-ugly - gst-vaapi ]; + # Fix output directory + postInstall = '' + mkdir $out/lib/obs-plugins + mv $out/lib/obs-gstreamer.so $out/lib/obs-plugins/ + ''; + meta = with lib; { description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio"; homepage = "https://github.com/fzwoch/obs-gstreamer"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix index a16c8924adceb..a16c8924adceb 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix diff --git a/pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch b/pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch index 03b54473bb8ba..03b54473bb8ba 100644 --- a/pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch +++ b/pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix new file mode 100644 index 0000000000000..499f07fccd7af --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchFromGitHub +, gst_all_1 +, pciutils +, pkg-config +, meson +, ninja +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-vaapi"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "fzwoch"; + repo = pname; + rev = version; + hash = "sha256-wrbVuqIe+DY3R+Jp3zCy2Uw3fv5ejYHtRV2Sv+y/n0w="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base obs-studio pciutils ]; + + # - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin; + # - without gst-plugins-base it won't even show proper errors in logs; + # - Without gst-plugins-bad it won't find element "vapostproc"; + # - gst-vaapi adds "VA-API" to "Encoder type"; + # Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help. + passthru.obsWrapperArguments = + let + gstreamerHook = package: "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${lib.getLib package}/lib/gstreamer-1.0"; + in + with gst_all_1; builtins.map gstreamerHook [ + gstreamer + gst-plugins-base + gst-plugins-bad + gst-vaapi + ]; + + # Fix output directory + postInstall = '' + mkdir $out/lib/obs-plugins + mv $out/lib/obs-vaapi.so $out/lib/obs-plugins/ + ''; + + meta = with lib; { + description = "OBS Studio VAAPI support via GStreamer"; + homepage = "https://github.com/fzwoch/obs-vaapi"; + maintainers = with maintainers; [ ahuzik pedrohlc ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index ba0e8a8182633..c156ac288b663 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -8,6 +8,7 @@ , wayland-scanner , obs-studio , libX11 +, libxcb , vulkan-headers , vulkan-loader , libGL @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGL libX11 + libxcb vulkan-headers vulkan-loader wayland diff --git a/pkgs/applications/video/obs-studio/wrapper.nix b/pkgs/applications/video/obs-studio/wrapper.nix index 5303991f1fb96..62bc80d26df3b 100644 --- a/pkgs/applications/video/obs-studio/wrapper.nix +++ b/pkgs/applications/video/obs-studio/wrapper.nix @@ -24,7 +24,7 @@ symlinkJoin { "$out/bin/obs" ''--set OBS_PLUGINS_PATH "${pluginsJoined}/lib/obs-plugins"'' ''--set OBS_PLUGINS_DATA_PATH "${pluginsJoined}/share/obs/obs-plugins"'' - ] ++ pluginArguments; + ] ++ lists.unique pluginArguments; in '' ${concatStringsSep " " wrapCommandLine} diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 48f1b98f6e537..d910383bf956d 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libogg libvorbis libdvdread ]; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; meta = { description = "Tools for modifying and inspecting OGG media streams"; diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 02270cd75e06e..ec980f1bfd1be 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -7,6 +7,7 @@ , gtk3 , libopenshot , python3 +, qtbase , qtsvg , wrapGAppsHook }: @@ -55,7 +56,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec { '' # Fix toolbar icons on Darwin + lib.optionalString stdenv.isDarwin '' - --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \ + --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/${qtbase.qtPluginPrefix}" \ '' + '' "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 4214bed7167f4..904f039758ca3 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt - sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' bindings/python/CMakeLists.txt - export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) ''; nativeBuildInputs = lib.optionals stdenv.isLinux [ @@ -62,7 +60,10 @@ stdenv.mkDerivation rec { doCheck = false; - cmakeFlags = [ "-DENABLE_RUBY=OFF" ]; + cmakeFlags = [ + "-DENABLE_RUBY=OFF" + "-DPYTHON_MODULE_PATH=${python3.sitePackages}" + ]; meta = with lib; { homepage = "http://openshot.org/"; diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index 60e5924b5f342..30c364578eb0a 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen , wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect -, libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook, liblapack +, libdc1394, librealsense, libGL, libGLU, vtk_8_withQt5, wrapGAppsHook, liblapack , xorg }: stdenv.mkDerivation rec { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { qtbase libGL libGLU - vtkWithQt5 + vtk_8_withQt5 ]; # Disable warnings that are irrelevant to us as packagers diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index e268b05094edc..5abc6c47a1346 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { qtgraphicaleffects ]; - NIX_CFLAGS_COMPILE = "-I${mlt.dev}/include/mlt++ -I${mlt.dev}/include/mlt"; + 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}" diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix index d50b7ababfa77..b02d6e6e31fc7 100644 --- a/pkgs/applications/video/showmethekey/default.nix +++ b/pkgs/applications/video/showmethekey/default.nix @@ -1,56 +1,40 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch -, glib , meson , ninja , libevdev , json-glib -, cairo -, pango , libinput , gtk4 , wrapGAppsHook4 , libxkbcommon , pkg-config }: - stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "AlynxZhou"; - repo = "showmethekey"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA="; + hash = "sha256-iWZjOhugGD7GikcIKaJimfLrTDaGQeYgmp17N03Meb8="; }; - patches = [ - (fetchpatch { - name = "use-gtk4-update-icon-cache.patch"; - url = "https://github.com/alynxzhou/showmethekey/commit/c73102dc2825d00cbaf323fcfc96736381dc67ae.patch"; - sha256 = "sha256-6QDY5eQ9A8q3LZeD7v6WI/4vYXc/XXVY/WENA1nvIKo="; - }) - ]; - nativeBuildInputs = [ - glib meson ninja - cairo - pango json-glib pkg-config - libevdev - libinput - libxkbcommon wrapGAppsHook4 ]; buildInputs = [ gtk4 + libevdev + libinput + libxkbcommon ]; meta = with lib; { diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 6a8207e7bc16d..664cbcf2db3f6 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 = "5.1.2"; + version = "5.3.0"; format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - hash = "sha256-UB9gTT2/rQXV1Q7UQywEHlGBCJDMDmXupD8nYII4dno="; + hash = "sha256-+9MSSzPYZ8gwOeQLehR41SklfdcUn8Pa6TI//lh9twE="; }; nativeCheckInputs = with python3Packages; [ @@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec { requests websocket-client urllib3 + certifi ]) ++ [ ffmpeg ]; diff --git a/pkgs/applications/video/stremio/default.nix b/pkgs/applications/video/stremio/default.nix index 0316318534dcd..f1b469006a709 100644 --- a/pkgs/applications/video/stremio/default.nix +++ b/pkgs/applications/video/stremio/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share/applications} ln -s $out/opt/stremio/stremio $out/bin/stremio mv $out/opt/stremio/smartcode-stremio.desktop $out/share/applications + install -Dm 644 images/stremio_window.png $out/share/pixmaps/smartcode-stremio.png ln -s ${nodejs}/bin/node $out/opt/stremio/node ln -s $server $out/opt/stremio/server.js ''; diff --git a/pkgs/applications/video/subtitleedit/default.nix b/pkgs/applications/video/subtitleedit/default.nix new file mode 100644 index 0000000000000..a7bdf2e110fb4 --- /dev/null +++ b/pkgs/applications/video/subtitleedit/default.nix @@ -0,0 +1,96 @@ +{ lib +, stdenv +, copyDesktopItems +, makeDesktopItem +, makeWrapper +, fetchzip +, ffmpeg +, gtk2 +, hunspell +, icoutils +, mono +, mpv +, tesseract4 +}: + +stdenv.mkDerivation rec { + pname = "subtitleedit"; + version = "3.6.11"; + + src = fetchzip { + url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip"; + sha256 = "00w9jx704in3hbnzp0i7bhqkhbl0h5mahc5izwa980b67w08dc26"; + stripRoot = false; + }; + + preUnpack = '' + rm -rf source + ''; + + nativeBuildInputs = [ + copyDesktopItems + icoutils + makeWrapper + ]; + + runtimeLibs = lib.makeLibraryPath [ + gtk2 + hunspell + mpv + tesseract4 + ]; + + runtimeBins = lib.makeBinPath [ + ffmpeg + hunspell + tesseract4 + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps + + cp -r * $out/bin/ + ln -s ${hunspell.out}/lib/libhunspell*.so $out/bin/libhunspell.so + makeWrapper "${mono}/bin/mono" $out/bin/subtitleedit \ + --add-flags "$out/bin/SubtitleEdit.exe" \ + --prefix LD_LIBRARY_PATH : ${runtimeLibs} \ + --prefix PATH : ${runtimeBins} + + wrestool -x -t 14 SubtitleEdit.exe > subtitleedit.ico + icotool -x -i 3 -o $out/share/icons/hicolor/16x16/apps/subtitleedit.png subtitleedit.ico + icotool -x -i 6 -o $out/share/icons/hicolor/32x32/apps/subtitleedit.png subtitleedit.ico + icotool -x -i 9 -o $out/share/icons/hicolor/48x48/apps/subtitleedit.png subtitleedit.ico + icotool -x -i 10 -o $out/share/icons/hicolor/256x256/apps/subtitleedit.png subtitleedit.ico + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Subtitle Edit"; + exec = "subtitleedit"; + icon = "subtitleedit"; + comment = meta.description; + categories = [ "Video" ]; + }) + ]; + + meta = with lib; { + description = "A subtitle editor"; + homepage = "https://nikse.dk/subtitleedit/"; + license = licenses.gpl3Plus; + longDescription = '' + With Subtitle Edit you can easily adjust a subtitle if it is out of sync with + the video in several different ways. You can also use it for making + new subtitles from scratch (using the time-line /waveform/spectrogram) + or for translating subtitles. + ''; + maintainers = with maintainers; [ paveloom ]; + platforms = platforms.all; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix index 706dbc187377a..c21a0611262da 100644 --- a/pkgs/applications/video/tivodecode/default.nix +++ b/pkgs/applications/video/tivodecode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file"; - homepage = "http://tivodecode.sourceforge.net"; + homepage = "https://tivodecode.sourceforge.net"; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix index 023f37de287db..70e335192d9d3 100644 --- a/pkgs/applications/video/ustreamer/default.nix +++ b/pkgs/applications/video/ustreamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "5.20"; + version = "5.36"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - sha256 = "sha256-ZJebLsmoaIxfM8Eenv/r351Kr8XM+wyZUc2TI+oGDxU="; + sha256 = "sha256-VnqCiEPaBzGN2TL7oXO4T7dcNdGneac/5nFPwRPiJ9c="; }; buildInputs = [ libbsd libevent libjpeg ]; diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 28528318c162f..404af2ec83b37 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, fetchgit, vdr, fetchFromGitHub +{ lib, stdenv, vdr, fetchFromGitHub , graphicsmagick, pcre, xorgserver, ffmpeg , libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses , callPackage }: let mkPlugin = name: stdenv.mkDerivation { - name = "vdr-${vdr.version}-${name}"; + name = "vdr-${name}-${vdr.version}"; inherit (vdr) src; buildInputs = [ vdr ]; preConfigure = "cd PLUGINS/src/${name}"; @@ -55,13 +55,13 @@ in { markad = stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.0.26"; + version = "3.1.1"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-0J6XeLgr9IZSWsheQZWVNRLIxp8iyCvR9Y0z/yrbTnI="; - rev = "v${version}"; + sha256 = "sha256-h2a400T6mHzZRWAVFXF5Wzhu4Zp1D3btEKlxnCtB13M="; + rev = "V${version}"; }; buildInputs = [ vdr ffmpeg ]; @@ -101,12 +101,12 @@ in { epgsearch = stdenv.mkDerivation rec { pname = "vdr-epgsearch"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { repo = "vdr-plugin-epgsearch"; owner = "vdr-projects"; - sha256 = "sha256-UlbPCkUFN0Gyxjw9xq2STFTDZRVcPPNjadSQd4o2o9U="; + sha256 = "sha256-C+WSdGTnDBTWLvpjG5GBaK8pYbht431nL5iaL/a0H4Y="; rev = "v${version}"; }; @@ -150,7 +150,7 @@ in { vnsiserver = stdenv.mkDerivation rec { pname = "vdr-vnsiserver"; - version = "1.8.1"; + version = "1.8.3"; buildInputs = [ vdr ]; @@ -160,7 +160,7 @@ in { repo = "vdr-plugin-vnsiserver"; owner = "vdr-projects"; rev = version; - sha256 = "sha256-1C0Z7NoU+FNch4BhrAcbJdzVvGuH1YDaxJ+9PflR78E="; + sha256 = "sha256-ivHdzX90ozMXSvIc5OrKC5qHeK5W3TK8zyrN8mY3IhE="; }; meta = with lib; { @@ -173,14 +173,15 @@ in { }; - text2skin = stdenv.mkDerivation { + text2skin = stdenv.mkDerivation rec { pname = "vdr-text2skin"; version = "1.3.4-20170702"; - src = fetchgit { - url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git"; - sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa"; + src = fetchFromGitHub { + repo = "vdr-plugin-text2skin"; + owner = "vdr-projects"; rev = "8f7954da2488ced734c30e7c2704b92a44e6e1ad"; + sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa"; }; buildInputs = [ vdr graphicsmagick ]; @@ -200,7 +201,7 @@ in { dontInstall = true; meta = with lib; { - homepage = "https://projects.vdr-developer.org/projects/plg-text2skin"; + inherit (src.meta) homepage; description = "VDR Text2Skin Plugin"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index f31e7b79ae7db..ed9c09087e412 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.9.3"; + version = "1.9.7"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-0jtA64RVlh57zjrGDJAR/tt8V6sSksAx9kBDRW1m+WM="; + sha256 = "sha256-SviAuV+71pxnuEcmoLQkA1yti2jAAuG7yZZDlf3cODc="; rev = "v${version}"; }; diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index 2bb9437f1b06f..82c23b4892e43 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: alsa_device.o:(.bss+0x8): multiple definition of `rc'; QvkAlsaDevice.o:(.bss+0x8): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; preConfigure = '' sed -i 's/lrelease-qt5/lrelease/g' vokoscreen.pro diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix index 9c07eb1a6368a..1a8c6f2d3adbe 100644 --- a/pkgs/applications/video/w_scan/default.nix +++ b/pkgs/applications/video/w_scan/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: char-coding.o:/build/w_scan-20170107/si_types.h:117: multiple definition of # `service_t'; countries.o:/build/w_scan-20170107/si_types.h:117: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = { description = "Small CLI utility to scan DVB and ATSC transmissions"; diff --git a/pkgs/applications/video/w_scan2/default.nix b/pkgs/applications/video/w_scan2/default.nix new file mode 100644 index 0000000000000..56000407fce63 --- /dev/null +++ b/pkgs/applications/video/w_scan2/default.nix @@ -0,0 +1,25 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "w_scan2"; + version = "1.0.14"; + + src = fetchFromGitHub { + owner = "stefantalpalaru"; + repo = "w_scan2"; + rev = version; + sha256 = "sha256-fDFAJ4EMwu4X1Go3jkRjwA66xDY4tJ5wCKlEdZUT4qQ="; + }; + + meta = { + description = "A small channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T/T2 channels.conf files"; + homepage = "https://github.com/stefantalpalaru/w_scan2"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ _0x4A6F ] ; + license = lib.licenses.gpl2Only; + }; +} diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 837e86082f950..7350765ab5d2f 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -46,7 +46,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"]; - NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isClang "-Qunused-arguments"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Qunused-arguments"; postPatch = lib.optionalString csmSupport '' cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index d13cfbd7f177f..e49c2a6591217 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -1,12 +1,17 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles , lima +, lima-bin , makeWrapper , qemu , testers , colima + # use lima-bin on darwin to support native macOS virtualization + # https://github.com/NixOS/nixpkgs/pull/209171 +, lima-drv ? if stdenv.isDarwin then lima-bin else lima }: buildGoModule rec { @@ -41,7 +46,7 @@ buildGoModule rec { postInstall = '' wrapProgram $out/bin/colima \ - --prefix PATH : ${lib.makeBinPath [ lima qemu ]} + --prefix PATH : ${lib.makeBinPath [ lima-drv qemu ]} installShellCompletion --cmd colima \ --bash <($out/bin/colima completion bash) \ diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/applications/virtualization/conmon-rs/default.nix index 59a2de96e9dd6..ef25427c4a234 100644 --- a/pkgs/applications/virtualization/conmon-rs/default.nix +++ b/pkgs/applications/virtualization/conmon-rs/default.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "conmon-rs"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VwVJWf9tKZ5rVF8tXDf35zsS2PipqC8FPbXUpOzsw/Y="; + sha256 = "sha256-mngs5ivRyMJ927VV00mFNIG+nD9EuE3qLyN+OHMMkHQ="; }; nativeBuildInputs = [ capnproto protobuf ]; doCheck = false; - cargoSha256 = "sha256-zY9fsZK1C3HnCxeNA5dCbQQHYx3IVDMHCHYwFh5ev2k="; + cargoSha256 = "sha256-ruChRz2rnPalBiXcpco/WS/eDgg52ckPBLBuoQa9us4="; meta = with lib; { description = "An OCI container runtime monitor written in Rust"; diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 25b89889b5288..a27930fcb4ac4 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.5"; + version = "2.1.7"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zpZ3hVgnh8gkrSghSvhSZnG9uaN+GTKFGHv+MMcs73Q="; + hash = "sha256-W6nqhSEoP2mDp7fCoXqwYAafjfESxymYXAdC3BnJJno="; }; nativeBuildInputs = [ pkg-config ]; @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) cri-o podman; }; meta = with lib; { + changelog = "https://github.com/containers/conmon/releases/tag/${src.rev}"; homepage = "https://github.com/containers/conmon"; description = "An OCI container runtime monitor"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 40a1e671cc565..d5fb7df67f707 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.15"; + version = "1.6.19"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-Vlftq//mLYZPoT2R/lHJA6wLnqiuC+Cpy4lGQC8jCPA="; + hash = "sha256-Us7NEv2BngV1Q/Bkuv4XOjVjpqThL0LnIH+yciPG3L8="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; @@ -45,6 +45,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) docker; }; meta = with lib; { + changelog = "https://github.com/containerd/containerd/releases/tag/${src.rev}"; homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 60d05f6f23095..1c2dce886536c 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.7.2"; + version = "1.8.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-SNNy/oI3ZcMeRLEMS2nSCS/rRaen5WsDfhdlHQCdtP4="; + hash = "sha256-Pm96fOfbBqf7mc9llv3sFi00Ioa3f9WNoDmLBPhB2eI="; fetchSubmodules = true; }; @@ -74,9 +74,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A fast and lightweight fully featured OCI runtime and C library for running containers"; + homepage = "https://github.com/containers/crun"; license = licenses.gpl2Plus; platforms = platforms.linux; - inherit (src.meta) homepage; maintainers = with maintainers; [ ] ++ teams.podman.members; }; } diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index c116a581103bb..bbefed66fae3d 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -1,21 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, makeBinaryWrapper }: buildGoModule rec { pname = "docker-slim"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitHub { - owner = "docker-slim"; - repo = "docker-slim"; + owner = "slimtoolkit"; + repo = "slim"; rev = version; - sha256 = "sha256-CN3mvXjI6c10yvXM2owWASngsU2PjgLhd1N55vxubw0="; + sha256 = "sha256-KbwkZIGkAdzPPo5CrWKnKzFsD8OUONk6JWo1wzwti3s="; }; vendorSha256 = null; - subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; + subPackages = [ "cmd/slim" "cmd/slim-sensor" ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; ldflags = [ "-s" @@ -27,13 +27,13 @@ buildGoModule rec { # docker-slim tries to create its state dir next to the binary (inside the nix # store), so we set it to use the working directory at the time of invocation postInstall = '' - wrapProgram "$out/bin/docker-slim" --add-flags '--state-path "$(pwd)"' + wrapProgram "$out/bin/slim" --add-flags '--state-path "$(pwd)"' ''; meta = with lib; { description = "Minify and secure Docker containers"; - homepage = "https://dockersl.im/"; - changelog = "https://github.com/docker-slim/docker-slim/raw/${version}/CHANGELOG.md"; + homepage = "https://slimtoolkit.org/"; + changelog = "https://github.com/slimtoolkit/slim/raw/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ]; }; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 1646c05175141..cada624a2a686 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.15.1"; + version = "2.16.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-CDkewlZFvjp6kb6UoMDUv9iAUfm0akMD9RpI9/H7Sz8="; + sha256 = "sha256-/kdEzC97atFJw8rWFAdm9tofayj1fwBRvNKwbjWIGR8="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorSha256 = "sha256-sv4lK6MRwmp/1CSGBoYMpcGunVCuE8p1vB4VKaRuwQc="; + vendorHash = "sha256-1iEJPVrsRqQQhkspRmUtS4ru4DCKiyobGztM4d0vb2Y="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 5027a8fd5c911..17b3982a1f7d0 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -2,11 +2,12 @@ rec { dockerGen = { - version, rev, sha256 - , moby-src - , runcRev, runcSha256 - , containerdRev, containerdSha256 - , tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true + version + , cliRev, cliHash + , mobyRev, mobyHash + , runcRev, runcHash + , containerdRev, containerdHash + , tiniRev, tiniHash, buildxSupport ? true, composeSupport ? true # package dependencies , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc @@ -29,7 +30,7 @@ rec { owner = "opencontainers"; repo = "runc"; rev = runcRev; - sha256 = runcSha256; + hash = runcHash; }; # docker/runc already include these patches / are not applicable @@ -44,7 +45,7 @@ rec { owner = "containerd"; repo = "containerd"; rev = containerdRev; - sha256 = containerdSha256; + hash = containerdHash; }; buildInputs = oldAttrs.buildInputs @@ -59,7 +60,7 @@ rec { owner = "krallin"; repo = "tini"; rev = tiniRev; - sha256 = tiniSha256; + hash = tiniHash; }; # Do not remove static from make files as we want a static binary @@ -67,9 +68,16 @@ rec { buildInputs = [ glibc glibc.static ]; - NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; + env.NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); + moby-src = fetchFromGitHub { + owner = "moby"; + repo = "moby"; + rev = mobyRev; + hash = mobyHash; + }; + moby = buildGoPackage (lib.optionalAttrs stdenv.isLinux rec { pname = "moby"; inherit version; @@ -95,7 +103,7 @@ rec { (fetchpatch { name = "buildkit-zfs.patch"; url = "https://github.com/moby/moby/pull/43136.patch"; - sha256 = "1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; + hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; }) ]; @@ -108,7 +116,7 @@ rec { # build engine cd ./go/src/${goPackagePath} export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="${rev}" + export DOCKER_GITCOMMIT="${cliRev}" export VERSION="${version}" ./hack/make.sh dynbinary cd - @@ -159,8 +167,8 @@ rec { src = fetchFromGitHub { owner = "docker"; repo = "cli"; - rev = "v${version}"; - sha256 = sha256; + rev = cliRev; + hash = cliHash; }; goPackagePath = "github.com/docker/cli"; @@ -192,7 +200,7 @@ rec { mkdir -p .gopath/src/github.com/docker/ ln -sf $PWD .gopath/src/github.com/docker/cli export GOPATH="$PWD/.gopath:$GOPATH" - export GITCOMMIT="${rev}" + export GITCOMMIT="${cliRev}" export VERSION="${version}" export BUILDTIME="1970-01-01T00:00:00Z" source ./scripts/build/.variables @@ -254,20 +262,16 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.21"; - rev = "v${version}"; - sha256 = "sha256-hPQ1t7L2fqoFWoinqIrDwFQ1bo9TzMb4l3HmAotIUS8="; - moby-src = fetchFromGitHub { - owner = "moby"; - repo = "moby"; - rev = "v${version}"; - sha256 = "sha256-BcYDh/UEmmURt7hWLWdPTKVu/Nzoeq/shE+HnUoh8b4="; - }; + version = "20.10.23"; + cliRev = "v${version}"; + cliHash = "sha256-fNaRpstyG90Jzq3+U2A42Jj+ixb+m7tXLioIcsegPbQ="; + mobyRev = "v${version}"; + mobyHash = "sha256-nBPw/M4VC9XeZ9S33HWdWSjY2J2mYpI/TPOzvLjSmJM="; runcRev = "v1.1.4"; - runcSha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA="; - containerdRev = "v1.6.9"; - containerdSha256 = "sha256-KvQdYQLzgt/MKPsA/mO5un6nE3/xcvVYwIveNn/uDnU="; + runcHash = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA="; + containerdRev = "v1.6.15"; + containerdHash = "sha256-Vlftq//mLYZPoT2R/lHJA6wLnqiuC+Cpy4lGQC8jCPA="; tiniRev = "v0.19.0"; - tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; } diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index d96277604b5f6..bbf20c6039f53 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/krunvm"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; + platforms = libkrun.meta.platforms; }; } diff --git a/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch b/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch new file mode 100644 index 0000000000000..85806bfcd8922 --- /dev/null +++ b/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch @@ -0,0 +1,12 @@ +diff --git a/meson.build b/meson.build +index d5c3627..2bd692a 100644 +--- a/meson.build ++++ b/meson.build +@@ -86,7 +86,7 @@ govirt_global_cflags = ['-std=c99', + '-Woverride-init', + '-Wno-unused-parameter'] + +-foreach arg : govirt_global_cflags ++foreach arg : compiler.get_supported_arguments(govirt_global_cflags) + add_project_arguments(arg, language : 'c') + endforeach diff --git a/pkgs/applications/virtualization/libgovirt/default.nix b/pkgs/applications/virtualization/libgovirt/default.nix index 0815781c21f7d..18d88b5468524 100644 --- a/pkgs/applications/virtualization/libgovirt/default.nix +++ b/pkgs/applications/virtualization/libgovirt/default.nix @@ -1,46 +1,48 @@ { lib , stdenv -, fetchurl -, glib +, fetchzip , gnome -, librest -, libsoup +, meson , pkg-config , gobject-introspection +, ninja +, glib +, librest_1_0 }: stdenv.mkDerivation rec { pname = "libgovirt"; - version = "0.3.8"; + version = "0.3.9"; outputs = [ "out" "dev" ]; - src = fetchurl { + src = fetchzip { url = "mirror://gnome/sources/libgovirt/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg="; + sha256 = "sha256-6RDuJTyaVYlO4Kq+niQyepom6xj1lqdBbyWL/VnZUdk="; }; - patches = lib.optionals stdenv.isDarwin [ - # The flag breaks the build on darwin and doesn't seem necessary - ./no-version-script-ld-flag.patch + patches = [ + # https://gitlab.gnome.org/GNOME/libgovirt/-/issues/9 + ./auto-disable-incompatible-compiler-warnings.patch ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (lib.concatStringsSep " " [ + "-Wno-typedef-redefinition" + "-Wno-missing-field-initializers" + "-Wno-cast-align" + ]); nativeBuildInputs = [ + meson pkg-config gobject-introspection - ]; - - buildInputs = [ - libsoup + ninja ]; propagatedBuildInputs = [ glib - librest + librest_1_0 ]; - enableParallelBuilding = true; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch b/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch deleted file mode 100644 index a837c3bf06421..0000000000000 --- a/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/govirt/Makefile.in -+++ b/govirt/Makefile.in -@@ -511,8 +511,7 @@ - libgovirt_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic \ -- -no-undefined \ -- -Wl,--version-script=$(srcdir)/govirt.sym -+ -no-undefined - - libgovirt_la_CFLAGS = \ - $(WARNINGFLAGS_C) - -Diff finished. Fri Oct 28 10:36:38 2022 diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix index d718c61066f2c..6cbed6f41f601 100644 --- a/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { HOME="$(mktemp -d)" ''; - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper removeReferencesTo ]; diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix new file mode 100644 index 0000000000000..86b49c5a1eb62 --- /dev/null +++ b/pkgs/applications/virtualization/lima/bin.nix @@ -0,0 +1,112 @@ +{ stdenvNoCC +, lib +, fetchurl +, writeScript +, installShellFiles +, qemu +, makeBinaryWrapper +, autoPatchelfHook +}: + +let + version = "0.14.2"; + + dist = { + aarch64-darwin = rec { + archSuffix = "Darwin-arm64"; + url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; + sha256 = "8334d83ca9555271b9843040066057dd8462a774f60dfaedbe97fae3834c3894"; + }; + + 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 = "3866113c92619f0041ff6fc68fef2bf16e751058b9237289b2bea8fb960bdab0"; + }; + + aarch64-linux = rec { + archSuffix = "Linux-aarch64"; + url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; + sha256 = "373be7ebcf5932570c384c6bfb159cd418011b98a18c26ba0467827dad302230"; + }; + + 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 = "44cae71eae65673afcc22c557f6385aa98792aecbb43195de48217581ae39143"; + }; + }; +in +stdenvNoCC.mkDerivation { + inherit version; + pname = "lima"; + src = fetchurl { + inherit (dist.${stdenvNoCC.hostPlatform.system} or + (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}")) url sha256; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ makeBinaryWrapper installShellFiles ] + ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r bin share $out + chmod +x $out/bin/limactl + wrapProgram $out/bin/limactl \ + --prefix PATH : ${lib.makeBinPath [ qemu ]} + installShellCompletion --cmd limactl \ + --bash <($out/bin/limactl completion bash) \ + --fish <($out/bin/limactl completion fish) \ + --zsh <($out/bin/limactl completion zsh) + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + USER=nix $out/bin/limactl validate $out/share/lima/examples/default.yaml + USER=nix $out/bin/limactl validate $out/share/lima/examples/experimental/vz.yaml + ''; + + # Stripping removes entitlements of the binary on Darwin making it non-operational. + # Therefore, disable stripping on Darwin. + dontStrip = stdenvNoCC.isDarwin; + + passthru.updateScript = + let + lima-bin = builtins.toString ./bin.nix; + in + writeScript "update-lima-bin.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl jq gawk + + set -eou pipefail + + LATEST_VERSION=$(curl -H "Accept: application/vnd.github+json" -Ls https://api.github.com/repos/lima-vm/lima/releases/latest | jq -r .tag_name | cut -c 2-) + curl -Ls -o SHA256SUMS https://github.com/lima-vm/lima/releases/download/v$LATEST_VERSION/SHA256SUMS + AARCH64_DARWIN_SHA256=$(cat SHA256SUMS | awk '/Darwin-arm64/{print $1}') + X86_64_DARWIN_SHA256=$(cat SHA256SUMS | awk '/Darwin-x86_64/{print $1}') + AARCH64_LINUX_SHA256=$(cat SHA256SUMS | awk '/Linux-aarch64/{print $1}') + X86_64_LINUX_SHA256=$(cat SHA256SUMS | awk '/Linux-x86_64/{print $1}') + + # reset version first so that all platforms are always updated and in sync + update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=aarch64-darwin + update-source-version lima-bin $LATEST_VERSION $AARCH64_DARWIN_SHA256 --file=${lima-bin} --system=aarch64-darwin + update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=x86_64-darwin + update-source-version lima-bin $LATEST_VERSION $X86_64_DARWIN_SHA256 --file=${lima-bin} --system=x86_64-darwin + update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=aarch64-linux + update-source-version lima-bin $LATEST_VERSION $AARCH64_LINUX_SHA256 --file=${lima-bin} --system=aarch64-linux + update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=x86_64-linux + update-source-version lima-bin $LATEST_VERSION $X86_64_LINUX_SHA256 --file=${lima-bin} --system=x86_64-linux + rm SHA256SUMS + ''; + + meta = with lib; { + homepage = "https://github.com/lima-vm/lima"; + description = "Linux virtual machines (on macOS, in most cases)"; + license = licenses.asl20; + maintainers = with maintainers; [ tricktron ]; + }; +} diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index c41779459454b..c8072c903d260 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.1.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SrNYvkJy97GwneA7UClNLaO0fd+ZiMSxCCSgqwESw5Y="; + sha256 = "sha256-v9ycluLfkrPDzjsMXtv7w9UHgMaGzTsJw4lT/KfRAu4="; }; - cargoHash = "sha256-S/V2PVkL9T/USXAzorDpo0nhRm9DOkNtfw5CADg4oKM="; + cargoHash = "sha256-wVQEa1qS+JF6PHKvRrRFbSvj2qp6j14ErOQPkxP0uuA="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index f6cc83fde17c4..287fa02df75fc 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -14,17 +14,61 @@ , go-md2man , nixosTests , python3 +, makeWrapper +, symlinkJoin +, extraPackages ? [ ] +, runc +, crun +, conmon +, slirp4netns +, fuse-overlayfs +, util-linux +, iptables +, iproute2 +, catatonit +, gvproxy +, aardvark-dns +, netavark +, testers +, podman }: +let + # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed + binPath = lib.makeBinPath ([ + ] ++ lib.optionals stdenv.isLinux [ + runc + crun + conmon + slirp4netns + fuse-overlayfs + util-linux + iptables + iproute2 + ] ++ extraPackages); + + helpersBin = symlinkJoin { + name = "podman-helper-binary-wrapper"; + + # this only works for some binaries, others may need to be be added to `binPath` or in the modules + paths = [ + gvproxy + ] ++ lib.optionals stdenv.isLinux [ + aardvark-dns + catatonit # added here for the pause image and also set in `containersConf` for `init_path` + netavark + ]; + }; +in buildGoModule rec { pname = "podman"; - version = "4.3.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-UOAQtGDoZe+Av4+9RQCJiV3//B/pdF0pEsca4FonGxY="; + hash = "sha256-337PFsPGm7pUgnFeNJKwT+/7AdbWSfCx4kXyAvHyWJQ="; }; patches = [ @@ -32,13 +76,13 @@ buildGoModule rec { ./rm-podman-mac-helper-msg.patch ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; - outputs = [ "out" "man" ] ++ lib.optionals stdenv.isLinux [ "rootlessport" ]; + outputs = [ "out" "man" ]; - nativeBuildInputs = [ pkg-config go-md2man installShellFiles python3 ]; + nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper python3 ]; buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs @@ -50,13 +94,16 @@ buildGoModule rec { systemd ]; + HELPER_BINARIES_DIR = "${PREFIX}/libexec/podman"; # used in buildPhase & installPhase + PREFIX = "${placeholder "out"}"; + buildPhase = '' runHook preBuild patchShebangs . ${if stdenv.isDarwin then '' make podman-remote # podman-mac-helper uses FHS paths '' else '' - make bin/podman bin/rootlessport + make bin/podman bin/rootlessport bin/quadlet ''} make docs runHook postBuild @@ -64,29 +111,30 @@ buildGoModule rec { installPhase = '' runHook preInstall - mkdir -p {$out/{bin,etc,lib,share},$man} # ensure paths exist for the wrapper ${if stdenv.isDarwin then '' - mv bin/{darwin/podman,podman} + install bin/darwin/podman -Dt $out/bin '' else '' - install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d - for s in contrib/systemd/**/*.in; do - substituteInPlace "$s" --replace "@@PODMAN@@" "podman" # don't use unwrapped binary - done - PREFIX=$out make install.systemd - install -Dm555 bin/rootlessport -t $rootlessport/bin + make install.bin install.systemd ''} - install -Dm555 bin/podman -t $out/bin - PREFIX=$out make install.completions - MANDIR=$man/share/man make install.man + make install.completions install.man + mkdir -p ${HELPER_BINARIES_DIR} + ln -s ${helpersBin}/bin/* ${HELPER_BINARIES_DIR} + wrapProgram $out/bin/podman \ + --prefix PATH : ${lib.escapeShellArg binPath} runHook postInstall ''; postFixup = lib.optionalString stdenv.isLinux '' - RPATH=$(patchelf --print-rpath $out/bin/podman) - patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/podman + RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped) + patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped ''; passthru.tests = { + version = testers.testVersion { + package = podman; + command = "HOME=$TMPDIR podman --version"; + }; + } // lib.optionalAttrs stdenv.isLinux { inherit (nixosTests) podman; # related modules inherit (nixosTests) 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 902a50e4ce24f..d1fe9bcc9b0ae 100644 --- a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -1,16 +1,16 @@ diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go -index a6907c0df..717d82ff3 100644 +index 4f25b4d26..8a79862fd 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go -@@ -1483,11 +1483,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward - case notInstalled: - fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n") - fmt.Printf("address can't be used by podman. ") -- if helper := findClaimHelper(); len(helper) > 0 { -- fmt.Printf("If you would like to install it run the\nfollowing commands:\n") -- fmt.Printf("\n\tsudo %s install\n", helper) -- fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix) -- } - case machineLocal: - fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n") - case claimUnsupported: +@@ -1509,11 +1509,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward + case notInstalled: + fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n") + fmt.Printf("address can't be used by podman. ") +- if helper := findClaimHelper(); len(helper) > 0 { +- fmt.Printf("If you would like to install it run the\nfollowing commands:\n") +- fmt.Printf("\n\tsudo %s install\n", helper) +- fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix) +- } + case machineLocal: + fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n") + case claimUnsupported: diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix deleted file mode 100644 index 7fe483a7079e5..0000000000000 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ podman-unwrapped -, runCommand -, makeWrapper -, symlinkJoin -, lib -, stdenv -, extraPackages ? [] -, runc # Default container runtime -, crun # Container runtime (default with cgroups v2 for podman/buildah) -, conmon # Container runtime monitor -, slirp4netns # User-mode networking for unprivileged namespaces -, fuse-overlayfs # CoW for images, much faster than default vfs -, util-linux # nsenter -, iptables -, iproute2 -, catatonit -, gvproxy -, aardvark-dns -, netavark -}: - -# do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed - -let - binPath = lib.makeBinPath ([ - ] ++ lib.optionals stdenv.isLinux [ - runc - crun - conmon - slirp4netns - fuse-overlayfs - util-linux - iptables - iproute2 - ] ++ extraPackages); - - helpersBin = symlinkJoin { - name = "${podman-unwrapped.pname}-helper-binary-wrapper-${podman-unwrapped.version}"; - - # this only works for some binaries, others may need to be be added to `binPath` or in the modules - paths = [ - gvproxy - ] ++ lib.optionals stdenv.isLinux [ - aardvark-dns - catatonit # added here for the pause image and also set in `containersConf` for `init_path` - netavark - podman-unwrapped.rootlessport - ]; - }; - -in runCommand podman-unwrapped.name { - name = "${podman-unwrapped.pname}-wrapper-${podman-unwrapped.version}"; - inherit (podman-unwrapped) pname version passthru; - - preferLocalBuild = true; - - meta = builtins.removeAttrs podman-unwrapped.meta [ "outputsToInstall" ]; - - outputs = [ - "out" - "man" - ]; - - nativeBuildInputs = [ - makeWrapper - ]; - -} '' - ln -s ${podman-unwrapped.man} $man - - mkdir -p $out/bin - ln -s ${podman-unwrapped}/etc $out/etc - ln -s ${podman-unwrapped}/lib $out/lib - ln -s ${podman-unwrapped}/share $out/share - makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ - --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \ - --prefix PATH : ${lib.escapeShellArg binPath} -'' diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 18472f03d850c..648183654701e 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { pname = "pods"; - version = "1.0.2"; + version = "1.0.5"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kjonyd0xL0QLjPS+U3xDC6AhOOxQmVAZ3STLXaa8eXc="; + sha256 = "sha256-V/4atbYG3jP0o1Bfn/dZBDXEk+Yi4cSJAY8HnTmpHRI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-K5oOpo3xJiNg7F549JLGs83658MYcoGfuIcNoF88Njc="; + sha256 = "sha256-gJZ3z6xDgWwOPjCLZg3LRMk3KoTXGaotXgO/xDUwAvk="; }; nativeBuildInputs = [ @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A podman desktop application"; homepage = "https://github.com/marhkb/pods"; + changelog = "https://github.com/marhkb/pods/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index e68cf7048b56a..c20a2c53d6002 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3, zlib, pkg-config, glib, buildPackages +{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , makeWrapper, runtimeShell, removeReferencesTo @@ -51,7 +51,13 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3.pkgs.sphinx python3.pkgs.sphinx-rtd-theme ] + nativeBuildInputs = [ + makeWrapper removeReferencesTo + pkg-config flex bison meson ninja perl + + # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation + python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme + ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; @@ -143,7 +149,6 @@ stdenv.mkDerivation rec { # have our patches and will be subtly broken because of that. "--meson=meson" "--cross-prefix=${stdenv.cc.targetPrefix}" - "--cpu=${stdenv.hostPlatform.uname.processor}" (lib.enableFeature guestAgentSupport "guest-agent") ] ++ lib.optional numaSupport "--enable-numa" ++ lib.optional seccompSupport "--enable-seccomp" diff --git a/pkgs/applications/virtualization/quickgui/default.nix b/pkgs/applications/virtualization/quickgui/default.nix new file mode 100644 index 0000000000000..9c4de021f2560 --- /dev/null +++ b/pkgs/applications/virtualization/quickgui/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, dpkg +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "quickgui"; + version = "1.2.8"; + + src = fetchurl { + url = "https://github.com/quickemu-project/quickgui/releases/download/v${version}/quickgui_${version}-1_lunar1.0_amd64.deb"; + sha256 = "sha256-crnV7OWH5UbkMM/TxTIOlXmvqBgjFmQG7RxameMOjH0="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; + + buildInputs = [ + wrapGAppsHook + ]; + + unpackCmd = "dpkg-deb -x $curSrc source"; + + installPhase = '' + runHook preInstall + + mv usr $out + substituteInPlace $out/share/applications/quickgui.desktop \ + --replace "/usr" $out + + runHook postInstall + ''; + + meta = { + description = "A Flutter frontend for quickemu"; + homepage = "https://github.com/quickemu-project/quickgui"; + changelog = "https://github.com/quickemu-project/quickgui/releases/tag/v${version}"; + maintainers = [ lib.maintainers.heyimnova ]; + platforms = lib.platforms.linux; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + mainProgram = "quickgui"; + }; +} diff --git a/pkgs/applications/virtualization/rvvm/default.nix b/pkgs/applications/virtualization/rvvm/default.nix new file mode 100644 index 0000000000000..54f3cf7700be8 --- /dev/null +++ b/pkgs/applications/virtualization/rvvm/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, SDL_compat }: + +stdenv.mkDerivation rec { + pname = "rvvm"; + version = "unstable-2023-01-25"; + + src = fetchFromGitHub { + owner = "LekKit"; + repo = "RVVM"; + rev = "4de27d7083db34bd074b4f056d6eb3871ccf5c10"; + sha256 = "sha256-FjEcXfweL6FzA6iLxl9XnKaD4Fh/wZuRTJzZzHkc/B4="; + }; + + buildInputs = [ SDL_compat ]; + + makeFlags = + [ "BUILDDIR=out" "BINARY=rvvm" "USE_SDL=1" "GIT_COMMIT=${src.rev}" "all" "lib" ] + # work around https://github.com/NixOS/nixpkgs/issues/19098 + ++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto"; + + installPhase = '' + runHook preInstall + + install -d $out/{bin,lib,include/devices} + install -m755 out/rvvm -t $out/bin + install -m755 out/librvvm.{a,so} -t $out/lib + install -m644 src/rvvmlib.h -t $out/include + install -m644 src/devices/*.h -t $out/include/devices + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/LekKit/RVVM"; + description = "The RISC-V Virtual Machine"; + license = with licenses; [ gpl3 /* or */ mpl20 ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ nebulka ]; + }; +} diff --git a/pkgs/applications/virtualization/sail-riscv/default.nix b/pkgs/applications/virtualization/sail-riscv/default.nix new file mode 100644 index 0000000000000..b952b0f189185 --- /dev/null +++ b/pkgs/applications/virtualization/sail-riscv/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchFromGitHub +, lib +, arch +, ocamlPackages +, ocaml +, zlib +, z3 +}: + + +stdenv.mkDerivation rec { + pname = "sail-riscv"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "riscv"; + repo = pname; + rev = version; + hash = "sha256-7PZNNUMaCZEBf0lOCqkquewRgZPooBOjIbGF7JlLnEo="; + }; + + nativeBuildInputs = with ocamlPackages; [ ocamlbuild findlib ocaml z3 sail ]; + buildInputs = with ocamlPackages; [ zlib linksem ]; + strictDeps = true; + + postPatch = '' + rm -r prover_snapshots + ''; + + makeFlags = [ + "SAIL=sail" + "ARCH=${arch}" + "SAIL_DIR=${ocamlPackages.sail}/share/sail" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp c_emulator/riscv_sim_${arch} $out/bin + mkdir $out/share/ + cp -r generated_definitions/{coq,hol4,isabelle} $out/share/ + + runHook postInstall + ''; + + + meta = with lib; { + homepage = "https://github.com/riscv/sail-riscv"; + description = "A formal specification of the RISC-V architecture, written in Sail"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix deleted file mode 100644 index 5ec5b19ce0426..0000000000000 --- a/pkgs/applications/virtualization/singularity/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, fetchurl -, util-linux -, gpgme -, openssl -, libuuid -, coreutils -, which -, makeWrapper -, cryptsetup -, squashfsTools -, buildGoPackage}: - -with lib; - -buildGoPackage rec { - pname = "singularity"; - version = "3.8.7"; - - src = fetchurl { - url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-Myny5YP4SoNDyywDgKHWy86vrn0eYztcvK33FD6shZs="; - }; - - goPackagePath = "github.com/sylabs/singularity"; - - buildInputs = [ gpgme openssl libuuid ]; - nativeBuildInputs = [ util-linux which makeWrapper cryptsetup ]; - propagatedBuildInputs = [ coreutils squashfsTools ]; - - postPatch = '' - substituteInPlace internal/pkg/build/files/copy.go \ - --replace /bin/cp ${coreutils}/bin/cp - ''; - - postConfigure = '' - cd go/src/github.com/sylabs/singularity - - patchShebangs . - sed -i 's|defaultPath := "[^"]*"|defaultPath := "${lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go - - ./mconfig -V ${version} -p $out --localstatedir=/var - - # Don't install SUID binaries - sed -i 's/-m 4755/-m 755/g' builddir/Makefile - ''; - - buildPhase = '' - runHook preBuild - make -C builddir - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - make -C builddir install LOCALSTATEDIR=$out/var - chmod 755 $out/libexec/singularity/bin/starter-suid - - # Explicitly configure paths in the config file - sed -i 's|^# mksquashfs path =.*$|mksquashfs path = ${lib.makeBinPath [squashfsTools]}/mksquashfs|' $out/etc/singularity/singularity.conf - sed -i 's|^# cryptsetup path =.*$|cryptsetup path = ${lib.makeBinPath [cryptsetup]}/cryptsetup|' $out/etc/singularity/singularity.conf - - runHook postInstall - ''; - - meta = with lib; { - homepage = "http://www.sylabs.io/"; - description = "Application containers for linux"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = [ maintainers.jbedo ]; - }; -} diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix new file mode 100644 index 0000000000000..f20735e45e3dc --- /dev/null +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -0,0 +1,238 @@ +# Configurations that should only be overrided by +# overrideAttrs +{ pname +, version +, src +, projectName # "apptainer" or "singularity" +, vendorHash ? null +, deleteVendor ? false +, proxyVendor ? false +, extraConfigureFlags ? [ ] +, extraDescription ? "" +, extraMeta ? { } +}: + +let + # Workaround for vendor-related attributes not overridable (#86349) + # should be removed when the issue is resolved + _defaultGoVendorArgs = { + inherit + vendorHash + deleteVendor + proxyVendor + ; + }; +in +{ lib +, buildGoModule +, runCommandLocal + # Native build inputs +, makeWrapper +, pkg-config +, util-linux +, which + # Build inputs +, bash +, conmon +, coreutils +, cryptsetup +, fakeroot +, go +, gpgme +, libseccomp +, libuuid + # This is for nvidia-container-cli +, nvidia-docker +, openssl +, squashfsTools +, squashfuse + # Overridable configurations +, enableNvidiaContainerCli ? true + # Compile with seccomp support + # SingularityCE 3.10.0 and above requires explicit --without-seccomp when libseccomp is not available. +, enableSeccomp ? true + # Whether the configure script treat SUID support as default + # When equal to enableSuid, it supress the --with-suid / --without-suid build flag + # It can be set to `null` to always pass either --with-suid or --without-suided + # Type: null or boolean +, defaultToSuid ? true + # Whether to compile with SUID support +, enableSuid ? false +, starterSuidPath ? null + # newuidmapPath and newgidmapPath are to support --fakeroot + # where those SUID-ed executables are unavailable from the FHS system PATH. + # Path to SUID-ed newuidmap executable +, newuidmapPath ? null + # Path to SUID-ed newgidmap executable +, newgidmapPath ? null + # Remove the symlinks to `singularity*` when projectName != "singularity" +, removeCompat ? false + # Workaround #86349 + # should be removed when the issue is resolved +, vendorHash ? _defaultGoVendorArgs.vendorHash +, deleteVendor ? _defaultGoVendorArgs.deleteVendor +, proxyVendor ? _defaultGoVendorArgs.proxyVendor +}: + +let + defaultPathOriginal = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"; + privileged-un-utils = if ((isNull newuidmapPath) && (isNull newgidmapPath)) then null else + (runCommandLocal "privileged-un-utils" { } '' + mkdir -p "$out/bin" + ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap" + ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap" + ''); +in +buildGoModule { + inherit pname version src; + + # Override vendorHash with the output got from + # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).go-modules" + # or with `null` when using vendored source tarball. + inherit vendorHash deleteVendor proxyVendor; + + # go is used to compile extensions when building container images + allowGoReference = true; + + strictDeps = true; + + passthru = { + inherit + enableSeccomp + enableSuid + projectName + removeCompat + starterSuidPath + ; + }; + + nativeBuildInputs = [ + makeWrapper + pkg-config + util-linux + which + ]; + + buildInputs = [ + bash # To patch /bin/sh shebangs. + conmon + cryptsetup + gpgme + libuuid + openssl + squashfsTools + squashfuse + ] + ++ lib.optional enableNvidiaContainerCli nvidia-docker + ++ lib.optional enableSeccomp libseccomp + ; + + configureScript = "./mconfig"; + + configureFlags = [ + "--localstatedir=/var/lib" + "--runstatedir=/var/run" + ] + ++ lib.optional (!enableSeccomp) "--without-seccomp" + ++ lib.optional (enableSuid != defaultToSuid) (if enableSuid then "--with-suid" else "--without-suid") + ++ extraConfigureFlags + ; + + # Packages to prefix to the Apptainer/Singularity container runtime default PATH + # Use overrideAttrs to override + defaultPathInputs = [ + bash + coreutils + cryptsetup # cryptsetup + go + privileged-un-utils + squashfsTools # mksquashfs unsquashfs # Make / unpack squashfs image + squashfuse # squashfuse_ll squashfuse # Mount (without unpacking) a squashfs image without privileges + ] + ++ lib.optional enableNvidiaContainerCli nvidia-docker + ; + + postPatch = '' + if [[ ! -e .git || ! -e VERSION ]]; then + echo "${version}" > VERSION + fi + # Patch shebangs for script run during build + patchShebangs --build "$configureScript" makeit e2e scripts mlocal/scripts + # Patching the hard-coded defaultPath by prefixing the packages in defaultPathInputs + substituteInPlace cmd/internal/cli/actions.go \ + --replace "defaultPath = \"${defaultPathOriginal}\"" "defaultPath = \"''${defaultPathInputs// /\/bin:}''${defaultPathInputs:+/bin:}${defaultPathOriginal}\"" + ''; + + postConfigure = '' + # Code borrowed from pkgs/stdenv/generic/setup.sh configurePhase() + + # set to empty if unset + : ''${configureFlags=} + + # shellcheck disable=SC2086 + $configureScript -V ${version} "''${prefixKey:---prefix=}$prefix" $configureFlags "''${configureFlagsArray[@]}" + + # End of the code from pkgs/stdenv/generic/setup.sh configurPhase() + ''; + + buildPhase = '' + runHook preBuild + make -C builddir -j"$NIX_BUILD_CORES" + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + make -C builddir install LOCALSTATEDIR="$out/var/lib" + runHook postInstall + ''; + + postFixup = '' + substituteInPlace "$out/bin/run-singularity" \ + --replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}" + wrapProgram "$out/bin/${projectName}" \ + --prefix PATH : "${lib.makeBinPath [ + fakeroot + squashfsTools # Singularity (but not Apptainer) expects unsquashfs from the host PATH + ]}" + # Make changes in the config file + ${lib.optionalString enableNvidiaContainerCli '' + substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ + --replace "use nvidia-container-cli = no" "use nvidia-container-cli = yes" + ''} + ${lib.optionalString (removeCompat && (projectName != "singularity")) '' + unlink "$out/bin/singularity" + for file in "$out"/share/man/man?/singularity*.gz; do + if [[ -L "$file" ]]; then + unlink "$file" + fi + done + for file in "$out"/share/*-completion/completions/singularity; do + if [[ -e "$file" ]] + rm "$file" + done + ''} + ${lib.optionalString enableSuid (lib.warnIf (isNull starterSuidPath) "${projectName}: Null starterSuidPath when enableSuid produces non-SUID-ed starter-suid and run-time permission denial." '' + chmod +x $out/libexec/${projectName}/bin/starter-suid + '')} + ${lib.optionalString (enableSuid && !isNull starterSuidPath) '' + mv "$out"/libexec/${projectName}/bin/starter-suid{,.orig} + ln -s ${lib.escapeShellArg starterSuidPath} "$out/libexec/${projectName}/bin/starter-suid" + ''} + ''; + + meta = with lib; { + description = "Application containers for linux" + extraDescription; + longDescription = '' + Singularity (the upstream) renamed themselves to Apptainer + to distinguish themselves from a fork made by Sylabs Inc.. See + + https://sylabs.io/2021/05/singularity-community-edition + https://apptainer.org/news/community-announcement-20211130 + ''; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ jbedo ShamrockLee ]; + mainProgram = projectName; + } // extraMeta; +} diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix new file mode 100644 index 0000000000000..a21066d775746 --- /dev/null +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -0,0 +1,92 @@ +{ callPackage +, fetchFromGitHub +, nixos +, conmon +}: +let + apptainer = callPackage + (import ./generic.nix rec { + pname = "apptainer"; + version = "1.1.5"; + projectName = "apptainer"; + + src = fetchFromGitHub { + owner = "apptainer"; + repo = "apptainer"; + rev = "v${version}"; + hash = "sha256-onJkpHJNsO0cQO2m+TmdMuMkuvH178mDhOeX41bYFic="; + }; + + # Update by running + # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).go-modules" + # at the root directory of the Nixpkgs repository + vendorHash = "sha256-tAnh7A8Lw5KtY7hq+sqHMEUlgXvgeeCKKIfRZFoRtug="; + + extraDescription = " (previously known as Singularity)"; + extraMeta.homepage = "https://apptainer.org"; + }) + { + # Apptainer doesn't depend on conmon + conmon = null; + + # Apptainer builders require explicit --with-suid / --without-suid flag + # when building on a system with disabled unprivileged namespace. + # See https://github.com/NixOS/nixpkgs/pull/215690#issuecomment-1426954601 + defaultToSuid = null; + }; + + singularity = callPackage + (import ./generic.nix rec { + pname = "singularity-ce"; + version = "3.10.4"; + projectName = "singularity"; + + src = fetchFromGitHub { + owner = "sylabs"; + repo = "singularity"; + rev = "v${version}"; + hash = "sha256-bUnQXQVwaVA3Lkw3X9TBWqNBgiPxAVCHnkq0vc+CIsM="; + }; + + # Update by running + # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).go-modules" + # at the root directory of the Nixpkgs repository + vendorHash = "sha256-K8helLcOuz3E4LzBE9y3pnZqwdwhO/iMPTN1o22ipVg="; + + # Do not build conmon from the Git submodule source, + # Use Nixpkgs provided version + extraConfigureFlags = [ + "--without-conmon" + ]; + + extraDescription = " (Sylabs Inc's fork of Singularity, a.k.a. SingularityCE)"; + extraMeta.homepage = "https://sylabs.io/"; + }) + { + defaultToSuid = true; + }; + + genOverridenNixos = package: packageName: (nixos { + programs.singularity = { + enable = true; + inherit package; + }; + }).config.programs.singularity.packageOverriden.overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { + description = ""; + longDescription = '' + This package produces identical store derivations to `pkgs.${packageName}` + overriden and installed by the NixOS module `programs.singularity` + with default configuration. + + This is for binary substitutes only. Use pkgs.${packageName} instead. + ''; + }; + }); +in +{ + inherit apptainer singularity; + + apptainer-overriden-nixos = genOverridenNixos apptainer "apptainer"; + singularity-overriden-nixos = genOverridenNixos singularity "singularity"; +} diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 2b27e3a7875a2..5390a4fb6625d 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # FIXME: May no longer be needed with spice-vdagent versions over 0.21.0 - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index 76668301c6bbf..2df0978b0d0aa 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postPatch = "sed -i /tini-static/d CMakeLists.txt"; - NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; + env.NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index 1c648b25ddb02..dc6f79d6a7e55 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -10,18 +10,20 @@ stdenv.mkDerivation rec { hash = "sha256-IKIkqzx7YWki0L6D5WbwQiVWJfDFGdI2nsGgg212CcE="; }; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook pkg-config getopt + ocamlPackages.ocaml + ocamlPackages.findlib ]; - buildInputs = with ocamlPackages; [ + ocamlPackages.ocaml calendar curses - findlib gettext-stub - ocaml ocaml_libvirt ] ++ [ libxml2 ]; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 2e8aa34286a6f..0e24dd9b08f2e 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -3,14 +3,20 @@ , bash-completion , fetchurl , fetchpatch -, gdbm ? null +, gdbm , glib , gsettings-desktop-schemas , gtk-vnc , gtk3 , intltool -, libcap ? null +, libcap , libgovirt + # Currently unsupported. According to upstream, libgovirt is for a very narrow + # use-case and we don't currently cover it in Nixpkgs. It's safe to disable. + # https://gitlab.com/virt-viewer/virt-viewer/-/issues/100#note_1265011223 + # Can be enabled again once this is merged: + # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/129 +, ovirtSupport ? false , libvirt , libvirt-glib , libxml2 @@ -19,21 +25,13 @@ , pkg-config , python3 , shared-mime-info -# https://gitlab.com/virt-viewer/virt-viewer/-/issues/88 -, spice-gtk_libsoup2 ? null -, spice-protocol ? null +, spice-gtk +, spice-protocol , spiceSupport ? true , vte , wrapGAppsHook }: -assert spiceSupport -> ( - gdbm != null - && (stdenv.isLinux -> libcap != null) - && spice-gtk_libsoup2 != null - && spice-protocol != null -); - with lib; stdenv.mkDerivation rec { @@ -46,10 +44,10 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix build with meson 0.61 - # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117 + # Fix build with meson 0.61. Should be fixed in the next release. + # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/120 (fetchpatch { - url = "https://gitlab.com/virt-viewer/virt-viewer/-/commit/ed19e51407bee53988878a6ebed4e7279d00b1a1.patch"; + url = "https://gitlab.com/virt-viewer/virt-viewer/-/commit/98d9f202ef768f22ae21b5c43a080a1aa64a7107.patch"; sha256 = "sha256-3AbnkbhWOh0aNjUkmVoSV/9jFQtvTllOr7plnkntb2o="; }) ]; @@ -71,21 +69,26 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk-vnc gtk3 - libgovirt libvirt libvirt-glib libxml2 vte + ] ++ optionals ovirtSupport [ + libgovirt ] ++ optionals spiceSupport ([ gdbm - spice-gtk_libsoup2 + spice-gtk spice-protocol ] ++ optionals stdenv.isLinux [ libcap ]); # Required for USB redirection PolicyKit rules file - propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2; + propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + + mesonFlags = [ + (lib.mesonEnable "ovirt" ovirtSupport) + ]; strictDeps = true; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index d6531452c760f..1ff7f0abebaa4 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ cdrkit ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index cb91d8505633e..57fd03361305d 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -148,7 +148,7 @@ callPackage (import ./generic.nix (rec { ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString [ # Fix build on Glibc 2.24. "-Wno-error=deprecated-declarations" # Fix build with GCC 8 diff --git a/pkgs/applications/window-managers/cardboard/default.nix b/pkgs/applications/window-managers/cardboard/default.nix index 5347b0961a540..115ab3d53e04b 100644 --- a/pkgs/applications/window-managers/cardboard/default.nix +++ b/pkgs/applications/window-managers/cardboard/default.nix @@ -99,6 +99,8 @@ stdenv.mkDerivation rec { cp -r ${expected-wrap} ${expected-wrap.name} cp -r ${wlroots-wrap} ${wlroots-wrap.name} ) + + sed '1i#include <functional>' -i cardboard/ViewAnimation.h # gcc12 ''; # "Inherited" from Nixpkgs expression for wlroots @@ -108,6 +110,8 @@ stdenv.mkDerivation rec { "-Dwlroots:libseat=disabled" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ]; # gcc12 + meta = with lib; { homepage = "https://gitlab.com/cardboardwm/cardboard"; description = "A scrollable, tiling Wayland compositor inspired on PaperWM"; diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 95170b79326de..6e2e45e8b9a67 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -1,36 +1,42 @@ { lib , stdenv , fetchFromGitHub +, installShellFiles +, libX11 , libinput , libxcb , libxkbcommon , pixman , pkg-config +, substituteAll , wayland , wayland-protocols -, wlroots +, wlroots_0_16 , writeText -, enable-xwayland ? true, xwayland, libX11 +, xcbutilwm +, xwayland +, enableXWayland ? true , conf ? null -, patches ? [ ] }: let - totalPatches = patches ++ [ ]; + wlroots = wlroots_0_16; in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "dwl"; - version = "0.3.1"; + version = "0.4"; src = fetchFromGitHub { owner = "djpohly"; - repo = pname; - rev = "v${version}"; - hash = "sha256-VHxBjjnzJNmtJxrm3ywJzvt2bNHGk/Cx8TICw6SaoiQ="; + repo = "dwl"; + rev = "v${self.version}"; + hash = "sha256-OW7K7yMYSzqZWpQ9Vmpy8EgdWvyv3q1uh8A40f6AQF4="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; buildInputs = [ libinput @@ -40,18 +46,13 @@ stdenv.mkDerivation rec { wayland wayland-protocols wlroots - ] ++ lib.optionals enable-xwayland [ + ] ++ lib.optionals enableXWayland [ libX11 + xcbutilwm xwayland ]; - # Allow users to set their own list of patches - patches = totalPatches; - - # Last line of config.mk enables XWayland - prePatch = lib.optionalString enable-xwayland '' - sed -i -e '$ s|^#||' config.mk - ''; + outputs = [ "out" "man" ]; # Allow users to set an alternative config.def.h postPatch = let @@ -60,21 +61,19 @@ stdenv.mkDerivation rec { else writeText "config.def.h" conf; in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; - NIX_CFLAGS_COMPILE = [ - # https://github.com/djpohly/dwl/issues/186 - "-Wno-error=unused-result" - ]; - - dontConfigure = true; - - installPhase = '' - runHook preInstall - install -d $out/bin - install -m755 dwl $out/bin - runHook postInstall + preBuild = '' + makeFlagsArray+=( + XWAYLAND=${lib.optionalString enableXWayland "-DXWAYLAND"} + XLIBS=${lib.optionalString enableXWayland "xcb\\ xcb-icccm"} + ) ''; - meta = with lib; { + installFlags = [ + "PREFIX=$(out)" + "MANDIR=$(man)/share/man/man1" + ]; + + meta = { homepage = "https://github.com/djpohly/dwl/"; description = "Dynamic window manager for Wayland"; longDescription = '' @@ -88,9 +87,10 @@ stdenv.mkDerivation rec { - Limited to 2000 SLOC to promote hackability - Tied to as few external dependencies as possible ''; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; + changelog = "https://github.com/djpohly/dwl/releases/tag/v${self.version}"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.AndersonTorres ]; inherit (wayland.meta) platforms; }; -} +}) # TODO: custom patches from upstream website diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 6dc22a664d3dc..d056005e8f523 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: plugin.o:(.bss+0x0): multiple definition of `stam'; panel.o:(.bss+0x20): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS="-lX11"; meta = with lib; { diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index ed6b9fd4aac73..f1d7c585c4430 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -77,10 +77,9 @@ stdenv.mkDerivation rec { pytestFlagsArray = [ "../tests" ]; disabledTests = [ - "test_title_different_letters_are_drawn" # font problems - "test_completable_commands" # font problems "test_autostart" # $PATH problems "test_wmexec_to_other" # timeouts in sandbox + "test_rules" # timeouts ]; passthru = { diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix index 2485552fce6ea..1450807c6709f 100644 --- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # src/ewmh/ewmh.cpp:67:28: error: non-constant-expression cannot be narrowed from type 'int' to 'uint32_t' (aka 'unsigned int') in initializer list - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-c++11-narrowing"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-c++11-narrowing"; installPhase = '' runHook preInstall diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index ec2e03de0f8ee..1c06fc2ae28d2 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "wmfocus"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HrS+C/6KDG2Rn/3u/mMmp4vzQ5YAHUFL4HFecteuzsc="; + sha256 = "sha256-zXqPZORwi7X1wBTecPg9nOCvRHWNTtloCpgbPwtFhzo="; }; - cargoSha256 = "sha256-EzgYnfUgwK2ldzrlqe9N9jeGgK+RzQPjbOjJCGEkcwE="; + cargoHash = "sha256-4eoV/viI7Q7I7mIqcHVAyPf/y2RWaWX0B+mLZWMEbcI="; nativeBuildInputs = [ python3 pkg-config ]; buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index ad2ed5bf34617..52a213cda86fe 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-Zl7ob0JcFN8sl8Zuf2aB7l7q3W8GmvVBoI1W3aLLXfU="; + hash = "sha256-2gEZRkym21X4rvj6kzZh9WChZUkfqgS1wiWh7LBioZM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/katriawm/default.nix b/pkgs/applications/window-managers/katriawm/default.nix index 61a82f526d9eb..4c75b082506d4 100644 --- a/pkgs/applications/window-managers/katriawm/default.nix +++ b/pkgs/applications/window-managers/katriawm/default.nix @@ -7,14 +7,14 @@ , pkg-config }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "katriawm"; - version = "21.09"; + version = "22.12"; src = fetchzip { - name = finalAttrs.pname + "-" + finalAttrs.version; - url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz"; - hash = "sha256-xt0sWEwTcCs5cwoB3wVbYcyAKL0jx7KyeCefEBVFhH8="; + name = self.pname + "-" + self.version; + url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${self.version}.tar.gz"; + hash = "sha256-xFKr4PxqvnQEAWplhRsaL5rhmSJpnImpk1eXFX0N1tc="; }; nativeBuildInputs = [ @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { installFlags = [ "prefix=$(out)" ]; - meta = with lib; { + meta = { homepage = "https://www.uninformativ.de/git/katriawm/file/README.html"; description = "A non-reparenting, dynamic window manager with decorations"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.AndersonTorres ]; inherit (libX11.meta) platforms; }; }) diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index 8bd0691450c74..adf3facb99b22 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -23,15 +23,15 @@ let wlroots = wlroots_0_16; in -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "labwc"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; - rev = finalAttrs.version; - hash = "sha256-P1hKYTW++dpV3kdmI5nBGun080gVTrKzi2WOJKR84j4="; + rev = self.version; + hash = "sha256-PfvtNbSAz1vt0+ko4zRPyRRN+lhQoA2kJ2xoJy5o4So="; }; nativeBuildInputs = [ @@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/labwc/labwc"; description = "A Wayland stacking compositor, similar to Openbox"; + changelog = "https://raw.githubusercontent.com/labwc/labwc/${self.version}/NEWS.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; diff --git a/pkgs/applications/window-managers/leftwm/0001-patch-version.patch b/pkgs/applications/window-managers/leftwm/0001-patch-version.patch new file mode 100644 index 0000000000000..8c28f0c22abee --- /dev/null +++ b/pkgs/applications/window-managers/leftwm/0001-patch-version.patch @@ -0,0 +1,22 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ac3125a..c02b11d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -431,7 +431,7 @@ dependencies = [ + + [[package]] + name = "leftwm" +-version = "0.4.0" ++version = "0.4.1" + dependencies = [ + "anyhow", + "clap", +@@ -467,7 +467,7 @@ dependencies = [ + + [[package]] + name = "leftwm-core" +-version = "0.4.0" ++version = "0.4.1" + dependencies = [ + "dirs-next", + "futures", diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index fe3e46f7b47a6..70d7476432a28 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,20 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "sha256-4f9YOVkOXn7+TzTUZS2Lultgj9WhiOPUa/fHUeyLBUU="; + sha256 = "sha256-ZAlX8Vu4JAwQlwBOHT435Bz3g3qqK5ePm9v0cDqP8Q4="; }; - cargoSha256 = "sha256-D00IFTELRlqeKQ7zheJKTvu5FBgYQXsZ+OnPnVzweC4="; + cargoSha256 = "sha256-nn/P9ZZNf1Zts4JiJ2kXWAAG/HT1GnlYHXcPijYiBlU="; + + cargoPatches = [ + ./0001-patch-version.patch + ]; buildInputs = rpathLibs; @@ -33,7 +37,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/leftwm/leftwm"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ yanganto ]; changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG"; }; } diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix new file mode 100644 index 0000000000000..fd3e82e43aa50 --- /dev/null +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -0,0 +1,71 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, nixosTests +, cmake +, pkg-config +, mir +, libxkbcommon +}: + +stdenv.mkDerivation rec { + pname = "miriway"; + version = "unstable-2023-02-18"; + + src = fetchFromGitHub { + owner = "Miriway"; + repo = "Miriway"; + rev = "1363ae0452c5093f84418bc65354e93796caec65"; + hash = "sha256-hQ2z3GlTJG9qewJLkPpoRMSn0D7xCLyl+1O+G4NnedA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + mir + libxkbcommon + ]; + + passthru = { + updateScript = unstableGitUpdater { }; + providedSessions = [ "miriway" ]; + tests = { + inherit (nixosTests) miriway; + }; + }; + + meta = with lib; { + description = "Mir based Wayland compositor"; + longDescription = '' + Miriway is a starting point for creating a Wayland based desktop environment using Mir. + + At the core of Miriway is miriway-shell, a Mir based Wayland compositor that provides: + + - A "floating windows" window managament policy; + - Support for Wayland (and via Xwayland) X11 applications; + - Dynamic workspaces; + - Additional Wayland support for "shell components" such as panels and docs; and, + - Configurable shortcuts for launching standard apps such as launcher and terminal emulator. + + In addition to miriway-shell, Miriway has: + + - A "terminal emulator finder" script miriway-terminal, that works with most terminal emulators; + - A launch script miriway to simplify starting Miriway; + - A default configuration file miriway-shell.config; and, + - A greeter configuration miriway.desktop so Miriway can be selected at login + + Miriway has been tested with shell components from several desktop environments and there are notes on + enabling these in miriway-shell.config. + ''; + homepage = "https://github.com/Miriway/Miriway"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index fc25171076709..fdd9604f7c796 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: workspaces.o:src/keyboard.h:93: multiple definition of # `NumLockMask'; client.o:src/keyboard.h:93: first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { homepage = "https://web.archive.org/web/20191129172107/https://www.oroborus.org/"; diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index 6f1a37f9379a1..f2d0e1d484d76 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -16,15 +16,15 @@ , pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "pekwm"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "pekdon"; repo = "pekwm"; - rev = "release-${version}"; - hash= "sha256-voHPstdcd4CHnAdD3PMxca0A6MyMYJi8Ik0UlFB0vG0="; + rev = "release-${self.version}"; + hash= "sha256-hA+TBAs9NMcc5DKIkzyUHWck3Xht+yeCO54xJ6oXXuQ="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libpng ]; - meta = with lib; { + meta = { homepage = "https://www.pekwm.se/"; description = "A lightweight window manager"; longDescription = '' @@ -65,8 +65,9 @@ stdenv.mkDerivation rec { they should when starting applications. - Chainable Keygrabber, usability for everyone. ''; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${self.version}/NEWS.md"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 7a10bf4cfaefc..439030f34da3c 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "0.2.1"; + version = "0.2.4"; src = fetchFromGitHub { owner = "riverwm"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eIW8NNhacAM/7gZCUHCmiySANLenfcaCRTUkoJUZRPQ="; + hash = "sha256-cIcO6owM6eYn+obYVaBOVQpnBx4++KOqQk5Hzo3GcNs="; fetchSubmodules = true; }; @@ -65,10 +65,11 @@ stdenv.mkDerivation rec { passthru.providedSessions = ["river"]; meta = with lib; { + changelog = "https://github.com/ifreund/river/releases/tag/v${version}"; homepage = "https://github.com/ifreund/river"; description = "A dynamic tiling wayland compositor"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k adamcstephens ]; + maintainers = with maintainers; [ fortuneteller2k adamcstephens rodrgz ]; }; } diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 6cfc55240222a..32c8cf1b86a38 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -22,13 +22,13 @@ let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in stdenv.mkDerivation rec { pname = "sway-unwrapped"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - hash = "sha256-r5qf50YK0Wl0gFiFdSE/J6ZU+D/Cz32u1mKzOqnIuJ0="; + hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g="; }; patches = [ diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index b7e07444a06be..c3058294ca55c 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "swaylock-effects"; - version = "1.6.10"; + version = "1.6.11"; src = fetchFromGitHub { owner = "jirutka"; repo = "swaylock-effects"; rev = "v${version}"; - sha256 = "sha256-VkyH9XN/pR1UY/liG5ygDHp+ymdqCPeWHyU7/teJGbU="; + sha256 = "sha256-MKmWVYssO9HAcP5uqwpy9kDa6/kfZyV2NI7ibozt7Ug="; }; postPatch = '' diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 30e43fa0c902a..20a7a5ed7fe08 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.7"; + version = "1.7.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; - rev = version; - hash = "sha256-xbcVsnE0DecC+g49NOBNpqPl5JTtuxUUc7KinKhi5TE="; + rev = "v${version}"; + hash = "sha256-ZsOLDqmkyhel8QAezdVZ51utruJrBZWqaZ7NzimXWQ4="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix b/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix index 1aa3dace78523..36cfdcfaed33c 100644 --- a/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix +++ b/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swayest-workstyle"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Lyr-7D1h"; repo = "swayest_workstyle"; rev = version; - sha256 = "sha256-LciTrYbmJV0y0H6QH88vTBXbDdDSx6FQtO4J/CFLjtY="; + sha256 = "sha256-C2Nz6fBwaj+cOxIfoBu+9T+CoJ5Spc1TAJcQWdIF/+I="; }; - cargoSha256 = "sha256-34Ij3Hd1JI6d1vhv1XomFc9SFoB/6pbS39upLk+NeQM="; + cargoHash = "sha256-6pAlJmpyv2a1XCZQLOYilxJAGPbPmkEz1ynTLa0RjE0="; doCheck = false; # No tests diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index fb57c0a73c2a2..9886fc97af149 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { sha256 = "078y14ff9wmmbzq314f7bq1bxx0rc12xy4j362n60iamr56qs4x6"; }; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix index 225e44c21cedb..5c68a39a1ead5 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { export sourceRoot=$(echo */${pname}/wmsm) ''; - NIX_CFLAGS_COMPILE = "-std=gnu89"; + env.NIX_CFLAGS_COMPILE = "-std=gnu89"; postPatch = '' substituteInPlace Makefile \ diff --git a/pkgs/applications/window-managers/yeahwm/default.nix b/pkgs/applications/window-managers/yeahwm/default.nix index 25a25a06ad9ed..f1a6635b362a2 100644 --- a/pkgs/applications/window-managers/yeahwm/default.nix +++ b/pkgs/applications/window-managers/yeahwm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: screen.o:(.bss+0x40): multiple definition of `fg'; client.o:(.bss+0x40): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon"; postInstall = '' gzip -9 --stdout yeahwm.1 > yeahwm.1.gz |