diff options
Diffstat (limited to 'pkgs/applications')
617 files changed, 15029 insertions, 5468 deletions
diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index 9e18904ff6596..815b956da8e12 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config , glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook -, libX11, libXtst, libXfixes, libXcursor +, xorg }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 gsettings-desktop-schemas - libX11 libXtst libXfixes libXcursor + xorg.libX11 xorg.libXtst xorg.libXfixes xorg.libXcursor ]; passthru = { diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/applications/accessibility/wvkbd/default.nix index e44b68f966ddf..44a6025761362 100644 --- a/pkgs/applications/accessibility/wvkbd/default.nix +++ b/pkgs/applications/accessibility/wvkbd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "jjsullivan5196"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h/hXHQfLiDkVKYZFsjyq2+w1Pnn3lR6H+r+fXYkP5ZY="; + sha256 = "sha256-rMaJzePtT7K0X9o9/yT1hfKIo07W2CLEZKqHwfCLQBE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index eafbfec966482..08ef2d0830887 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 +{ lib, stdenv, fetchFromGitHub, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 , python3Packages , meson, ninja }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix index 7b209994103ec..acd8bf1f74f0b 100644 --- a/pkgs/applications/audio/ams/default.nix +++ b/pkgs/applications/audio/ams/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchgit -, automake , alsa-lib , ladspaH , libjack2 diff --git a/pkgs/applications/audio/apple-music-electron/default.nix b/pkgs/applications/audio/apple-music-electron/default.nix deleted file mode 100644 index 850f644afc34e..0000000000000 --- a/pkgs/applications/audio/apple-music-electron/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ appimageTools, lib, fetchurl }: -let - pname = "apple-music-electron"; - version = "1.5.5"; - name = "Apple.Music-${version}"; - - src = fetchurl { - url = "https://github.com/cryptofyre/Apple-Music-Electron/releases/download/v${version}/${name}.AppImage"; - sha256 = "1gb6j3nvam9fcpsgiv56jccg9a4y14vzsyw11h3hckaigy90knpx"; - }; - - appimageContents = appimageTools.extract { inherit name src; }; -in appimageTools.wrapType2 { - inherit name src; - - extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; - - meta = with lib; { - description = "Unofficial Apple Music application without having to bother with a Web Browser or iTunes"; - homepage = "https://github.com/iiFir3z/Apple-Music-Electron"; - license = licenses.mit; - maintainers = [ maintainers.ivar ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 953e9887f5a6e..733368c115c4c 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -13,6 +13,7 @@ , libjack2 , lv2 , lilv +, mpg123 , serd , sord , sqlite @@ -45,52 +46,36 @@ , libsepol , libxkbcommon , util-linux -, wxGTK +, wavpack +, wxGTK32 +, gtk3 , libpng , libjpeg -, AppKit ? null -, AudioToolbox ? null -, AudioUnit ? null -, Carbon ? null -, Cocoa ? null -, CoreAudio ? null -, CoreAudioKit ? null -, CoreServices ? null -, wxmac +, AppKit +, AudioToolbox +, AudioUnit +, Carbon +, CoreAudio +, CoreAudioKit +, CoreServices }: # TODO -# 1. as of 3.0.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions -# 2. detach sbsms +# 1. detach sbsms let inherit (lib) optionals; pname = "audacity"; - version = "3.1.3"; - - wxWidgets_src = fetchFromGitHub { - owner = pname; - repo = "wxWidgets"; - rev = "v${version}-${pname}"; - sha256 = "sha256-KrmYYv23DHBYKIuxMYBioCQ2e4KWdgmuREnimtm0XNU="; - fetchSubmodules = true; - }; - - wxGTK' = wxGTK.overrideAttrs (oldAttrs: rec { - src = wxWidgets_src; - }); - - wxmac' = wxmac.overrideAttrs (oldAttrs: rec { - src = wxWidgets_src; - }); -in stdenv.mkDerivation rec { + version = "3.2.1"; +in +stdenv.mkDerivation rec { inherit pname version; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Audacity-${version}"; - sha256 = "sha256-sdI4paxIHDZgoWTCekjrkFR4JFpQC6OatcnJdVXCCZk="; + sha256 = "sha256-7rfttp9LnfM2LBT5seupPyDckS7LEzWDZoqtLsGgqgI="; }; postPatch = '' @@ -105,9 +90,9 @@ in stdenv.mkDerivation rec { gettext pkg-config python3 + makeWrapper ] ++ optionals stdenv.isLinux [ linuxHeaders - makeWrapper ]; buildInputs = [ @@ -115,6 +100,7 @@ in stdenv.mkDerivation rec { ffmpeg_4 file flac + gtk3 lame libid3tag libjack2 @@ -125,6 +111,7 @@ in stdenv.mkDerivation rec { libvorbis lilv lv2 + mpg123 pcre portmidi serd @@ -136,6 +123,8 @@ in stdenv.mkDerivation rec { suil twolame portaudio + wavpack + wxGTK32 ] ++ optionals stdenv.isLinux [ alsa-lib # for portaudio at-spi2-core @@ -149,12 +138,8 @@ in stdenv.mkDerivation rec { libsepol libuuid util-linux - wxGTK' - wxGTK'.gtk ] ++ optionals stdenv.isDarwin [ - wxmac' AppKit - Cocoa CoreAudioKit AudioUnit AudioToolbox CoreAudio CoreServices Carbon # for portaudio libpng @@ -167,22 +152,33 @@ in stdenv.mkDerivation rec { "-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON" "-Daudacity_conan_enabled=Off" "-Daudacity_use_ffmpeg=loaded" + "-Daudacity_has_vst3=Off" # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; + # [ 57%] Generating LightThemeAsCeeCode.h... + # ../../utils/image-compiler: error while loading shared libraries: + # lib-theme.so: cannot open shared object file: No such file or directory + preBuild = '' + export LD_LIBRARY_PATH=$PWD/utils + ''; + doCheck = false; # Test fails # Replace audacity's wrapper, to: # - put it in the right place, it shouldn't be in "$out/audacity" # - Add the ffmpeg dynamic dependency postInstall = lib.optionalString stdenv.isLinux '' - rm "$out/audacity" wrapProgram "$out/bin/audacity" \ --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_4 ]} \ --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ --suffix AUDACITY_PATH : "$out/share/audacity" + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/Audacity.app $out/Applications/ + makeWrapper $out/Applications/Audacity.app/Contents/MacOS/Audacity $out/bin/audacity ''; meta = with lib; { @@ -198,11 +194,9 @@ in stdenv.mkDerivation rec { # Documentation. cc-by-30 ]; - maintainers = with maintainers; [ lheckemann veprbl ]; + maintainers = with maintainers; [ lheckemann veprbl wegank ]; platforms = platforms.unix; - # darwin-aarch due to qtbase broken for it. - # darwin-x86_64 due to - # https://logs.nix.ci/?attempt_id=5cbc4581-09b4-4148-82fe-0326411a56b3&key=nixos%2Fnixpkgs.152273. - broken = stdenv.isDarwin; + # error: unknown type name 'NSAppearanceName' + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index 2603e88fcbdb7..6127cb7e69291 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -28,8 +28,12 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = lib.optionals gtkGUI [ pkg-config ]; + buildInputs = [ gettext ncurses ] - ++ lib.optionals gtkGUI [ pkg-config gtk2 ]; + ++ lib.optionals gtkGUI [ gtk2 ]; + + configureFlags = lib.optionals (!gtkGUI) ["--without-gtk"]; meta = with lib; { description = "Audio mixer for X and the console"; diff --git a/pkgs/applications/audio/blanket/default.nix b/pkgs/applications/audio/blanket/default.nix index 6c648ed711591..4662002c95e89 100644 --- a/pkgs/applications/audio/blanket/default.nix +++ b/pkgs/applications/audio/blanket/default.nix @@ -1,10 +1,9 @@ { lib -, stdenv , fetchFromGitHub , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , desktop-file-utils , appstream-glib , python3Packages @@ -30,9 +29,8 @@ python3Packages.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 desktop-file-utils - appstream-glib ]; buildInputs = [ @@ -57,6 +55,8 @@ python3Packages.buildPythonApplication rec { postPatch = '' patchShebangs build-aux/meson/postinstall.py + substituteInPlace build-aux/meson/postinstall.py \ + --replace gtk-update-icon-cache gtk4-update-icon-cache ''; meta = with lib; { diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 72f13bdb09bfb..ebf72588df0d1 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -1,6 +1,4 @@ { lib -, a2jmidid -, coreutils , libjack2 , fetchpatch , fetchFromGitHub @@ -8,7 +6,6 @@ , pkg-config , pulseaudioFull , qtbase -, makeWrapper , mkDerivation , python3 }: diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index bdcbf024e6064..4ab651e3fb847 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH - libglade lv2 pkg-config + libglade lv2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 291c3875cea8d..82259d563ce90 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KcwEuiy58wjTr+RWPmpMaPgM0olzxiWp9MMYiKwmIcI="; + sha256 = "sha256-SN+9Q5v0bv+kQcYLBJmSCd9WIGSeQuOZze8LVwF20EA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix index 9fe86550f0da4..6398141c86dd4 100644 --- a/pkgs/applications/audio/cozy/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { format = "other"; # no setup.py pname = "cozy"; - version = "1.2.0"; + version = "1.2.1"; # Temporary fix # See https://github.com/NixOS/nixpkgs/issues/57029 @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { owner = "geigi"; repo = pname; rev = version; - sha256 = "0igqf9b77i13sxlk4ziw549h379hmz1slrb3vvf8irk94gxabsaw"; + hash = "sha256-cRqfLFLvje8lxUZ4S83UAFyYUX0vj1ZgLG0Y6gpCfmI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index d635dce83f4e6..d41ebed096064 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://bach.dynet.com/crip/"; description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; - license = lib.licenses.gpl1; + license = lib.licenses.gpl1Only; platforms = lib.platforms.linux; maintainers = [ maintainers.endgame ]; }; diff --git a/pkgs/applications/audio/eartag/default.nix b/pkgs/applications/audio/eartag/default.nix new file mode 100644 index 0000000000000..aad765041e4b8 --- /dev/null +++ b/pkgs/applications/audio/eartag/default.nix @@ -0,0 +1,78 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, libadwaita +, gettext +, glib +, gobject-introspection +, desktop-file-utils +, appstream-glib +, gtk4 +, librsvg +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "eartag"; + version = "0.2.1"; + format = "other"; + + src = fetchFromGitHub { + owner = "knuxify"; + repo = pname; + rev = version; + sha256 = "sha256-TlY2F2y7ZZ9f+vkYYkES5zoIGcuTWP1+rOJI62wc4SU="; + }; + + postPatch = '' + chmod +x ./build-aux/meson/postinstall.py + patchShebangs ./build-aux/meson/postinstall.py + substituteInPlace ./build-aux/meson/postinstall.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + + nativeBuildInputs = [ + meson + ninja + glib + desktop-file-utils + appstream-glib + pkg-config + gettext + gobject-introspection + wrapGAppsHook4 + ] ++ lib.optional stdenv.isDarwin gtk4; # for gtk4-update-icon-cache + + buildInputs = [ + librsvg + libadwaita + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + eyeD3 + pillow + mutagen + pytaglib + python-magic + ]; + + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + homepage = "https://github.com/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 + # being incorrectly identified as unfree software. + license = licenses.mit; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/pkgs/applications/audio/exact-audio-copy/default.nix b/pkgs/applications/audio/exact-audio-copy/default.nix new file mode 100644 index 0000000000000..bd5e55bc21061 --- /dev/null +++ b/pkgs/applications/audio/exact-audio-copy/default.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchurl +, makeDesktopItem +, imagemagick +, p7zip +, wine +, writeShellScriptBin +, symlinkJoin +, use64 ? false +}: + +let + pname = "exact-audio-copy"; + version = "1.6.0"; + + eac_exe = fetchurl { + url = "http://www.exactaudiocopy.de/eac-${lib.versions.majorMinor version}.exe"; + sha256 = "8291d33104ebab2619ba8d85744083e241330a286f5bd7d54c7b0eb08f2b84c1"; + }; + + cygwin_dll = fetchurl { + url = "https://cygwin.com/snapshots/x86/cygwin1-20220301.dll.xz"; + sha256 = "0zxn0r5q69fhciy0mrplhxj1hxwy3sq4k1wdy6n6kyassm4zyz1x"; + }; + + patched_eac = stdenv.mkDerivation { + pname = "patched_eac"; + inherit version; + + nativeBuildInputs = [ + imagemagick + p7zip + ]; + + buildCommand = '' + mkdir -p $out + _tmp=$(mktemp -d) + cd $_tmp + 7z x -aoa ${eac_exe} + chmod -R 755 . + cp ${cygwin_dll} cygwin1.dll.xz + xz --decompress cygwin1.dll.xz + mv cygwin1.dll CDRDAO/ + cp -r * $out + 7z x EAC.exe + convert .rsrc/1033/ICON/29.ico -thumbnail 128x128 -alpha on -background none -flatten "$out/eac.ico.128.png" + ''; + }; + + wrapper = writeShellScriptBin pname '' + export WINEPREFIX="''${EXACT_AUDIO_COPY_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/exact-audio-copy"}/wine" + export WINEARCH=${if use64 then "win64" else "win32"} + export WINEDLLOVERRIDES="mscoree=" # disable mono + export WINEDEBUG=-all + if [ ! -d "$WINEPREFIX" ] ; then + mkdir -p "$WINEPREFIX" + ${wine}/bin/wineboot -u + fi + + exec ${wine}/bin/wine ${patched_eac}/EAC.exe "$@" + ''; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + comment = "Audio Grabber for CDs"; + desktopName = "Exact Audio Copy"; + categories = [ "Audio" "AudioVideo" ]; + icon = "${patched_eac}/eac.ico.128.png"; + }; +in +symlinkJoin { + name = "${pname}-${version}"; + + paths = [ wrapper desktopItem ]; + + meta = with lib; { + description = "A precise CD audio grabber for creating perfect quality rips using CD and DVD drives"; + homepage = "https://www.exactaudiocopy.de/"; + changelog = "https://www.exactaudiocopy.de/en/index.php/resources/whats-new/whats-new/"; + license = licenses.unfree; + maintainers = [ maintainers.brendanreis ]; + platforms = wine.meta.platforms; + }; +} diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 4ee5ab82e6e46..87f2920c200b5 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.11"; + version = "2.5.12"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-ldn6st3/iIABjEfAwodOnPrI97DygWbnYmvMktlOgrk="; + sha256 = "sha256-pq9zO4opCh9GEEtuQjrxKdNvOasDlcGGUsQD4je7Wyw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index 5fd4eb2fb7d37..720bc1613b1db 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.41.1"; + version = "2.50.6"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-I5No9J7TLOf++B+lx1RfGY8LBoDAApq/EV8016wH9Hc="; + sha256 = "sha256-Q/vrm3WPsjkE3Xf/XEirsJPFXHNSW/Ve3Jbi/5nIrx8="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 621804840bf02..c9e3b946dd19f 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "flac"; - version = "1.3.4"; + version = "1.4.1"; src = fetchurl { url = "http://downloads.xiph.org/releases/flac/${pname}-${version}.tar.xz"; - sha256 = "0dz7am8kbc97a6afml1h4yp085274prg8j7csryds8m3fmz61w4g"; + # Official checksum is published at https://github.com/xiph/flac/releases/tag/${version} + sha256 = "91303c3e5dfde52c3e94e75976c0ab3ee14ced278ab8f60033a3a12db9209ae6"; }; buildInputs = [ libogg ]; @@ -20,5 +21,6 @@ stdenv.mkDerivation rec { description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; platforms = platforms.all; license = licenses.bsd3; + maintainers = with maintainers; [ ruuda ]; }; } diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 1047da60906e6..cfa831ab525af 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.58"; + version = "1.60"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-FHhASs1PKTz6G1sAKNUeft0BHbWgl44l7eiOnyQXZb8="; + sha256 = "sha256-6/9NaQSRNGnuIivIeWi/dOBSOzxhZYghy7zvdB5i500="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index 59253af2ad68a..1e6bbdb4dd715 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gameboy sound player"; - license = licenses.gpl1; + license = licenses.gpl1Plus; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 4c93fad511ae0..33930dfb7d2d1 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { version = "11.8.16"; libmpd = stdenv.mkDerivation { - name = "libmpd-11.8.17"; + pname = "libmpd"; + version = "11.8.17"; src = fetchurl { - url = "http://download.sarine.nl/Programs/gmpc/11.8/libmpd-11.8.17.tar.gz"; + url = "https://download.sarine.nl/Programs/gmpc/${lib.versions.majorMinor version}/libmpd-${version}.tar.gz"; sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; }; patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 30c6e57188abc..d0cff6c44fb65 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsa-lib +{ lib, stdenv, fetchsvn, cmake, pkg-config, fftwFloat, alsa-lib , zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2 , includeDemo ? true }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ pkg-config fftwFloat alsa-lib zlib wavpack wxGTK31 udev ] + buildInputs = [ fftwFloat alsa-lib zlib wavpack wxGTK31 udev ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = lib.optional (!jackaudioSupport) [ diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index a0defad0da0c7..81a97d5a054e6 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv -, lv2, makeWrapper, pkg-config, python3, raul, serd, sord, sratom +, lv2, pkg-config, python3, raul, serd, sord, sratom , wafHook , suil }: diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index 786b455120852..be6f095143873 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -13,7 +13,6 @@ , makeDesktopItem , pkg-config , libarchive -, fetchpatch , copyDesktopItems , usePipewire ? true , usePulseaudio ? false @@ -26,28 +25,15 @@ let in mkDerivation rec { pname = "jamesdsp"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub rec { owner = "Audio4Linux"; repo = "JDSP4Linux"; fetchSubmodules = true; rev = version; - hash = "sha256-Hkzurr+s+vvSyOMCYH9kHI+nIm6mL9yORGNzY2FXslc="; + hash = "sha256-wD1JZQD8dR24cBN4QJCSrEsS4aoMD+MQmqnOIFKOeoE="; }; - patches = [ - # fixing /usr install assumption, remove on version bump - (fetchpatch { - url = "https://github.com/Audio4Linux/JDSP4Linux/commit/003c9e9fc426f83e269aed6e05be3ed55273931a.patch"; - hash = "sha256-crll/a7C9pUq9eL5diq8/YgC5bNC6SrdijZEBxZpJ8E="; - }) - # compatibility fix for PipeWire 0.3.44+, remove on version bump - (fetchpatch { - url = "https://github.com/Audio4Linux/JDSP4Linux/commit/e04c55735cc20fc3c3ce042c5681ec80f7df3c96.patch"; - hash = "sha256-o6AUtQzugykALSdkM3i3lYqRmzJX3FzmALSi0TrWuRA="; - }) - ]; - nativeBuildInputs = [ qmake pkg-config @@ -86,6 +72,11 @@ in }) ]; + postInstall = '' + install -D resources/icons/icon.png $out/share/pixmaps/jamesdsp.png + install -D resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/jamesdsp.svg + ''; + meta = with lib;{ broken = (stdenv.isLinux && stdenv.isAarch64); description = "An audio effect processor for PipeWire clients"; diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix index 655fc6a9608ca..935e3a9503836 100644 --- a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix +++ b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config -, boost, cairo, fftw, gnome, ladspa-sdk, libxcb, lv2, xcbutilwm +, boost, cairo, fftw, ladspa-sdk, libxcb, lv2, xcbutilwm , zita-convolver, zita-resampler }: diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/applications/audio/ltc-tools/default.nix index c8c87959727c1..9355810507448 100644 --- a/pkgs/applications/audio/ltc-tools/default.nix +++ b/pkgs/applications/audio/ltc-tools/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al"; }; - buildInputs = [ pkg-config libltc libsndfile jack2 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libltc libsndfile jack2 ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index a825eaa4e38cd..675189f6d1315 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { patches = [ ./buf_rect.patch ./fix_build_with_gcc-5.patch]; + nativeBuildInputs = [ pkg-config ]; buildInputs = - [ pkg-config SDL SDL_image libjack2 + [ SDL SDL_image libjack2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index ce12b239e5acc..76c5de75ef544 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , mkDerivation -, fetchurl , fetchFromGitHub , chromaprint , cmake diff --git a/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix b/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix index 3896545dc41c2..a628e38469f51 100644 --- a/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix +++ b/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-1KiWMTVTTf1/iR4AzJ1Oe0mOrWN5edsZN0tQMidgnRA="; }; - buildInputs = [ lv2 pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ lv2 ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index ab7e33ea3e37a..2c4f8eaa5a99c 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-MPD"; - version = "3.2.0"; + version = "3.3.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-oZvKr61lyu7CmXP2A/xtYng1FIUPyveVJMqUuv6UnaM="; + sha256 = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM="; }; - propagatedBuildInputs = [mopidy]; + propagatedBuildInputs = [ mopidy ]; # no tests implemented doCheck = false; diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index b19e22eeeba4d..6b47d1f3c846b 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A fully functional terminal-based music player, library, and streaming audio server"; homepage = "https://musikcube.com/"; - maintainers = [ maintainers.aanderse ]; + maintainers = with maintainers; [ aanderse srapenne ]; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/applications/audio/new-session-manager/default.nix b/pkgs/applications/audio/new-session-manager/default.nix index 287b593d3eb80..5f23b9be651cc 100644 --- a/pkgs/applications/audio/new-session-manager/default.nix +++ b/pkgs/applications/audio/new-session-manager/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "new-session-manager"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "linuxaudio"; repo = "new-session-manager"; rev = "v${version}"; - sha256 = "sha256-QVykRYXToeVXr7pYQy2afgEAlXrQnm68+xEUZhd+FkY="; + sha256 = "sha256-5G2GlBuKjC/r1SMm78JKia7bMA97YcvUR5l6zBucemw="; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index a6683904cb1d9..f86595361b659 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libogg ]; propagatedBuildInputs = [ libopus ]; + outputs = [ "out" "dev" ]; patches = [ ./include-multistream.patch ] # fixes problem with openssl 1.1 dependency # see https://github.com/xiph/opusfile/issues/13 diff --git a/pkgs/applications/audio/oxefmsynth/default.nix b/pkgs/applications/audio/oxefmsynth/default.nix index 0e3e801d18caf..59ed1ce21f5f6 100644 --- a/pkgs/applications/audio/oxefmsynth/default.nix +++ b/pkgs/applications/audio/oxefmsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, unzip, fetchzip, libX11 }: +{ stdenv, lib, fetchFromGitHub, fetchzip, libX11 }: let diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix new file mode 100644 index 0000000000000..6aa92a3a99fa4 --- /dev/null +++ b/pkgs/applications/audio/parlatype/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, fetchFromGitHub +, appstream-glib +, dbus +, desktop-file-utils +, gettext +, glib +, gobject-introspection +, gsettings-desktop-schemas +, gst_all_1 +, gtk3 +, hicolor-icon-theme +, isocodes +, itstool +, libxml2 +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "parlatype"; + version = "3.1"; + + src = fetchFromGitHub { + owner = "gkarsay"; + repo = pname; + rev = "v${version}"; + sha256 = "1a4xlsbszb50vnz1g7kf7hl7aywp7s7xaravkcx13csn0a7l3x45"; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + gobject-introspection + itstool + libxml2 + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + buildInputs = [ + dbus + glib + gsettings-desktop-schemas + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + gtk3 + hicolor-icon-theme + isocodes + ]; + + postPatch = '' + patchShebangs data/meson_post_install.py + patchShebangs libparlatype/tests/data/generate_config_data + ''; + + doCheck = false; + + meta = with lib; { + description = "GNOME audio player for transcription"; + longDescription = '' + Parlatype is a minimal audio player for manual speech transcription, + written for the GNOME desktop environment. It plays audio sources to + transcribe them in your favourite text application. It’s intended to be + useful for journalists, students, scientists and whoever needs to + transcribe audio files. + ''; + homepage = "https://www.parlatype.org/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ alexshpilkin melchips ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index a8a5bed0e0739..99bbdf693a9c1 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib boost @@ -33,7 +34,6 @@ stdenv.mkDerivation rec { glibmm gtkmm2 libjack2 - pkg-config python3 wafHook ]; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index f9e54bbbd566e..d57c56a2adb71 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,4 @@ { fetchurl -, fetchpatch , lib , stdenv , pkg-config diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix index aeb58911623b4..fc4c08a63aa3d 100644 --- a/pkgs/applications/audio/pd-plugins/gem/default.nix +++ b/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , puredata diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 811b8c2ee9aa2..5aef92ab61fb0 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system"; homepage = "http://www.chnry.net/ch/?090-Pure-Mapping&lang=en"; - license = lib.licenses.gpl1; + license = lib.licenses.gpl1Only; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 26c62f3e30bfb..308d5b65f3e5a 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, curl, gnugrep, jq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }: +{ lib, stdenv, curl, jq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }: let versionForFile = v: builtins.replaceStrings ["."] [""] v; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 377dc4d2975c3..d05a12ec30af3 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.2.22"; + version = "6.2.23"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-RE4QDK5x9xG1RsAWB6dgviu3V1ay/+r0vyHCPCu/qCU="; + sha256 = "sha256-gl+kT8wXLCWnNmOBx6Vg+FbmJ8kJ8pJKsahpqcYw9Lk="; }; configurePhase = '' diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix index 487f86cf660f6..cb190cabf54d5 100644 --- a/pkgs/applications/audio/qmidiarp/default.nix +++ b/pkgs/applications/audio/qmidiarp/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchgit -, automake , autoreconfHook , lv2 , pkg-config diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 28d050d2e4258..6b09e086fa3de 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -17,12 +17,15 @@ , libpulseaudio }: +let + url_for_platform = version: arch: "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz"; +in stdenv.mkDerivation rec { pname = "reaper"; version = "6.66"; src = fetchurl { - url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.hostPlatform.qemuArch}.tar.xz"; + url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { x86_64-linux = "sha256-kMXHHd+uIc5tKlDlxKjphZsfNMYvvV/4Zx84eRwPGcs="; aarch64-linux = "sha256-pB3qj9CJbI5iWBNKNX2niIfHrpSz9+qotX/zKGYDwYo="; @@ -75,6 +78,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = ./updater.sh; + meta = with lib; { description = "Digital audio workstation"; homepage = "https://www.reaper.fm/"; diff --git a/pkgs/applications/audio/reaper/updater.sh b/pkgs/applications/audio/reaper/updater.sh new file mode 100755 index 0000000000000..750bea346bbc3 --- /dev/null +++ b/pkgs/applications/audio/reaper/updater.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts + +set -euo pipefail + +reaper_ver=$(curl -Ls https://www.reaper.fm/download.php | grep -o 'Version [0-9]\.[0-9]*' | head -n1 | cut -d' ' -f2) + +function set_hash_for_arch() { + local arch=$1 + pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_linux_$arch.tar.xz) + pkg_hash=$(nix hash to-sri "sha256:$pkg_hash") + # reset the version so the second architecture update doesn't get ignored + update-source-version reaper 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" --system=$arch-linux + update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-linux +} + +set_hash_for_arch aarch64 +set_hash_for_arch x86_64 diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index 711444651c333..d795138a4b562 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -2,6 +2,7 @@ , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto , wrapQtAppsHook, pkg-config +, libjack2 }: stdenv.mkDerivation rec { @@ -17,6 +18,7 @@ stdenv.mkDerivation rec { [ alsa-lib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo libmad liboggz libpulseaudio libsamplerate libsndfile lrdf opusfile portaudio rubberband serd sord capnproto + libjack2 ]; nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; @@ -34,5 +36,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.vandenoever ]; platforms = platforms.linux; + # undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.4.29' + broken = true; # at 2022-09-30 }; } diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 41e71cec2ff81..1f5bb36a51443 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "sonic-pi"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "sonic-pi-net"; repo = pname; rev = "v${version}"; - hash = "sha256-VRuNhS53okKsCHgKEsJgkpIe9yXFY6d2ghd0nsUQLLM="; + hash = "sha256-R+nmjIIDLoGOoCkDvJqejE1DaweHSAV8M2RvdwN5qAQ="; }; mixFodDeps = beamPackages.fetchMixDeps { diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix index e995f8cfa1b93..af1dfb01e9aea 100644 --- a/pkgs/applications/audio/spot/default.nix +++ b/pkgs/applications/audio/spot/default.nix @@ -16,7 +16,7 @@ , openssl , alsa-lib , libpulseaudio -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { rustPlatform.rust.cargo rustPlatform.cargoSetupHook rustPlatform.rust.rustc - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x build-aux/cargo.sh patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py + substituteInPlace build-aux/meson/postinstall.py \ + --replace gtk-update-icon-cache gtk4-update-icon-cache ''; passthru = { diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 2b1d114964bfa..3011b712fe256 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -1,4 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchCrate, rustPlatform, installShellFiles, pkg-config, openssl, python3, libxcb, AppKit, Security }: +{ lib +, stdenv +, fetchFromGitHub +, fetchCrate +, fetchpatch +, rustPlatform +, installShellFiles +, pkg-config +, openssl +, python3 +, libxcb +, AppKit +, Security +}: rustPlatform.buildRustPackage rec { pname = "spotify-tui"; @@ -8,14 +21,30 @@ rustPlatform.buildRustPackage rec { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI="; + hash = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI="; }; - # Use patched rspotify cargoPatches = [ + # Use patched rspotify ./Cargo.lock.patch + + # Needed so that the patch below it applies. + (fetchpatch { + name = "update-dirs.patch"; + url = "https://github.com/Rigellute/spotify-tui/commit/3881defc1ed0bcf79df1aef4836b857f64be657c.patch"; + hash = "sha256-OGqiYLFojMwR3RgKbddXxPDiAdzPySnscVVsVmTT7t4="; + }) + + # https://github.com/Rigellute/spotify-tui/pull/990 + (fetchpatch { + name = "update-socket2-for-rust-1.64.patch"; + url = "https://github.com/Rigellute/spotify-tui/commit/14df9419cf72da13f3b55654686a95647ea9dfea.patch"; + hash = "sha256-craY6UwmHDdxih3nZBdPkNJtQ6wvVgf09Ovqdxi0JZo="; + }) ]; + patches = [ + # Use patched rspotify ./Cargo.toml.patch ]; @@ -44,7 +73,7 @@ rustPlatform.buildRustPackage rec { ln -s ${rspotify} ./rspotify-${rspotify.version} ''; - cargoSha256 = "sha256-S8zuVYcyYvrwggIvlpxNydhoN9kx6xLBwYJSHcbEK40="; + cargoHash = "sha256-aZJ6Q/rvqrv+wvQw2eKFPnSROhI5vXPvr5pu1hwtZKA="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ]; buildInputs = [ ] diff --git a/pkgs/applications/audio/tagger/default.nix b/pkgs/applications/audio/tagger/default.nix new file mode 100644 index 0000000000000..b7708299d30c0 --- /dev/null +++ b/pkgs/applications/audio/tagger/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, jsoncpp +, taglib +, curl +, curlpp +, glib +, gtk4 +, libadwaita +, wrapGAppsHook4 +, desktop-file-utils +, chromaprint # fpcalc +}: + +stdenv.mkDerivation rec { + pname = "tagger"; + version = "2022.10.3"; + + src = fetchFromGitHub { + owner = "nlogozzo"; + repo = "NickvisionTagger"; + rev = version; + hash = "sha256-dyp2XzTnDs08tTTbCnjWh061UXnH4Q0Gnt0jofgVm2U="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + jsoncpp + taglib + curl + curlpp + ]; + + # Don't install compiled binary + postPatch = '' + sed -i '/fpcalc/d' meson.build + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ chromaprint ]}" + ) + ''; + + meta = with lib; { + description = "An easy-to-use music tag (metadata) editor"; + homepage = "https://github.com/nlogozzo/NickvisionTagger"; + mainProgram = "org.nickvision.tagger"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/applications/audio/tap-plugins/default.nix index c0b2c64822f4b..56ff4c0e1911d 100644 --- a/pkgs/applications/audio/tap-plugins/default.nix +++ b/pkgs/applications/audio/tap-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ladspa-sdk, pkgs, ... }: +{ lib, stdenv, ladspa-sdk, pkgs, ... }: stdenv.mkDerivation rec { pname = "tap-plugins"; diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 31a197071045e..6c39fdcf5fc08 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.1"; + version = "7.4.2"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-cHuEmRQG40p04MXcwmYMm7Jih+mYre9IBnOPMx1/k7k="; + sha256 = "sha256-fEEu7GqK1leOop3kd1Ci9BAH2bP31jvTOg3DEL8lIF4="; }; postUnpack = '' @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { description = "The Linux desktop music player from the future"; homepage = "https://tauonmusicbox.rocks/"; license = licenses.gpl3; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ jansol ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 8b6d50917219d..f81854aec28f9 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.2.0"; + version = "4.3.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "sha256-YydpWzGH+Orb8Vot8hchh+FFcd327VwQ8Kr7x8WYnv4="; + sha256 = "sha256-/ZESysxaDhMpyTKHjjoRMiLM7SMESA5VIfgWCqdyDck="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; @@ -109,7 +109,7 @@ 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 "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" \ --replace "/usr/share/icons/hicolor/0x0/apps/tidal-hifi.png" "tidal-hifi.png" for size in 48 64 128 256 512; do diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index 112d84a08b112..da149db075379 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo - libdvdread pkg-config x264 libmpeg2 xvidcore ]; + libdvdread x264 libmpeg2 xvidcore ]; configureFlags = [ "--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat" "--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2" diff --git a/pkgs/applications/audio/vocproc/default.nix b/pkgs/applications/audio/vocproc/default.nix index 46957000507bd..bb402f425daa2 100644 --- a/pkgs/applications/audio/vocproc/default.nix +++ b/pkgs/applications/audio/vocproc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, pkg-config, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: +{ lib, stdenv, fetchzip, pkg-config, lv2, fftw, lv2-cpp-tools, gtkmm2 }: stdenv.mkDerivation rec { pname = "vocproc"; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 30b7abc6dfba7..a1613946150bc 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20220714"; + version = "20220923"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "sha256-myrHOfgpCwuW8YX0jZ3RutoqtXysU0ejBNcuxN3stXU="; + sha256 = "sha256-9Y9up5Ziipm6ums1wESfcADKgMwas2SESgGPn74RTt4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 61d49d110a9e8..87305027e4c41 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; - nativeBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ alsa-lib dssi gtk2 libjack2 ladspaH - ladspaPlugins liblo pkg-config ]; + ladspaPlugins liblo ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index 0609438b05349..9500c63a7af31 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -4,7 +4,6 @@ , SDL2 , alsa-lib , libaudec -, bash , bash-completion , breeze-icons , carla diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 6f1734bbc1359..c1ede1ea839f6 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -15,6 +15,7 @@ , protobuf , qrencode , libevent +, sqlite , withGui , python3 , jemalloc @@ -23,17 +24,15 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.21.13"; + version = "0.26.2"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1x8xcdi1vcskggk9bqkwr3ah4vi9b7sj2h8hf7spac6dvz8lmzav"; + sha256 = "0gz4713lk3alk3ykwq1bdqjywadrfrnb7n2878136g01n87j00az"; }; - patches = [ ./fix-bitcoin-qt-build.patch ]; - nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssl @@ -47,6 +46,7 @@ mkDerivation rec { util-linux protobuf libevent + sqlite ] ++ lib.optionals withGui [ qtbase qttools qrencode ]; cmakeFlags = lib.optionals (!withGui) [ diff --git a/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch b/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch deleted file mode 100644 index c49bbc4325192..0000000000000 --- a/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- bitcoin-abc-v0.15.0-src/build-aux/m4/bitcoin_qt.m4 1970-01-01 01:00:01.000000000 +0100 -+++ bitcoin-abc-v0.15.0-src.org/build-aux/m4/bitcoin_qt.m4 2017-09-27 23:38:44.748384197 +0100 -@@ -35,11 +35,7 @@ - dnl Output: $1 is set to the path of $2 if found. $2 are searched in order. - AC_DEFUN([BITCOIN_QT_PATH_PROGS],[ - BITCOIN_QT_CHECK([ -- if test "x$3" != x; then -- AC_PATH_PROGS($1,$2,,$3) -- else -- AC_PATH_PROGS($1,$2) -- fi -+ AC_PATH_PROGS($1,$2) - if test "x$$1" = x && test "x$4" != xyes; then - BITCOIN_QT_FAIL([$1 not found]) - fi diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 8e87610e03fc2..4dfeebfe0962f 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -7,6 +7,7 @@ , automake , gettext , libtool +, lowdown , protobuf , unzip , which @@ -21,30 +22,21 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.12.0"; + version = "0.12.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "1ff400339db3d314b459e1a3e973f1213783e814faa21f2e1b18917693cabfd9"; - }; - - manpages = fetchurl { - url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}-manpages.tar.xz"; - sha256 = "sha256-7EohXp0/gIJwlMsTHwlcLNBzZb8LwF9n0eXkQhOnY7g="; + sha256 = "sha256-SlDDOJ6H2UVT/dof23CYSzCliAc+5CAYQc87AzOtYjg="; }; # when building on darwin we need dawin.cctools to provide the correct libtool # as libwally-core detects the host as darwin and tries to add the -static # option to libtool, also we have to add the modified gsed package. - nativeBuildInputs = [ autoconf autogen automake gettext libtool protobuf py3 unzip which ] + nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ]; buildInputs = [ gmp libsodium sqlite zlib ]; - postUnpack = '' - tar -xf $manpages -C $sourceRoot - ''; - # this causes some python trouble on a darwin host so we skip this step. # also we have to tell libwally-core to use sed instead of gsed. postPatch = if !stdenv.isDarwin then '' diff --git a/pkgs/applications/blockchains/eclair/default.nix b/pkgs/applications/blockchains/eclair/default.nix index dcddef619312b..7c5d71f35f532 100644 --- a/pkgs/applications/blockchains/eclair/default.nix +++ b/pkgs/applications/blockchains/eclair/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "eclair"; - version = "0.6.2"; - revision = "6817d6f"; + version = "0.7.0-patch-disconnect"; + revision = "cad88bf"; src = fetchzip { url = "https://github.com/ACINQ/eclair/releases/download/v${version}/eclair-node-${version}-${revision}-bin.zip"; - sha256 = "038r9mblm2r8mkxnv65k29r7xj22dff5gmvzv9xiy5zf9i45mmk8"; + hash = "sha256-agOxflCXfoeSeGliB/PAMMyCdqYYajciHMfLrSiZx1Q="; }; propagatedBuildInputs = [ jq openjdk11 ]; diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 3f1e7e8b99b37..3c54844863ffc 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 = "4.0.103"; + version = "4.0.104"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-9vGPHNq76BSdqN1z0KzDOzeMOHAUKnA3Jpx+I5+FOFM="; + sha256 = "sha256-h6OVeDifYIKyIkwbN/pmJWge4/YGL6cnQQ/sI14LsHQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 5ef6889af3068..70a87a98e8856 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "erigon"; - version = "2022.09.03"; + version = "2022.10.01"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dilsoJw7VPA7SerpAOhYUviE2zt2qMBmSLWaPm0ux2Y="; + sha256 = "sha256-FuOVI59vfhm5q92hnfgarh3zpLXSDRmZQJuERHf4I7A="; fetchSubmodules = true; }; - vendorSha256 = "sha256-W8hEMfn2qW/3+V6x/RH1azj49V26fyQ+1y2re3tXsTk="; + vendorSha256 = "sha256-B9brjWvYw65ti2Ac3D4nQUEax/q+Uf5DTPBHXeWQybw="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index c3360da372182..02efa6f26974d 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-GaXXqIHuMTGn8iLymAhL8i0HzXmaO6RxtvIzgWw6QI0="; + sha256 = "sha256-sX9GeY+c/mcsAWApQ0E5LwoXZgWUC4w7YY8/PEzMhl8="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix new file mode 100644 index 0000000000000..fc95295d3d9e6 --- /dev/null +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -0,0 +1,103 @@ +{ clang +, cmake +, fetchFromGitHub +, fetchurl +, lib +, lighthouse +, llvmPackages +, nodePackages +, perl +, protobuf +, rustPlatform +, Security +, stdenv +, testers +, unzip +}: + +rustPlatform.buildRustPackage rec { + pname = "lighthouse"; + version = "3.1.2"; + + # lighthouse/common/deposit_contract/build.rs + depositContractSpecVersion = "0.12.1"; + testnetDepositContractSpecVersion = "0.9.2.1"; + + src = fetchFromGitHub { + owner = "sigp"; + repo = "lighthouse"; + rev = "v${version}"; + hash = "sha256-EJFg6ZjxxijxJNMwKRh0cYeqwujUV3OJgXBvBRsnbVI="; + }; + + cargoHash = "sha256-iXqRtBqvM9URQsL8qGmpr3CNX2fpbtDOaluibAX/lWo="; + + buildFeatures = [ "modern" "gnosis" ]; + + nativeBuildInputs = [ clang cmake perl protobuf ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; + + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + + depositContractSpec = fetchurl { + url = "https://raw.githubusercontent.com/ethereum/eth2.0-specs/v${depositContractSpecVersion}/deposit_contract/contracts/validator_registration.json"; + hash = "sha256-ZslAe1wkmkg8Tua/AmmEfBmjqMVcGIiYHwi+WssEwa8="; + }; + + testnetDepositContractSpec = fetchurl { + url = "https://raw.githubusercontent.com/sigp/unsafe-eth2-deposit-contract/v${testnetDepositContractSpecVersion}/unsafe_validator_registration.json"; + hash = "sha256-aeTeHRT3QtxBRSNMCITIWmx89vGtox2OzSff8vZ+RYY="; + }; + + LIGHTHOUSE_DEPOSIT_CONTRACT_SPEC_URL = "file://${depositContractSpec}"; + LIGHTHOUSE_DEPOSIT_CONTRACT_TESTNET_URL = "file://${testnetDepositContractSpec}"; + + cargoBuildFlags = [ + "--package lighthouse" + ]; + + __darwinAllowLocalNetworking = true; + + checkFeatures = [ ]; + + # All of these tests require network access + cargoTestFlags = [ + "--workspace" + "--exclude beacon_node" + "--exclude http_api" + "--exclude beacon_chain" + "--exclude lighthouse" + "--exclude lighthouse_network" + "--exclude slashing_protection" + "--exclude web3signer_tests" + ]; + + # All of these tests require network access + checkFlags = [ + "--skip service::tests::tests::test_dht_persistence" + "--skip time::test::test_reinsertion_updates_timeout" + ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + "--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch" + "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" + ]; + + checkInputs = [ + nodePackages.ganache + ]; + + passthru.tests.version = testers.testVersion { + package = lighthouse; + command = "lighthouse --version"; + version = "v${lighthouse.version}"; + }; + + meta = with lib; { + description = "Ethereum consensus client in Rust"; + homepage = "https://lighthouse.sigmaprime.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ centromere pmw ]; + }; +} diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index 28813ae6b0dc3..bb91e141f44ef 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.15.1-beta"; + version = "0.15.2-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "sha256-E1RxFy7eRCTnzTg2B0llRt+r41K6V4VQH7Edh1As4cY="; + sha256 = "sha256-C7BZ6awY2v5Uvvh12YEosoEQyJoetWzH/1wIQSVjtEk="; }; - vendorSha256 = "sha256-e72HIsS1fftJEOvjr1RQMo3+gjlBxXPHq2olGWfurJk="; + vendorSha256 = "sha256-rCdcPkgrFcDfLfF8wipFws7YTKEgotuVqVIJYLMOxbs="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; diff --git a/pkgs/applications/blockchains/masari/default.nix b/pkgs/applications/blockchains/masari/default.nix index 175cd7a31bd82..7cc0b2a593ea1 100644 --- a/pkgs/applications/blockchains/masari/default.nix +++ b/pkgs/applications/blockchains/masari/default.nix @@ -1,25 +1,35 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost -, lmdb, miniupnpc, readline }: +, lmdb, miniupnpc, readline, git, zeromq, libsodium, rapidjson, cppzmq }: stdenv.mkDerivation rec { pname = "masari"; - version = "0.1.4.0"; + version = "unstable-2022-10-09"; src = fetchFromGitHub { owner = "masari-project"; repo = "masari"; - rev = "v${version}"; - sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3"; + rev = "ff71f52220858b84a4403dab9a14339bcad57826"; + sha256 = "sha256-GunNFqZNgpLfyAA9BiBC98axgTQuK76z3BUl5T0iJqs="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; + postPatch = '' + # remove vendored libraries + rm -r external/{miniupnpc,rapidjson} + ''; + + nativeBuildInputs = [ cmake pkg-config git ]; + + buildInputs = [ + boost miniupnpc openssl unbound + zeromq readline libsodium + rapidjson cppzmq + ]; meta = with lib; { description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol"; homepage = "https://www.getmasari.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthewcroughan ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index 659e54f9b4648..caac322020eb5 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , boost, miniupnpc, openssl, unbound , zeromq, pcsclite, readline, libsodium, hidapi , randomx, rapidjson @@ -9,13 +8,13 @@ stdenv.mkDerivation rec { pname = "monero-cli"; - version = "0.18.1.1"; + version = "0.18.1.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "sha256-R3ajdsHVgvkUEwaShwMvhIrcbM4YjsXgBk2QGBhxGRQ="; + sha256 = "sha256-yV1ysoesEcjL+JX6hkmcrBDmazOWBvYK6EjshxJzcAw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 945cb5e080c5e..1a39e68d8f67b 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.18.1.1"; + version = "0.18.1.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "sha256-mxbr02Ba/BeUiAZujnBdXgJSaq6a/U4GM7rR7sZzTWc="; + sha256 = "sha256-GBILqNkYQUkil1qvYnJTkHwgK3dzKR9I9GVbbLy/0UU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index a1b9f8348b6a1..7aeb483b5cbf5 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , rustPlatform , cmake -, llvmPackages , openssl , pkg-config , stdenv diff --git a/pkgs/applications/blockchains/oxen/default.nix b/pkgs/applications/blockchains/oxen/default.nix index 773071c0499ea..53c3a156d5e12 100644 --- a/pkgs/applications/blockchains/oxen/default.nix +++ b/pkgs/applications/blockchains/oxen/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch -, cmake, pkg-config +{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, pkg-config , boost, openssl, unbound , pcsclite, readline, libsodium, hidapi , rapidjson diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 2e7df608eba09..92342bfda7856 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -10,13 +10,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.28"; + version = "0.9.29"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-PYPNbysk9jHGtAUGr8O/Ah0ArTNKQYYToR5djG+XujI="; + sha256 = "sha256-/IJs3153KzhGf5I6LueljzRhDl/PYYlPseF6wCh+u3M="; # 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. @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-Dqcjt3yvZdaHp6sIQFo9wYH/icIInyXqKHE1Q/JjrwY="; + cargoSha256 = "sha256-mI8VvTlM9ynstDBC0ubQkzg3D2ZXuWqJGS/Y23D6dU0="; buildInputs = lib.optional stdenv.isDarwin [ Security ]; diff --git a/pkgs/applications/blockchains/teos/add-cargo-lock.patch b/pkgs/applications/blockchains/teos/add-cargo-lock.patch new file mode 100644 index 0000000000000..04a49ab12144d --- /dev/null +++ b/pkgs/applications/blockchains/teos/add-cargo-lock.patch @@ -0,0 +1,3905 @@ +--- a/Cargo.lock 2022-09-26 16:57:09.795022563 +0200 ++++ b/Cargo.lock 2022-09-29 10:21:19.312000000 +0200 +@@ -0,0 +1,3902 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "aead" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "ahash" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" ++dependencies = [ ++ "getrandom 0.2.7", ++ "once_cell", ++ "version_check", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.65" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" ++ ++[[package]] ++name = "ascii-canvas" ++version = "3.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" ++dependencies = [ ++ "term", ++] ++ ++[[package]] ++name = "assert-json-diff" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" ++dependencies = [ ++ "serde", ++ "serde_json", ++] ++ ++[[package]] ++name = "async-channel" ++version = "1.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" ++dependencies = [ ++ "concurrent-queue", ++ "event-listener", ++ "futures-core", ++] ++ ++[[package]] ++name = "async-executor" ++version = "1.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" ++dependencies = [ ++ "async-task", ++ "concurrent-queue", ++ "fastrand", ++ "futures-lite", ++ "once_cell", ++ "slab", ++] ++ ++[[package]] ++name = "async-global-executor" ++version = "2.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca" ++dependencies = [ ++ "async-channel", ++ "async-executor", ++ "async-io", ++ "async-lock", ++ "blocking", ++ "futures-lite", ++ "once_cell", ++] ++ ++[[package]] ++name = "async-io" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7" ++dependencies = [ ++ "autocfg", ++ "concurrent-queue", ++ "futures-lite", ++ "libc", ++ "log", ++ "once_cell", ++ "parking", ++ "polling", ++ "slab", ++ "socket2 0.4.7", ++ "waker-fn", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "async-lock" ++version = "2.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" ++dependencies = [ ++ "event-listener", ++] ++ ++[[package]] ++name = "async-object-pool" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aeb901c30ebc2fc4ab46395bbfbdba9542c16559d853645d75190c3056caf3bc" ++dependencies = [ ++ "async-std", ++] ++ ++[[package]] ++name = "async-process" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c" ++dependencies = [ ++ "async-io", ++ "autocfg", ++ "blocking", ++ "cfg-if 1.0.0", ++ "event-listener", ++ "futures-lite", ++ "libc", ++ "once_cell", ++ "signal-hook", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "async-std" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" ++dependencies = [ ++ "async-channel", ++ "async-global-executor", ++ "async-io", ++ "async-lock", ++ "async-process", ++ "crossbeam-utils", ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-lite", ++ "gloo-timers", ++ "kv-log-macro", ++ "log", ++ "memchr", ++ "once_cell", ++ "pin-project-lite 0.2.9", ++ "pin-utils", ++ "slab", ++ "wasm-bindgen-futures", ++] ++ ++[[package]] ++name = "async-stream" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" ++dependencies = [ ++ "async-stream-impl", ++ "futures-core", ++] ++ ++[[package]] ++name = "async-stream-impl" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "async-task" ++version = "4.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" ++ ++[[package]] ++name = "async-trait" ++version = "0.1.57" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "atomic-waker" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" ++ ++[[package]] ++name = "backoff" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" ++dependencies = [ ++ "futures-core", ++ "getrandom 0.2.7", ++ "instant", ++ "pin-project-lite 0.2.9", ++ "rand 0.8.5", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "base32" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" ++ ++[[package]] ++name = "base64" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++ ++[[package]] ++name = "base64-compat" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a8d4d2746f89841e49230dd26917df1876050f95abafafbe34f47cb534b88d7" ++dependencies = [ ++ "byteorder", ++] ++ ++[[package]] ++name = "basic-cookies" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38" ++dependencies = [ ++ "lalrpop", ++ "lalrpop-util", ++ "regex", ++] ++ ++[[package]] ++name = "bech32" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b" ++ ++[[package]] ++name = "bit-set" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" ++dependencies = [ ++ "bit-vec", ++] ++ ++[[package]] ++name = "bit-vec" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" ++ ++[[package]] ++name = "bitcoin" ++version = "0.28.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05bba324e6baf655b882df672453dbbc527bc938cadd27750ae510aaccc3a66a" ++dependencies = [ ++ "base64-compat", ++ "bech32", ++ "bitcoin_hashes", ++ "secp256k1", ++ "serde", ++] ++ ++[[package]] ++name = "bitcoin_hashes" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "006cc91e1a1d99819bc5b8214be3555c1f0611b169f527a1fdc54ed1f2b745b0" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "bitcoincore-rpc" ++version = "0.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd0e67dbf7a9971e7f4276f6089e9e814ce0f624a03216b7d92d00351ae7fb3e" ++dependencies = [ ++ "bitcoincore-rpc-json", ++ "jsonrpc", ++ "log", ++ "serde", ++ "serde_json", ++] ++ ++[[package]] ++name = "bitcoincore-rpc-json" ++version = "0.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e2ae16202721ba8c3409045681fac790a5ddc791f05731a2df22c0c6bffc0f1" ++dependencies = [ ++ "bitcoin", ++ "serde", ++ "serde_json", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "block-buffer" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" ++dependencies = [ ++ "block-padding", ++ "generic-array", ++] ++ ++[[package]] ++name = "block-buffer" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "block-padding" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" ++ ++[[package]] ++name = "blocking" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" ++dependencies = [ ++ "async-channel", ++ "async-task", ++ "atomic-waker", ++ "fastrand", ++ "futures-lite", ++ "once_cell", ++] ++ ++[[package]] ++name = "bstr" ++version = "0.2.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "buf_redux" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" ++dependencies = [ ++ "memchr", ++ "safemem", ++] ++ ++[[package]] ++name = "bumpalo" ++version = "3.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" ++ ++[[package]] ++name = "byteorder" ++version = "1.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++ ++[[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 = "cache-padded" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" ++ ++[[package]] ++name = "castaway" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" ++ ++[[package]] ++name = "cc" ++version = "1.0.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" ++ ++[[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 = "chacha20" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f08493fa7707effc63254c66c6ea908675912493cd67952eda23c09fae2610b1" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "cipher", ++ "cpufeatures", ++ "zeroize", ++] ++ ++[[package]] ++name = "chacha20poly1305" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6547abe025f4027edacd9edaa357aded014eecec42a5070d9b885c3c334aba2" ++dependencies = [ ++ "aead", ++ "chacha20", ++ "cipher", ++ "poly1305", ++ "zeroize", ++] ++ ++[[package]] ++name = "chrono" ++version = "0.4.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" ++dependencies = [ ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "chunked_transfer" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" ++ ++[[package]] ++name = "cipher" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "clap" ++version = "2.34.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "cln-plugin" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2043841c090a404cb81b145c8ad3c66bae122ba722387fc322b93c157d596433" ++dependencies = [ ++ "anyhow", ++ "bytes 1.2.1", ++ "cln-rpc", ++ "futures", ++ "log", ++ "serde", ++ "serde_json", ++ "tokio 1.21.2", ++ "tokio-stream", ++ "tokio-util 0.6.10", ++] ++ ++[[package]] ++name = "cln-rpc" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "18fb71ceca239c83a06fb494028b4a6b7b38ad4dd9c0410b7ea6013b90e15045" ++dependencies = [ ++ "anyhow", ++ "bytes 1.2.1", ++ "futures-util", ++ "hex", ++ "log", ++ "native-tls", ++ "serde", ++ "serde_json", ++ "tokio 1.21.2", ++ "tokio-util 0.6.10", ++] ++ ++[[package]] ++name = "colored" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" ++dependencies = [ ++ "atty", ++ "lazy_static", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "concurrent-queue" ++version = "1.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" ++dependencies = [ ++ "cache-padded", ++] ++ ++[[package]] ++name = "convert_case" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" ++ ++[[package]] ++name = "core-foundation" ++version = "0.9.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 = "cpufeatures" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "crunchy" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" ++ ++[[package]] ++name = "crypto-common" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" ++dependencies = [ ++ "generic-array", ++ "typenum", ++] ++ ++[[package]] ++name = "crypto-mac" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" ++dependencies = [ ++ "generic-array", ++ "subtle", ++] ++ ++[[package]] ++name = "ctor" ++version = "0.1.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" ++dependencies = [ ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "curl" ++version = "0.4.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" ++dependencies = [ ++ "curl-sys", ++ "libc", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "socket2 0.4.7", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "curl-sys" ++version = "0.4.56+curl-7.83.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6093e169dd4de29e468fa649fbae11cdcd5551c81fe5bf1b0677adad7ef3d26f" ++dependencies = [ ++ "cc", ++ "libc", ++ "libnghttp2-sys", ++ "libz-sys", ++ "openssl-sys", ++ "pkg-config", ++ "vcpkg", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "curve25519-dalek" ++version = "3.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" ++dependencies = [ ++ "byteorder", ++ "digest 0.9.0", ++ "rand_core 0.5.1", ++ "subtle", ++ "zeroize", ++] ++ ++[[package]] ++name = "data-encoding" ++version = "2.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" ++ ++[[package]] ++name = "der-oid-macro" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c73af209b6a5dc8ca7cbaba720732304792cddc933cfea3d74509c2b1ef2f436" ++dependencies = [ ++ "num-bigint", ++ "num-traits", ++ "syn", ++] ++ ++[[package]] ++name = "der-parser" ++version = "6.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4cddf120f700b411b2b02ebeb7f04dc0b7c8835909a6c2f52bf72ed0dd3433b2" ++dependencies = [ ++ "der-oid-macro", ++ "nom", ++ "num-bigint", ++ "num-traits", ++ "rusticata-macros", ++] ++ ++[[package]] ++name = "derive_more" ++version = "0.99.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" ++dependencies = [ ++ "convert_case", ++ "proc-macro2", ++ "quote", ++ "rustc_version", ++ "syn", ++] ++ ++[[package]] ++name = "diff" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" ++ ++[[package]] ++name = "digest" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "digest" ++version = "0.10.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" ++dependencies = [ ++ "block-buffer 0.10.3", ++ "crypto-common", ++] ++ ++[[package]] ++name = "dirs-next" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "dirs-sys-next", ++] ++ ++[[package]] ++name = "dirs-sys-next" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" ++dependencies = [ ++ "libc", ++ "redox_users", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "ed25519" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" ++dependencies = [ ++ "signature", ++] ++ ++[[package]] ++name = "ed25519-dalek" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" ++dependencies = [ ++ "curve25519-dalek", ++ "ed25519", ++ "rand 0.7.3", ++ "serde", ++ "sha2", ++ "zeroize", ++] ++ ++[[package]] ++name = "either" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" ++ ++[[package]] ++name = "ena" ++version = "0.14.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3" ++dependencies = [ ++ "log", ++] ++ ++[[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 = "event-listener" ++version = "2.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" ++ ++[[package]] ++name = "fallible-iterator" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" ++ ++[[package]] ++name = "fallible-streaming-iterator" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" ++ ++[[package]] ++name = "fastrand" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" ++dependencies = [ ++ "instant", ++] ++ ++[[package]] ++name = "fixedbitset" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" ++ ++[[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-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++dependencies = [ ++ "bitflags", ++ "fuchsia-zircon-sys", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++ ++[[package]] ++name = "futures" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-io", ++ "futures-sink", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-channel" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" ++dependencies = [ ++ "futures-core", ++ "futures-sink", ++] ++ ++[[package]] ++name = "futures-core" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" ++ ++[[package]] ++name = "futures-executor" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" ++dependencies = [ ++ "futures-core", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-io" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" ++ ++[[package]] ++name = "futures-lite" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" ++dependencies = [ ++ "fastrand", ++ "futures-core", ++ "futures-io", ++ "memchr", ++ "parking", ++ "pin-project-lite 0.2.9", ++ "waker-fn", ++] ++ ++[[package]] ++name = "futures-macro" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "futures-sink" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" ++ ++[[package]] ++name = "futures-task" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" ++ ++[[package]] ++name = "futures-util" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" ++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 = "generic-array" ++version = "0.14.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" ++dependencies = [ ++ "typenum", ++ "version_check", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.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.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "globset" ++version = "0.4.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" ++dependencies = [ ++ "aho-corasick", ++ "bstr", ++ "fnv", ++ "log", ++ "regex", ++] ++ ++[[package]] ++name = "gloo-timers" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "js-sys", ++ "wasm-bindgen", ++] ++ ++[[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 0.2.25", ++ "tokio-util 0.3.1", ++ "tracing", ++ "tracing-futures", ++] ++ ++[[package]] ++name = "h2" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" ++dependencies = [ ++ "bytes 1.2.1", ++ "fnv", ++ "futures-core", ++ "futures-sink", ++ "futures-util", ++ "http", ++ "indexmap", ++ "slab", ++ "tokio 1.21.2", ++ "tokio-util 0.7.4", ++ "tracing", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" ++dependencies = [ ++ "ahash", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" ++ ++[[package]] ++name = "hashlink" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" ++dependencies = [ ++ "hashbrown 0.11.2", ++] ++ ++[[package]] ++name = "headers" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" ++dependencies = [ ++ "base64", ++ "bitflags", ++ "bytes 1.2.1", ++ "headers-core", ++ "http", ++ "httpdate 1.0.2", ++ "mime", ++ "sha1", ++] ++ ++[[package]] ++name = "headers-core" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" ++dependencies = [ ++ "http", ++] ++ ++[[package]] ++name = "heck" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" ++dependencies = [ ++ "unicode-segmentation", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "hex" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "hmac" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" ++dependencies = [ ++ "crypto-mac", ++ "digest 0.9.0", ++] ++ ++[[package]] ++name = "home" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[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.3", ++] ++ ++[[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 = "http-body" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" ++dependencies = [ ++ "bytes 1.2.1", ++ "http", ++ "pin-project-lite 0.2.9", ++] ++ ++[[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 = "httpdate" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" ++ ++[[package]] ++name = "httpmock" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c159c4fc205e6c1a9b325cb7ec135d13b5f47188ce175dabb76ec847f331d9bd" ++dependencies = [ ++ "assert-json-diff", ++ "async-object-pool", ++ "async-trait", ++ "base64", ++ "basic-cookies", ++ "crossbeam-utils", ++ "form_urlencoded", ++ "futures-util", ++ "hyper 0.14.20", ++ "isahc", ++ "lazy_static", ++ "levenshtein", ++ "log", ++ "regex", ++ "serde", ++ "serde_json", ++ "serde_regex", ++ "similar", ++ "tokio 1.21.2", ++ "url", ++] ++ ++[[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 0.2.7", ++ "http", ++ "http-body 0.3.1", ++ "httparse", ++ "httpdate 0.3.2", ++ "itoa 0.4.8", ++ "pin-project", ++ "socket2 0.3.19", ++ "tokio 0.2.25", ++ "tower-service", ++ "tracing", ++ "want", ++] ++ ++[[package]] ++name = "hyper" ++version = "0.14.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" ++dependencies = [ ++ "bytes 1.2.1", ++ "futures-channel", ++ "futures-core", ++ "futures-util", ++ "h2 0.3.14", ++ "http", ++ "http-body 0.4.5", ++ "httparse", ++ "httpdate 1.0.2", ++ "itoa 1.0.3", ++ "pin-project-lite 0.2.9", ++ "socket2 0.4.7", ++ "tokio 1.21.2", ++ "tower-service", ++ "tracing", ++ "want", ++] ++ ++[[package]] ++name = "hyper-timeout" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" ++dependencies = [ ++ "hyper 0.14.20", ++ "pin-project-lite 0.2.9", ++ "tokio 1.21.2", ++ "tokio-io-timeout", ++] ++ ++[[package]] ++name = "hyper-tls" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" ++dependencies = [ ++ "bytes 1.2.1", ++ "hyper 0.14.20", ++ "native-tls", ++ "tokio 1.21.2", ++ "tokio-native-tls", ++] ++ ++[[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.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" ++dependencies = [ ++ "autocfg", ++ "hashbrown 0.12.3", ++] ++ ++[[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.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" ++ ++[[package]] ++name = "isahc" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" ++dependencies = [ ++ "async-channel", ++ "castaway", ++ "crossbeam-utils", ++ "curl", ++ "curl-sys", ++ "encoding_rs", ++ "event-listener", ++ "futures-lite", ++ "http", ++ "log", ++ "mime", ++ "once_cell", ++ "polling", ++ "slab", ++ "sluice", ++ "tracing", ++ "tracing-futures", ++ "url", ++ "waker-fn", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.10.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" ++ ++[[package]] ++name = "itoa" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" ++ ++[[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 = "jsonrpc" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f8423b78fc94d12ef1a4a9d13c348c9a78766dda0cc18817adf0faf77e670c8" ++dependencies = [ ++ "base64-compat", ++ "serde", ++ "serde_derive", ++ "serde_json", ++] ++ ++[[package]] ++name = "jsonrpc-core" ++version = "17.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e" ++dependencies = [ ++ "futures", ++ "futures-executor", ++ "futures-util", ++ "log", ++ "serde", ++ "serde_derive", ++ "serde_json", ++] ++ ++[[package]] ++name = "jsonrpc-http-server" ++version = "17.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "522a047cac0958097ee71d047dd71cb84979fd2fa21c7a68fbe12736bef870a2" ++dependencies = [ ++ "futures", ++ "hyper 0.13.10", ++ "jsonrpc-core", ++ "jsonrpc-server-utils", ++ "log", ++ "net2", ++ "parking_lot 0.11.2", ++ "unicase", ++] ++ ++[[package]] ++name = "jsonrpc-server-utils" ++version = "17.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bce68fa279a2822b3619369cd024f8a4f8e5ce485468834f8679a3c7919aae2d" ++dependencies = [ ++ "bytes 0.5.6", ++ "futures", ++ "globset", ++ "jsonrpc-core", ++ "lazy_static", ++ "log", ++ "tokio 0.2.25", ++ "tokio-util 0.3.1", ++ "unicase", ++] ++ ++[[package]] ++name = "keccak" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] ++ ++[[package]] ++name = "kv-log-macro" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" ++dependencies = [ ++ "log", ++] ++ ++[[package]] ++name = "lalrpop" ++version = "0.19.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823" ++dependencies = [ ++ "ascii-canvas", ++ "atty", ++ "bit-set", ++ "diff", ++ "ena", ++ "itertools", ++ "lalrpop-util", ++ "petgraph", ++ "pico-args", ++ "regex", ++ "regex-syntax", ++ "string_cache", ++ "term", ++ "tiny-keccak", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "lalrpop-util" ++version = "0.19.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4" ++dependencies = [ ++ "regex", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "levenshtein" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" ++ ++[[package]] ++name = "libc" ++version = "0.2.133" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" ++ ++[[package]] ++name = "libnghttp2-sys" ++version = "0.1.7+1.45.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" ++dependencies = [ ++ "cc", ++ "libc", ++] ++ ++[[package]] ++name = "libsqlite3-sys" ++version = "0.23.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2cafc7c74096c336d9d27145f7ebd4f4b6f95ba16aa5a282387267e6925cb58" ++dependencies = [ ++ "cc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "libz-sys" ++version = "1.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "lightning" ++version = "0.0.108" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d885bf509066af86ae85354c8959028ad6192c22a2657ef8271e94029d30f9d0" ++dependencies = [ ++ "bitcoin", ++] ++ ++[[package]] ++name = "lightning-block-sync" ++version = "0.0.108" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8f1ed50f41785af19f5cd1225b668e87ef0d59bb84e6f8ef2542933e6082a2c" ++dependencies = [ ++ "bitcoin", ++ "chunked_transfer", ++ "futures", ++ "lightning", ++ "serde", ++ "serde_json", ++] ++ ++[[package]] ++name = "lightning-net-tokio" ++version = "0.0.108" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2f0170619152c4d6b947d5ed0de427b85691482a293e0cae52d4336a2220a776" ++dependencies = [ ++ "bitcoin", ++ "lightning", ++ "tokio 1.21.2", ++] ++ ++[[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", ++ "value-bag", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" ++ ++[[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 = "mio" ++version = "0.6.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "fuchsia-zircon", ++ "fuchsia-zircon-sys", ++ "iovec", ++ "kernel32-sys", ++ "libc", ++ "log", ++ "miow", ++ "net2", ++ "slab", ++ "winapi 0.2.8", ++] ++ ++[[package]] ++name = "mio" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" ++dependencies = [ ++ "libc", ++ "log", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++ "windows-sys", ++] ++ ++[[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 = "multimap" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" ++ ++[[package]] ++name = "multipart" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182" ++dependencies = [ ++ "buf_redux", ++ "httparse", ++ "log", ++ "mime", ++ "mime_guess", ++ "quick-error", ++ "rand 0.8.5", ++ "safemem", ++ "tempfile", ++ "twoway", ++] ++ ++[[package]] ++name = "native-tls" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" ++dependencies = [ ++ "lazy_static", ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "new_debug_unreachable" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" ++ ++[[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.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.45" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" ++dependencies = [ ++ "autocfg", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "num_threads" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "oid-registry" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fe554cb2393bc784fd678c82c84cc0599c31ceadc7f03a594911f822cb8d1815" ++dependencies = [ ++ "der-parser", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" ++ ++[[package]] ++name = "opaque-debug" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" ++ ++[[package]] ++name = "openssl" ++version = "0.10.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-src" ++version = "111.22.0+1.1.1q" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.76" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" ++dependencies = [ ++ "autocfg", ++ "cc", ++ "libc", ++ "openssl-src", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "parking" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" ++ ++[[package]] ++name = "parking_lot" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" ++dependencies = [ ++ "instant", ++ "lock_api", ++ "parking_lot_core 0.8.5", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" ++dependencies = [ ++ "lock_api", ++ "parking_lot_core 0.9.3", ++] ++ ++[[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", ++ "smallvec", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "redox_syscall", ++ "smallvec", ++ "windows-sys", ++] ++ ++[[package]] ++name = "pem" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" ++dependencies = [ ++ "base64", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" ++ ++[[package]] ++name = "petgraph" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" ++dependencies = [ ++ "fixedbitset", ++ "indexmap", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" ++dependencies = [ ++ "siphasher", ++] ++ ++[[package]] ++name = "pico-args" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" ++ ++[[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.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" ++ ++[[package]] ++name = "polling" ++version = "2.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011" ++dependencies = [ ++ "autocfg", ++ "cfg-if 1.0.0", ++ "libc", ++ "log", ++ "wepoll-ffi", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "poly1305" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" ++dependencies = [ ++ "cpufeatures", ++ "opaque-debug", ++ "universal-hash", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" ++ ++[[package]] ++name = "precomputed-hash" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" ++ ++[[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.46" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "prost" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" ++dependencies = [ ++ "bytes 1.2.1", ++ "prost-derive 0.8.0", ++] ++ ++[[package]] ++name = "prost" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" ++dependencies = [ ++ "bytes 1.2.1", ++ "prost-derive 0.9.0", ++] ++ ++[[package]] ++name = "prost-build" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" ++dependencies = [ ++ "bytes 1.2.1", ++ "heck", ++ "itertools", ++ "lazy_static", ++ "log", ++ "multimap", ++ "petgraph", ++ "prost 0.9.0", ++ "prost-types", ++ "regex", ++ "tempfile", ++ "which", ++] ++ ++[[package]] ++name = "prost-derive" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" ++dependencies = [ ++ "anyhow", ++ "itertools", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "prost-derive" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" ++dependencies = [ ++ "anyhow", ++ "itertools", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "prost-types" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" ++dependencies = [ ++ "bytes 1.2.1", ++ "prost 0.9.0", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" ++ ++[[package]] ++name = "quote" ++version = "1.0.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" ++dependencies = [ ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.3.1", ++ "rdrand", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom 0.1.16", ++ "libc", ++ "rand_chacha 0.2.2", ++ "rand_core 0.5.1", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" ++dependencies = [ ++ "libc", ++ "rand_chacha 0.3.1", ++ "rand_core 0.6.4", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.6.4", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++dependencies = [ ++ "rand_core 0.4.2", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom 0.1.16", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" ++dependencies = [ ++ "getrandom 0.2.7", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rcgen" ++version = "0.8.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5911d1403f4143c9d56a702069d593e8d0f3fab880a85e103604d0893ea31ba7" ++dependencies = [ ++ "chrono", ++ "pem", ++ "ring", ++ "x509-parser", ++ "yasna", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++dependencies = [ ++ "rand_core 0.3.1", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "redox_users" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" ++dependencies = [ ++ "getrandom 0.2.7", ++ "redox_syscall", ++ "thiserror", ++] ++ ++[[package]] ++name = "regex" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" ++ ++[[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.11.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" ++dependencies = [ ++ "base64", ++ "bytes 1.2.1", ++ "encoding_rs", ++ "futures-core", ++ "futures-util", ++ "h2 0.3.14", ++ "http", ++ "http-body 0.4.5", ++ "hyper 0.14.20", ++ "hyper-tls", ++ "ipnet", ++ "js-sys", ++ "log", ++ "mime", ++ "native-tls", ++ "once_cell", ++ "percent-encoding", ++ "pin-project-lite 0.2.9", ++ "serde", ++ "serde_json", ++ "serde_urlencoded", ++ "tokio 1.21.2", ++ "tokio-native-tls", ++ "tokio-socks", ++ "tower-service", ++ "url", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", ++ "winreg", ++] ++ ++[[package]] ++name = "ring" ++version = "0.16.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" ++dependencies = [ ++ "cc", ++ "libc", ++ "once_cell", ++ "spin", ++ "untrusted", ++ "web-sys", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "rusqlite" ++version = "0.26.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ba4d3462c8b2e4d7f4fcfcf2b296dc6b65404fbbc7b63daa37fd485c149daf7" ++dependencies = [ ++ "bitflags", ++ "fallible-iterator", ++ "fallible-streaming-iterator", ++ "hashlink", ++ "libsqlite3-sys", ++ "memchr", ++ "smallvec", ++] ++ ++[[package]] ++name = "rustc_version" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" ++dependencies = [ ++ "semver", ++] ++ ++[[package]] ++name = "rusticata-macros" ++version = "4.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" ++dependencies = [ ++ "nom", ++] ++ ++[[package]] ++name = "rustls" ++version = "0.19.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" ++dependencies = [ ++ "base64", ++ "log", ++ "ring", ++ "sct", ++ "webpki", ++] ++ ++[[package]] ++name = "rustls-pemfile" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" ++dependencies = [ ++ "base64", ++] ++ ++[[package]] ++name = "rustversion" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" ++ ++[[package]] ++name = "ryu" ++version = "1.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" ++ ++[[package]] ++name = "safemem" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" ++ ++[[package]] ++name = "schannel" ++version = "0.1.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" ++dependencies = [ ++ "lazy_static", ++ "windows-sys", ++] ++ ++[[package]] ++name = "scoped-tls" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "sct" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" ++dependencies = [ ++ "ring", ++ "untrusted", ++] ++ ++[[package]] ++name = "secp256k1" ++version = "0.22.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26947345339603ae8395f68e2f3d85a6b0a8ddfe6315818e80b8504415099db0" ++dependencies = [ ++ "secp256k1-sys", ++ "serde", ++] ++ ++[[package]] ++name = "secp256k1-sys" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "152e20a0fd0519390fc43ab404663af8a0b794273d2a91d60ad4a39f13ffe110" ++dependencies = [ ++ "cc", ++] ++ ++[[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 = "1.0.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" ++ ++[[package]] ++name = "serde" ++version = "1.0.145" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.145" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.85" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" ++dependencies = [ ++ "indexmap", ++ "itoa 1.0.3", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "serde_regex" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" ++dependencies = [ ++ "regex", ++ "serde", ++] ++ ++[[package]] ++name = "serde_urlencoded" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" ++dependencies = [ ++ "form_urlencoded", ++ "itoa 1.0.3", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "sha-1" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "cpufeatures", ++ "digest 0.10.5", ++] ++ ++[[package]] ++name = "sha1" ++version = "0.10.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "cpufeatures", ++ "digest 0.10.5", ++] ++ ++[[package]] ++name = "sha2" ++version = "0.9.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" ++dependencies = [ ++ "block-buffer 0.9.0", ++ "cfg-if 1.0.0", ++ "cpufeatures", ++ "digest 0.9.0", ++ "opaque-debug", ++] ++ ++[[package]] ++name = "sha3" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" ++dependencies = [ ++ "block-buffer 0.9.0", ++ "digest 0.9.0", ++ "keccak", ++ "opaque-debug", ++] ++ ++[[package]] ++name = "signal-hook" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" ++dependencies = [ ++ "libc", ++ "signal-hook-registry", ++] ++ ++[[package]] ++name = "signal-hook-registry" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "signature" ++version = "1.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "deb766570a2825fa972bceff0d195727876a9cdf2460ab2e52d455dc2de47fd9" ++ ++[[package]] ++name = "similar" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803" ++ ++[[package]] ++name = "simple_logger" ++version = "2.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48047e77b528151aaf841a10a9025f9459da80ba820e425ff7eb005708a76dc7" ++dependencies = [ ++ "atty", ++ "colored", ++ "log", ++ "time", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "siphasher" ++version = "0.3.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" ++ ++[[package]] ++name = "slab" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "sluice" ++version = "0.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" ++dependencies = [ ++ "async-channel", ++ "futures-core", ++ "futures-io", ++] ++ ++[[package]] ++name = "smallvec" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" ++ ++[[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 = "socket2" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" ++dependencies = [ ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "spin" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" ++ ++[[package]] ++name = "string_cache" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" ++dependencies = [ ++ "new_debug_unreachable", ++ "once_cell", ++ "parking_lot 0.12.1", ++ "phf_shared", ++ "precomputed-hash", ++] ++ ++[[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.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" ++dependencies = [ ++ "clap", ++ "lazy_static", ++ "structopt-derive", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.4.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" ++dependencies = [ ++ "heck", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "subtle" ++version = "2.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" ++ ++[[package]] ++name = "syn" ++version = "1.0.101" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" ++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 = "tempdir" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" ++dependencies = [ ++ "rand 0.4.6", ++ "remove_dir_all", ++] ++ ++[[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", ++ "remove_dir_all", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "teos" ++version = "0.1.2" ++dependencies = [ ++ "bitcoin", ++ "bitcoincore-rpc", ++ "hex", ++ "home", ++ "jsonrpc-http-server", ++ "lightning", ++ "lightning-block-sync", ++ "lightning-net-tokio", ++ "log", ++ "prost 0.9.0", ++ "rand 0.8.5", ++ "rcgen", ++ "rusqlite", ++ "serde", ++ "serde_json", ++ "simple_logger", ++ "structopt", ++ "tempdir", ++ "teos-common", ++ "tokio 1.21.2", ++ "tokio-stream", ++ "toml", ++ "tonic 0.6.2", ++ "tonic-build", ++ "torut", ++ "triggered", ++ "warp", ++] ++ ++[[package]] ++name = "teos-common" ++version = "0.1.2" ++dependencies = [ ++ "bitcoin", ++ "chacha20poly1305", ++ "hex", ++ "lightning", ++ "prost 0.9.0", ++ "rand 0.8.5", ++ "rusqlite", ++ "serde", ++ "serde_json", ++ "tonic 0.6.2", ++ "tonic-build", ++] ++ ++[[package]] ++name = "term" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" ++dependencies = [ ++ "dirs-next", ++ "rustversion", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.37" ++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 = "time" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" ++dependencies = [ ++ "itoa 1.0.3", ++ "libc", ++ "num_threads", ++ "time-macros", ++] ++ ++[[package]] ++name = "time-macros" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" ++ ++[[package]] ++name = "tiny-keccak" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" ++dependencies = [ ++ "crunchy", ++] ++ ++[[package]] ++name = "tinyvec" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" ++dependencies = [ ++ "tinyvec_macros", ++] ++ ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.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", ++ "memchr", ++ "mio 0.6.23", ++ "num_cpus", ++ "pin-project-lite 0.1.12", ++ "slab", ++] ++ ++[[package]] ++name = "tokio" ++version = "1.21.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" ++dependencies = [ ++ "autocfg", ++ "bytes 1.2.1", ++ "libc", ++ "memchr", ++ "mio 0.8.4", ++ "num_cpus", ++ "pin-project-lite 0.2.9", ++ "signal-hook-registry", ++ "socket2 0.4.7", ++ "tokio-macros", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "tokio-io-timeout" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" ++dependencies = [ ++ "pin-project-lite 0.2.9", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "tokio-macros" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tokio-native-tls" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" ++dependencies = [ ++ "native-tls", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "tokio-rustls" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" ++dependencies = [ ++ "rustls", ++ "tokio 1.21.2", ++ "webpki", ++] ++ ++[[package]] ++name = "tokio-socks" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" ++dependencies = [ ++ "either", ++ "futures-util", ++ "thiserror", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "tokio-stream" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af" ++dependencies = [ ++ "futures-core", ++ "pin-project-lite 0.2.9", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "tokio-tungstenite" ++version = "0.17.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" ++dependencies = [ ++ "futures-util", ++ "log", ++ "tokio 1.21.2", ++ "tungstenite", ++] ++ ++[[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 0.2.25", ++] ++ ++[[package]] ++name = "tokio-util" ++version = "0.6.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" ++dependencies = [ ++ "bytes 1.2.1", ++ "futures-core", ++ "futures-sink", ++ "log", ++ "pin-project-lite 0.2.9", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "tokio-util" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" ++dependencies = [ ++ "bytes 1.2.1", ++ "futures-core", ++ "futures-sink", ++ "pin-project-lite 0.2.9", ++ "tokio 1.21.2", ++ "tracing", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "tonic" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "796c5e1cd49905e65dd8e700d4cb1dffcbfdb4fc9d017de08c1a537afd83627c" ++dependencies = [ ++ "async-stream", ++ "async-trait", ++ "base64", ++ "bytes 1.2.1", ++ "futures-core", ++ "futures-util", ++ "h2 0.3.14", ++ "http", ++ "http-body 0.4.5", ++ "hyper 0.14.20", ++ "hyper-timeout", ++ "percent-encoding", ++ "pin-project", ++ "prost 0.8.0", ++ "prost-derive 0.8.0", ++ "tokio 1.21.2", ++ "tokio-rustls", ++ "tokio-stream", ++ "tokio-util 0.6.10", ++ "tower", ++ "tower-layer", ++ "tower-service", ++ "tracing", ++ "tracing-futures", ++] ++ ++[[package]] ++name = "tonic" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" ++dependencies = [ ++ "async-stream", ++ "async-trait", ++ "base64", ++ "bytes 1.2.1", ++ "futures-core", ++ "futures-util", ++ "h2 0.3.14", ++ "http", ++ "http-body 0.4.5", ++ "hyper 0.14.20", ++ "hyper-timeout", ++ "percent-encoding", ++ "pin-project", ++ "prost 0.9.0", ++ "prost-derive 0.9.0", ++ "tokio 1.21.2", ++ "tokio-rustls", ++ "tokio-stream", ++ "tokio-util 0.6.10", ++ "tower", ++ "tower-layer", ++ "tower-service", ++ "tracing", ++ "tracing-futures", ++] ++ ++[[package]] ++name = "tonic-build" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" ++dependencies = [ ++ "proc-macro2", ++ "prost-build", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "torut" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "99febc413f26cf855b3a309c5872edff5c31e0ffe9c2fce5681868761df36f69" ++dependencies = [ ++ "base32", ++ "base64", ++ "derive_more", ++ "ed25519-dalek", ++ "hex", ++ "hmac", ++ "rand 0.7.3", ++ "serde", ++ "serde_derive", ++ "sha2", ++ "sha3", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "tower" ++version = "0.4.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" ++dependencies = [ ++ "futures-core", ++ "futures-util", ++ "indexmap", ++ "pin-project", ++ "pin-project-lite 0.2.9", ++ "rand 0.8.5", ++ "slab", ++ "tokio 1.21.2", ++ "tokio-util 0.7.4", ++ "tower-layer", ++ "tower-service", ++ "tracing", ++] ++ ++[[package]] ++name = "tower-layer" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" ++ ++[[package]] ++name = "tower-service" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" ++ ++[[package]] ++name = "tracing" ++version = "0.1.36" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "log", ++ "pin-project-lite 0.2.9", ++ "tracing-attributes", ++ "tracing-core", ++] ++ ++[[package]] ++name = "tracing-attributes" ++version = "0.1.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tracing-core" ++version = "0.1.29" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" ++dependencies = [ ++ "once_cell", ++] ++ ++[[package]] ++name = "tracing-futures" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" ++dependencies = [ ++ "pin-project", ++ "tracing", ++] ++ ++[[package]] ++name = "triggered" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ce148eae0d1a376c1b94ae651fc3261d9cb8294788b962b7382066376503a2d1" ++ ++[[package]] ++name = "try-lock" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" ++ ++[[package]] ++name = "tungstenite" ++version = "0.17.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" ++dependencies = [ ++ "base64", ++ "byteorder", ++ "bytes 1.2.1", ++ "http", ++ "httparse", ++ "log", ++ "rand 0.8.5", ++ "sha-1", ++ "thiserror", ++ "url", ++ "utf-8", ++] ++ ++[[package]] ++name = "twoway" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "typenum" ++version = "1.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" ++ ++[[package]] ++name = "unicase" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" ++dependencies = [ ++ "version_check", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" ++ ++[[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 = "universal-hash" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" ++dependencies = [ ++ "generic-array", ++ "subtle", ++] ++ ++[[package]] ++name = "untrusted" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" ++ ++[[package]] ++name = "url" ++version = "2.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" ++dependencies = [ ++ "form_urlencoded", ++ "idna", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "utf-8" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" ++ ++[[package]] ++name = "value-bag" ++version = "1.0.0-alpha.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" ++dependencies = [ ++ "ctor", ++ "version_check", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" ++ ++[[package]] ++name = "version_check" ++version = "0.9.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" ++ ++[[package]] ++name = "waker-fn" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" ++ ++[[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 = "warp" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ed7b8be92646fc3d18b06147664ebc5f48d222686cb11a8755e561a735aacc6d" ++dependencies = [ ++ "bytes 1.2.1", ++ "futures-channel", ++ "futures-util", ++ "headers", ++ "http", ++ "hyper 0.14.20", ++ "log", ++ "mime", ++ "mime_guess", ++ "multipart", ++ "percent-encoding", ++ "pin-project", ++ "rustls-pemfile", ++ "scoped-tls", ++ "serde", ++ "serde_json", ++ "serde_urlencoded", ++ "tokio 1.21.2", ++ "tokio-stream", ++ "tokio-tungstenite", ++ "tokio-util 0.7.4", ++ "tower-service", ++ "tracing", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wasi" ++version = "0.11.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "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 = "watchtower-plugin" ++version = "0.1.2" ++dependencies = [ ++ "backoff", ++ "bitcoin", ++ "cln-plugin", ++ "hex", ++ "home", ++ "httpmock", ++ "log", ++ "reqwest", ++ "rusqlite", ++ "serde", ++ "serde_json", ++ "tempdir", ++ "teos-common", ++ "tokio 1.21.2", ++ "tonic 0.5.2", ++] ++ ++[[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 = "webpki" ++version = "0.21.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" ++dependencies = [ ++ "ring", ++ "untrusted", ++] ++ ++[[package]] ++name = "wepoll-ffi" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "which" ++version = "4.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" ++dependencies = [ ++ "either", ++ "libc", ++ "once_cell", ++] ++ ++[[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-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.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" ++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 = "x509-parser" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ffc90836a84cb72e6934137b1504d0cae304ef5d83904beb0c8d773bbfe256ed" ++dependencies = [ ++ "base64", ++ "chrono", ++ "data-encoding", ++ "der-parser", ++ "lazy_static", ++ "nom", ++ "oid-registry", ++ "ring", ++ "rusticata-macros", ++ "thiserror", ++] ++ ++[[package]] ++name = "yasna" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e262a29d0e61ccf2b6190d7050d4b237535fc76ce4c1210d9caa316f71dffa75" ++dependencies = [ ++ "chrono", ++] ++ ++[[package]] ++name = "zeroize" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" ++dependencies = [ ++ "zeroize_derive", ++] ++ ++[[package]] ++name = "zeroize_derive" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "synstructure", ++] diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix new file mode 100644 index 0000000000000..197246770d0dc --- /dev/null +++ b/pkgs/applications/blockchains/teos/default.nix @@ -0,0 +1,80 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, llvmPackages +, openssl +, perl +, protobuf +, rustfmt +, Security +, SystemConfiguration +}: + +let + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "talaia-labs"; + repo = "rust-teos"; + rev = "v${version}"; + hash = "sha256-N+srREYsADMTqz3uDXpeCuXrZZ62FopXO7DClGfyk9U="; + }; + + common.meta = with lib; { + homepage = "https://github.com/talaia-labs/rust-teos"; + license = licenses.mit; + maintainers = with maintainers; [ seberm ]; + platforms = platforms.unix; + }; + + cargoPatches = [ ./add-cargo-lock.patch ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + + nativeBuildInputs = [ + perl # used by openssl-sys to configure + protobuf + rustfmt + llvmPackages.clang + ]; + + + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; +in +{ + teos = rustPlatform.buildRustPackage { + pname = "teos"; + cargoSha256 = "sha256-7VYYYSMJ2JP1KuA8sD0X3wInubH/jbA/sgzsTsomyEc="; + buildAndTestSubdir = "teos"; + + inherit version src cargoPatches buildInputs nativeBuildInputs LIBCLANG_PATH; + + meta = common.meta // { + description = "A Lightning watchtower compliant with BOLT13, written in Rust"; + }; + + cargoTestFlags = [ + "--workspace" + ]; + }; + + teos-watchtower-plugin = rustPlatform.buildRustPackage { + pname = "teos-watchtower-plugin"; + cargoSha256 = "sha256-xL+DiEfgBYJQ1UJm7LAr1/f34pkU8FRl4Seic8MFAlM="; + buildAndTestSubdir = "watchtower-plugin"; + + inherit version src cargoPatches buildInputs nativeBuildInputs LIBCLANG_PATH; + + meta = common.meta // { + description = "A Lightning watchtower plugin for clightning"; + }; + + # The test is skipped due to following error: + # thread 'retrier::tests::test_manage_retry_unreachable' panicked at 'assertion failed: + # wt_client.lock().unwrap().towers.get(&tower_id).unwrap().status.is_unreachable()', watchtower-plugin/src/retrier.rs:518:9 + checkFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "--skip=retrier::tests::test_manage_retry_unreachable" ]; + }; +} diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 20520037a60c1..c4d007f290773 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { postPatch = '' # Have to do this here instead of in preConfigure because # cargoDepsCopy gets unset after postPatch. - configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy") + configureFlagsArray+=("RUST_VENDORED_SOURCES=$cargoDepsCopy") ''; CXXFLAGS = [ diff --git a/pkgs/applications/display-managers/greetd/default.nix b/pkgs/applications/display-managers/greetd/default.nix new file mode 100644 index 0000000000000..744b43f6f8aa4 --- /dev/null +++ b/pkgs/applications/display-managers/greetd/default.nix @@ -0,0 +1,51 @@ +{ rustPlatform +, lib +, fetchFromSourcehut +, pam +, scdoc +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "greetd"; + version = "0.8.0"; + + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = pname; + rev = version; + sha256 = "sha256-20D6HanUeAc0S9czkNJFmhsrfEqodpafkHsmwKccrHQ="; + }; + + cargoHash = "sha256-8nMQ81Y0DnPs9WmxNASlcjTEVw5lh+nZtZ7vmmBCu2g="; + + nativeBuildInputs = [ + scdoc + installShellFiles + ]; + + buildInputs = [ + pam + ]; + + postInstall = '' + for f in man/*; do + scdoc < "$f" > "$(sed 's/-\([0-9]\)\.scd$/.\1/' <<< "$f")" + rm "$f" + done + installManPage man/* + ''; + + meta = with lib; { + description = "Minimal and flexible login manager daemon"; + longDescription = '' + greetd is a minimal and flexible login manager daemon + that makes no assumptions about what you want to launch. + Comes with agreety, a simple, text-based greeter. + ''; + homepage = "https://sr.ht/~kennylevinsen/greetd/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/display-managers/greetd/dlm.nix b/pkgs/applications/display-managers/greetd/dlm.nix new file mode 100644 index 0000000000000..3b6f4773a29cf --- /dev/null +++ b/pkgs/applications/display-managers/greetd/dlm.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromSourcehut +}: + +rustPlatform.buildRustPackage rec { + pname = "dlm"; + version = "2020-01-07"; + + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = pname; + rev = "6b0e11c4f453b1a4d7a32019227539a980b7ce66"; + sha256 = "1r3w7my0g3v2ya317qnvjx8wnagjahpj7yx72a65hf2pjbf5x42p"; + }; + + cargoSha256 = "01a8k60qnx2pgxb2adgw30c2hjb60w6230khm5hyqgmp7z4rm8k8"; + + meta = with lib; { + description = "A stupid simple graphical login manager"; + homepage = "https://git.sr.ht/~kennylevinsen/dlm"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/display-managers/greetd/gtkgreet.nix b/pkgs/applications/display-managers/greetd/gtkgreet.nix new file mode 100644 index 0000000000000..e0ebbb3bc4c26 --- /dev/null +++ b/pkgs/applications/display-managers/greetd/gtkgreet.nix @@ -0,0 +1,53 @@ +{ stdenv +, lib +, fetchFromSourcehut +, pkg-config +, cmake +, meson +, ninja +, gtk3 +, gtk-layer-shell +, json_c +, scdoc +}: + +stdenv.mkDerivation rec { + pname = "gtkgreet"; + version = "0.7"; + + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = pname; + rev = version; + sha256 = "ms+2FdtzzNlmlzNxFhu4cpX5H+5H+9ZOtZ0p8uVA3lo="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + cmake + ]; + + buildInputs = [ + gtk3 + gtk-layer-shell + json_c + scdoc + ]; + + mesonFlags = [ + "-Dlayershell=enabled" + ]; + + # G_APPLICATION_FLAGS_NONE is deprecated in GLib 2.73.3+. + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + + meta = with lib; { + description = "GTK based greeter for greetd, to be run under cage or similar"; + homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/display-managers/greetd/tuigreet.nix b/pkgs/applications/display-managers/greetd/tuigreet.nix new file mode 100644 index 0000000000000..8660c4a1a49cf --- /dev/null +++ b/pkgs/applications/display-managers/greetd/tuigreet.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "tuigreet"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "apognu"; + repo = pname; + rev = version; + sha256 = "sha256-8/2I6bk29/GqZ1ACuN9RgBiGAy7yt0iw2fagHfu4/BI="; + }; + + cargoSha256 = "sha256-fOs9a0/1c8Kh4JA5up3XSQ+km/FwSYzl0w4UDL4yU4M="; + + meta = with lib; { + description = "Graphical console greeter for greetd"; + homepage = "https://github.com/apognu/tuigreet"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ luc65r ivar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/display-managers/greetd/wlgreet.nix b/pkgs/applications/display-managers/greetd/wlgreet.nix new file mode 100644 index 0000000000000..932aa47fd7146 --- /dev/null +++ b/pkgs/applications/display-managers/greetd/wlgreet.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromSourcehut +}: + +rustPlatform.buildRustPackage rec { + pname = "wlgreet-unstable"; + version = "2022-01-25"; + + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = "wlgreet"; + rev = "8517e578cb64a8fb3bd8f8a438cdbe46f208b87c"; + sha256 = "0la4xlikw61cxvbkil1d22dgvazi7rs17n5i2z02090fvnfxxzxh"; + }; + + cargoSha256 = "651d2bf01612534f1c4b0472c812095a86eb064d16879380c87f684c04fe0d8d"; + + meta = with lib; { + description = "Raw wayland greeter for greetd, to be run under sway or similar"; + homepage = "https://git.sr.ht/~kennylevinsen/wlgreet"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index e84f305526b49..cd406686df86e 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter -, dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs -, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: +, dbus, pcre, libepoxy, xorg, at-spi2-core, libxklavier, libxkbcommon +, gtk3, vala, cmake, libgee, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: stdenv.mkDerivation { pname = "lightdm-enso-os-greeter"; @@ -30,15 +30,15 @@ stdenv.mkDerivation { pcre libepoxy libgee - libX11 + xorg.libX11 lightdm - libXdmcp + xorg.libXdmcp gdk-pixbuf clutter-gtk libxklavier at-spi2-core libxkbcommon - libpthreadstubs + xorg.libpthreadstubs librsvg ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b25ee1ac6cdc1..976cfb95fd0c2 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,16 +10,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2021.2.1.15"; # "Android Studio Chipmunk (2021.2.1)" - sha256Hash = "ABjg38DdKSFwBRb3osRDN3xVd4jaf7CkUkPstDAHRb4="; + version = "2021.3.1.16"; # "Android Studio Dolphin (2021.3.1)" + sha256Hash = "GnJbWFeG9DuUQzbK9wM2BEbj9LXm4jQFf/Eh5Q75HZo="; }; betaVersion = { - version = "2021.3.1.14"; # "Android Studio Dolphin (2021.3.1) Beta 5" - sha256Hash = "k1Qt54u45rwHsQNz9TVqnFB65kBKtfFZ3OknpfutKPI="; + version = "2022.1.1.12"; # "Android Studio Electric Eel (2022.1.1) Beta 2" + sha256Hash = "8iSFPH0PTQkzV1t8bEq7CBtOU8pzdnD/PrpVcgPnO6Q="; }; latestVersion = { # canary & dev - version = "2022.1.1.8"; # "Android Studio Electric Eel (2022.1.1) Canary 8" - sha256Hash = "0bZXx4YpMztLAnwuBaSaNT3GJNfYnqCDanwR+Q7qyUc="; + version = "2022.2.1.2"; # "Android Studio Flamingo (2022.2.1) Canary 2" + sha256Hash = "hlHlgyl9If2LH4aExpElx0rqmWeoFX+qx4w6RRb5e8U="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index bed21ea5c3af2..74668bccacf2c 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.171.0"; + version = "1.172.5"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-+NTxZ5UkmaFDcTYliNi/5c8xGztVu6P8C7Ga99MHSFM="; + hash = "sha256-bet0hLplxTjizYhRKDqafsps1kULW8jves1faEeLAKE="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 529c66125e877..4af7813e75a71 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,13 +16,13 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.09.18", - "hash": "sha256-HjW4V7MctQoHbDYIlMv7VS0nS7FFG6Qir0sCju+isI0=" + "rev": "2022.10.09", + "hash": "sha256-FUqkKcX0UbknvhntIo782ZGIteEE1SvPsfXo4yv6310=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2022.09.18", - "hash": "sha256-yIbIRo4hpwbCdH+3fIhjnQPtdvuFmfJSqloKjWqKEuY=" + "rev": "2022.10.03", + "hash": "sha256-2XP3LyB18ZHLQOxzP4lBuhlUA8u1+wHl97cxmRYa7Xg=" }, "EControl": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index f5657b0a4d79c..64204deaa4aaa 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -14,11 +14,11 @@ let platform_major = "4"; - platform_minor = "24"; + platform_minor = "25"; year = "2022"; - month = "06"; #release month - buildmonth = "06"; #sometimes differs from release month - timestamp = "${year}${buildmonth}070700"; + month = "09"; #release month + buildmonth = "08"; #sometimes differs from release month + timestamp = "${year}${buildmonth}311800"; gtk = gtk3; in rec { @@ -38,7 +38,7 @@ in rec { 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-mqoeP6BwmTWGy6qp/+BSfjTaMfAEKtlyqHwn1GrihRCXQyDNeVWRkBNa7JTCUs+yve2rokgisZNVSwpgAqqHYQ=="; + hash = "sha512-1sUQ/jDOQMqnKLKY6oh28STvS5pbH89+2zs+H77euiJOsBgB+yEkEntnhI39O67qmOK/EkQ3y3NkQcumbax56A=="; }; }; @@ -50,7 +50,7 @@ in rec { 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-RbvqIUnJ00/qvqsw1s5mcZ2SQhhT2y+S9J9xOB+t8bK+1SOhUOFvU/HcDAmHBl88L1qBCF0ckAKd7jETYPeXnw=="; + hash = "sha512-Qb2BmfXtmVeTLIZZav91hayPkwSGYMAG3fod3BmyJdo1DPas6VC+MzBwklAjpC1wqLTzKCAKzVZtdtPYC9QCqw=="; }; }; @@ -62,7 +62,7 @@ in rec { 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-PPgFti6UUSkIDEUBGY4tDVfnaFXxTUIRIvfMOVXVxIr+ciGK2dOHpQ7K9hcYnWqoIulxa/fV+TXQI3hzcIRVAA=="; + hash = "sha512-RW+5H82AcH/U9XUzIlUCU5heN9qQAlMl3rmxsKnTYxVWdIjSN461Nf71F6jPhL/Q+VCAMesguOEF0AqyhnH0nw=="; }; }; @@ -88,7 +88,7 @@ in rec { 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-IVSdZI4QnMtj7HdWAXATeJSQt950qNkiSL7n/+f9bPioCA2NtNbDUlBBxnownMKnr+C+iJH2phzPabT9Ar6plA=="; + hash = "sha512-1wjKNBl6A2XENRVZNtDelPSMAYtc4wRXdQ4CJX/1YcFUPEzbPsX7plO2uJXmDpZcjw3wkQNxqy4bmZF6YnXy/Q=="; }; }; @@ -100,7 +100,7 @@ in rec { 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-ace+zpz5tjLA89gHLyBrjldKU7+kb85uJX4y4IQdVkrskrA+uCv0z9lzB/qbgrH51ZFN2xz04z1nFLJd09WacA=="; + hash = "sha512-UejE0pzgwBYpmNbdGEegMM5iEOMYP+VvebU17YQeJUzh/qYr0B6sfXwJ+cdTCavKCNGLMMDenJMYk9V/6DSZHw=="; }; }; @@ -112,7 +112,7 @@ in rec { 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-Xo1dk8+BLUoUVrnMm9XC+IBzoS9bKde2waRaYxjCRBOykUiZ4npGgquh3bEbsk1GZ3cKlwuxLxr9Y9+RGw3UTA=="; + hash = "sha512-9E0Zwv64qRwVdPouhmIYT6SkbTkd3zLnfkHduHy2VXvmqW7xaOfmplvxpr+V1RDpnfDfw4RouU+WQdhFqBqcWg=="; }; }; @@ -124,7 +124,7 @@ in rec { 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-rkjLwexI352G8CYkaF/1dl26wF58IuPMan76gR/3Fx/CMywtv25Tueu8NWZGkHd6Zwdpv/h25D8fu9tbM2NExg=="; + hash = "sha512-V7GmvqQVZnTkkhKmuGyMiZlFlRpFbXM7r6w9yS0FxBOHNHIzkX4pJ6sgn+ww1lvwsdPqBFYtbWUiuKo73eTKzg=="; }; }; @@ -136,7 +136,7 @@ in rec { 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-8FaVTzjvtT17pYUYfKJgVd55nd2ngrsLY+7AJnXu/BI="; + hash = "sha256-8qQWwUiNemJLTAncZwO14fBfr7kTmmXPSeqBLfV8wTw="; }; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 354210deb1323..d479802e60d43 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -19,10 +19,10 @@ elpaBuild { pname = "ack"; ename = "ack"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ack-1.10.tar"; - sha256 = "0jz8badhjpzjlrprpzgcm1z6ask1ykc7ab62ixjrj9wcgfjif5qw"; + url = "https://elpa.gnu.org/packages/ack-1.11.tar"; + sha256 = "0fsi3lgfkyv9gxwcs0q5c9fawksz6x0pqarjagcndnd7jlbxjw7z"; }; packageRequires = []; meta = { @@ -234,10 +234,10 @@ elpaBuild { pname = "async"; ename = "async"; - version = "1.9.6"; + version = "1.9.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/async-1.9.6.tar"; - sha256 = "0qyf1niqjhzaphb50q1znkwqzpdvqw3drivkzrqxrs747k7pm3my"; + url = "https://elpa.gnu.org/packages/async-1.9.7.tar"; + sha256 = "0wwjgvj42irznwz6rjh8yiz4p9hswgi6ak57anjn256c4zx8xaz2"; }; packageRequires = [ emacs ]; meta = { @@ -1071,10 +1071,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "0.6.1"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-0.6.1.tar"; - sha256 = "1yxfnwq2b32xrl52g61a9g3i53m94iybx0n8hh6nbmcv5x4y43ya"; + url = "https://elpa.gnu.org/packages/denote-1.0.0.tar"; + sha256 = "1gywi22x12p7hkliwy84i7pvyis5ja22fybz5shkdmkcl12mx631"; }; packageRequires = [ emacs ]; meta = { @@ -1086,10 +1086,10 @@ elpaBuild { pname = "detached"; ename = "detached"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/detached-0.9.0.tar"; - sha256 = "1br1s2kwb5ji4ad5m89grpyvjffhc3xxydgja9q796cx6zwrnavp"; + url = "https://elpa.gnu.org/packages/detached-0.9.1.tar"; + sha256 = "1hzvqb18bpdpmnk469cmkayvddm37knd3mjj7m6zv3qsjw17n6f1"; }; packageRequires = [ emacs ]; meta = { @@ -1247,6 +1247,21 @@ license = lib.licenses.free; }; }) {}; + doc-toc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "doc-toc"; + ename = "doc-toc"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/doc-toc-1.0.tar"; + sha256 = "07yan1jmp6q87rhm8bmglswnhzlh5r9j35x5sqm5yfx0pcp16kpj"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/doc-toc.html"; + license = lib.licenses.free; + }; + }) {}; docbook = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "docbook"; @@ -1386,10 +1401,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20220828"; + version = "20220926"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20220828.tar"; - sha256 = "0znsimjq61p67c2q3qbia5qrimy847xy6gjpl1jgyrdlpgm9hv6r"; + url = "https://elpa.gnu.org/packages/eev-20220926.tar"; + sha256 = "0kc30y44wl691jchafljp938kbwilawdfxm0bp6nsniv1bm95rpy"; }; packageRequires = [ emacs ]; meta = { @@ -1401,10 +1416,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-0.5.0.tar"; - sha256 = "1k73q48vg7vyjmnvizinwn9if481ajq63ps2iwb01f1brrhmbf5v"; + url = "https://elpa.gnu.org/packages/ef-themes-0.6.0.tar"; + sha256 = "00xq5ymsq8lq2jc541lw64i9pp0a0757wj3nasmfsa27wfpivzhb"; }; packageRequires = [ emacs ]; meta = { @@ -1563,10 +1578,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ement-0.2.tar"; - sha256 = "1kxbkqiy5c9pxk4f5k3d3j2q3qn7cg8f21zpgds9s8fd6ax0arcf"; + url = "https://elpa.gnu.org/packages/ement-0.3.tar"; + sha256 = "08k1qfcymsnaz0mzq33l3i0fj9kjf5y0pdpn7k0skhhlsw90h078"; }; packageRequires = [ emacs @@ -2909,10 +2924,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-2.6.0.tar"; - sha256 = "0i4y69rrdcm64mvqs5z7dmgx1xk0x7g5978q5gjblczlfka444k4"; + url = "https://elpa.gnu.org/packages/modus-themes-2.7.1.tar"; + sha256 = "1ms5nig05z26342723jln50m7xq055knr2570x40lkg2m9s1ikx1"; }; packageRequires = [ emacs ]; meta = { @@ -3162,10 +3177,10 @@ elpaBuild { pname = "notmuch-indicator"; ename = "notmuch-indicator"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/notmuch-indicator-0.1.0.tar"; - sha256 = "11kbl8y95vwww1rsgdd1q5x8i690gi4cxql4n2sg7r5dysdrbyz1"; + url = "https://elpa.gnu.org/packages/notmuch-indicator-0.1.1.tar"; + sha256 = "1fdl8xm48id1a85gf3gr8d8m3sz61xrras9f598pvrksm3j162b6"; }; packageRequires = [ emacs ]; meta = { @@ -3582,10 +3597,10 @@ elpaBuild { pname = "perl-doc"; ename = "perl-doc"; - version = "0.2"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/perl-doc-0.2.tar"; - sha256 = "1p5bbkwllh91a0vg5aisqa9kbms7l9vxk14lm09bav952xxn6gdl"; + url = "https://elpa.gnu.org/packages/perl-doc-0.6.tar"; + sha256 = "0xmk09pfvdzkrjfsa2l78bd6akcbdhcbnpvwnm6r83h65gpld79f"; }; packageRequires = [ emacs ]; meta = { @@ -3642,10 +3657,10 @@ elpaBuild { pname = "plz"; ename = "plz"; - version = "0.2"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/plz-0.2.tar"; - sha256 = "1b45m9b9gzx5ylpxcppkiikk5lfya7ngiqsap4a7m1b2cr8rqxcj"; + url = "https://elpa.gnu.org/packages/plz-0.2.1.tar"; + sha256 = "01xa4vjbcdm37dya5d006k9p37kcm1g4yh4j7vh7hjfdz43j6y9s"; }; packageRequires = [ emacs ]; meta = { @@ -3747,10 +3762,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "5.2.4"; + version = "5.2.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-5.2.4.tar"; - sha256 = "1dzl4xaf31nyjb5hnwwf29i75x0i8dakpmmagbn4ks5hi3jl2ig0"; + url = "https://elpa.gnu.org/packages/pyim-5.2.5.tar"; + sha256 = "00f23pl53rdy9iwp4gj2656wik7c6vnmhsglg7z4pz3ippz3f4hq"; }; packageRequires = [ async emacs xr ]; meta = { @@ -4427,10 +4442,10 @@ elpaBuild { pname = "sokoban"; ename = "sokoban"; - version = "1.4.8"; + version = "1.4.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sokoban-1.4.8.tar"; - sha256 = "1w3vrkg239x1saqka21zbl380fxqmbz3lr7820spxd8p5w9v55pn"; + url = "https://elpa.gnu.org/packages/sokoban-1.4.9.tar"; + sha256 = "1zri4czw2d5impkgn8d4hliyw31vndadg7wj31gairk8kyakjpgm"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -4687,10 +4702,10 @@ elpaBuild { pname = "taxy-magit-section"; ename = "taxy-magit-section"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/taxy-magit-section-0.10.tar"; - sha256 = "1g58nvpb04ldhn5qnjw2q5idrv6vhlfa0qmb46cvis6bkz46cxkw"; + url = "https://elpa.gnu.org/packages/taxy-magit-section-0.11.tar"; + sha256 = "058z95c0z2hxplr5pfgph1cdq68zcrkmwx1wqyd5fy4a5h43yknq"; }; packageRequires = [ emacs magit-section taxy ]; meta = { @@ -4826,10 +4841,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.3.2"; + version = "2.5.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.3.2.tar"; - sha256 = "1jcicb9f7c1nmaqg20yy2j4wd0qfch4llc26ga7q3ckhx41pvbiw"; + url = "https://elpa.gnu.org/packages/tramp-2.5.3.3.tar"; + sha256 = "05w04qwk1lk50fzwl6fxyf6pb1jd2lx4as99zm1dpa858jab6w4a"; }; packageRequires = [ emacs ]; meta = { @@ -4841,10 +4856,10 @@ elpaBuild { pname = "tramp-nspawn"; ename = "tramp-nspawn"; - version = "1.0"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-nspawn-1.0.tar"; - sha256 = "1si649vcj4md50p5nzvw431580rcl113rraj6fw636a394485hvx"; + url = "https://elpa.gnu.org/packages/tramp-nspawn-1.0.1.tar"; + sha256 = "1w8h563pcdksqqy5v5vi7vrx76r6pi4bzhqywk1v67rhnr33qsvq"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 2bfc2f18e97dd..94ca0cdf0b6d8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -96,7 +96,7 @@ self: let ./build.sh -j$NIX_BUILD_CORES ''; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' ./install.sh --prefix=$out ''; diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix index 6482d46d387ef..c43d0d7765443 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix @@ -1,7 +1,6 @@ { trivialBuild , lib , fetchFromGitHub -, curl , plz , cl-lib , ts diff --git a/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix index 5eaee9bbfdfe5..7809dcd735660 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix @@ -1,5 +1,4 @@ -{ lib -, trivialBuild +{ trivialBuild , fetchFromGitHub , emacs , popup diff --git a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix index 503554412b5b3..b8bbe7db577bb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , emacs , trivialBuild diff --git a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix index 6251fd6932a70..d5283da41dff6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , trivialBuild , emacs diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 39835c58b6501..6190d25ce93d0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -186,7 +186,7 @@ let cd - ''; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' install -m=755 -D source/sqlite/emacsql-sqlite \ $out/share/emacs/site-lisp/elpa/emacsql-sqlite-${old.version}/sqlite/emacsql-sqlite ''; @@ -301,7 +301,7 @@ let make popd ''; - postInstall = '' + postInstall = (attrs.postInstall or "") + "\n" + '' outd=$(echo $out/share/emacs/site-lisp/elpa/libgit-**) mkdir $outd/build install -m444 -t $outd/build ./source/src/libegit2.so @@ -426,7 +426,7 @@ let cd - ''; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' mkdir -p $out/bin install -m755 -Dt $out/bin ./source/server/telega-server ''; @@ -456,7 +456,7 @@ let pkgs.libtool (pkgs.zeromq.override { enableDrafts = true; }) ]; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' mv $EZMQ_LIBDIR/emacs-zmq.* $out/share/emacs/site-lisp/elpa/zmq-* rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile @@ -533,7 +533,7 @@ let ]; # we need the proper out directory to exist, so we do this in the # postInstall instead of postBuild - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' pushd source/build >/dev/null make install -m444 -t $out/share/emacs/site-lisp/elpa/vterm-** ../*.so diff --git a/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix index 1dcf27e64ebc6..735e18f6b68ab 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix @@ -1,5 +1,4 @@ -{ lib -, trivialBuild +{ trivialBuild , fetchFromGitHub , emacs }: diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 591774ad714b9..53b5f9e1743ea 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.7.2"; + version = "1.8.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-1.7.2.tar"; - sha256 = "0vdpv8k1cvkn3cvsnxqv299gvp470ga2pgmfvdqi7k1vzypgpp57"; + url = "https://elpa.nongnu.org/nongnu/annotate-1.8.0.tar"; + sha256 = "169cav480g2fm3z7d5dixrng2h8fv39sa9n066b79cb573p4bbcp"; }; packageRequires = []; meta = { @@ -1208,10 +1208,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "3.8.7"; + version = "3.8.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-3.8.7.tar"; - sha256 = "1n0m061amrzm0xpgqy2mp9vrk2960gqhl5hi6c1smcmm7nxqwz12"; + url = "https://elpa.nongnu.org/nongnu/helm-3.8.8.tar"; + sha256 = "1qsiw8gswjwfp79n7g103db7xsmk36lq6ln558ipn4cw0fpnq1sc"; }; packageRequires = [ helm-core popup ]; meta = { @@ -1223,10 +1223,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.8.7"; + version = "3.8.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.7.tar"; - sha256 = "1sak74v3gg34zzlbbgvlzvg7gw32fhcbxp5kigigmwvvbj5imgs7"; + url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.8.tar"; + sha256 = "0wg21425ki8n8d954lkmlyci6awwwv53jg4gn5z495vh27qiv3qn"; }; packageRequires = [ async emacs ]; meta = { @@ -2358,6 +2358,21 @@ license = lib.licenses.free; }; }) {}; + sweeprolog = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "sweeprolog"; + ename = "sweeprolog"; + version = "0.4.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.4.5.tar"; + sha256 = "17dbrn2yvc6ib4dig410kbmvpwp4iz6q9hx6g0mk3vxqjrmgwyls"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sweeprolog.html"; + license = lib.licenses.free; + }; + }) {}; swift-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "swift-mode"; @@ -2518,10 +2533,10 @@ elpaBuild { pname = "tuareg"; ename = "tuareg"; - version = "2.3.0"; + version = "3.0.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/tuareg-2.3.0.tar"; - sha256 = "0a24q64yk4bbgsvm56j1y68zs9yi25qyl83xydx3ff75sk27f1yb"; + url = "https://elpa.nongnu.org/nongnu/tuareg-3.0.1.tar"; + sha256 = "0y98gwnbrcj3csd9yilk1izgzmp1ds5dh3y1bxgb2fzrjir3i13f"; }; packageRequires = [ caml emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix index d02283f25ad8c..bd6a2996d6e1b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix @@ -1,5 +1,4 @@ -{ lib -, trivialBuild +{ trivialBuild , fetchFromGitHub , emacs }: 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 2faff33b5d07d..1a630831d89ac 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -204,11 +204,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20220426, - 2058 + 20220930, + 52 ], - "commit": "566944e3b336c29d3ac11cd739a954c9d112f3fb", - "sha256": "0walpgv18gx11hvij1mf9hgsd1x40rhccbzsnwsh86lka1g3na34" + "commit": "e92b5cffa4e87c221c24f3e72ae33959e1ec2b68", + "sha256": "1nl7wm4l30hjcbqrvdci66aa6ax32ih46n58q3imc46z8c6rhqxh" }, "stable": { "version": [ @@ -2197,15 +2197,15 @@ "repo": "alan-platform/AlanForEmacs", "unstable": { "version": [ - 20220923, - 1554 + 20220928, + 1229 ], "deps": [ "flycheck", "s" ], - "commit": "01466bf6451104e9e996d157f1258fe0e19e049f", - "sha256": "1phpj6jbj8jbk90k3vi8y9m1faz3cxs3wkj2n17n5d2pmyjy77nb" + "commit": "8856871633ef961a0dd7cf019be44212cfe1add1", + "sha256": "1pmgp69w0vi14rzrrkxn8gwhvb1yfczcw73h5jfsawhislg2vq8a" }, "stable": { "version": [ @@ -2336,14 +2336,14 @@ "repo": "cpitclaudel/alectryon", "unstable": { "version": [ - 20211018, - 321 + 20220925, + 2236 ], "deps": [ "flycheck" ], - "commit": "5505e00e5c8a5080ee0e640e5dc8de947e3b9aff", - "sha256": "053pr895zdd0pklxvx4aa4lzn6lds1zgqd8adp9k1qcampxh64np" + "commit": "8a1f3054c97fc86d628413800cfef75577c43485", + "sha256": "11nsa1jh3d3q848hdx8qrqkk427pilldkai119plv3rnmf2sqckc" }, "stable": { "version": [ @@ -2484,11 +2484,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20220823, - 1719 + 20220929, + 2303 ], - "commit": "4a4d6269b8b85b0b15954f063e6ce378630d80c0", - "sha256": "0y1dpxv8hha8pcxssayy0gaa7jd15ad0hwpmpixg164xzjn0cnb6" + "commit": "51bf77da1ebc3c199dfc11f54c0dce67559f5f40", + "sha256": "1idzamhpfgcdiwap20s3cc258kawxa1k46c4s79xslfbdqy0abdy" }, "stable": { "version": [ @@ -2526,14 +2526,14 @@ "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20220620, - 1939 + 20220929, + 1135 ], "deps": [ "all-the-icons" ], - "commit": "b5d3af1e47de09e6ac80d4d7fba516e6a3c38e26", - "sha256": "1a72ka2sfnn644kgz6ag8sz3j8dxkbmlyd5rv7fq9qwj7487n2yh" + "commit": "bcaed35bb3ad7fc46007f16e0d670beb82bb613e", + "sha256": "1ns87m2xgdp9q86iqbswz746gb896d0n0wv8b92n158hhz81c8g9" }, "stable": { "version": [ @@ -3227,11 +3227,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20220916, - 1547 + 20220930, + 1003 ], - "commit": "f166cca70bc5d54da6027a590b8407bc08deece6", - "sha256": "0n0jir0zhhskxm7z5kz988h9gxbd6mgiyyrixggjr7yyfg3m22r8" + "commit": "0c3342bd55c827b8e4529fd5ee2aa40053a334f6", + "sha256": "0y9v37y8l1mx14lggddlimlmivzz0ll4pwhq87szf50bv23xiq7r" }, "stable": { "version": [ @@ -3721,11 +3721,11 @@ "repo": "alexmurray/apparmor-mode", "unstable": { "version": [ - 20220920, - 1225 + 20220930, + 1134 ], - "commit": "fdd520249a882eaf7b52dfaba49887149697741b", - "sha256": "0v179is71xpz3jn049wqib8dgjncv6pq0i9kx37rkg9djy06z0m8" + "commit": "9b0ba33995172044068fa2609d97b1015f9fb513", + "sha256": "0ncp3aq5b2xmr3khy2c6hz8492k56j8v8lfkqqky7n028zy90nv5" } }, { @@ -4272,20 +4272,20 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20220922, - 1622 + 20220928, + 1909 ], - "commit": "dbac40131f6644bf80fd27581b62361e743fb4a8", - "sha256": "04vx7a7rs8klfadafdik5x917zkz5hjbj9ckks6afq2d73pcj8lm" + "commit": "53addd02fbad33765f508f8e6254ebd44e1f81e5", + "sha256": "18pysi1pf6hbv6w0nq50j5xclvgd006iqqijh44wck9hxhdwyfr1" }, "stable": { "version": [ 1, 9, - 6 + 7 ], - "commit": "370ead445f5d0fc21b7338e05a64830c410368a3", - "sha256": "1q480ss2jgijdpy6pa4xrjni9pf5q6dwf8hv052fhdpi55bmfdn2" + "commit": "53addd02fbad33765f508f8e6254ebd44e1f81e5", + "sha256": "18pysi1pf6hbv6w0nq50j5xclvgd006iqqijh44wck9hxhdwyfr1" } }, { @@ -5477,14 +5477,14 @@ "repo": "abo-abo/auto-yasnippet", "unstable": { "version": [ - 20191015, - 942 + 20220927, + 857 ], "deps": [ "yasnippet" ], - "commit": "db9e0dd4335b2202cd5dac95bbbc87a1032d9bbe", - "sha256": "0az8pip0gsq5xqpfizcz4rmj5hmkvz1fdkg996k9qqacp17p2caj" + "commit": "7ef65b8e128bcf8afc52a702402c7943839abfb9", + "sha256": "01mdijgngh4bjngxcs81d7v8f6r28ly355gz4f87dbqaxvsdj92f" }, "stable": { "version": [ @@ -9960,11 +9960,11 @@ "repo": "ocaml/caml-mode", "unstable": { "version": [ - 20220503, - 1742 + 20220928, + 835 ], - "commit": "d3d2f5dbeccd0f415cbb28fab2015dc678e80bbd", - "sha256": "0w9ypvvkm8qx88rldkhysp12inc8izn1qj9rpcchk8xzs0s7sqxp" + "commit": "a970f303065fe176a920db0466dacf3e2a20b56b", + "sha256": "1bd21fhcjgz7iadbz66yyzb7d88mlan7mkxm8zm0jnlkhdmixc9v" }, "stable": { "version": [ @@ -10094,8 +10094,8 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220906, - 1126 + 20220929, + 1312 ], "deps": [ "bech32", @@ -10109,8 +10109,8 @@ "yaml-mode", "yasnippet" ], - "commit": "2d414d39b4824bf4de97b98f130da24c70ca916e", - "sha256": "0ap82dyvzv19w89xinxfqq2ixsr8yrg3wq9lraxy87m6djjhlcy0" + "commit": "833a33780ea4fd95e99495b05fc19abac0412e5c", + "sha256": "1rzab8kqmrgsp3firl0v7bcbasv499gpj7qrm2g65lp1vygqh8m9" } }, { @@ -10694,15 +10694,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20220920, - 510 + 20220926, + 1247 ], "deps": [ "cl-lib", "powerline" ], - "commit": "eac6522bb9c19c525770822d9f14b4d0ff07324c", - "sha256": "1z7b3s29xb0n25bfbbm1wrcap9dvig5zi5fcnvlyrl9si9565948" + "commit": "7d9fad0daa44ffb2acecf6525759e46e08e35f2c", + "sha256": "0la8fmwirspg7m453qhfb64sqryl59dxc1lfmjkh6mzf85nqbl1i" }, "stable": { "version": [ @@ -10803,11 +10803,11 @@ "repo": "nbarrientos/cern-ldap.el", "unstable": { "version": [ - 20220830, - 1909 + 20220925, + 1550 ], - "commit": "1e8ac2029ade5e7755ec76f15a0948a10c955a8f", - "sha256": "11gc34qrsmh814ma4y8asxb1fvy0rvhmch4yv2ydimgfblhlffxs" + "commit": "4851e952318e11ea9693efe2e460983d5c6dffcd", + "sha256": "0axaynilvccj0bwv5xa6zbk5m1vvxgy1avngvpdqqxp8hwm4m1rj" }, "stable": { "version": [ @@ -11030,11 +11030,11 @@ "repo": "GrammarSoft/cg3", "unstable": { "version": [ - 20220901, - 1202 + 20220930, + 907 ], - "commit": "30a33cabfdaea2d9b54a040f88cf741ea43738b2", - "sha256": "07jcfw9cy7d5h57mna30a8q1nq1qvy0jhxrlz18jl5nd09hr9lh6" + "commit": "4d0fcdd3f9f33832af357928762d785d88b3d494", + "sha256": "0nh6lgwrd776n3chk3wyla95hf5jhkcmbmnz25d5lsk35nb2fwb8" }, "stable": { "version": [ @@ -11711,8 +11711,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220919, - 1610 + 20220930, + 1032 ], "deps": [ "clojure-mode", @@ -11722,8 +11722,8 @@ "sesman", "spinner" ], - "commit": "101671c06df301833b3dcf6a5ed83a028efc334f", - "sha256": "16y01kwm5zyhczw7lpmxcql6jaka2bcdswbn0xnwkld7m4dnjamd" + "commit": "e75706f53bd0470bcec0d1e3a4cef6a043a20fc7", + "sha256": "09k527ah8vh02mvzy28y5hwr6dvzqgdjxbjwv9q4fc1bvmfmnl0l" }, "stable": { "version": [ @@ -12021,16 +12021,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20220913, - 1718 + 20220925, + 2234 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "60cc30e4aa6947a9a06db39a4198162fa5959f5e", - "sha256": "124r0s9qc40d7hca7l37l4b40dcyd6vcliszp0cf5wc6g13m7n7k" + "commit": "219a69c519fa77ba609b05ac5dbcb9ae357d383b", + "sha256": "02ay11a5nn7j1f3f3zjrsrp6j1hsyl1k58v8cx4mi5m73wbchc98" }, "stable": { "version": [ @@ -12085,15 +12085,15 @@ "repo": "emacs-citar/citar-org-roam", "unstable": { "version": [ - 20220913, - 1114 + 20220927, + 1834 ], "deps": [ "citar", "org-roam" ], - "commit": "29688b89ac3bf78405fa0dce7e17965aa8fe0dff", - "sha256": "06xzsrb1ihadwysxpghhcpl315rrv8zrfay03jwzqmm4hyrxvz6i" + "commit": "27105d0a9578279560cd79cfad5871e7e603bc58", + "sha256": "192p4bfa49mj5iq70lazi828gzwd1z7dfmckg4xfmdsd58crygh3" }, "stable": { "version": [ @@ -12906,11 +12906,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220905, - 1237 + 20220928, + 557 ], - "commit": "d47298212ffc486ade3f2428f103feba3a467af0", - "sha256": "0jh2navzljxkna04lf95cqbvk9bzyfcjw9knvg5b331q6s9zl9ck" + "commit": "414157c3e523e80cc44dca8f86f1853122ee5f6b", + "sha256": "1ldzbc7zrkqnkf3gm69q94ys4my984zps1gymw5sdx6gn9qc96iv" }, "stable": { "version": [ @@ -16466,14 +16466,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220914, - 920 + 20220930, + 2231 ], "deps": [ "compat" ], - "commit": "76aab86015c3d7628dbd5f92b2dd8ab9aeadac8d", - "sha256": "0wnsmn978ivf9vhis0by467q0fp4gprq169px41q4z4zaf6fcpjj" + "commit": "af11b72f628c1ff0b051bb4180bfdb7833d64e40", + "sha256": "0fmaxga2xws2xnxfxrqkvjacba1a1y6811s2m6bibfcm8iyldpyk" }, "stable": { "version": [ @@ -16780,27 +16780,27 @@ "repo": "jao/consult-notmuch", "unstable": { "version": [ - 20220513, - 1647 + 20220929, + 2111 ], "deps": [ "consult", "notmuch" ], - "commit": "4138855cddee0ef126cff6a5fc5ca9c49fd2682d", - "sha256": "1wqp0pp408bxywxzq3gk1hk5vr19k4vsz5b979b4gbk89i1gxamb" + "commit": "29e9a3d0d4ed2e8bcefbf009103f7e5665b6c260", + "sha256": "18r47cj89qli534irah3lwwzsnik5bcf61clnrkhafqv9y51m67z" }, "stable": { "version": [ 0, - 7 + 8 ], "deps": [ "consult", "notmuch" ], - "commit": "883527072b56bb09dd921800bca13860caaa4ffe", - "sha256": "0xzpkpf2sb89qkbqcrwddp4pgnzdjp40bc5da22jq9r4pf67y7qs" + "commit": "29e9a3d0d4ed2e8bcefbf009103f7e5665b6c260", + "sha256": "18r47cj89qli534irah3lwwzsnik5bcf61clnrkhafqv9y51m67z" } }, { @@ -20905,11 +20905,11 @@ "repo": "niklaseklund/detached.el", "unstable": { "version": [ - 20220923, - 1411 + 20220928, + 806 ], - "commit": "4d63d7d6aa4668fb7bd141c9701075f2dc7d67a5", - "sha256": "064xr2gjl29zx8g6sb7fj2h2v2rpqpzrr6pd4nj4r5pah1hi7xcv" + "commit": "772ac746a9e8350f24ff548301ef13986e5b21d9", + "sha256": "129y80yya8v3a8iz9z8nix44mivfkd5p3q454ancynv89pkbhsl2" }, "stable": { "version": [ @@ -21031,11 +21031,11 @@ "repo": "radian-software/diary-manager", "unstable": { "version": [ - 20220508, - 128 + 20220929, + 2042 ], - "commit": "c538504e606208fa902d040e54188072df6193d0", - "sha256": "1j10wl00mgfpw3554jngkmn44z4s28m5qvw3lg0zgca50xkjnyqa" + "commit": "56c739224e5bb845d275bfe3f4e420285de3a929", + "sha256": "1248xyb9rmlf07ag7hnvcisgljvacia72s9l0grihjfa3mrlmdks" }, "stable": { "version": [ @@ -21638,14 +21638,14 @@ "repo": "tilmanrassy/emacs-dir-treeview", "unstable": { "version": [ - 20220820, - 27 + 20220918, + 42 ], "deps": [ "treeview" ], - "commit": "1e516096344e13cc5c19aeaed135a85de01b4561", - "sha256": "071m5rshcjbbv6xrz0dqm9j4m6nhawwq8flhxwjb5ab9vidjby84" + "commit": "3430eb32d824270181fc74bac7334fa7c4b5be9a", + "sha256": "0grvkyasj1mck8i7qhclgidcx9zqil9pm1n5gk4h659fr9ji283k" } }, { @@ -22612,14 +22612,14 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220923, - 1034 + 20221001, + 426 ], "deps": [ "transient" ], - "commit": "36c8cb289fa57e6eb6b90080548deadeb4fc7838", - "sha256": "09ikiijvqvji3rn9vb7cr32d9ap7r1b73rmm3kmlv18120fp29kb" + "commit": "a877ba816f907daea2d86bd10754bec6484e753a", + "sha256": "0xq2h5fbfzd3r4hxy0lp0zz12a9mhf8x58ddxk1s6j80v8xr5v0b" }, "stable": { "version": [ @@ -23710,15 +23710,15 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220924, - 1354 + 20220930, + 952 ], "deps": [ "compat", "shrink-path" ], - "commit": "3e022a7a12a1a2e2fad0133b215266d73467ff31", - "sha256": "1b68c1bal7z56zg76i1lzmk2kylc75g49kq6i1f9gk5y71w888y1" + "commit": "5dbb43411e79c1c67cdcd05e04c037c229c8ea87", + "sha256": "03zj28dvf7dh2j21ffdn7liblg7j72wx3yfijx42w9v9hfgcya1m" }, "stable": { "version": [ @@ -24527,11 +24527,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20220910, - 1225 + 20220928, + 2032 ], - "commit": "e5d427e4e63ca7b13960b5ad69893186ae3a9ceb", - "sha256": "0b5yy09li1v57q8bbf19m51s1w69zj5vnkfds12sdvdlrra7zqr0" + "commit": "6f599480be69437171fb4e9d58fd29b20731096f", + "sha256": "0qr50ivwgbpygp9kscm6h71jjys06s2jib1k8q35xahaah4dbrkf" } }, { @@ -25025,30 +25025,30 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20220616, - 2302 + 20220928, + 405 ], "deps": [ "popup", "request", "transient" ], - "commit": "46aa41a207c9644ef9789512e025d4e7c7f3d5ea", - "sha256": "07nhcnq0b1wha1nd7y6mzqgf7x5dzi4pg11q827fjfap7aw9mh6p" + "commit": "31e2f6d6d11be17576e135dd28d5ed441462d77d", + "sha256": "0jfm0cz65rlwb9ycdwd5lpwv0dh77ixd64bbjli4y4g5ilay6dx1" }, "stable": { "version": [ 3, 9, - 56 + 57 ], "deps": [ "popup", "request", "transient" ], - "commit": "46aa41a207c9644ef9789512e025d4e7c7f3d5ea", - "sha256": "07nhcnq0b1wha1nd7y6mzqgf7x5dzi4pg11q827fjfap7aw9mh6p" + "commit": "31e2f6d6d11be17576e135dd28d5ed441462d77d", + "sha256": "0jfm0cz65rlwb9ycdwd5lpwv0dh77ixd64bbjli4y4g5ilay6dx1" } }, { @@ -26113,8 +26113,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20220924, - 854 + 20220926, + 1235 ], "deps": [ "eldoc", @@ -26124,8 +26124,8 @@ "seq", "xref" ], - "commit": "83052a5e61267a2e1c091c1bd4301ea81f1bc6d7", - "sha256": "0irxjlfplmixshywsxpq7yknfy9g2m3dpky1mk6psxbk7h7swyyp" + "commit": "a49f620f53d00efe471dbceccc795329d6d40e5e", + "sha256": "18vgyjagk8s37dm30pqra1xk12rg0nv9npmm2q9vb44r47kbr02l" }, "stable": { "version": [ @@ -27306,8 +27306,8 @@ "repo": "jeetelongname/elfeed-goodies", "unstable": { "version": [ - 20220614, - 49 + 20220929, + 1136 ], "deps": [ "cl-lib", @@ -27316,8 +27316,8 @@ "popwin", "powerline" ], - "commit": "c9d9cd196746add3010d74f43b5c9866562f39fb", - "sha256": "1b80srhravjf791qlx42hmzlprzlf7p8faqn5cljh3nrrridivxn" + "commit": "ff9fa91e29c9cd06fdddedc1eabbdf4d3cb93e8c", + "sha256": "1s7f21cw84qv59hj3bnsph68p3mhzvdcsl9v095787pcddc85s3b" } }, { @@ -29923,15 +29923,15 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20220917, - 1359 + 20220927, + 1207 ], "deps": [ "closql", "compat" ], - "commit": "01df3974f5bf08d0984619dbea4994e3863208f6", - "sha256": "0zvybm76nqhpmbmhqj6l7nc3wv2wvi6jfwhj9qfz3ahki3cadsd6" + "commit": "582759aa230e1de252f7b60711e38034769ab602", + "sha256": "1cgxqaif9azbmfi101alca1x728jm5l5dzly9fczamlbz587jaac" }, "stable": { "version": [ @@ -31556,11 +31556,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20220902, - 818 + 20220915, + 2126 ], - "commit": "ecd8865bbbdf6664b66be5ffd5d4e62d5af78240", - "sha256": "09x0hfipb2jmg8q01nn706vn7s8ks23jzwmg9vjndlv0ki94ip62" + "commit": "f45542e723d7415f5e22bcf39f25e31d055d168c", + "sha256": "088dd8mmsabpg639r08rv8kz6qzmlmgfvqln8k26h0szzrin01di" }, "stable": { "version": [ @@ -31724,15 +31724,15 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20220920, - 1548 + 20220927, + 353 ], "deps": [ "csv-mode", "ess" ], - "commit": "8f00579c79d12f359ce6aff828a7462c421c962d", - "sha256": "0ww9b8gzih3klaq490k8hyizx867drcsds6kn8hjfqlj8fl0vh9q" + "commit": "1b48afef4dcc8fbaed1af98fade7f0df84bd6871", + "sha256": "0nybmqj166a5qrhcn0a7mlwdwfijm8hgzizvd3lycycak3ixq6xf" }, "stable": { "version": [ @@ -32174,15 +32174,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220830, - 1232 + 20220929, + 1317 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "26ec0cda1bcb899ae37086a1268a055484171519", - "sha256": "1klh8zx0pmq4lca8c33714h1qczxp3wlqxaqdg31lawvg3cdm5hp" + "commit": "0aaf5944db224f1d8948acac64e2b703ed151446", + "sha256": "0b0frclfbh9k5igv5gdcgb9cwnwmnxcmkf5sgsmm8glrnvgblg1q" }, "stable": { "version": [ @@ -32375,15 +32375,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220810, - 1901 + 20220926, + 1733 ], "deps": [ "annalist", "evil" ], - "commit": "665d5c99e216c7b18856f7ceda7c91ea5669f904", - "sha256": "0vmwd85vc6hcyfzg4zwhsilp6y0kmygnyfn02ham0b6gc2kakz23" + "commit": "f45f4ab142adc02582e88d18e8f7ac904802b4c1", + "sha256": "04ak4hjg8dlzcx104lgmx66ip57z9vswhjhn2sx2b2sfyfhkbi6y" }, "stable": { "version": [ @@ -32941,11 +32941,11 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20220608, - 1134 + 20220927, + 220 ], - "commit": "271551560c3c8c066b29d335f781ff9b5aefe746", - "sha256": "1vzpmr33smi1kgcrxj7jl8wvk1ffvy2bf6p6pki0r53lk03mf8fr" + "commit": "ec3dd819983b2d824142efddd46ef29b46a7c454", + "sha256": "00yclv8fky3czwnp3qfvcbbadqagqzyf6cxq50vyhmvjhnf9xspi" }, "stable": { "version": [ @@ -33895,15 +33895,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20220905, - 930 + 20220930, + 1401 ], "deps": [ "evil", "tree-sitter" ], - "commit": "c2408aa1342fddbde5e877e405fdd2eb03a07779", - "sha256": "1aw9pzsnl3wm01a1vc3y7x9cb6pqbb6w521gqiqxjfn8r6xjaljl" + "commit": "fad2178f4455301afcafcf93d93fa5c5ca2aed47", + "sha256": "00yfc4hwbsdm9qfvi8pbva7ifr2lxrcrnb16dv05jmfssx8kdpdk" } }, { @@ -34403,6 +34403,31 @@ } }, { + "ename": "exercism", + "commit": "da659316f2b8c8b326e04ee1e55fceb105128103", + "sha256": "0vy86v7ya9lqizl7ldrnlzcd12219dksrgbgvyla0yr6i8msqh4w", + "fetcher": "github", + "repo": "anonimitoraf/exercism.el", + "unstable": { + "version": [ + 20221001, + 1037 + ], + "deps": [ + "a", + "async", + "async-await", + "dash", + "persist", + "request", + "s", + "transient" + ], + "commit": "44dca0c889ac605777257ec3db442263772bb2c6", + "sha256": "1nzjfbyl0n4h9h9rrb037i65xd6j22ymvhb5irmrqvxbb2fvfs7w" + } + }, + { "ename": "exiftool", "commit": "4835a76909d020781021e747fbc341111a94dbfa", "sha256": "1zvcps64yvz8lsjhi1j0808983fv2s7kx67yjr8ps454mcl8bpab", @@ -35632,11 +35657,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20220825, - 1549 + 20220928, + 842 ], - "commit": "a3d7564f209c32b804852b7fe8056c1952414f08", - "sha256": "06w5q339k0nr0cvzc3s7zmk82124n0qikyyz918wvwgw8widcj3f" + "commit": "9173638b9a1f15e94a05440fdaec7a2f9ea45438", + "sha256": "0bb59s38lwpkmbwxld0z69jj3fk6h97yn2gqv51xm2rbkg2s92wc" }, "stable": { "version": [ @@ -36995,8 +37020,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20220823, - 1254 + 20220928, + 1355 ], "deps": [ "dash", @@ -37004,8 +37029,8 @@ "pkg-info", "seq" ], - "commit": "600b3bffda3862121d96bbc5c1f8990fa9033a82", - "sha256": "0nv8ln8mr63kn1c41amj88isl8f3imqhb0bqrpl6g6frm2rfwxkm" + "commit": "d72c29fec85f1da6584475d88c1265f80e1275ad", + "sha256": "1l39inrl26z9z13hdvbi8wk0zqnx31j4g2bs5nv80fxc8j5sxqna" }, "stable": { "version": [ @@ -39483,15 +39508,15 @@ "repo": "abingham/flycheck-vale", "unstable": { "version": [ - 20190609, - 1533 + 20220929, + 608 ], "deps": [ "flycheck", "let-alist" ], - "commit": "f08249535348d046d0974b9c20fe1b7dd3cd2660", - "sha256": "0xjaxckl5rajlxq9a4c9n8l4605n2xkkyd2sdj38kd9w9a428wvz" + "commit": "7c7ebc3de058a321cb76348a01f45f02dc55d2f0", + "sha256": "086b2ljx3n2jpjm2vl7p0mnjbhx3v45kjrxd5y7q4ilhi29g5cpf" } }, { @@ -39689,6 +39714,19 @@ ], "commit": "023472345980c251429046d6a20e85c76f9e928e", "sha256": "1zfysavx2w5mvy2mgi3v32205f1b7zfcrabi17rzi0v88h8j46a8" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "flymake", + "let-alist" + ], + "commit": "6fb90eefc2ad6214127de2ccff5160bf1d47eb87", + "sha256": "1dxy1bljvd8rar0pivdrfahmgnnjlxm0mlks8mzw3l7k7b7jar6k" } }, { @@ -40714,6 +40752,21 @@ } }, { + "ename": "flymake-sqlfluff", + "commit": "a24b706cdc277fec9d3998574430882f318e26f8", + "sha256": "0pqwyaifdbj5lrwz5ifqmp2r2d4wjvqvr09gpgz54ijm3bjlb38q", + "fetcher": "github", + "repo": "erickgnavar/flymake-sqlfluff", + "unstable": { + "version": [ + 20220925, + 2144 + ], + "commit": "b76f335555c9a94ffc3d7281f3dca345de474eed", + "sha256": "0snghmn59xcfqb90rgfph8fviapcwhh7d76hls54ixc6lc5za42p" + } + }, + { "ename": "flymake-swi-prolog", "commit": "a3645b08cb46e3d91081da7baa982b5283918447", "sha256": "05d86w375h7h7izw9bh8sqmgnjbw15dxv67sfnlk38b2mgmv6198", @@ -41407,11 +41460,11 @@ "repo": "usaoc/elisp-for", "unstable": { "version": [ - 20220923, - 1018 + 20220929, + 1246 ], - "commit": "5df8659ef315882b90f84da2eb9adf95443b571c", - "sha256": "0xm4l2kiy5j1pjjrja7791msb37fi26nabfhnacxaiagxksxlda5" + "commit": "22de9e71e0b7f831da4e4a756c75abcc73a02fad", + "sha256": "12asqfhy6bmwg7k0iysvv1z85cvnyrwrl8bzbjrx7giwyy3rk30l" }, "stable": { "version": [ @@ -41582,15 +41635,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20220909, - 1032 + 20220928, + 1045 ], "deps": [ "inheritenv", "language-id" ], - "commit": "48f79e894c04b0c73c6334194ee17d7f72046c83", - "sha256": "1ri9cbbd73g3a6wlmj8g4xx5vwfnxr2r7sdkr0c91yfihai51xg1" + "commit": "d01a0702472d159bacc704394198a77a64d3c79b", + "sha256": "1r406npg5f2wqysj9rligcjjr68m44ja8n8v82rf8zpi6v1pmp8h" }, "stable": { "version": [ @@ -43488,16 +43541,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20220812, - 2150 + 20220928, + 227 ], "deps": [ "dash", "magit", "s" ], - "commit": "4de561d1295d4c86ca9b159ab0c746bedc2d0380", - "sha256": "1k1gr6hnb9warbaglhfzarm145afsrv55xdkq6wq6s0imac742ba" + "commit": "38e53dfa782d65c7f93db8368b0c49f619c1f09e", + "sha256": "0rjrv7y4zkzry2fbsi55ccrnmasd0l8cpd0rapf0sskwc1wldymi" } }, { @@ -44846,30 +44899,30 @@ "repo": "akirak/github-linguist.el", "unstable": { "version": [ - 20220418, - 22 + 20220928, + 2013 ], "deps": [ "async", "map", "project" ], - "commit": "e1055cba19d82620a735e8e40d094b538e1f4d94", - "sha256": "00abshhhm6pvzgwaqhw8g0gwfs915hpdnfh5bqxr9434a56hgkd2" + "commit": "73f9f52e1f626e866d8becc7a3671630449764c2", + "sha256": "0vsab3jwkck9l42j22j2ndcj6njqbi516z7ayhlnv2z10ifjwfp7" }, "stable": { "version": [ 0, 1, - 1 + 2 ], "deps": [ "async", "map", "project" ], - "commit": "6e3fc58a465e6726dcba6da038f959028c62223b", - "sha256": "1zli3xzp44c61jrg0fn7h39ianxjp2r24sswm3i99hnx052pp8fp" + "commit": "f8f28745542d7e4300d73c6bf006ce48b6657947", + "sha256": "0a5ibyg7hncwiavngzvivhf5sbhp3czsicyfy1rpfijmbjm4whyl" } }, { @@ -47875,11 +47928,11 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20211119, - 815 + 20221001, + 1525 ], - "commit": "1b3b807e84cb250f0cc70876a438fed3b27eb756", - "sha256": "1p99lrq6p6xyn9lc2zmf68ns70kayhri1xls0h1h6ibxsqzvxyac" + "commit": "d03ccd6314d474f3e6beadc69c0b6ce32af62f07", + "sha256": "1s5xig6pbkbnb0xn7rp3a02ig0pzdwxqj54f3bjda0c37ch0l1cj" }, "stable": { "version": [ @@ -48592,14 +48645,14 @@ "repo": "alphapapa/hammy.el", "unstable": { "version": [ - 20220901, - 1102 + 20220926, + 1800 ], "deps": [ "ts" ], - "commit": "bd51cfd903d00a3302542dc2a8a17fe8b4d48107", - "sha256": "1vn0jzdkzjwvzmm824dgjdwhgfjpg4swsky61w2z9d57fl8p04an" + "commit": "62d3262a60d0f6f07920919bb3c47b57cb11bab2", + "sha256": "0q9lz0pz501l2s5g5hcn62ii2xfma04csij1rc6k3wzv6gnx4ary" } }, { @@ -49032,11 +49085,11 @@ "repo": "emacsorphanage/haxe-mode", "unstable": { "version": [ - 20210108, - 1835 + 20220930, + 251 ], - "commit": "fb3f3c9514e652f8955a67baeae13de264996860", - "sha256": "05kaxcazbr51chcmlx0fscwk32blj3lzndkr0qpbwfrn8n6mcmrg" + "commit": "4d51bd4bf75aef53d1671e22ce6555e4daf883db", + "sha256": "0dfjr6k0w996ygds0d5w0msx83bincvwnmmwaq8sxhdi3rnx26r2" }, "stable": { "version": [ @@ -49175,28 +49228,28 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220924, - 1201 + 20220928, + 1917 ], "deps": [ "helm-core", "popup" ], - "commit": "3c64aa842a7d382460cacc9d6fbe0e39d012b4f5", - "sha256": "0j0sfm8an38d9lfgaijrg8abjwz63qrmh4zq8vhrb572gam9kxn8" + "commit": "0a9a1e32cf130d181b26e23919402c8c25f41996", + "sha256": "1i8hbdp5sg99h3imqydk4wd7mqsa04113yavk5sx1wgc17jm1l42" }, "stable": { "version": [ 3, 8, - 7 + 8 ], "deps": [ "helm-core", "popup" ], - "commit": "4ede199d5d1b7050486a0fdeecbbbf49fef31118", - "sha256": "1a8zkp00ahb84ww5072naxwllzbjhi7ccarkk2d7xsykn5lig54c" + "commit": "0a9a1e32cf130d181b26e23919402c8c25f41996", + "sha256": "1i8hbdp5sg99h3imqydk4wd7mqsa04113yavk5sx1wgc17jm1l42" } }, { @@ -50081,26 +50134,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220920, - 1150 + 20220928, + 1917 ], "deps": [ "async" ], - "commit": "0c12230b4f90118990a3449cbc220b3e13417387", - "sha256": "1hrwab6k4sa8f6x6wssl25lpbp214arb1k210xa788gshm40wqjv" + "commit": "0a9a1e32cf130d181b26e23919402c8c25f41996", + "sha256": "1i8hbdp5sg99h3imqydk4wd7mqsa04113yavk5sx1wgc17jm1l42" }, "stable": { "version": [ 3, 8, - 7 + 8 ], "deps": [ "async" ], - "commit": "4ede199d5d1b7050486a0fdeecbbbf49fef31118", - "sha256": "1a8zkp00ahb84ww5072naxwllzbjhi7ccarkk2d7xsykn5lig54c" + "commit": "0a9a1e32cf130d181b26e23919402c8c25f41996", + "sha256": "1i8hbdp5sg99h3imqydk4wd7mqsa04113yavk5sx1wgc17jm1l42" } }, { @@ -53905,14 +53958,14 @@ "repo": "duncanburke/help-find", "unstable": { "version": [ - 20220513, - 1028 + 20220929, + 822 ], "deps": [ "dash" ], - "commit": "6dd61bbb6290e06e30c002c011da71e348ac045f", - "sha256": "00b4vbk3m0br5k2x9mqx1v58j7jpd4k1nln18s99ggxpmx5klk02" + "commit": "ef7266fc480367c12bff64817c875af940d0c9c0", + "sha256": "1m73capf6flcn8d8ykx13va0wvpcqkjj5isdf5wrlaxhayjc2s7r" } }, { @@ -53947,8 +54000,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20220919, - 540 + 20220925, + 2206 ], "deps": [ "dash", @@ -53956,8 +54009,8 @@ "f", "s" ], - "commit": "db1e15b3783c83d9781a546f37b900ad53576659", - "sha256": "0cxpm6b36bwd42gmah9ic7i74m25j232wag5s0v3m1bsqrk66ra4" + "commit": "3aa08da7a151f1928bf0e3d12fc2443b6485b6ef", + "sha256": "062ym5662b83dxga30qgdvp7krq30m41m3qpj2n64jfimbyk1f56" }, "stable": { "version": [ @@ -54928,11 +54981,11 @@ "repo": "ideasman42/emacs-hl-indent-scope", "unstable": { "version": [ - 20220911, - 920 + 20220929, + 2350 ], - "commit": "c8fd8bc602d71050d4e953ddd8922583081745ad", - "sha256": "03kd2j99d2zifarpcsj62f12a28n6k4dwghsa0cdxjkkpakf16lr" + "commit": "6220879d7b8b8fdb2274555b401890f7ae8d48c0", + "sha256": "0ysbg6r9af45qxc2cnh41ymp69aq1sr3dqyxb9f37ss2dkdjryc3" } }, { @@ -55083,16 +55136,16 @@ "repo": "thanhvg/emacs-hnreader", "unstable": { "version": [ - 20220103, - 1909 + 20220928, + 423 ], "deps": [ "org", "promise", "request" ], - "commit": "e17006072b0cd06ab7ff32c6187e9565131a78b2", - "sha256": "0fyfgdzjc1xy2v13wz96xj09fa18q4285xksc77wm9gxn7ghpvz4" + "commit": "8481681c9b2f3bd1ddab12a657f5f3827e288ad7", + "sha256": "0ls4q79s361bwa89g1iq3mk6a9d5q3f5sldip8ww42dafmd9smbi" } }, { @@ -57609,11 +57662,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20220704, - 652 + 20220930, + 2107 ], - "commit": "d82a5aa4d3ee4b37c69261480e1866fff8b7b348", - "sha256": "0llrz47013x2fllqg9p114ancrryb2dxpkypmxpr2x7y75qqkvk7" + "commit": "586b955dde5a0699fca76db28ad0d6c3e4141a27", + "sha256": "00jjkfa7aj5sssdsbkyh7crs2y6j3h9gyj3gmdapj8hk1wkbnc9a" }, "stable": { "version": [ @@ -57934,6 +57987,36 @@ } }, { + "ename": "inferior-islisp", + "commit": "f276aa46506c784e1dc8caff8c5fa9885da4ba82", + "sha256": "1igq56vabdk38dby8g6db5f8kqifpdfkh8rlbd23bak6hyrlqadz", + "fetcher": "gitlab", + "repo": "sasanidas/islisp-mode", + "unstable": { + "version": [ + 20220924, + 1040 + ], + "deps": [ + "islisp-mode" + ], + "commit": "423b84fe4cc6944e36971225b3e19c888e7e4690", + "sha256": "174zjlgcikaydgx5npsbwqblzc61pxnnpw50nia8jhh8175j2sbl" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "deps": [ + "islisp-mode" + ], + "commit": "18258f7134cfd8e0bd12538351b3cd23ae44cec1", + "sha256": "174zjlgcikaydgx5npsbwqblzc61pxnnpw50nia8jhh8175j2sbl" + } + }, + { "ename": "inflections", "commit": "392c7616d27bf12b29ef3c2ea71e42ffaea81cc6", "sha256": "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70", @@ -58016,14 +58099,14 @@ "repo": "ubolonton/info-colors", "unstable": { "version": [ - 20200125, - 1447 + 20220927, + 1640 ], "deps": [ "cl-lib" ], - "commit": "47ee73cc19b1049eef32c9f3e264ea7ef2aaf8a5", - "sha256": "1zmiik1ba7xspbk2g8igr1rscxxzxpzjrzspxjcw9khw6z4iwr51" + "commit": "2e237c301ba62f0e0286a27c1abe48c4c8441143", + "sha256": "0di34jg2r8nlflxln5azaf2a409hr3pwl93x8jdkv070yqyrf69f" }, "stable": { "version": [ @@ -58977,6 +59060,30 @@ } }, { + "ename": "islisp-mode", + "commit": "f276aa46506c784e1dc8caff8c5fa9885da4ba82", + "sha256": "08fpz699philm5j45ixziccy8jc4bx0nzjgbsx64j84r5dbdnyg8", + "fetcher": "gitlab", + "repo": "sasanidas/islisp-mode", + "unstable": { + "version": [ + 20220924, + 1043 + ], + "commit": "bbf45d02495f9455e91beed01676178dfa5d3561", + "sha256": "174zjlgcikaydgx5npsbwqblzc61pxnnpw50nia8jhh8175j2sbl" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "commit": "18258f7134cfd8e0bd12538351b3cd23ae44cec1", + "sha256": "174zjlgcikaydgx5npsbwqblzc61pxnnpw50nia8jhh8175j2sbl" + } + }, + { "ename": "isortify", "commit": "c756ccbae044bc23131060355532261aa9a12409", "sha256": "0bqs84prlwk94x543mv22wjnz0s7gqbdi7ryvdc20s7vdr18fn82", @@ -59140,11 +59247,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20220915, - 1532 + 20220926, + 1250 ], - "commit": "011653a8c0572202603458fa90f337a419fb88a6", - "sha256": "16ci7d89kflw17h4f7kl9pmmj6gkdfqzjwspj6ckdgw18l4vlbqh" + "commit": "29b61fe1f4d5268d750b666a7ffc1269e22c6477", + "sha256": "0ckpclxyrihyimpl9bcyql1gfsn1b7flr23asni1rzxzpq16nvn9" }, "stable": { "version": [ @@ -61826,8 +61933,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20220828, - 1436 + 20220927, + 704 ], "deps": [ "dash", @@ -61837,8 +61944,8 @@ "spinner", "vterm" ], - "commit": "ef72f073d783a26c008c9fb478f3d686b9e9ea1b", - "sha256": "0vwlc0q1mrrgfwvz753j2wx7krqxyw23bkhms6vjki921zq24fsb" + "commit": "0e6fa5180447024c794cb8186c782c5cf28ae68e", + "sha256": "0phzrwr90zl7hvmh7p0cgkhs1sj2zpk3hg4f2gf49ix3q7vbbwhl" }, "stable": { "version": [ @@ -62871,14 +62978,14 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20220422, - 1612 + 20220918, + 2243 ], "deps": [ "compat" ], - "commit": "2e5f99f38cfdd55979dadda74b2d7086fedebb03", - "sha256": "08w0bccyi3j6cqgywah952vazl50gq4rh8p076459lyl8kjsc189" + "commit": "e4ef3c5fb46b1f749c9d838d2eba709e164402e2", + "sha256": "19vf6rmydf0ayns9cllj2skq79xjfdn343csijmy3vb6hp3zq869" }, "stable": { "version": [ @@ -65208,11 +65315,11 @@ "repo": "merrickluo/liberime", "unstable": { "version": [ - 20211203, - 244 + 20220928, + 845 ], - "commit": "79b709debe036f98d74ac129934e59c4d08c1dd5", - "sha256": "1z1z8x65z4wp9gkbasljxc9bwigi2db95sy31m6k9120k74gkzsk" + "commit": "2217883b0ca3b308de4e2c670a0ac8c767fd633e", + "sha256": "0s0fsjs52x4v1h04j711fd2w7dmx55dc1chfd0s3czf1r5vr7hc3" }, "stable": { "version": [ @@ -65437,8 +65544,8 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20220721, - 451 + 20220928, + 1307 ], "deps": [ "fringe-helper", @@ -65446,8 +65553,8 @@ "indicators", "ov" ], - "commit": "1b2dfa899409f4af2896fce6b9acbe98072abd59", - "sha256": "1xxmvdgqfj3lv33vn4pw3rdrxjmqypf09hh5w1jr69xbyl2ahzzp" + "commit": "7561700e37543bc7622e41d81d5b6dd038a8efe0", + "sha256": "0amx49lpbdxmm844b8xlc9x3x848pdq3az41b0l7qkyvsschxajl" }, "stable": { "version": [ @@ -67400,26 +67507,26 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20210815, - 1426 + 20221001, + 1150 ], "deps": [ "lsp-mode" ], - "commit": "d1da34e21d88e507dc1abc75ec457c9cd30165db", - "sha256": "0saghy3j54gyknx5qljwrpkf8ibbdwjqwljfnqqn6yxq1kmfmdik" + "commit": "94c4536579c18e17e87f2441810968a153c3bea1", + "sha256": "1myzjgx2hq70aa9vb0vmgh2jdd25c5b7x580ccb9c0p40rzjjpbr" }, "stable": { "version": [ - 2, + 3, 0, 0 ], "deps": [ "lsp-mode" ], - "commit": "1c60c2d331baf778bd8a3ac9d5688516398ae323", - "sha256": "1nm03yn02ja867d9ba3n980v86kcd5varzng1lhzv7fr7akv5j13" + "commit": "94c4536579c18e17e87f2441810968a153c3bea1", + "sha256": "1myzjgx2hq70aa9vb0vmgh2jdd25c5b7x580ccb9c0p40rzjjpbr" } }, { @@ -67506,8 +67613,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220922, - 1911 + 20221001, + 846 ], "deps": [ "dash", @@ -67517,8 +67624,8 @@ "markdown-mode", "spinner" ], - "commit": "447032e53c8bfb56dbd00f2b51355544e87ed180", - "sha256": "0r26ibqbr4xyfcckkzpwlc42xyhfcdw9clgl45l889pjzdv1rmdx" + "commit": "a5bb8deaa1bfa03ee94b563cd1b030676931a7df", + "sha256": "1rcqjk6fj0a7plnlb41ci26041r6w3lfkb2ifwb5fgdfg5r7cqiz" }, "stable": { "version": [ @@ -68413,11 +68520,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20220920, - 1237 + 20220926, + 1228 ], - "commit": "2f86d2f456029c3ed9d8e5cd0ed2f3dd8cb3b862", - "sha256": "0zg8y62zi59v0p6hi9zq9ajc90q7qz439l7aaqr9rjwbmj91m5bk" + "commit": "0ae427be02275054ec08cd6fc5259f38473120b3", + "sha256": "068wylr06qq2mgpn786lb2jb4cfp28h8aqiqzdhnq1sdcrqmxb1c" }, "stable": { "version": [ @@ -68437,8 +68544,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220919, - 1308 + 20220926, + 56 ], "deps": [ "compat", @@ -68448,8 +68555,8 @@ "transient", "with-editor" ], - "commit": "4ee691cd90a4975b31ba4f3f6fc3ae69a0b0eb62", - "sha256": "0384yy53nfs91sqnhvb9gb9j265dszzz4c0g414f5cf0pj0jar5f" + "commit": "ada7b21fcc90004d7ac1c5a42c0750e12c2a5ef8", + "sha256": "1nl5axpxv5srxyihkzsi1sqnb5r09fah9ppvsiw1ihgc6fh7a460" }, "stable": { "version": [ @@ -68476,15 +68583,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20220302, - 1725 + 20220926, + 300 ], "deps": [ "cl-lib", "magit" ], - "commit": "efe484644666c6b7c544b0fb7b87e30703fa9425", - "sha256": "1n2q9px8b3s3732a6yiz9gvfxbya7sa2qnxidzcn4gdp867l103c" + "commit": "0b3787d2c2ed0603467be8152847b7539c8a955c", + "sha256": "04g1bgzbxzm2g44rv89m3rcx2h89f06sj3m88his4m0l3rwgzkf7" }, "stable": { "version": [ @@ -68959,15 +69066,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220901, - 331 + 20220929, + 1014 ], "deps": [ "compat", "dash" ], - "commit": "248d8103f83db841adf3d92b358ae42b81df41dc", - "sha256": "1yxhdf1mry0axln0fp3gvrxsqn7ls76jxa4559snwcfzfxxf2gy3" + "commit": "cfe5a1260bf19191adab837e90acc1004529a0c9", + "sha256": "04lfwy494bv1acmr9jhr4w46jrpi4hyjmg5wjsxf547vx666q6vd" }, "stable": { "version": [ @@ -69389,22 +69496,22 @@ }, { "ename": "makefile-executor", - "commit": "08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9", - "sha256": "0889rq2a7ks2ynyq91xsa2kpzgd72kzbjxx0b34w8faknpj3b6hi", + "commit": "f1cd87e10ef298dd8db2361d81211bf5d732cde1", + "sha256": "1rgldb38nni217g1xvxbpj6xs9l079f9wfii1v71fccqra3r0mny", "fetcher": "github", - "repo": "thiderman/makefile-executor.el", + "repo": "Olivia5k/makefile-executor.el", "unstable": { "version": [ - 20220919, - 802 + 20220928, + 936 ], "deps": [ "dash", "f", "s" ], - "commit": "b304f4b5cc5d33eedf76ff0fdae839d1a00ed2a5", - "sha256": "1axamja9a3h7x2bwsiqgxdf7rrv5n0jhi8cirblag9ipg1ba7j75" + "commit": "170d14d834a0d163cd618d642d4580ff75b014be", + "sha256": "1g9mzic9k27fhpzcfpvlirgks2ip13z4xn8bfqabmp0xgq41ga5j" } }, { @@ -70892,11 +70999,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20220920, - 45 + 20220930, + 15 ], - "commit": "c3f291ad289769fc9a3b2745a5e9969af6322d0c", - "sha256": "0059jwhdxl4pi90c8rsxidy4ya5ixcxly1iblbbbk58rwfy28ck4" + "commit": "dae2baa8228ee0a5cb37c6707057160c57bfe5f2", + "sha256": "08zpgaihsza69n6wnx4va3qjnh0bica477xshf7klyp6w13akr3k" }, "stable": { "version": [ @@ -72491,11 +72598,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20220921, - 1323 + 20221001, + 752 ], - "commit": "ee35a9af344d2b2920589ec4d66e9cb513bdfb80", - "sha256": "0k7syi00vk2gds2gj6q9c4dh5msnn21bqgqn5vz3sxffpaw4say0" + "commit": "ad5cb41daf57456dc28d54b07f9a1dcb2c55cbd4", + "sha256": "19b49lg598qz50976i09scz15bz5njk8bnd51c7cb4cyknh1c87z" }, "stable": { "version": [ @@ -72989,8 +73096,8 @@ "repo": "themkat/mos-mode", "unstable": { "version": [ - 20220828, - 847 + 20220927, + 1845 ], "deps": [ "dap-mode", @@ -72998,8 +73105,8 @@ "ht", "lsp-mode" ], - "commit": "1e688e76f1600095b8b55ea8006489a3db9c421d", - "sha256": "0jb9nmp01dsjc1djksgia09vy52yqk38i59wglaqqcv60150kfaj" + "commit": "3f82f1de4f951096424e0da14ea4e4a40a82059d", + "sha256": "1i9xcmnvnz1vxhi4c9hkfnyniabyah0pwd3r64lgxr5yv04wzsyp" } }, { @@ -80335,6 +80442,24 @@ } }, { + "ename": "org-custom-cookies", + "commit": "44e1c0107084b9ac41e7459a78c0ef03aa34a05a", + "sha256": "0gxw7rp4n9psfd657hnlggnllb4cp9d71n7mviknblifj065ynfz", + "fetcher": "github", + "repo": "gsingh93/org-custom-cookies", + "unstable": { + "version": [ + 20220928, + 114 + ], + "deps": [ + "org" + ], + "commit": "e57e0de5b8200224bf5d44b62481c542986f2f13", + "sha256": "1r3m7nvx10yzxsasld3h59psml4r7kmz2wn79n5xkppkpb0dbymn" + } + }, + { "ename": "org-d20", "commit": "98bf91038196dfb59c491c9ed96c6b6a0cb311a9", "sha256": "158n900ifb1mfckd0gjmb9gpzibh8a2x56flbn2r035gcdbb7wc5", @@ -82608,27 +82733,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20220831, - 1033 + 20220929, + 1630 ], "deps": [ "dash", "org" ], - "commit": "b25ec9f8671c399807b6988b215e5dfc7c95a539", - "sha256": "1rjzsgy42mjjqd4a4f2jp73hf9jf8k324m3vspv2a4nrf5497p4i" + "commit": "e4e13cc5e240f9b2717295f6df536d29a8ead108", + "sha256": "0l05bn79dp27zk5xkcyk8qj6rwl7s1z02ncbzxw8qq10fs4081rm" }, "stable": { "version": [ 0, - 4 + 4, + 1 ], "deps": [ "dash", "org" ], - "commit": "9b14ffbbdf0c08f3ea15fd4825522f5cd856d9a7", - "sha256": "0v566plqyl82hjd26l38x6vxbw8l6ib9b5v9i0zggkqrahv1x91p" + "commit": "f1fcb0c6391f8e38c94a18f7c2a19124196e4862", + "sha256": "07yv157ci814ndzwrynmys80w5iiq9k43qvv4hajn5x7c467vm97" } }, { @@ -82766,16 +82892,16 @@ "repo": "org-roam/org-roam-ui", "unstable": { "version": [ - 20220803, - 1024 + 20220927, + 1434 ], "deps": [ "org-roam", "simple-httpd", "websocket" ], - "commit": "c75fc7506ee7f03840a9a93ed9336d7ed24551aa", - "sha256": "0mkcd2622np8s5qz2zvx7lch6dc586xqmn6914gi4ym7nvklf3zy" + "commit": "6bf6a5eecc1fa7ddbb1fcda85e08fe9c393f9298", + "sha256": "0y2rpk2ncl18ymvvvqzjvy1d3kxi94ack6qxb8zp2p5jdx2n0ciw" } }, { @@ -83333,15 +83459,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220912, - 430 + 20220930, + 948 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "bfe7f054109f9f0e6fedbf5c9240fa96ebdde5fd", - "sha256": "0i9r0623r6wwb8c0r5ph97n2iy166cmfcd6mmkmw6hpiyg19rx3x" + "commit": "25ceccde36cbb3bbed55da939348c47f91670455", + "sha256": "04j8c8j0d4lgn2pd2x21q79x3gdwsnzw57l45n5r8arqpdmmjbgz" } }, { @@ -83795,11 +83921,11 @@ "repo": "nullman/emacs-org-visibility", "unstable": { "version": [ - 20220710, - 1747 + 20220929, + 1407 ], - "commit": "24aee13a956bc1cff72f8b04f47e7d9ec01bb3b3", - "sha256": "1b7afdiagnf9biw0px7qc6ayjbbhy5z2gwl7g1whb3h5hvrri4j5" + "commit": "71d57ca126ccb5441b87aa052903fa6ad59b62f3", + "sha256": "1xl9v42isszx6svdnsnlfs5ksczyzwh14bzh5szkw041gfmy9k0r" }, "stable": { "version": [ @@ -84409,11 +84535,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20220726, - 1241 + 20220928, + 1944 ], - "commit": "815c9f6aa89354a5720759616bcb1ff7ec52b21c", - "sha256": "19zzm7anr1f8dj53xikj4rdrj87bvc7f79hw6ig8zmyd7i490msy" + "commit": "068973339af3714ea015501f0fcc35014f255c1a", + "sha256": "03h0g2pr1yxbvvp7bj0k00p16dp3g5h4jgqjp28d4pllcpfwspmy" } }, { @@ -84439,14 +84565,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20220726, - 1235 + 20220928, + 1946 ], "deps": [ "cl-lib" ], - "commit": "4b09436de15545ce73dd40e938176a98254109f8", - "sha256": "0k7z3d24k4nqz13xj0a7l79idar3kdl022r4jm3f9hjkxlddsbfk" + "commit": "8ce207b7100dc9cde071099b56cebb87924aaafd", + "sha256": "07mp1kgp9jkajs1lwwzl051gaygi8wqmnkp52pddw4xfcni9i6va" } }, { @@ -88477,17 +88603,25 @@ }, { "ename": "pg", - "commit": "5c4d1bb21948da2b283a3a9d89d9e3aed11afa13", - "sha256": "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji", + "commit": "a84e158f6ad6258c2e499cd7a7ca3c2006203b0d", + "sha256": "1738lkqpl9afp9ivq9nnz77j14vbvx7n7yv1xn5b1fk3hfj60v5c", "fetcher": "github", - "repo": "cbbrowne/pg.el", + "repo": "emarsden/pg-el", "unstable": { "version": [ - 20130731, - 2142 + 20221001, + 1320 + ], + "commit": "99085cd115b705e42e574b13dc168b901b767bf3", + "sha256": "09l2zzp0r0pwl0kak9z6kn700vm4mr99acn2g2dgn9c3pl0syndj" + }, + "stable": { + "version": [ + 0, + 16 ], - "commit": "4f6516ec3946d95dcef49abb6703cc89ecb5183d", - "sha256": "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0" + "commit": "11f27360086f27936401e1f4b196f73dbd11d880", + "sha256": "1jdnslpgdm16klaga02p33g7c8bjzg164kxz3jd7gs5v9gqa6ppz" } }, { @@ -90973,23 +91107,20 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20220910, - 1225 + 20220927, + 1610 ], - "commit": "66b840b6ded808974225501d2e672da7363579a6", - "sha256": "0alrzskhbi1mr3d33gq6ym546yfj7lsfai8xasxnbawb6w8akc4w" + "commit": "20ce6cbd2f06423be35b3b700c698f0e109e880c", + "sha256": "13ww7hld5pa32myj9krr6prmc99s7hnpsw8mw9krpxffykkblj2f" }, "stable": { "version": [ 0, 5, - 8 - ], - "deps": [ - "cl-lib" + 9 ], - "commit": "9d104d4bbbcb37bbc9d9ce762e74d41174683f86", - "sha256": "0qrsz4z9q2bfq9xv4n94mvyslm232v2ql9r1fjycx7rnmpqggiwl" + "commit": "20ce6cbd2f06423be35b3b700c698f0e109e880c", + "sha256": "13ww7hld5pa32myj9krr6prmc99s7hnpsw8mw9krpxffykkblj2f" } }, { @@ -91581,11 +91712,11 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20220911, - 138 + 20221001, + 127 ], - "commit": "928cc72ec3dca8e9a60d356b9b8ce896ec5ff621", - "sha256": "1hyn000z6xy5cb2k7h8xairxvhlhk2pcc1rqabwg76jlh8qbr24w" + "commit": "a86b71431002f7c7be6ea86f6f2694d206564b13", + "sha256": "1hxfilsd8bia4zn2gzsfzpll39bb980z4j76wqh4ry69nx84w2gf" }, "stable": { "version": [ @@ -91933,11 +92064,11 @@ "repo": "masukomi/private-comments-mode", "unstable": { "version": [ - 20220330, - 1316 + 20220929, + 1807 ], - "commit": "57eb1ba3812e44344b7d5336c3a3ad14a28e4f9e", - "sha256": "0m5qksmzbjwzv10n7hb3v8sa6zab4kp2w7ayv2g7fc94cm1aljz2" + "commit": "b32b862e42e1f5cf26b6ca4cebea69b3f4e1aeab", + "sha256": "0q79dh1z9hgcln2maaw514dxqk1nw16wdqpw6vg2y6kz535xwmfn" }, "stable": { "version": [ @@ -92751,11 +92882,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20220803, - 1702 + 20220930, + 1309 ], - "commit": "b5e3589ac84698eb94eb005bd17cd35633788127", - "sha256": "12iscqdngyc6ap8xsxc44mfwsbzg93id2l4fc4y133brdcndzqal" + "commit": "ef18ee4d6ffa160fe563307561f2cad12e9478b5", + "sha256": "12sy38s3ys1jyvbfrbq9xwhdvvdmhcj3bymnqfvgqlhi7p3frrp8" }, "stable": { "version": [ @@ -92864,10 +92995,10 @@ "stable": { "version": [ 21, - 6 + 7 ], - "commit": "24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb", - "sha256": "0qr1158s97p7xdhjpbmd7ylqdzr2r3n5gn6xl4h948fyxzc9vsg8" + "commit": "54489e95e01882407f356f83c9074415e561db00", + "sha256": "0yhjgmgzj0awwsp6g2hsvwx86v2ns8pfcvk2wdq6kdyv6dngh7ig" } }, { @@ -93788,28 +93919,28 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20220919, - 421 + 20220927, + 803 ], "deps": [ "async", "xr" ], - "commit": "d1b28087e261814de5b3200629b023c403cb93d4", - "sha256": "1izcw1gqh8j497qjm7zxijk7arlakicl8g5jadjbamxybcha1mlp" + "commit": "1129a07aa45c71c8d6712b73f089e7addbce53db", + "sha256": "180bkdl5zbsxi5q0fxr4p6676iblky9cd1qq9cxssbyzjpj1qpgq" }, "stable": { "version": [ 5, 2, - 4 + 5 ], "deps": [ "async", "xr" ], - "commit": "6b4329a25f0ec61f8fd404d926315064b966fa0b", - "sha256": "19q416q69lzf2w9yjv3fy7dnzrza3z6caqrrmnfh8q8lv22hn8ll" + "commit": "2d9e9c5b9703dc4f3a400ab353ee99556c892c00", + "sha256": "0ixvwfdk6kl14gqaz6988iz36fdjk8gd94aiqkaf7y2wlm4gjs11" } }, { @@ -94676,11 +94807,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20220730, - 230 + 20220928, + 919 ], - "commit": "59bd9bf760f2fdf70c81c220f2875dbee0c29d5c", - "sha256": "1lv8q6rs61qijrfj40fwy89gyhf9dgbp44z3p6clbhlq9kqf55jw" + "commit": "37962e3b264795b7a3593109c7f14dbf57d9b77e", + "sha256": "1xdqr73y8lpxhmgp1yrap3bw5pf8lhaw2v3jib1pka6aj40vi2di" }, "stable": { "version": [ @@ -98902,8 +99033,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220923, - 1411 + 20220928, + 1157 ], "deps": [ "dash", @@ -98917,8 +99048,8 @@ "spinner", "xterm-color" ], - "commit": "17d49c734276fe112bf051492555c3c2ae4f2fea", - "sha256": "0n0hjj2inyl0kh0xkrmwrj5zfx85awba2aamrwz19irw17k1xyzz" + "commit": "0eca6e6f0b5b3b02233a2d03c797be2f9a983c19", + "sha256": "189dxc9p6dgiqgs3s0855lw4i2vpl2c9rhyyjanyih64mi378rm1" }, "stable": { "version": [ @@ -100920,11 +101051,11 @@ "repo": "midnightSuyama/shader-mode", "unstable": { "version": [ - 20180518, - 1157 + 20220930, + 1052 ], - "commit": "d7dc8d0d6fe8914e8b6d5cf2081ad61e6952359c", - "sha256": "13scj6w3vsdcgmq7zak3pflqpq295wgzsng72rcafgkkr7r12rar" + "commit": "fe5a1982ba69e4a98b834141a46a1908f132df15", + "sha256": "1vch21zxhh4bwdm48060cixd479bs31i7hi5kxi7q8wqbic9gdzm" } }, { @@ -105700,11 +105831,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20220922, - 1947 + 20220925, + 2308 ], - "commit": "72bd263bc3171c5a2123441a4ed89ef9dbbfca02", - "sha256": "0v2v9fvwqgpxy9dnb2ymfga28rvxsxd5miby953qyjcbgrg7md47" + "commit": "20a1c9b36e99cbfbf70598e2cfaccd960e74c1ce", + "sha256": "1kz95vb6jbpkzs11mx623sj8xdf8n007vr9ix6wqvdsaqy158qkl" }, "stable": { "version": [ @@ -108224,14 +108355,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20220614, - 2113 + 20220924, + 1805 ], "deps": [ "project" ], - "commit": "6c3314167bf15a99247acb4eb60827faea36f4dd", - "sha256": "1d9m8aji2nd38w1a39whbqsg1kpfjxkmi1xn6pyfkng5bzalfq40" + "commit": "93a2b5650e4a75bc844251b1807ec0aa48ea27e9", + "sha256": "1rqy6wxbriz1xxsk5mjifsczvi1dpqn3adhj677r4b9lbrl4jkqk" } }, { @@ -108416,10 +108547,10 @@ "unstable": { "version": [ 20220924, - 1232 + 1640 ], - "commit": "566dd054ff70d9bfe26d6db448fcf4cc9c0623f1", - "sha256": "14qnyb8vjxlw0qz8bkbpylbjw29pjwkj9k50qi6lmggmlw8x448f" + "commit": "d441ae6b392597f0e01bc79292845c880d468b60", + "sha256": "123h7wz2ql6cl6s0n6n18g4ssa0p1a90svx7zh9627w45q68qlbr" }, "stable": { "version": [ @@ -109777,11 +109908,11 @@ "version": [ 2022, 9, - 19, + 26, 0 ], - "commit": "2f0283d9c28cb792e846cbb7718bfa073943869d", - "sha256": "1dv6c23656mfb9advmipy0dlh1z6qql9iv2y3m7k8fkchigc9pmw" + "commit": "167ba9f102920b1ed9b7c4b666b370935a4151dd", + "sha256": "1syxzqkr32r9ybdjiv545k5lg927z3qw61nprgs1s5im3fd4yh54" } }, { @@ -110489,11 +110620,11 @@ "repo": "tok/tok-theme", "unstable": { "version": [ - 20220924, - 1242 + 20220928, + 1823 ], - "commit": "99b3cbd44470c2c345f3516a9d58a4d1c847a12a", - "sha256": "1d12qf6gv3i6wjmqr4vpcq08b112jnwikll4ra5w86l9dbfk12wi" + "commit": "eb67fd9ba96a29e00d6c62261721ddf7c156e26b", + "sha256": "0m9hczl0jdwr7i3k4ba1rx0k4lvbjvjgg0fdvpax8p8lc1yav4cy" } }, { @@ -111412,26 +111543,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20220915, - 441 + 20220925, + 1020 ], "deps": [ "tree-sitter" ], - "commit": "6d18db5e68d106b21c5c6a746bd262a8e8782a2c", - "sha256": "0dcahb895wa66p7jzps7fnaaxjca3rg31hq8wrjc9f9fglz5ipvw" + "commit": "00738cb725785cbd42978f944f8661c33b5d3fe5", + "sha256": "1nr1k92c0k7q0x7mgm0x23jyysc09mf967bmhyw6m4pdy1myc38x" }, "stable": { "version": [ 0, 12, - 3 + 4 ], "deps": [ "tree-sitter" ], - "commit": "6d18db5e68d106b21c5c6a746bd262a8e8782a2c", - "sha256": "0dcahb895wa66p7jzps7fnaaxjca3rg31hq8wrjc9f9fglz5ipvw" + "commit": "00738cb725785cbd42978f944f8661c33b5d3fe5", + "sha256": "1nr1k92c0k7q0x7mgm0x23jyysc09mf967bmhyw6m4pdy1myc38x" } }, { @@ -111478,8 +111609,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220917, - 1219 + 20220926, + 1903 ], "deps": [ "ace-window", @@ -111491,8 +111622,8 @@ "pfuture", "s" ], - "commit": "e4bb236bd5cd7c077c2207b33d2699485c405536", - "sha256": "02g8w3xpkil724mwpk67x31gv16ahhj6slvcjbis3c16ni9m14ck" + "commit": "20765acd38e00faa46a72b9a2cf63a7b451c6850", + "sha256": "04wglc8lkw06hq9y9lsd3p5pwsc70cxx047da9v9hhdm2milggkn" }, "stable": { "version": [ @@ -111797,11 +111928,11 @@ "repo": "tilmanrassy/emacs-treeview", "unstable": { "version": [ - 20220912, - 2346 + 20220928, + 43 ], - "commit": "b68f77bf102b289e7b0e97f767bb7ffff9a5835b", - "sha256": "11c9m4x4nrh6vxma59vdm24vkipk38n17mcnva3ymn49r3597fwh" + "commit": "d9c10feddf3b959e7b33ce83103e1f0a61162723", + "sha256": "14s0b6zbapsvgyxki59lglwb3s8wjsjwkgj5r66af9nj2bgz5ms9" } }, { @@ -112095,26 +112226,26 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20220719, - 148 + 20220929, + 1327 ], "deps": [ "caml" ], - "commit": "ad8a688b7e2aeeafc320a845f86cdd9aa7c971ce", - "sha256": "0vma9ylyaxrl21a3g4vlzd9iqpwallchaar3p7v0dyp5cf8xxvfw" + "commit": "53ce2fdfdd372d52f3a6547c33b687e7d403357a", + "sha256": "1pxw5cy1zxw10vqk0mgfjvi26sq50naf22irdv701dwnqdp6j5yy" }, "stable": { "version": [ - 2, - 2, - 0 + 3, + 0, + 1 ], "deps": [ "caml" ], - "commit": "5796f08757a6d172d628834a40ba6379f318edf5", - "sha256": "06zxnn85fk5087iq0zxc5l5n9fz8r0367wylmynbfhc9711vccy6" + "commit": "4d94293cc5a7bba6cd043e29968719ce597d65f5", + "sha256": "1p3xpk78i8ywgdmc59w05wjjy9dg6gm5gicm08szmrlnx08v2ihm" } }, { @@ -113773,11 +113904,11 @@ "repo": "jcs-elpa/use-ttf", "unstable": { "version": [ - 20220704, - 700 + 20220930, + 1951 ], - "commit": "0b1e16d4da63a53011bb46efdb9377293d3b5239", - "sha256": "1dg4csd1kd6kc34d67rwvg1f0gfhipcbzawhc9qbpnpip99dj4mz" + "commit": "105577c6290934119978e23b168f0b97c9d586ba", + "sha256": "143iy63rlibxlyrzxj2qfh3vjwsdgzypimazs7vd6x7l4p45xzrj" }, "stable": { "version": [ @@ -118273,11 +118404,11 @@ "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20220905, - 1652 + 20220926, + 944 ], - "commit": "def4acd761ee959b25599a8149488f1ab5789381", - "sha256": "0lnl9pns1qwbc2qwvsgcxi7vd9w8sp24d2x6v8v1z0m4qi92a3mm" + "commit": "933b02832ca2e098f865d2080b9feb058afa008b", + "sha256": "12bc8jzay4l7wmw177l7x3h5yaf8gg3vzisbcvbfcn0x076765ll" } }, { @@ -119440,11 +119571,11 @@ "url": "https://www.yatex.org/hgrepos/yatex", "unstable": { "version": [ - 20220924, - 325 + 20220929, + 123 ], - "commit": "86ceef677ca2804f00cb966b538a27928a28fe77", - "sha256": "1n6y4gyxshmrx5600wmh19v500birj2xnaz609c3x14nlxwnfb33" + "commit": "923a6c0183be469fb4f94b1258527f2ca1cc5b79", + "sha256": "0f5xgzid2bl0qy803vzy1dn8hiq022rbdq2lnj4zxjcvz9jd5cm7" }, "stable": { "version": [ @@ -119803,11 +119934,11 @@ "repo": "taquangtrung/emacs-yul-mode", "unstable": { "version": [ - 20220911, - 1651 + 20220927, + 338 ], - "commit": "6d5a02ee18145d223a5b0bc46359f1938358b8d4", - "sha256": "064j7qlallg3wl5gxz94bg17v8qsmdbbv2f1l76h4zw5v4x14y0b" + "commit": "56cba05549873fcf1b66e304969011dc1a1ad228", + "sha256": "1wkmi6xi81z3ff872lpz1cpqbw2sj2844kwzhqhvir4w2lqr4ab5" } }, { @@ -119890,11 +120021,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20220823, - 442 + 20220927, + 631 ], - "commit": "2db3a34f50ec4dd6e2cae92bab639ccfc742b3cc", - "sha256": "1iqshfkf4xchymmf340bdh6vl555z50l2wd3r3g063gf03vxsr5a" + "commit": "4788de0bcfecf8faec69251decb9924492d008f3", + "sha256": "0x52xmv6rhjss480sddj8hrsibmq4i06kra9m58hhv9pwyfvijdw" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix index 7b57d69d55953..e6e645a3b3a1c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , trivialBuild , emacs diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix index ece5c95f05ab0..ba9e941f38968 100644 --- a/pkgs/applications/editors/geany/with-vte.nix +++ b/pkgs/applications/editors/geany/with-vte.nix @@ -1,7 +1,6 @@ { symlinkJoin , makeWrapper , geany -, lndir , vte }: diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 7cfde3a91f399..54625d75e5c53 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -2,92 +2,113 @@ , lib , ctags , cmark -, appstream-glib , desktop-file-utils +, editorconfig-core-c , fetchurl +, fetchpatch , flatpak , gnome , libgit2-glib , gi-docgen , gobject-introspection -, glade -, gspell -, gtk3 -, gtksourceview4 +, enchant +, icu +, gtk4 +, gtksourceview5 , json-glib , jsonrpc-glib -, libdazzle -, libhandy +, libadwaita +, libpanel , libpeas -, libportal-gtk3 +, libportal-gtk4 , libxml2 , meson , ninja , ostree -, pcre +, d-spy , pcre2 , pkg-config , python3 , sysprof , template-glib , vala -, vte -, webkitgtk -, wrapGAppsHook +, vte-gtk4 +, webkitgtk_5_0 +, wrapGAppsHook4 , dbus , xvfb-run }: stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "42.1"; + version = "43.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XU1RtwKGW0gBcgHwxgfiSifXIDGo9ciNT86HW1VFZwo="; + sha256 = "dzIhF6ERsnR7zOitYFeKZ5wgIeSGkRz29OY0FjKKuzM="; }; + patches = [ + # The test environment hardcodes `GI_TYPELIB_PATH` environment variable to direct dependencies of libide & co. + # https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/2ce510b0ec0518c29427a29b386bb2ac1a121edf + # https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/2964f7c2a0729f2f456cdca29a0f5b7525baf7c1 + # + # But Nix does not have a fallback path for typelibs like /usr/lib on FHS distros and relies solely + # on `GI_TYPELIB_PATH` environment variable. So, when Ide started to depend on Vte, which + # depends on Pango, among others, GIrepository was unable to find these indirect dependencies + # and crashed with: + # + # Typelib file for namespace 'Pango', version '1.0' not found (g-irepository-error-quark, 0) + ./fix-finding-test-typelibs.patch + ]; + nativeBuildInputs = [ - appstream-glib desktop-file-utils - gi-docgen + (gi-docgen.overrideAttrs (attrs: { + patches = attrs.patches ++ [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gi-docgen/-/commit/f4ff4787cce962b705fb2588b31f2988c5063c13.patch"; + sha256 = "11VGFFb2PLVxnX/qUQdLPLfhGQWx4sf4apBP7R2JWjA="; + }) + ]; + })) gobject-introspection meson ninja pkg-config python3 python3.pkgs.wrapPython - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ ctags cmark + editorconfig-core-c flatpak - gnome.devhelp - glade libgit2-glib libpeas - libportal-gtk3 - vte - gspell - gtk3 - gtksourceview4 + libportal-gtk4 + vte-gtk4 + enchant + icu + gtk4 + gtksourceview5 json-glib jsonrpc-glib - libdazzle - libhandy + libadwaita + libpanel libxml2 ostree - pcre + d-spy pcre2 python3 sysprof template-glib vala - webkitgtk + webkitgtk_5_0 ]; checkInputs = [ @@ -110,6 +131,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs build-aux/meson/post_install.py + substituteInPlace build-aux/meson/post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; checkPhase = '' diff --git a/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch b/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch new file mode 100644 index 0000000000000..1c6c663c69a77 --- /dev/null +++ b/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch @@ -0,0 +1,13 @@ +diff --git a/src/meson.build b/src/meson.build +index c9a44e418..cd9e466d6 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -35,7 +35,7 @@ foreach test_typelib_dep: test_typelib_deps + test_gi_typelib_path += [join_paths(test_typelib_dep.get_variable('libdir'), 'girepository-1.0')] + endforeach + test_env = [ +- 'GI_TYPELIB_PATH=@0@'.format(':'.join(test_gi_typelib_path)), ++ 'GI_TYPELIB_PATH=@0@:@1@'.format(':'.join(test_gi_typelib_path), run_command('sh', ['-c', 'echo "$GI_TYPELIB_PATH"']).stdout().strip()), + 'G_TEST_SRCDIR=@0@/tests'.format(meson.current_source_dir()), + 'G_TEST_BUILDDIR=@0@/tests'.format(meson.current_build_dir()), + 'G_DEBUG=gc-friendly', diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index fe8666fd741bd..3a4760265d12b 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -15,18 +15,18 @@ , gnome , glib , pkg-config -, intltool +, gettext , itstool , libxml2 }: stdenv.mkDerivation rec { - version = "3.40.0"; + version = "3.41.2"; pname = "gnome-latex"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "xad/55vUDjeOooyPRaZjJ/vIzFw7W48PCcAhfufMCpA="; + sha256 = "8xDwoUUEmfDP92y5+cXWaZGpUGH6s9bmcMSlZHOF1jM="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gobject-introspection wrapGAppsHook itstool - intltool + gettext ]; buildInputs = [ diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index ea0a1e2f24768..063833ceaa15c 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,6 +1,6 @@ { avahiSupport ? false # build support for Avahi in libinfinity , lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools -, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome }: +, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool }: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/applications/editors/hecate/default.nix index 29a3e1ff1caa3..dd266c0babcac 100644 --- a/pkgs/applications/editors/hecate/default.nix +++ b/pkgs/applications/editors/hecate/default.nix @@ -1,19 +1,19 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - version = "0.0.1"; +buildGoModule rec { pname = "hecate"; + version = "unstable-2022-05-03"; src = fetchFromGitHub { - owner = "evanmiller"; - repo = "hecate"; - rev = "v${version}"; - sha256 = "0ymirsd06z3qa9wi59k696mg8f4mhscw8gc5c5zkd0n3n8s0k0z8"; + owner = "evanmiller"; + repo = "hecate"; + rev = "7637250f4b2c5b777418b35fa11276d11d5128b0"; + sha256 = "sha256-8L0ukzPF7aECCeZfwZYKcJAJLpPgotkVJ+OSdwQUjhw="; }; - goPackagePath = "hecate"; + vendorSha256 = "sha256-eyMrTrNarNCB3w8EOeJBmCbVxpMZy25sQ19icVARU1M="; - goDeps = ./deps.nix; + ldflags = [ "-s" "-w" ]; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/applications/editors/hecate/deps.nix b/pkgs/applications/editors/hecate/deps.nix deleted file mode 100644 index c9d94934a444a..0000000000000 --- a/pkgs/applications/editors/hecate/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "b6acae516ace002cb8105a89024544a1480655a5"; - sha256 = "0zf95qdd5bif9rw03hqk87x7d905p373bvsj0bl4gi16spqjbdil"; - }; - } - { - goPackagePath = "github.com/edsrzf/mmap-go"; - fetch = { - type = "git"; - url = "https://github.com/edsrzf/mmap-go"; - rev = "935e0e8a636ca4ba70b713f3e38a19e1b77739e8"; - sha256 = "11a63wrjwfnchjhwqjp6yd5j0370ysppjgv31l5bmvvwps7whq9d"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "737072b4e32b7a5018b4a7125da8d12de90e8045"; - sha256 = "09ni8bmj6p2b774bdh6mfcxl03bh5sqk860z03xpb6hv6yfxqkjm"; - }; - } -] diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 47dabbf0cbb93..b2713def5bb8f 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -86,6 +86,22 @@ let }; }); + buildGateway = { pname, version, src, license, description, wmClass, ... }: + (mkJetBrainsProduct { + inherit pname version src wmClass jdk; + product = "Gateway"; + meta = with lib; { + homepage = "https://www.jetbrains.com/remote-development/gateway/"; + inherit description license platforms; + longDescription = '' + JetBrains Gateway is a lightweight launcher that connects a remote + server with your local machine, downloads necessary components on the + backend, and opens your project in JetBrains Client. + ''; + maintainers = with maintainers; [ kouyk ]; + }; + }); + buildGoland = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { inherit pname version src wmClass jdk; @@ -301,6 +317,19 @@ in update-channel = products.datagrip.update-channel; }; + gateway = buildGateway rec { + pname = "gateway"; + version = products.gateway.version; + description = "Your single entry point to all remote development environments"; + license = lib.licenses.unfree; + src = fetchurl { + url = products.gateway.url; + sha256 = products.gateway.sha256; + }; + wmClass = "jetbrains-gateway"; + update-channel = products.gateway.update-channel; + }; + goland = buildGoland rec { pname = "goland"; version = products.goland.version; diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index 3f77f3fae5b15..fde3e52632e8e 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -80,6 +80,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { --set-default JDK_HOME "$jdk" \ --set-default ANDROID_JAVA_HOME "$jdk" \ --set-default JAVA_HOME "$jdk" \ + --set-default JETBRAINSCLIENT_JDK "$jdk" \ --set ${hiName}_JDK "$jdk" \ --set ${hiName}_VM_OPTIONS ${vmoptsFile} diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 19fefe9ad6a03..5505c0c61c8f8 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,47 +3,56 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "a0d9e77ad4afbb5f7d69e23cf84ccf132eed6ead6c3a7cd442b33924e6931656", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.1.tar.gz", + "version": "2022.2.3", + "sha256": "e0338107115231c4b354870dfcf537ba6ad1741a0d310e4e50c48dfc24ff9cce", + "url": "https://download.jetbrains.com/cpp/CLion-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4167.35" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "4015bfa478f7ee33914975b530f13930bc32eff86223e9256f2610497f95825f", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1.tar.gz", + "version": "2022.2.5", + "sha256": "55b28f3b79eda126fe778e2945804d50b1145503737f1b5e25ab6ae2d2a0e3ae", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5.tar.gz", "version-major-minor": "2022.1.1", - "build_number": "222.3345.126" + "build_number": "222.4345.5" + }, + "gateway": { + "update-channel": "Gateway EAP", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", + "version": "2022.3 EAP", + "sha256": "4868baed9350065c1db760f07a09badd1473132af640cc19330e20c8a0940d7d", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.tar.gz", + "version-major-minor": "2022.3", + "build_number": "223.6646.21" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2022.2.2", - "sha256": "c3cfc300f55adc3a52528d13a1133bffd2aa7c2d20ea301cd20e3aff52d87609", - "url": "https://download.jetbrains.com/go/goland-2022.2.2.tar.gz", + "version": "2022.2.3", + "sha256": "fda47d9939b95d8995d1a375443025599cd74b1b5a2966273477ecfafa9ce4f1", + "url": "https://download.jetbrains.com/go/goland-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.57" + "build_number": "222.4167.25" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "93eb9391a898aad164ca47965e0445cbf0f04d7062b6875c4e4a3136799ee6cf", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1.tar.gz", + "version": "2022.2.3", + "sha256": "4ba5faafad48d58db5099fae080ae2238086d3d9803080082de8efe35d8bf4ed", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4345.14" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz", - "version": "2022.2.1", - "sha256": "43eee4b9ea9aed7601252823689e7232b39829784a9bab5e8b5462f55eecc83a", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1-no-jbr.tar.gz", + "version": "2022.2.3", + "sha256": "7454d7e0b8f4e3d8d805dde645d28b842101bd77aea8b29125880c592e6b8c85", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3-no-jbr.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4345.14" }, "mps": { "update-channel": "MPS RELEASE", @@ -57,103 +66,112 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "dc463578e879f958cae3c5fc775170dd0a6a89347c02aa087126f03cc7a63f79", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1.tar.gz", + "version": "2022.2.3", + "sha256": "2376cd043bb941524df62db40f9125b1c693be11df80a41fd5b3dd9dcd3446e9", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.61" + "build_number": "222.4345.15" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "fc91b134b6899a09ce8cbdc1ebdbdcfe1c1ffb6dbe756b30b24d7ad131bf27c8", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1.tar.gz", + "version": "2022.2.2", + "sha256": "2f361c5f59c685c9f8d1385029ed753eabe5b688a82acef6e83a50f0d2b9d7a8", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.2.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.56" + "build_number": "222.4167.33" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "a23ffa7b617ab27d3c8abb0689b4d03b5370534193152cd4cfe4196c7d150751", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1.tar.gz", + "version": "2022.2.2", + "sha256": "b7bfb86026fba669bb22429ab0840afba5047680202762070cfbb1f181d53d0e", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.2.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.56" + "build_number": "222.4167.33" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "3f61c5fbdf46b94a5cb772ad51dda5a9cad8a9c7ad78dbcacf01daa2226a5633", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1.tar.gz", + "version": "2022.2.3", + "sha256": "2fdff8616fd1574a0ef7baaed855aa39a1254ea164b74d1b4dda11241e58ab2d", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.37" + "build_number": "222.4167.23" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2022.2", - "sha256": "4300570552fb94932fe4311b6f8c7a071296e0c0c84246039f26f1b37dda9f0a", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.tar.gz", + "version": "2022.2.3", + "sha256": "a8c3412db30ab7bd8b8601b0a50c95dc48a412391f1c33df27c47cf5d2204257", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3345.111" + "build_number": "222.4345.14" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2022.2.1", - "sha256": "508fe7272dd049875d848b52a2908e4d228ce576d4dde5f56f51a8c346b12a2c", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1.tar.gz", + "version": "2022.2.3", + "sha256": "1d7d464bbcb83d5af48359aeda6aa7d165038bfaa1f26fef1019761eb278fa22", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.tar.gz", "version-major-minor": "2022.1", - "build_number": "222.3739.57" + "build_number": "222.4345.14" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2022.2.1", - "sha256": "ba2a8fcf9a1f080ca6b2ef832b13104c440077b9e6a2bb6e26bc97bdea373208", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.1.dmg", + "version": "2022.2.3", + "sha256": "d7e0dcbb3c28f383d1365f5cb6d2b55afbb8c638fd9f100b8040f72b394a1aed", + "url": "https://download.jetbrains.com/cpp/CLion-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4167.35" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2022.2.1", - "sha256": "7cd7bcdc7588a88459dcda5bab0e7c97751b8d7a87a37c5af8e08072fc9beb03", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1.dmg", + "version": "2022.2.5", + "sha256": "cdf0302b0ab65d3dfce4e48004ef45873c9912c844d2e3c82bfe19de2b11cfda", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5.dmg", "version-major-minor": "2022.1.1", - "build_number": "222.3345.126" + "build_number": "222.4345.5" + }, + "gateway": { + "update-channel": "Gateway EAP", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", + "version": "2022.3 EAP", + "sha256": "2db71a052501db41d5cfe142f1a6e3178fe02830f0da127d00fbf93a4629c61b", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.dmg", + "version-major-minor": "2022.3", + "build_number": "223.6646.21" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2022.2.2", - "sha256": "e11f07aebf849ed942c4b8658c11c70ce81b4138186a0301c0ec7cd236f1ff51", - "url": "https://download.jetbrains.com/go/goland-2022.2.2.dmg", + "version": "2022.2.3", + "sha256": "f2e9f2455cf2e13f3b7ed28c18507aa758742c533cb1c07a1ebe62172a939b47", + "url": "https://download.jetbrains.com/go/goland-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.57" + "build_number": "222.4167.25" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2022.2.1", - "sha256": "9c1402f8682ecefe84ae9494c65b80da1b763664624a7f6b0104b044b4cb687a", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1.dmg", + "version": "2022.2.3", + "sha256": "6ec3721d9961918a14630eaf068765eeba97e71baecd95ec67510dc25c8bd1b1", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4345.14" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2022.2.1", - "sha256": "e54a026da11d05d9bb0172f4ef936ba2366f985b5424e7eecf9e9341804d65bf", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1.dmg", + "version": "2022.2.3", + "sha256": "df780c841398532e090adc2c6af35a7fbcdd29fddb37e5a68f33d61a9032d5a3", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4345.14" }, "mps": { "update-channel": "MPS RELEASE", @@ -167,103 +185,112 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2022.2.1", - "sha256": "ba9cc863c2247e6404b015fac085e8b3427b29aba3d7cb07940840f7c5e3b647", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1.dmg", + "version": "2022.2.3", + "sha256": "8dbe5cd8e31c7f6bc6795db6946e2430c82f0aa2c13e7805c40733428b02241d", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.61" + "build_number": "222.4345.15" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2022.2.1", - "sha256": "8c2b322cab74cbf52dbe33e0fd9be63fe320d1ade2446790c4eec7309b590eea", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1.dmg", + "version": "2022.2.2", + "sha256": "a7fbc83ea01e96c79a75fd061669fa0156b770e92c1153a03681fb67ee4a59ea", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.2.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.56" + "build_number": "222.4167.33" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2022.2.1", - "sha256": "6636139dc9c0e28b90517e91d1c1924e218b5d33d9418cca888b05c11fbf54d9", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1.dmg", + "version": "2022.2.2", + "sha256": "9b2f5841fa5741881600fbf3b0d5686f2593a6771bb70454d4cb0cc3acd1e43a", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.2.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.56" + "build_number": "222.4167.33" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2022.2.1", - "sha256": "13cdaa0f83e645a0a08bc3dd05522441e591b247af853b22c8ca5bbce047a125", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1.dmg", + "version": "2022.2.3", + "sha256": "aa02c2c621d356486a0b698a45d773f5830ff4ef431940059f82e8d3c17a2335", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.37" + "build_number": "222.4167.23" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2022.2", - "sha256": "d806254af68425089d40a7a302ce10c87283a25399e7b667e8d261b3958f4fbb", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.dmg", + "version": "2022.2.3", + "sha256": "a04700159fcf3bfed74d196edc4c1150e5906dc4730d06ffd017b6bbb9bc853b", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3345.111" + "build_number": "222.4345.14" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2022.2.1", - "sha256": "7d57692ce83dd6c853c80c457bdb8239dd833cf5535c600154a7ebc0be18a05d", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1.dmg", + "version": "2022.2.3", + "sha256": "e6532a9a840c3508cdf26511200fbba34ec9a275154d717538019f72ebc5fc51", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.57" + "build_number": "222.4345.14" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "af36f7f9a98881d37d89757083875494c472e60d14bd70fe0d08533d284dd4e1", - "url": "https://download.jetbrains.com/cpp/CLion-2022.2.1-aarch64.dmg", + "version": "2022.2.3", + "sha256": "d921c83ee6b444520e7fdb9fdae4ec0e67cea6dfcaa720e6b36d85c17a4df39c", + "url": "https://download.jetbrains.com/cpp/CLion-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4167.35" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "01d8de1225fb4a74f22752edf74038405f02d27565f01816d8e751d7989a75bb", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1-aarch64.dmg", + "version": "2022.2.5", + "sha256": "8ff78e440e4753adc8dbd4ee408fde114f7d9c65ee780f012b917498b63993ee", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5-aarch64.dmg", "version-major-minor": "2022.1.1", - "build_number": "222.3345.126" + "build_number": "222.4345.5" + }, + "gateway": { + "update-channel": "Gateway EAP", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", + "version": "2022.3 EAP", + "sha256": "513d3a271c5ff20fdc5c22f6e28eb21cfbb283d01ade2d11f33bb7eb79317410", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21-aarch64.dmg", + "version-major-minor": "2022.3", + "build_number": "223.6646.21" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2022.2.2", - "sha256": "7098f05847c0524bc90b00766c71c2f1cc1442983da956c79ee1445b48da73fd", - "url": "https://download.jetbrains.com/go/goland-2022.2.2-aarch64.dmg", + "version": "2022.2.3", + "sha256": "c3c790a45b36af006f743a70fb114782a9c4a2076d025de65894d0f39b0f48a5", + "url": "https://download.jetbrains.com/go/goland-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.57" + "build_number": "222.4167.25" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "4bf843152fe009838dbb5e5a1d8e39ebf98df5f6771254cf1f26ff0b299798fd", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1-aarch64.dmg", + "version": "2022.2.3", + "sha256": "333c70caf452034ae332cdded4d24a71592049b4045725eb57826a0b997d1c7a", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4345.14" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "f7b56525adf96d0ac290eebebd08a53b962a799db65942e07cd437aef655fa0e", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1-aarch64.dmg", + "version": "2022.2.3", + "sha256": "9e5c32fffd17d651d8d875c2588a067902a9ebb9bf815d06aabfd75b9f4ee3cd", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.54" + "build_number": "222.4345.14" }, "mps": { "update-channel": "MPS RELEASE", @@ -277,56 +304,56 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "b553e1f0249b4d7f89cacdac7bada758895cd35aec8ddac5f81017f61ddc44fb", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1-aarch64.dmg", + "version": "2022.2.3", + "sha256": "0dee8fe654cccdafa73b65da1a2ef844401a9438ecee726fe6f6af1f09d07c38", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.61" + "build_number": "222.4345.15" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "c3abc618614be830dbf41479b74ae489aa44290d9bbb11e3c4d2cdffb4d569b6", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1-aarch64.dmg", + "version": "2022.2.2", + "sha256": "8a6f1440cfc9aa47a89a8dda7d19bf50c9790fc12153f97d11e975327703d6e0", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.2.2-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.56" + "build_number": "222.4167.33" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "416ca961042b9c3ae8b23039cc3b84b64e941c1d82478bca3e327089efa4f4d2", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1-aarch64.dmg", + "version": "2022.2.2", + "sha256": "30915c13c4ba2907f083dfa092bc3734e98a4ab83e2180221e52b9b04a93a1e2", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.2-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.56" + "build_number": "222.4167.33" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "96e539ba43d7dcecb9e709c1b1483b4c832fbff4b9fd77f6e91b266a91125a55", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1-aarch64.dmg", + "version": "2022.2.3", + "sha256": "5dd892ed16dd1bc819a97ffb62cdfbb3b60c6019581ba18358afc5c0a39585f5", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.37" + "build_number": "222.4167.23" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2022.2", - "sha256": "c7650443f16ab9cc0b3f6fc701164633bab079f11eeb7aa93b78f2ddc73640a0", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2-aarch64.dmg", + "version": "2022.2.3", + "sha256": "cd7a967c2745aca566569a320eb276773638d05fcd25839db18a098803d2c5f4", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3345.111" + "build_number": "222.4345.14" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2022.2.1", - "sha256": "fa790240b0d00cb134bf0e87c6a85d5a749b73b3f577a9564a890e5819926e53", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1-aarch64.dmg", + "version": "2022.2.3", + "sha256": "7ffd746e5e33f2d69f7b8c39920f67de149f183a0d372d20f3f6bc4febf2e355", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.3-aarch64.dmg", "version-major-minor": "2022.1", - "build_number": "222.3739.57" + "build_number": "222.4345.14" } } } diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index 8a6dc4e00730c..c5265aa255c20 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , callPackage , runCommand , makeWrapper diff --git a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix index 7ede04427b5bd..fc6254f27e8de 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix @@ -1,4 +1,4 @@ -{ lib, octave, python3Packages }: +{ lib, python3Packages }: with python3Packages; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 9beab9fa4beaf..26788ddb06774 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "A vim inspired text editor"; license = licenses.publicDomain; mainProgram = "kak"; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ vrthra srapenne ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index 2f53df97d325a..0376e3af6bfb7 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool gtk2 ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix index 0675ceaba9621..5587c2c0243c3 100644 --- a/pkgs/applications/editors/nano/nanorc/default.nix +++ b/pkgs/applications/editors/nano/nanorc/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts -, coreutils, git, gnused, nix, nixfmt }: +{ lib, stdenv, fetchFromGitHub, writeScript, common-updater-scripts +, coreutils, git, gnused, nix }: let owner = "scopatz"; diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 77f0735ec989d..3d1aa9cdc57c7 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -27,6 +27,7 @@ , ApplicationServices , AppKit , Carbon +, removeReferencesTo }: rustPlatform.buildRustPackage rec { pname = "neovide"; @@ -80,6 +81,7 @@ rustPlatform.buildRustPackage rec { python2 # skia-bindings python3 # rust-xcb llvmPackages.clang # skia + removeReferencesTo ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; # All tests passes but at the end cargo prints for unknown reason: @@ -115,6 +117,10 @@ rustPlatform.buildRustPackage rec { xorg.libXi ] ++ lib.optionals enableWayland [ wayland ]); in '' + # library skia embeds the path to its sources + remove-references-to -t "$SKIA_SOURCE_DIR" \ + $out/bin/neovide + wrapProgram $out/bin/neovide \ --prefix LD_LIBRARY_PATH : ${libPath} ''; @@ -128,6 +134,8 @@ rustPlatform.buildRustPackage rec { install -m444 -Dt $out/share/applications assets/neovide.desktop ''; + disallowedReferences = [ SKIA_SOURCE_DIR ]; + meta = with lib; { description = "This is a simple graphical user interface for Neovim."; homepage = "https://github.com/Kethku/neovide"; diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/applications/editors/neovim/neovim-qt.nix index f6013202bafb1..b9d0ab4ec23ef 100644 --- a/pkgs/applications/editors/neovim/neovim-qt.nix +++ b/pkgs/applications/editors/neovim/neovim-qt.nix @@ -1,5 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper -, msgpack, neovim, python3Packages, qtbase, qtsvg }: +{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, msgpack, neovim, python3Packages, qtbase, qtsvg }: mkDerivation rec { pname = "neovim-qt-unwrapped"; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index b18811dd09805..6cfcec8f1f7b3 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , python3 , neovim +, fetchpatch }: with python3.pkgs; buildPythonApplication rec { @@ -15,6 +16,14 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "0lbz4w8hgxsw4k1pxafrl3rhydrvi5jc6vnsmkvnhh6l6rxlmvmq"; }; + patches = [ + # Fix a compatibility issue with neovim 0.8.0 + (fetchpatch { + url = "https://github.com/mhinz/neovim-remote/commit/56d2a4097f4b639a16902390d9bdd8d1350f948c.patch"; + hash = "sha256-/PjE+9yfHtOUEp3xBaobzRM8Eo2wqOhnF1Es7SIdxvM="; + }) + ]; + propagatedBuildInputs = [ pynvim psutil @@ -26,15 +35,12 @@ with python3.pkgs; buildPythonApplication rec { pytestCheckHook ]; - disabledTests = [ - # these tests get stuck and never return - "test_escape_filenames_properly" - "test_escape_single_quotes_in_filenames" - "test_escape_double_quotes_in_filenames" - ]; - doCheck = !stdenv.isDarwin; + preCheck = '' + export HOME="$(mktemp -d)" + ''; + meta = with lib; { description = "A tool that helps controlling nvim processes from a terminal"; homepage = "https://github.com/mhinz/neovim-remote/"; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 4f204fd7dbcc6..0502e79cb5d18 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -1,7 +1,5 @@ { stdenv, symlinkJoin, lib, makeWrapper , writeText -, bundlerEnv, ruby -, nodejs , nodePackages , python3 , python3Packages diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index 52134d15da823..6a67d6df743ca 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -3,41 +3,37 @@ , fetchFromGitHub , pkg-config , which +, zip +, libicns , capstone , jansson , libunistring -, lua5_3 , wxGTK31 +, lua53Packages +, perlPackages , Carbon , Cocoa , IOKit -, libicns -, wxmac }: stdenv.mkDerivation rec { pname = "rehex"; - version = "0.4.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "solemnwarning"; repo = pname; rev = version; - hash = "sha256-NuWWaYABQDaS9wkwmXkBJWHzLFJbUUCiePNQNo4yZrk="; + hash = "sha256-VBHNrOVIz7UM9tY1V7Ykwt4Cv0fY++8gXc2og4sLDk8="; }; - postPatch = '' - # See https://github.com/solemnwarning/rehex/pull/148 - substituteInPlace Makefile.osx \ - --replace '$(filter-out %@2x.png,$(wildcard $(ICONSET)/*.png))' 'res/icon{16,32,128,256,512}.png' - ''; - - nativeBuildInputs = [ pkg-config which ] + nativeBuildInputs = [ pkg-config which zip ] ++ lib.optionals stdenv.isDarwin [ libicns ]; - buildInputs = [ capstone jansson libunistring lua5_3 ] - ++ lib.optionals (!stdenv.isDarwin) [ wxGTK31 ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ]; + buildInputs = [ capstone jansson libunistring wxGTK31 ] + ++ (with lua53Packages; [ lua busted ]) + ++ (with perlPackages; [ perl TemplateToolkit ]) + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ]; makeFlags = [ "prefix=${placeholder "out"}" ] ++ lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]; @@ -53,7 +49,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/solemnwarning/rehex"; changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt"; license = licenses.gpl2Only; - maintainers = with maintainers; [ markus1189 ]; + maintainers = with maintainers; [ markus1189 wegank ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 7525b41508cfa..409f99e37afa2 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -1,6 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper -, boost, xercesc, hunspell, zlib, pcre16 -, qtbase, qttools, qtwebengine, qtxmlpatterns +, boost, xercesc, qtbase, qttools, qtwebengine, qtxmlpatterns , python3Packages }: diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d2fb08a807fc1..57ea7b9e5fdc6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -53,12 +53,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-09-16"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "4098ba53139d3e59efae1c9140180440d3df9174"; - sha256 = "053a6b7xxz85bkh4v4s5kmjwvdlj26sksv5vyjmjk3anps9lc0dr"; + rev = "98c99cc950f147a877d56a590d92b357c24086b9"; + sha256 = "06q4riwy7gdmcrqjqnsgw98r382jwsk5qn1f43pg04cwdaksjy4k"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -161,12 +161,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-09-15"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "f090cb40eacdce71c406e466d02e3b41c03312c8"; - sha256 = "0ma65874dffpj7sc3skczlxf7gmq1v2lqi5qwqv0hgx6idqdkf1c"; + rev = "b7bf04eaeae846168efd86ef0136394a2d128b72"; + sha256 = "00krndb2crrcvcp8vb60wqz75pjj3121335mykaqhhq0jhc67xw2"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-09-24"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "687fc5aca8eef79278a01345f1a93dcc68453f29"; - sha256 = "0mldl6zssdxnkxls4r9rbb94f9i5yi7bc0r99k34v4bq25j9ls55"; + rev = "23bf2d69967491b1dc43f37c809f2711cc879fd2"; + sha256 = "0zl8sf9sy2i3fp3wbpw9rvm5wjkak897i5yl699jfxxv0gal5sgv"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-09-25"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "2adcaae6f53e0bc42445f14caa210e8d64368469"; - sha256 = "039rfly4knc7d9n3wkvi4f7m4pwh4ifpci59gnbvqlyhr9x29mzs"; + rev = "1ed769feb2a13061be69563cc42d686ac44fc441"; + sha256 = "0naxqvxm8dwi7hbphbl04kaphhxpq1x2f3n9whdhj7rbnq7m6r9h"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,12 +437,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-09-22"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "cdd88b5e46109c01a69f3f9b10eae53811b4a65c"; - sha256 = "0v7dg2s7igs11566kxd5qjl81fq4iw5i6xn9qrl23wg5mbksvwiy"; + rev = "99ccab251fad7c8b235582b46752a0536d01b315"; + sha256 = "1whjbplgqik4pdp3z1ly7z1qii6z615drqc3i09p4sahdb7cw2n6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-09-25"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "87099324fdf55e5219e852676769f3b5f0290d98"; - sha256 = "039mh32k1vz3g7sdagavsir79wzxgp1y6747rgpgdrrf5jdf3crh"; + rev = "bbdfc56c5a00f4f31936a057fed99807c0a52f0c"; + sha256 = "04ma4nz47ld6a4x0d5pn7a70kx0a8p2ynyb2gg8mb1x09593q95m"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -534,12 +534,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-09-25"; + version = "2022-10-04"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "78942df284a4a00c59a6edcc187684cdbc333fb9"; - sha256 = "1i29zqi1xqar0i0a0y30jssl914a3mxvvvfki3k3c6gdhskf9in3"; + rev = "f085227504076dff5224cbf10cb1bf83286188a9"; + sha256 = "00n3vagkgy31r47a1ivy0zxm3a13z3d80l6ay7l49srh10rfh3c1"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -666,24 +666,24 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-09-23"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "7ee75ae20c7d556f1febb6d1a5961e48766c9c0b"; - sha256 = "1ikxarjknpba4mvd1bkyswvai9laca38biccn3py7x8lwvlvhp85"; + rev = "8d92822df7fb5549bbc0cc65056e960341433cdf"; + sha256 = "0af6fn9iym0kgldbla1h13dds8sd8pd441f20bpszfbmr4djfskh"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; asynctasks-vim = buildVimPluginFrom2Nix { pname = "asynctasks.vim"; - version = "2022-08-23"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "4b6abc813b67e743fee205da2f996f737df1ae20"; - sha256 = "03vqz5yz76wymsrvbkyvnfl3453b4hba2h0ji9lyy3brxb6lf1bg"; + rev = "32d2af43f196605f35aa78f38b16e9a8d158b010"; + sha256 = "0ryq8qsrjzdyrapz040mvp9f3mzcflcw14nddp5fq95859n18n2k"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -736,6 +736,18 @@ final: prev: meta.homepage = "https://github.com/jiangmiao/auto-pairs/"; }; + auto-save-nvim = buildVimPluginFrom2Nix { + pname = "auto-save.nvim"; + version = "2022-08-06"; + src = fetchFromGitHub { + owner = "pocco81"; + repo = "auto-save.nvim"; + rev = "2c7a2943340ee2a36c6a61db812418fca1f57866"; + sha256 = "0zfy1pw39c0zf4mfd8kgl1hj9h1hcbsql32rp0wk0kf714hbxqli"; + }; + meta.homepage = "https://github.com/pocco81/auto-save.nvim/"; + }; + auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; version = "2022-09-19"; @@ -786,12 +798,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-09-01"; + version = "2022-10-03"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "c41ad6e3f68c2c9f6aa268c6232cdef885107303"; - sha256 = "0mdimwsiclpjn2df75lc92ryyjyql4m1x0bvpl629z33hvhlcvs0"; + rev = "61424a6211431a42458bc755b3e7e982e671c438"; + sha256 = "1xg7wm3prq2vj0jg2knb96lc7mlh7l6fw6c23s0i9vqrbz4b8jr2"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -894,12 +906,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2022-05-22"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "46255e4a76c4fb450a94885527f5e58a7d96983c"; - sha256 = "1z6m9bavyx2ln2dik05fcaf6gq6jdrpcgrq5i1l1sy45h447a3hw"; + rev = "e88dbe0ba5829119d8edb5fc69d3c8553e324a93"; + sha256 = "0qja5jvx8047v5qbch6flcg8fq00369ffcivrv2gkqkmggg4dvb6"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -918,24 +930,24 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-09-19"; + version = "2022-10-04"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "83bf4dc7bff642e145c8b4547aa596803a8b4dc4"; - sha256 = "1wlwm75c1ngk4dkzynl7p5av6ydxagcmx82bg7l9037h2ijvqhv2"; + rev = "0606ceeea77e85428ba06e21c9121e635992ccc7"; + sha256 = "099ad6vxlmplzvzrykl2rnbamgacriasa2pab8fv8q9hmdd0nbc2"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; bullets-vim = buildVimPluginFrom2Nix { pname = "bullets.vim"; - version = "2022-09-10"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "dkarter"; repo = "bullets.vim"; - rev = "d3a75d60ffe74c91b2a1225327bbeff540fdab11"; - sha256 = "18l2nszcpm55x7q1ardp790sajairs1a2y8a9z63cck9bkigmj3w"; + rev = "746f92ae05cdcc988857d8e76418326f07af9494"; + sha256 = "0zdfri31h1iv3jjw2yqkqqfd07cdk7ymyrl5n03khwh192dawd5r"; }; meta.homepage = "https://github.com/dkarter/bullets.vim/"; }; @@ -978,12 +990,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2022-09-26"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "19483e6c226650f14acabfc4b1ec6521cf964a4e"; - sha256 = "11p4mzbyjsxik9jzg11d17mnacj8krxzrq4hjjg0pn1cggh3wqyh"; + rev = "e74e0ebf3fac929c81fb9d918228ef03afc8d470"; + sha256 = "1abpkiry3ffmwj51yldiaw3ix1scr6jjx714am1d4wz7kbl4228g"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1050,12 +1062,12 @@ final: prev: clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2022-09-23"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "f2ca89d978f9fc907beb432a472a89fced7e10bd"; - sha256 = "0g0w950l7pam1fibkc5fggchvsfi4fsyvrky2f1yizrndpmq09yz"; + rev = "756a12b1604aa86368f2078ab44bfa788a29ece4"; + sha256 = "1wxyy98gal3zdwrh6z92044yyj3nbw2bzq9diwa1h5waraf9jg7r"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1458,12 +1470,12 @@ final: prev: cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2022-07-26"; + version = "2022-10-03"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "447c87cdd6e6d6a1d2488b1d43108bfa217f56e1"; - sha256 = "0nmxwfn0gp70z26w9x03dk2myx9bbjxqw7zywzvdm28lgr43dwhv"; + rev = "91ff86cd9c29299a64f968ebb45846c485725f23"; + sha256 = "18ixx14ibc7qrv32nj0ylxrx8w4ggg49l5vhcqd35hkp4n56j6mn"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; @@ -1494,48 +1506,48 @@ final: prev: cmp-spell = buildVimPluginFrom2Nix { pname = "cmp-spell"; - version = "2021-10-19"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "f3fora"; repo = "cmp-spell"; - rev = "5602f1a0de7831f8dad5b0c6db45328fbd539971"; - sha256 = "1pk6izww8canfqpiyrqd6qx1p3j18pwfzkfx4ynbng8kl9nh6nv5"; + rev = "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa"; + sha256 = "1lzv8wbq1w45pbig7lcgyj46nmz4gkag7b37j72p04bixr7wgabv"; }; meta.homepage = "https://github.com/f3fora/cmp-spell/"; }; cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-09-14"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "01653a5934b242e8ca517e079419c3b151ce2b00"; - sha256 = "03nvx8rmdi23iiga5c3fnyaxl46jhv0hkqkcvcx10jjk34v1x9b0"; + rev = "5a6d58badbfed69ee285983bf2cf5a17d957483a"; + sha256 = "1dsbq0wcqf8c7y5ld74gqxbf2pdh28km7wdk37xvlqcvfk1kzmxs"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; cmp-tmux = buildVimPluginFrom2Nix { pname = "cmp-tmux"; - version = "2022-08-02"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "cmp-tmux"; - rev = "e32f2f1417c9ff307ad348a134788eabd76c6112"; - sha256 = "1fq9jiyf19mxlq13cg9775wmmrpm6jphhl0hrf7jb1aikvdi1b6y"; + rev = "984772716f66d8ee88535a6bf3f94c4b4e1301f5"; + sha256 = "1fy0rw9garhabbif6d7vvrv73c25lwv9fjh5b4y0m3kisvkbqfyr"; }; meta.homepage = "https://github.com/andersevenrud/cmp-tmux/"; }; cmp-treesitter = buildVimPluginFrom2Nix { pname = "cmp-treesitter"; - version = "2022-06-09"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "c2886bbb09ef6daf996a258db29546cc1e7c12a7"; - sha256 = "1ar6d6pqybn4vqynbh18mc7fy1ybv0s9mi1r2j1nfcmgvh4wsvwk"; + rev = "5f695e4173ad74a4c8dbbfd8990286464bf69293"; + sha256 = "1l32k8fdmpg8lfh1qqmahash957izz9zr6gfjvfs5s4if0fl3f2r"; }; meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; @@ -1590,12 +1602,12 @@ final: prev: cmp-zsh = buildVimPluginFrom2Nix { pname = "cmp-zsh"; - version = "2022-01-18"; + version = "2022-10-03"; src = fetchFromGitHub { owner = "tamago324"; repo = "cmp-zsh"; - rev = "1d8133e5637c73b3eb392682ae9661d521738268"; - sha256 = "0122lf44yqjp01znp7gnc682yx7fikjkzc5njp73lmys76321lz3"; + rev = "c24db8e58fac9006ec23d93f236749288d00dec9"; + sha256 = "1rifl2rhrbnq3hnwmn19fky3ibv1qf4pb0hx81pl38dgq6lfm2s6"; }; meta.homepage = "https://github.com/tamago324/cmp-zsh/"; }; @@ -1638,12 +1650,12 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2022-09-13"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "5127966503e070770225437205949c6d244ab8a1"; - sha256 = "1w5y0dkvmrrw4ilwlvcybp98mlx9222ygb0kdg31k5v4jzqynxj1"; + rev = "cb405c0dc72312a06d17710a537ab0e6b6758648"; + sha256 = "12s2nxyck0hwxk3z4h5knss9wsjmwiimj9kxs4bywwibwlwgnf6i"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -1710,12 +1722,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-09-25"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "ca63592c1ba484aa7146a6a9f34b9a6cb8d8ffb9"; - sha256 = "10dr4kp8z2kzg167n1n7ndmdm7hhvsv4423g290yljlk0vbvflfn"; + rev = "d0fa7acd233d76585daf9ce0b74ad1112591e271"; + sha256 = "04qs3gcx2qjagawr577sadz6bkwlr40532i9f7p7jfkbd7ybgzm2"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1782,24 +1794,24 @@ final: prev: command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2022-09-18"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "f6a6cf7fb17cee08ca0ca84ffce6aabccc3d8476"; - sha256 = "0gi6z6l5gw7dhg8gqbd6m3yzasyd2ccmwjjh8j4ma0dd7f5c7iq7"; + rev = "f8d67e234aa39856ce62246cd4bf1c76f8b46245"; + sha256 = "1iq34bysnkl65gvdpsfqgimvmnpq964654c0g1ijjc0ayfk1yyd8"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-09-26"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "7cc86127d30f7001a6e83c8b72656f17a67bc55f"; - sha256 = "1jl2wwr8ssszgkynnkxpz2c57mw7yapvrc892jrnkbkj6lv7h8vi"; + rev = "250bbc5a04b6e80ff1c212e89a80e976cda9e433"; + sha256 = "18x9a1fmial78f28mkaqsajzazjj9zd4yq44fghw1ynaa36gjmwh"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1866,12 +1878,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2022-09-27"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "12641f77bea3e1bd93560653cba6e9f1c264c0dd"; - sha256 = "1fm81s16ccrm0ia21hwc299mnpx3r2i3byggkwsi7cb5kh4lh6zw"; + rev = "b565df009e92aad6ca8b338562b2f375fb1fea96"; + sha256 = "0855y7vhhfzv3ppmg5834k593jg4b2qlkpg45fsf4xkks3g2s168"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -1950,12 +1962,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-09-26"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "0c91dd3c8c994f1cef3f91356133b971ffaf52c3"; - sha256 = "1859f750c1v1y79khk6z7yizbgawvnndxsiwyb04wpzx2np3s21i"; + rev = "839fe23a7746f03aa9ef1ebf087501cd6126cf0f"; + sha256 = "1009jc5zz20hfi8g7j4znnrwm6jdj6041a24i3ayklgl5dqw2519"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1998,24 +2010,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-09-27"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "dbebb09f0c48d9af2b36f4e36e30e74ee7cef558"; - sha256 = "09bv552gg5pkkzz8b0bj1xgp41ywz2yjwgrzqi64xhk98hdhhpy6"; + rev = "80ec4396170f63041d8d7e8d2df3c54eb45300f7"; + sha256 = "13h2nib9amjjsx35gsxfcvyx674m04wrsp4fia06ksa40h8hadkm"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-09-27"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "be1075ca88e3fd1d22bb8d3c8490701b4c90d2cb"; - sha256 = "007gsvd0n53hgk92dk2wxx91lfdng8rq8cxl469gd9n71ixr31d0"; + rev = "adfb5c498f9d6d7f3b74baaae228ab6dcf923ecb"; + sha256 = "19l9g3j0pn3l4rndx38fpi82ypgbm0087gwyczj6dbvszld3ln78"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2034,12 +2046,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-09-27"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "8988534294ceaa8fc0a76e68b188efdca88626bf"; - sha256 = "09s8x7knsjbbbwnx13m3911nddapr92xink75lhn2k3hkr0hwmvq"; + rev = "550149d751f8d62ad646d38ef57b87f4d960bceb"; + sha256 = "1y5achbd4vkq0fhsh9hvgnb4qh42k3mskii7x6vrnr3vr3gvy0ff"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2178,12 +2190,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-09-16"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "1c4802a654c9127c745cbe2ffff9909a3a9ff965"; - sha256 = "1fs9qk3xskvhbbs33kywk9krkcrbsrmizm0imqsbsp3c1cr3m8xk"; + rev = "bd7163f56ac715a6d687737ea144731ac6ce8478"; + sha256 = "0rbxs7bj0vhjrwmjlw74shskgy5igcfyn4iddrk1qc3kryaakdhw"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2492,12 +2504,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete.nvim"; - version = "2022-08-24"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "4e30d980f51087241499e20d687b76dc5000274e"; - sha256 = "0ll5wb8kpqy907rw6c9v99vkldp9lcvbrzdysjcdq4z8gzcwrvac"; + rev = "14578f1d0c7ed8faca7e640104840b7eaa1c35ee"; + sha256 = "1gwq7nhd90ifh1gys2jvrq2s8521pyz7w3nsr2pmnv64h3yl1f2f"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -2550,14 +2562,26 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; + dial-nvim = buildVimPluginFrom2Nix { + pname = "dial.nvim"; + version = "2022-08-29"; + src = fetchFromGitHub { + owner = "monaqa"; + repo = "dial.nvim"; + rev = "d2d7a57fb030c82b8b0d6712d9c35dfb49d9aa3c"; + sha256 = "1zm116xd7b79piaiia9fn56h7ivnmy0dip02q3n61fmn1sqijggr"; + }; + meta.homepage = "https://github.com/monaqa/dial.nvim/"; + }; + diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-09-24"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "6baa30d0a6f63da254c2d2c0638a426166973976"; - sha256 = "0jhs3nkxjkp0w26yx6p9qx7la9sr4pxp2vgcdj6jbgrwifxaqp3y"; + rev = "a1fbcaa7e1e154cfa793ab44da4a6eb0ae15458d"; + sha256 = "0wffr2g0d2nasbjqabm0arjgv28xlg6xqay9w5gw3hglz33rr5np"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2588,12 +2612,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-09-20"; + version = "2022-10-03"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "76477792b34f8fed167b5aa61a325e4dab26c3d7"; - sha256 = "10ma1k67c36jy38j3mx3s57scflmja7m68cgf5dzh0icg7h4viyi"; + rev = "12b808a6867e8c38015488ad6cee4e3d58174182"; + sha256 = "037sxvq9ywdnmy9f2gw89q52a76rmg4gwbn62i669ca95wvkhzxa"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2758,12 +2782,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-09-19"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "496975425a28ef1f974e90e9664fe3409738f071"; - sha256 = "14p688anpsfj09yhmmjbl949xfx61qv79vg26hbxif149i3z5035"; + rev = "f26dd12e5b0e39a8dd2abcb46066c250b5651de9"; + sha256 = "03rla7gwjd8l35pk2mgi0qj23mpssdvfv2iz6c4dj2ixqs1ry9sh"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2806,12 +2830,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-07-25"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "492492e7d50452a9ace8346d31f6d6da40439f0e"; - sha256 = "1s3qv09gbsjjmqkb85hc4832j18hd21j37rg4iqks0a4n2z5yi4b"; + rev = "1097a86db8ba38e390850dc4035a03ed234a4673"; + sha256 = "15pspfihd2rjzyw6pzd3yycjrn98nx79njasrn4j4sl4ivlay5g6"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2841,6 +2865,18 @@ final: prev: meta.homepage = "https://github.com/andviro/flake8-vim/"; }; + flit-nvim = buildVimPluginFrom2Nix { + pname = "flit.nvim"; + version = "2022-09-23"; + src = fetchFromGitHub { + owner = "ggandor"; + repo = "flit.nvim"; + rev = "dd43846edca345075a60d2f749bcca71cd47a17f"; + sha256 = "1da1pfkm0jg9570smg0l2hc059jjaxpzvz8jbkx6i2m56gq9lmnh"; + }; + meta.homepage = "https://github.com/ggandor/flit.nvim/"; + }; + float-preview-nvim = buildVimPluginFrom2Nix { pname = "float-preview.nvim"; version = "2020-11-03"; @@ -2891,12 +2927,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-08-26"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "07a746e6df6bf4c77766aa6c19723da618a38781"; - sha256 = "0qffbwvb3vh92vixk8wq6h11ayvzvlq64x4qdwx7nz7dfd6cwlhb"; + rev = "88aa63ba216708611b472d8737b96af71c2f3785"; + sha256 = "0x55w1fs0pciinapdvs3vdsiql29753vi2f9sr3jpxlk4rgaygpa"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2915,12 +2951,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-09-18"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "2be79d8a9b03d4175ba6b3d14b082680de1b31b1"; - sha256 = "0hbvqcmfgkdww6gwdx3xaim2bx5xvw825slh3wi69wkqa5qbjasx"; + rev = "6cd7469403fd06a3840a1065728d1affe1c23ec8"; + sha256 = "0qilmi6xg37xq29kfk6nnchz1jm18qrbvgcfzq028pmdbnakg7r5"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3023,12 +3059,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-09-22"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "316879662ff9c33ae4b1072f8238e4bba2999e0a"; - sha256 = "1b334fqvv49d9cnk4yv3hd3qgnw4x48l1i2ja1pxxiwi91q1hgwr"; + rev = "c81874db259eef85ae21794b2f29e953519c692c"; + sha256 = "1k6h1n4rpi47ggqvmxrw9bhis5mkd2fnqvyirvr4yz2sgivljmwn"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3179,12 +3215,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-09-18"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f98c85e7c3d65a51f45863a34feb4849c82f240f"; - sha256 = "0ljzja43jdkv77nh4253x3gwk2hjx968yk7b5ag4y1mvyp1540qn"; + rev = "9d18976c10413e52d76d41a771f042704786ce2e"; + sha256 = "1fzmg74i9q6xal0k1s1ikgbc37s0q1z79af5vhlfll5f2c5dkpsk"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3215,12 +3251,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-09-22"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "b6b997277e019f751031ea52f9571ad2e1e7e42d"; - sha256 = "1cnzgm0pixh2zrmkfgxjybb6i1lqa0hbkwrmbm1jb5p0hhc4d1j6"; + rev = "9038d7cdd76a930973b6158d800c8dbc02236a4b"; + sha256 = "0x49l7g84m1328fqad501f4iqqy3imbl8r8rh4rxsi1zam46f2ba"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3335,16 +3371,28 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-09-15"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "c632f629026cf41308b4473ab9bb9686318c993c"; - sha256 = "1dn4a5wnahh2hnhx3sda2lrmfi675bmifpm3g1xjxqj3771ivznk"; + rev = "24f9e795bfac5fabbaba703116e747dcf2ad8d2f"; + sha256 = "0an08vf70ispd3alywz964vlxkgg17dgfz5n18q60ix2fs6pmgii"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; + guess-indent-nvim = buildVimPluginFrom2Nix { + pname = "guess-indent.nvim"; + version = "2022-07-17"; + src = fetchFromGitHub { + owner = "nmac427"; + repo = "guess-indent.nvim"; + rev = "c37467baa1a51b74ed767cbe0540fce44e03d828"; + sha256 = "11fb9xsaq9ygl7sd7k1xg4ccbynmjdvnrbs44snp4q48fidn1vrb"; + }; + meta.homepage = "https://github.com/nmac427/guess-indent.nvim/"; + }; + gundo-vim = buildVimPluginFrom2Nix { pname = "gundo.vim"; version = "2021-02-21"; @@ -3371,23 +3419,23 @@ final: prev: hare-vim = buildVimPluginFrom2Nix { pname = "hare.vim"; - version = "2022-08-27"; + version = "2022-10-10"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "0bdef854f8531747438f7764cf7553ba16e56fb8"; - sha256 = "15ajgvhwl63h5268kp56m741bglaq3zgcf0bv61sasrh4v97xmgz"; + rev = "267fb4dac4e8cd4df1d9b57fa587ce718f5fc256"; + sha256 = "1spl17vd8w5k5xgqvmr80fi5samzhxfcqnkmzpqjk2sf5z88k80k"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2022-08-10"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "f4aff5bf9b512f5a85fe20eb1dcf4a87e512d971"; - sha256 = "0jfc9d4dkx331567aic36mbqv3p2rq5nds35n33qg4f4mwqy8n6b"; + rev = "4dfe94e633945c14ad0f03044f601b8e6a99c708"; + sha256 = "1jr4k56glyd98lk19dj9r7i8zx72hhzn5lz1w846ffvsci5ffw1g"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; @@ -3454,12 +3502,12 @@ final: prev: hologram-nvim = buildVimPluginFrom2Nix { pname = "hologram.nvim"; - version = "2022-09-03"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "edluffy"; repo = "hologram.nvim"; - rev = "338969044a5d6f9f56f728c8efeeced7408d580a"; - sha256 = "0q493i7fsws9q2wrmddbvxwr968qkkz8nlgm0nynb13m5qxpdzvh"; + rev = "f5194f71ec1578d91b2e3119ff08e574e2eab542"; + sha256 = "0khmi21mvmif7qd8cak9x1z4h68d34rwhfvcvnqxxh0mjzvskppv"; }; meta.homepage = "https://github.com/edluffy/hologram.nvim/"; }; @@ -3478,28 +3526,40 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-07-31"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "2a1b686aad85a3c241f8cd8fd42eb09c7de5ed79"; - sha256 = "1f8p8cxi74kgqs20knx7yq1bd7m30va1dqpsy5dqdzsazr50fymc"; + rev = "6591b3656b75ff313cc38dc662a7ee8f75f1c165"; + sha256 = "1y6jvl8q8j46zy1c18xi0hfdbma2cq7g3k0ymw05qghvvjyv65bq"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-09-17"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "a71c37feb8fe878d54f15135ddea0d2b3ea04a44"; - sha256 = "1z7wq8dzfqw0m6ydvfahqi513x4a77vg7kxq3476awq8601h1525"; + rev = "86f4f2f7c1cebdbeb9a9bd498810a0154e80dbab"; + sha256 = "0gzxnh13l1ys8jbcnkgfrjz901qf8wvyslqyldyzm3ryis823acg"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; + hydra-nvim = buildVimPluginFrom2Nix { + pname = "hydra.nvim"; + version = "2022-10-02"; + src = fetchFromGitHub { + owner = "anuvyklack"; + repo = "hydra.nvim"; + rev = "fa41a971765d4cce9c39185289f5a10894f66dbd"; + sha256 = "198bkw3y3253wjamvxxkdjr54nv1bkin148v554b47yv5w156zz1"; + }; + meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; + }; + i3config-vim = buildVimPluginFrom2Nix { pname = "i3config.vim"; version = "2021-06-23"; @@ -3897,14 +3957,38 @@ final: prev: meta.homepage = "https://github.com/leanprover/lean.vim/"; }; + leap-ast-nvim = buildVimPluginFrom2Nix { + pname = "leap-ast.nvim"; + version = "2022-10-10"; + src = fetchFromGitHub { + owner = "ggandor"; + repo = "leap-ast.nvim"; + rev = "1a21b70505ebb868a1e196c0d63797e1426b53a5"; + sha256 = "1jb8rydp4h3b71vfn9hq4ni1fs6ds0kk92vlal4jl9gzs38cx5p9"; + }; + meta.homepage = "https://github.com/ggandor/leap-ast.nvim/"; + }; + + leap-nvim = buildVimPluginFrom2Nix { + pname = "leap.nvim"; + version = "2022-10-10"; + src = fetchFromGitHub { + owner = "ggandor"; + repo = "leap.nvim"; + rev = "517f142dea3d62c956fd00ab78385b83b14932a9"; + sha256 = "09j9frsxqxbzvk2fpyfz1ian9q5gzm1zj13kq64fwldzxamjsjji"; + }; + meta.homepage = "https://github.com/ggandor/leap.nvim/"; + }; + legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2022-09-26"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "59309190f3c80a41160e29d644a15ceb5c64e239"; - sha256 = "17zg7hpabnb0bc9y78i358nasixmznimp44z097xw5h3fkz2z2aq"; + rev = "9d8e43e25174033a1066f12b7d656d93c7527db7"; + sha256 = "17drk65qrxnmnywg8p3251581hfy01drzj669v92brn1varp1a6d"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -3935,12 +4019,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-09-26"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "4a0644b64da8ebc5d64b964f7da9a394f06259bd"; - sha256 = "0kyc1v26y98hmx3ajqgdr9xl4jw62c56n1i3xl6hab98inp1vq6z"; + rev = "6be26d4c4a06228f72329b424f6f92d860de611d"; + sha256 = "0nn3r7b513jhg9l0fa94rmxpdkwg9r7hdqn1x7jw3q6s547z9pin"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -4031,12 +4115,12 @@ final: prev: lightline-vim = buildVimPluginFrom2Nix { pname = "lightline.vim"; - version = "2022-05-09"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "b02ef0d9f253dfc1cbb3f340b74998d7a4db0bf6"; - sha256 = "1rr5n23vvybfi3gbqljalqn0pnkwzzb4zqcz74jlz1dfyddsngah"; + rev = "b1e91b41f5028d65fa3d31a425ff21591d5d957f"; + sha256 = "0xb0hdjk4dww80s2ypvgz5rsvv41b07hskahz8r7xq6si5m5scrn"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -4103,12 +4187,12 @@ final: prev: litee-calltree-nvim = buildVimPluginFrom2Nix { pname = "litee-calltree.nvim"; - version = "2022-09-27"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "04e766756aa755e00a400cd09dae867a03f6f25d"; - sha256 = "050a19kmilxlh4pknw6jakhnnkwwl51cddvi9aw2742pspddhnyy"; + rev = "e2dffec35740032258fee3a3c7f30123226f2271"; + sha256 = "091iga42vmkwxwr8y4p4j8l2cawja5q7n10bq7bqc9j8z6jvl9x8"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; @@ -4127,12 +4211,12 @@ final: prev: litee-symboltree-nvim = buildVimPluginFrom2Nix { pname = "litee-symboltree.nvim"; - version = "2022-09-26"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-symboltree.nvim"; - rev = "4cbb64f3aa433522160c4e340fdf19900198e4ea"; - sha256 = "0v8w2ddf8zwb0vpqwxc0294cgi4674ff335w0f226hrpkl962022"; + rev = "488a660afcfd54644e6b755256907d3c7d8cf8d0"; + sha256 = "0mjjap47cz01qar0q87ssh45l4dkzizxcm986gksrmvhwwrii3ap"; }; meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; @@ -4149,6 +4233,18 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; + live-command-nvim = buildVimPluginFrom2Nix { + pname = "live-command.nvim"; + version = "2022-10-10"; + src = fetchFromGitHub { + owner = "smjonas"; + repo = "live-command.nvim"; + rev = "b3639c1bc78dbd396b47ef1dcf624dabc01238be"; + sha256 = "0bkffrsha1mhsnd0w45js5d0kx097k21lyg7bwj4a40icgkgyfpk"; + }; + meta.homepage = "https://github.com/smjonas/live-command.nvim/"; + }; + lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors.nvim"; version = "2022-09-05"; @@ -4294,12 +4390,12 @@ final: prev: lua-dev-nvim = buildVimPluginFrom2Nix { pname = "lua-dev.nvim"; - version = "2022-09-27"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "folke"; repo = "lua-dev.nvim"; - rev = "e18c4ce4048497384972052d8118eeaa0a681ada"; - sha256 = "1yg3g613i2wp6zhvf940gvgz3318g8hzw4m5x76i63qpz6nanbmx"; + rev = "34858064f55295557a377b88aebccc9965869cf8"; + sha256 = "1dvwzsa3002yaff0rcjkfzgzv3r96192kh0b9skg53z44nyvawcw"; }; meta.homepage = "https://github.com/folke/lua-dev.nvim/"; }; @@ -4318,24 +4414,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-09-11"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "a52f078026b27694d2290e34efa61a6e4a690621"; - sha256 = "0cz9vpbd1z3986qbd166h747az8rqgwls0mhi1imqz0z9b66hrbc"; + rev = "edca2b03c724f22bdc310eee1587b1523f31ec7c"; + sha256 = "06gy6jy3gfhhjcy61fx9myhs4bmknhlfsmnsi1mmcydhm4gcbm2b"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-09-20"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "d36c063b7f6e701852f7880f1314656592a61b4f"; - sha256 = "1kqarf2710iqwa1zz8y7dm8s37b1q4330ldnw2adyzlyh6zifjwv"; + rev = "08511f9a8dc3ef01c31a245429bfaef993e2f1f6"; + sha256 = "04100gf6rgl3d7vxsxvf0xgn0y2ypyjh22qznx18hm0c7mdsl1qz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4415,12 +4511,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-09-25"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "548761ecc9f23423186dfeee293807f957b45185"; - sha256 = "0drcda1mipyia6pll6k2pns1sniwhsxs5hpc3671i77fwqw4synb"; + rev = "de33236e23cab880a1ab3d1cfdc828d3eedbddf8"; + sha256 = "1qww1rl7aw4n9766asbdz765wllxkhygm0azdkic7j8hb95dr94x"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -4439,12 +4535,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-09-26"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "49f970355e7b0dc5407057eb39b778d20209b7aa"; - sha256 = "13fa6anil5y4wj0a543j4pip9a1slvrxwvlqihvh57cqn3r7vxsz"; + rev = "9f7bdfd90d5bdb466fd297f691db6c58316c3bb7"; + sha256 = "11yn7jwy8vy6rzmavh420x3dn7y9lzb0dn5nkrky2rr38s6wyd5h"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4811,12 +4907,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-09-22"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "463820a83f4ba387655f370a17c87dc3100cdf0d"; - sha256 = "1h0mil77s8pbgjvqb0kf6l4avz1y33116rgv2kkaii1zn4dwmnws"; + rev = "74c9e29b61780345d3ad9d7a4a4437607caead4a"; + sha256 = "07szj9ajv3n8hpx0ibvysi0p5rfshcnbk0v3jyh2lvrcvky2qkqg"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4871,12 +4967,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-09-23"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "9279eb2de80c8a9af12b1a35f3e0fd8d742b61dd"; - sha256 = "0l7k6bf9jnqakzy7931fjr1pna2fvwcwd9y4y0yp7rsql5a5fk3d"; + rev = "9a9891a3247b2c15b752efca749f1175b9013235"; + sha256 = "01iibvgf5lf23zivd94dfcjiz2b0rmqcz7yddfqf8drq1pi3bxjw"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4931,12 +5027,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "0198dcf2d5585742220e21e002f095464874e19e"; - sha256 = "1qbh4rpv4gzrsaqq0s64rq3c93ghspfd1ida76wpivzbzcrj4q7w"; + rev = "bae6314522e47172564203d4f1c56dc1e39c1c14"; + sha256 = "0hwhcdswa5msxndcfcn68dq8aj6gka7vmfcvbnaxmwza23ik09cd"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -4979,12 +5075,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2022-09-12"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "2a0a05ff983aa62d74ba868aadf89deb93dd5454"; - sha256 = "1qbkhkvag4aqp11b938j18drra5dymqqxjghwnq00dq97ll777s7"; + rev = "60f3a2bc2bd22b98af5770b940762f77ca17cfee"; + sha256 = "0vcv0j5zvz4mmaczkkspl5l5fv8x36fdlvm9sf3s85hsz0gh03xp"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -5051,12 +5147,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-09-05"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "83f6ee9e646c803aa14c7293ad7775900f24ea1a"; - sha256 = "07fi55ilkqmb7xqwk1vd6nkmpfwrpqjnjz8wv8z84h1s3dpcslzx"; + rev = "59c3dbcec362eff7794f1cb576d56fd8a3f2c8bb"; + sha256 = "1dkwgqx576xc8fryhi61q7mka93vv28hfsw340k594jkqc3da9i2"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5097,14 +5193,26 @@ final: prev: meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; + noice-nvim = buildVimPluginFrom2Nix { + pname = "noice.nvim"; + version = "2022-10-09"; + src = fetchFromGitHub { + owner = "folke"; + repo = "noice.nvim"; + rev = "87f908da660c321439a0dd98a8e51cd85227f57b"; + sha256 = "0byzbwhclppby3ryqis29d6wpdgshk7qi9sp1pp8kkfjv2fg3xb3"; + }; + meta.homepage = "https://github.com/folke/noice.nvim/"; + }; + nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2022-05-31"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-vim"; - rev = "bc0f057162491e9228207d74bd88b5efe875316e"; - sha256 = "16fm573my8ysmcy68wy9kxwrm85q8fmpggwr83z1gwq3mmws59xy"; + rev = "0748955e9e8d9770b44f2bec8456189430b37d9d"; + sha256 = "1xifxwyjwfr9z801mm9sfh2sy0xf5ydhbg8ssi5mpdilffpkghp6"; }; meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; }; @@ -5123,12 +5231,12 @@ final: prev: nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-08-17"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "40c71de9596ad9e7a7c742ba969399790cadd711"; - sha256 = "1md1ykr1anjxf2fcksk2wjhkqd7nc144l3v6pyc6pb0vs27qakzg"; + rev = "fab5de2c7430b1d091801b254afc30c066a3b200"; + sha256 = "1jqqnsi0sqfkgynhwy8a5ya3rqhry3fiabdkkivns9cjvvq5lz4m"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -5147,36 +5255,36 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-09-12"; + version = "2022-10-04"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "e9889bbd9919544697d497537acacd9c67d0de99"; - sha256 = "0gd2kha6hi6z3y8g0wrgi9lnslchmldhxc5vbd6iak47csi7h7gr"; + rev = "4715f6092443f0b8fb9a3bcb0cfd03202bb03477"; + sha256 = "1ddqwifszbdl8yzi0sj8dh20cb4hg6rk3s6qjy4l4sgslzxgsnk9"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-09-22"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "8af89c5fa2b732aaa9c3bf8aed95bccc9c4ce295"; - sha256 = "0801yhgh6vjhskcmcwd9z62zvcp7szmb4q8xdrzn30gfwxzci04j"; + rev = "17e81c1c1f21f8f6d11a4141a490a0b37974a52b"; + sha256 = "0l8lkrcbyvlkjv18fvi6jk13s9dj5in8h9f0izx1xpk6cdarx7cb"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; numb-nvim = buildVimPluginFrom2Nix { pname = "numb.nvim"; - version = "2022-03-20"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "nacro90"; repo = "numb.nvim"; - rev = "453c50ab921fa066fb073d2fd0f826cb036eaf7b"; - sha256 = "0pkssmd29r2d5f0s770ppj0z4rv0qj5szd43jh16wxknwwjmqi9n"; + rev = "d95b7ea62e320b02ca1aa9df3635471a88d6f3b1"; + sha256 = "1g8nnrxyfgn3v9k4xi7dh1b29vnp73k5x7vz002q7xar4alj468z"; }; meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; @@ -5207,12 +5315,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-09-17"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "14cc2a4fc6243152ba085cc2059834113496c60a"; - sha256 = "1z5dmlzvp0dmji8zl7nggl6wp9qh4cgkabqk0wabl1fa4y913qxp"; + rev = "4fc96c8f3df89b6d23e5092d31c866c53a346347"; + sha256 = "09aka75d7a0acixrp2b7hfy08vdnjxxiknd5ngf2pk479k8z5zbj"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -5243,12 +5351,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-09-21"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "aea31569d1b20aa6a35fa84ec756cb205a4a7134"; - sha256 = "105iz6m3hp2qqxhmgnz17rydcbbvwyn3yvrlfr5jsj0r8qxfs0yj"; + rev = "c33b5c57ff82d71f8004b37c8c17a7928da76d08"; + sha256 = "019lhnwaiz0drdqx6vj56hgjqklfjf48vsx1fk35j5b97nh0sbnh"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5279,36 +5387,36 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-09-27"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "2427d06b6508489547cd30b6e86b1c75df363411"; - sha256 = "14ksk5c2dds7plqn5kfvxa65kck1yjn3dbgzalrfwn35ynxl92nx"; + rev = "53bd5749011c0830d54d9b22a37259651d5916df"; + sha256 = "1fbhbb0aakjs7zwdllzpcydz41nanxyw271ix18h9j47a4x12lq6"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2022-05-29"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "ee599409ed6ab31f6d7115e9c5c4550336470c14"; - sha256 = "09kldrnfy4fz6f706s444rnwkrzl0zx5fpiygs4mgvdcq1maavlw"; + rev = "58e12501ea028ff1171f8f06ea53891f7c6e1c3f"; + sha256 = "18vfrfkwr27jswflwrsppv17ylvi1l2rgxrv4p14cmyr03h8zx22"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; nvim-colorizer-lua = buildVimPluginFrom2Nix { pname = "nvim-colorizer.lua"; - version = "2022-09-22"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvim-colorizer.lua"; - rev = "20fd0091ef4d873fb1ce8b2bbb278664514cac7a"; - sha256 = "02wj29bm7fwkp7igvynfmvndxmz6gngkhjz740xbwv2ncxiv974j"; + rev = "9dd7ecde55b06b5114e1fa67c522433e7e59db8b"; + sha256 = "1lmvxz8k680yfjhadkh0km2v16vhg8p07xbkkvc0jhkp6hg4sxx4"; }; meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; @@ -5375,24 +5483,36 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-09-24"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "764899df5ca39076acb08a447f7e5bd0b4fa3147"; - sha256 = "1l02prap758nhgcfgnf440ndv6cchns1rd7wd2acpwhzdvx5xfdf"; + rev = "6b12294a57001d994022df8acbe2ef7327d30587"; + sha256 = "16v6cy2za9v48jrm4mipfnxv5ry0h60k85342xrzxwanhnkagi5v"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; + nvim-dap-python = buildVimPluginFrom2Nix { + pname = "nvim-dap-python"; + version = "2022-10-09"; + src = fetchFromGitHub { + owner = "mfussenegger"; + repo = "nvim-dap-python"; + rev = "408186a9d1e03e078e3603af912f9e264ceb2742"; + sha256 = "131a8m5ngxlpbx2b9syksmcci7fff03naw56z7djkvs1w6zh4ln4"; + }; + meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; + }; + nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-09-25"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "8d0768a83f7b89bd8cb8811800bc121b9353f0b2"; - sha256 = "0hic4wf4lpl4ya4zbdng0ih2lbcc1bp6mqxc588nlmw044m68bia"; + rev = "1cd4764221c91686dcf4d6b62d7a7b2d112e0b13"; + sha256 = "19fn9jghvjvmvfm06g2a1hbpm1yd9w5dnr5dcqpwcaz0pxi1y74x"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -5469,6 +5589,18 @@ final: prev: meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; + nvim-highlight-colors = buildVimPluginFrom2Nix { + pname = "nvim-highlight-colors"; + version = "2022-09-28"; + src = fetchFromGitHub { + owner = "brenoprata10"; + repo = "nvim-highlight-colors"; + rev = "5d20935b99d976ffa0d8226a78a8b2e091f0f699"; + sha256 = "0mqczqcrz2iz0k52k5bglad6rbsr8dddm5mvb1gsihbqp0ijyj85"; + }; + meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; + }; + nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; version = "2022-08-22"; @@ -5483,12 +5615,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-09-26"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "b00336ebecc7115740577afa267ff8c26c6b31dc"; - sha256 = "08k4j4qhdiq50rkq8q13dplyga6jrn9nkmzyn6m55sahh3cqz4xn"; + rev = "8b67dd488cc4633dc3580b44bf0b30d002a2ba29"; + sha256 = "1wwk0sxd3j4fpndill5hbdq1rwmjfv8x8hmajvsxdnpc8skvyzxa"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5507,12 +5639,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-09-18"; + version = "2022-10-04"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "e9f40e793a16f3cebbd7e864e1ea0c32afa38747"; - sha256 = "111962k5axifxmc5jilgimj2ly7sk7wwjskmviqc7i3wpc9pahia"; + rev = "0422245fdef57aa4eddba3d99aee1afaaf425da7"; + sha256 = "0h43bqf5n0l8f1jyzp7splsvcdran9j4arafpvli4pkfd9qx3h38"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5567,12 +5699,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-09-21"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "1b3468b07452e3736b67afd43547f766cc1db307"; - sha256 = "096yp2lpqkr7fv2nh3kk3v06d5mcy1lsr0x3d0y3j7zsy2xxn8fb"; + rev = "eefa696036d7cbaa23d4b72ad272f2c615936e73"; + sha256 = "1wfsv7c4gl7dwy9n7x5pa0xrasim6ksl58ah8l4a6dpayyw2wrgm"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5591,12 +5723,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-09-23"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d4eb971db353ccf78cefb3be1b05483b69ec1e69"; - sha256 = "0hrf4lkd8ikdrncajylbsgjkpj8vg6yfmbdlqaw6z8bqqk0n28dq"; + rev = "0a8064eda0c7a4475c4a8ceb39199e975308797b"; + sha256 = "163ppl8fdybx2bkaimbxxidn6vgqgz6dz6qs45ng9f9ys1wxg5nr"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5627,12 +5759,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-09-05"; + version = "2022-10-03"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "b7587a9155d22761f1b28c18f7927e6df0d08387"; - sha256 = "03jym28bk49609m5k0lw18xir6ia23df4m4av5046zqm9dmvhkj0"; + rev = "1284bbf8d79fe010909e65abdd849f047ff51914"; + sha256 = "121h5whwdyv3svby6qsjp893lwc98b6bs18jy58y5xzdzqv2lrd3"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -5675,12 +5807,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-09-22"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "3a8ec89e1918ea2acbb9b22c5ac2006d31773052"; - sha256 = "00ixzciwgzpi2sg6s5cyw8101nnwrv0ks8x77mcqrvpmqnlg6hky"; + rev = "56f65a9474e9ce294a89eb325fccf4391646bfd4"; + sha256 = "1dr3yv8b3zv50yls8xwf6k75xk7l8y78cbbs7zvjmwri31sw5w4f"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5697,6 +5829,18 @@ final: prev: meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; + nvim-rename-state = buildVimPluginFrom2Nix { + pname = "nvim-rename-state"; + version = "2022-09-29"; + src = fetchFromGitHub { + owner = "olrtg"; + repo = "nvim-rename-state"; + rev = "d8a2ad1d3e9269d673007dbd0e76871bb10da878"; + sha256 = "1aj9pz1y3yn63z4nyifs3f47j3zcbwl4v42l64rjz7m9pzdsa34b"; + }; + meta.homepage = "https://github.com/olrtg/nvim-rename-state/"; + }; + nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; version = "2022-09-26"; @@ -5711,12 +5855,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-09-22"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "afff8a8cbda4de2b75249ee08359d0584458f0ef"; - sha256 = "1swhn82b2a9gc5kxas9cgdpkvykpb9322ghmk5nwss99i05nrnl0"; + rev = "ee5ed2100b953c315d9fa2bfd08e93d6548253e0"; + sha256 = "0k8x58f12y565283h2rjw8mdlnhv39awldc4d9aqm0ny8vh4mj1h"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -5747,12 +5891,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-09-26"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "a0b35fd410e16f00543e81dbb6c52c723f49717e"; - sha256 = "1krsgy0x3x9bml8iszd0svz9iqmdn73yn15n49ffznq3vj3gafr2"; + rev = "faf9ffe92d871dd18b4d26b52fcc6b36d315f335"; + sha256 = "1miwnazlrgjw547lnh1ksv1p9qmiwrqfw5x7f6z6f18ilhly1k1q"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -5771,36 +5915,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-09-25"; + version = "2022-10-10"; src = fetchFromGitHub { - owner = "kyazdani42"; + owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "9914780cbabdffe3cd030867f0bc34c6e51bcb95"; - sha256 = "1w6icjxl3l9djr8gx2p3rvwg0878g64npxn2l6s40iyizdb4qvc6"; + rev = "b01e7beaa6f0dbbf5df775cf4ecc829a23f0be54"; + sha256 = "0bmzwgycrp6wcn8kd2h1kwl0ysazmzd36fvi12x2c99yxnassxvi"; }; - meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; + meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-09-27"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "0289160c963fac1d0330966a798acacf85a43a88"; - sha256 = "0c78089lk5wrj8brszcy08gzp6wvpmwiraynbixnnaxq8cnfmxgn"; + rev = "6840b3740da5497730136c875e8f89cad314657b"; + sha256 = "1yl9gjdv059xjnzfcqd1mh4icdxr6dyay694gi3g9jbg3pi3djg8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-09-23"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "8d0759eb798fee2e1201b26c3279713ac67c44c2"; - sha256 = "1pbd9x89vcph1n67ybfnn659xlnbsy8wjx403j9hp7x1qy73906p"; + rev = "c46a8a0a60412a8fe43aa6bd3a01845c46de6bf2"; + sha256 = "0p90akdva7zjfb2yc6gybx1i7yr82rbg6943xz74c8wgynppasbr"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -5831,12 +5975,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-09-03"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "e63c2ff8e38fad77299dd74e14c7c9360e1b3181"; - sha256 = "1f3lkjfb7nh68yd2466fglz5xvzplghq522irfndq8ik5jpwcwbn"; + rev = "80a38f9408102693539f54eef3e6a57d44c6147d"; + sha256 = "1gnv82ph7irmaf17mmgm9a18gnysming6sfvbirx13d23y61xb1x"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -5867,26 +6011,26 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-09-17"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "fad8badcd9baa4deb2cf2a5376ab412a1ba41797"; - sha256 = "1q6daj6q89pf16pxgq8phcjad1l3i8m6afmra2b5ay5f9f2qk53q"; + rev = "1ec3f880585c644ddd50a51502c59f4e36f03e62"; + sha256 = "03403mx5rdknsaia8br0ymc9y53kv8jnnlawfrwralxm1fsrml5h"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-09-18"; + version = "2022-10-03"; src = fetchFromGitHub { - owner = "kyazdani42"; + owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "969728506c0175644a1d448f55e311ccdada7eaf"; - sha256 = "0ycxr16bxqjrp9mzq263j561jb8si9161asgdq2g1644r7mlzhbv"; + rev = "a8cf88cbdb5c58e2b658e179c4b2aa997479b3da"; + sha256 = "1946azhr3rq702mvidzby9jvq7h2zs45d6k9j7clxw2g9xbx0k6a"; }; - meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; + meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; nvim-whichkey-setup-lua = buildVimPluginFrom2Nix { @@ -5963,12 +6107,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-09-14"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "e634cd1b120af1d7f642081185782a24b49dc11f"; - sha256 = "1zlqyhxr8ibgahz3s3gwbw0ybkczgd96a18d5lfcg5i9axi6iaqp"; + rev = "d91f88be51fa7cde8b5d6f529c057338aad18383"; + sha256 = "0d4340gjbsvbdvymw0a7kpqwvzrn946nnsaav9i0z6rallrk583n"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -6011,24 +6155,24 @@ final: prev: onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2022-07-18"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "1fe54f212f09a03c2b5e277f0fe5b7b9d0b0a4ed"; - sha256 = "19jhpfwidwigrcwz20qgm4gf5znz61xslfsf90fkr7k45vgwsk4q"; + rev = "b6b5ffe31a195a3077338d7a506b905e4a51590f"; + sha256 = "0mw0z6z33xrxs5yp5d2jm8wvrlicj084gmw858sbx9d9ph4sdyj3"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-09-26"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "d8ca7cfd1c64f262568da4531257fa9f54f211b3"; - sha256 = "194yvzk7hi21hbbxrfmnk2xfhkylkl2nc5ymbjvgsy992x16d52r"; + rev = "81f50f9ab0f4b556b4bd10c8c8cdf8a76ab01213"; + sha256 = "179nq72hlcb4g5dgm8psl3il075km80ijz5kz5yzb43kllkaadls"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6047,12 +6191,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2022-09-18"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "a31be34c1186f240fbadb9646ff00774f5759595"; - sha256 = "1zicshnz0s4cfv793rd2wyi5mzh90ykg27a4jsydblgcgbqbgnih"; + rev = "749ee2f7fdeb9a02f25195d4850d2ff16240c863"; + sha256 = "0zagysrszabwfxr942dhj4aqdsnbr15qsvq6pvnd99nc3rs05w45"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -6071,24 +6215,24 @@ final: prev: open-browser-vim = buildVimPluginFrom2Nix { pname = "open-browser.vim"; - version = "2021-10-05"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser.vim"; - rev = "80ec3f2bb0a86ac13c998e2f2c86e16e6d2f20bb"; - sha256 = "01qj967nch3wwkbshrsdzyyr4apvsqrpa4dkmpn21qr2183w84zz"; + rev = "7d4c1d8198e889d513a030b5a83faa07606bac27"; + sha256 = "0sqzj25sdczxcpbp2ncpm07y631w9x81yv292xji3l0nzx7601pm"; }; meta.homepage = "https://github.com/tyru/open-browser.vim/"; }; orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-09-25"; + version = "2022-10-04"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "77ea13332f3c811b707e902c7cb8605c471a2f4c"; - sha256 = "02276gfmkik74248fy2zx888v0vf2fyf9vywagy5d9q566c78zac"; + rev = "017570f58c6316982ecc6ddfe6fefd28b55a4092"; + sha256 = "0bbvdraxslg8k2m2ldglmspaawrrrp3plglzri7hm8scnw7mz58n"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -6227,12 +6371,12 @@ final: prev: plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-09-17"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "62dc2a7acd2fb2581871a36c1743b29e26c60390"; - sha256 = "1qrdv9as2h591rgv47irz374rwndv0jgaia5a7x931j6j8zr0kkp"; + rev = "4b7e52044bbb84242158d977a50c4cbcd85070c7"; + sha256 = "11815h0h2mf5ym282ghk7xav90635r88qbgaflpgbyk2banl31wl"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -6421,12 +6565,12 @@ final: prev: rainbow = buildVimPluginFrom2Nix { pname = "rainbow"; - version = "2021-11-15"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "c18071e5c7790928b763c2e88c487dfc93d84a15"; - sha256 = "1m691f3w1zraam4cmq0sj9a86bmd7g1bhirrzqy5mg089x6n3rdc"; + rev = "61f719aebe0dc5c3048330c50db72cfee1afdd34"; + sha256 = "0q6ynkv08b4rlns6gzrkwxrihykpadcrln8ckbcwmsv97injhxws"; }; meta.homepage = "https://github.com/luochen1990/rainbow/"; }; @@ -6517,12 +6661,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-08-16"; + version = "2022-10-03"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "23f9efc71cc7aa42a44df8a2f20f6812f6c54abf"; - sha256 = "0aj4mx8riiclaccii1y0yzkp6kkkcfvjqgvkkkvr93ywncrfc6h9"; + rev = "29af8cd89822d4eeadbd3410bcb0c6ae1ce83307"; + sha256 = "06xilrcsya49p59bnyg1958ipa2avzjavnih9md0h89ks3k93rs7"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -6637,12 +6781,12 @@ final: prev: rust-vim = buildVimPluginFrom2Nix { pname = "rust.vim"; - version = "2021-10-05"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "4aa69b84c8a58fcec6b6dad6fe244b916b1cf830"; - sha256 = "07nh8gvkwq91i7qcz0rk5jlc8sb4d3af4zq2892kmmw576zg1wd8"; + rev = "1cdc5cb4bd061bc30b502e07321682b5a4396dca"; + sha256 = "1xklq4g6dvqd3a5msnrir899hzqmjkscpb8bq9wd4fi3ivmjjjgg"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -6890,12 +7034,12 @@ final: prev: space-vim = buildVimPluginFrom2Nix { pname = "space-vim"; - version = "2022-08-03"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "space-vim"; - rev = "f1465f4c586962cec9231e237f1d6c15b9156a98"; - sha256 = "0qq4g2kldg3hjv5g18na0r2442vg5xa52fs0h004908prnwdsnjr"; + rev = "ad92c42f97c2cb495c34b83f43d91b3d6cfdfa4e"; + sha256 = "1ijzvnj3hff2c0kilqlb2gwv7l141p61176xv4nz5r4v9knqgl5s"; }; meta.homepage = "https://github.com/liuchengxu/space-vim/"; }; @@ -6999,12 +7143,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2022-07-23"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "56c5aacd5e31496d9b3cd3d1b0e570bb9a65d35b"; - sha256 = "1yx3bar8gsapaka0x9bkm5d7frzz3k1kpwbc7n110f5x3cirf1yx"; + rev = "47685f0adb89928fc1b2a9b812418680f29aaf27"; + sha256 = "03l86sr766kpggxxk97rc3fy6j4igsprsh19wdq8mzk119nmww0i"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; @@ -7035,12 +7179,12 @@ final: prev: stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; - version = "2022-07-09"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "stabilize.nvim"; - rev = "f7c4d93d6822df1770a90b7fdb46f6df5c94052e"; - sha256 = "01ngpjnpppazq4dqfwrdc2jkgz5ikpxkscsy0gc89lyi4q2srpai"; + rev = "34069870a8e72632c5447188e638e1c6bfebc353"; + sha256 = "0ik3p1p3wndclw7a72rx507fzk6d9zv6b75lahd0sp9ra9xhzc86"; }; meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; @@ -7083,12 +7227,12 @@ final: prev: substrata-nvim = buildVimPluginFrom2Nix { pname = "substrata.nvim"; - version = "2022-06-21"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "kvrohit"; repo = "substrata.nvim"; - rev = "aea8143ceab98ffcb02934773cc3b4249425f76c"; - sha256 = "07jjywqmcnll82hnibdrs42i148whn1x6l9dp2wr52kskq1419l2"; + rev = "e3b2b69ce597e8d17767a41d8db45b15178a0b45"; + sha256 = "0vw1s46fzqxd8mrqhb1azk6sks9bpacgczmyaki8g47i1adbs8cq"; }; meta.homepage = "https://github.com/kvrohit/substrata.nvim/"; }; @@ -7119,12 +7263,12 @@ final: prev: surround-nvim = buildVimPluginFrom2Nix { pname = "surround.nvim"; - version = "2022-02-22"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "ur4ltz"; repo = "surround.nvim"; - rev = "633068182cf894480341b992445f0f0d2883721d"; - sha256 = "0mqg4vki23rs0rj6zyfkd1ki9wndjifp0lmnnw99x3i1qc0ba47i"; + rev = "36c253d6470910692491b13382f54c9bab2811e1"; + sha256 = "0bjv399gw0gkpfqclmv65viwi34il5zn5kx9zplnkq5r0734l3nw"; }; meta.homepage = "https://github.com/ur4ltz/surround.nvim/"; }; @@ -7143,12 +7287,12 @@ final: prev: swayconfig-vim = buildVimPluginFrom2Nix { pname = "swayconfig.vim"; - version = "2022-09-21"; + version = "2022-10-05"; src = fetchFromGitHub { owner = "jamespeapen"; repo = "swayconfig.vim"; - rev = "5369682267a826a1717c1331ea5f90c19d5ff64d"; - sha256 = "017kj74lm935bi5sxg4gm32b0jq2wmfck65cjyhmxyyy8mcwi24c"; + rev = "30014a34d0ab46f26311f47c1c11ba0b9166f1d5"; + sha256 = "03jw3w80zgmql8ngs8s1j8digwkn7206psklmcnmc1p2drb2d3pf"; }; meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; }; @@ -7373,12 +7517,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-08-27"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "f1e5a5129129e2dd69f1d3f3df0dd8956903a963"; - sha256 = "1jhif6vi7n5kvn4xfz11ahy0a37dzkjq0scc3iiah9ad5nydmykx"; + rev = "da487dfd41266a0b5507a310da684ef3a3bfdb68"; + sha256 = "1lnang3qn861z0p657aa8r7w6d1v6qn86gdwg7di11dgc5vljfh4"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -7409,12 +7553,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2022-09-06"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "d51c7631dcc0f598692676f554c4e79d7596d541"; - sha256 = "03mjzlk28igjjwln61r8g4xz972ps7yfhdxgs4fh3b2m08gqkdnd"; + rev = "9634c3508c6565284065ec011476204ce13f354a"; + sha256 = "1d0d9lwrpxqhvjn1r4jd1dnmra48jabjjbhi35sw41iw1v5v3al3"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -7494,12 +7638,12 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2022-09-16"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "91e9a9737b8522b5a4ecbd8464504da35a1e96cd"; - sha256 = "1nlamiyswmkx39m61lqnazdkak6vk6wyv6izl0g5k9g0ribdcjiw"; + rev = "ff4d3cea905383a67d1a47b9dd210c4907d858c2"; + sha256 = "16byj7gcyxpn837x096a074vpj67drbd5ndcfpkvp1xyam9604b4"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -7578,16 +7722,28 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-09-17"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "30e2dc5232d0dd63709ef8b44a5d6184005e8602"; - sha256 = "1nn6gpmaw8qdx3qf89sjayhhh31x80h52dprxdllyyj0n79a10w4"; + rev = "f174a0367b4fc7cb17710d867e25ea792311c418"; + sha256 = "1hra6vrr25xan0xwjc76m14ml6hwrm7nx2wapl44zx3m29hwfasx"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; + template-string-nvim = buildVimPluginFrom2Nix { + pname = "template-string.nvim"; + version = "2022-08-18"; + src = fetchFromGitHub { + owner = "axelvc"; + repo = "template-string.nvim"; + rev = "84e50b878caa92100c65deec12ccb41aa4ef3fae"; + sha256 = "1ibz9vpqy0lck8pxzr3bikrw3zcrrw0nx5kz53a5n38qrb4l95gg"; + }; + meta.homepage = "https://github.com/axelvc/template-string.nvim/"; + }; + tender-vim = buildVimPluginFrom2Nix { pname = "tender.vim"; version = "2021-05-24"; @@ -7722,12 +7878,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2022-09-17"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "02eb3019786d9083b93ab9457761899680c6f3ec"; - sha256 = "1p8gyi405knrb0rf9nqzy4d1ginhamrgsg4nz5x73bjxjf4klmg6"; + rev = "8df75dbb9ddd78a378b9661f25f0b193f38f06dd"; + sha256 = "149rq2w65gqi3972bwsp243qkflkyj2aqc4gc561kj9rkspqh82x"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -7771,12 +7927,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2022-09-24"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "81f0db1bd0b7f4eb8eb9e81c4b4f12b878cefb10"; - sha256 = "0msaz7lh6x2dcgwrxjw1dxrbwh09qx87mcqnhx2hlwy5b10apvmf"; + rev = "23c0038166800d373f3ec41e56768212aa3aaa2f"; + sha256 = "1zz54cq4ls4kb74pjxpy1afzckw5m3q92r1gr83l36i7yn5w0h61"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -7903,24 +8059,24 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-08-13"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "4f5249b2a6f6308377cb2bf734974a4e6f8a960e"; - sha256 = "0zaiyv63hzk1vaa9xd317zs0s2x1d9rbjam13g7qsm2i3lip6n65"; + rev = "e99fdf15cd55a4a8e0cb0a80a6810c1867a5c401"; + sha256 = "1ym6myhxq4z9h6nnh1dxvkqc4nbhq500wy4mj494lm2hz6nnhl09"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2022-09-10"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "bf76bf2d1a097cda024699738286fa81fb6529ac"; - sha256 = "0993pydpn62z6k7f9msd5d3xaks8ij2sg10xrzawd6n3s35n77lh"; + rev = "bd60cb564e3c3220b35293679669bb77af5f389d"; + sha256 = "0w05yhyjh6j7gcdfghvbjylc64wba42fagnj4bxk1lbcqvnnzxc8"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -7951,12 +8107,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-09-25"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "da852a2d7e2aabae6d60178267d175d02c3396e2"; - sha256 = "0v4ahqalwrj076jp7kg52hk2cididihbgkzq1z6i1f86vnm69kv8"; + rev = "b60eb8f5f5257778645d9472d666853e1b86cc66"; + sha256 = "00zp7w77glgzdncr95d5k7k8cd3b46m3kpsn77ya96yhb25g8i7w"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -8023,12 +8179,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-09-21"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "90eeb664a73c640fbc6304855d1a153687ae583f"; - sha256 = "1dyck2icfn4mdjlj4sz7458qsb4ilfp7244054qpzyxmxyf0ihma"; + rev = "c40fd7de27b527e018d7ff5bb0191d94b5e54bcc"; + sha256 = "1s63pcp8n33ajl18m2j49i3pskda376mwjdcyiw6wgvaz8sfzj7w"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -8359,12 +8515,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-09-26"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "78abec3b83b5fb1bef51fcdddbcbebd7d4293685"; - sha256 = "0ifd90mb1ysry9cpsimd7x2i2q63y17ragwv2rvvxppb4q7kkbdq"; + rev = "46dd87223757619a0a7fb0b075e2cf7d23ea899d"; + sha256 = "0xcv66ic68hgiw5cqdfbnimqdya7hg3zbrrzafgvfx6v468kgy96"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -8743,12 +8899,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-09-25"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "5cd460ca66a734824d35e95f51750858bce1dc1c"; - sha256 = "1521kv2fcay1kx9zyvcwrd1cj85y0slicpj04dhhnvc9my97ydpa"; + rev = "bebf5bec5f497af5e299ea162087c443ed96c003"; + sha256 = "15bg1bqxskx9ji7w7id1ri5r1xlkcdih9bpfv7gpfm95ifkd8ss2"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9031,12 +9187,12 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-09-26"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "dec7689004dcf6e5a3a4efd2a55944f7d43aed40"; - sha256 = "0w0k5m3lb29ack7kh8yb1h58r2jc3ygnjywf6v7m7z91py933c40"; + rev = "29ffd51107bff410f9fa667575541e253f4099a1"; + sha256 = "0ibknwr8lc58aggblndr7zm5qjb6nspxcmqad2b8whaxs9176a3h"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -9067,12 +9223,12 @@ final: prev: vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2022-01-10"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "a2258658661e42dd4cdba4958805dbad1fe29ef4"; - sha256 = "044aim36332ss5zlv8vxww8gqv0pldmn3nw08msldkfxmi86ybbd"; + rev = "71f239af28b7214eebb60d4ea5bd040291fb7e33"; + sha256 = "0kshppxgi63wn96a8h9zv7drwqcbljin5jhszh8q7pqw2xsd83gn"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -9307,12 +9463,12 @@ final: prev: vim-erlang-runtime = buildVimPluginFrom2Nix { pname = "vim-erlang-runtime"; - version = "2022-09-16"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-runtime"; - rev = "6dc03035315a5d694c8e5bd852937784766b7904"; - sha256 = "0n6wm3pydc08ryvqkhs98lszqaxql975w9smlzr55h3a9xmyj7p6"; + rev = "f7d4bbdcff675000d4345d9834cc7d825a84ed3f"; + sha256 = "0b4f2jwsbsbysg364pslw8c94nvh5q2clfxfnz3lqrkkl1cpr3cs"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; }; @@ -9571,12 +9727,12 @@ final: prev: vim-gist = buildVimPluginFrom2Nix { pname = "vim-gist"; - version = "2021-11-04"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-gist"; - rev = "34e0f0aad5cc21cb3087a5d92ae1aa108019ecda"; - sha256 = "1dlsml47nh2mdllahh2nicnpqxk271p62cp3xsjd4dbbr0lallds"; + rev = "5bfbb5450d9eff248f6c074de0b7800392439304"; + sha256 = "00yvl59jbblkif4967kdg6b0mr0hd7rnr5mkxnb4n74akj9pwcf0"; }; meta.homepage = "https://github.com/mattn/vim-gist/"; }; @@ -9968,12 +10124,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2022-09-21"; + version = "2022-10-04"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "a2e8476af3f3e993bb0d6477438aad3096512e42"; - sha256 = "1wk0gxvljzl6c0vrwb99mvxj755ck1c6jhvn16r1d68kva1f0nkj"; + rev = "0603e75fc4ecde1ee5a1b2fc8106ed6704f34d14"; + sha256 = "01361ss6g7kcap7hjma9ij8xa75zlvy878s4p7r5sxxbdwwpqarg"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -10281,12 +10437,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2022-08-12"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "519befb7004bf3a66a3ddfdc2d431b0bd360dc97"; - sha256 = "0dg23ayi191xjvhyyb52byjvl731xrrf9255h3qci7hi3p20jkcy"; + rev = "212e3aa210c9f0965e4b234653a08fd3aa525470"; + sha256 = "1vbkm5rs0n9hhcv462ldrf3acx4q170fgzzp44444dmxd7w2pgf9"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -10401,12 +10557,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-09-27"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "8fdaf4f78c94c6abba06a907520a5de157c5803b"; - sha256 = "0cm3vf84hvvi13v4239j3m24p6dzclv7y4061wyh6sdf7cdx6dqq"; + rev = "23728ad8c5becd2641ac7fb7e995b36295d2544e"; + sha256 = "026blks2bljynrw1xg8wmxz1ikr0f819ih0635bxwp8ah9dkfqzc"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -10510,12 +10666,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-09-21"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "80ad7817e58755a602f993163f61f3500978ebe5"; - sha256 = "1q001rwqp04nl09xl32c328vbbdmm9n51i3a8wszqpz3blp4jl3s"; + rev = "3fa1b2283e957784922fe891de361a2342b90bca"; + sha256 = "0x86wmph3pb4bkqddb1zm381q9214hvf7cq9ydch4hjbx0vmbjwi"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -10534,12 +10690,12 @@ final: prev: vim-merginal = buildVimPluginFrom2Nix { pname = "vim-merginal"; - version = "2022-07-26"; + version = "2022-10-04"; src = fetchFromGitHub { owner = "idanarye"; repo = "vim-merginal"; - rev = "436076b9f2daa805948fa054a24e3b519f6fc089"; - sha256 = "1gcc35pp44sm632nqa14hg9d8ymfrfs9sd62gzjkygjbyz9c8nc1"; + rev = "e8740401cdec9199f4676c5a640a785ec094258b"; + sha256 = "09rmmqq9a3xjcplw69kxsqbv3bpdkw1zvdiiihl499vafwrhky6w"; }; meta.homepage = "https://github.com/idanarye/vim-merginal/"; }; @@ -10606,12 +10762,12 @@ final: prev: vim-mucomplete = buildVimPluginFrom2Nix { pname = "vim-mucomplete"; - version = "2022-05-25"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-mucomplete"; - rev = "71269817dd8f5a9122ae40891bb116050cadbf89"; - sha256 = "1f0rjxb7x6haz96j3wqrayk972k6g8kw4c40m3rcfhp2bxsn1g9m"; + rev = "03bcd4a7dfe0a2f6d432e8ce936d35273a15209d"; + sha256 = "04vqya8dsphxia5j080ir7jk61jak2gc6xhg810wwxql4zls3fs1"; }; meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; }; @@ -11290,12 +11446,12 @@ final: prev: vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; - version = "2020-11-03"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "vim-qml"; - rev = "50d2e737094c146195171b7d52e522384f15afe8"; - sha256 = "1iz2l51c15ijkpzyk5qwmd8y0yy2z8f1jwxcwk16h63g4nmfm1zr"; + rev = "92cd291bc3d59126ef771dfaad5f2506636104c7"; + sha256 = "1pabhpsikss4cr439yikwl7lnq5bahzs22xmv9icp3fz921c67bh"; }; meta.homepage = "https://github.com/peterhoeg/vim-qml/"; }; @@ -11542,12 +11698,12 @@ final: prev: vim-sexp-mappings-for-regular-people = buildVimPluginFrom2Nix { pname = "vim-sexp-mappings-for-regular-people"; - version = "2020-01-16"; + version = "2022-10-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sexp-mappings-for-regular-people"; - rev = "7c3de2f13422fb4b62b4c34a660532c7b3d240c7"; - sha256 = "0malswal9hnbq2wf1rx2lp1r69wpwsvyhgi46xbg079x2n857bmj"; + rev = "ffe645ff61e22d0b7c282d53b8745be4298104e6"; + sha256 = "1g0zi26lppgp35f9q12484c00q7yj58d7wrpfs57v4six02292dc"; }; meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/"; }; @@ -11614,24 +11770,24 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-04-28"; + version = "2022-10-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "1d25e8e5dc4062e38cab1a461934ee5e9d59e5a8"; - sha256 = "1nb90zm9jc2mq5fxbxifrmhkpjs3a5y68amr3f99rxfd0197jxcs"; + rev = "8332f123a63c739c870c96907d987cc3ff719d24"; + sha256 = "15aln4mb82d2k67brgh6xq8nx9rn9ymy3a2ciwwjnxawzjs2pbpg"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2022-08-30"; + version = "2022-10-08"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "c959072d38fabb36cd5371439aaba0b692fb0b73"; - sha256 = "1chq7ppyv7djjsamj7a05dx3zs5ic3nr0wvvc8qfswx1i9lrjhys"; + rev = "9cdd180a6056e8ae0c7d3581313344b9a3e8e7e8"; + sha256 = "02f8lmyrp60myj624aqgdqg91l19rfs32gds3d2y411w0p77kzbl"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -11710,12 +11866,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-09-12"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "faaa499189c4ee3fe13860e675e2370d55e3e5dd"; - sha256 = "11zhff8l3r60jcmmvy7yv5dxz661ggv7sjs8gca5xw9m63d9v3z1"; + rev = "9a7f3968c92c6589d3a12aa5448e8374c8d68a42"; + sha256 = "15bqw0l78s8v2l44j4h64lvs7456h5l0dy46kxas095jrjg9aqnw"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -11746,12 +11902,12 @@ final: prev: vim-speeddating = buildVimPluginFrom2Nix { pname = "vim-speeddating"; - version = "2021-04-29"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-speeddating"; - rev = "95da3d72efc91a5131acf388eafa4b1ad6512a9b"; - sha256 = "1al53c1x2bnnf0nnn7319jxq7bphaxdcnb5i7qa86m337jb2wqrp"; + rev = "5a36fd29df63ea3f65562bd2bb837be48a5ec90b"; + sha256 = "0zwhynknkcf9zpsl7ddsrihh351fy9k75ylfrzzl222i88g17d14"; }; meta.homepage = "https://github.com/tpope/vim-speeddating/"; }; @@ -11951,12 +12107,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-09-22"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "8e2d3f55fdf315903a59cfa9ee60bac283a5f7fa"; - sha256 = "0fnjgalxgyjzy5c5j20zvla1c645hgf2d5mqinz397xxss672mfm"; + rev = "e7150de777ef0c81a015972e4feb56c4b3137efd"; + sha256 = "03jc3jf4znhknvw90iqyn4jpwm13fc3w0nw4vllggwxzvihha1hv"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -12131,24 +12287,24 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-09-26"; + version = "2022-10-10"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "c9a050e10d95461e344f7908fdb5e2d93156601a"; - sha256 = "1xz5ycnai7iy94xiq1xp1l1c66g0p39pndb09bkxmfxrdqi8pmyd"; + rev = "58daf4b1927c4c4fa5377f7527a2d13d06a044f7"; + sha256 = "1k91q2i7pv1yx1mdcwhagwvpi294zbwngvd63xv1wfkwkyi32jcj"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; - version = "2020-11-18"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "bronson"; repo = "vim-trailing-whitespace"; - rev = "05f068ebd9dbdf71d2d334d02abd99deb0311c40"; - sha256 = "1bh15yw2aysvpn2ndnc0s6jzc0y93x6q1blc5pph67rdix5bm7gy"; + rev = "907174052a504e60e9b915f5c083ee5f6e067080"; + sha256 = "07jsgsv4j1zcxizl9wflib68rrp61zpxzy89yzak4b1lyxnl66s9"; }; meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; @@ -12299,12 +12455,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-04-22"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "8f199ef690ed26dcbb8973d9a6760d1332449ac9"; - sha256 = "1d9wr97a02j717sbh55xk7xam6d97l5ggi0ymc67q64hrq8nsaai"; + rev = "b2caf50a6e3c021c92b236abff70bbb467bce24f"; + sha256 = "0dccl6rqvkj7vlx25s7ja5p0nsxzryabd1hpj16r9dnsvklzs1wq"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -12623,12 +12779,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-09-23"; + version = "2022-10-09"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "46c280d2fb9b329ae8dec8c1e520cab3a3d5b743"; - sha256 = "158yiba4hnai1fk8yq0dz6rmrhy17h8rb8gkaajac2b5c8f823f2"; + rev = "90c8b7de334ee778c99eaafee41105808e363f81"; + sha256 = "0hgasj2sr5kh4c70rwgzn2cfpw8vc61m82jjhis15a6bdl2jqw4a"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -12636,12 +12792,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-09-26"; + version = "2022-10-03"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "f72d835b40946a2c934f9cb775dc2d6b1eae0b66"; - sha256 = "0828792i2kjjd8yvc3xj7206klhb8i82n1l2flzkl2r4asdncjd7"; + rev = "06ae45a2aa9fdee5d479b2ccd1be145d225852e2"; + sha256 = "086qima9v821raw2mbm3wxkfj5l58mwwlbgjnnx5sz9msw7qg7dc"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -12670,6 +12826,18 @@ final: prev: meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; + virtual-types-nvim = buildVimPluginFrom2Nix { + pname = "virtual-types.nvim"; + version = "2022-03-17"; + src = fetchFromGitHub { + owner = "jubnzv"; + repo = "virtual-types.nvim"; + rev = "31da847fa54b801f309a08123935626adda4aaad"; + sha256 = "0kqg29xld064fz1xly1kc7wcyck62q5hjkb5fc5vrj0zdnrdzz22"; + }; + meta.homepage = "https://github.com/jubnzv/virtual-types.nvim/"; + }; + vis = buildVimPluginFrom2Nix { pname = "vis"; version = "2013-04-26"; @@ -12766,6 +12934,18 @@ final: prev: meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; + windows-nvim = buildVimPluginFrom2Nix { + pname = "windows.nvim"; + version = "2022-09-28"; + src = fetchFromGitHub { + owner = "anuvyklack"; + repo = "windows.nvim"; + rev = "e3a1217976d4ec8d2515cb634dbf5d26cabd46d5"; + sha256 = "1wpbspyjxcdvvbdysk0982wg24fy0p47df6c8d9rs2dmzb9zghv3"; + }; + meta.homepage = "https://github.com/anuvyklack/windows.nvim/"; + }; + winshift-nvim = buildVimPluginFrom2Nix { pname = "winshift.nvim"; version = "2022-09-06"; @@ -12961,12 +13141,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-09-27"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "ef90176bb55fb71da491c4b6c098986c22f1d8e5"; - sha256 = "145m98vihgy8qpgdsxqqcv66m804i8ysf30flck896rfz492dqy6"; + rev = "e4ff2a69844f02ef3ee88ca5c5766eb4c7cf0c0c"; + sha256 = "1xb161q8zmb52x1y8v6fvc5snlf47jxwnyams46xq2q2k8x4sjl6"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -12985,12 +13165,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-09-27"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "7cd1f0acb516f031648d5e93d9abf56c025cc82a"; - sha256 = "1y9jk7pqgbdjiinx9sx7hibxah9rxaq4nfjr8mxg6w04jacwdmn7"; + rev = "5375b996a54214d43065017ea06092929d670e9b"; + sha256 = "0dcqxaz2fa2dp1bpq6schdzr4mhm3nckcmaaa9bn213xxa9dv1in"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -13057,12 +13237,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-09-20"; + version = "2022-10-03"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "3723a16f99955ab274777cc27323b75f2515420f"; - sha256 = "1mx6vkii6rhi7lv5l50kc7rqmi9rxvhw9bm7i8450d0258c987ak"; + rev = "69dca24ba7f8e74f1e6f0bacbc93481ac4047f2e"; + sha256 = "1n6q7h53zbbybyi219hamagpycasvnnxjgvifsdrxw7825zdnlsy"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 743c0b99f8a33..f04511f9a2138 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -53,6 +53,7 @@ , zsh # command-t dependencies +, getconf , ruby # cpsm dependencies @@ -239,10 +240,11 @@ self: super: { }; command-t = super.command-t.overrideAttrs (old: { - buildInputs = [ ruby ]; + nativeBuildInputs = [ getconf ruby ]; buildPhase = '' substituteInPlace lua/wincent/commandt/lib/Makefile \ - --replace '/bin/bash' 'bash' + --replace '/bin/bash' 'bash' \ + --replace xcrun "" make build rm ruby/command-t/ext/command-t/*.o ''; @@ -357,6 +359,10 @@ self: super: { }; }); + flit-nvim = super.flit-nvim.overrideAttrs (old: { + dependencies = with self; [ leap-nvim ]; + }); + forms = super.forms.overrideAttrs (old: { dependencies = with self; [ self.self ]; }); @@ -520,6 +526,10 @@ self: super: { dependencies = with self; [ nvim-lspconfig plenary-nvim ]; }); + leap-ast-nvim = super.leap-ast-nvim.overrideAttrs (old: { + dependencies = with self; [ leap-nvim nvim-treesitter ]; + }); + lens-vim = super.lens-vim.overrideAttrs (old: { # remove duplicate g:lens#animate in doc/lens.txt # https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985 @@ -610,10 +620,18 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); + noice-nvim = super.noice-nvim.overrideAttrs(old: { + dependencies = with self; [ nui-nvim nvim-notify ]; + }); + null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: { dependencies = with self; [ plenary-nvim ]; }); + nvim-dap-python = super.nvim-dap-python.overrideAttrs (old: { + dependencies = with self; [ nvim-dap ]; + }); + nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: { dependencies = with self; [ popfix ]; }); @@ -983,7 +1001,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-g5yNqDCN1O9x7/HcM8NsZlMwLudDTuPLE5gSpScNQnY="; + cargoSha256 = "sha256-AY14YEdMpHXmiHwEA9hwSwwwJ8hYIomAuIuCJv1OUDw="; }; in '' diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index baaeea48ddd76..8c90a7ed19b2b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -60,6 +60,7 @@ https://github.com/vmchale/ats-vim/,, https://github.com/ray-x/aurora/,, 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/vim-scripts/autoload_cscope.vim/,, https://github.com/rafi/awesome-vim-colorschemes/,, @@ -213,6 +214,7 @@ https://github.com/rhysd/devdocs.vim/,, https://github.com/vmchale/dhall-vim/,, https://github.com/onsails/diaglist.nvim/,, https://github.com/nvim-lua/diagnostic-nvim/,, +https://github.com/monaqa/dial.nvim/,HEAD, https://github.com/sindrets/diffview.nvim/,, https://github.com/direnv/direnv.vim/,, https://github.com/doki-theme/doki-theme-vim/,, @@ -237,6 +239,7 @@ https://github.com/wincent/ferret/,, https://github.com/j-hui/fidget.nvim/,, https://github.com/bogado/file-line/,, https://github.com/andviro/flake8-vim/,, +https://github.com/ggandor/flit.nvim/,HEAD, https://github.com/ncm2/float-preview.nvim/,, https://github.com/fhill2/floating.nvim/,, https://github.com/floobits/floobits-neovim/,, @@ -280,6 +283,7 @@ https://github.com/morhetz/gruvbox/,, https://github.com/eddyekofo94/gruvbox-flat.nvim/,, https://github.com/sainnhe/gruvbox-material/,, https://github.com/ellisonleao/gruvbox.nvim/,, +https://github.com/nmac427/guess-indent.nvim/,HEAD, https://github.com/sjl/gundo.vim/,, https://github.com/junegunn/gv.vim/,, https://git.sr.ht/~sircmpwn/hare.vim,HEAD, @@ -293,6 +297,7 @@ https://github.com/edluffy/hologram.nvim/,, https://github.com/urbit/hoon.vim/,, https://github.com/phaazon/hop.nvim/,, https://github.com/rktjmp/hotpot.nvim/,, +https://github.com/anuvyklack/hydra.nvim/,HEAD, https://github.com/mboughaba/i3config.vim/,, https://github.com/cocopon/iceberg.vim/,, https://github.com/idris-hackers/idris-vim/,, @@ -326,6 +331,8 @@ https://github.com/latex-box-team/latex-box/,, https://github.com/kdheepak/lazygit.nvim/,, https://github.com/Julian/lean.nvim/,, https://github.com/leanprover/lean.vim/,, +https://github.com/ggandor/leap-ast.nvim/,HEAD, +https://github.com/ggandor/leap.nvim/,HEAD, https://github.com/mrjones2014/legendary.nvim/,HEAD, https://github.com/camspiers/lens.vim/,, https://github.com/thirtythreeforty/lessspace.vim/,, @@ -347,6 +354,7 @@ https://github.com/ldelossa/litee-calltree.nvim/,, https://github.com/ldelossa/litee-filetree.nvim/,, https://github.com/ldelossa/litee-symboltree.nvim/,, https://github.com/ldelossa/litee.nvim/,, +https://github.com/smjonas/live-command.nvim/,HEAD, https://github.com/folke/lsp-colors.nvim/,, https://github.com/lukas-reineke/lsp-format.nvim/,HEAD, https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD, @@ -428,6 +436,7 @@ https://github.com/EdenEast/nightfox.nvim/,, https://github.com/zah/nim.vim/,, https://github.com/tjdevries/nlua.nvim/,, https://github.com/mcchrish/nnn.vim/,, +https://github.com/folke/noice.nvim/,HEAD, https://github.com/arcticicestudio/nord-vim/,, https://github.com/shaunsingh/nord.nvim/,, https://github.com/andersevenrud/nordic.nvim/,, @@ -453,6 +462,7 @@ https://github.com/roxma/nvim-completion-manager/,, https://github.com/klen/nvim-config-local/,, https://github.com/yamatsum/nvim-cursorline/,, https://github.com/mfussenegger/nvim-dap/,, +https://github.com/mfussenegger/nvim-dap-python/,HEAD, https://github.com/rcarriga/nvim-dap-ui/,, https://github.com/theHamsta/nvim-dap-virtual-text/,, https://github.com/allendang/nvim-expand-expr/,, @@ -460,6 +470,7 @@ https://github.com/vijaymarupudi/nvim-fzf/,, https://github.com/vijaymarupudi/nvim-fzf-commands/,, https://github.com/sakhnik/nvim-gdb/,, https://github.com/smiteshp/nvim-gps/,, +https://github.com/brenoprata10/nvim-highlight-colors/,HEAD, https://github.com/Iron-E/nvim-highlite/,, https://github.com/kevinhwang91/nvim-hlslens/,, https://github.com/neovimhaskell/nvim-hs.vim/,, @@ -479,6 +490,7 @@ https://github.com/AckslD/nvim-neoclip.lua/,, https://github.com/yamatsum/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, https://github.com/gennaro-tedesco/nvim-peekup/,, +https://github.com/olrtg/nvim-rename-state/,HEAD, https://github.com/dstein64/nvim-scrollview/,, https://github.com/dcampos/nvim-snippy/,HEAD, https://github.com/ishan9299/nvim-solarized-lua/,, @@ -636,6 +648,7 @@ https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,, https://github.com/nvim-telescope/telescope-z.nvim/,, https://github.com/jvgrootveld/telescope-zoxide/,, https://github.com/nvim-telescope/telescope.nvim/,, +https://github.com/axelvc/template-string.nvim/,HEAD, https://github.com/jacoborus/tender.vim/,, https://github.com/wincent/terminus/,, https://github.com/oberblastmeister/termwrapper.nvim/,, @@ -1063,6 +1076,7 @@ https://github.com/puremourning/vimspector/,, https://github.com/lervag/vimtex/,, https://github.com/preservim/vimux/,, https://github.com/vimwiki/vimwiki/,, +https://github.com/jubnzv/virtual-types.nvim/,HEAD, https://github.com/vim-scripts/vis/,, https://github.com/navicore/vissort.vim/,, https://github.com/liuchengxu/vista.vim/,, @@ -1071,6 +1085,7 @@ https://github.com/mattn/webapi-vim/,, https://github.com/folke/which-key.nvim/,, https://github.com/gelguy/wilder.nvim/,, https://github.com/gcmt/wildfire.vim/,, +https://github.com/anuvyklack/windows.nvim/,, https://github.com/sindrets/winshift.nvim/,, https://github.com/wannesm/wmgraphviz.vim/,, https://github.com/vim-scripts/wombat256.vim/,, diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 1692a81c3d6c1..2e482cdf7df5b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -167,7 +167,7 @@ let rtpPath = "."; vimFarm = prefix: name: drvs: - let mkEntryFromDrv = drv: { name = "${prefix}/${drv.pname}"; path = drv; }; + let mkEntryFromDrv = drv: { name = "${prefix}/${lib.getName drv}"; path = drv; }; in linkFarm name (map mkEntryFromDrv drvs); /* Generates a packpath folder as expected by vim diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a7936404015f9..e866c25e29d0c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -225,8 +225,8 @@ let mktplcRef = { name = "vscode-apollo"; publisher = "apollographql"; - version = "1.19.9"; - sha256 = "sha256-iJpzNKcuQrfq4Z0LXuadt6OKXelBbDQg/vuc7NJ2I5o="; + version = "1.19.11"; + sha256 = "sha256-EixefDuJiw/p5yAR/UQLK1a1RXJLXlTmOlD34qpAN+U="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; @@ -326,7 +326,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=attilabuti.brainfuck-syntax"; homepage = "https://github.com/attilabuti/brainfuck-syntax"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -410,7 +410,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=badochov.ocaml-formatter"; homepage = "https://github.com/badochov/ocamlformatter-vscode"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -585,7 +585,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=christian-kohler.path-intellisense"; homepage = "https://github.com/ChristianKohler/PathIntellisense"; license = licenses.mit; - maintainers = with maintainers; [ imgabe superherointj ]; + maintainers = with maintainers; [ imgabe ]; }; }; @@ -673,8 +673,8 @@ let mktplcRef = { name = "vscode-eslint"; publisher = "dbaeumer"; - version = "2.2.2"; - sha256 = "sha256-llalyQXl+k/ugZq+Ti9mApHRqAGu6QyoMP51GtZnRJ4="; + version = "2.2.6"; + sha256 = "sha256-1yZeyLrXuubhKzobWcd00F/CdU824uJDTkB6qlHkJlQ="; }; meta = { license = lib.licenses.mit; @@ -698,8 +698,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.47.0"; - sha256 = "sha256-KtDJo8rhQXkZtJz93E+J7eNiAIcLk4e5qKDLoR3DoGw="; + version = "0.48.1"; + sha256 = "sha256-3TpZGvas+pfabHayaA6Yd9nOO2MbfXbCvCiTcbja9Vo="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -934,8 +934,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.8.0"; - sha256 = "sha256-+8lEuQD73w+urAv2Tw0b+q6oQ66+gLgMPe3Luln9cuY="; + version = "9.9.0"; + sha256 = "sha256-Yr7M4HyRNcsBf8YglQLvyZjblMhtkpMP+f9SH8oUav0="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -943,7 +943,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; homepage = "https://github.com/prettier/prettier-vscode"; license = licenses.mit; - maintainers = with maintainers; [ datafoo superherointj ]; + maintainers = with maintainers; [ datafoo ]; }; }; @@ -1134,7 +1134,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=gencer.html-slim-scss-css-class-completion"; homepage = "https://github.com/gencer/SCSS-Everywhere"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -1150,7 +1150,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=gitlab.gitlab-workflow"; homepage = "https://gitlab.com/gitlab-org/gitlab-vscode-extension#readme"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -1368,11 +1368,16 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.8.0"; - sha256 = "sha256-VD1g4DJfA0vDJ0cyHFDEtCEqQo0nXfPC5vknEU91cPk="; + version = "0.11.0"; + sha256 = "sha256-okvwyD0m2r8ar85VtuBUNMUZGGrCfJ4DB9v7aSX5PjM="; }; meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; + description = "Elixir support with debugger, autocomplete, and more. Powered by ElixirLS."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=JakeBecker.elixir-ls"; + homepage = "https://github.com/elixir-lsp/elixir-ls"; license = licenses.mit; + maintainers = with maintainers; [ datafoo ]; }; }; @@ -1400,24 +1405,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=IronGeek.vscode-env"; homepage = "https://github.com/IronGeek/vscode-env.git"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; - }; - }; - - jakebecker.elixir-ls = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "elixir-ls"; - publisher = "JakeBecker"; - version = "0.11.0"; - sha256 = "sha256-okvwyD0m2r8ar85VtuBUNMUZGGrCfJ4DB9v7aSX5PjM="; - }; - meta = with lib; { - changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; - description = "Elixir support with debugger, autocomplete, and more. Powered by ElixirLS."; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=JakeBecker.elixir-ls"; - homepage = "https://github.com/elixir-lsp/elixir-ls"; - license = licenses.mit; - maintainers = with maintainers; [ datafoo ]; + maintainers = with maintainers; [ ]; }; }; @@ -1468,7 +1456,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=jnoortheen.nix-ide"; homepage = "https://github.com/jnoortheen/vscode-nix-ide"; license = licenses.mit; - maintainers = with maintainers; [ superherointj SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; }; @@ -1893,8 +1881,8 @@ let mktplcRef = { name = "color-highlight"; publisher = "naumovs"; - version = "2.5.0"; - sha256 = "sha256-dYMDV84LEGXUjt/fbsSy3BVM5SsBHcPaDDll8KjPIWY="; + version = "2.6.0"; + sha256 = "sha256-TcPQOAHCYeFHPdR85GIXsy3fx70p8cLdO2UNO0krUOs="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/naumovs.color-highlight/changelog"; @@ -1963,7 +1951,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=phoenixframework.phoenix"; homepage = "https://github.com/phoenixframework/vscode-phoenix"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -2027,7 +2015,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform"; homepage = "https://github.com/ocamllabs/vscode-ocaml-platform"; license = licenses.isc; - maintainers = with maintainers; [ ratsclub superherointj ]; + maintainers = with maintainers; [ ratsclub ]; }; mktplcRef = { name = "ocaml-platform"; @@ -2090,7 +2078,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=Prisma.prisma"; homepage = "https://github.com/prisma/language-tools"; license = licenses.asl20; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -2332,7 +2320,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=stefanjarina.vscode-eex-snippets"; homepage = "https://github.com/stefanjarina/vscode-eex-snippets"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -2357,8 +2345,8 @@ let mktplcRef = { publisher = "stkb"; name = "rewrap"; - version = "1.16.1"; - sha256 = "sha256-OTPNbwoQmKd73g8IwLKMIbe6c7E2jKNkzwuBU/f8dmY="; + version = "1.16.3"; + sha256 = "sha256-WHeLTN992ltEZw2W7B3sJrHfAFsOGMq3llV4C0hXLNA="; }; meta = with lib; { changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md"; @@ -2374,8 +2362,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.3.1"; - sha256 = "0pm9i3zw4aa4qrcqnzb9bz166rl7p6nwb81m9rqzisdc85mx4s3x"; + version = "2.10.1"; + sha256 = "sha256-FeYkSML6QYtuIHIbAovOqlPwkKfNkHr7IdMCWwkynQ0="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -2469,7 +2457,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=theangryepicbanana.language-pascal"; homepage = "https://github.com/ALANVF/vscode-pascal-magic"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -2800,6 +2788,7 @@ let aliases = self: super: { # aliases + jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls; ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) go; }; }; diff --git a/pkgs/applications/editors/vscode/extensions/rescript/default.nix b/pkgs/applications/editors/vscode/extensions/rescript/default.nix index 902bc58f1d14c..1f92e600f40fd 100644 --- a/pkgs/applications/editors/vscode/extensions/rescript/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rescript/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, vscode-utils, callPackage }: let - version = "1.6.0"; + version = "1.8.1"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = if stdenv.isLinux then "linux" @@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - sha256 = "sha256-/Nv+uyTkJQVaPKIDRr1P/Z5vsituXpP48/sDn3FUEeA="; + sha256 = "sha256-XZG0PRzc3wyAVq9tQeGDlaUZg5YAgkPxJ3NsrdUHoOk="; }; postPatch = '' rm -r ${analysisDir} diff --git a/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix index a0b49f9c44be7..a87cd0943428e 100644 --- a/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix +++ b/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "rescript-lang"; repo = "rescript-vscode"; rev = version; - sha256 = "sha256-O5kZCnhtMcevPTs5UxhIXx124WQf1VvF2WMVHjMEQZc="; + sha256 = "sha256-a8otK0BxZbl0nOp4QWQRkjb5fM85JA4nVkLuKAz71xU="; }; nativeBuildInputs = [ ocaml dune_3 ]; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix index d5961f0c9ebaa..9eba40330b96d 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix @@ -45,7 +45,8 @@ let inherit (stdenv.hostPlatform) system; }).nodeDependencies.override (old: { inherit src version; - buildInputs = [pkg-config libsecret]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [libsecret]; dontNpmInstall = true; })); diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 71c0f3bb55e3b..d140d7d569f2a 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -2,7 +2,6 @@ , unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper , atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap -, writeShellScriptBin # Populate passthru.tests , tests diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1ae65c1cbf4b4..4c154ebf9cbef 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 = "0ar8gpklaa0aa3k1934jyg2vh65hzncx0awl1f0wz8n4fjasfrpc"; - x86_64-darwin = "0jkpzyg2pk2d88w2ffrp2lr0qadss7ccycx4vpmjmw62d3sap8n1"; - aarch64-linux = "1g7lzqghagz63pljg4wy34z706j70vjmk49cl8v27jbnsgnva56a"; - aarch64-darwin = "132ml95xlyv5c343bfv0gpgr8rmk85xspsy9baninlmhnmy7mivv"; - armv7l-linux = "04anb6r7hkk3y3vahx32nxj5dz2i66rrnl0561xkcjr4cqvxykiw"; + x86_64-linux = "0hj6rpg65ivnnvzfjm16vjpjzzqbabpw5ldrr78x7ddrr06h02z6"; + x86_64-darwin = "01gskihfp5s0j4dw8nxmfsp0sav1zqlmylmvwhi1y2qqq4y9c3w9"; + aarch64-linux = "07n1svlkd2ji4b6yvhci6qvx429xipp8y418cqq3173gw8v59lws"; + aarch64-darwin = "0gr94l7lk54fhhhqbiv23hd7d25xilqlwla2dbs5c171nj9pz325"; + armv7l-linux = "0nxnjrzwfvma9zl4x11r45qwqq8mk91cxg47mg33qgr22lvbgz63"; }.${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.71.2"; + version = "1.72.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 49c5cf0004402..ea081382b51af 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 = "1ajls31iqvrcnydwdn2fhajz76j60vsqhn343237jgwfbvaklvav"; - x86_64-darwin = "100p494k1gfzhd86nj9hvh0w73i4wjn2vy6jdpb66rrmswy2hr40"; - aarch64-linux = "066g825s79hmwl5yl7yl0yf6vzr3nagb44bcqw1zp1iqv54f40c6"; - aarch64-darwin = "02aln53zcjp689ivq3ypid2gk9pwbqs24n1ay0hibvrpkx3v4y8k"; - armv7l-linux = "1qvz1233k31baw09p45x67cfadsgm1jnnfc4r8yvrh75iplcspgl"; + x86_64-linux = "01b6w97miai191b2d1lr7cwv36vjvwv1hjggr0g9gfr5j99yzdw3"; + x86_64-darwin = "1vf6sdm19r1d6a6ljz3jlvqddgyrdqcxpha4x80ar3kwddy254kb"; + aarch64-linux = "1i48lck395i6lzcxwzfhijs5d141wnxbxg5rzgprm2hgkqx836nr"; + aarch64-darwin = "02xvb41i8ri8l9w8cxxviz63mkskkmxn6rwprpbglpbpxncsxgbn"; + armv7l-linux = "0s0zlql652fwfz94bqmnrl77agd8gf6i5w1y09jpvcc33wv0zlgw"; }.${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.71.2.22258"; + version = "1.72.1.22284"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index f310fb85a26c6..efcbe32f78d77 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext, openmp, Cocoa }: stdenv.mkDerivation rec { pname = "wxHexEditor"; @@ -12,13 +12,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ wxGTK libtool python2 gettext ]; + buildInputs = [ wxGTK libtool python2 gettext ] + ++ lib.optionals stdenv.cc.isClang [ openmp ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; preConfigure = "patchShebangs ."; prePatch = '' substituteInPlace Makefile --replace "/usr" "$out" substituteInPlace Makefile --replace "mhash; ./configure" "mhash; ./configure --prefix=$out" + '' + lib.optionalString stdenv.cc.isClang '' + substituteInPlace Makefile --replace "-lgomp" "-lomp" ''; patches = [ @@ -30,7 +34,7 @@ stdenv.mkDerivation rec { ./missing-semicolon.patch ]; - makeFlags = [ "OPTFLAGS=-fopenmp" ]; + makeFlags = lib.optionals stdenv.cc.isGNU [ "OPTFLAGS=-fopenmp" ]; meta = { description = "Hex Editor / Disk Editor for Huge Files or Devices"; @@ -46,6 +50,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.wxhexeditor.org/"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ wegank ]; }; } diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 45bb9ed74f9f6..d02e08ed6cd40 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -1,38 +1,40 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , SDL2 , cmake +, copyDesktopItems +, makeDesktopItem , curl , extra-cmake-modules -, gtk3 , libevdev , libpulseaudio -, mesa +, libXrandr +, mesa # for libgbm , ninja , pkg-config , qtbase , qttools -, sndio , vulkan-loader -, wayland +#, wayland # Wayland doesn't work correctly this version , wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "duckstation"; - version = "0.pre+date=2022-01-18"; + version = "unstable-2022-07-08"; src = fetchFromGitHub { owner = "stenzek"; repo = pname; - rev = "51041e47f70123eda41d999701f5651830a0a95e"; - sha256 = "sha256-nlF6ctDU8KCK7MN2pniPLLqUbPUygX9rl0hjzVQ+mPo="; + rev = "82965f741e81e4d2f7e1b2abdc011e1f266bfe7f"; + sha256 = "sha256-D8Ps/EQRcHLsps/KEUs56koeioOdE/GPA0QJSrbSdYs="; }; nativeBuildInputs = [ cmake extra-cmake-modules + copyDesktopItems ninja pkg-config qttools @@ -42,43 +44,43 @@ mkDerivation rec { buildInputs = [ SDL2 curl - gtk3 libevdev libpulseaudio + libXrandr mesa qtbase - sndio vulkan-loader - wayland + #wayland ]; cmakeFlags = [ "-DUSE_DRMKMS=ON" - "-DUSE_WAYLAND=ON" + #"-DUSE_WAYLAND=ON" ]; - postPatch = '' - substituteInPlace extras/linux-desktop-files/duckstation-qt.desktop \ - --replace "duckstation-qt" "duckstation" \ - --replace "TryExec=duckstation" "tryExec=duckstation-qt" \ - --replace "Exec=duckstation" "Exec=duckstation-qt" - substituteInPlace extras/linux-desktop-files/duckstation-nogui.desktop \ - --replace "duckstation-nogui" "duckstation" \ - --replace "TryExec=duckstation" "tryExec=duckstation-nogui" \ - --replace "Exec=duckstation" "Exec=duckstation-nogui" - ''; + desktopItems = [ + (makeDesktopItem { + name = "duckstation-qt"; + desktopName = "DuckStation"; + genericName = "PlayStation 1 Emulator"; + icon = "duckstation"; + tryExec = "duckstation-qt"; + exec = "duckstation-qt %f"; + comment = "Fast PlayStation 1 emulator"; + categories = [ "Game" "Emulator" "Qt" ]; + type = "Application"; + }) + ]; installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share $out/share/pixmaps $out/share/applications - rm bin/common-tests + mkdir -p $out/bin $out/share cp -r bin $out/share/duckstation - ln -s $out/share/duckstation/duckstation-{qt,nogui} $out/bin/ + ln -s $out/share/duckstation/duckstation-qt $out/bin/ - cp ../extras/icons/icon-256px.png $out/share/pixmaps/duckstation.png - cp ../extras/linux-desktop-files/* $out/share/applications/ + install -Dm644 ../extras/icons/icon-256px.png $out/share/pixmaps/duckstation.png runHook postInstall ''; @@ -86,12 +88,13 @@ mkDerivation rec { doCheck = true; checkPhase = '' runHook preCheck - ./bin/common-tests + bin/common-tests runHook postCheck ''; # Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173 qtWrapperArgs = [ + "--set QT_QPA_PLATFORM xcb" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}" ]; diff --git a/pkgs/applications/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix index afe12aab0c830..e3f3900340388 100644 --- a/pkgs/applications/emulators/fs-uae/launcher.nix +++ b/pkgs/applications/emulators/fs-uae/launcher.nix @@ -2,8 +2,9 @@ , stdenv , fetchurl , gettext -, makeWrapper , python3 +, wrapQtAppsHook +, fsuae }: stdenv.mkDerivation rec { @@ -17,8 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext - makeWrapper python3 + wrapQtAppsHook ]; buildInputs = with python3.pkgs; [ @@ -29,15 +30,19 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - postInstall = '' - wrapProgram $out/bin/fs-uae-launcher --set PYTHONPATH "$PYTHONPATH" + dontWrapQtApps = true; + + preFixup = '' + wrapQtApp "$out/bin/fs-uae-launcher" --set PYTHONPATH "$PYTHONPATH" \ + --prefix PATH : ${lib.makeBinPath [ fsuae ]} ''; meta = with lib; { homepage = "https://fs-uae.net"; description = "Graphical front-end for the FS-UAE emulator"; - license = lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ sander AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } + diff --git a/pkgs/applications/emulators/maiko/default.nix b/pkgs/applications/emulators/maiko/default.nix index e78b680d617a8..27f2a38f77a0c 100644 --- a/pkgs/applications/emulators/maiko/default.nix +++ b/pkgs/applications/emulators/maiko/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libX11 }: +{ lib, stdenv, fetchFromGitHub, cmake, xorg }: stdenv.mkDerivation rec { pname = "maiko"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { hash = "sha256-Y+ngep/xHw6RCU8XVRYSWH6S+9hJ74z50pGpIqS2CjM="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libX11 ]; + buildInputs = [ xorg.libX11 ]; installPhase = '' runHook preInstall find . -maxdepth 1 -executable -type f -exec install -Dt $out/bin '{}' \; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://interlisp.org/"; license = licenses.mit; maintainers = with maintainers; [ ehmry ]; - inherit (libX11.meta) platforms; + inherit (xorg.libX11.meta) platforms; }; } diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index 4424bedc6f23c..ce0ea6d6de8b8 100644 --- a/pkgs/applications/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -3,12 +3,14 @@ , fetchFromGitHub , SDL2 , cmake -, libepoxy -, ffmpeg_4 +, copyDesktopItems +, ffmpeg , imagemagick , libedit , libelf +, libepoxy , libzip +, lua , makeDesktopItem , minizip , pkg-config @@ -18,31 +20,33 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mgba"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; - rev = version; - hash = "sha256-0ZtoyyoD+YjplJlPFpZgIg5119j/6X8ZaSZP+UpX5K0="; + rev = finalAttrs.version; + hash = "sha256-2thc2v3aD8t1PrREZIjzRuYfP7b3BA7uFb6R95zxsZI="; }; nativeBuildInputs = [ cmake + copyDesktopItems pkg-config wrapQtAppsHook ]; buildInputs = [ SDL2 - libepoxy - ffmpeg_4 + ffmpeg imagemagick libedit libelf + libepoxy libzip + lua minizip qtbase qtmultimedia @@ -79,9 +83,9 @@ stdenv.mkDerivation rec { runners, and a modern feature set for emulators that older emulators may not support. ''; + changelog = "https://github.com/mgba-emu/mgba/blob/${finalAttrs.version}/CHANGES"; license = licenses.mpl20; maintainers = with maintainers; [ MP2E AndersonTorres ]; platforms = platforms.linux; }; -} -# TODO: use desktopItem functions +}) diff --git a/pkgs/applications/emulators/np2kai/default.nix b/pkgs/applications/emulators/np2kai/default.nix index dd5e53967c010..cf55085b78a19 100644 --- a/pkgs/applications/emulators/np2kai/default.nix +++ b/pkgs/applications/emulators/np2kai/default.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { configurePhase = '' export GIT_VERSION=${builtins.substring 0 7 src.rev} - buildFlags="$buildFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES}" + buildFlags="$buildFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES" '' + optionalString enableX11 '' cd x11 substituteInPlace Makefile.am \ diff --git a/pkgs/applications/emulators/pcem/default.nix b/pkgs/applications/emulators/pcem/default.nix index 2e6aa683e4d3a..22173fe9e0853 100644 --- a/pkgs/applications/emulators/pcem/default.nix +++ b/pkgs/applications/emulators/pcem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, wxGTK31, coreutils, SDL2, openal, alsa-lib, pkg-config +{ stdenv, lib, fetchzip, wxGTK32, coreutils, SDL2, openal, alsa-lib, pkg-config , autoreconfHook, withNetworking ? true, withALSA ? true }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ wxGTK31 coreutils SDL2 openal ] + buildInputs = [ wxGTK32 coreutils SDL2 openal ] ++ lib.optional withALSA alsa-lib; configureFlags = [ "--enable-release-build" ] diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ed47c579d642c..57ae88dbd42ce 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -8,7 +8,6 @@ , fetchFromGitHub , ffmpeg , fluidsynth -, gcc10Stdenv , gettext , hexdump , hidapi @@ -31,7 +30,6 @@ , portaudio , python3 , retroarch -, SDL , sfml , snappy , udev @@ -40,6 +38,7 @@ , xxd , xz , zlib +, fetchpatch }: let @@ -56,7 +55,7 @@ let , stdenvOverride ? stdenv , src ? (getCoreSrc core) , broken ? false - , version ? "unstable-2022-04-21" + , version ? "unstable-2022-10-01" , platforms ? retroarch.meta.platforms # The resulting core file is based on core name # Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename @@ -113,7 +112,7 @@ let meta = with lib; { inherit broken description license platforms; homepage = "https://www.libretro.com/"; - maintainers = with maintainers; [ edwtjo hrdinka MP2E thiagokokada ]; + maintainers = with maintainers; teams.libretro.members ++ [ hrdinka ]; }; }) // builtins.removeAttrs args [ "core" "src" "description" "license" "makeFlags" ] ); @@ -205,6 +204,14 @@ in makefile = "Makefile"; }; + beetle-supafaust = mkLibRetroCore { + core = "mednafen-supafaust"; + src = getCoreSrc "beetle-supafaust"; + description = "Port of Mednafen's experimental snes_faust core to libretro"; + license = lib.licenses.gpl2Plus; + makefile = "Makefile"; + }; + beetle-supergrafx = mkLibRetroCore { core = "mednafen-supergrafx"; src = getCoreSrc "beetle-supergrafx"; @@ -233,6 +240,7 @@ in core = "blastem"; description = "Port of BlastEm to libretro"; license = lib.licenses.gpl3Only; + platforms = lib.platforms.x86; }; bluemsx = mkLibRetroCore { @@ -300,7 +308,6 @@ in citra = mkLibRetroCore { core = "citra"; description = "Port of Citra to libretro"; - stdenvOverride = gcc10Stdenv; license = lib.licenses.gpl2Plus; extraBuildInputs = [ libGLU libGL boost ffmpeg nasm ]; makefile = "Makefile"; @@ -331,7 +338,6 @@ in core = "dolphin"; description = "Port of Dolphin to libretro"; license = lib.licenses.gpl2Plus; - extraNativeBuildInputs = [ cmake curl pkg-config ]; extraBuildInputs = [ libGLU @@ -359,7 +365,7 @@ in core = "dosbox"; description = "Port of DOSBox to libretro"; license = lib.licenses.gpl2Only; - stdenvOverride = gcc10Stdenv; + CXXFLAGS = "-std=gnu++11"; }; eightyone = mkLibRetroCore { @@ -397,7 +403,8 @@ in license = lib.licenses.gpl2Only; extraBuildInputs = [ libGL libGLU ]; makefile = "Makefile"; - makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; + makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; + patches = [ ./fix-flycast-makefile.patch ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; }; @@ -452,9 +459,9 @@ in core = "hatari"; description = "Port of Hatari to libretro"; license = lib.licenses.gpl2Only; - extraBuildInputs = [ SDL zlib ]; extraNativeBuildInputs = [ which ]; dontConfigure = true; + # zlib is already included in mkLibRetroCore as buildInputs makeFlags = [ "EXTERNAL_ZLIB=1" ]; }; @@ -467,41 +474,37 @@ in mame2000 = mkLibRetroCore { core = "mame2000"; - description = "Port of MAME ~2000 to libretro"; + description = "Port of MAME ~2000 to libretro, compatible with MAME 0.37b5 sets"; license = "MAME"; makefile = "Makefile"; makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0"; - enableParallelBuilding = false; }; mame2003 = mkLibRetroCore { core = "mame2003"; - description = "Port of MAME ~2003 to libretro"; + description = "Port of MAME ~2003 to libretro, compatible with MAME 0.78 sets"; license = "MAME"; makefile = "Makefile"; - enableParallelBuilding = false; }; mame2003-plus = mkLibRetroCore { core = "mame2003-plus"; - description = "Port of MAME ~2003+ to libretro"; + description = "Port of MAME ~2003+ to libretro, compatible with MAME 0.78 sets"; license = "MAME"; makefile = "Makefile"; - enableParallelBuilding = false; }; mame2010 = mkLibRetroCore { core = "mame2010"; - description = "Port of MAME ~2010 to libretro"; + description = "Port of MAME ~2010 to libretro, compatible with MAME 0.139 sets"; license = "MAME"; makefile = "Makefile"; makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ]; - enableParallelBuilding = false; }; mame2015 = mkLibRetroCore { core = "mame2015"; - description = "Port of MAME ~2015 to libretro"; + description = "Port of MAME ~2015 to libretro, compatible with MAME 0.160 sets"; license = "MAME"; makeFlags = [ "PYTHON=python3" ]; extraNativeBuildInputs = [ python3 ]; @@ -512,16 +515,11 @@ in mame2016 = mkLibRetroCore { core = "mame2016"; - description = "Port of MAME ~2016 to libretro"; + description = "Port of MAME ~2016 to libretro, compatible with MAME 0.174 sets"; license = with lib.licenses; [ bsd3 gpl2Plus ]; extraNativeBuildInputs = [ python3 ]; extraBuildInputs = [ alsa-lib ]; makeFlags = [ "PYTHON_EXECUTABLE=python3" ]; - postPatch = '' - # Prevent the failure during the parallel building of: - # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o - mkdir -p 3rdparty/genie/build/gmake.linux/obj/Release/src/host/lua-5.3.0/src - ''; enableParallelBuilding = false; }; @@ -666,7 +664,7 @@ in platforms = lib.platforms.x86; }; - pcsx_rearmed = mkLibRetroCore { + pcsx-rearmed = mkLibRetroCore { core = "pcsx_rearmed"; description = "Port of PCSX ReARMed with GNU lightning to libretro"; license = lib.licenses.gpl2Only; @@ -677,11 +675,7 @@ in core = "picodrive"; description = "Fast MegaDrive/MegaCD/32X emulator"; license = "MAME"; - - extraBuildInputs = [ libpng SDL ]; - SDL_CONFIG = "${lib.getDev SDL}/bin/sdl-config"; - dontAddPrefix = true; - configurePlatforms = [ ]; + dontConfigure = true; makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; }; @@ -727,6 +721,17 @@ in makefile = "Makefile"; }; + puae = mkLibRetroCore { + core = "puae"; + description = "Amiga emulator based on WinUAE"; + license = lib.licenses.gpl2Only; + makefile = "Makefile"; + patches = fetchpatch { + url = "https://github.com/libretro/libretro-uae/commit/90ba4c9bb940e566781c3590553270ad69cf212e.patch"; + sha256 = "sha256-9xkRravvyFZc0xsIj0OSm2ux5BqYogfQ1TDnH9l6jKw="; + }; + }; + quicknes = mkLibRetroCore { core = "quicknes"; description = "QuickNES libretro port"; @@ -747,7 +752,7 @@ in core = "scummvm"; description = "Libretro port of ScummVM"; license = lib.licenses.gpl2Only; - extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL SDL ]; + extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL ]; makefile = "Makefile"; preConfigure = "cd backends/platform/libretro/build"; }; @@ -800,9 +805,8 @@ in core = "stella"; description = "Port of Stella to libretro"; license = lib.licenses.gpl2Only; - extraBuildInputs = [ libpng pkg-config SDL ]; makefile = "Makefile"; - preBuild = "cd src/libretro"; + preBuild = "cd src/os/libretro"; dontConfigure = true; }; @@ -844,7 +848,7 @@ in core = "tic80"; description = "Port of TIC-80 to libretro"; license = lib.licenses.mit; - extraNativeBuildInputs = [ cmake pkg-config libGL libGLU ]; + extraNativeBuildInputs = [ cmake pkg-config ]; makefile = "Makefile"; cmakeFlags = [ "-DBUILD_LIBRETRO=ON" diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 4a8c762b6a934..1754ad5eccb6b 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, nixosTests , enableNvidiaCgToolkit ? false , withGamemode ? stdenv.isLinux , withVulkan ? stdenv.isLinux @@ -36,11 +37,11 @@ }: let - version = "1.10.3"; + version = "1.11.0"; libretroCoreInfo = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; - sha256 = "sha256-wIIMEWrria8bZe/rcoJwDA9aCMWwbkDQFyEU80TZXFQ="; + sha256 = "sha256-46T87BpzWUQHD7CsCF2sZo065Sl8Y4Sj1zwzBWmCiiU="; rev = "v${version}"; }; runtimeLibs = lib.optional withVulkan vulkan-loader @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "sha256-nAv1yv0laqlOmB8UUkK5wSYy/ySqXloEErm+yV30bbA="; + sha256 = "sha256-/rOf85TQTXbY9kIETaO5E58f2ZvKPqEFLsbNne/+/lw="; rev = "v${version}"; }; @@ -128,12 +129,9 @@ stdenv.mkDerivation rec { # Workaround for the following error affecting newer versions of Clang: # ./config.def.h:xxx:x: error: 'TARGET_OS_TV' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-Wno-undef-prefix" ] - # Workaround build failure on -fno-common toolchains: - # duplicate symbol '_apple_platform' in:ui_cocoa.o cocoa_common.o - # TODO: drop when upstream gets a fix for it: - # https://github.com/libretro/RetroArch/issues/14025 - ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-Wno-undef-prefix" ]; + + passthru.tests = nixosTests.retroarch; meta = with lib; { homepage = "https://libretro.com"; @@ -141,6 +139,10 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; changelog = "https://github.com/libretro/RetroArch/blob/v${version}/CHANGES.md"; - maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch thiagokokada ]; + maintainers = with maintainers; teams.libretro.members ++ [ matthewbauer kolbycrouch ]; + # FIXME: error while building in macOS: + # "Undefined symbols for architecture <arch>" + # See also retroarch/wrapper.nix that is also broken in macOS + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch b/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch new file mode 100644 index 0000000000000..a067839c7c32b --- /dev/null +++ b/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +index 01d99c30..8c2dd248 100644 +--- a/Makefile ++++ b/Makefile +@@ -440,7 +440,6 @@ else ifeq ($(platform), arm64) + CPUFLAGS += -DTARGET_LINUX_ARMv8 -frename-registers + CFLAGS += $(CPUFLAGS) + CXXFLAGS += $(CPUFLAGS) +- ASFLAGS += $(CFLAGS) -c -frename-registers -fno-strict-aliasing -ffast-math -ftree-vectorize + PLATFORM_EXT := unix + WITH_DYNAREC=arm64 + HAVE_GENERIC_JIT = 0 diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 41649cbf4c003..fac926c9062bd 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -2,8 +2,8 @@ "atari800": { "owner": "libretro", "repo": "libretro-atari800", - "rev": "beab30e7ea10b7ed14d0514064f47d16f76cd995", - "sha256": "r9MsnasNhhYdFyr2VHJXkTXssB5U00JW6wN/+i+SNUk=" + "rev": "94033288b026fe699bc50703609807aa8075f4dd", + "sha256": "fTKFELELt1g7t3uPgnXIgeMkkSbl9GHr0/k2FHcpDFI=" }, "beetle-gba": { "owner": "libretro", @@ -14,38 +14,38 @@ "beetle-lynx": { "owner": "libretro", "repo": "beetle-lynx-libretro", - "rev": "de0d520d679cb92767876d4e98da908b1ea6a2d6", - "sha256": "BszU5bnlHBOwQSZOM9P4WIP863rS5RluNWvGBFxqzYs=" + "rev": "3d2fcc5a555bea748b76f92a082c40227dff8222", + "sha256": "PpFLi9DIvv8igtAqDPkLfH1CjkbeOumcpNCP7K9C1PY=" }, "beetle-ngp": { "owner": "libretro", "repo": "beetle-ngp-libretro", - "rev": "facf8e1f5440c5d289258ee3c483710f3bf916fb", - "sha256": "vDKDt7MvCB9XQYP291cwcEPDxfNIVgNSWtBYz9PVgcw=" + "rev": "00c7cb8ea97ad9a372307405d8abf34e401fec8a", + "sha256": "MtZMPjgT4dQy+E+4jSDE08PRi0pwa+q48kmTHhfIQMY=" }, "beetle-pce-fast": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "e8801687f232a6f8828b3ff5dadbc9fe1b0076fc", - "sha256": "YM+URLnMqsdmk/5yqCg8U4mPpgtmj5qne2CrbTpTeN8=" + "rev": "cc248db4d2f47d0f255fbc1a3c651df4beb3d835", + "sha256": "euoNldhyEPfC9EgEX201mpSjns2qbCIAow0zmMKTnaE=" }, "beetle-pcfx": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "bfc0954e14b261a04dcf8dbe0df8798f16ae3f3c", - "sha256": "XzCb1lZFYgsg+3eQ1OqyycNxCgLtZFA30rno3ytdnoM=" + "rev": "08632fcbc039f70dbd6da5810db9dcc304d7fbde", + "sha256": "G+OUs6k8dwH4BK+0X/g47wbY7Dpb3lT5TslLwPWq6g4=" }, "beetle-psx": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "5a24d54d30dd00d817d267cf92fd5b3f4640928f", - "sha256": "uG1BhElNW75PnfM+rEYfbl97iwRT89hnl84yvlgx6fg=" + "rev": "bd6b9ef3049fe3f70a18ee6f752a935ae83c2f2b", + "sha256": "CXcLMOF6IXUrp14nyTQ5KK2LR+FyWcF0UcvHTxEVSo0=" }, "beetle-saturn": { "owner": "libretro", "repo": "beetle-saturn-libretro", - "rev": "dd18f9c477106263b3b7b050f4970d331ff7b23a", - "sha256": "RN5dmORtNOjIklSz/n11lz37bZ4IcPD7cyRcBGS4Oi8=" + "rev": "054862a4ccb9b2f1bad9e5b075fc3d1116dc8055", + "sha256": "oL9YPvDGkUs0Tm/rNznnV+Tg5mcvqs1VcGVmz/fDHmw=" }, "beetle-snes": { "owner": "libretro", @@ -53,66 +53,72 @@ "rev": "d770563fc3c4bd9abb522952cefb4aa923ba0b91", "sha256": "zHPtfgp9hc8Q4gXJ5VgfJLWLeYjCsQhkfU1T5RM7AL0=" }, + "beetle-supafaust": { + "owner": "libretro", + "repo": "supafaust", + "rev": "85b5527231a6ad6f9475c15c8ff1b9d16884cd30", + "sha256": "6ynxRfGYlp7Fuq3XT2uHsR9Uwu7WMIYjclLc0Pf/qNM=" + }, "beetle-supergrafx": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "59991a98c232b1a8350a9d67ac554c5b22771d3c", - "sha256": "zv3dAPWrj6hkNaFQ5vUKm5Orcrb2XO48WSkAFiAVUO0=" + "rev": "3cfafe8c684a2f4f4532bcf18e25d2f8760ca45d", + "sha256": "hIBUMpXgX5zPi/W1vAhkuxprGfZQ/K5ZrtiswV36EMQ=" }, "beetle-vb": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "246555f8ed7e0b9e5748b2ee2ed6743187c61393", - "sha256": "96lQlDqx2bvFeovqGGkemxqS2zlHw92O6YeTEGlgf34=" + "rev": "162918f06d9a705330b2ba128e0d3b65fd1a1bcc", + "sha256": "BtrdDob+B5g8Lq93LUhF7E0uWFUIMZneWFgH0VcsgPE=" }, "beetle-wswan": { "owner": "libretro", "repo": "beetle-wswan-libretro", - "rev": "d1fb3f399a2bc16b9ad0f2e8c8ba9f7051cd26bd", - "sha256": "p9mJv7zBFjNh1sh5iAjBZzxP6k8ydUNDXLQIjHl9doQ=" + "rev": "16d96f64a32cbe1fa89c40b142298dbd007f2f4d", + "sha256": "LBtOQfVvP70OB6qMnFXtWdJUu7CkkMfSQ0iPGhe7xeI=" }, "blastem": { "owner": "libretro", "repo": "blastem", - "rev": "0786858437ed71996f43b7af0fbe627eb88152fc", - "sha256": "uEP5hSgLAle1cLv/EM7D11TJMAggu7pqWxfrUt3rhEg=" + "rev": "277e4a62668597d4f59cadda1cbafb844f981d45", + "sha256": "EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs=" }, "bluemsx": { "owner": "libretro", "repo": "bluemsx-libretro", - "rev": "92d0c41b4973854114c7b2d06ab727a266d404c5", - "sha256": "dL4k+zG8L4KK4lwf9eXPVGk/u5xQn2htIEpoKyj9kQI=" + "rev": "acf358be18644a9df0ed9602d63c2f73d4fe605a", + "sha256": "K4mH+brakYZcVEeYMFUkFThqdZGt2+aP5DfpOgWSJxg=" }, "bsnes": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "26c583e1c5d09253b6c61e2b9d418e8758eef632", - "sha256": "Qa0ScFHcEgBUoWouNoW4JINZ2aHjNATndxhcwKw476Q=" + "rev": "7679cb9618c37c9044158d5cf3da28ef25afa9af", + "sha256": "9ozzXvCAuafcZn9iq91tTq16e2mlYqjwauJUGSbFd+k=" }, "bsnes-hd": { "owner": "DerKoun", "repo": "bsnes-hd", - "rev": "65f24e56c37f46bb752190024bd4058e64ad77d1", - "sha256": "1dk2i71NOLeTTOZjVll8wrkr5dIH5bGSGUeeHqWjZHE=" + "rev": "04821703aefdc909a4fd66d168433fcac06c2ba7", + "sha256": "QmNthbWb92vel5PFwJRXeEEVZHIxfvZ0ls+csodpGbU=" }, "bsnes-mercury": { "owner": "libretro", "repo": "bsnes-mercury", - "rev": "4ba6d8d88e57d3193d95e1bcf39e8d31121f76d4", - "sha256": "w2MVslgRlxW4SMzgcXP4gXr9A8B07N7LNrB1LXzk1Zk=" + "rev": "fb9a41fe9bc230a07c4506cad3cbf21d3fa635b4", + "sha256": "gBOxKSv3j229IVdtffqFV/zSSacEs8UsBERnQgdFw4Y=" }, "citra": { "owner": "libretro", "repo": "citra", - "rev": "44e01f99016008eff18bc7a28234d1098382358d", - "sha256": "vIrUStv+VM8pYeznnWSVBRfSA71/B7VIY7B/syymGzE=", + "rev": "70bf7d8a63b0b501e8f5cff89a86a3e2d4083aa0", + "sha256": "uHWROH6/ZAZygkhEQGNyllncCp2XDCdYwy/CKgGKAcM=", "fetchSubmodules": true }, "desmume": { "owner": "libretro", "repo": "desmume", - "rev": "5d0ae2be2c9fb6362af528b3722e81323318eb9f", - "sha256": "4bJ6fLZ+fV7SnZ71YT3JFcXFOgmskNUCmCHwc2QNl0A=" + "rev": "fbd368c8109f95650e1f81bca1facd6d4d8687d7", + "sha256": "7MFa5zd1jdOCqSI+VPl5nAHE7Kfm/lA0lbSPFskzqaQ=" }, "desmume2015": { "owner": "libretro", @@ -123,20 +129,20 @@ "dolphin": { "owner": "libretro", "repo": "dolphin", - "rev": "6a0b6ee8a4d5363e669f5faf43abc8f17e4278a8", - "sha256": "TeeHnttGmCeOTDTK/gJM+RpusjDDndapZAa3T+oLiq0=" + "rev": "9810e29a1f3633d32b6643b97a1147d83311d73a", + "sha256": "iIaVSJSC3mD1k751vQvWI6x0C/HhfjEaMwfX53FpZv4=" }, "dosbox": { "owner": "libretro", "repo": "dosbox-libretro", - "rev": "74cd17ed0ff810ff78cb8c1f1e45513bfe8a0f32", - "sha256": "0PIloW7j/87asDJ8IDw4r3r4muxNF+RbvkIRPLZQvRc=" + "rev": "b7b24262c282c0caef2368c87323ff8c381b3102", + "sha256": "PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I=" }, "eightyone": { "owner": "libretro", "repo": "81-libretro", - "rev": "2e34567a320cba27b9162b1776db4de3cdb7cf03", - "sha256": "vjrHRLzc9Fy0MwV9d+LlcJTGJfVsRauEig8R+erBtfw=" + "rev": "73f6cca62dabc84df946aea71cf457ce5ae5ea9d", + "sha256": "oovIKMZXxtLc+zmbguagTVoMPngokdN3xTBnb/+KUjY=" }, "fbalpha2012": { "owner": "libretro", @@ -147,14 +153,14 @@ "fbneo": { "owner": "libretro", "repo": "fbneo", - "rev": "e4625a196b9232ba93a156e3a5164aa11193f20a", - "sha256": "/5JmwuLWWBQWXnqCMjKzOC2XG6wo5a6xgQOYX1P1zcw=" + "rev": "8678b0fcd02c4049c0cfa40a0ab87fded1bbedd8", + "sha256": "MiLYaURj17Sq8V31SDFQ93XH4DAYMQQelVq+4EBmtro=" }, "fceumm": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "b3c35b6515b2b6a789c589f976a4a323ebebe3eb", - "sha256": "zwFQGQyO0Vj/IBM1k8JB3D/jB3OwDuGdSHLavr8Fxgw=" + "rev": "3d3cc53c0177e296af2427c29bbb31902b26f3b8", + "sha256": "Z5LqP6IBq0H6uM0027PSkW6JLvVDA/4CrO6bI478Z1o=" }, "flycast": { "owner": "libretro", @@ -165,38 +171,38 @@ "fmsx": { "owner": "libretro", "repo": "fmsx-libretro", - "rev": "11fa9f3c08cde567394c41320ca76798c2c64670", - "sha256": "1u5c5oDIjjXEquh6UBv2H1F/Ln7h44DTF1ohDG0Qnww=" + "rev": "1360c9ff32b390383567774d01fbe5d6dfcadaa3", + "sha256": "LLGD29HKpV34IOJ2ygjHZZT7XQqHHXccnpGNfWCuabg=" }, "freeintv": { "owner": "libretro", "repo": "freeintv", - "rev": "295dd3c9e4b2d4f652f6a6a904afbe90a8187068", - "sha256": "tz0X6AfD7IL3Y50vjgSO5r6sDhu++6Gj8Rp7de5OqMk=" + "rev": "9a65ec6e31d48ad0dae1f381c1ec61c897f970cb", + "sha256": "ZeWw/K6i04XRympqZ6sQG/yjN8cJglVcIkxpyRHx424=" }, "gambatte": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "15536214cdce31894d374b2ffa2494543057082b", - "sha256": "cTSoK6rezRajnuWPt7WkYn3SWL0sTu7h5X3Ig1KukDA=" + "rev": "7e02df60048db0898131ea365f387a026e4e648d", + "sha256": "RnFuD8PL+/uPhWe+sSXMPm5+XH8FzCwY+MSquR/AB+o=" }, "genesis-plus-gx": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "7520ac8aae7b08262c0472e724e6ef0bfe41d285", - "sha256": "wKcO/dulgZKgXTuHdcQvfSrfxSI5UA0az6qMLtP4K6g=" + "rev": "5cdb31854074de1662266a0a675866ea7b787b42", + "sha256": "vMswSKM5aYlPZu5y4Z1L/+eaPBdQaLPPMKoC7B/xzqc=" }, "gpsp": { "owner": "libretro", "repo": "gpsp", - "rev": "f0f0b31f9ab95946965b75fed8d31e19290f3d43", - "sha256": "aiegBSpQDyXzVkyWuUpI66QvA1tqS8PQ8+75U89K10A=" + "rev": "81649a2c8075201bb823cce8fdf16a31c92a3b6c", + "sha256": "De9Tke+fp6CtXzm0w6Qzts3jj1j/1uB0kYZfaWyNqA0=" }, "gw": { "owner": "libretro", "repo": "gw-libretro", - "rev": "d08a08154ce8ed8e9de80582c108f157e4c6b226", - "sha256": "PWd/r4BBmhiNqJdV6OaXHr4XCdR1GyVipq3zvyBcqEs=" + "rev": "19a1cb3105ca4a82139fb4994e7995fd956f6f8d", + "sha256": "luhKXzxrXVNAHw8ArF1I78Zch7XEPwI3aqe0f6WRgD0=" }, "handy": { "owner": "libretro", @@ -207,44 +213,44 @@ "hatari": { "owner": "libretro", "repo": "hatari", - "rev": "e5e36a5262cfeadc3d1c7b411b7a70719c4f293c", - "sha256": "T4I3NVEMBKr5HLs60x48VNRl2TMnhqvaF+LTtYQ7qdU=" + "rev": "1ebf0a0488580ef95c0b28f02223b31813c867c5", + "sha256": "i6dr+fFWPatRCIY+ajIZ1p3ERPV5ktv0nxHKxbGE5ao=" }, "mame": { "owner": "libretro", "repo": "mame", - "rev": "b7dd999590717638ceade2e24d16d63147aa12ad", - "sha256": "QgENNjykhO+WSxAb//J+R7QP3/rZnxqv7sarO4eBYuc=" + "rev": "fcacbc7811a9b69874fd09b91e7217e44c6a0980", + "sha256": "WiBmqBcqxXmeQOmTN4FDDUv680uqAkpYUOnvJ7FXn4k=" }, "mame2000": { "owner": "libretro", "repo": "mame2000-libretro", - "rev": "dd9d6612c29bf5b29bc2f94cab2d43fe3dcd69ee", - "sha256": "X0fP0bNBk2hqXVdRspylLIjZO563aMXkyX4qgx/3Vr8=" + "rev": "0208517404e841fce0c094f1a2776a0e1c6c101d", + "sha256": "WEJd7wSzY32sqMpMrjCD0hrOyAQq1WMBaGiY/2QQ4BQ=" }, "mame2003": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "3eb27d5f161522cf873c0642f14b8e2267b3820f", - "sha256": "TQ4FwboKeEP58hOL2hYs4OYes2o0wSKFSp4CqZV5r6I=" + "rev": "cb0c89304b2cd584cda7105c6be4e69fa304f0e0", + "sha256": "ob/aUh5NZCfQvpA+nEs2QhVXeNBBVZesX/xQfatY9wU=" }, "mame2003-plus": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "e5ee29ecb8182952f861f22516e5791625fe2671", - "sha256": "YunfAITR/Etm8lvEab/HigZoBz+ayJQ7ezjItWI/HvE=" + "rev": "982db57b325b54aa90a60bd2e512b624d3b6642c", + "sha256": "uyysUD/PULHyaOw42GJoBsT9fYdYuAl4eLCVNRU8/Sw=" }, "mame2010": { "owner": "libretro", "repo": "mame2010-libretro", - "rev": "932e6f2c4f13b67b29ab33428a4037dee9a236a8", - "sha256": "HSZRSnc+0300UE9fPcUOMrXABlxHhTewkFPTqQ4Srxs=" + "rev": "5f524dd5fca63ec1dcf5cca63885286109937587", + "sha256": "OmJgDdlan/niGQfajv0KNG8NJfEKn7Nfe6GRQD+TZ8M=" }, "mame2015": { "owner": "libretro", "repo": "mame2015-libretro", - "rev": "e6a7aa4d53726e61498f68d6b8e2c092a2169fa2", - "sha256": "IgiLxYYuUIn3YE+kQCXzgshES2VNpUHn0Qjsorw0w/s=" + "rev": "2599c8aeaf84f62fe16ea00daa460a19298c121c", + "sha256": "TURTX0XrvqwqKG3O3aCttDAdicBdge5F1thVvYgEHaw=" }, "mame2016": { "owner": "libretro", @@ -255,20 +261,20 @@ "melonds": { "owner": "libretro", "repo": "melonds", - "rev": "e93ec3e462d3dfc1556781510a3cee113f02abb2", - "sha256": "NDrsqX17OKw1/PIZSrWAxhVl+Qk/xG7lCnr6Ts+7YJ4=" + "rev": "6a03f3f11a729dbf698ec53954c735a0680aca01", + "sha256": "GH/G/UzwjNqHwtIwx6VohP4XsJKe+EFU2n+GX43IByM=" }, "mesen": { "owner": "libretro", "repo": "mesen", - "rev": "bb9ea02eba28682986044a6f49329ec533aa26ba", - "sha256": "G2NQDpByvI9RFEwrRiKXcMnPtVtqpvEoZgk7/fk5qCU=" + "rev": "9b412c1533a6d7eec7b2904775cbd26c21f02119", + "sha256": "Tf+lWfSU7AuW6Um5TXkWNAeg35W08YkYQwW0Yx3iNTM=" }, "mesen-s": { "owner": "libretro", "repo": "mesen-s", - "rev": "b0b53409eecb696fb13f411ffde72e8f576feb09", - "sha256": "lDHyeIsVsI5+ZK8EJI50alrFuu0uJmxscda5bR1UmQQ=" + "rev": "32a7adfb4edb029324253cb3632dfc6599ad1aa8", + "sha256": "/OOMH7kt9Pmkdmy5m+I8FMvog5mqZHyrZvfjHccz8oo=" }, "meteor": { "owner": "libretro", @@ -279,114 +285,120 @@ "mgba": { "owner": "libretro", "repo": "mgba", - "rev": "5d48e0744059ebf38a4e937b256ffd5df4e0d103", - "sha256": "OYw2nlldFx5B7WX0E8Gbgfp1j4h65ZxyKDS9tneHXQg=" + "rev": "db7ace387cdc87d9f2bd4f9f5211c26ce0b07867", + "sha256": "i/U5yrnGQBRHqBu8c/mQ7Eov43+6IOOs+H8pSKXNM1E=" }, "mupen64plus": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "6e9dcd2cd9d23d3e79eaf2349bf7e9f25ad45bf1", - "sha256": "rs/VL2K6aS8Rl01IyxUiWipzLEzg+7+fbXxI0qN5X/I=" + "rev": "c10546e333d57eb2e5a6ccef1e84cb6f9274c526", + "sha256": "dbS32slJBfz8DHeIQy20lAYw0+ig0LRgIaGfqW082xs=" }, "neocd": { "owner": "libretro", "repo": "neocd_libretro", - "rev": "327aeceecdf71c8a0c0af3d6dc53686c94fe44ad", - "sha256": "cY0P+0EQ0b9df+YT2EMvrxjp5L+DwIg31rEJqchU+hc=" + "rev": "b7d96e794f2dfa500cba46c78cbc3c28349cfd05", + "sha256": "TG5xIqIM0MlHDNtPhyISqo/ctTqemKROwXgoqUsCQ0E=" }, "nestopia": { "owner": "libretro", "repo": "nestopia", - "rev": "a9e197f2583ef4f36e9e77d930a677e63a2c2f62", - "sha256": "QqmWSk8Ejf7QMJk0cVBgpnyqcK6oLjCnnXMXInuWfYc=" + "rev": "a9ee6ca84f04990e209880fe47144e62b14253db", + "sha256": "q3pD2Cm/a62x3xW8JymU9w82zHlT0BoPlaSfzjZzh/c=" }, "np2kai": { "owner": "AZO234", "repo": "NP2kai", - "rev": "2b09ea6a589cdcae27bca27160b3f82638fbb45d", - "sha256": "M3kGA1TU3xui6of9XgUspI+Zf+hjYP1d2mgKwxsy3IQ=", + "rev": "606fafa7081b62df5f4727c34560da23927c21cd", + "sha256": "qS7OrY8bFkAmRgbzLCw9PqgxtKuVNKI+tsDVU7PqWIw=", "fetchSubmodules": true }, "nxengine": { "owner": "libretro", "repo": "nxengine-libretro", - "rev": "bc692a392473a45f63cdccbb353c3445b530d671", - "sha256": "tAZkYHRKL+mI6f7YCnaU0qTSOZGW2o20p6wovMK1n2k=" + "rev": "aa32afb8df8461920037bdbbddbff00bf465c6de", + "sha256": "Ic5YsNLoEZJ/vkjthwypwLN3ntB/5EX8bU92V80S7R4=" }, "o2em": { "owner": "libretro", "repo": "libretro-o2em", - "rev": "641f06d67d192a0677ec861fcb731d3ce8da0f87", - "sha256": "s3FreOziXeGhUyQdSoOywZldD21m3+OXK0EJ2Z8rXiY=" + "rev": "3303cc15e4323280084471f694f6d34c78199725", + "sha256": "xH8Dlsg84q8awxjObMPXKZcJSwmix1YdRXIpee7rw6o=" }, "opera": { "owner": "libretro", "repo": "opera-libretro", - "rev": "3849c969c64b82e622a7655b327fa94bc5a4c7cc", - "sha256": "McSrvjrYTemqAAnfHELf9qXC6n6Dg4kNsUDA7e2DvkE=" + "rev": "8a49bb8877611037438aeb857cb182f41ee0e3a1", + "sha256": "oH+sQi4D+xkqiJbq7fgGdHjgvyLt8UjlgXIo7K3wXZM=" }, "parallel-n64": { "owner": "libretro", "repo": "parallel-n64", - "rev": "b804ab1a199d6ff1f8fef4aa7dfcf663990e430b", - "sha256": "zAet6hYa/79CBbvwZNTNs/ayWuHHlwg+0Y4BAUFddBc=" + "rev": "a03fdcba6b2e9993f050b50112f597ce2f44fa2c", + "sha256": "aJG+s+1OkHQHPvVzlJWU/VziQWj1itKkRwqcEBK+lgA=" }, "pcsx2": { "owner": "libretro", "repo": "pcsx2", - "rev": "0251730a21d7238856d79aa25e2942b48edb38f6", - "sha256": "a/lWLBCww4QwxdO7Sbvmfq0XF9FnP4xzF51ljsWk46I=" + "rev": "ad7650949e6c8c87cd2c5e278af88e3722a321bc", + "sha256": "iqXCW28werxbZNo1hlDLiD3ywSZ9hvWmxwGPJ5bRZ+w=" }, "pcsx_rearmed": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "e24732050e902bd5402b2b7da7c391d2ca8fa799", - "sha256": "tPz5E3QO6FucjYOzdjbY2FHLPz1Fmms10tdt7rZIW8U=" + "rev": "5b406fd9567c0829171af44b3325dae6dd155732", + "sha256": "V+z58fRSaLurDiu4Y/xQjndkMKPSmEGjay3foDkppM0=" }, "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "7ff457f2f833570013f2a7e2608ac40632e0735d", - "sha256": "xEG5swvvWFhvosC1XpFaZphESNaf4AtX+6UE02B57j8=", + "rev": "26719f348eb579a8372e2c58ef0132d95d9dc817", + "sha256": "xD8RxFHeKOltIc35Zudj29x+vkq2AXfSKu0/ZzQQHi4=", "fetchSubmodules": true }, "play": { "owner": "jpd002", "repo": "Play-", - "rev": "39eb5c2eb6da65dc76b1c4d1319175a68120a77a", - "sha256": "EF3p0lvHjKGt4pxtTAkDM+uHsnW72lN+Ki8BaZIk/BQ=", + "rev": "1129440ab6ede8263275dc3a5eec1624d20442fb", + "sha256": "nTJjxVPGOofnIZbjGe3GZDIj4YnC73IbSdGsSuVIjEA=", "fetchSubmodules": true }, "ppsspp": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "83b8211abf7fb705835eb1ccf8feae04816ae96c", - "sha256": "8K4bz/GUnE8GrlAVFULMXLC+i3ZYvR28EpehEg6up4s=", + "rev": "16f93a26844b26e11cf9becfd275c4a637bfd1ab", + "sha256": "k1URDPE4kRMY1LUeR2zcLJFGt0Gnt5N8gTQHpIxDdRw=", "fetchSubmodules": true }, "prboom": { "owner": "libretro", "repo": "libretro-prboom", - "rev": "b22a6b19fd976a14374db9083baea9c91b079106", - "sha256": "NmEWRTHaZjV2Y6Wrc3WOamXCnOawKc2ja1KBDxokRiY=" + "rev": "4e671fa0a4b7b892e17ac4e1803c9d627653a4c1", + "sha256": "d2/cpfhNczZkHzMGQIxO9jw65AMs9Jmh4ItiLLdDYsk=" }, "prosystem": { "owner": "libretro", "repo": "prosystem-libretro", - "rev": "fbf62c3dacaac694f7ec26cf9be10a51b27271e7", - "sha256": "Opb6CUeT/bnaTg4MJo7DNsVyaPa73PLbIor25HHWzZ0=" + "rev": "cf544d3c8e40ff197ea5bb177a1269db31077803", + "sha256": "A7yQwzM8ewI+UCPQVyO7DNyiQCTw2yG1soi6l7T3pDE=" + }, + "puae": { + "owner": "libretro", + "repo": "libretro-uae", + "rev": "1b7dd443ff89d667d99f8c44454a91ed59bcabd9", + "sha256": "YJiZEtB0rBFffEZj/hB7zEFBUp02kCzblq4CtCmygKo=" }, "quicknes": { "owner": "libretro", "repo": "QuickNES_Core", - "rev": "e6f08c165af45fc2d2f26c80ba0cfc33e26f9cfe", - "sha256": "JQtlqN3mvIwKy6iN9opHPHnh0E7AIn9JVitIfXklI/I=" + "rev": "1b88a09f1c386ff9ee46bb371583ae04c5cb5dd0", + "sha256": "Q7DDufGTdP+R05ND56PxMNR96ZacJFxPi0ETieV2B58=" }, "sameboy": { "owner": "libretro", "repo": "sameboy", - "rev": "b154b7d3d885a3cf31203f0b8f50d3b37c8b742b", - "sha256": "tavGHiNpRiPkibi66orMf93cnCqQCD8XhSl/36nl/9M=" + "rev": "09138330990da32362246c7034cf4de2ea0a2a2b", + "sha256": "hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4=" }, "scummvm": { "owner": "libretro", @@ -397,38 +409,38 @@ "smsplus-gx": { "owner": "libretro", "repo": "smsplus-gx", - "rev": "9de9847dc8ba458e9522d5ae8b87bf71ad437257", - "sha256": "XzqQ/3XH5L79UQep+DZ+mDHnUJKZQXzjNCZNZw2mGvY=" + "rev": "60af17ddb2231ba98f4ed1203e2a2f58d08ea088", + "sha256": "2SZR9BOTYLmtjEF4Bdl49H2pFNEIaU68VqlA7ll5TqU=" }, "snes9x": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "3c729a9763263bc3a69f48370e43ae05e672970a", - "sha256": "01M6Wvbu1omMwh3Xg4RGh028jirGs7mLpxwKJgMRQxA=" + "rev": "28be1a196d2c59ed4b6489d487187569a7370aff", + "sha256": "FW4ynSS+R1ygQaCS0UrWGktfHGtcy0P/Mp/BXKfmII0=" }, "snes9x2002": { "owner": "libretro", "repo": "snes9x2002", - "rev": "c4397de75a5f11403d154abd935e39fe969bca94", - "sha256": "yL4SIRR1Er+7Iq3YPfoe5ES47nvyA3UmGK+upLzKiFA=" + "rev": "540baad622d9833bba7e0696193cb06f5f02f564", + "sha256": "WJh8Qf1/uFaL9f9d28qXsbpeAZfYGPgjoty3G6XAKSs=" }, "snes9x2005": { "owner": "libretro", "repo": "snes9x2005", - "rev": "23f759bc4bf2e39733296f7749e446418e3cd0f3", - "sha256": "/bZrMp7NHgdYvA3Tw1ZoWXRg7VxmatRUX5cCJsU3NCY=" + "rev": "fd45b0e055bce6cff3acde77414558784e93e7d0", + "sha256": "zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI=" }, "snes9x2010": { "owner": "libretro", "repo": "snes9x2010", - "rev": "c98224bc74aa0bbf355d128b22e4a2a4e94215b0", - "sha256": "mf5msdwdcRRfFWHwmWLS/qKd7gNlLwexGEB6wB6TfhE=" + "rev": "e86e54624a7910a64a9a744e3734d4067c48d240", + "sha256": "U1eeXuhYssAOgiNOZ7fr/8rkPScts3GmWgK6ki39PVA=" }, "stella": { "owner": "stella-emu", "repo": "stella", - "rev": "efb2a9f299cad241e12d811580f28d75b6c3438d", - "sha256": "QYwDTd8EZUMXJiuSJtoW8XQXgl+Wx0lPkNLOwzM5bzA=" + "rev": "65115cc3a133d68979f3096bdecb067bcaedb493", + "sha256": "letOnjaIGIjC9xwj5C156VkBhMPFtVq12FG7SuC5+OY=" }, "stella2014": { "owner": "libretro", @@ -439,14 +451,14 @@ "swanstation": { "owner": "libretro", "repo": "swanstation", - "rev": "0e53a5ac09a30d73d78b628f7e4954ebe5615801", - "sha256": "vOu99fsm2oeSi96tWR+vV5suZSYCyXJVgOdvjnKbNhg=" + "rev": "b6a18318bd7bf0d3b28b50d2b554810ea11b30cb", + "sha256": "jZ6SfiHFJyaTFvINrEe61yhUtWYoqRzaAi0vLuDnMuo=" }, "tgbdual": { "owner": "libretro", "repo": "tgbdual-libretro", - "rev": "1e0c4f931d8c5e859e6d3255d67247d7a2987434", - "sha256": "0wHv9DpKuzJ/q5vERqCo4GBLre2ggClBIWSjGnMLQq8=" + "rev": "a6f3018e6a23030afc1873845ee54d4b2d8ec9d3", + "sha256": "MBUgYXX/Pc+TkwoS7OwbXSPssKUf6lwWx/bKhvwDkHs=" }, "thepowdertoy": { "owner": "libretro", @@ -457,15 +469,15 @@ "tic80": { "owner": "libretro", "repo": "tic-80", - "rev": "e9f62f85a154796c6baaee8a9f6fd0cfdd447019", - "sha256": "JTAoIqxqpaLjsQiIpJ4wQsREI5/rTxVxDywoL3oLI4Q=", + "rev": "bd6ce86174fc7c9d7d3a86263acf3a7de1b62c11", + "sha256": "RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q=", "fetchSubmodules": true }, "vba-m": { "owner": "libretro", "repo": "vbam-libretro", - "rev": "254f6effebe882b7d3d29d9e417c6aeeabc08026", - "sha256": "vJWjdqJ913NLGL4G15sRPqO/wp9xPsuhUMLUuAbDRKk=" + "rev": "7c25d64d6903c6d859cce781c52da0671c4f7d3e", + "sha256": "U+jBM34sZxny9lpuegQ8YDKBwYrWOAyLBMKumoQCok4=" }, "vba-next": { "owner": "libretro", @@ -476,8 +488,8 @@ "vecx": { "owner": "libretro", "repo": "libretro-vecx", - "rev": "141af284202c86ed0d4ce9030c76954a144287cf", - "sha256": "p5vMuG2vr3BTJOQWNcTPb89MlkVrRvJNTIJSU8r9zfU=" + "rev": "b5c17bb7fd4a704f58160bc699322a16d0643396", + "sha256": "nICXrVyoMWs2yDcewHd7z6rBt+haY/Dqf5lvF6RLnyg=" }, "virtualjaguar": { "owner": "libretro", @@ -488,7 +500,7 @@ "yabause": { "owner": "libretro", "repo": "yabause", - "rev": "17dfcd8de4700341d972993501d3a043925675ce", - "sha256": "xwW7Oe3Cy3yC0xC5acLW6OGUIG+dKd1mwiXK5ZAumdo=" + "rev": "c7e02721eddb3de0ec7ae0d61e9e3afa5f586a62", + "sha256": "Y2YsPpgBA021pRDOFqH29zsRSbFIpRo5fq+tkknJbSA=" } } diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index bb6fd2884a500..b546569d283fe 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -18,6 +18,7 @@ CORES = { "beetle-psx": {"repo": "beetle-psx-libretro"}, "beetle-saturn": {"repo": "beetle-saturn-libretro"}, "beetle-snes": {"repo": "beetle-bsnes-libretro"}, + "beetle-supafaust": {"repo": "supafaust"}, "beetle-supergrafx": {"repo": "beetle-supergrafx-libretro"}, "beetle-vb": {"repo": "beetle-vb-libretro"}, "beetle-wswan": {"repo": "beetle-wswan-libretro"}, @@ -71,6 +72,7 @@ CORES = { "ppsspp": {"repo": "ppsspp", "owner": "hrydgard", "fetch_submodules": True}, "prboom": {"repo": "libretro-prboom"}, "prosystem": {"repo": "prosystem-libretro"}, + "puae": {"repo": "libretro-uae"}, "quicknes": {"repo": "QuickNES_Core"}, "sameboy": {"repo": "sameboy"}, "scummvm": {"repo": "scummvm"}, diff --git a/pkgs/applications/emulators/retroarch/wrapper.nix b/pkgs/applications/emulators/retroarch/wrapper.nix index 6adcb8ffd8b44..535cd40db6c34 100644 --- a/pkgs/applications/emulators/retroarch/wrapper.nix +++ b/pkgs/applications/emulators/retroarch/wrapper.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { The following cores are included: ${lib.concatStringsSep "\n" (map (x: " - ${x.name}") cores)} ''; - # FIXME: exits with error on macOS: + # FIXME: exit with error on macOS: # No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting broken = stdenv.isDarwin; }; diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 3f8c2fc97b0e2..c53276659e089 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14141-d686b48f6"; - rpcs3Version = "0.0.24-14141-d686b48f6"; - rpcs3Revision = "d686b48f6549c736661e14d1e0990b043c32e3c2"; - rpcs3Sha256 = "1jzpb189isy9kc6l5cy1nfx0wq5cri753sh32b1xq259lkqihdp5"; + rpcs3GitVersion = "14241-92b08a4fa"; + rpcs3Version = "0.0.24-14241-92b08a4fa"; + rpcs3Revision = "92b08a4fafb1e36ccc23ac7e2a9b10e91a9b6df7"; + rpcs3Sha256 = "01h9m4cdywdfhiv5kjd7cv53spv3g2ixk3dvji14vi28zac8jcxb"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index fa0b63ba1be1b..765f7b12721aa 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -1,5 +1,7 @@ { lib , buildDotnetModule +, dotnetCorePackages +, stdenvNoCC , fetchFromGitHub , wrapGAppsHook , libX11 @@ -86,6 +88,8 @@ buildDotnetModule rec { "/p:ExtraDefineConstants=DISABLE_UPDATER" ]; + dotnetRestoreFlags = [ "--runtime ${dotnetCorePackages.sdk_6_0.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ]; + executables = [ "Ryujinx.Headless.SDL2" "Ryujinx.Ava" diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 4db1f8d2fec78..39fef4cad2ee3 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "AtkSharp"; version = "3.22.25.128"; sha256 = "0fg01zi7v6127043jzxzihirsdp187pyj83gfa6p79cx763l7z94"; }) (fetchNuGet { pname = "Avalonia"; version = "0.10.15"; sha256 = "02rf96gxpafbk0ilg3nxf0fas9gkpb25kzqc2lnbxp8h366qg431"; }) @@ -132,15 +135,6 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "runtime.win.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; }) - (fetchNuGet { pname = "runtime.win.System.Console"; version = "4.3.0"; sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; }) - (fetchNuGet { pname = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; }) - (fetchNuGet { pname = "runtime.win.System.IO.FileSystem"; version = "4.3.0"; sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; }) - (fetchNuGet { pname = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; }) - (fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) - (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) - (fetchNuGet { pname = "runtime.win7-x64.runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1dmbmksnxg12fk2p0k7rzy16448mddr2sfrnqs0rhhrzl0z22zi5"; }) - (fetchNuGet { pname = "runtime.win7.System.Private.Uri"; version = "4.3.0"; sha256 = "0bxkcmklp556dc43bra8ngc8wymcbbflcydi0xwq0j22gm66xf2m"; }) (fetchNuGet { pname = "Ryujinx.Audio.OpenAL.Dependencies"; version = "1.21.0.1"; sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l"; }) (fetchNuGet { pname = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "5.0.1-build10"; sha256 = "05r3fh92raaydf4vcih77ivymbs97kqwjlgqdpaxa11aqq0hq753"; }) (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.0.22-build20"; sha256 = "03d1rv0rlr2z7ynqixgj9xqlksplk1vsvq5wxjf5c6c6zcknx01r"; }) @@ -293,7 +287,6 @@ (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix new file mode 100644 index 0000000000000..121a1708a5b78 --- /dev/null +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitHub, zoxide }: + +rustPlatform.buildRustPackage rec { + pname = "felix"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "kyoheiu"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7WeikYd/mADsp9DQ0jelhuZo5ZiyJrHG9HBg/YLpjZY="; + }; + + cargoSha256 = "sha256-IUiyDk+TRfODXQ+45ARcFximkLVk32pqvJfn23H0kAw="; + + checkInputs = [ zoxide ]; + + meta = with lib; { + description = "A tui file manager with vim-like key mapping"; + homepage = "https://github.com/kyoheiu/felix"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "fx"; + }; +} diff --git a/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/pkgs/applications/file-managers/portfolio-filemanager/default.nix index 48039b64fb60a..770491b4ffa69 100644 --- a/pkgs/applications/file-managers/portfolio-filemanager/default.nix +++ b/pkgs/applications/file-managers/portfolio-filemanager/default.nix @@ -47,6 +47,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib + gtk3 gobject-introspection libhandy librsvg diff --git a/pkgs/applications/file-managers/spacefm/default.nix b/pkgs/applications/file-managers/spacefm/default.nix index 433109cd86af3..334228f98ead1 100644 --- a/pkgs/applications/file-managers/spacefm/default.nix +++ b/pkgs/applications/file-managers/spacefm/default.nix @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ - gtk3 udev desktop-file-utils shared-mime-info intltool + gtk3 udev desktop-file-utils shared-mime-info wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 ] ++ (if ifuseSupport then [ ifuse ] else []); # Introduced because ifuse doesn't build due to CVEs in libplist diff --git a/pkgs/applications/file-managers/worker/default.nix b/pkgs/applications/file-managers/worker/default.nix index 774e885401a04..8357076b31014 100644 --- a/pkgs/applications/file-managers/worker/default.nix +++ b/pkgs/applications/file-managers/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.10.1"; + version = "4.11.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-8dJjh+h8lsdydSqLJ72sfi2IFJ4X8dfRot5/aAEQ5Vk="; + sha256 = "sha256-lpR9eHiKOkQ6/rHTJLFUDrMHdSx4rZgppc36CyZlSXg="; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index d59b936608c84..c861c695598e4 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fox gettext xlibsWrapper gcc intltool file libpng ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ fox gettext xlibsWrapper gcc file libpng ]; preConfigure = '' sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index a702eb54c1354..db7278c23bd3b 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -20,7 +20,6 @@ , Cocoa , unixODBC , poppler -, hdf4 , hdf5 , netcdf , sqlite diff --git a/pkgs/applications/gis/spatialite-gui/default.nix b/pkgs/applications/gis/spatialite-gui/default.nix index 541d0da8d734e..76014887d2b8a 100644 --- a/pkgs/applications/gis/spatialite-gui/default.nix +++ b/pkgs/applications/gis/spatialite-gui/default.nix @@ -20,7 +20,7 @@ , sqlite , virtualpg , wxGTK -, wxmac +, xz , zstd , Carbon , Cocoa @@ -56,9 +56,10 @@ stdenv.mkDerivation rec { proj sqlite virtualpg + wxGTK + xz zstd - ] ++ lib.optional stdenv.isLinux wxGTK - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ]; + ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/artem/default.nix b/pkgs/applications/graphics/artem/default.nix new file mode 100644 index 0000000000000..5747c88b24bbf --- /dev/null +++ b/pkgs/applications/graphics/artem/default.nix @@ -0,0 +1,50 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, pkg-config +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "artem"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "finefindus"; + repo = pname; + rev = "v${version}"; + sha256 = "1jax39gizlcbqnkjckxwm5h0wdk5dk8dasaj9wxv7yidbcbgj4zh"; + }; + + cargoSha256 = "sha256-n2NOWrgcMVHpNCHL7r8+Kl1e01XYadaNM7UdE8fQo1U="; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + + buildInputs = [ openssl ]; + + OPENSSL_NO_VENDOR = 1; + + checkFlags = [ + # require internet access + "--skip=arguments::input::url_input" + "--skip=full_file_compare_url" + + # flaky + "--skip=full_file_compare_html" + ]; + + postInstall = '' + installManPage $releaseDir/build/artem-*/out/artem.1 + installShellCompletion $releaseDir/build/artem-*/out/artem.{bash,fish} \ + --zsh $releaseDir/build/artem-*/out/_artem + ''; + + meta = with lib; { + description = "A small CLI program to convert images to ASCII art"; + homepage = "https://github.com/finefindus/artem"; + changelog = "https://github.com/finefindus/artem/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/graphics/ciano/default.nix b/pkgs/applications/graphics/ciano/default.nix index dcaabed6b19c7..7b96dc1f793d5 100644 --- a/pkgs/applications/graphics/ciano/default.nix +++ b/pkgs/applications/graphics/ciano/default.nix @@ -3,14 +3,9 @@ , fetchFromGitHub , desktop-file-utils , ffmpeg -, gobject-introspection , granite , gtk , imagemagick -, libgee -, libhandy -, libsecret -, libsoup , meson , ninja , pkg-config diff --git a/pkgs/applications/graphics/cyan/default.nix b/pkgs/applications/graphics/cyan/default.nix new file mode 100644 index 0000000000000..2e59c6716b71b --- /dev/null +++ b/pkgs/applications/graphics/cyan/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, qt5 +, cmake +, pkg-config +, imagemagick +, nix-update-script +}: + +stdenv.mkDerivation rec { + pname = "cyan"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "rodlie"; + repo = pname; + rev = version; + hash = "sha256-R5sj8AN7UT9OIeUPNrdTIUQvtEitXp1A32l/Z2qRS94="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt5.wrapQtAppsHook + ]; + + buildInputs = [ imagemagick ]; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "Image viewer and converter, designed for prepress (print) work"; + homepage = "https://github.com/rodlie/cyan"; + mainProgram = "Cyan"; + license = licenses.cecill21; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index fda56c0d8cb7a..c82f4f4d5f80f 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -4,11 +4,7 @@ , stdenv , python3 , libGL -, libX11 -, libXcursor -, libXi -, libXrandr -, libxcb +, xorg , libxkbcommon , AppKit , IOKit @@ -31,11 +27,11 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ libGL - libX11 - libXcursor - libXi - libXrandr - libxcb + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libxcb libxkbcommon ] ++ lib.optionals stdenv.isDarwin [ AppKit diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 17537083aaed7..0cc93bbbe8ab7 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -2,7 +2,6 @@ , stdenv , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , ninja , GitPython diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 774e377ca031c..ef731caf1a20e 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , at-spi2-core , babl @@ -7,22 +8,19 @@ , dleyna-renderer , gdk-pixbuf , gegl -, geocode-glib +, geocode-glib_2 , gettext , gexiv2 -, gfbgraph , glib , gnome-online-accounts , gnome , gobject-introspection -, grilo -, grilo-plugins , gsettings-desktop-schemas , gtk3 , itstool , libdazzle +, libportal-gtk3 , libhandy -, libgdata , libxml2 , meson , ninja @@ -36,13 +34,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "42.0"; + version = "43.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JcsoFCUZnex7BF8T8y+PlgNMsMuLlNlvnf+vT1vmhVE="; + sha256 = "x6x0WNUz8p2VUBHHS3YiTXnqMbzBLp1tDOe2w3BNCOE="; }; patches = [ @@ -73,18 +71,15 @@ stdenv.mkDerivation rec { dleyna-renderer gdk-pixbuf gegl - geocode-glib + geocode-glib_2 gexiv2 - gfbgraph glib gnome-online-accounts - grilo - grilo-plugins gsettings-desktop-schemas gtk3 libdazzle + libportal-gtk3 libhandy - libgdata tracker tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index ae1e64297bd57..06c3b03ae5330 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ intltool gtk2 ]; + buildInputs = [ gtk2 ]; meta = with lib; { description = "A simple and fast image viewer for X"; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 4b421b41d9a3d..32f6ac97fa370 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "500"; + version = "502"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gsOto37++++ucpDC0ri3HhROp7v6qlHENjFvsbuyM6k="; + sha256 = "sha256-f3VnPmrRdo4PLQvS5pUafOh6ppq4hiwolz/FVVBNgxI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index bc608c6735ffc..9c854d9ffbf38 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, fetchpatch , vala , pkg-config , python3 diff --git a/pkgs/applications/graphics/image-roll/default.nix b/pkgs/applications/graphics/image-roll/default.nix index 49cf0ff1b6057..461a07837d83b 100644 --- a/pkgs/applications/graphics/image-roll/default.nix +++ b/pkgs/applications/graphics/image-roll/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , glib , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , gtk4 }: @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk="; - nativeBuildInputs = [ glib pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ glib pkg-config wrapGAppsHook4 ]; buildInputs = [ gtk4 ]; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { "--skip=file_list::tests" # sometimes fails on darwin - "image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none" + "--skip=image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none" ]; postInstall = '' diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index af1bc78ac32da..5988627d401c9 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -4,12 +4,9 @@ , wrapQtAppsHook , qtmultimedia , qttools -, qtscript , qtdeclarative , qtnetworkauth , qtbase -, autogen -, automake , makeWrapper , catch2 , nodejs diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 21ba5d513751b..a9b0001847181 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -6,11 +6,9 @@ , openjpeg, opencolorio_1, xsimd, poppler, curl, ilmbase, libmypaint, libwebp , qtmultimedia, qtx11extras, quazip , python3Packages - , version , kde-channel , sha256 - , callPackage }: diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index fb47a304f2240..86aed684db01a 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, patchelf, fetchurl, p7zip +{ lib, stdenv, fetchurl, p7zip , nss, nspr, libusb1 , qtbase, qtmultimedia, qtserialport , autoPatchelfHook, wrapQtAppsHook diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index 5615044b90e7b..1f25332e85269 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -6,8 +6,7 @@ , stdenv , withSixel ? false , libsixel -, libX11 -, libXrandr +, xorg , AppKit , withSki ? true }: @@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optional withSixel libsixel - ++ lib.optionals stdenv.isLinux [ libX11 libXrandr ] + ++ lib.optionals stdenv.isLinux (with xorg; [ libX11 libXrandr ]) ++ lib.optional stdenv.isDarwin AppKit; buildNoDefaultFeatures = !withSki; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 1087bba9705e8..b1c4f2258f0b0 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, fetchurl +{ lib, fetchFromGitLab, fetchurl , boost, cmake, ffmpeg, qtbase, qtx11extras , qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper , mkDerivation, ninja, mpi, python3, tbb, libGLU, libGL diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index 587a078e0660a..962f6dc97acd0 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}: +{lib, stdenv, fetchFromGitHub, flex, bison, cmake, zlib}: stdenv.mkDerivation { version = "2018-08-15"; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 52e38b23c1ff2..767b749ef736c 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,7 +1,6 @@ { mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects -, extra-cmake-modules, poppler, kimageformats, libarchive, libdevil -}: +, extra-cmake-modules, poppler, kimageformats, libarchive}: mkDerivation rec { pname = "photoqt"; diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/applications/graphics/pikopixel/default.nix index 97a3684682d44..58a52aee4943c 100644 --- a/pkgs/applications/graphics/pikopixel/default.nix +++ b/pkgs/applications/graphics/pikopixel/default.nix @@ -1,7 +1,6 @@ { lib , fetchurl , gnustep -, gcc , llvmPackages_9 }: diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index d6e0724383764..2877d81d4110f 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.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = version; - sha256 = "sha256-9Nlrei3TxZr3tv0BtlfsKAvDJhQHgd21FzLnzitYF3U="; + sha256 = "sha256-HOZ1BQIXrjVi2Y+2czt64pb++KGyN+6yDZ5Inu8NhJY="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtsvg - exiv2.lib + exiv2 ]; meta = with lib; { diff --git a/pkgs/applications/graphics/pinta/deps.nix b/pkgs/applications/graphics/pinta/deps.nix index 57c2c152edf84..66f7e61267247 100644 --- a/pkgs/applications/graphics/pinta/deps.nix +++ b/pkgs/applications/graphics/pinta/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.34"; sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"; }) (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.34"; sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"; }) diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index deed3d3b88829..8e4c4805750bd 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -1,7 +1,6 @@ { mkDerivation , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index a4eb306823974..251dfdef32f43 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -6,11 +6,11 @@ , libexif , libgphoto2 , libwebp -, libsoup +, libsoup_3 , libxml2 , vala , sqlite -, webkitgtk +, webkitgtk_4_1 , pkg-config , gnome , gst_all_1 @@ -30,7 +30,6 @@ , wrapGAppsHook , gobject-introspection , itstool -, libgdata , libchamplain , libsecret , gsettings-desktop-schemas @@ -41,11 +40,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.30.16"; + version = "0.31.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-yYgs+9rTA8uBYbFJrLtMYX++fKn2q24i0XTiRH51GPo="; + sha256 = "sha256-OwSPxs6ZsjLR4OqbjbB0CDyGyI07bWMTaiz4IXqkXBk="; }; nativeBuildInputs = [ @@ -66,10 +65,10 @@ stdenv.mkDerivation rec { libexif libgphoto2 libwebp - libsoup + libsoup_3 libxml2 sqlite - webkitgtk + webkitgtk_4_1 gst_all_1.gstreamer gst_all_1.gst-libav gst_all_1.gst-plugins-base @@ -87,7 +86,6 @@ stdenv.mkDerivation rec { librest gcr gnome.adwaita-icon-theme - libgdata libchamplain libsecret ]; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index a77a0313223bf..c87a71fdf6c7c 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -114,7 +114,6 @@ stdenv.mkDerivation { gtk3 gtkmm3 imagemagick - intltool libjack2 libsigcxx libxmlxx diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index fb44d36f62a6d..d54d4e06f0d46 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.20"; + version = "0.0.21"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-WsG6mjO90QQNsAarxdupZvXubdy06JjQmVYUzygl8l4="; + sha256 = "sha256-T9YBU/YhhOASdKnzLcwQGBLc4HcQspiOV9VRgotfq3c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/veusz/default.nix b/pkgs/applications/graphics/veusz/default.nix index d8f1ae76a887d..cb57f87fc6622 100644 --- a/pkgs/applications/graphics/veusz/default.nix +++ b/pkgs/applications/graphics/veusz/default.nix @@ -1,6 +1,5 @@ { python3Packages , qtbase -, ghostscript , wrapQtAppsHook , lib }: diff --git a/pkgs/applications/graphics/vimiv-qt/default.nix b/pkgs/applications/graphics/vimiv-qt/default.nix index 8e0caff1d1759..1b0b2a1516f0b 100644 --- a/pkgs/applications/graphics/vimiv-qt/default.nix +++ b/pkgs/applications/graphics/vimiv-qt/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , python3 , qt5 diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 15c2d468fb4f0..2ba96fda3f0b9 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + nativeBuildInputs = [ intltool ]; buildInputs = [ aalib gsl libpng libX11 xorgproto libXext - libXt zlib gettext intltool perl + libXt zlib gettext perl ]; preConfigure = '' diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index 990e279c59012..44733d8bead75 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "yacreader"; - version = "9.9.1"; + version = "9.9.2"; src = fetchFromGitHub { owner = "YACReader"; repo = pname; rev = version; - sha256 = "sha256-D+ZmFMg9ZixZNUAMjPHwz7gcwKjG49lm5hTEqftbIrY="; + sha256 = "sha256-rurJkCIuHTWxIGb+TTHp8sQS26/5W/sdtWFxyeqVx54="; }; nativeBuildInputs = [ qmake pkg-config ]; @@ -22,5 +22,6 @@ mkDerivation rec { description = "A comic reader for cross-platform reading and managing your digital comic collection"; homepage = "http://www.yacreader.com"; license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ srapenne ]; }; } diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index e656d36a1c9b4..94c948c1c4ea7 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, substituteAll, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools, diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 508f7e79f55e5..b708cb1bd5905 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -1,5 +1,4 @@ -{ mkDerivation, lib, config -, extra-cmake-modules, kdoctools +{ mkDerivation, lib, extra-cmake-modules, kdoctools , breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n , kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons , libarchive, libzip diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix index c7ef5c4615cee..24f93ee0af753 100644 --- a/pkgs/applications/kde/calendarsupport.nix +++ b/pkgs/applications/kde/calendarsupport.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, fetchpatch, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kholidays, kidentitymanagement, kmime, pimcommon, qttools, diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix index 63639800d5f6a..51203271b1ff4 100644 --- a/pkgs/applications/kde/elisa.nix +++ b/pkgs/applications/kde/elisa.nix @@ -1,5 +1,4 @@ { mkDerivation -, fetchFromGitHub , lib , extra-cmake-modules , kdoctools diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix index 6080ad5db34bf..1a800525255cd 100644 --- a/pkgs/applications/kde/kaddressbook.nix +++ b/pkgs/applications/kde/kaddressbook.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, fetchpatch, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion, kcrash, kdbusaddons, ki18n, kontactinterface, kparts, diff --git a/pkgs/applications/kde/kalzium.nix b/pkgs/applications/kde/kalzium.nix index 02ab1bd52c205..045c9a3c8d6e3 100644 --- a/pkgs/applications/kde/kalzium.nix +++ b/pkgs/applications/kde/kalzium.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, avogadro, qtscript, kparts, kplotting, kunitconversion }: +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, qtscript, kparts, kplotting, kunitconversion }: mkDerivation { pname = "kalzium"; diff --git a/pkgs/applications/kde/kapptemplate.nix b/pkgs/applications/kde/kapptemplate.nix index 7251648be09d5..447b2d009b604 100644 --- a/pkgs/applications/kde/kapptemplate.nix +++ b/pkgs/applications/kde/kapptemplate.nix @@ -1,6 +1,5 @@ { lib , mkDerivation -, fetchurl , cmake , extra-cmake-modules , qtbase diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix index 60aad7d2a9551..157ca73ecfc13 100644 --- a/pkgs/applications/kde/kdeconnect-kde.nix +++ b/pkgs/applications/kde/kdeconnect-kde.nix @@ -1,6 +1,5 @@ { mkDerivation , extra-cmake-modules -, fetchpatch , kcmutils , kconfigwidgets , kdbusaddons diff --git a/pkgs/applications/kde/kolf.nix b/pkgs/applications/kde/kolf.nix index 5bcb9fb110000..c9a5a61e2812f 100644 --- a/pkgs/applications/kde/kolf.nix +++ b/pkgs/applications/kde/kolf.nix @@ -2,7 +2,7 @@ , mkDerivation , extra-cmake-modules , kdoctools -, libkdegames, kconfig, kio, ktextwidgets +, libkdegames, kio, ktextwidgets }: mkDerivation { diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix index eace8660c2eb0..097661d580216 100644 --- a/pkgs/applications/kde/kompare.nix +++ b/pkgs/applications/kde/kompare.nix @@ -2,7 +2,6 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2, - fetchpatch }: mkDerivation { diff --git a/pkgs/applications/kde/libkmahjongg.nix b/pkgs/applications/kde/libkmahjongg.nix index b14e50f32bcc7..6fe8c55004c2d 100644 --- a/pkgs/applications/kde/libkmahjongg.nix +++ b/pkgs/applications/kde/libkmahjongg.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kwidgetsaddons diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index 2003eb5264e28..a1959b473dd0d 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,8 +1,8 @@ { buildGoModule, fetchFromGitHub, installShellFiles, lib }: let - humioCtlVersion = "0.30.1"; - sha256 = "sha256-w+mZi3KdBnBRII/Mi+1SN/u4dhz2vfqn3nzU6AKk4yM="; + humioCtlVersion = "0.30.2"; + sha256 = "sha256-FqBS6PoEKMqK590f58re4ycYmrJScyij74Ngj+PLzLs="; vendorSha256 = "sha256-70QxW2nn6PS6HZWllmQ8O39fbUcbe4c/nKAygLnD4n0="; in buildGoModule { name = "humioctl-${humioCtlVersion}"; diff --git a/pkgs/applications/misc/1password-gui/darwin.nix b/pkgs/applications/misc/1password-gui/darwin.nix new file mode 100644 index 0000000000000..04bc102311621 --- /dev/null +++ b/pkgs/applications/misc/1password-gui/darwin.nix @@ -0,0 +1,21 @@ +{ stdenv +, pname +, version +, src +, meta +, unzip +, undmg +}: + +stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ unzip undmg ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; +} diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 46480a0325987..7f8cc200a968f 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -1,144 +1,58 @@ -{ lib -, stdenv +{ stdenv +, callPackage +, channel ? "stable" , fetchurl -, makeWrapper -, wrapGAppsHook -, alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, cairo -, cups -, dbus -, expat -, gdk-pixbuf -, glib -, gtk3 -, libX11 -, libXcomposite -, libXdamage -, libXext -, libXfixes -, libXrandr -, libdrm -, libxcb -, libxkbcommon -, libxshmfence -, libGL -, libappindicator-gtk3 -, mesa -, nspr -, nss -, pango -, systemd -, udev -, xdg-utils +, lib +# This is only relevant for Linux, so we need to pass it through +, polkitPolicyOwners ? [ ] }: - # The 1Password polkit file requires a list of users for whom polkit - # integrations should be enabled. This should be a list of strings that - # correspond to usernames. -, polkitPolicyOwners ? [] -}: let - # Convert the polkitPolicyOwners variable to a polkit-compatible string for the polkit file. - policyOwners = lib.concatStringsSep " " (map (user: "unix-user:${user}") polkitPolicyOwners); -in stdenv.mkDerivation rec { pname = "1password"; - version = "8.9.4"; + version = if channel == "stable" then "8.9.4" else "8.9.6-30.BETA"; - src = - if stdenv.hostPlatform.isAarch64 then - fetchurl { - url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "0y456ssfsx4cy6pcnihiwi64y90s91399qhgs4abn4pp9wr0h08g"; - } - else - fetchurl { + sources = { + stable = { + x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; sha256 = "sha256-Smq0gOGfBTjIOMwF1AI+TJwXaIiTi/YP9mGIqcjsCNQ="; }; + aarch64-linux = { + url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; + sha256 = "sha256-SJDUfAFEwYnOR+y/6Dg2S/CkA84QogoRpMXOPP5PyrM="; + }; + x86_64-darwin = { + url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; + sha256 = "sha256-+2FQQ5FiB0N30JM/Mtnfa04K2XZaf3r/W1+i8VKNslA="; + }; + aarch64-darwin = { + url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; + sha256 = "sha256-nhocEwtr6cMSSStPa7S+g8SwPStJVWPblA3HbqJ8q6Q="; + }; + }; + beta = { + x86_64-linux = { + url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; + sha256 = "sha256-xBfpBkYff1X26Iu0Ee03lIiR6UdJOiaG+kZMVotG0Hc="; + }; + aarch64-linux = { + url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; + sha256 = "0j0v90i78y1m77gpn65iyjdy1xslv1mar1ihxj9jzcmva0nmdmra"; + }; + x86_64-darwin = { + url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; + sha256 = "sha256-PNlEBFoIGYkDR4TzbudsqAE5vjbiVHTNL7XoflN+mUY="; + }; + aarch64-darwin = { + url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; + sha256 = "sha256-PYS0N4VeUjNhCncSDXvpyLuHlpv4nn35aJTPANdMXwk="; + }; + }; + }; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; - buildInputs = [ glib ]; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - dontWrapGApps = true; - - installPhase = - let rpath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXrandr - libdrm - libxcb - libxkbcommon - libxshmfence - libGL - libappindicator-gtk3 - mesa - nspr - nss - pango - systemd - ] + ":${stdenv.cc.cc.lib}/lib64"; - in '' - runHook preInstall - - mkdir -p $out/bin $out/share/1password - cp -a * $out/share/1password - - # Desktop file - install -Dt $out/share/applications resources/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}' - - '' + (lib.optionalString (polkitPolicyOwners != [ ]) - '' - # Polkit file - mkdir -p $out/share/polkit-1/actions - substitute com.1password.1Password.policy.tpl $out/share/polkit-1/actions/com.1password.1Password.policy --replace "\''${POLICY_OWNERS}" "${policyOwners}" - '') + '' - - # Icons - cp -a resources/icons $out/share - - interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} - patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} - for file in $(find $out -type f -name \*.so\* ); do - patchelf --set-rpath ${rpath}:$out/share/1password $file - done - - runHook postInstall - ''; - - preFixup = '' - # Electron is trying to open udev via dlopen() - # and for some reason that doesn't seem to be impacted from the rpath. - # Adding udev to LD_LIBRARY_PATH fixes that. - # Make xdg-open overrideable at runtime. - makeWrapper $out/share/1password/1password $out/bin/1password \ - ''${gappsWrapperArgs[@]} \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} - ''; + src = fetchurl { + inherit (sources.${channel}.${stdenv.system}) url sha256; + }; meta = with lib; { description = "Multi-platform password manager"; @@ -146,6 +60,9 @@ in stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = builtins.attrNames sources.${channel}; }; -} + +in if stdenv.isDarwin +then callPackage ./darwin.nix { inherit pname version src meta; } +else callPackage ./linux.nix { inherit pname version src meta polkitPolicyOwners; } diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/linux.nix index d90b3e46f50cb..06a10dd973d3d 100644 --- a/pkgs/applications/misc/1password-gui/beta.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -1,6 +1,9 @@ { lib , stdenv -, fetchurl +, pname +, version +, src +, meta , makeWrapper , wrapGAppsHook , alsa-lib @@ -43,21 +46,8 @@ let # Convert the polkitPolicyOwners variable to a polkit-compatible string for the polkit file. policyOwners = lib.concatStringsSep " " (map (user: "unix-user:${user}") polkitPolicyOwners); -in stdenv.mkDerivation rec { - pname = "1password"; - version = "8.9.6-30.BETA"; - - src = - if stdenv.hostPlatform.isAarch64 then - fetchurl { - url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "0j0v90i78y1m77gpn65iyjdy1xslv1mar1ihxj9jzcmva0nmdmra"; - } - else - fetchurl { - url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-xBfpBkYff1X26Iu0Ee03lIiR6UdJOiaG+kZMVotG0Hc="; - }; +in stdenv.mkDerivation { + inherit pname version src meta; nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; buildInputs = [ glib ]; @@ -120,8 +110,8 @@ in stdenv.mkDerivation rec { cp -a resources/icons $out/share interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} - patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} + patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} + patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} for file in $(find $out -type f -name \*.so\* ); do patchelf --set-rpath ${rpath}:$out/share/1password $file done @@ -139,14 +129,4 @@ in stdenv.mkDerivation rec { --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} ''; - - - meta = with lib; { - description = "Multi-platform password manager"; - homepage = "https://1password.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - }; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index a6fb04a9e7d7e..12445d958c806 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "AngleSharp"; version = "0.17.1"; sha256 = "038idg33ydy72362qplsd7y8ldifi9zg02dhjli6wy4p47hyqcph"; }) (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.1"; sha256 = "0sdxqjwvyf0l1cp4n4i84g7rly8z7ramq0y7vsgqvf6hzx7dnk5i"; }) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 1239d22f1f3e5..84499448a41b7 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "albert"; - version = "0.17.3"; + version = "0.17.6"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "sha256-UIG6yLkIcdf5IszhNPwkBcSfZe4/CyI5shK/QPOmpPE="; + sha256 = "sha256-nbnywrsKvFG8AkayjnylOKSnn7rRWgNv5zE9DDeOmLw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 5e4f448235485..3b27f5b96e30f 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -5,15 +5,15 @@ , atk , cairo , desktop-file-utils -, evolution-data-server +, evolution-data-server-gtk4 , evolution -, gcr +, gcr_4 , gettext , glib , gnome , gpgme , gtk3 -, gtksourceview3 +, gtksourceview4 , gtkspell3 , libcryptui , libxml2 @@ -42,6 +42,20 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/8c42a67695621d1e30cec933a04e633e6030bbaf.patch"; sha256 = "qyqFgYSu4emFDG/Mjwz1bZb3v3/4gwQSKmGCoPPNYCQ="; }) + + # Port to Gcr 4 + # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/14 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/cd44b476f4ffbf37c5d5f5b996ecd711db925576.patch"; + sha256 = "wJ1035NxgeTwUa0LoNcB6TSLxffoXBR3WbGAGkfggYY="; + }) + + # Port to GtkSourceView 4 + # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/15 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/0ba7f05cba7feaf2ae2c220596aead5dfc676675.patch"; + sha256 = "5uvHTPzQloEq8SVt3EnZ+8mziBdXsDmu/e92/RtyFzE="; + }) ]; nativeBuildInputs = [ @@ -58,13 +72,13 @@ stdenv.mkDerivation rec { buildInputs = [ atk cairo - evolution-data-server - gcr + evolution-data-server-gtk4 + gcr_4 glib evolution gpgme gtk3 - gtksourceview3 + gtksourceview4 gtkspell3 libcryptui sqlite diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 7b327cd7f0960..98ea0802f2e45 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.28.0"; + version = "0.29.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-tYeVz10saTJBf6DDGIVSd4IkSREDJFi/am/kg/An02E="; + sha256 = "sha256-xoHYQbV8fPsHs/G1iuTaQ197dpUZkMohmYM924y8NT0="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index d41685821cd7c..cdf6ca3e6f803 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , appstream-glib , clang , desktop-file-utils diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 7b98b429c82ea..37898709493e8 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-uDfC/PqT1Bb8np0l2DDIZUoNP9QpjxZH5v1hK2k1Miw="; + sha256 = "sha256-3T0vpyAw21u2+csqaz3Yf10G8IQRDyjReedIo+I4fvw="; }; buildInputs = [ libnotify glib ]; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index f0e0b877d9d79..5b78e99932019 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.10"; + version = "0.6.13"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-pv/GxTGmpGc8RHjKO8F03jybS0uO+SS3z4KCZfHYV0Q="; + sha256 = "sha256-YGaAJOyVZBHEWQuZVfPIIbtuntv1klQk9GcWRN+oVF4="; }; nativeBuildInputs = [ pkg-config pcre ]; diff --git a/pkgs/applications/misc/bfcal/default.nix b/pkgs/applications/misc/bfcal/default.nix new file mode 100644 index 0000000000000..695f5bc69b0ca --- /dev/null +++ b/pkgs/applications/misc/bfcal/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, fetchFromSourcehut +, meson +, ninja +, pkg-config +, wrapQtAppsHook +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "bfcal"; + version = "1.0.1"; + + src = fetchFromSourcehut { + owner = "~bitfehler"; + repo = "bfcal"; + rev = "v${version}"; + sha256 = "sha256-5xyBU+0XUNFUGgvw7U8YE64zncw6SvPmbJhc1LY2u/g="; + }; + + nativeBuildInputs = [ + meson ninja pkg-config wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + ]; + + meta = with lib; { + description = "Quickly display a calendar"; + homepage = "https://git.sr.ht/~bitfehler/bfcal"; + license = licenses.gpl3Plus; + platforms = qtbase.meta.platforms; + maintainers = with maintainers; [ laalsaas ]; + }; +} diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 1d26881868e51..ada160015bfa2 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,37 +1,40 @@ { lib -, mkDerivation +, stdenv , fetchurl +, cmake , fetchpatch -, poppler_utils -, pkg-config -, libpng +, fontconfig +, hunspell +, hyphen +, icu , imagemagick , libjpeg -, fontconfig +, libmtp +, libpng +, libstemmer +, libuchardet +, libusb1 +, pkg-config , podofo -, qtbase +, poppler_utils +, python3Packages , qmake -, icu +, qtbase +, qtwayland +, removeReferencesTo , sqlite -, hunspell -, hyphen -, unrarSupport ? false -, python3Packages -, libusb1 -, libmtp +, wrapQtAppsHook , xdg-utils -, removeReferencesTo -, libstemmer -, wrapGAppsHook +, unrarSupport ? false }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "calibre"; - version = "5.44.0"; + version = "6.7.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-b/qj6v02okNV5ZV/D4ONttttNFbPoXy00Tn9lOuviOw="; + hash = "sha256-R1poU9qhqf1DYZJ9tkupJrPR99pn5nTpkS6vkMzrwCg="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 @@ -40,18 +43,18 @@ mkDerivation rec { (fetchpatch { name = "0001-only-plugin-update.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; - sha256 = "sha256-dLzO1TWP7Q4nw2a3oN7qlhGCmcA0NKJrZidUnD6hUMA="; + hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ="; }) (fetchpatch { name = "0006-Hardening-Qt-code.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0006-Hardening-Qt-code.patch"; - sha256 = "sha256-/X6iZZFxv4793h2yYI3UAz0mLNEmKpdVrmOnABFT0tE="; + hash = "sha256-CutVTb7K4tjewq1xAjHEGUHFcuuP/Z4FFtj4xQb4zKQ="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; prePatch = '' - sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings\"]@g" \ + 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 @@ -61,8 +64,15 @@ mkDerivation rec { ''; dontUseQmakeConfigure = true; + dontUseCmakeConfigure = true; - nativeBuildInputs = [ pkg-config qmake removeReferencesTo wrapGAppsHook ]; + nativeBuildInputs = [ + cmake + pkg-config + qmake + removeReferencesTo + wrapQtAppsHook + ]; buildInputs = [ fontconfig @@ -74,10 +84,12 @@ mkDerivation rec { libmtp libpng libstemmer + libuchardet libusb1 podofo poppler_utils qtbase + qtwayland sqlite xdg-utils ] ++ ( @@ -102,7 +114,7 @@ mkDerivation rec { pillow pychm pyqt-builder - pyqt5 + pyqt6 python regex sip @@ -112,11 +124,11 @@ mkDerivation rec { pycryptodome # the following are distributed with calibre, but we use upstream instead odfpy - ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqtwebengine.meta.platforms) [ + ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ # much of calibre's functionality is usable without a web # browser, so we enable building on platforms which qtwebengine # does not support by simply omitting qtwebengine. - pyqtwebengine + pyqt6-webengine ] ++ lib.optional (unrarSupport) unrardll ); @@ -166,8 +178,7 @@ mkDerivation rec { $out/lib/calibre/calibre/plugins/podofo.so for program in $out/bin/*; do - wrapProgram $program \ - ''${qtWrapperArgs[@]} \ + wrapQtApp $program \ --prefix PYTHONPATH : $PYTHONPATH \ --prefix PATH : ${poppler_utils.out}/bin done diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index 494ed3001e5c1..e65bcd2ff2e2d 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, xlibsWrapper, motif +{ stdenv, lib, fetchFromGitHub, motif, xorg , withAudioTracking ? false, libpulseaudio, aubio }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ stdenv.mkDerivation { makeFlags = [ "DESTINATION=$(out)/bin/" ] ++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1"; - buildInputs = [ xlibsWrapper motif ] + buildInputs = [ motif xorg.libX11 xorg.libXext xorg.libXt ] ++ lib.optionals withAudioTracking [ libpulseaudio aubio ]; meta = with lib; { diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index 749dc4b8e863d..8206698ce2ecd 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -2,7 +2,7 @@ let pname = "chrysalis"; - version = "0.11.5"; + version = "0.11.8"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}-binary"; @@ -10,7 +10,7 @@ in appimageTools.wrapAppImage rec { inherit name; src = fetchurl { url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; - sha256 = "sha256-3GdObGW91nDqOAlHcaI/4wnbl2EG2RGGzpwY+XYQ0u4="; + sha256 = "sha256-yyb6sRCPjHCK0tkuHTffw2NkZHcqw9tIdHbbBiKLGu8="; }; }; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index a6efda32d8381..19a2e7aae2a02 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -8,7 +8,6 @@ , libXfixes , libXtst , qtx11extras -, git , knotifications , qtwayland , wayland diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 2243a8d093757..5832cf9432aee 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 = "2.4.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-vneX3Wo1DUK1WIwBP3nMUDV26EN2A7XIqMcTZQ4UI4A="; + sha256 = "sha256-Ge1dO2I4avblN+3BXY9AXFFmgX4lIwZYUf4IohH1vqc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index 76a5808963f97..95d3a2aa93336 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav, jq }: +{ lib, stdenv, fetchFromGitHub, python3Packages, libspnav, jq }: let diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 32440ad7df197..ceb1b9833c928 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -23,16 +23,16 @@ inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) }) rec { pname = "dbeaver"; - version = "22.2.0"; # When updating also update mvnSha256 + version = "22.2.2"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-T2S5qoOqjqJGf7M4h+IFO+bBER3aNcbxC7CY1fJFqpg="; + sha256 = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI="; }; - mvnSha256 = "HdIhENml6W4U+gM7ODxXinbex5o1X4YhWGTct5rpL5c="; + mvnSha256 = "uu7UNRIuAx2GOh4+YxxoGRcV5QO8C72q32e0ynJdgFo="; mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix index 5d77f301c8217..4625a6dda99dd 100644 --- a/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/pkgs/applications/misc/deadd-notification-center/default.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "deadd-notification-center"; - version = "2021-03-10"; + version = "2022-04-20"; src = fetchFromGitHub { owner = "phuhl"; repo = "linux_notification_center"; - rev = "640ce0f"; - sha256 = "12ldr8vppylr90849g3mpjphmnr4lp0vsdkj01a5f4bv4ksx35fm"; + rev = "d31867472c35a09562c832b0a589479930c52b86"; + sha256 = "sha256-Arl4niscJPYCFWd4mw42IgNs+JsHsVpaTx86zEj3KFM="; }; patches = [ diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index b9d8b0f9797db..581a8126cadad 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "devilspie2"; - version = "0.43"; + version = "0.44"; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz"; - sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc"; + url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2-${version}.tar.xz"; + sha256 = "Cp8erdKyKjGBY+QYAGXUlSIboaQ60gIepoZs0RgEJkA="; }; nativeBuildInputs = [ intltool pkg-config ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { positioned at a specific screen position, or position a window on a specific workspace. ''; - homepage = "https://www.gusnan.se/devilspie2/"; + homepage = "https://www.nongnu.org/devilspie2/"; license = licenses.gpl3; maintainers = [ maintainers.ebzzry ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 186826e6f7d45..918605366fe7d 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -1,12 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK, Cocoa }: -let - wxInputs = - if stdenv.isDarwin then - [ wxmac darwin.apple_sdk.frameworks.Cocoa ] - else - [ wxGTK ]; -in stdenv.mkDerivation rec { pname = "diff-pdf"; version = "0.5"; @@ -19,7 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoconf automake pkg-config ]; - buildInputs = [ cairo poppler ] ++ wxInputs; + buildInputs = [ cairo poppler wxGTK ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; preConfigure = "./bootstrap"; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index a6545db64cad0..452c1edc99f81 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, qtbase, fetchpatch, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook , secp256k1 }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 46ea57c6193d3..9421cce1d8f75 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -89,7 +89,13 @@ python3.pkgs.buildPythonApplication { qdarkstyle ]; - preBuild = '' + postPatch = '' + # make compatible with protobuf4 by easing dependencies ... + substituteInPlace ./contrib/requirements/requirements.txt \ + --replace "protobuf>=3.12,<4" "protobuf>=3.12" + # ... and regenerating the paymentrequest_pb2.py file + protoc --python_out=. electrum/paymentrequest.proto + substituteInPlace ./electrum/ecc_fast.py \ --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + (if enableQt then '' diff --git a/pkgs/applications/misc/endeavour/default.nix b/pkgs/applications/misc/endeavour/default.nix new file mode 100644 index 0000000000000..3c48efe66c474 --- /dev/null +++ b/pkgs/applications/misc/endeavour/default.nix @@ -0,0 +1,104 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, gettext +, gnome +, glib +, gtk4 +, wayland +, libadwaita +, libpeas +, gnome-online-accounts +, gsettings-desktop-schemas +, libportal-gtk4 +, evolution-data-server-gtk4 +, libical +, librest +, json-glib +, itstool +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "endeavour"; + version = "42.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Endeavour"; + rev = "v${version}"; + sha256 = "U91WAoyIeQ0WbFbOCrbFJjbWe2eT7b/VL2M1hNXxyzQ="; + }; + + patches = [ + # fix build race bug https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257667 + (fetchpatch { + url = "https://cgit.freebsd.org/ports/plain/deskutils/gnome-todo/files/patch-src_meson.build?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655"; + sha256 = "sha256-dio4Mg+5OGrnjtRAf4LwowO0sG50HRmlNR16cbDvEUY="; + extraPrefix = ""; + name = "gnome-todo_meson-build.patch"; + }) + + # build: Fix building with -Werror=format-security + # https://gitlab.gnome.org/World/Endeavour/-/merge_requests/132 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Endeavour/-/commit/3bad03e90fcc28f6e3f87f2c90df5984dbeb0791.patch"; + sha256 = "sha256-HRkNfhn+EH0Fc+KBDdX1Q+T9QWSctTOn1cvecP2N0zo="; + }) + + # build: Use GNOME module post_install() + # https://gitlab.gnome.org/World/Endeavour/-/merge_requests/135 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Endeavour/-/commit/a8daa1d8acd0a5da7aef54d6e16d8a585c71e555.patch"; + sha256 = "sha256-zUTQ36eUMOY9ODAgwSKUhSlB9Cj0Yu/60KjFFW5fx2I="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + wrapGAppsHook4 + itstool + ]; + + buildInputs = [ + glib + gtk4 + wayland # required by gtk header + libadwaita + libpeas + gnome-online-accounts + gsettings-desktop-schemas + gnome.adwaita-icon-theme + + # Plug-ins + libportal-gtk4 # background + evolution-data-server-gtk4 # eds + libical + librest # todoist + json-glib # todoist + ]; + + passthru = { + updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; + }; + }; + + meta = with lib; { + description = "Personal task manager for GNOME"; + homepage = "https://gitlab.gnome.org/World/Endeavour"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 1c590451a9b86..5ab3694728ad1 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -62,7 +62,7 @@ in python.pkgs.buildPythonApplication rec { homepage = "https://www.etesync.com/"; description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks"; license = licenses.gpl3; - maintainers = with maintainers; [ valodim ]; + maintainers = with maintainers; [ thyol valodim ]; broken = stdenv.isDarwin; # pyobjc-framework-Cocoa is missing }; } diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 79420eacec827..f13d45059473e 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "exercism"; - version = "3.0.13"; + version = "3.1.0"; src = fetchFromGitHub { owner = "exercism"; repo = "cli"; rev = "v${version}"; - sha256 = "17gvz9a0sn4p36hf4l77bxhhfipf4x998iay31layqwbnzmb4xy7"; + sha256 = "sha256-9GdkQaxYvxMGI5aFwUtQnctjpZfjZaKP3CsMjC/ZBSo"; }; - vendorSha256 = "0b2m9xkac60k5rbxmb03cxf530m23av14pnsjk8067l998sm4vqi"; + vendorSha256 = "sha256-EW9SNUqJHgPQlNpeErYaooJRXGcDrNpXLhMYpmZPVSw"; doCheck = false; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index aafc332f6b9cb..2a23aac79f82c 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -2,7 +2,7 @@ , xdg-utils, zip, unzip, gzip, bzip2, gnutar, p7zip, xz , IOKit, Carbon, Cocoa, AudioToolbox, OpenGL , withTTYX ? true, libX11 -, withGUI ? true, wxGTK30, wxmac +, withGUI ? true, wxGTK32 , withUCD ? true, libuchardet # Plugins @@ -12,18 +12,15 @@ , withPython ? false, python3Packages }: -let - wxWidgets = (if stdenv.isDarwin then wxmac else wxGTK30); -in stdenv.mkDerivation rec { pname = "far2l"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = "v_${version}"; - sha256 = "sha256-nfoAElPLQ97lj65MBX4JMEdgTFbkdEbR1BazYZgV/lg="; + sha256 = "sha256-0t1ND6LmDcivfrZ8RaEr1vjeS5JtaeWkoHkl2e7Xr5s="; }; patches = [ ./python_prebuild.patch ]; @@ -31,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkg-config m4 makeWrapper ]; buildInputs = lib.optional withTTYX libX11 - ++ lib.optional withGUI wxWidgets + ++ lib.optional withGUI wxGTK32 ++ lib.optional withUCD libuchardet ++ lib.optionals withColorer [ spdlog xercesc ] ++ lib.optionals withMultiArc [ libarchive pcre ] @@ -73,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems"; homepage = "https://github.com/elfmz/far2l"; - license = licenses.gpl2Plus; # NOTE: might change in far2l repo soon, check next time + license = licenses.gpl2Only; maintainers = with maintainers; [ hypersw ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index 9f1b6f73a1a81..0d01122e6a5ff 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.14"; + version = "3.0.15"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - hash = "sha256-Jx+MLItr+rIGfzJdQku1pRXaIldfrpG3vfOhjebSIZA="; + hash = "sha256-QeUopHBW3KZGkYklOJIjlNCQG+aab2vwbIsVBfQ07R4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index c5d48ff454e4f..061fce572631a 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -1,32 +1,29 @@ -{ lib, rustPlatform, fetchFromGitHub, jq }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "genact"; - version = "1.1.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Mw6mPOxiWnYu2QgqL4VccwwJhdxZ7zLJyX/oJWfGUhw="; + sha256 = "sha256-MB/i1jCxoGE8cPF+NE8aS7kF7ZsGb4+OyLcPcGp1hwI="; }; - cargoSha256 = "sha256-ygQklcRjdffGl0s77MwKsyHVJWqWJZHq4SU38cSMVug="; + cargoSha256 = "sha256-OBGJIR3REeMxHQu3ovEKSZZ8QNlhl/5jvWbR5OdsRTQ="; - depsExtraArgs = { - nativeBuildInputs = [ jq ]; - postBuild = '' - pushd $name/humansize + nativeBuildInputs = [ installShellFiles ]; - [ -d feature-tests ] && rm -r feature-tests + postInstall = '' + $out/bin/genact --print-manpage > genact.1 + installManPage genact.1 - jq '.files |= with_entries(select(.key | startswith("feature-tests") | not))' \ - -c .cargo-checksum.json > .cargo-checksum.json.new - mv .cargo-checksum.json{.new,} - - popd - ''; - }; + installShellCompletion --cmd genact \ + --bash <($out/bin/genact --print-completions bash) \ + --fish <($out/bin/genact --print-completions fish) \ + --zsh <($out/bin/genact --print-completions zsh) + ''; meta = with lib; { description = "A nonsense activity generator"; diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 137682c397744..4fe60064cd59f 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, fetchpatch, pkg-config, exiv2, libxml2, gtk3 +{ fetchFromGitHub, lib, stdenv, pkg-config, exiv2, libxml2, gtk3 , libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 1619f7f433422..c196a107f0068 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpx-viewer"; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 2973ac81539c1..d7177906287ef 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gpxsee"; - version = "11.5"; + version = "11.6"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-bA5C+BFqeOS0oFgz/qlYOFMsuh3L/U6QJbzOcRQkNhY="; + hash = "sha256-kwEltkLcMCZlUJyE+nyy70WboVO1FgMw0cH1hxLVtKQ="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/applications/misc/grsync/default.nix index c8068d682237f..3a6a717b6e103 100644 --- a/pkgs/applications/misc/grsync/default.nix +++ b/pkgs/applications/misc/grsync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Synchronize folders, files and make backups"; homepage = "http://www.opbyte.it/grsync/"; - license = licenses.gpl1; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.kuznero ]; }; diff --git a/pkgs/applications/misc/gtkradiant/default.nix b/pkgs/applications/misc/gtkradiant/default.nix new file mode 100644 index 0000000000000..a8f5c91d1eb8e --- /dev/null +++ b/pkgs/applications/misc/gtkradiant/default.nix @@ -0,0 +1,163 @@ +{ lib, stdenv, fetchFromGitHub, fetchsvn +, scons, pkg-config, python3 +, glib, libxml2, gtk2, libGLU, gnome2 +, runCommand, writeScriptBin, runtimeShell +, makeDesktopItem, copyDesktopItems +}: + +let + q3Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk"; + rev = 144; + sha256 = "sha256-U1GtMv775JEOAJ1W2kSaRNPDCnW39W+KqVDTTG2yISY="; + }; + urtPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/UrTPack/trunk"; + rev = 144; + sha256 = "sha256-DQjENyQa1kEieU3ZWyMt2e4oEN0X2K3lxP79sBI91iI="; + }; + etPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/ETPack/trunk"; + rev = 144; + sha256 = "sha256-mqaWOYfF/F6ABh7nKA36YvsywZIdwJ9IitFi2Xp5rgk="; + }; + qlPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/QLPack/trunk"; + rev = 144; + sha256 = "sha256-lrn4nu3JI7j+t9jYd+UFE55GOCbc6+Sh2fZfVlEr1WM="; + }; + q2Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q2Pack/trunk"; + rev = 144; + sha256 = "sha256-ad8dRV+28Zz5yQsJU7hvteSIn9wWpehuqxMspw3yvvU="; + }; + quetooPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/QuetooPack/trunk"; + rev = 144; + sha256 = "sha256-SOblPJgdVEZrTYtvDlcF7paIm3UitSVFQ9+RahXkO64="; + }; + jaPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/JAPack/trunk"; + rev = 144; + sha256 = "sha256-P6lI+nNrPwoWJl5ThUHIA3Iw1nWVo2djaaWHAF5HuDo="; + }; + stvefPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/STVEFPack/trunk"; + rev = 144; + sha256 = "sha256-quNyVC6fg1FIBsLWx0LzRK2JfxKMNJeUEIkWGhGJHhI="; + }; + wolfPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/WolfPack/trunk"; + rev = 144; + sha256 = "sha256-693k6KiIchQddVGBhRJf7ikv6ut5L9rcLt0FTZ7pSvw="; + }; + unvanquishedPack = fetchsvn { + url = "https://github.com/Unvanquished/unvanquished-mapeditor-support.git/trunk/build/gtkradiant/"; + rev = 212; + sha256 = "sha256-weBlnSBezPppbhsMOT66vubioTxpDC+AcKIOC2Xitdo="; + }; + q1Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q1Pack/trunk"; + rev = 144; + sha256 = "sha256-JfmDIUoDY7dYdMgwwUMgcwNhWxuxsdkv1taw8DXhPY4="; + }; + packs = runCommand "gtkradiant-packs" {} '' + mkdir -p $out + ln -s ${q3Pack} $out/Q3Pack + ln -s ${urtPack} $out/UrTPack + ln -s ${etPack} $out/ETPack + ln -s ${qlPack} $out/QLPack + ln -s ${q2Pack} $out/Q2Pack + ln -s ${quetooPack} $out/QuetooPack + ln -s ${jaPack} $out/JAPack + ln -s ${stvefPack} $out/STVEFPack + ln -s ${wolfPack} $out/WolfPack + ln -s ${unvanquishedPack} $out/UnvanquishedPack + ln -s ${q1Pack} $out/Q1Pack + ''; + +in +stdenv.mkDerivation rec { + pname = "gtkradiant"; + + version = "unstable-2022-07-31"; + + src = fetchFromGitHub { + owner = "TTimo"; + repo = "GtkRadiant"; + rev = "5b498bfa01bde6c2c9eb60fb94cf04666e52d22d"; + sha256 = "sha256-407faeQnhxqbWgOUunQKj2JhHeqIzPPgrhz2K5O4CaM="; + }; + + # patch paths so that .game settings are put into the user's home instead of the read-only /nix/store + postPatch = '' + substituteInPlace radiant/preferences.cpp \ + --replace 'gameFilePath += "games/";' 'gameFilePath = g_get_home_dir(); gameFilePath += "/.cache/radiant/games/";printf("gameFilePath: %s\\n", gameFilePath);' \ + --replace 'radCreateDirectory( gameFilePath );' 'if (g_mkdir_with_parents( gameFilePath, 0777 ) == -1) {radCreateDirectory( gameFilePath );};' \ + --replace 'strGamesPath = g_strAppPath.GetBuffer();' 'strGamesPath = g_get_home_dir();' \ + --replace 'strGamesPath += "games";' 'strGamesPath += "/.cache/radiant/games";' + ''; + + nativeBuildInputs = + let + python = python3.withPackages (ps: with ps; [ + urllib3 + ]); + svn = writeScriptBin "svn" '' + #!${runtimeShell} -e + if [ "$1" = checkout ]; then + # link predownloaded pack to destination + mkdir -p $(dirname $3) + ln -s ${packs}/$(basename $3) $3 + # verify existence + test -e $(readlink $3) + elif [ "$1" = update ]; then + # verify existence + test -e $(readlink $3) + else + echo "$@" + exit 1 + fi + ''; + in [ + scons + pkg-config + python + svn + copyDesktopItems + ]; + + buildInputs = [ glib libxml2 gtk2 libGLU gnome2.gtkglext ]; + + enableParallelBuilding = true; + + desktopItems = [ (makeDesktopItem { + name = "gtkradiant"; + exec = "gtkradiant"; + desktopName = "GtkRadiant"; + comment = meta.description; + categories = [ "Development" ]; + icon = "gtkradiant"; + # includes its own splash screen + startupNotify = false; + }) ]; + + postInstall = '' + mkdir -p $out/{bin,lib} + cp -ar install $out/lib/gtkradiant + + ln -s ../lib/gtkradiant/radiant.bin $out/bin/gtkradiant + ln -s ../lib/gtkradiant/{q3map2,q3map2_urt,q3data} $out/bin/ + + mkdir -p $out/share/pixmaps + ln -s ../../lib/gtkradiant/bitmaps/icon.png $out/share/pixmaps/gtkradiant.png + ''; + + meta = with lib; { + description = "Level editor for idTech games"; + homepage = "https://icculus.org/gtkradiant/"; + license = with licenses; [ gpl2Only bsdOriginal lgpl21Only ]; + maintainers = with maintainers; [ astro ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index 8d77d75dafeb8..d4bd7c63a7225 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.6.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pEULArQDwKZzpD0GVH21L1v9xVZiBz91kL/jPJjJav4="; + sha256 = "sha256-6x1t/PLs1dqlY5XQ1F0PDqZ/TofZ0h1hTc0C1sjn3fA="; }; - vendorSha256 = "sha256-vvNoO5eABGVwvAzK33uPelmo3BKxfqiYgEXZI7kgeSo="; + vendorSha256 = "sha256-rOBwhPXo4sTSI3j3rn3c5qWGnGFgkpeFUKgtzKBltbg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 10dd5bd545c31..d9e0204be322b 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, pkgs -, glib, gnome, gtk3, gtksourceview3, gtkspell3, poppler, texlive +, glib, gtk3, gtksourceview3, gtkspell3, poppler, texlive , pkg-config, intltool, autoreconfHook, wrapGAppsHook }: diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 851f2d80c9763..d5aa1ac88179c 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { "--enable-SIGCHLD-fallback" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ Xaw3d ghostscriptX perl - pkg-config ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index f7c5714f1262a..fb172eb22b016 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool gtk3 texinfo ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gtk3 texinfo ]; meta = { description = "A GTK enabled dropin replacement for xmessage"; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 2f6df287197f1..695706cefc5b8 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, fetchpatch }: +{ lib, fetchFromGitHub, python3 }: let diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix new file mode 100644 index 0000000000000..5a9c5122acc36 --- /dev/null +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, pkg-config +, dpkg +, openssl +, webkitgtk +, libappindicator +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "holochain-launcher"; + version = "0.6.0"; + + src = fetchurl { + url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; + sha256 = "sha256-o9cUFtq5XUkbC3yFRFiV2k4uWjb+szlE8qV+G9Gve5E="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + wrapGAppsHook # required for FileChooser + ]; + + buildInputs = [ + openssl + webkitgtk + libappindicator + ]; + + unpackCmd = "dpkg-deb -x $curSrc source"; + + installPhase = '' + mv usr $out + ''; + + preFixup = '' + patchelf --add-needed "libappindicator3.so" "$out/bin/holochain-launcher" + ''; + + meta = with lib; { + description = "A cross-platform executable that launches a local Holochain conductor, and installs and opens apps"; + homepage = "https://github.com/holochain/launcher"; + maintainers = [ maintainers.steveej ]; + license = licenses.cal10; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index f55752a229238..b9f78afda4bb3 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }: +{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, unwrapped ? callPackage ./runtime.nix {} }: buildFHSUserEnv rec { name = "houdini-${unwrapped.version}"; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 5481376af8c60..d57f2270daf18 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.104.2"; + version = "0.104.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7GB2bLf6J253oFkTLg8iblE6c2wFYS3WCUqTDsc61/8="; + sha256 = "sha256-bGyU0i/wwFprAoLENrmBY2IxLjwyX4pQ9z4LFIUguI4="; }; - vendorSha256 = "sha256-K7rQSs4PqFGV4gZ6UevS7S0w0OQykAkHntklKz5vPrU="; + vendorSha256 = "sha256-is1dQJwvhygn95rbeHeGI97vDXo8ftnNqug4eERN3gI="; doCheck = false; diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index 6d78dd559c26f..a68ec733ab714 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -4,12 +4,8 @@ , stdenv , pkg-config , fontconfig -, libXcursor -, libXi -, libXrandr -, libxcb +, xorg , libGL -, libX11 , openssl , AppKit , ApplicationServices @@ -42,10 +38,10 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ fontconfig - libXcursor - libXi - libXrandr - libxcb + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libxcb openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit @@ -64,7 +60,7 @@ rustPlatform.buildRustPackage rec { postFixup = lib.optionalString stdenv.isLinux '' patchelf $out/bin/inlyne \ - --add-rpath ${lib.makeLibraryPath [ libGL libX11 ]} + --add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]} ''; meta = with lib; { diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 7d99bd8558a94..aecd7a4b09001 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18543"; + version = "18570"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-AQmdBwgOVws8MDAX8i3P7bsk3r69g7x3jhADGwRWa2c="; + hash = "sha256-EAEh/n7M56rzjtkIs8ZteDvOLuHxNsMyT7VGFyPre6s="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-pGVn+NgfSlyYcT0BCTj+Ntbe7d0l6LJSeDi9xve0K4g="; + hash = "sha256-2xsHsaDxm/wjiCyS5tmD8uUlLrBdd3sS8JLal3pX3pA="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 6b594f196c942..b001b50c40126 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub +{ lib, stdenv, runCommand, fetchzip, fetchurl, fetchFromGitHub , cmake, pkg-config, zlib, libpng, makeWrapper , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index 54f0fe1a7d379..d1f6094753989 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -1,7 +1,6 @@ { mkDerivation , extra-cmake-modules , fetchFromGitHub -, kdoctools , kiconthemes , kio , kjobwidgets diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index 8f66eb87c24fc..85b409fe5ef31 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.23"; + version = "1.2.24"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "sha256-Sr20WAJLKy/vaCw76abq8qoKWZbuVgqjlCTZom/puPU="; + sha256 = "sha256-s//GkCKvppqJ+7x8pNwVEaBsUOCKCGt+wLj9P+3N9hc="; }; dontBuild = true; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index fdac7cede1702..c7040e1c96c7f 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato turion ]; + maintainers = with maintainers; [ jonafato turion srapenne ]; platforms = platforms.linux ++ platforms.darwin; broken = stdenv.isDarwin; # see to https://github.com/NixOS/nixpkgs/issues/172165 }; diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix index e019e9f1b9865..3a8750301fea4 100644 --- a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix +++ b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix @@ -41,7 +41,7 @@ buildGoModule rec { ''; license = licenses.mit; homepage = "https://github.com/mschneider82/keylight-control"; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index e64feb4165555..7f13494f65f5c 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,7 +1,6 @@ { lib, mkDerivation, fetchFromGitHub , callPackage , pkg-config -, makeWrapper , qmake , qtbase , qtwebengine diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix index 9d365cd328c8b..37f8203e047a5 100644 --- a/pkgs/applications/misc/kiwix/lib.nix +++ b/pkgs/applications/misc/kiwix/lib.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, fetchFromGitHub , meson, ninja, pkg-config , python3 , curl @@ -11,7 +11,6 @@ , gtest }: - stdenv.mkDerivation rec { pname = "kiwix-lib"; version = "10.1.1"; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 0ff5b4a6a625b..278d2c363bdb7 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -62,6 +62,9 @@ in buildFHSUserEnv { # Osmose qt4 + # Overwatch 2 + libunwind + # PPSSPP glew snappy diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix index e97008ab36cf9..f14084a865e5c 100644 --- a/pkgs/applications/misc/mangal/default.nix +++ b/pkgs/applications/misc/mangal/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "mangal"; - version = "3.10.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "metafates"; repo = pname; rev = "v${version}"; - hash = "sha256-rWj9CknWNI6SSh0AwaPpj5TxHQzkAmaAhWW7kze3xiY="; + hash = "sha256-1fWy7riInrbReQ0sQ1TF8GhqWQG0KXk1JzhmxlSuvmk="; }; proxyVendor = true; - vendorSha256 = "sha256-ZgeG8S78/yS9KfEK1bZ3VlQGmZPBo9TXLQLz8rXOEGo="; + vendorSha256 = "sha256-+HDuGSZinotUtCqffrmFkjHegxdArSJMWwnUG/tnLRc="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index 3144f59476b57..98bcda9943fcd 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -8,10 +8,15 @@ rustPlatform.buildRustPackage rec { owner = "mdzk-rs"; repo = "mdzk"; rev = version; - sha256 = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs="; + hash = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs="; }; - cargoSha256 = "sha256-2lPckUhnyfHaVWXzZXKliolDZiPtNl9UBZIKs6tUaNQ="; + cargoPatches = [ + # Remove when new version of mdzk is released. + ./update-mdbook-for-rust-1.64.patch + ]; + + cargoHash = "sha256-5zGUBvmf68tCk5jGrNn+ukgYbiKzrlmZvWrYgoJf2zk="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch b/pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch new file mode 100644 index 0000000000000..79b7240b96f88 --- /dev/null +++ b/pkgs/applications/misc/mdzk/update-mdbook-for-rust-1.64.patch @@ -0,0 +1,246 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ae63793..4068e02 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -162,12 +162,46 @@ dependencies = [ + "ansi_term", + "atty", + "bitflags", +- "strsim", +- "textwrap", ++ "strsim 0.8.0", ++ "textwrap 0.11.0", + "unicode-width", + "vec_map", + ] + ++[[package]] ++name = "clap" ++version = "3.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e538f9ee5aa3b3963f09a997035f883677966ed50fce0292611927ce6f6d8c6" ++dependencies = [ ++ "atty", ++ "bitflags", ++ "clap_lex", ++ "indexmap", ++ "lazy_static", ++ "strsim 0.10.0", ++ "termcolor", ++ "textwrap 0.15.1", ++] ++ ++[[package]] ++name = "clap_complete" ++version = "3.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" ++dependencies = [ ++ "clap 3.2.2", ++] ++ ++[[package]] ++name = "clap_lex" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" ++dependencies = [ ++ "os_str_bytes", ++] ++ + [[package]] + name = "cpufeatures" + version = "0.2.1" +@@ -222,9 +256,9 @@ dependencies = [ + + [[package]] + name = "env_logger" +-version = "0.7.1" ++version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" ++checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" + dependencies = [ + "atty", + "humantime", +@@ -385,15 +419,6 @@ dependencies = [ + "version_check", + ] + +-[[package]] +-name = "getopts" +-version = "0.2.21" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +-dependencies = [ +- "unicode-width", +-] +- + [[package]] + name = "getrandom" + version = "0.1.16" +@@ -471,7 +496,7 @@ dependencies = [ + "log", + "pest", + "pest_derive", +- "quick-error 2.0.1", ++ "quick-error", + "serde", + "serde_json", + ] +@@ -575,12 +600,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" + + [[package]] + name = "humantime" +-version = "1.3.0" ++version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +-dependencies = [ +- "quick-error 1.2.3", +-] ++checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + + [[package]] + name = "hyper" +@@ -822,13 +844,14 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + + [[package]] + name = "mdbook" +-version = "0.4.15" ++version = "0.4.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "241f10687eb3b4e0634b3b4e423f97c5f1efbd69dc9522e24a8b94583eeec3c6" ++checksum = "23f3e133c6d515528745ffd3b9f0c7d975ae039f0b6abb099f2168daa2afb4f9" + dependencies = [ + "anyhow", + "chrono", +- "clap", ++ "clap 3.2.2", ++ "clap_complete", + "env_logger", + "handlebars", + "lazy_static", +@@ -838,7 +861,6 @@ dependencies = [ + "pulldown-cmark", + "regex", + "serde", +- "serde_derive", + "serde_json", + "shlex", + "tempfile", +@@ -1062,6 +1084,12 @@ dependencies = [ + "winapi 0.3.9", + ] + ++[[package]] ++name = "os_str_bytes" ++version = "6.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" ++ + [[package]] + name = "parking_lot" + version = "0.11.2" +@@ -1258,17 +1286,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6" + dependencies = [ + "bitflags", +- "getopts", + "memchr", + "unicase", + ] + +-[[package]] +-name = "quick-error" +-version = "1.2.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +- + [[package]] + name = "quick-error" + version = "2.0.1" +@@ -1386,9 +1407,9 @@ dependencies = [ + + [[package]] + name = "regex" +-version = "1.5.4" ++version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" ++checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" + dependencies = [ + "aho-corasick", + "memchr", +@@ -1403,9 +1424,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + + [[package]] + name = "regex-syntax" +-version = "0.6.25" ++version = "0.6.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" ++checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + + [[package]] + name = "remove_dir_all" +@@ -1577,13 +1598,19 @@ version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + ++[[package]] ++name = "strsim" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" ++ + [[package]] + name = "structopt" + version = "0.3.26" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" + dependencies = [ +- "clap", ++ "clap 2.33.3", + "lazy_static", + "structopt-derive", + ] +@@ -1673,6 +1700,12 @@ dependencies = [ + "unicode-width", + ] + ++[[package]] ++name = "textwrap" ++version = "0.15.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" ++ + [[package]] + name = "thiserror" + version = "1.0.30" +diff --git a/Cargo.toml b/Cargo.toml +index dfeeb45..8b1e4e5 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -38,7 +38,7 @@ handlebars = "4.2.1" + ignore = "0.4.18" + lazy_static = "1.4.0" + lazy-regex = "2.2.2" +-mdbook = { version = "0.4.15", default-features = false } ++mdbook = { version = "0.4.21", default-features = false } + notify = "4.0.17" + pest = "2.1.3" + pest_derive = "2.1.0" +diff --git a/src/renderer/mdzk_renderer.rs b/src/renderer/mdzk_renderer.rs +index 55b2423..f8480ca 100644 +--- a/src/renderer/mdzk_renderer.rs ++++ b/src/renderer/mdzk_renderer.rs +@@ -92,7 +92,7 @@ impl Renderer for HtmlMdzk { + "description", + json!(ctx.config.book.description.clone().unwrap_or_default()), + ); +- if let Some(ref livereload) = html_config.livereload_url { ++ if let Some(ref livereload) = html_config.live_reload_endpoint { + data.insert("livereload", json!(livereload)); + } + data.insert("fold_enable", json!(html_config.fold.enable)); diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix index ec978b9fc3a2b..b8cb75b057fd1 100644 --- a/pkgs/applications/misc/mupdf/1.17.nix +++ b/pkgs/applications/misc/mupdf/1.17.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkg-config, freetype, harfbuzz, openjpeg +{ stdenv, lib, fetchurl, pkg-config, freetype, harfbuzz, openjpeg , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index 1dba44531e595..52ced3b41753a 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.1.0"; + version = "1.2.0"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = "numberstation"; rev = version; - hash = "sha256-A6qwsbeNZXfSOZwHp19/4JQ8dZgjsK7Y2zho6vJXsGA="; + hash = "sha256-e/KZrBnep5LbzgNnIoZlS5AMxhx4KlmdYDzdldMGVwg="; }; postPatch = '' diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index c38ee194b4e24..2ef17f9c1cdf3 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "0.15.9"; + version = "1.0.0"; 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 "1q9almr8k1i2wzksd09libgnvypj5k9j15y6cxg4rgnw32fa152n" else "sha256-Qz1Ic5FtxXIk8J/2spNZaqpPIgx3yNyXiAQllbVrGjw="; + sha256 = if stdenv.isDarwin then "sha256-KVWqdXzbQT93Dj4yesdnfFwAdYin1vfpPsj/ur1AGA0=" else "sha256-H1Cl9SBz/mwN8gezFkcV4KxI7+xVjQV2AtyLKyjVpI8="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 639ad2175b414..29cdac6b8d163 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "42.3"; + version = "43.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+ty6C/6uHmZyJmJk529j/lq/jw77NL4Ri1qXP7by9yQ="; + sha256 = "HKdaAMSoUSoJ5KJuszn615RNHtQayjL3D2lickQhglA="; }; patches = [ diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix index cefce001eba90..c463ade398622 100644 --- a/pkgs/applications/misc/osmscout-server/default.nix +++ b/pkgs/applications/misc/osmscout-server/default.nix @@ -1,7 +1,7 @@ { lib, mkDerivation, fetchFromGitHub, pkg-config , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation , libosmscout, valhalla, libpostal, osrm-backend, protobuf -, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost +, libmicrohttpd, sqlite, marisa, kyotocabinet, boost }: let @@ -14,20 +14,20 @@ let in mkDerivation rec { pname = "osmscout-server"; - version = "2.1.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "rinigus"; repo = "osmscout-server"; rev = version; - sha256 = "sha256-I14nQL0H2rMga+RDdAjykqmf7QIZveA6oGWu5PfZ89s="; + sha256 = "sha256-ngB3c6rUQ/+AeaJHKAFRl9lCkUobLWSnsn030brB+Bw="; fetchSubmodules = true; }; nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ kirigami2 qtquickcontrols2 qtlocation - valhalla libosmscout osrm-backend libmicrohttpd_0_9_70 + valhalla libosmscout osrm-backend libmicrohttpd libpostal sqlite marisa kyotocabinet boost protobuf date ]; diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix new file mode 100644 index 0000000000000..2a6495ff0155f --- /dev/null +++ b/pkgs/applications/misc/oxker/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchCrate, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "oxker"; + version = "0.1.5"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-OhXU61F8XK5ts4GwDUkFv4+FGNFUmJJ9ooRS9/D0yvQ="; + }; + + cargoSha256 = "sha256-ldf0XYBhxLL2v0+yBX9Dqq8kYgJZ2f4Lor+rUA0/47E="; + + meta = with lib; { + description = "A simple tui to view & control docker containers"; + homepage = "https://github.com/mrjackwills/oxker"; + changelog = "https://github.com/mrjackwills/oxker/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ siph ]; + }; +} diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index cffde0c3a3222..2da0374a67f70 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "p2pool"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-hf0iU246cmTCDYotPdTACFY135L2+cRV3FpVYnRZtRc="; + sha256 = "sha256-En2ogxAD61w7DRTsCGIp6fEP/cC2A+pTYIbjeJ1MktY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix new file mode 100644 index 0000000000000..502ee9f7f0161 --- /dev/null +++ b/pkgs/applications/misc/parsec/bin.nix @@ -0,0 +1,81 @@ +{ stdenvNoCC, stdenv +, lib +, dpkg, autoPatchelfHook, makeWrapper +, fetchurl +, alsa-lib, openssl, udev +, libglvnd +, libX11, libXcursor, libXi, libXrandr +, libpulseaudio +, libva +, ffmpeg +}: + +stdenvNoCC.mkDerivation { + pname = "parsec-bin"; + version = "150_28"; + + src = fetchurl { + url = "https://web.archive.org/web/20220622215230id_/https://builds.parsecgaming.com/package/parsec-linux.deb"; + sha256 = "1hfdzjd8qiksv336m4s4ban004vhv00cv2j461gc6zrp37s0fwhc"; + }; + + unpackPhase = '' + runHook preUnpack + + dpkg-deb -x $src . + + runHook postUnpack + ''; + + nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper ]; + + buildInputs = [ + stdenv.cc.cc # libstdc++ + libglvnd + libX11 + ]; + + runtimeDependenciesPath = lib.makeLibraryPath [ + stdenv.cc.cc + libglvnd + openssl + udev + alsa-lib + libpulseaudio + libva + ffmpeg + libX11 + libXcursor + libXi + libXrandr + ]; + + prepareParsec = '' + if [[ ! -e "$HOME/.parsec/appdata.json" ]]; then + mkdir -p "$HOME/.parsec" + cp --no-preserve=mode,ownership,timestamps ${placeholder "out"}/share/parsec/skel/* "$HOME/.parsec/" + fi + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + mv usr/* $out + + wrapProgram $out/bin/parsecd \ + --prefix LD_LIBRARY_PATH : "$runtimeDependenciesPath" \ + --run "$prepareParsec" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://parsecgaming.com/"; + description = "Remote streaming service client"; + license = licenses.unfree; + maintainers = with maintainers; [ arcnmx ]; + platforms = platforms.linux; + mainProgram = "parsecd"; + }; +} diff --git a/pkgs/applications/misc/pattypan/default.nix b/pkgs/applications/misc/pattypan/default.nix new file mode 100644 index 0000000000000..19a9b18ce193f --- /dev/null +++ b/pkgs/applications/misc/pattypan/default.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, unzip +, jre +, jdk +, ant +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, glib +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "pattypan"; + version = "22.03"; + + src = fetchFromGitHub { + owner = "yarl"; + repo = "pattypan"; + rev = "v${version}"; + sha256 = "0qmvlcqhqw5k500v2xdakk340ymgv5amhbfqxib5s4db1w32pi60"; + }; + + nativeBuildInputs = [ copyDesktopItems jdk ant makeWrapper wrapGAppsHook ]; + buildInputs = [ glib jre ]; + + buildPhase = '' + runHook preBuild + export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" + ant + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/java + cp pattypan.jar $out/share/java/pattypan.jar + makeWrapper ${jre}/bin/java $out/bin/pattypan \ + --add-flags "-cp $out/share/java/pattypan.jar pattypan.Launcher" + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + desktopName = "Pattypan"; + genericName = "An uploader for Wikimedia Commons"; + categories = [ "Utility" ]; + exec = "pattypan"; + name = "pattypan"; + }) + ]; + + meta = with lib; { + homepage = "https://commons.wikimedia.org/wiki/Commons:Pattypan"; + description = "An uploader for Wikimedia Commons"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ fee1-dead ]; + }; +} diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index dffbd2079aead..2e75791e30823 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; - nativeBuildInputs = [ pkg-config automake autoconf ]; - buildInputs = [ gtk2 libXft intltool libtool ]; + nativeBuildInputs = [ pkg-config automake autoconf intltool ]; + buildInputs = [ gtk2 libXft libtool ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 93d5d74ac731c..3416bb348567f 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -4,19 +4,18 @@ , qmake , mkDerivation , qtsvg -, libxml2 , postgresql }: mkDerivation rec { pname = "pgmodeler"; - version = "0.9.4"; + version = "1.0.0-beta"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-FwLPhIc2ofaB8Z2ZUYMFFt5XdoosEfEOwoIaI7pSxa0="; + sha256 = "sha256-1+1hKOY8unu6Z7LLv/WQ86JlwWUubQuhPP9OUjyXOrM="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index f27902a8aac76..fc6b6a1e2d4a5 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -1,30 +1,22 @@ { lib , fetchFromGitHub , bash -, cairo , glib -, qt5 -, hicolor-icon-theme , gdk-pixbuf +, gettext , imagemagick -, desktop-file-utils , ninja , meson , sassc -, ibus -, usbutils -, libxcb , python3Packages , gobject-introspection , gtk3 , wrapGAppsHook -, libappindicator-gtk3 }: python3Packages.buildPythonApplication rec { name = "polychromatic"; version = "0.7.3"; - format = "other"; src = fetchFromGitHub { @@ -41,57 +33,40 @@ python3Packages.buildPythonApplication rec { --replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \ --replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass' - substituteInPlace pylib/common.py --replace "/usr/share/polychromatic" "$out/share/polychromatic" + substituteInPlace pylib/common.py \ + --replace "/usr/share/polychromatic" "$out/share/polychromatic" ''; preConfigure = '' scripts/build-styles.sh ''; - buildInputs = [ - cairo - hicolor-icon-theme - ]; - - pythonPath = with python3Packages; [ - openrazer - pyqt5 - pyqtwebengine + nativeBuildInputs = with python3Packages; [ + gettext + gobject-introspection + meson + ninja + sassc + wrapGAppsHook ]; propagatedBuildInputs = with python3Packages; [ - libxcb - colour colorama - setproctitle + colour + gtk3 openrazer - openrazer-daemon - requests - ibus - usbutils - pyqt5 - libappindicator-gtk3 - ]; - - nativeBuildInputs = with python3Packages; [ + pygobject3 pyqt5 - desktop-file-utils - qt5.wrapQtAppsHook - wrapGAppsHook - ninja - meson - sassc + pyqtwebengine + requests + setproctitle ]; - propagatedNativeBuildInputs = [ - gobject-introspection - gtk3 - gdk-pixbuf - imagemagick - ]; + dontWrapGapps = true; + dontWrapQtApps = true; makeWrapperArgs = [ - "\${qtWrapperArgs[@]}" + "\${gappsWrapperArgs[@]}" ]; meta = with lib; { diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index d7613b0c2a54f..405d992576da8 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, cacert, openssl, nixosTests -, python39 +, python39, fetchpatch }: let @@ -107,6 +107,16 @@ python3'.pkgs.buildPythonPackage rec { 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="; + }) + ]; + passthru.tests = { inherit (nixosTests) privacyidea; }; checkInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ]; diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix index 80563a931292f..442f9d0e9b50b 100644 --- a/pkgs/applications/misc/process-viewer/default.nix +++ b/pkgs/applications/misc/process-viewer/default.nix @@ -39,5 +39,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/guillaumegomez/process-viewer"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "process_viewer"; }; } diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 286abfb3fdb13..1592ef5461559 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -130,6 +130,15 @@ stdenv.mkDerivation rec { # likely due to commit e682dd84cff5d2420fcc0a40508557477f6cc9d3 # See issue #185808 for details. sed -i 's|test_voronoi.cpp||g' tests/libslic3r/CMakeLists.txt + + # prusa-slicer expects the OCCTWrapper shared library in the same folder as + # the executable when loading STEP files. We force the loader to find it in + # the usual locations (i.e. LD_LIBRARY_PATH) instead. See the manpage + # dlopen(3) for context. + if [ -f "src/libslic3r/Format/STEP.cpp" ]; then + substituteInPlace src/libslic3r/Format/STEP.cpp \ + --replace 'libpath /= "OCCTWrapper.so";' 'libpath = "OCCTWrapper.so";' + fi ''; src = fetchFromGitHub { @@ -147,11 +156,20 @@ stdenv.mkDerivation rec { postInstall = '' ln -s "$out/bin/prusa-slicer" "$out/bin/prusa-gcodeviewer" + mkdir -p "$out/lib" + mv -v $out/bin/*.so $out/lib/ + mkdir -p "$out/share/pixmaps/" ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png" ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png" ''; + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "$out/lib" + ) + ''; + meta = with lib; { description = "G-code generator for 3D printer"; homepage = "https://github.com/prusa3d/PrusaSlicer"; diff --git a/pkgs/applications/misc/qcad/application-dir.patch b/pkgs/applications/misc/qcad/application-dir.patch index 0b8a29319eb3d..84782e1e7178f 100644 --- a/pkgs/applications/misc/qcad/application-dir.patch +++ b/pkgs/applications/misc/qcad/application-dir.patch @@ -33,16 +33,3 @@ index c6c31cbf5..c51b59ce6 100644 } int RSettings::getSnapRange() { -diff --git a/qcad.desktop b/qcad.desktop -index 93c5e9720..2d0e6bf32 100644 ---- a/qcad.desktop -+++ b/qcad.desktop -@@ -48,7 +48,7 @@ Comment[sv]=2D CAD-system - Comment[sl]=Sistem 2D CAD - Comment[uk]=2D САПР - Comment[tr]=2D CAD Sistemi --Exec=qcad %F -+Exec=qcad-bin %F - X-MultipleArgs=true - Icon=qcad_icon - Terminal=false diff --git a/pkgs/applications/misc/remarkable/restream/default.nix b/pkgs/applications/misc/remarkable/restream/default.nix index c383baaaa9e22..9af70769e3d99 100644 --- a/pkgs/applications/misc/remarkable/restream/default.nix +++ b/pkgs/applications/misc/remarkable/restream/default.nix @@ -1,5 +1,4 @@ { lib -, bash , stdenv , lz4 , ffmpeg-full diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 624da925cc7c6..cca6c5b488720 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.20"; + version = "0.0.21"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "sha256-khQ4Q2y/MJdz5EpfTSrLBROCX2QP2+3PXRO+x+FaXro="; + sha256 = "sha256-PObuO+Aea2MS1DW3/uOS7GajtFUPolDnPgwxYehGPlA="; }; - vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU="; + vendorSha256 = "sha256-LmKcHV0aq7NDEwaL+u8zXkbKzzdWD8zmnAGw5xShDYo="; doCheck = false; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 273b2d6046ed8..ea97f8305fee1 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }: +{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }: let version = "2.16.5.1"; diff --git a/pkgs/applications/misc/rlaunch/default.nix b/pkgs/applications/misc/rlaunch/default.nix index 206c32987cca6..5622c94d427f8 100644 --- a/pkgs/applications/misc/rlaunch/default.nix +++ b/pkgs/applications/misc/rlaunch/default.nix @@ -1,9 +1,7 @@ { lib , fetchFromGitHub , rustPlatform -, libX11 -, libXft -, libXinerama +, xorg }: rustPlatform.buildRustPackage rec { @@ -21,7 +19,7 @@ rustPlatform.buildRustPackage rec { # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. postFixup = '' - patchelf --set-rpath ${lib.makeLibraryPath [ libX11 libXft libXinerama ]} $out/bin/rlaunch + patchelf --set-rpath ${lib.makeLibraryPath (with xorg; [ libX11 libXft libXinerama ])} $out/bin/rlaunch ''; meta = with lib; { diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 0357681b7493e..293f214b60736 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -1,8 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch -, substituteAll , makeWrapper , autoreconfHook diff --git a/pkgs/applications/misc/rofi-power-menu/default.nix b/pkgs/applications/misc/rofi-power-menu/default.nix index 657796a5972a0..e02b7062f4bca 100644 --- a/pkgs/applications/misc/rofi-power-menu/default.nix +++ b/pkgs/applications/misc/rofi-power-menu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rofi }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "rofi-power-menu"; diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 9729301f6e74c..abd47c149ebb2 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec { urwid urwid-readline ]; + format = "other"; dontBuild = true; diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix index a8a0bfb1e10aa..c924a3ec2bb54 100644 --- a/pkgs/applications/misc/sl1-to-photon/default.nix +++ b/pkgs/applications/misc/sl1-to-photon/default.nix @@ -6,7 +6,6 @@ , numpy , pyphotonfile , shiboken2 -, which }: let version = "0.1.3"; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 02bf65761f019..10d4ffc77b4b2 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake +{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake , curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite , bluez diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix index 17888cc8041f1..0dd5afd3edb41 100644 --- a/pkgs/applications/misc/survex/default.nix +++ b/pkgs/applications/misc/survex/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , Carbon , Cocoa , ffmpeg @@ -12,14 +13,26 @@ , proj , python3 , wrapGAppsHook -, wxGTK30-gtk3 -, wxmac +, wxGTK32 , xlibsWrapper }: stdenv.mkDerivation rec { pname = "survex"; - version = "1.4.1"; + version = "1.4.3"; + + src = fetchurl { + url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-7NtGTe9xNRPEvG9fQ2fC6htQLEMHfqGmBM2ezhi6oNM="; + }; + + patches = [ + # Fix cavern.tst to work with SOURCE_DATE_EPOCH set + (fetchpatch { + url = "https://github.com/ojwb/survex/commit/b1200a60be7bdea20ffebbd8bb15386041727fa6.patch"; + hash = "sha256-OtFjqpU+u8XGy+PAHg2iea++b681p/Kl8YslisBs4sA="; + }) + ]; nativeBuildInputs = [ perl @@ -34,20 +47,14 @@ stdenv.mkDerivation rec { libGLU mesa proj + wxGTK32 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa - wxmac ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - wxGTK30-gtk3 xlibsWrapper ]; - src = fetchurl { - url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-69X1jGjBTQIQzkD1mTZTzE8L/GXnnf5SI52l7eIiLz4="; - }; - postPatch = '' patchShebangs . ''; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 60954d567e22a..f756e9788ac95 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "synergy"; - version = "1.14.5.17"; + version = "1.14.5.22"; src = fetchFromGitHub { owner = "symless"; repo = "synergy-core"; rev = version; - sha256 = "sha256-9B6KPa1TsS4khCf7ccmwQZJ1KDEuLNw/W0PScYCgtlE="; + sha256 = "sha256-rqQ4n8P8pZSWRCxaQLa2PuduXMt2XeaFs051qcT3/o8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix new file mode 100644 index 0000000000000..49b38bec655a8 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -0,0 +1,19 @@ +{ lib, fetchFromGitHub }: +rec { + version = "1.4.4"; + + src = fetchFromGitHub { + owner = "TandoorRecipes"; + repo = "recipes"; + rev = version; + sha256 = "sha256-1wqZoOT2Aafbs2P0mL33jw5HkrLIitUcRt6bQQcHx40="; + }; + + yarnSha256 = "sha256-gH0q3pJ2BC5pAU9KSo3C9DDRUnpypoyLOEqKSrkxYrk="; + + meta = with lib; { + homepage = "https://tandoor.dev/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix new file mode 100644 index 0000000000000..767d0c768ded0 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -0,0 +1,143 @@ +{ callPackage +, nixosTests +, python3 +}: +let + python = python3.override { + packageOverrides = self: super: { + django = super.django_4; + + # Tests are incompatible with Django 4 + django-js-reverse = super.django-js-reverse.overridePythonAttrs (_: { + doCheck = false; + }); + }; + }; + + common = callPackage ./common.nix { }; + + frontend = callPackage ./frontend.nix { }; +in +python.pkgs.pythonPackages.buildPythonPackage rec { + pname = "tandoor-recipes"; + + inherit (common) version src; + + format = "other"; + + patches = [ + # Allow setting MEDIA_ROOT through environment variable + ./media-root.patch + ]; + + propagatedBuildInputs = with python.pkgs; [ + beautifulsoup4 + bleach + bleach-allowlist + boto3 + cryptography + django + django-allauth + django-annoying + django-auth-ldap + django-autocomplete-light + django-cleanup + django-cors-headers + django-crispy-forms + django-hcaptcha + django-js-reverse + django-oauth-toolkit + django-prometheus + django-scopes + django-storages + django-tables2 + django-webpack-loader + django_treebeard + djangorestframework + drf-writable-nested + gunicorn + icalendar + jinja2 + lxml + markdown + microdata + pillow + psycopg2 + pyppeteer + python-dotenv + pytube + pyyaml + recipe-scrapers + requests + six + uritemplate + validators + webdavclient3 + whitenoise + ]; + + configurePhase = '' + runHook preConfigure + + ln -sf ${frontend}/ cookbook/static/vue + cp ${frontend}/webpack-stats.json vue/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + # Avoid dependency on django debug toolbar + export DEBUG=0 + + # See https://github.com/TandoorRecipes/recipes/issues/2043 + mkdir cookbook/static/themes/maps/ + touch cookbook/static/themes/maps/style.min.css.map + touch cookbook/static/themes/bootstrap.min.css.map + touch cookbook/static/css/bootstrap-vue.min.css.map + + ${python.pythonForBuild.interpreter} manage.py collectstatic_js_reverse + ${python.pythonForBuild.interpreter} manage.py collectstatic + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp -r . $out/lib/tandoor-recipes + chmod +x $out/lib/tandoor-recipes/manage.py + makeWrapper $out/lib/tandoor-recipes/manage.py $out/bin/tandoor-recipes \ + --prefix PYTHONPATH : "$PYTHONPATH" + + # usually copied during frontend build (see vue.config.js) + cp vue/src/sw.js $out/lib/tandoor-recipes/cookbook/templates/ + + runHook postInstall + ''; + + checkInputs = with python.pkgs; [ + pytestCheckHook + pytest-django + pytest-factoryboy + ]; + + passthru = { + inherit frontend python; + + updateScript = ./update.sh; + + tests = { + inherit (nixosTests) tandoor-recipes; + }; + }; + + meta = common.meta // { + description = '' + Application for managing recipes, planning meals, building shopping lists + and much much more! + ''; + }; +} diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix new file mode 100644 index 0000000000000..47dcde5aca517 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs-16_x }: +let + common = callPackage ./common.nix { }; +in +stdenv.mkDerivation { + pname = "tandoor-recipes-frontend"; + inherit (common) version; + + src = "${common.src}/vue"; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${common.src}/vue/yarn.lock"; + sha256 = common.yarnSha256; + }; + + nativeBuildInputs = [ + fixup_yarn_lock + # Use Node JS 16 because of @achrinza/node-ipc@9.2.2 + nodejs-16_x + nodejs-16_x.pkgs.yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" + fixup_yarn_lock yarn.lock + command -v yarn + yarn install --frozen-lockfile --offline --no-progress --non-interactive + patchShebangs node_modules/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -R ../cookbook/static/vue/ $out + cp webpack-stats.json $out + echo "${common.version}" > "$out/version" + + runHook postInstall + ''; + + meta = common.meta // { + description = "Tandoor Recipes frontend"; + }; +} diff --git a/pkgs/applications/misc/tandoor-recipes/media-root.patch b/pkgs/applications/misc/tandoor-recipes/media-root.patch new file mode 100644 index 0000000000000..8114ca8aaeb37 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/media-root.patch @@ -0,0 +1,17 @@ +diff --git a/recipes/settings.py b/recipes/settings.py +index 5676fe0a..6c6f1747 100644 +--- a/recipes/settings.py ++++ b/recipes/settings.py +@@ -426,10 +426,10 @@ if os.getenv('S3_ACCESS_KEY', ''): + AWS_S3_CUSTOM_DOMAIN = os.getenv('S3_CUSTOM_DOMAIN', '') + + MEDIA_URL = os.getenv('MEDIA_URL', '/media/') +- MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles") ++ MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(BASE_DIR, "mediafiles")) + else: + MEDIA_URL = os.getenv('MEDIA_URL', '/media/') +- MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles") ++ MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(BASE_DIR, "mediafiles")) + + # Serve static files with gzip + STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage' diff --git a/pkgs/applications/misc/tandoor-recipes/update.sh b/pkgs/applications/misc/tandoor-recipes/update.sh new file mode 100755 index 0000000000000..49b6d5f98ae95 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq + +# shellcheck shell=bash + +if [ -n "$GITHUB_TOKEN" ]; then + TOKEN_ARGS=(--header "Authorization: token $GITHUB_TOKEN") +fi + +if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then + echo "Regenerates packaging data for the tandoor-recipes package." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +version="$1" + +set -euo pipefail + +if [ -z "$version" ]; then + version="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/TandoorRecipes/recipes/releases?per_page=1" | jq -r '.[0].tag_name')" +fi + +package_src="https://raw.githubusercontent.com/TandoorRecipes/recipes/$version" + +src_hash=$(nix-prefetch-github TandoorRecipes recipes --rev "${version}" | jq -r .sha256) + +tmpdir=$(mktemp -d) +trap 'rm -rf "$tmpdir"' EXIT + +pushd "$tmpdir" +wget "${TOKEN_ARGS[@]}" "$package_src/vue/yarn.lock" +yarn_hash=$(prefetch-yarn-deps yarn.lock) +popd + +# Use friendlier hashes +src_hash=$(nix hash to-sri --type sha256 "$src_hash") +yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash") + +sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix +sed -i -E -e "s#sha256 = \".*\"#sha256 = \"$src_hash\"#" common.nix +sed -i -E -e "s#yarnSha256 = \".*\"#yarnSha256 = \"$yarn_hash\"#" common.nix diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix index 95937ea5f2e3c..4ccddcd70071c 100644 --- a/pkgs/applications/misc/termpdf.py/default.nix +++ b/pkgs/applications/misc/termpdf.py/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonApplication , fetchFromGitHub -, fetchPypi , bibtool , pybtex , pymupdf diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index c9d845574ff0b..132b205f85c12 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 = "22.3.1"; + version = "23.0.1"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-5KB88zMgwfObgmcMTe6R+oG48qLHrMht6vM1EvI+QFY="; + sha256 = "sha256-DyaJggucFOxkrpaJSmg5fTrK8O3HA0Byd5pHwcgPSIM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 48b1b2d57e05e..422cf8ea76231 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bleakgrey/tootle"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; + broken = true; }; } diff --git a/pkgs/applications/misc/trenchbroom/default.nix b/pkgs/applications/misc/trenchbroom/default.nix index 5ee13bb5ee3eb..9a93edb30f617 100644 --- a/pkgs/applications/misc/trenchbroom/default.nix +++ b/pkgs/applications/misc/trenchbroom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, ninja, git, pandoc, pkg-config -, libGL, libGLU, libXxf86vm, freeimage +, libGL, libGLU, freeimage , catch2, fmt, glew, miniz, tinyxml-2, xorg , qtbase, wrapQtAppsHook , copyDesktopItems, makeDesktopItem @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems pkg-config ]; buildInputs = [ - libGL libGLU libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2 + libGL libGLU xorg.libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2 xorg.libSM ]; QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 536d800001b23..9c50b189cc150 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -20,11 +20,10 @@ stdenv.mkDerivation rec { sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ glib - intltool udev ]; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 63a8b485df533..491dd28435a9b 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -31,6 +31,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ distutils_extra + gobject-introspection intltool wrapGAppsHook gdk-pixbuf @@ -40,7 +41,6 @@ python3Packages.buildPythonApplication rec { gdk-pixbuf glib gnome.adwaita-icon-theme - gobject-introspection gtk3 keybinder3 libappindicator diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 25cbac7d229ba..2473129bc6dc2 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }: +{ stdenv, lib, fetchhg, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }: stdenv.mkDerivation rec { pname = "wofi"; - version = "1.2.4"; + version = "1.3"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; rev = "v${version}"; - sha256 = "1bnf078fg1kwslzwm1mjxwcqqq3bhk1dzymwfw9gk3brqbxrl75c"; + sha256 = "sha256-GxMjEXBPQniD+Yc9QZjd8TH4ILJAX5dNzrjxDawhy8w="; }; nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 27694174d7037..5b52caeaf1ad5 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { }; maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; + mainProgram = "wn"; }; } diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 0ba8c5a97ad9d..e7a871a171dfb 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.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y8Vdh6sMMX8pS4zIuOfcejfsOB5z5mXEpRskJXQgU1Y="; + sha256 = "sha256-6dSKambBAi1JHVyhq9xBUx5X6QmjsZCV8lENB55Wzto="; }; - vendorSha256 = "sha256-UE7BYal8ycU7mM1TLJMhoNxQKZjtsO9rJ+YXmLiOSk0="; + vendorSha256 = "sha256-Qe+u0u/NBXpEDvfKAF50Uxu5rh8BLa7N0wJ4bEuKOps="; doCheck = false; diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index 294beb06c5bf8..1af9f8e249e5c 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , curl, db, libgeotiff -, libXpm, libXt, motif, pcre +, xorg, motif, pcre , perl, proj, rastermagick, shapelib }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl db libgeotiff - libXpm libXt motif pcre + xorg.libXpm xorg.libXt motif pcre perl proj rastermagick shapelib ]; diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index d056dd66e8da8..ecafb9d5118cc 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -2,7 +2,7 @@ # at https://www.x.org/releases/individual/. # That is why this expression is not inside pkgs.xorg -{ lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }: +{ lib, stdenv, fetchurl, makeWrapper, xorg, pkg-config }: stdenv.mkDerivation rec { pname = "xfontsel"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ libX11 libXaw ]; + buildInputs = [ xorg.libX11 xorg.libXaw ]; # Without this, it gets Xmu as a dependency, but without rpath entry NIX_LDFLAGS = "-lXmu"; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 73d111979f33a..5fffac0c7772b 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -1,5 +1,5 @@ -{ stdenv, stdenvGcc6, lib -, fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl +{ stdenv, lib, fetchpatch +, fetchFromGitHub, cmake, libmicrohttpd, openssl , opencl-headers, ocl-icd, hwloc , devDonationLevel ? "0.0" , openclSupport ? true @@ -18,11 +18,18 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-O3"; + patches = [ (fetchpatch { + name = "fix-libmicrohttpd-0-9-71.patch"; + url = "https://github.com/fireice-uk/xmr-stak/compare/06e08780eab54dbc025ce3f38c948e4eef2726a0...8adb208987f5881946992ab9cd9a45e4e2a4b870.patch"; + excludes = [ "CMakeLists.txt.user" ]; + hash = "sha256-Yv0U5EO1P5eikn1fKvUXEwemoUIjjeTjpP9p5J8pbC0="; + }) ]; + cmakeFlags = [ "-DCUDA_ENABLE=OFF" ] ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF"; nativeBuildInputs = [ cmake ]; - buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ] + buildInputs = [ libmicrohttpd openssl hwloc ] ++ lib.optionals openclSupport [ opencl-headers ocl-icd ]; postPatch = '' diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index c5900fb9d507e..1040451efae09 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -1,5 +1,4 @@ { stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl -, donateLevel ? 0 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index dbb5eb42e1d94..2a14cbe24fb51 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook intltool ]; - buildInputs = [ glib intltool gtk3 gtksourceview ]; + buildInputs = [ glib gtk3 gtksourceview ]; meta = with lib; { description = "A sticky note application for jotting down things to remember"; diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 5fca27915f0ac..392944aa2a990 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0aNtBf3np9cq9JTgHRWy73i4AKaVEOluhSMSUyobduI="; + sha256 = "sha256-oVMnhtsovZAqMdmtV8oJ8frgHGidjlFzVyrYxi+gNdg="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-DXPpW7vls4yDEMiRrqDndxEKSA7Uncrt6n8nmsBXHcU="; + cargoSha256 = "sha256-PDbhnVThdb/42Q/dp/MNU6i6Un/lkKzfKuGukFt5tmc="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index d6514e58517e3..5e76e3a14d537 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf"; }; - nativeBuildInputs = [ imake gccmakedep ]; + nativeBuildInputs = [ imake gccmakedep pkg-config ]; buildInputs = [ libX11 libXt libXext libXpm - ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ]; + ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 13c3f217de39d..3584d24f14944 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, meson, ninja, fetchurl, fetchpatch -, cairo +{ stdenv, lib, meson, ninja, fetchurl, cairo , girara , gtk-mac-integration , gumbo diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index b93fcc1903b33..320938eb39a66 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -31,7 +31,6 @@ , nss , openssl , pango -, procps , python3 , stdenv , systemd diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b22a334b64f3d..afee9cf4f61bc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -325,7 +325,7 @@ let buildPhase = let buildCommand = target: '' - ninja -C "${buildPath}" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES "${target}" + ninja -C "${buildPath}" -j$NIX_BUILD_CORES "${target}" ( source chrome/installer/linux/common/installer.include PACKAGE=$packageName diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 8341f2c6ee222..2a370a1a33b8d 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -70,7 +70,7 @@ def get_matching_chromedriver(version): 'version': chromedriver_version, 'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')), 'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64')), - 'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac64_m1')) + 'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac_arm64')) } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 0d0c25dc3e526..2571e3eefd37c 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "106.0.5249.61", - "sha256": "15qljfg8w124yp65srp1rz3ywrlqhzqzkhimn1h9xz0jkf9cnypj", - "sha256bin64": "0l0vxlv8gmd655z2889549iafnyd4gyknqfal5iaqdhvig3sdp07", + "version": "106.0.5249.119", + "sha256": "14niglj8q6mfkmgbbjhaipmyhv6vryx93crswb1xa871a14in28g", + "sha256bin64": "1kcf8l6ivqzx6qaiy7vx2l6mhfqn4lq93dkgcx1bdadikwcpq0dd", "deps": { "gn": { "version": "2022-08-11", @@ -12,42 +12,42 @@ } }, "chromedriver": { - "version": "106.0.5249.21", - "sha256_linux": "0z4m5145s00dycb7f7nscwghzwqym4if6k95w0q6d1hjyih8jh32", - "sha256_darwin": "1jnwaim2p579p1xlh9y2w11rp5agmp2144ipjs1fg9p97hrdi3yf", - "sha256_darwin_aarch64": "13wl55n54ld6nrmy1vallrqkzz031kzmw4sjwczra6k7ryd4z09w" + "version": "106.0.5249.61", + "sha256_linux": "0l2270d5az46pc6icpn3zx7yr8ilkszsrfy3qmwrx3cyc4xnmznj", + "sha256_darwin": "07k76i9m3j34h6ybn1wafy39d2ngf06bhp24qzwvv45rks714hqa", + "sha256_darwin_aarch64": "1nvid0s44nlzy46cgxzsyyb3jfpyl3xy7aqafwskmbxdczx7bdap" } }, "beta": { - "version": "106.0.5249.61", - "sha256": "15qljfg8w124yp65srp1rz3ywrlqhzqzkhimn1h9xz0jkf9cnypj", - "sha256bin64": "15149hwjlw6gyh4ismgv0b9k4xn3350s70pqij9n79jb53f4nj9s", + "version": "107.0.5304.29", + "sha256": "1gid36r4hdl3wg2dbdvp847vnzggd2jga4i3pl5mdnvd3f1z0jpd", + "sha256bin64": "039b1yc5x5xgfj8sbc843lpizgmrkppcnmdzqq36zgihhj4mqkrg", "deps": { "gn": { - "version": "2022-08-11", + "version": "2022-09-14", "url": "https://gn.googlesource.com/gn", - "rev": "0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a", - "sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac" + "rev": "fff29c1b3f9703ea449f720fe70fa73575ef24e5", + "sha256": "1c0dvpp4im1hf277bs5w7rgqxz3g2bax266i2g6smi3pl7a8jpnp" } } }, "dev": { - "version": "107.0.5304.10", - "sha256": "0i7awirsqbzbx3s6ff9b8g584w8s69islmahiwjkprm192k98k70", - "sha256bin64": "1v524ygk59r68b8hc8qn9vx067613nbcrdrvwkx7vggd9yp9mcya", + "version": "108.0.5343.2", + "sha256": "1xg982z01zrv2lfr5qygn4391906m1z3ksi7k1l0i86g777f0ahg", + "sha256bin64": "0pgk3hsw1dxd6z63gpgx5ivjq49lyk608rkidp8i0acmwrvf0fqm", "deps": { "gn": { - "version": "2022-09-14", + "version": "2022-10-05", "url": "https://gn.googlesource.com/gn", - "rev": "fff29c1b3f9703ea449f720fe70fa73575ef24e5", - "sha256": "1c0dvpp4im1hf277bs5w7rgqxz3g2bax266i2g6smi3pl7a8jpnp" + "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6", + "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x" } } }, "ungoogled-chromium": { - "version": "106.0.5249.62", - "sha256": "1nm6hxr0gk5263v2ypmyc72dj1xb5r3r335vjvhvcqscgpikvnhq", - "sha256bin64": null, + "version": "106.0.5249.119", + "sha256": "14niglj8q6mfkmgbbjhaipmyhv6vryx93crswb1xa871a14in28g", + "sha256bin64": "1kcf8l6ivqzx6qaiy7vx2l6mhfqn4lq93dkgcx1bdadikwcpq0dd", "deps": { "gn": { "version": "2022-08-11", @@ -56,8 +56,8 @@ "sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac" }, "ungoogled-patches": { - "rev": "106.0.5249.62-1", - "sha256": "0lm7brj3sx8rkq2nzz9w0by5mk9qp0ax1wsp68b2wcwcx6nrzjw4" + "rev": "106.0.5249.119-1", + "sha256": "0mgyakq0g3v24b1qn76zblhjf9zzbiv1fq95w7w42nv3fvxfrxr2" } } } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 3278191a9c532..138af6cc511c8 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib +{ lib, stdenv, fetchFromGitHub, ncurses, libX11, bzip2, zlib , brotli, zstd, xz, openssl, autoreconfHook, gettext, pkg-config, libev , gpm, libidn, tre, expat , # Incompatible licenses, LGPLv3 - GPLv2 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ncurses xlibsWrapper bzip2 zlib brotli zstd xz + ncurses libX11 bzip2 zlib brotli zstd xz openssl libidn tre expat libev ] ++ lib.optional stdenv.isLinux gpm diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index fc3c98f4f36b7..5110cdcb3a836 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "106.0b5"; + version = "106.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ach/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ach/firefox-106.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "bea7f87f3a7b29f3c096f49f2ab94e51856cb442e7f1761094f8f52bde5eb059"; + sha256 = "884386b80804a5634988315d8c3e20258255574d1ed0dc8ac58bc6c837ab8141"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/af/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/af/firefox-106.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "a9dd69131df9d9a3bb8caf9a4b55ae3dcd4465b704b5f8bddd781ab7cfc775e8"; + sha256 = "2d6f42f7b22ae15ce6b3b13a8224a3af961341de2d762dd6f8dea00001a631b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/an/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/an/firefox-106.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "c15a591ca484546cd529a53a574941f53be43c521fef08e3e55010be351d06dc"; + sha256 = "2b28d9f37925b3d537219d9bd121ba7053198bf08a4ff7eb71e2b9096e0b4bd2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ar/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ar/firefox-106.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "4c995eddc6de0eef2459e37bb1501bccbc552bf0ad47193eb1043154e3e07a49"; + sha256 = "dd28e26e7eea3908673916291f1d05349d3ab127203b37ad3bd28bf3215a29f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ast/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ast/firefox-106.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "ae81c1f39262047e85d621b86c99baccd8fe82f756f5c0c44d1bd2ad90710943"; + sha256 = "db0adbfa48167a1e7861bc89ffb21bca28353129503a647235128af9d56b0328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/az/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/az/firefox-106.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "3910d9fe216ee82555db1f0828646c987c5cb613ef5762a2711c60093971737b"; + sha256 = "e6ef489e52d790bc3d8b4dd0a4dbc03fabd9579a9d415f236db1d94bbc3ff75d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/be/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/be/firefox-106.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "2ce805213b9a64661f2557f7afecbc5f8f6944d89f6d060c2bdb4a19dc8d7901"; + sha256 = "3197d11054bb72a9bc4643222b00963f5f4e2a84d11208c557a1b661f0f46cec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/bg/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/bg/firefox-106.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a6bbe60761bbff9f22b1734b9a9c3e43909fa9d5ff6631e5d625994df18d65fb"; + sha256 = "59cc8ef8696f2505ec19439da42e51af773553416112005d99e366efd71b5bf9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/bn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/bn/firefox-106.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "7429b78661eafadecf5fc2c21ba2e32c424fb29843625ee3d5768104c9c79c73"; + sha256 = "31726e80484062b79e8e97789322e0549a07abce5f48fa4eb42b755e50475428"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/br/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/br/firefox-106.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "68381f2a0fa6666c97607b6a6c66b667e54311ec61292ccdfa2432c6d3919931"; + sha256 = "c51069ea5902c0e508605ca068362673dec9c4907dc4cbededa1b66377570446"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/bs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/bs/firefox-106.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "73a61dde5341c3222922da34552a8fbf7b61db27d067319def238f3185912a2f"; + sha256 = "510f49a46b807ef0ca04824e0b7bc5348a0b4c73609874bae404898788567779"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ca-valencia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ca-valencia/firefox-106.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "df2b3b99b7aca85bb36b590ca30c1208ac8560b70823de3f84ef0a992b2e78b8"; + sha256 = "9409079b1786b08777b115429bcb2cb8a2fd62ed9d04ca0124d777a76425310d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ca/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ca/firefox-106.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "de7dd57997baf718d07535457092c82046d48d91049c7774e3b8ecfde4c7fe8d"; + sha256 = "9632a0ed604bf7dc9473ddd1dc2ddc8b4bc29fc6184def0f9f77270c27c2bd80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/cak/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/cak/firefox-106.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "91e28a46e769a9c61ccf6673de33c5e87291c428ca0d35d00a7ff6f8e168ade4"; + sha256 = "d946152baa84a8b2d884e70af657c685b28634976e271733c599a71e892a87f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/cs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/cs/firefox-106.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "25b8a12896b9caaeda63b8a37476f2696fbba0ece2ea29e2589543895bbc724d"; + sha256 = "d3a55cef8382b75602e619bcb0342094cde293003573668ec47659c7ffeedc6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/cy/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/cy/firefox-106.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "00722d5a8fa7b7fef65aa1414095ed792cef438249548e49996768533ccf62a3"; + sha256 = "b0b7ea683ac637d03410367e1b57422ebd4009ca4effd997842227c6412a7daf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/da/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/da/firefox-106.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "98b4d5daaa9e01a8fe94479263ab036c11f9b54eb248b38679e04b240be0a5a7"; + sha256 = "d15a7d59a3a026e12195a50f38f0ed6aef4e6925652784a7b1442dd47d3b8b2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/de/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/de/firefox-106.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "afa49b3348af68b40ad2878fe4179aa574bfbcd3c018c3fc2ab558ceb685d019"; + sha256 = "7b61583bca9630dd024e35e4916e28e84d611a04ea7328b27e5af3d1a0807c86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/dsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/dsb/firefox-106.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "f924915523444a65b931bf79c313f2f812a674ababcac9c6b87d409b0a85dea8"; + sha256 = "54d4f0d90e5ceba46616e7872a551e9e9c12126be122dc9da51a30186a0c370c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/el/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/el/firefox-106.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b8b45b326456fb57d21a5824088e7dee205eb32678a054e3a5df07f7bd1a78d2"; + sha256 = "06718b57ec734acaee81ab6b38d1f2fbf5b9fe6fe05680994391533b9e851d68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/en-CA/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/en-CA/firefox-106.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "0b0008a5286cde1dd8921221d824b431c63a72fc9481f7fce1b38f74d5cd012f"; + sha256 = "b90eab420f6b5fd03a1ca6c048762ccf99c094f69de3743a7273b36c8e6791c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/en-GB/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/en-GB/firefox-106.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "94591b8014b8a11af8eba21d0d11b26cabdc316c0e8d767467b47f8a6812d5a9"; + sha256 = "c63a1febee839ff9e859d22695d531df34e4c8fde8618869ee3ebc3a09e505c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/en-US/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/en-US/firefox-106.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e273a1b11dc3e91000d68dce334ea7a4268cfbbe6b58237eac7d9ab18951023e"; + sha256 = "ae0844cfcf718fc8f83e5a0acc8695a25a770a023b490b8c8d53bf713a294d0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/eo/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/eo/firefox-106.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "1dea74114d1b7faac73ea4c5a311b7154aec8909c1889b83027d7099ecf554e5"; + sha256 = "2812f644e7ec87b6ced6ddd342ecbe59ab703ba836aae42cd67ee071543e2137"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/es-AR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/es-AR/firefox-106.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "071ea18cd48c6e18276e0b78c7aaf71c2e63076b1a2ddeb56383937cad01946d"; + sha256 = "d76876f1df1db49000b2c65f8802fcf71e8be4a9b2511323bc98e9ebdf70ae53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/es-CL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/es-CL/firefox-106.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "1f00980599f660f3e428ef84afa09df877311fb9ab681fcec04b83612ba112f7"; + sha256 = "2980ff292d28ad81235325cddec2be72982cf407d82f3e51d1d37a41e16525e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/es-ES/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/es-ES/firefox-106.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b8c126fc40a10ec3be625d769a5480226893e80684ef0a107b67478c5e66609a"; + sha256 = "e31346603d21bbff04588ef0173c6a095aa6d1120044096db433fbb230250ead"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/es-MX/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/es-MX/firefox-106.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "2b5954e0de55133c34aa559a249fa25c57457db1d2d8faf2bf62cf7e4913dedf"; + sha256 = "34692451448730d19a05dadee9e0cf14808a783ee5e1257c2f315c7eae4c4df7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/et/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/et/firefox-106.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "25a1f91f515e22a2ff746ba0d7bdf0d2dc872054332cca11073b1a044816b1b4"; + sha256 = "51459c73a16b847a831486c6455d13fcd8e9ff748e30db7a3e20161ea1f0b01e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/eu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/eu/firefox-106.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "7b15f34cec3ffddefa5abf3b7c188ae4632ebe6bdb65857da08a243e109ec017"; + sha256 = "22cc72a94a4e24face8e5eeed20aca426057096fc77d285dd7d62ae7c03fb0ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/fa/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/fa/firefox-106.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "241350d7f85483d005db7c1a019a310f3a522733f7cde4e99a07b5455df3b24f"; + sha256 = "e76421fc81172c017175566a9eccbdc4fc007885834113416379c0c38aa9ad17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ff/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ff/firefox-106.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b3d86797d3194e60f45e831e81b98d59605c71f67867c441bd7cb09b798a8a6c"; + sha256 = "47d2088c839808dbe4cce09168af0716315dc79d308c0d2930ba36f6d91797bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/fi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/fi/firefox-106.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "67718e8fb190fad9293f83141e3c019813e32f6ae4488a27a65f083835d2d875"; + sha256 = "ffa72cfa0a0d94a4ca0424e965e402852b2a48f61311deb528eadd9033b08a26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/fr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/fr/firefox-106.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "1fd4c7f4beaaeebc5096cd1f0dca50489373f6df7ee14882382e11af83b9f7d6"; + sha256 = "1b303b927790cc05e18a2b1a429d600fdff80418e05063be3e32f134d8093955"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/fy-NL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/fy-NL/firefox-106.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "ae1c105ec2612c51c4e22d8927f10db6d8ac926f68418d668302f6f88a19446a"; + sha256 = "870e3d436cf5460fd8b1a13c3861bb18e567bc876ec401a45f00d331340eae29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ga-IE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ga-IE/firefox-106.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "019fb8ca065127fdf32549429377eaec17cdca33be1bf23d8a984e24e5122892"; + sha256 = "5da83a865fe5cf17697f7ddfd63451d5df45009c047141dd6a797a4845da8824"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/gd/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/gd/firefox-106.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d6fc76cf2af53b13eef471b32a5e56e832713208d9a93f401c4c024a2a805431"; + sha256 = "5327ff5ff1cdeb266a126cf6d92b935af04106d41cc43f82b876b973092c07d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/gl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/gl/firefox-106.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8927a42942c020ae39ab7e71009019c8a8eea5c95504c8a1078ea9c4d747db79"; + sha256 = "66be6b90ee36c42456a82ed48317a3639810964501bbc47e4a30fa37bbed61f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/gn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/gn/firefox-106.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "9ebfc17c47c2ae47ee1fccbd060936dd80896839672200ddcf33ab8a0443f591"; + sha256 = "7aaf379858d049bd00a791b0c663a90c90e4b08bd6012b93752cdc56118c285d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/gu-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/gu-IN/firefox-106.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "e8b258e4824668c2418636f152b908e731712a42443b12f2da15703c91ddde0a"; + sha256 = "884377774adaeb51eeb2d38e6f2feeef8d1b666cd161e919a153e853d4111c01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/he/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/he/firefox-106.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "272276863f7614f276b6798f5ab7613b04a0c715dc3d6f132c212971d8844908"; + sha256 = "08e6e439247c9aee53373a7e3bc432d1a0a39383f05b3faacb6b0c497c9bdb8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hi-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/hi-IN/firefox-106.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "76a40f6845a43bcb614df52735604c797f26ef7d5bdc524a977fa6ef5893a7f9"; + sha256 = "1f3eb0228d6ea1cf8d1587ab1405bd2b97ac5bb35e714350a2ff312e2d2b4924"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/hr/firefox-106.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "dcf93acdd526561af640e3a6fa13b7de92b20cd0e0b5e4011c0490f95550080c"; + sha256 = "c4c2898ab76c530dc391860466c7e7c2cfceccd5c4a281af916a64bc9844333f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/hsb/firefox-106.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "aefc788cd53e96eb91635bc0b29c257ca5f6eadcd349f33d211a69e0c35fb633"; + sha256 = "366cc0ad32317e32fadc3c78421713f063c3290029d4d6c2662557c73124f129"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/hu/firefox-106.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2d9b5f4f8dd3fdd10316c4d63bf5c5177831489499adf27d4de6d7dd2e860964"; + sha256 = "a09357f8ad8fd06c80336902d6289f30c0e5d390c1ec605ad4410ec78013331b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hy-AM/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/hy-AM/firefox-106.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a399698df95f954613020654c9a088cd1929d9f772a22a388d3f39861f26ff98"; + sha256 = "137e8bfce4fa4a4d24b7fbfafb0c6e626280d684a80d920e92e10d1969844b52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ia/firefox-106.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "51f3425e0769384010c7a09914410ddd980b11e098b07e489f624302a515a33b"; + sha256 = "d64210d5b787f096d023fa19e5aac611326b998b005a2947971ccd67db8ddf4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/id/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/id/firefox-106.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "70ef6ff4532ab0c3b65770d632ad56dbddd08bf23e641b16a2d2ef477d13682e"; + sha256 = "e10a323f2d72586d215eec35f524acafce965ff955c54cf954bbc95992dd8b11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/is/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/is/firefox-106.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ad6aa8a533a00a2a2deb2b0f3ec89f4b3fedbc4981c9efe68eaaf6df8aff7599"; + sha256 = "a0331d0f2e35a305d6a38caefd93de547d8b0a1b2383e651299662a139f6efeb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/it/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/it/firefox-106.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e94457fd250270e5814a463e6d27e1b23f3d092ed9af0a2c8341eac238f598c9"; + sha256 = "66917927944d966c64145e61a901ec7442a1b8ec7019f252cc62f7fc33791ccb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ja/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ja/firefox-106.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "fe2c1e465e2bfa951e516e83b00de06942e496f8c49a1263397d7bdc1f842c8c"; + sha256 = "670e93ffc4fc2720671d7785d17aa60b2c2a1636c7f5c924c410dc696ffe94fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ka/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ka/firefox-106.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "cdea26f06a2022b1dc257345488befadc7d56846f058b8cf4c13428921d8b45d"; + sha256 = "7d37c71122582b4dd349e3be2559cfff2c6d7282405230a862ae6813db37802f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/kab/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/kab/firefox-106.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ea574431246be1f4255c526d8f22f6a93eb013236531fe0c8e82b84e3a332ed1"; + sha256 = "9a9070c6dca44b706dd45f1d7b3c050d5d22c48aa66b8f59da8070bff67c161c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/kk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/kk/firefox-106.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "09bba91f39ba55c982859be6f9f35b6292c7501d65b5f91205f2c281962b5673"; + sha256 = "6fee854d09045525b4496c69b6ac2954c707a9b428dd2e2637be414868181a52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/km/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/km/firefox-106.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "0034438685615cd9a60ae185e28f1536d85c47e7b2f2673c9754fa49474ab079"; + sha256 = "79258f0b3f4f1168a630bc6febc1b41b9eac146961911e3f71480684c26b20b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/kn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/kn/firefox-106.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "f39eddee2312c72573982e673986f15feeb080b61248d9d9cbe2505643a89ab7"; + sha256 = "d168d17bda835f9df79fde9a25825dabf1c1ddd46640b63e1180fbce21f28a11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ko/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ko/firefox-106.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "533f070343c7ad16f588c3e1c95e9426322f9125f0ec6e44ec14028a84c795b1"; + sha256 = "2e01cc1b4f80da8f150fe0439e573d2b70a484acb613d051e10450dd8fafb3ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/lij/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/lij/firefox-106.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2ccbaa80bc62059889e40d9ac942afbe4ea1a4ce59443fc4dad1496cc5b111b4"; + sha256 = "0add5b6f6fa18757c1c5d4e85bd0d0b3d11fe7e5dc4fd4ca6220ec14a05a3a7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/lt/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/lt/firefox-106.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "1414dc3341af8fbea50697f1c3d2ef82113165fd433301c2cf855496e48851c0"; + sha256 = "576b1d2c13519a5b456a031a571ccc9b66d19bd61eb55b874398dd42ce2e0c0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/lv/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/lv/firefox-106.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "2a5b9870de4717d3c38306f761db12ebfa3aa168a4853c2da112ff90654a1fa6"; + sha256 = "3efe9ac444cef5bacc06255520de2aa6da45bc2129debc649031d6c04aa56292"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/mk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/mk/firefox-106.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "2fa658a186ea7d45137d4733bd36228165ead1344c0c5a55f5d1f08cca705d26"; + sha256 = "8ead3cf9b0e703fbc2f16ced309dcdc6dc0fc4dbd5f48bee9e1199c67899f83b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/mr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/mr/firefox-106.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "c84dad1b673bebd621c671c3955dc0f74dd0c33d5fea0bf984b323baceeec753"; + sha256 = "fdc824c3cdbc8d494a7676bc4201867e8d40df9b8d52282a6d025bb07ec183bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ms/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ms/firefox-106.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "3874937e10203c29a7694055eb94c21fa21c22eed84a8a784df0a6c2db3af628"; + sha256 = "07314a76a0de637c890d31e87fc86fb786666e804edaad8392e63d6b13c97801"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/my/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/my/firefox-106.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "0458d73594a7b6a893fbe238f3c04040ef465ef24de99cf93ce63d2ee138a6ef"; + sha256 = "34b4ef6e06c84860930e2cd8cc2ffd4d2089fe9f957f164fa60ee60c3e27a670"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/nb-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/nb-NO/firefox-106.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "627e707144082ba5b517e81494d897a7ba45037bd7671e51a31f050f43c893aa"; + sha256 = "bd78999ae613e35503df88c16296f96e13b077241c266f1dfc2cb8e88f766024"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ne-NP/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ne-NP/firefox-106.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "8e3f0eebe18515d6ba3313647ca7eb4b47a5562aa6d98fc5ff03f76c19a9f195"; + sha256 = "719dee950f25b2802ff329e2d5362df8d3c27ea5f97a02c626cf60f83bcd0e8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/nl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/nl/firefox-106.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "c01353905bb853f9bb84b6a57e659957f056bcec97f909429a11afee615fd467"; + sha256 = "ab5a58486c7da8b4b9d619a876e980b09993014e1b50ebbbdc3a53ab03b5d3f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/nn-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/nn-NO/firefox-106.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "e7f32834243ccc2750f3c910a77ab3ca23c2ad20a25b36f46ed158dd8a2b6ff4"; + sha256 = "f7587731395794edafd05ddadd18af09eb662a24a640a1489626854929bbdd6f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/oc/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/oc/firefox-106.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "68f961dc9cb1736788d24af07de2ff898203f83e22a104b4753b9ca5975eab01"; + sha256 = "39c62c38fdf124cac776bbd3fbd6a595415fbbe850be6464fe1f3cf1be93e768"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/pa-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/pa-IN/firefox-106.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8473afdf1cd2f401d590b590572741bbb9a9d6de813d9156eee9f211372f3919"; + sha256 = "ae5464b38c0d62c36809d1cb0fb39a4a255a98d3f2481b72da4bf55e06e0d52c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/pl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/pl/firefox-106.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9d0b27ca2d551dc1b0e2441e42ddfdccac9be9c55fbe6407da62a13a812d6c2f"; + sha256 = "8bed3706c4014fe7d2c6665401c94a0ae7afe53368648e7443e1df752ca9bd1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/pt-BR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/pt-BR/firefox-106.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "cb6437c603f99b6fffb61068abbea8c14ed918c5f6014cf74c4e07061c585c62"; + sha256 = "f767971eb37f8ede6bda836ef5ae28de2a22fd961b9fbcabfbdf86af3fb12545"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/pt-PT/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/pt-PT/firefox-106.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "3e77d7b0d5defaa43b2d546acaa432386cfc1a7500080381b7f0aa7d76bb3f8e"; + sha256 = "34ef843b85b80b41784df33f6113683a59e5750e886f13fad2117137beca7b10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/rm/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/rm/firefox-106.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "401b0c3c8a20f8e54fb7b4efdee8ff5b87b2e5a92f810ebbbf95ca29a3d198f8"; + sha256 = "e3c639b929a4271890ad0dc30f08ba4c55cda28ab1cd5e06bc600159e189f3f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ro/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ro/firefox-106.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "7c8579b37b2f87221484cf4d9b91e0ce07b3fbe491d52045dad5a99487014d3d"; + sha256 = "2f408339fa4ea283988077bfb9bbafcb92e7cdf7695fb27fea14c3cf012dd4bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ru/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ru/firefox-106.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "b09f65afe0fadf16d7f79c9394a32ec01810e5ff5d6f579a134f1af2a9572b5e"; + sha256 = "509be703ba720c4370899113f9d707834ca9ede13c9f6c70694cbb2569b95f30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sco/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/sco/firefox-106.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "4c3ab17ec042eff2f22e64d8e13fddb5bc8c2f20b50e5c2f270dafbb8e291734"; + sha256 = "ef4c8bb53f87977335963ef7478eb815c7422f2b2ce4f4acf3a3679e0ac07dfc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/si/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/si/firefox-106.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "29eca6a13366388a53d2be6ec5ed0f920162658778998f5bf4db74992d4c822a"; + sha256 = "1eb58e98f806b62451e6b0767dcc04f879fa5b8f20ef93dc52e14684f043b290"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/sk/firefox-106.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "f8f15fb9d5d79a7c871bc85e9d307c9f80c9483effae44e785eaf9366e9d965d"; + sha256 = "0cd2691ca65ddb7b4b0bf16b0b9cce3d3d4c000e7f2ca28f5b2d3771c9d96480"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/sl/firefox-106.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2598d5da878e9191d3afd09c763f8fa8810dbd07e74cc7e606be16b662ccaaf0"; + sha256 = "f4a68b03acec57d119ffbb47648dcf8223561501616f7f7ee925e2ae26dcb9d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/son/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/son/firefox-106.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "82195883335e0e519e49bee16e74658346ae746fa8dbba7f8e93e54d0af2fbd8"; + sha256 = "b739bc82c76a4b3955ccacc44c9168413635b7bac63893da3a7eda9c7c3b8bcb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sq/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/sq/firefox-106.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2539b349125716e96daca48728bc630fef26f7041ff9555c05d999da249f30c5"; + sha256 = "f5d9c509c4a367b5497612e68af9609ae986a6fabdca6027c4ac0dd1a6de44c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/sr/firefox-106.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b83878494c9d2c00576456f353fcebd451741d806d4f28e3bd471a79d50ea1af"; + sha256 = "e49535fb7c0df0b3dc018a8b44441408d1332c98e7753ac191c0d1f54bc3a6fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sv-SE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/sv-SE/firefox-106.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6401bd691601f5ce3eb6dc15bbf317601b1e6f4538a34029a81dca9db2fc2818"; + sha256 = "7ca9bd5945e54fb0b94d2866c94779ff015d8123e74898a440eb171dce8e1afb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/szl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/szl/firefox-106.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "2329347da1cd23f925a00c30119c27e7bc3d51250b65f692b098fee50ad95224"; + sha256 = "103fc014424d95f7ea916505361e93b6d17348ed6dfbd66e56cce39bb2b03134"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ta/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ta/firefox-106.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "850cbd19a1a4f382e9457caa92f0a2fdb43a11bf7351e0d2b291eee48f9ff8e1"; + sha256 = "2ffc06cafe43074c3f907e7e4bd035afdfef84bc6955463c7f7cb56bfd33584b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/te/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/te/firefox-106.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "b9fe3a5939eb5590692533ee23ce60063b11531480d4161de5722dea6e98eeba"; + sha256 = "e8d594d166bc04262115cf0a732aa71ba3e156a1bd75d206468de457a5842758"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/th/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/th/firefox-106.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "7bc0e3063692bcb8b45ba8e1f66adbcad564c2f26a4ce86e064cb1e65868ae3a"; + sha256 = "0a02d63c62bd72e56e012ac929b6afc29862ecdb44fa3632e4c342b690dbbc03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/tl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/tl/firefox-106.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "8cd7a5b6a8ad541f221785db3eb36d57fa881940e0f6e3f815fe25521efd9b4c"; + sha256 = "473068cc7abd578ed767239beeb093ad3c7f0af3c96a19a14436f11d500307ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/tr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/tr/firefox-106.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1cd939b803cde0ae9c492e9228c25e5b5f3ee791a0f24e78487453c9da62404f"; + sha256 = "45225e3a43989061e44bb2386937e68e54f0fc5ef5b1890afef7b31faefdf522"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/trs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/trs/firefox-106.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "822f95b96f3e4bc5443a94d5211bba78c97522851b4bbf140505ac02f4568582"; + sha256 = "4b9e67cf20dff22c963d6c478253afd63e0325a89a9c1c4b7a890b018e0d964f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/uk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/uk/firefox-106.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e8f636cb417047c77a172a408897dc4c561a791398f0ef67109d442296e83c7d"; + sha256 = "d6960fc1987fe6889f285decec8f4148797bfc07777780c99629b2e81a900eba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ur/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/ur/firefox-106.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "a5d34b9c701f6ac3d7bc9d489fb745b6e1918a32134ba2a46602b0dbf02cfd71"; + sha256 = "065ba756eedfcf3987dbc4b20b2800db24e66ae9b0d664ad5b839231c277c4f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/uz/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/uz/firefox-106.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "99b5cb40e2395eae81a08e4b35e493783b3ae9974bbf8ab07be19f06d7083196"; + sha256 = "d37fc13e8d4e75b1fad0288a44ca45e135e1ae479db4c3b84f0bcc2628ddd966"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/vi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/vi/firefox-106.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "b7f9a9ff83528a178271f11468cbb44061a338d89f0b81bf55173dede0104651"; + sha256 = "e0635391843d343a3393363462795b22a889a4b8f42d29538c1a2b75a518fc43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/xh/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/xh/firefox-106.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "f56cf5d4ec969ce37c50380e10c9c705f4c4c024243e7f240a85be1643a4218a"; + sha256 = "154ee128d4945ed37ccbea334021070a4abf5f4d031b6f507cc6b54af2218cb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/zh-CN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/zh-CN/firefox-106.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "98d28832e91435cf766f8600eb234618e29cfc924338b20b5839a65f157d056c"; + sha256 = "9e19077947e419b9b0cff04ef8351938c6cdb7ca0776a01fbf435b8ffe4d94cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/zh-TW/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-x86_64/zh-TW/firefox-106.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "a7c8399e074762be8bd4db9d35b16a7c4cfe77cf652bc7171026049b2294a9fd"; + sha256 = "0452f1a544c09a2968400d75055b83314c3e27c468834516fea36bc365f95e4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ach/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ach/firefox-106.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "169078c74274713ffbb76cb8adc528c6cabaabd1273c9ac1a95cfee05aaa7bef"; + sha256 = "7ddcfe2286a7f76bc4425d0eb0e36f14535d7e367da0646154a746b911b08418"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/af/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/af/firefox-106.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "e4242a1757a8b99f546fbc744afff0c1522404a89f7c6e9e1aeb818a2a6d4bae"; + sha256 = "4ed067ed2ee93644fce3d1e61d2d6442e0899d0a1b3691b1d147843487b2928b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/an/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/an/firefox-106.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "454a0c854b3b79d3b95d9867a020dde2f80ee3b0f0095df9c4fe2a9df9544551"; + sha256 = "eedb7406a87afbe55058fc83911b74900fc05c7cf465ac4351707529931092db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ar/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ar/firefox-106.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "9cb8ae5b764d5b8f5256486039f8408895f710620a3a9e12ecb161bef85d53a0"; + sha256 = "37e3e257b900a3fc05bb3b915621024d81bc04da21554f396e8702d50decc0ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ast/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ast/firefox-106.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e4c5d5fdcf8046311a838d2240a667681e88ba54c8e23dd83b9eb63585a652a0"; + sha256 = "fca0e482392f9c6d279f313ec268f58d1ad7600f09050dea921d129f770e4348"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/az/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/az/firefox-106.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "1bf60c9297ca771568fbc05b5cdec9ea8b9a635db1892367bd7d56a8f7634fa3"; + sha256 = "8ec0f6ec976dffd6150712d28fbb14d7eef2a10e5e3250a6e5ddc3d568b62483"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/be/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/be/firefox-106.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "f446ea1ec69f709f9414b1ae12ed1f743ddb6c51fa4934e7045fef34d6ff69fe"; + sha256 = "825f6b10c23195f00c6450dd32fe1f1a41afeebd3b08305f60ddcfa07d48e669"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/bg/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/bg/firefox-106.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "794a41ebcfc905628cd4c79af06e044c63c6ff2121ecf35d99b414e65c897a36"; + sha256 = "b2d3794ba2f6a31fce5d6f3dc96cf619b099bd47a45b17f795ba9c3a7a23acfa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/bn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/bn/firefox-106.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "f101f45d4de2e3fdf0e6d505982e363f0431d1955f95e35afc0bbac8d5e38bd7"; + sha256 = "1fcd45de7e29f89b8463fa512f7958f17a81c5e7d72896b150336bb6adfd1818"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/br/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/br/firefox-106.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3285c16382a1a53dbfb97c6ef5cc248efa136737a8ab163d011bfefc8c3dbd48"; + sha256 = "5f4d489cd0167ead702b10f3b58a746ff069c04e9e195febf5b21471b1a6ca76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/bs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/bs/firefox-106.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "42f651f98d3a55fd7e0839a099cfd56ca4d52042ff77de5380db2941cc281ce0"; + sha256 = "2f7b2516820b5a984d468cc5fcb856c05a9a71670d459833997b6db0fe5d10db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ca-valencia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ca-valencia/firefox-106.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "11df86cb15f49f56cd342dd6e1bdae85c9be3c5275b309f4c5c69ad788d64507"; + sha256 = "abbb9608a45ae44376f353372ea0d4fd74fc58fed2ea817f685ae0b723314133"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ca/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ca/firefox-106.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "7171df8a1cd84e8a8037ed4403abffa84c3d6f962dcc8536473ed1032eb44497"; + sha256 = "2e02ed37b13edb838d8286163bbd3f8fca84310d369faa23385bda30df2d94d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/cak/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/cak/firefox-106.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "defe1af608fbd9feaa67387ab62f261f9ca907d2bd2ffa0221393b83b32e2018"; + sha256 = "fce6c81e05bf7c513d3861f060f1d5f4888313746bb8de31fe64d88a06a71e4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/cs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/cs/firefox-106.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5cd180fcbf478d9f7c7b46879ca03bd043f6d3aff116dc0da82a4ca78f85d75d"; + sha256 = "d93f351edf81d998ae6a2d81b7a17947c8f1ccdcb500aa08438340f30b253035"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/cy/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/cy/firefox-106.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "becd879cd077966bd14463d29bc6bb2661446f4ca5fae88cfd7b6885281931b7"; + sha256 = "1a93457e9e405b177c990baf64c93b45a5fb1a50a5cadf3ae38257480a6768d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/da/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/da/firefox-106.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "fe6d51f6e466e4032b0e676781dcd0261f74202d87141eb0d28886342c4b34eb"; + sha256 = "ec7424e6c190f78bcd9c18851330ed1a3ca241cf358b43ee578522d585e9c5a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/de/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/de/firefox-106.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "3b30a374bc43e7bccbec85b315066262820abcbaca827839cbde81995ca515ff"; + sha256 = "b3329bedac1d4644329a1de28ae2b01c6dd2451b3a0d18f7927a48c18a0fba98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/dsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/dsb/firefox-106.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "84564df51533b11ea8d87c3cf22b7717af60ef82d10480e29ff3e8d6a78c91f1"; + sha256 = "a419634e9542f7a09deb0abca3794012d6fa5fc87a02e7fca68baca158360515"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/el/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/el/firefox-106.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "1a714aa96e1b1b8e703342656dadb3cb69e71c3ae500ad2e3478c7595845d961"; + sha256 = "76da46e58ac925e99a4a0b5d14513e45113782dedd23dfde4a1285212620eb7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/en-CA/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/en-CA/firefox-106.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "615bf2277f21cdd78977ba69e650e71674ee5dd9bc8b8f2494a58b384ed504da"; + sha256 = "9f556862c55697963c437fc91ee02ce83d895984647574cdb8f3db125637c216"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/en-GB/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/en-GB/firefox-106.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "56c164907b01f1e82a93895c5a0eccd9ccb5263bdb1f1994152291e72adc674f"; + sha256 = "ac66ce286de81500af84af2a7e7686be1ab4dd495f46d27b2acd6be57f95174e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/en-US/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/en-US/firefox-106.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "50493199497b216f1be3bf25ba86364806eada947112f375f59bb7bf354ca8a2"; + sha256 = "80da60ef5c75a36dcb501a1c2cd77c7a12ac4e9cef219e836c5ed001b494dd7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/eo/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/eo/firefox-106.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "262a430720e18cee49592f9c0dcda721a6011b44ee67d45a827cb6a962fc727a"; + sha256 = "5b5fe4c594e01b03347b8ed3d0c4764490a04a03772731d3da81cb67fff9a6ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/es-AR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/es-AR/firefox-106.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "811a8106f0e1582deddf17cc06e1e897b9bbbc6971ee7b918b435e94091b5dde"; + sha256 = "a3e73149c8e2e43473a87fac7436971e8f063dfd5b47ea56fea9271c4a1aa699"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/es-CL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/es-CL/firefox-106.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "fbd830e4167439ca683a85a651bc8c775e041bdf36f8a37e620f0a75abe9a414"; + sha256 = "8f458a1c37d63dec999d4ab135ad6ded101692d9666e0d1a188a06e2a3b12997"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/es-ES/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/es-ES/firefox-106.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "41830935f8a966c2dedb9273bfc4d0a621c57a9e0a4ff26344a02f28f9d3ced2"; + sha256 = "b7611f34149c9fcec3cf0fc0463c09ea2a70143c85c0891d5ac096d1c62b154f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/es-MX/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/es-MX/firefox-106.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "9282891f005799dfb6e3de35c58c83d56a7f54ad18453cbc9baa353683f41062"; + sha256 = "788f9ccd60ffcce5a57191c0c2853bc587a6c6baff2236d2e13e81ed8b58023a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/et/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/et/firefox-106.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "30156bfb0e8bad70f2d7627f715f88a01bdcd386f413e046f1870945124bcbfa"; + sha256 = "4a170edc300029e8848faa2484ca18c1df217f22bf7fa2ec5faf1902757e5092"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/eu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/eu/firefox-106.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "276d3ed3317085eb0eb8cb1c579cd06ee12f7b615599f3e3dc1428758d7b2c78"; + sha256 = "6ffade19d934bd6b26d089dd9201435268a5c584bc5977a949d8c31f5d79b6f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/fa/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/fa/firefox-106.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "e91dff193a088ab5fd17f918e85adcb99a9d6971df59f0934b933676808a44be"; + sha256 = "4bd931aececd9b03e5ccd37b7d89808184081bad17f749dc2ba30294cad49663"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ff/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ff/firefox-106.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "1ceb71ed721122af040cf77be246df18a5598766b8e4288f8f16e2127ea2308b"; + sha256 = "279262ecd59cd2e0909a541832640121e2f296945c792c7bac656c4ef4b2aee2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/fi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/fi/firefox-106.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "dd0e8125686a13dc8a7a870781a076256e1797b97a784198cf39399a3a8cef1f"; + sha256 = "90a531658a543e32e2c95858de101e3ad7cc37f520507e33d44120265ed8ed81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/fr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/fr/firefox-106.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0120c5b797070f7cd3b3fd12bf83a8aec29c423ed9633df4995f653408492c49"; + sha256 = "9b9b240e8b3fd09aaf72fc04257c83e1c4da8d0e18224a2eee15d4e1fc059cf1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/fy-NL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/fy-NL/firefox-106.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "cd746b723f847bcb428b92d53e86a0a9a566f7539aeccd982f056cd3416c2a8c"; + sha256 = "37573ab88a9d4d0f7bf73bf4e5c992eaca0bede036284994fab397ef035785a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ga-IE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ga-IE/firefox-106.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "2c8f04872e6da8dcdf9a5cd6b39b2b6d5d16eee1b75180c829e75d040ec0e108"; + sha256 = "923e4ce3de2f0dc861b0f580e4ba4a83c34f04f9e5a9b262232f0088afc94a9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/gd/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/gd/firefox-106.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "974558931565de0e93fd95e8af46e8203ee3d50c7ed74cea3e1cf8d9a231dbb2"; + sha256 = "32a1303e3e42b4496fbc565d5bcfda73e54f51b419acfa8a0f9612c4a04b9506"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/gl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/gl/firefox-106.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "25c7e7398c41e698bbc1ef60a29ec67ec6b4cb0d5970f16e438d0251c4b233be"; + sha256 = "762eef980d7152dba2f1658dfc507a59d53930e95d86e1ff51fb5e5ac3f1ee01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/gn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/gn/firefox-106.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "9a60eca480973b4d17cc61ade4220db856afc3fede155cf20cb7d3d1520edb19"; + sha256 = "237f3385a33dd6bd64b62b7125999dc264c85e772bbf3d4109d45846b3aa36c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/gu-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/gu-IN/firefox-106.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "b5dbf1c01e67bb8803300774eab8a2db1090ebced6b63aa95731bbd3e0ee5c92"; + sha256 = "9c0312960163c5fd751a628196f0586a7b86bd2db2bef57a27b1c89f3837e6c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/he/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/he/firefox-106.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d9fb27f016bc8ed15582c064ad616ccc0aab11ad8054d6b7cef79d552658cc00"; + sha256 = "28035e6a1749b928306bf3044f29ee3e25727872927e2579a31d40028b3201bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hi-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/hi-IN/firefox-106.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "427375be41df65c7b42619bdf52d7ff74cc6019d9d95ada7cf0abe388c430bfe"; + sha256 = "0bb06ef91899ad6d310e510b9955b10af932b3e5ba60c35979a8247e4400c9b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/hr/firefox-106.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4142e5fce3fbc48e71d62635958d8f91ce18759066a3808eaeba66b8560cf683"; + sha256 = "61f84ec81ea55b12f44e2fd75586b3fb77e81f5a507276f7756bf1ff2152bcda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/hsb/firefox-106.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "282031c7b262ee6e25cd8a8d7358f4067de7ded90413c5e6fc2f0309733c0df6"; + sha256 = "21bb5259e3df6bab36619074696d65c927f5b72b95c273a275af91af8b68f9c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/hu/firefox-106.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "82c9562e6e00c508675ce68a95576f5182377d69bd6d88ac852501b5a68b38cf"; + sha256 = "fbff0c74f2f2dd7260b02998b4464f99a6a5a97a3f7ab03d24db26733a4f2d84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hy-AM/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/hy-AM/firefox-106.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "56eeceb75cfdb3289ab3676fbd11b00b9a2af5ff43f635e740690bc51c56b989"; + sha256 = "da6287f72ba79afb290cf36eb14e3535eb5b31c6ac5b3656de0d801db9fd6f10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ia/firefox-106.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "853a3b4f646df1f1a0b35bd2b5adc1037230fbecbf3e3cd695e23d650987fe5d"; + sha256 = "3937806ce4291210aa41ec3a6014637415013ad754ca2d5934b9a2aef9e51990"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/id/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/id/firefox-106.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "88d9b1afcb5b0ba2e9ba15e4cc3c4db1c70f3f7c3e610d1673f7e6a79730676a"; + sha256 = "894c02e2533b6286ac7b4c01ed14419c4a3dbf63ceeaf08d1063d2231c07feb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/is/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/is/firefox-106.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "17b81b21f0b29af20b7fe784291ce82af92c2f500826a9317824589cc53fd531"; + sha256 = "8244aab22d14f10eff5e1dd5611cebb41bd8ff6c70305f6b41309348f64a38cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/it/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/it/firefox-106.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "accc16a4e97055e20d2b43cd6845a1366d98e47e82210fa64205935f465b7905"; + sha256 = "87ce1fc0221be982ceb34a63dc7741ba4ccb4feb731301246f5fabda2c849d10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ja/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ja/firefox-106.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d33537fc124f00aa026d7c38516c57abc8db96c91683283bd4e05a6913c2e4f8"; + sha256 = "4670f718fe6b763e81db0c397afda0f8023f7f72af2eff0ac1b2be9dcab09b4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ka/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ka/firefox-106.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "7b2f82de48d51c3974f5f6d288ad36ccbb1c2c81a1e552a79018b769cdfad897"; + sha256 = "9349eae96f436e3acc8b228ae56221e11dd04ab70e961769a4a4af776cf36d0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/kab/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/kab/firefox-106.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "199068a45daa7969f76eda767a5d93d46a50a17deef61882f2735df595aac59b"; + sha256 = "eb18f9faca92ba1590a60b332fe247eebf4ec5acaf1c29a54bc6f8c453eb6ae5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/kk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/kk/firefox-106.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "00fc43c92a23afc23dfd5a8898aefa598ad43b70364024659aba3f30f79d1c42"; + sha256 = "75fbc363dc259f311469817f540683de02003b098476d5c8472be23bca4b36c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/km/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/km/firefox-106.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "34aa8d09cf26680d73785ecdb437f3725e869c9f5228d732bd63ea59cee4a413"; + sha256 = "a69a970684800cdf04f47d2ef496786067b3f155a1e63635edce49f449daa485"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/kn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/kn/firefox-106.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "e32ba6af267023b41228fff4846494f57c2716f473f82b1c496402a770bce2f7"; + sha256 = "5622ee7bb68734dcad4b660e4c354c2cd871633d0dcb64de2bc677f9b33d9e78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ko/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ko/firefox-106.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "79c749404b273e38c5e55f9aa826008948113789f8e4e8d081fb6b1373c90d84"; + sha256 = "905376d5f7a99ccd306c22f8cfc5de997ac83f95e3da94dc017016310464434d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/lij/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/lij/firefox-106.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "cae6d39686fb95b24d49384050c0ecdb6e62ee3c6ca5e09b3060df66eb6d8ab4"; + sha256 = "01875a19973b9de6d7df36599130c8cc09246e68f107e76e5ece393be6f85e7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/lt/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/lt/firefox-106.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "587b6e65835fafc7248019796ad8be5f66e76711a501047c1bb3f13a85405ba4"; + sha256 = "6eea9fe10eef5fde2c0b4f2b015c733241e3f6277b9c79ad8bf3c694adb42e01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/lv/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/lv/firefox-106.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "ad0b9cc6999fbf2d94c31bc1374ad69b63d055e95e472ce78989b717411b7b06"; + sha256 = "2924e91cd66d4c27daed5f97cb7fd637a8de715afabd7165a4e8ef40f8b1fe99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/mk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/mk/firefox-106.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6157eb460916c3380c482de68a90efa56ee34ed5726cccc7f4a6b6592f5e3a4d"; + sha256 = "65236b18e53a659041d92f065e38a535164d31e8668f022917369bb6d675aa14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/mr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/mr/firefox-106.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "1bc36fe6d9c1053251273378e88d0fee9390473d2e4727daa3f6ada440d5daee"; + sha256 = "98dc87f85ea2c4b058c3693cc5e41515d37fab4bd67652a634fc46f1bb3006ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ms/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ms/firefox-106.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "39177d411723ad28f4b7c5068d2e170eb1bd24241304052473185d72ca05ce84"; + sha256 = "1e78ec58e43f92d4e68dcd4a2312815d865f3d353b765364cd7703d6937dbd87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/my/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/my/firefox-106.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "acaa92b8a029f8207e150f8417156aa474e28af775199b7a9e4ec9757ef8c0b5"; + sha256 = "af2de02b8e6ca8985312fcbb9bc72214bd9ef96b67018771fe02423448846d5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/nb-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/nb-NO/firefox-106.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "177f0dd59c5d463937dce0fedf18841cc6cf7423decfacae5347ae580aeb6bcd"; + sha256 = "bf9fedfcc944f561f47488ada0799d67c393355b5534351b9128fa8cc7f28a53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ne-NP/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ne-NP/firefox-106.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "246f98ba8548543213e6e15f1c33613dd7c4d718d23c6c93c7453dcde63c2d46"; + sha256 = "f56ec0434f53094dde70fabd48c811c50454db36c10d1b5ef3baa1b6afb3f9ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/nl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/nl/firefox-106.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "0fde142970d72d4f1bf0a0aa9729a2828172856697440253fef2c2888ebbf077"; + sha256 = "fcbaf3329d7881b1580a3d441f1ef5dabbb326c4d3ce85170bbbfa8eb44f5474"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/nn-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/nn-NO/firefox-106.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "2801c4a9db78587d3d5a4d817cdb6551551c6daedada650b658a94e0bdbca91f"; + sha256 = "0883c23897ff9543bfb04d71e8b783f02062c32ac9664dfeca0484a84b267644"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/oc/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/oc/firefox-106.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "db851c61ac83f4328b97fe95e377a748da500beca19f2eedfd9b58abaf346239"; + sha256 = "81367e6cde9aa7cad970fd8946f0b6dd1c8d27af61ff8d11271f0e741077d6aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/pa-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/pa-IN/firefox-106.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "bbc9e82d30764efcc9e5168fef26c8d3ab141af6a2bee58007843b5dc9170ef8"; + sha256 = "effd52994aefdc0019361483f78799c1205f03bf6882fd9335fdd1d7e55b7356"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/pl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/pl/firefox-106.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "cdafd35d0ff5482477f0942fce33258974a533371d55e2a4de7c7b5f0ff17b0b"; + sha256 = "c1034d37df9f66d19a243a07d6f3eec4596f765968f66271b170e7189128b709"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/pt-BR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/pt-BR/firefox-106.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fb80e5442da92bedecc4a94f935321ac70c3a57072e115663243287265d9ce7b"; + sha256 = "691380fafc56a1144985483266ed4c9ac1800ca1d294731fba08b9ca04033e87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/pt-PT/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/pt-PT/firefox-106.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "471daad9a2ac8bc4df475bca4c6f8ff940e545b9171970c01ed57b173ff820ff"; + sha256 = "314cce53df018e4ce2c8b5beb460ec5933b1146b2f35e3105725d24072395b3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/rm/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/rm/firefox-106.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "993751ae6469b7105cb187952570b1b4e87f458720b47576ffeccb50c7b9f52f"; + sha256 = "d75782064471f8e2417b9c50414734a8d482d4335ad0bb54106c29f008e01089"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ro/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ro/firefox-106.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "47ec676324b841bcb9cf366176a394640f9b47c181b5a3a818342b1692e3b1c5"; + sha256 = "778f33dcf00fcf0c1c0d5c354d0848fd3b37d9a8ed14394ee34b48894e1b5556"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ru/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ru/firefox-106.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "15dc118027eaa0d7d063523aabba12b46920405076c1ce238fda62db2b4ee7e4"; + sha256 = "75ac9c96c1357fb989b75a3c2192b5155f5f60d3c7108d30d6dd9f28a6b456ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sco/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/sco/firefox-106.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "82476bdfe8ad10077e32b96789c5fed32eaeb5c907650e003010203788006bf0"; + sha256 = "52067dc01bf3c1543ddd7e3fb7301ffda1dc42d5f9cc7a4ff1170f8e5527defb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/si/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/si/firefox-106.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "bd2e414bc53a2f13cb36366a0fbed16dac9aed3e777553e1fe052f435af03bdb"; + sha256 = "0afe6495a3c68c53616752466722a34ed9315cac88081cd92de7473d5a84bb0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/sk/firefox-106.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "4c6a3a51cfe0ac744b1f7940f419b78d67033733c9ec141e6e117cb80ecf8dd7"; + sha256 = "9a0765b70801fcdd9b71f07c0ada27d77ea8736f870a2ebc659c454dd7aa9f57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/sl/firefox-106.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "305cba317b340a649a531c493801bca0533e05b68b7b8c1c81f4970cf57a1d09"; + sha256 = "8b1cccc21530f8386a1fd41a72e0ec77f3d12abbb3de3ed50e508f9d9aef093b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/son/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/son/firefox-106.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "88c43f4fd4c61a1cdbd6109f65bb27235e22f471c8091d52890c0dcb8bf38b48"; + sha256 = "5cd84cbc6dc77d23895e3abcd146ef9264efac25ca7352cafe2d5c5075b67799"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sq/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/sq/firefox-106.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "127e042d07e6b56e2bc177c05a09a6b712ee63fbbaeb4a90d4b0e9775fef7aa2"; + sha256 = "dc981d039848dd5b6a92aacce5b597b3f9d47cd731d73448c3c66f75977397ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/sr/firefox-106.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d08f6fba892fb500924d2ed2531127b6bf51b7b9d65f11c36ae3e05adebd1a71"; + sha256 = "ab188a37c103fc99be79d7674248ec628d170c72e30822d4b61c77838d329465"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sv-SE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/sv-SE/firefox-106.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ef56a2f2acd15e54f831f0e0c4a55506c3ed8ff1d532cefca86f6fdaa5b14d21"; + sha256 = "0545988d72226792a165b6efa6d2cc5fbcc2a12ee8ccd797e6ba62d476bd730f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/szl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/szl/firefox-106.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "8aefe66b15188403a200cd215c89da1b35998d5a5cbf5519ee05160dc98b8e10"; + sha256 = "95a0de3340d6f739a0e31d59d0d077d0f9773a3c7f83604068f4f10b414d4420"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ta/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ta/firefox-106.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "427f704d4d0a533b76f120d10164def4da34d0292870e728dd3019d7aa7d87e0"; + sha256 = "28d987dd792b9e77e460d23bd3d04005ac2f041cd3658feeeb4f827348beba6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/te/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/te/firefox-106.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "7edb070de265f08795b5808dc1bdb6f98b17b22b7a1f8cbd449de5e54fd2c4c3"; + sha256 = "21b7ccdfcf77edeb9110880208c3bf74adf99986defe570fbe095cde44fd93af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/th/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/th/firefox-106.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "c618a55797f8dcc66efe766ed00ceb8a26768fb8873865d3a88c721e8419fba1"; + sha256 = "3276c6dee7c9714335f5659b9f5865aca423834a88f2a3e594164884dc706257"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/tl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/tl/firefox-106.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d33946e26e36e72e341d7407184806230c5bff06f9d9cd4042dfc723f0283072"; + sha256 = "453b46acd3de9b5d470d04c1f4afbc2c0579bd8fd663ac45a3669290c3fb029e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/tr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/tr/firefox-106.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "38ae66fe5a76b6f86283adbce1e2b47117e69316d4fdf17c68b3173ae332ed13"; + sha256 = "5af1d2c7c55af71798c6766b2553ed1961da03900a4c1348ca4984b381827606"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/trs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/trs/firefox-106.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "0f628d1d423a024491dc1360c5d7ff949061ec7e4b373501f026f94e0725493b"; + sha256 = "3ea2e868c7df4812c394bb614c6d9f209f00e8aec1bd9b363a46b2fc7b451c6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/uk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/uk/firefox-106.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "95ec7c2a00e87aec69055334681a81dd1e26074136bae946e166193b380d469a"; + sha256 = "bf1300196d9edfa174d486b9d811f7d864b51232e4b5b02a6a5b0337cc13ca81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ur/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/ur/firefox-106.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "9f7a89e65ce6e3c286499bc2b54ed86cb4319a509cafbc5705bcd6fd509bc0b2"; + sha256 = "796f2e0d29c518ca826d84f2aebfc36b42892ed35dd7aa7774b232d03d971981"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/uz/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/uz/firefox-106.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "54e32fe8c68655dfd0ac18af6be75f6bb853b4d2f065a021e8042c415fefc90f"; + sha256 = "c70249d8d3e18331021ff98b77f2aa595acd6fe8d5265a34979dc02b8e4dea0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/vi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/vi/firefox-106.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "23a925448bb9bf719f12af2d5d1735d580f1a53f9a7f4d9d0ef351a1d1bc1b59"; + sha256 = "e1d87e2ff57aec8f7301c52580b04736fc165933d2bb5437f2d428f8de8cadf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/xh/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/xh/firefox-106.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "258cd630090bdf94f9df31a572d20bfc6b556527646c0c29e75446c884cda1db"; + sha256 = "6620a82d899f69b661477f10ad7e38823f0ac7dee2091abcd3ff145e7efebd8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/zh-CN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/zh-CN/firefox-106.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "5509842e4292b9b98fe24671643b646b25f7f50a32f4cf75bbe0afeb4e784642"; + sha256 = "84e6f6e6d1960fc2fb0e8e86c1dfa0cd87b14441a96d31d1fd3f817312591734"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/zh-TW/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b9/linux-i686/zh-TW/firefox-106.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5fe8c896bd2ef9b80041c4375a3441707b3719161d2f03e220e54cfd956ad9e2"; + sha256 = "a3a693b4d98f3fc3dc269fb6f9b05915f6bb68d1008f3b0b2cea3406db547bf5"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 5d221a9c70c2e..d6b78a90fecf8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -144,14 +144,15 @@ stdenv.mkDerivation { inherit gtk3; - buildInputs = [ wrapGAppsHook gtk3 adwaita-icon-theme ]; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ gtk3 adwaita-icon-theme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 dontStrip = true; dontPatchELF = true; - patchPhase = '' + postPatch = '' # Don't download updates from Mozilla directly echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js ''; diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index d84d53101937a..9f307fc952457 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "106.0b5"; + version = "106.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ach/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ach/firefox-106.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "8561511ffa05f44e7ecb355e55a5f34debf314fda2db73f9e3b72be9748acd40"; + sha256 = "3ebe56c40b5bf562e2e4eabbe327e29b00a870c94c07ba8810a1df403b16d7c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/af/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/af/firefox-106.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "83617476e933ae50766e48d915716606585e52aadfb0794f2f522ea0249588bd"; + sha256 = "a26e05d8d10e025454460a2659cc56774b3724b13b453131465d94096fc70729"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/an/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/an/firefox-106.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "05500e3cb7dfd8d6767cf1a0a9de36f8e5569f8c561a6c723702373a258e9416"; + sha256 = "91f07dec175b186a3a1c3153754b1461aadd7810336c630b2bf35378d6ba90af"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ar/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ar/firefox-106.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7a084938b7996cf7003a9d351ac6a47d36d1341aada27be3a7b4cd8a904bb8aa"; + sha256 = "57202c3b150d84a7367eac72472c42e1fe838215f99a348ad236a46440d297fb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ast/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ast/firefox-106.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2555cbd082b0e4e94ebbc71f45897c3f2e62703d8f14300360d896cc48d70e86"; + sha256 = "ca2a01659555bc132b62a1cbcf1adc7678fd56dbf396feeeb4930a05d9158503"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/az/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/az/firefox-106.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "71cff2fa458bc664a8fc43f8c94b36dd75b61c6534e45d904e391991dae38590"; + sha256 = "6deb5ec435900f4f336823c3239387fa5656292c283257536c8af2e835f16b53"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/be/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/be/firefox-106.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "30b1055d251fffe08c867e4e17ce564e0cfb98db57c5e94733a462e25a93b357"; + sha256 = "bfad1ca2c73d7207a52bc15cdbda57da44fa944d23c3742286de46b5f5163c52"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/bg/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/bg/firefox-106.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "0fa796ab33be0378f5119f6485310370032b3ff0a265c09844060a16299d8044"; + sha256 = "c8f56d7a61ac8d403f27edb3d69f937c25c19f5b265183f033954a248517633e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/bn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/bn/firefox-106.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "e9167f0d715f29337bc378d0bad08c283b61128d0c6d4d34b0ea9d0230129d27"; + sha256 = "5c22cae00f1a693a70fb97342c812bc5eb2d12ec13367440437a09ac40e7227e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/br/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/br/firefox-106.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "7ffd2f5ce0a865984016849c41c2eec420f65f569142d2999a45c85f88b6359b"; + sha256 = "3578dd15c79a1f7d4b7e75d9110d8717c65e5dd9691ddec8c5b48614918e6081"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/bs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/bs/firefox-106.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "255a076f7d77405a6a9a717baa2e7428810ab2d0e52f4b1b7d3bd661a8e68d45"; + sha256 = "446c9eb257df3876eacb1a8357770b0a5610f4119481b555c2ee03bc718bc5b1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ca-valencia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ca-valencia/firefox-106.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "adea915bc0c7b6b108c78399e1f2246c71e6c52edf68b0acc5bb09b89910c77f"; + sha256 = "b0b117bfe4c23850b37ade82eee9d0c759a0e4cacc5b70b1a1356e3faa4937c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ca/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ca/firefox-106.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "bd57a37cd9d7d7b7fe11d4d657a65edb28f6d8cdf97c618db8f5ee61cf0f45a1"; + sha256 = "1d7715d5861603511216a00a6cae3185cc1b1a729d728a00fa4e78cfe5f344de"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/cak/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/cak/firefox-106.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "064bfc818a73e26b2391af3952419fcd33185b777a445566f7611573b512aa36"; + sha256 = "54ecf36ac07d55e9039bbd0558d0e5c445c9cf71bab4023c15a9259981305e70"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/cs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/cs/firefox-106.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "96f9ffcd5c27fb63322146012db1484f4348e37ef67487ee6ae595785f821d4c"; + sha256 = "e35eab9da83e67fef76685fd7a94abb9539177bbae7131687cd1195bd744494f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/cy/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/cy/firefox-106.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "f33a17099b64ca3a88d53666ac3e82f9d349f17610bceb3be2f2f78c00b442c3"; + sha256 = "4bd53c1ea3742f4ccaf7271bb9b6113173dadf63c1a6a8bac9a4d0dff414b6dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/da/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/da/firefox-106.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c17bd03975c4aea3c8469f16340a50ae55287b1fd9a92223487e5293e6520540"; + sha256 = "90441f376364471a6f7d56ebb07ca25665d31a44b5f92ebe8c4826ae1078cc57"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/de/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/de/firefox-106.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "3b8c84ab9a961d4c0b1fbfcab10a6b38e855bff9b54446d94f9f7b5a66dd04a1"; + sha256 = "0c5d1095f0864098fb584b6d1d389e4b04d63c4281893fa79036d2285a5bbd14"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/dsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/dsb/firefox-106.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "10f57d6cb48e493d860a1fbcd1817224e63bbaf36bcc9bf8d6d56e9e7e07d490"; + sha256 = "1648e34c3ed9e875500cd0000ab504a83f00495d2dcdf7edda5a375e128aaa17"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/el/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/el/firefox-106.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ebb6a84f17e0a0ae677f01417e7e199be75b8888624c739a63be50e7cb6631ed"; + sha256 = "6bd50fffcd3dd60c431f68d34beea2b26e013c6fa9dcf355b1a4bd9115f41353"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/en-CA/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/en-CA/firefox-106.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f132aa451958757f8f8fd1ae82ed0b72e46838ff59044d956edc7242a106687e"; + sha256 = "8c15de5a3ffa277e43f895574800afc8d1b663a1454f32e18da0e68886542293"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/en-GB/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/en-GB/firefox-106.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "733e103756d3e885d9b7dd084448c8ed9158b735615e2433ea2eb35c4aacf413"; + sha256 = "834f87eb566870ff0916d52771ad1dc9be3edc99f5d9638223e75028ec4de961"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/en-US/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/en-US/firefox-106.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "3c5e8abf57742958345d1be9ed5d4cc8096198a8f9e1b58277ddf5dee300df42"; + sha256 = "d7cef4f3c7330ad8b2e92f70ed587d004df97967be2053feacf718b0eee228a7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/eo/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/eo/firefox-106.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "ed02281964a7b63be645a1c0bfa54c60c9c06e17ae46958b4bbe7feaf844a55b"; + sha256 = "81a07a70272fe99118fe866e7d951a7e491e87b2e886e9ed5ce0a5c3e713100b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/es-AR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/es-AR/firefox-106.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "8acea707b073aee74c3a5072f04150b35bbf4e1b603752d3931dca3d51abfb5e"; + sha256 = "ef73fb7d8086b9339f90bc086fa803d18b24dabe19ae4c35d6938afac8fcb536"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/es-CL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/es-CL/firefox-106.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "295208a0fa79f04f27e7d0a5597faa40ace70c425c6236ce5ffa0105d617a68e"; + sha256 = "a32d4e057513e52a59af0d701e7f017b7ddf9e8c1817b5d74334b8ed43b616aa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/es-ES/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/es-ES/firefox-106.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c278cf1a3010f0fdf63334773b37e02a368f2fa60aeb626215f16a45cbea7ac8"; + sha256 = "8e8a263393e8363b3fd368a1612c85ccdb3a773115a9387faf282bd68bbbbbf3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/es-MX/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/es-MX/firefox-106.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "68b8242ce796aef4e08e23db3c804d373e7b811e22759fc0fd4777169e77864f"; + sha256 = "c3a2654f12b4acf0a81135216c3e4129cad50eb7ecf66d977a1bbf53d2b32ac4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/et/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/et/firefox-106.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "0526e691ee552cbf11a74749d2a1c633d84289210ba85677f035565c9ac9f395"; + sha256 = "8510ffc3dc24d2988d6893375b99d8f910defab3ca16f4ff03840d8bbb5ecbe0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/eu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/eu/firefox-106.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "fb8aadf65afcc9503181600eb1c446922fe6d46ba74a32c069b7dbe9acab4f14"; + sha256 = "b7f865d539e4f68f1b3068c125c5170062e4fe475105c081a2253255e34c4104"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/fa/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/fa/firefox-106.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "79f82ad1a1aeacd865449c34c1d7249d62875924dc204e04e9cd0123fad04286"; + sha256 = "2a3a561a0155b5a297e67458cc73f075eab5e203f6c61edfaf4fea16b0c58f32"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ff/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ff/firefox-106.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "c33b13c7b6a19604f46f33e705ea3d950832ea62495ef687212e38d8205b322a"; + sha256 = "7048aedf27c36ef50f8e8f47e84361800cb68488e37cc02f63924818bbdc9abc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/fi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/fi/firefox-106.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "8080d7de2104faa02a38b12700bde752c8bd2b01168d975247c2576e59b34d8e"; + sha256 = "19ffb0b0c7336fd4a2a266caf67133867b7becde145c0e1a0e21f026a4b749ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/fr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/fr/firefox-106.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f552d225f475b428c701a52780824f559659760438928c6ca765fc95888d4a48"; + sha256 = "813d18b63de5d4baecdc4a2f4c1ec456c0a95fff618567339c7a4c0119c0e14d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/fy-NL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/fy-NL/firefox-106.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3918bf4e8662d104255c633e6845653797c15ec4919864b20460520320ec0acf"; + sha256 = "749041497606ee86e47596cbe6e4c1ac5014b35e06d2a371d8b29023236a8bce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ga-IE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ga-IE/firefox-106.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "643808c3cddae4bb84d1e1801e861c82d8254c783a70e08bd2323e0ffc6f1136"; + sha256 = "afa62ee5a9fc30a44a12442f2ff51828d5fde8c09ba0b5d71be5830f14e2799e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/gd/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/gd/firefox-106.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d07e8ac6bd91644e92a81d004f2167b4a0157671b4883cae42e5ee4435bdfb04"; + sha256 = "4da5232a4871e9f6d53feb8af228cf99906f3cb197c90e90d7c76185a05fb413"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/gl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/gl/firefox-106.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "bc844861dedb5a3567f20352bc522cdd6f1517a8578716dd856a0c505f13f350"; + sha256 = "f354d1aed287e2d2ddae35f09b0bb30f546dcca99f710f1ea4ba99ecf330cdd7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/gn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/gn/firefox-106.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "28b2a372aad0253f7c86897eeee1ffbd5618b3adc1795fab5f45519ad8308df0"; + sha256 = "1c157ea5b0e9c2b1c203aedf4e12c5a50bbf4294dea006f4b0d58ed2dc480f0b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/gu-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/gu-IN/firefox-106.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "513eb2523c4ae09c14b7102c09f6fbc6a33f194e0f9c71ab0fbbeca96796d9a6"; + sha256 = "f81162b1e36c55ba112fec447f8a6916e935b805fe7d4397a9cf93315b0984b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/he/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/he/firefox-106.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "20b83257778c16097889f9399f326cbc631fdd9fb3c8aec03e9d99d1af0d1764"; + sha256 = "692da92b9ccf4f99b393d973cdb28050947ff27a8050be5287f1e53f17fe092c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hi-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/hi-IN/firefox-106.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "beb5034ab76c09b605b91a87070674c82a5ffe92da5e8905cade02477976dbc4"; + sha256 = "fd815c9f887ae62df294b9a37922eb648ae4d9c3fe55b27b147fbcaa49606dcb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/hr/firefox-106.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "76585fcca92bae5ea91b2e16d1c38b645d1a5b6132a474be1de070efa7d14a34"; + sha256 = "36a469ffbcd55cc55536cb76cf5f131149c2af307a7f630495897ce83308aacd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/hsb/firefox-106.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "ee3c70ec61475cb01df13adbf45d6f889934e97162662dba56e54a553b403913"; + sha256 = "7542a7adb317b0067062320e1ce023aa99a0ea3ce4b4e9d48e9f18385b154ea0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/hu/firefox-106.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2349d58a9dce6588de0a0afcb28a66269674cdd6b8879a3ff9514a4d129dad09"; + sha256 = "bec7a36369264e5ad8b135fc785ea366ead64495fb2ca9ea4da74b0a7b9c87ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hy-AM/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/hy-AM/firefox-106.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a5429d3282b68498986668070ca1e6b009b2471871efee707df659d4ab1a5051"; + sha256 = "bc700c136152a4a35981062af1fd3a55958c62177325d1fda0cbb2c7556cd86c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ia/firefox-106.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "c00260190fa7f71b0394f33eb4f3955c3eaece1c47ba85eb32c7c61ddc750fb7"; + sha256 = "b06a46c6c851e705364f6eadfe64ed90ad8a815a67f5f8be969ca85a05386bfb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/id/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/id/firefox-106.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1b89d56c33b0b36d16d4a454beb1572a29f21f4e93c584f7282367770f309b46"; + sha256 = "e24eb1b8532cd0dddbad2be8fd98c04b38bdf57f2fca3a19851fe19e96199b36"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/is/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/is/firefox-106.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "64b453f79e65911ebc192201a711439d0d4c2bf31b2757fafcdbaf42e4cdd61a"; + sha256 = "75b0b03fe19b5071fbe73d02f4e4c2e3e51494c0a54be3806027d4dd00b6c468"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/it/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/it/firefox-106.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f199bbd3957966733a8d7b3b7cb365b9d8ff6bb1a1009dc8a444b9d23cf75ce6"; + sha256 = "fed3d54a4ada6d58ecf0c1975a08b1dcd3ad8e72d072c63d991192dd4b07008e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ja/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ja/firefox-106.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "fd671e68f74080861b7671c7c50e10553d3aab4e3bd695f2726eade496a7d462"; + sha256 = "7c4a5cb3fbebc1a3785da5f4c33e01beb078e136a786d07b1c8b9af889d699ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ka/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ka/firefox-106.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "85b4c5e5c1aa54e634db7beea0fd9570aaf7d88753cca8fee58198763be86d54"; + sha256 = "e5039787dd0f5e9f5e947a40a2f676d95603cf6ab05cdff7dbcc1bb1d92b4d21"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/kab/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/kab/firefox-106.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f99f041f9239e4c2f01c812523390bf53a514ddb76dc9be59865f04deae06b1d"; + sha256 = "29aaa921bfa8b08c072aa5ef99fce272d7a272a62873ff985a7f9022f61fd70d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/kk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/kk/firefox-106.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "7b594bee8a5c86306e8b1958418b3113bafeff8ffeab26996b4d61f6adbbc10c"; + sha256 = "0b4d833544b617f6f608668a9c14dafda9c7dc7e96053ee3fee832ea1758e7c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/km/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/km/firefox-106.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "77290edbc038e7a263ba2020215d69f18d1dd431982d54ddeb2947296f0b798a"; + sha256 = "763ff1d6e23f14a6f276aef5415683780cf9201689b3df2c4c908a8f1ecbb75f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/kn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/kn/firefox-106.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "32e9df13c83adb6a9d715e3987ae8a64c8b008265b9737b5c9ca1e219963905a"; + sha256 = "ba81d1d500b81ca6bd109a90224cbe3ce632d34fe444840da68ad596e932c493"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ko/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ko/firefox-106.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4bc1ac651a96274d6353113f7c28a2937d533d12a297f8c8afa8596b73e1b35f"; + sha256 = "c98e00b855acc484b7656a6c6c13cd5a931e018e00b4a5183297443b0c349d6b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/lij/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/lij/firefox-106.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "51beb8c5e8aab30a3cfeeeb6944315082c3bad5f6984ed9de8b0f3b439bb47fc"; + sha256 = "1030abb7bf5f336353b3ac404dc85d3d14b9e28f88761b49ac3e7cec3bd620a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/lt/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/lt/firefox-106.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "18ee3a3f4d3628060338ff32b738e6ece839aa01c8b7c21e54eeb1a4a42decb2"; + sha256 = "0d1b9957b4bd43b14148fe7fe3d659487ae8764417c506c93d0daeb62ed47611"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/lv/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/lv/firefox-106.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "dee950f1b2dbd3d96e121d4200c3ed05befb3e96f88b70fe08a4c5ec081b6190"; + sha256 = "5e62b670e1db3770d4e216363ad5ee9e6f3988f6413b0f34a8470db97d2093cb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/mk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/mk/firefox-106.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "1ae47a547f40f517f185fd49cd74c48d3203a40d377651705563fcb651b867af"; + sha256 = "d506ea8340ee0307ba56c89f32835058a1fa0e70036e0e9731bad8b483e95f41"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/mr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/mr/firefox-106.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "0adfcf990bb90bc33b056fe113f7c89a4dcd06e2dd5e05ba1fa5e6290fa4cb50"; + sha256 = "83b5f7d958043f2a4b9fc1ee87a4f3cfc1bb26351f0147c037e85a03e83e364c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ms/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ms/firefox-106.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c105fb810a6665a95b801f963aa66356b110ebe573c720e0076b123fc3f6ee8d"; + sha256 = "5efba8634ca7c218b9d3131a18e9ed08377a2f8db56538d53daad8fbbf362bf1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/my/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/my/firefox-106.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "73c8a093f14db76099b84f9bd97c679cbceee78e93470878cc2144f50edc7c21"; + sha256 = "c5492ebe9be80028a4b557c693a2bb145220c264215f9675fd1e1619837dab7d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/nb-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/nb-NO/firefox-106.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9b323cc24010071a915c2d7f8ad7c62a125799289e2d37e16054df22deea0e95"; + sha256 = "028ab96ad8397ffed47f1c027788f3e25cdeb7b72f9cb72c3d9fac9b0b3e6f44"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ne-NP/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ne-NP/firefox-106.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "aac79aeba8cfe567b8f281c98e4b0914c7ba94c746ba836c3eb3d2dc5b908e04"; + sha256 = "dae8ffd4e1c0cdb7fb0e89053319f27ae0fce0ff2e0c688f450cc97669bb4abc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/nl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/nl/firefox-106.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "e7d7b3ba83e5de6636335c612b709916974f06b9fb9bedac3786f23a8d76887d"; + sha256 = "4b0f93e49f9a0619e4462bdff86739baeb102802546dd6f20758ead3801b042c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/nn-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/nn-NO/firefox-106.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "806a6d230030228fc9c386711de90a57d47fb46a8360f6d0ca4608e845bf1e5d"; + sha256 = "db544a7d0396d1941651775eb879ce85a092ef3d612bd072d453b886e2fcbf72"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/oc/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/oc/firefox-106.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d44da3e42a9539efb56d87f15d8f931d10e555124951f679f6651630161e1434"; + sha256 = "dd29cdfb7c0325ad2fb1c7d9e4c50eeec98d83f3d87e25465a4d27cc46f96f99"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/pa-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/pa-IN/firefox-106.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "f5a69d6488040009bbdd02481931a4b8b16a2cefd092f8b77822e7d92acfd658"; + sha256 = "5703607d932822eddd3556fdc1e3b4b0114eb43491b5ffc89823d41ad625f1b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/pl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/pl/firefox-106.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "713b9a753f3124c7f828b9d47fd0efb096f992d7dda927469ba9d5b657488ffd"; + sha256 = "8097c645b1016b0a7542e4ec74c6058e2447ec8b130b0d82c54269c504074cd3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/pt-BR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/pt-BR/firefox-106.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "765ceef939a14617f3c6551245c5f5add040b2be481366dfb80f55680ccd5a4f"; + sha256 = "32870792882be1dbca51c7c6e7c4bb4bb68c86a45b495152b4520991b377028b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/pt-PT/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/pt-PT/firefox-106.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "7489126fb451d4a75b5a18be31d1bee296efe7b47339def2b7d97a7308663800"; + sha256 = "ab8aa12b54d9295137f959469a2266e996415326f13549e4f3c6a8d2ff05c5c4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/rm/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/rm/firefox-106.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "444781014ed9cb501c6ce6bd7254bef771b5d9a78a46b40caa057fda5ea9fdbc"; + sha256 = "4d2fa84dd0f83fdbc15d255394388df4cc8117872d5702473730cb581c72a27d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ro/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ro/firefox-106.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a435a105cc1b450e56fa773215f4f39974dd1865ff21abdfe0d9eab15ac38f20"; + sha256 = "4cead2f0280332334da157a7c72f45eb52d4db17d8382c13b36d8eb1618501ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ru/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ru/firefox-106.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "50bb64601eac51ee80cd232f25a37c40f58f630ea888f4656e06ff53a511d978"; + sha256 = "e863acbc65bce522eb0150a44c1a8bf12ba49b5b6540ebf7251cc95fd231f73a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sco/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/sco/firefox-106.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "30d43956c9ad25eb0e60453fdd88f9adad5d057ddddcafe32d8e103193a8a7f0"; + sha256 = "6642b1ea47168930e6abbfeb4dd22423dafcedf55cd636e51ec676827ba2f418"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/si/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/si/firefox-106.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "0013f2fd5008756443e661becf13d91d5a6fcec91c83aedf9deb422b14c1957a"; + sha256 = "c1534f27e7c52703c6498716225d801211c5aef6e69d515e8300d53383a15055"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/sk/firefox-106.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8feabb983ee212d93f59bcad6d9a8a66450e871560e597d768ad7c986f694b68"; + sha256 = "3e13107e564986ad5407168d037efcb9de58fbe5ea5ac1b87e0a79e96b3edf06"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/sl/firefox-106.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ecab79986183edc42aa1450488cbb6163a7ad92a21788ee5f8468ad47d3629f8"; + sha256 = "f67f2438bef34b425b5db30d74433eed3cbcd39bde893a9363c625c518c93628"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/son/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/son/firefox-106.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7742d879125b22e25bc18e9113e567150eea3b991a6fe55d364399ca01374552"; + sha256 = "b5d4d684d36b54d2349bb2a2bbf5e4cb383fdbeedf39f01e7a33ac9716657ea0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sq/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/sq/firefox-106.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "21d213389cae20280f5ecba82993d165dba36fc36c6f9ab0e93732d049f2f593"; + sha256 = "77cd5bbcc773578f0569a72be475927efd11cbb0fc2eaaf171806424d9c9f6e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/sr/firefox-106.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "978ad725c887c4b68a65cf7c67349b44298ef404d7d84f7113a0c4855370a31e"; + sha256 = "9c69a858ec50d3ecc0743642c2e84325782857506623d3112681326fad8cf2ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sv-SE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/sv-SE/firefox-106.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "7e53f46c1135822a09c53cd10a375ca299b6254752daf0a90883648c1d428209"; + sha256 = "1d31cb570348098b47c77f8dacaa73d4f06c9491e9b8a182183ee0d4151c3d13"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/szl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/szl/firefox-106.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "37e203a9b83482ffa8bd2ac5c757d295e0ff1550077b0151023e1974f049642f"; + sha256 = "4e064354abe58d9ab1e856dc558ad04941c33fd2c3cef4d35146f3911dda5984"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ta/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ta/firefox-106.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "2044377f697fd6943d7e904b74556a084700d2a7064eb994114119264fef450e"; + sha256 = "22d4fde7f0b8797ef69552df43467d746ddd35536cbe902708e4321091285e38"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/te/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/te/firefox-106.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "0afe9d890f0e3d6087d3f12a63d007de658bd94c7bad43845065e2f7f8ea1715"; + sha256 = "4c22051fe420ae0b22b14f90aa84e922db2ac700924f78bdbc65417013d2bda3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/th/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/th/firefox-106.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "9d3bfa3a227c1193c4900e99aa181306aa2560e0f419405e8f0026aa5f04e0b7"; + sha256 = "862f090de4606753bfd47454e4809cf71549cfea3145168b2658737f7dd8c0e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/tl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/tl/firefox-106.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "c4784990fefd26fcb26abdc59bf5b978bf00dc6036212565e4c4c75baf71f8fe"; + sha256 = "808bca7567af4013440c4bc91d0ae75730245886f378525b6b93d42592cbac19"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/tr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/tr/firefox-106.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bff6fcbdc140766aa4971dabd2544a08ce42f923a8726871fc47b18fde099c59"; + sha256 = "998de3d38bf6176a0a20261989569c9cfcabcc9217bcc640ae828b7eb981b3ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/trs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/trs/firefox-106.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "727663232ee0fca2a9b5918688211de5013dc294d2fec80e7f568ef579fcfcdb"; + sha256 = "56662e9611ebebc0e5b86756d7e2209f9e428c949e87485f1348b3839326943a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/uk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/uk/firefox-106.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "feda8099c81ca622f19a1a3205d6aef9d2b452397e16e6d1b213609ff23bfa05"; + sha256 = "edb0ca3d48f2a49d9c2dbfa799de5467230e7508a12a9d11c4a128822575ea5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ur/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/ur/firefox-106.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "40ee8c47b590054eddf4bf8789abc52bb76d8a4261fd342db26a15e614ce6e57"; + sha256 = "2f875dc26f140f23227b8450cd40d57055f4152161ae6ccb426dea8ded49355f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/uz/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/uz/firefox-106.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "f6fa60d36fc6f624ce5b8b97a74a181720645ff0aa7b0f5545b6759804e9821c"; + sha256 = "a5674cd2175cbf1c9bf18ea7d123c7fe67de0f391b7d3448b625b42ece339aa3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/vi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/vi/firefox-106.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "0159e7f7bec4e32589a955cc7b94c322e0d80257fbb960c8fa1f5d56cb5564cb"; + sha256 = "0bc4c7dfc9eec43dcd82c122c8561ed4618e128d0bcf672c4a82a8b4bd9720ca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/xh/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/xh/firefox-106.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e05a18b54cc54b74b7a90317378939cfac2278473e5d2166288a560bc621964e"; + sha256 = "2b05ab2150cdbec19c6a4ae66268093bfc22515fc5b07ab692a05d33fa918109"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/zh-CN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/zh-CN/firefox-106.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "88337f1fa445a934866493be661e59d968ab48d1beb8ab65820adbf5c43b47ad"; + sha256 = "6c1d98a6c9343a3cc535d66f016bd82ea945e1c8c2af2c96dda9cc3250792719"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/zh-TW/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-x86_64/zh-TW/firefox-106.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5710e0a112ccc06d7dfbcfc550e397796a3a829d9b587723cd6f74352ad2ffa3"; + sha256 = "50578db4e06eb23cf82467b6ab7b2e37fa53ae53f3eff0e4065bfddd6a512954"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ach/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ach/firefox-106.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "ad16eeb19cb0d64715faafa58f7ae5344306c57ae5cc00064870ea6d0d422705"; + sha256 = "1175d4285ad6cdc184c6136300416b618173e5b23a2748c05d285d3f8c6d57cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/af/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/af/firefox-106.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "3e94c4b550466e7ae223ee9347e67ba05f00b5aa77a889b4063066b6c0f96a01"; + sha256 = "49f3892f719527f1f4e6b064d75e96ee42368f60d949ed58bfbc84e467d4b1d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/an/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/an/firefox-106.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "7bec79c662b03e5b9690ea283d15b26105714ebcae5e43ddf6acff3207c8a399"; + sha256 = "954e04f76f5a7c5583f44ef847cf65ec326ac967c0b307a5a0962ce9e979a89c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ar/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ar/firefox-106.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "7ff23d45f9af6dc4e381ad944726f196239baa0c073f2e91ce2b6a0f8fbb0e82"; + sha256 = "f17fbe8aac355b8f1dde44125c7f67fecce0ce69aa6e1f8f5e5deeb03ab0affb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ast/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ast/firefox-106.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "4ebba3167fbb09e7881c765378db6dc283f68dfe5cb430bc1b7e7d1d69f5e7d1"; + sha256 = "d7486ea5070281d71d039323046aaa38aecb59961296ba6549921399dc1d9be6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/az/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/az/firefox-106.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "d14511717cf9d7baeff5d18bacf364374f24d5a6f5ef780eb43db7b85feb490b"; + sha256 = "a6e2056709fdba67d0f0275c54cab6cba588cdaaee5b55edfe88f8faec9d3287"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/be/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/be/firefox-106.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "a9e8f4776977c30cf9b3f30f5d0e82c34b402ca0974d3c130ed5629a22e168b2"; + sha256 = "0baaa51a5bb272961ff5f58a67befcaf0a858d27c79582ee1175095e33a55652"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/bg/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/bg/firefox-106.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "47d8c1926013cb318b400f9e0cf68c9ce555fe2e4923d47d5017df792925beae"; + sha256 = "311f49e906a79ce19e6a7661d8834bec00e0b10db39b9d3264621a69dc00fc2c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/bn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/bn/firefox-106.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "551740e8756abde368f1c7937f123ec571ebf576d1b71d60ca20ec075ecc2b2d"; + sha256 = "d755517b47e2a3624d5918259ce3afe8ddc1692050a5ace5b783e8e915702c2e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/br/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/br/firefox-106.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "2d1a3e19a9f076f0e71600527324db780b3422f4f204f64c7b99d0e01256c5ba"; + sha256 = "1055b678f7885672062967cf10963e60ecd56ae66aef311a43a7e24c4b8210ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/bs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/bs/firefox-106.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "9d1030495857bbb0e1ff8bb76c4e7519b73c219233d608c74420149dac2d8f1b"; + sha256 = "b5fb9371d28c58c06feb7df2a5fc9bd608953f917427b540deb12754c2b8c1ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ca-valencia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ca-valencia/firefox-106.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "1eeb313718a669ea559b7f88a427d96b54f0229424ad8b3db01b8e3843bbc4ed"; + sha256 = "33af156bff13112ac7525bc7a908a97951e16a8a6c3b6b9af23f9ab5c12a33ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ca/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ca/firefox-106.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e348847c952faa0a60a6a21a579102c86cf186b28b400cbac07119228bee33a1"; + sha256 = "8adbaf3ead5e92b61aa5df704e8c3ebfd767997ab431ecd26532506a956f65fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/cak/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/cak/firefox-106.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8f019eb3200baa1ff673b86d4a020ec40008c79d217e54698f0b01b4b6bea4ac"; + sha256 = "8d4068c9409e5d77d21c75d9e7aa5dac32ef66ee1c2df1835f8485328c2aaaa4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/cs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/cs/firefox-106.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b3076475e5eefcfb7053dd6efc93ab71aa60fdcf2007d4d78c19c277b1ae696f"; + sha256 = "f6ae92878aa3d6ac355e227c86481b200f171b371a07740c8cb116bc040c266a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/cy/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/cy/firefox-106.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "ce73e760b47aceba4585a0e1c718efe454276878bab20d3bdef949e95167340a"; + sha256 = "2862e0db884f6293f93f3ece80bae58551b8760715865d5d411a94ed7bb3525b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/da/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/da/firefox-106.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "0f3a2ca436f1ae15fcc894c404debe5c2a913374839d307c6ddf63542d9755fa"; + sha256 = "460d65fec1d4f939e8c04eabf11f4b73007a8b7a42bc7cfdb8fe9ad3f1c9f365"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/de/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/de/firefox-106.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "fddc3ac5efc62eee05df25aff44b9581e716206e57b0d466bcc97294c76d3f27"; + sha256 = "bbce376fefbff5d1e1e831ee0924530ac6e49fce3899de98a440619c3395a2b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/dsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/dsb/firefox-106.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "55fb931de68335a636689aa7734a03f3b4bd12796b0d16f82dd4400d0c250960"; + sha256 = "a84df46b23f0b0ac646d1357c60922c32a2e394b17ff78332e674724b6be0c5b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/el/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/el/firefox-106.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8a5a2396eb14fd11c58c4e6c951746bac1d2e1ba65804927f105e3b97607ee3c"; + sha256 = "1706ba7ffbbe8d46001a10421ee4705a79c371f0cfe404b7027caf224f3e2468"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/en-CA/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/en-CA/firefox-106.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "18651db0a2a70b056b3d324279e294d1626790701bf523c43f2f1641f4d89fdd"; + sha256 = "140a224de2cff29941e7d81fa025244950f56f736a94dc1c74452f53ba7e27db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/en-GB/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/en-GB/firefox-106.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8efd080d721fe1d971d61ebfd9a284f78feb743fc3450c216d0438e46734e1bc"; + sha256 = "358fc1253ecb78168f4961dcb3d9646470b408b7dce0984ee891dcc451343918"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/en-US/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/en-US/firefox-106.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "732c2355f1105af61505c899932e6e53e43c79784c1e921b684ff10db3c50262"; + sha256 = "514f96960ef3c5e259d5acc18ed3b492451d3aea5694037bea9e22af31237dc4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/eo/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/eo/firefox-106.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "7151f8420e25157e86733bdf13df4a2fed5357aecf7674dab505feee9c4eb09c"; + sha256 = "d5ffcc045fb45cd1dd748b6351412a1a2016fb47d3457f00f3d0b63ae8bc12d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/es-AR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/es-AR/firefox-106.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "1f017a00e0755655c5503348e7d4f0462330fc6afba8d3aec24ab3173efd0926"; + sha256 = "6122faba3085ab9bcba174181bddc42093fc09953bf3478c194e7706b51cb157"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/es-CL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/es-CL/firefox-106.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "a31fba6855a952403692d6fbdb85c01ea83770205e8542e0cef8c635a861c6a6"; + sha256 = "5304587072a1adcf8edd404b332b6048a7ae7ed3c3b85f13c8a2a2590deae2d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/es-ES/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/es-ES/firefox-106.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a28f566bbf8e0eb5908fc88b5468f3f94455e3b70cff0bc81006c1370144404d"; + sha256 = "e9e1cb95838da3e97082f5dc7a656cc4df1cbe9767ac7e573ea2c980bfddc347"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/es-MX/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/es-MX/firefox-106.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "641f6b89fcd53bd8a55b93bd72b2e59922f43f0e4bef3ae0391dd721ba1e124c"; + sha256 = "9281244a4fbcf02a5a0a0b49e9823cd97cdad72ddb8d415edb9dd45cbc86e1ca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/et/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/et/firefox-106.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4b4f28c3590ff40d42246c5e2867398606a572d0f1f289c2b1e60e5aae4ffb5f"; + sha256 = "a65d3c1e6a967a0e7a5e9490e9ad41a10b3c42013f41b446c915dd638e211743"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/eu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/eu/firefox-106.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "dd5a093ff4a8990f48900b48f30b3eec6df7029a41cddb4eae23b934770da1ec"; + sha256 = "df03f88804366c44777ad0f83c402557ed330c8d56b820b98a7e628e92dd3ae6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/fa/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/fa/firefox-106.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "f4c869d935cc9e57bb1363d7bd4fff11eb85af6f9a6569164acf01948f675a84"; + sha256 = "674d4c04836f7ac87de7f72c4d797e83a52239852df7939da54f4e5b9df0feea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ff/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ff/firefox-106.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "a4b4eb26b522d3394c7beb1b059cd7bc347e613e5cd24660f6f9841193ac8c8a"; + sha256 = "3808a89290cc624a1b747794225340c4324c9076f46ba738ffc17d5ee709430e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/fi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/fi/firefox-106.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "5b88dd9ea08e45ad165ba05d2e17586aff8df602277724be9106068508d59234"; + sha256 = "20ac2cb22b2c4a78c93b5a1ea126619fbd58b5b5331fdb2c0d022e41a8aa5cc4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/fr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/fr/firefox-106.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "5b5e392b8984afb42bd2871e5a0044c5b64fcc006026af618d4bbee6905f06ed"; + sha256 = "781ed63cdfbb35bba49cb5fc4874828135c8a0c224b45524912ed3a90cf5f9a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/fy-NL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/fy-NL/firefox-106.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e71c2f92a1b7805b23ea03902383ebb82318d6252be76726a80659c53f73c1ba"; + sha256 = "9970e9d1de09af683bfcf2c6de36d3ce404242cd6bec1711990409f18e9c0ebf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ga-IE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ga-IE/firefox-106.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "7bfe67bff7f844586fa9fc3d46c383823cec26a35856d7d71b73f84c59deb1d5"; + sha256 = "35afbab556d75b0a037859270bc7ce1f3225ef6719431b2436e150efa020c5fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/gd/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/gd/firefox-106.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2de9bcaf38257b2557f61d0f2828bdd3ab67d4b406cb93dcdc4d8ef145716708"; + sha256 = "9f74ffaea003fdb8c09913a5e300424cb2d81126c184f363c57c3dc35f39e69d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/gl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/gl/firefox-106.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "94f25607dde8a8b7cd96c91bbf59047b40c6e28763cd28055ab0991470448de2"; + sha256 = "60640cca039224cc9857c79f6b519fe477ce5b937666705112082b1b622e3fd7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/gn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/gn/firefox-106.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "8b7fb89fa16cfebc8f88ebfa0a71e00fc6be999e5ab8d5605482580f2c812d1b"; + sha256 = "4ef2fb51be32294d2487bf832bc78ce8af95e7820b35189dcff4510891a512f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/gu-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/gu-IN/firefox-106.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "eb6a925a483b5f0e42e14d8f9be83c4d1fe0d6d29aea44adb9e1b3e53cad465e"; + sha256 = "dfa4721f747df82d64b76c2faf27e76ac3e03537bda79b5ba6ced1c6c627ac78"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/he/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/he/firefox-106.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "137ac1cdaebfaa5b07076176537d6bf83e7159f23d486f7846dafda995177d76"; + sha256 = "2ca67315c89c9b7df8580c6416ff91181c1de9901d098ae38a0e7729887d3886"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hi-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/hi-IN/firefox-106.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "5c0fb3aa2c88d954dab3f4a11ae901f56e3af990b37e0c161952ada8280c2b8b"; + sha256 = "eb275752bcb54c8d7f36256b8e095ad2d3712b40a433da858751adf78f150378"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/hr/firefox-106.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "36339c7514dd93088dd89fb58de234804cc6cd2959ab47be01e66b08322e0e0c"; + sha256 = "e9a5ed69afbbbc9b5d03fe25453e4f7e3a8f75d6ca4dfbf05eba44058ec77eb0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/hsb/firefox-106.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "438cfe725888f0a3ecd06c426951148dd26a2102e8085de988f62f391ae63491"; + sha256 = "c9a78aef751d2000d5f7aa0c980b2df8cca8b6830acc87271b936e703f754699"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/hu/firefox-106.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "d6cf04012dcdcba201e02d2e8bdc54134d845ad3055d604cce9701e6b1a43a2d"; + sha256 = "fc915cdbeb0b35bab8dabfb4dcd7bc0d938fd4c57edfc890f8ac8af321edb4a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hy-AM/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/hy-AM/firefox-106.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "46622bc5ba0240171a93f8eb6b023998455fbc46c562f5ee134eca255349e896"; + sha256 = "13d02d7872f68131c343d11bc5942938a9b11d894fb01c9a5b3e6f3e5c5e2d5d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ia/firefox-106.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "70f0ce5b7a053b9dc0e0728501c525c305683792654717ffa8f56d53e7421b19"; + sha256 = "b175f0f47c31650641322a4f511982dc489bd197b858a389cc2b3dd50e9dcc94"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/id/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/id/firefox-106.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c544291b74d3538ce76dadaef86b68ef16a7bdb6af12f274fa4313fc6ac55474"; + sha256 = "3416bb5cbbf904de8bf043f633e01519eb3bf5a37116f04e42fd71938bd5fdec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/is/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/is/firefox-106.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "345965cd4a4ddf0a69b00ec10f33ba947f75b38a35e56705a6ff44957d2b650d"; + sha256 = "09f6e4514739e97dd294151206361d7b3892671457e3cf714981f3e06ba614f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/it/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/it/firefox-106.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "b01889446d3e539046c13c0b3c8a9c60308768e0e0bb3cc772a7b19198702547"; + sha256 = "987ed3c877edca44a904dc4f58a8249bc608b637775727acb42797f4c7ade527"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ja/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ja/firefox-106.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "6270bad12685a49626291d90f620aa194e3262e2e0a59fda87a75e1bb47b3559"; + sha256 = "d0fccd27709b0f9002ac0cd449b0b1646c653c5b0bb54b277db002a826fe8aa1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ka/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ka/firefox-106.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "20c845eb27d0aab0ffceef8ff1d7215b8fcda883dcc7cd285ff01a890ecdbf7f"; + sha256 = "de6c70e8d6519a8704f23740ffbba2b41de65364f7bfdc5e718bc73cadb01165"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/kab/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/kab/firefox-106.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "82083c91554c9432c93fbdb740a69cff2fa0d23ec937c6f308524b5e8c619348"; + sha256 = "566adec6f20d034fcc0b778bf43bd7fcbdc57482b23cbfc31c0bb377ffec5293"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/kk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/kk/firefox-106.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "0060a1ffbc5c272c9f13375f657bedbbd856e39f88ac13082db138b5c5361ca7"; + sha256 = "742d0311b4e6313a7ff3c31546fb8f53fd6ff3d79ef8535bd29f9880b3a0a9a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/km/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/km/firefox-106.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f888e6b31238df74d6c10ac1136c795276c65ab7b2e9b4d63b4f20230b861fb3"; + sha256 = "c18901f91949d3a7047bd7dbe5ca61015291becea830bad3d05ca30972e01b11"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/kn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/kn/firefox-106.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "107b113f5239f0d1a225248f274f7d730b6e5b2c3ed7b873c0252d83c5d798e4"; + sha256 = "76c2644846e8713f8651b811d3db326ba7c3ac6347bc026196237341756d50e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ko/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ko/firefox-106.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d4db566fa090f3ab7c49d51d2fa4d3d822ac6fdb7c6562278f1880b6b742deed"; + sha256 = "04cf3e4b7ceae9d31b6d0c93b2180700a8a045e0205dd78a96ce27783bd2f216"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/lij/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/lij/firefox-106.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "32a62e75511133ac65c0cf02bd41e9142ee33adaeefc593795dfb7f477f9b6ce"; + sha256 = "37a852991a1a8cc7b4cf9cfdf9c106cf613edae6b943d12b7fa08496d6b8e767"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/lt/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/lt/firefox-106.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "926c0eef7c2f96034ae0901d3803d9940a03b9c5d14a2bc6baabda82d285cfa5"; + sha256 = "15640392e0e1782c23cc28472dc46db4d8d0437308393df33c255e71bd11ca27"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/lv/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/lv/firefox-106.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7c4643e8b8626679b55499cdffaeca1b7d941502c916171c7cac28c4efa925d4"; + sha256 = "b018303fa2d17328fb4538d652cedd54c5870c4c7db861f1ba212a107c638370"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/mk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/mk/firefox-106.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "652ba14a7c92460f6f6ded6340888b7442df3eef506ede26d1f829999f223766"; + sha256 = "10a1ae1599834a6541ab657b712350e6ee103b3c9329afc514c272fa4011a67e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/mr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/mr/firefox-106.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "8b8f2da65becc73b9d4b17cef27554e6a29d4313174947f80567b9ea1dfb7036"; + sha256 = "11991f7a934d0f8d3096469c3ab6c803a23fed9a1f59951bf0542194ad36225e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ms/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ms/firefox-106.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "39cf1d632f53a686d66f76a2a9d51c2da719655824ef888cd89b9f0deb04d1e1"; + sha256 = "e5e05406b5031598b298d4641b2c492c4ebdf818fe7f91bbfd3a12babeeebd47"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/my/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/my/firefox-106.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ab8afee1d85f3f7b96c232bbee11ba7e7e3442e3415e450cb9d0fe93922a78f4"; + sha256 = "c771c314486c6bae7f4f19fffc015788bdcdfe7571caee595da58339e0d7f33d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/nb-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/nb-NO/firefox-106.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9e4dba2ab7645922257e59cdf3f008086fddd32c5acfd52dd2d2ffa97f747aae"; + sha256 = "0cdb88bbf63e494742c64499121fb49f27fc833547f976ebf070bfc95ef86aaa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ne-NP/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ne-NP/firefox-106.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "2a158b9898f464500a94f9f70575d717195c9f197fea2844f3d7ae7f3b3ee619"; + sha256 = "28e4d3adaf02147ee68c72169fa3920d81b7173a65db75b1705ca1fd978565c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/nl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/nl/firefox-106.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "528f9f405a69ef8c8b1a49c2ed9c5e24a23d570b0e956c5376ffeff5e3ad21e0"; + sha256 = "849987c786576e60657438cb075921f05693d8769fc13242a708844c94b63824"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/nn-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/nn-NO/firefox-106.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "47722775d70bd26f72bb1d0791afc8871ad1a6e0770ffb79858a078a23ea0796"; + sha256 = "b6241f9130f9216fc5ee0302eb3cd6b02f7d6ffb9281fa652950b934f6d68996"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/oc/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/oc/firefox-106.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "bdf867e3a02420d361f1089b4c3795473c062a8b7e0d3b6fa6d43734f059cd9f"; + sha256 = "b471bd1a403c8a780ed4d5c4f4ac93991939cec4ddaf93ab3dc1ff9ff63a31b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/pa-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/pa-IN/firefox-106.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d533a1f51a2feeeb233b0a450ce7f435acbae3e7d10d085c96ccf2668a3980ab"; + sha256 = "dc775133de278bd10e3a3aef38f8cd9bca749ea66789623924c790351dfb0473"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/pl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/pl/firefox-106.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "dac080a9f0967529443d78e78641239e33176751b81d21654110b6479daa53e8"; + sha256 = "7ab83fac6fa2974510fe5a6793a8afd0d547f8e8a78102bb87f76977199d1f67"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/pt-BR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/pt-BR/firefox-106.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "2c0a21897e70bc1a552f85040ba35b024e0c702eb4b4455b47ecf94a7220de71"; + sha256 = "38ad22204c9ef39075d3444870f5ae68230afc894602e02c7a50c3091406b015"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/pt-PT/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/pt-PT/firefox-106.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "1a3ce08ce28134b84c05b2bebf9706e0735931af479ab117684d76b4fd33b097"; + sha256 = "ce374b167688832594c0879bcd415c2fa391ae9da1bd7c1fa8dc31b702952cf5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/rm/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/rm/firefox-106.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "fffd3d3a7b9bdfb6f61c92105dbafcf018acc58733cc5e6d7552acc0ab0505b6"; + sha256 = "364555cb49afe2bc7aa8cd8b680ddf50d1a79cfcfefb2eb24c5a4ea936198a92"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ro/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ro/firefox-106.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4d7fe3626437e5c4b49e35aff6bdfd532203599947ef0014953a869cdffa31f9"; + sha256 = "8552829ff43f174420cdb98cac11b5d537bf2863c6a284333ee6d8fa96f5296c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ru/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ru/firefox-106.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c31f1f2dadb723a10097408b36e63532f921fa1362d4699c9f437c016d24169c"; + sha256 = "6132c265a8b0eeaeaf1173d0eca2bf6d575ac77896800f7b02c80700532073b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sco/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/sco/firefox-106.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "d7ae32dd99b2c5b09d5ce01d068bbcdd6ba3c42a81852693fd895c7611ce7bc9"; + sha256 = "6de01840100140e8dc07f27b8893b2d1d0c802ccfe58cfc3f7111e86fd6b794d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/si/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/si/firefox-106.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "350533abb41efa727a2cc74ade0b23a1bd25e8fdb6858c90c32f9c395db263c7"; + sha256 = "44767ab3f7a236f1daa5b8fe90f5e84ec542a184d8d44d2f6ddbb71fb42b59eb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/sk/firefox-106.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7358c40827d3c0fdc5e36766c0073374b42281cd0c6e63f45b7f0e03207f4bd4"; + sha256 = "9017035546caf2ecc747c52905e03e96f0dfeb09b29cff2379e26f9ca482bbbf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/sl/firefox-106.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b5e38822a3aeb879a6dbca59b7c2417e3ebedbf79dbd08d4df5881ebf776e62a"; + sha256 = "78c9828abf47d7f2fba55bd0dac337f2d8c30cadd1b7115ed1d352d7d0ed4421"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/son/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/son/firefox-106.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "484e3341331e95e9c375a263fbaa8ca7a59db445701f9c7f9caa1d70d3f6805e"; + sha256 = "128a013cc004a3b0b5193cdb95f0f35229902c8d8e5c07f2fb23c274486b8e42"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sq/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/sq/firefox-106.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "8d408e7bf017679496e76f7f2968684d5c4046c9fb443d2fb3c9ea13abf19594"; + sha256 = "eb302dde11ed7925d834029ffbf26fb7944a82050f20d523b2c78c71b96a6086"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/sr/firefox-106.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "50a3b16863ac0c79ad17361fc845d1d374ca114038fbdbb1722a1e90ca4c52c6"; + sha256 = "2697e476475aea0e94cd3bad0b060aeb07aedb46d2647f8f35bead016756c0e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sv-SE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/sv-SE/firefox-106.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ca9af22602e8683d810032f895e7d7e5d5ae7c5f6b3ceded2085277c3c7ea3f2"; + sha256 = "00ccdaf2b02c64026a85706c754604fd76cd079167e89eeae1eca9bd07157421"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/szl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/szl/firefox-106.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "501b33a929f17e5ad49041113140676d77f24484343ef4a785dd29b5e2fb23a2"; + sha256 = "1b554f298ff742b727178d906fc3aad9529ecb3ef732b3e454f3d5aca9a137a8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ta/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ta/firefox-106.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "513af6cc93ed1197a8f4519fbf26a3791b2de608ba5d3e3c282d04e5bad941db"; + sha256 = "8cd8c82bffa0dee0a496fcd1d6a89afd2cbaf91823a386e5d5ea1ecb6c6caaf0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/te/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/te/firefox-106.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "7a2a9d2244c73c39d915a970e2133532a1a44596dcad4fec0783702bd630521d"; + sha256 = "c1ff4531313bf901b27a904e6b653e862e03f1987e0595553e25d5e457e70e0d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/th/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/th/firefox-106.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "7c5453ef9a84da8f71305919cc23b8e0bb746239df4a94b75a26c240c3b00c12"; + sha256 = "7d916199a29e54d15477b02af0fa7a4101294c82ce834cb67df2d7f9606a219d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/tl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/tl/firefox-106.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "00c4d5b8120a2e434cf77c2fa994575eda8a46d10fddf5e55407bf5a84b9d7ea"; + sha256 = "816c28e5b805ce4e1a2d588073b9a10ccee2032f53414a7c55df44d6c29a2603"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/tr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/tr/firefox-106.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "daa107b760f215ec0bec362462edebbd3df0e9f7dc3ecec0baba394bf16f9c51"; + sha256 = "57e183a63f4f590ca7417a6b5a896395c684cec05b00ca667a042a51b9f6a41e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/trs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/trs/firefox-106.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "bcfc29fbfbf9e791896e19935b868609cdfc85116282a732cfdd83f5871f825f"; + sha256 = "61ecefe086cf856da4ebe5a62c06fcc2fa005e7a808df2b6183bd984fca81a59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/uk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/uk/firefox-106.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "a0a55891b3032d00da27a940b99af8447537e9f5c1aab3689ef77131e7ae9210"; + sha256 = "18311d4224139f98b54fe90927a806345628008916b8c4b3b5f97bf33f46f29d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ur/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/ur/firefox-106.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "a6038932291061aba7b57a3cd95346580df997ba34e45bbf77b0f648f9f3f7ed"; + sha256 = "f1a92d802f2e587d993aaf401ddc554eb7c857b2f5d7bdc8e16aa2a8b45dff9d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/uz/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/uz/firefox-106.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c1eecdca0d2047392cb70d19ee485d02b7cda0717ed4bc3eabc9906579f3189c"; + sha256 = "61d5b07f450d01d8cc1264a71df42eab82f6a4985f701d8b1516e29c7b06ce70"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/vi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/vi/firefox-106.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "bc33bb2e02e23ec740cb1f91298862d346b799ac9df04ed3e0301e19a7b97e34"; + sha256 = "f9e444905d3778da8f5f10d01c618f0bcde4d9ed4d27eff380e1c39315e415d3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/xh/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/xh/firefox-106.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "4d7147385bbd00a3cca6130831ca67e87904aa403d4e8134d459c18a8b3824d6"; + sha256 = "bb09260b0d530a1327075d83f996beb72067857df25424238ecc9cb96c1516e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/zh-CN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/zh-CN/firefox-106.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "3d854dfd5ba369e803a462c75cbe4912e3c28767e570f5946cf3ec07a25c85d7"; + sha256 = "511306078e0489f2ec4923b7db8048d0010fab17467cb0b7bc3599c3b7a2e7b9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/zh-TW/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b9/linux-i686/zh-TW/firefox-106.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "b439906bdc4e1b6b2b19ca28506aebbedaf0fb063ea9a5955654521983ec0f6b"; + sha256 = "d80241665552f3a1ff87621d71d32b1a26648e63cc812e8c24f28045a8016693"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index db8b01a524563..9a4fa4a077483 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 = "105.0.1"; + version = "105.0.3"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ach/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ach/firefox-105.0.3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "2a292e4d140ea74bf51fb150fcf07c053d3b670780bbf865597a90195e41c88d"; + sha256 = "8147662ba2ab1b5299771a006cbb09e654f4af46bb4a65d9b75474e456514824"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/af/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/af/firefox-105.0.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "001f428c1923dfdebf73bfcbe7e56b6387c98f2c7b55f2c068c314bb3d0e394c"; + sha256 = "8c0164434b26d85a17deba56a0c41f05b214ec1b414496520f2bb9a8a03fc266"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/an/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/an/firefox-105.0.3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "515c8ff97fff98703c1b7a225411ed8cfe256c2b389ce9777a52a711ada7d8de"; + sha256 = "739c4eda5931d67054d48cf8bd2e428b0344f04c4fc0d57a29efc60bc6fa6ba1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ar/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ar/firefox-105.0.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "e1c07b1be533debf394c3d5120cc54a1403963dbae6044004db41ea00795f238"; + sha256 = "f49ab32d39f9bea4f4ccf74f039265cdc938fd85676be8c4e9f83214e731b558"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ast/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ast/firefox-105.0.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b3c36cb5c6d9365dd9b070ece37896cd83405dfd7d5bd34c4438e50454e1fc14"; + sha256 = "e655e1b333f14c4540dabb9c48639aba2cb31a8ed499e303155fa46d10b30d54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/az/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/az/firefox-105.0.3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "456b1e3609e8e4629b64795870c20fd231bdb53223b24046a19649e367f37ecc"; + sha256 = "56a9ede376eb86322325ab81525d138a9f404f7d8384beea1e41a1c74093774d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/be/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/be/firefox-105.0.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "75d5ac806ff70fce1671636794c9bc0451eb33fc7109a9e195cef8246d80919e"; + sha256 = "07c5bff28da68df45e0d32e22e411436f6ad6538791f7f8805bfdc7cfe1cb988"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/bg/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/bg/firefox-105.0.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "436126b9edf631eea6e68b7068cc752a3e3e6d86e77722cb74fcb1c3dbef7bd5"; + sha256 = "b9ce3e10b398da8ecb07f158874c0ecb6a92319f2587731a1a94af370ae6e4bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/bn/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/bn/firefox-105.0.3.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "2f08c7ac904ea50df7cff5645ff4bc56e470b6a7215affeeee1497e63edaad06"; + sha256 = "b51077e8746523ce6278986d70e12f3867af394ad8ca54b259f3b061d2370fc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/br/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/br/firefox-105.0.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "aa77c3646cb0753d80bb52f3fd1e71a2d1e13b004d3924481dc175c453154269"; + sha256 = "6cd62dcf0ac98d81d6acaa24d29ddb7052ae322d1de5df1faa6f3fc74612eb19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/bs/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/bs/firefox-105.0.3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "ae2cf70e774eddb67c6c311f3d325b921b7db74a0f8b06146ef2431cf79df804"; + sha256 = "c51aeaeb69dcbc099521ff568d8746f32304e231988b2790e2b1c96a217b9b89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ca-valencia/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ca-valencia/firefox-105.0.3.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "b85b6d597939f559270fda3993298db51717c2b86ce9ab8d50fe777b1101bc1e"; + sha256 = "5e05be19fb65b8fa8e3e6babfd1d970be960d82367877337a5b13118d3ec82b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ca/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ca/firefox-105.0.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "01764fb52c22caf81291e25efa606e28796fc3c9489fc95d9312bfb60a6590e7"; + sha256 = "fbb55041ca2d43c7d84469f0b0f379f41e890837f6642696f1c0b0cf6afccf65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/cak/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/cak/firefox-105.0.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "56b87331ad9c5aefd3890fa760a64397d878b93b48bed93a5d743f72273df943"; + sha256 = "831217cf7cc7e0d58fe3b7502bb341ec60397954e7b1c825cf6732f2f0f0c38f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/cs/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/cs/firefox-105.0.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "f4ab7f935c4d13510c82d0c05627f1173f2e6f0c314b5e4eb27210982d837238"; + sha256 = "e5ab70b9bc95b7929e75524713076455b27cc7dabd97f0b9323f7d7c1566a899"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/cy/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/cy/firefox-105.0.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0d77c652ce5deef61ae2ad0bc78de9a5fd1578d4e6c7cd0152fb7d80df125ea8"; + sha256 = "705f2e17f1f50afd3fb0f7399c13093c9e8375fae25c33ebcc2428182c9f2936"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/da/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/da/firefox-105.0.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e0ed75c3d18380782d229940be3686599a29368a3525d28d5390cc8a4d76322d"; + sha256 = "539190ddb241de10f6ba817d721ead00b7e3637bec6d554be64161d466d3e30c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/de/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/de/firefox-105.0.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "ffb8157e40d92992e6119094ceeb30621b111804956dfd0bcb09c75949fd5b7c"; + sha256 = "aa7427a996ff1aae94d6e9d1c7550cb68509822fe0f3bbc02c51711dd22b6bae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/dsb/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/dsb/firefox-105.0.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "32ef53801f3e3cebb410956d13c8280e5ee4ac90f5eefbb367a667a578f5c558"; + sha256 = "c888c692542a4e4f1de11ae8deb2e9eefc8b0a18b4361e70b1894aaa1a4fde6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/el/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/el/firefox-105.0.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ece05bdbaf75cde0d42d528f5445ee8d36ad312df58d2aee6f35d70f635ca977"; + sha256 = "989621c666d3bbbf795e44889249b9ed7bdc5ca2064de047b8ddf433f347bf6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/en-CA/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/en-CA/firefox-105.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "258eea4191b27d4d677769b0e9d24befc8bb186ab820265e6a89706469d4fdc5"; + sha256 = "bad4096dafa44bbeba0d79a229b824237e27946dc5d2f1f638638a93fde19c6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/en-GB/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/en-GB/firefox-105.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "72323eeef336612e706e200b0e4bff9e7dd6041a5f968810e274b697469cccf6"; + sha256 = "b3b9e9e775bd0b1b5e2b2468142990f6f3766dbafa008c526d4df960157ab1fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/en-US/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/en-US/firefox-105.0.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "99d277ca46e0f6f79a8b7f7b77d05a0f4d2aa63b6c582ff6f248984d87fb2c4b"; + sha256 = "e334d4dfbe4be20e6acf42a5c1915cd326b5a1112e6465537cab6efe7ebae50f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/eo/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/eo/firefox-105.0.3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "9c0fcbc3febed025550d4f1739a13a5765c09c3d79be15b2f58d935a09a14f78"; + sha256 = "8549bfc0d781f02f7aba6ce987993594ce6a4ec2cc6cdd3726d4cbd5f609dc31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/es-AR/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/es-AR/firefox-105.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3cb6116afdeeb4a39e5d40ca31fcd2123266956000ddfcb5886c2a31c2596a8c"; + sha256 = "83d9b40aea5209ff08200ec1c1a01140b33a3e462f6a092d6b398bb963cde939"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/es-CL/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/es-CL/firefox-105.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "2dee3c9d15841b7fdeb446b06de5638d0938f47374b91aa76da3f0c6ead516d3"; + sha256 = "b72104bd3fe1841160694ab3f8f80a0423ca8ad5cb7053a56faf60a7f2c2aa4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/es-ES/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/es-ES/firefox-105.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0bec68bf87c51280895aad0f524780e62acbdd9227227634aff8431802f2536a"; + sha256 = "fa4628e37f72412161e8caf1f0632d7b6de8b1b6fa0b24779a0304d6c164d893"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/es-MX/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/es-MX/firefox-105.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "dbbd6228aa426432bfd8772c3ef3ac54fd1f9c548d8b0472033f56b3f94864f3"; + sha256 = "f06f9b25d5b819a632dc40129c13209fa4e4ea08f0c6b976c9d5e09655870bff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/et/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/et/firefox-105.0.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "bf88a2d9bd8e1650342a06807c261c4d46d7f58380151bb4beb17416315dc7a0"; + sha256 = "4266932d3e1cbdc8db6f9281903ca29cf677fda74643e852593fe328f121a5a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/eu/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/eu/firefox-105.0.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9635765d8b7ea51881a012298882e7f644ffcbe6b0d6b227db15cda6d568b92f"; + sha256 = "c57cdb69028a40c5eb9e785dd160585863c3a7228141f04a514ef0d78483847a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/fa/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/fa/firefox-105.0.3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "d97dd45457d806e5d9adcfb05ec5000469ccdc7d97fcb866f7d27bd693000985"; + sha256 = "e66ab1bced7b570bf7e965cf77b7bb63664f9411eb82e2501d34e4a144654d7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ff/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ff/firefox-105.0.3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "d812c9d77ed85b6876ac13f9930799b90b74dfd8d1a7c48593aece3529913243"; + sha256 = "3bb4733a58d696148210380c8b3c63a1e776a30b1c3a4f7863df450afb4781cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/fi/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/fi/firefox-105.0.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e6a50f893698ebb52406d837fe8de3aea1588477c65af7b5580c04d69d1cd5ac"; + sha256 = "b7acbc08ae7e5c71ada03fba6697c897483b2868c50de4f685478397898a5f26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/fr/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/fr/firefox-105.0.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "4567e8b6092b6a027ba50249244ac3b3c2ff5d3d2b00e9abeb0836cfbce2bd6e"; + sha256 = "4fca40c7b2da51dc31e3d1e635db494f3709114a050bc0a0f48cdaa4d3d0cdbc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/fy-NL/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/fy-NL/firefox-105.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "375ddfcb709e820a568f3a3aa5dfe62b6699636506aea3045ba0f499d8163937"; + sha256 = "ff99d51e8ea33c4bbe95b1f13fd306c49acf1f16896e380f23522637fe178ea0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ga-IE/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ga-IE/firefox-105.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "0fc745fdaad6978e093b7b736b9676dc830c6e60a924e2a095278b6a14f76ae9"; + sha256 = "28882d7cb3cde4e5623bb97e2a5f1b5cd395f9c11b67d35419dbd07d6422d70c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/gd/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/gd/firefox-105.0.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "9a8aad8ca0baf54ef2eb0c77175c394c6f4aa676c51781fb78c6e5b00e407758"; + sha256 = "d9fbc262f0a2bc8bbb4c9399ecbeb1d9da5f61bca4540e5a94fef64dd52c929e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/gl/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/gl/firefox-105.0.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8979485ed7c0a1bfa950749aa3d291bc25c7f5aaac6563996a5b991e05989cd1"; + sha256 = "97180c4a243258c13881559736babf28ec22b19db05fb7d1d4b0b3c91515a3fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/gn/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/gn/firefox-105.0.3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "1dce9550f3d2942a8688fc9263ffad3abbbd11545d9c29255924fe88e1cbf020"; + sha256 = "1572f5d457aa28a8a9868f17f5228f01a5520b132c13729052004b73f56fd4d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/gu-IN/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/gu-IN/firefox-105.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3429fe9b7be0daf7ae039e00b7d16ca16b2dcdd77434575091c2deaa33dabbff"; + sha256 = "3fd3724195a1050cd43a78dec568966f29c072e740add16d568e2b2ae38ba900"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/he/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/he/firefox-105.0.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c5b93b8b0aa69ef0a9c29dbc81bcc532652d08a2891874c12d7048a475240b2f"; + sha256 = "ec0dfa3637d47d6585695f22155f79baa4a698b1e88f75b3a71cea78d1d89d7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/hi-IN/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/hi-IN/firefox-105.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "54d3ac7e94abab83b03b88de143523e56a6e0c85314c61b3c821b8145e49593d"; + sha256 = "9b59e25246eaeda267658575a45ab84df76a3e45053303492eeb3bdfbde365ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/hr/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/hr/firefox-105.0.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "1bb9a4b332aa13786fa21dd23ba51b5faa69669fc41ba996b84979ec1d0cd638"; + sha256 = "52f3ad9bca4d2d082d746f70014be9771b5c331920adec4149b713a05ea40186"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/hsb/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/hsb/firefox-105.0.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "d3edfbf7b52beee12fe098e20d4a76dc092f1bdb5717779f19a3ed58ace4c6ee"; + sha256 = "2802d07492f7728d0c73c6e87a07f43226c69060e0e2f821d2c9e501b4af93c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/hu/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/hu/firefox-105.0.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "47823efccb14195f7deafbe49021d2e9224852f5d87771ce680e05ed33927209"; + sha256 = "9030c21d2c07924ef077269c112b7371e58a513385988dd7a2ffd4d7732092db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/hy-AM/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/hy-AM/firefox-105.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "130856c658b356bfa8de750fd4e36f940a3367e4db368acdab0e071954abb1d5"; + sha256 = "800752f83f6ffbdaa890b3193c3ed13d339acfd56aeee51dd8deb0146cab0e4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ia/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ia/firefox-105.0.3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "f6f99a21f73c43049f0935eda76b866e47b6d6e1ab0cb82464550ce13b06f4fc"; + sha256 = "25d6ef5d14dcb9272c3290d6dba09f5a86b15cade172469e21d7c76e1c00f8cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/id/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/id/firefox-105.0.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "11155d40d29b241e4d10d3d71d11a81353498f40a33d2ec3e8a16ecba1ebb9b0"; + sha256 = "642c33998da03b4b01aaeacce08dd5174816409559b40b8772cac23d2d59fdef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/is/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/is/firefox-105.0.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ef750f5c5fcca99fddfc6a28c5531211873770efdff403b0c4f6ba4ea6492375"; + sha256 = "f50416330af1f0a441b7ebaba7e74177b15601797e1f62764ec4aa0f6be88fc6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/it/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/it/firefox-105.0.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f77fabfe81caf68142429d8840f9c3a0c3532e7bc02d4425e3394801840ce607"; + sha256 = "ffce6c4f6a74d1f377e59c2c7249eab9899556860e696cdba823335b103cb29f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ja/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ja/firefox-105.0.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "618404d115720cfcb75cb462179f648772c98cd78912ecd2a2062f7f977c606e"; + sha256 = "26d31f2161974a66f8cc0b6f687e40e921d10f41021df957753a55ca943b18dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ka/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ka/firefox-105.0.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "99b41e63b573b62fde39daee0af1f7c0ec6b93b30cec594691634e27f70cbe49"; + sha256 = "b0a48857217ffea6a0ea457638295c22ead53912df1890ff751cf4a0576217a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/kab/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/kab/firefox-105.0.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "447df815475f83c3b9215758948292d9eb093cf417897f4904ff4253ac3cb818"; + sha256 = "73c2b31c6411f416a78050c6c1400fae21d2a4ba498d91ce5fdcea295be7d810"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/kk/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/kk/firefox-105.0.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "376a29caff8ab9382321487665b545ca97b9177551e368158176c9d50f5cf5e8"; + sha256 = "399124d887a7c9c3ff0638b1f3f1ab831197d030985c41c5b8d90d1e76a9a899"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/km/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/km/firefox-105.0.3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "86b08e8922c907bd0358d91ab19a5b5ef84ac505c33b9126eb4c4ce034107aba"; + sha256 = "a9e5032a7ba4fd1934094443bbc936fbc33a3b347aa19dc98e2e1f4a199a9cd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/kn/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/kn/firefox-105.0.3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "d90f60352bf07cf3366f1a421c9dc7ae4c16b1ab7db3edc252eb884ee3f7035b"; + sha256 = "9d8b54bb8bfdad388b3879ff30f36b71cef805ac7eaa60faaaba33a64ca8c16a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ko/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ko/firefox-105.0.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "7e5144713519d0b29451047a0946215117791641142247c1f90d6e4c294ebef4"; + sha256 = "ef37cba1d8cf70e1d505d01a31536e0db078b84e3f38bc0e1995138ca3fb00f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/lij/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/lij/firefox-105.0.3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "75165203c5ba0c382818214dddfeb2ab94a6948f4c5c7d142d31c36ca9422e2d"; + sha256 = "20fb0d20e33b85c54b4eb50567ccbb7d67c1431edf1325278ad97b45c056cba8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/lt/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/lt/firefox-105.0.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "6cb8920f924f8be2fdf6b8cef9113e4b539205beb24d5f5110712eef818ca279"; + sha256 = "710a927eb3ce175d19a0d7f7bbf9252c3807eb7e860289219cf56016ed41b9cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/lv/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/lv/firefox-105.0.3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1e4e7622a97910462ba924109e8e0e6d35efcfbdc849ac3621d61ccd119a60e5"; + sha256 = "30b34d3a9c9afcdfda31dc9a5e8459971936a19d436bd5862db14b3bb95858ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/mk/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/mk/firefox-105.0.3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "88ab94691358f26a294da16f2fd51755bd873dcfa07c6ab3e5dbfefe4684315c"; + sha256 = "7f0e8799121fad98150d7cf7d1545580bd7d93fcad14e578e789d2f03c5ab124"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/mr/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/mr/firefox-105.0.3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "034d14b22d0258499863487b4cb693be23fab6d710f920640ede7430a75b0c11"; + sha256 = "6198357f1be5f0399658146aac94eca90ede5d3adbd406aa601e3c23431385e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ms/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ms/firefox-105.0.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0b0162fcf05a7317f8f977b93b532f312460de0dab631376ee1b8f618c776ec1"; + sha256 = "52c1cce6ced27b9b3d2a95b2c8ee68f3edd6d7aa9dc88b95b92ae826d6458565"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/my/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/my/firefox-105.0.3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "d01e4b321b2193675ab28c689164ce13f83ab9d6b808419a82536d294a230d53"; + sha256 = "4515e82eb618ce9ec75b4adf3a4d09bacb5c9c55cebe13eb5e2a4b1a75e22eaf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/nb-NO/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/nb-NO/firefox-105.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "bdb9e0a86302a4af47c84342aec2c9987b2052e876f9b81a1df20165593ae30b"; + sha256 = "29016c84832ed48e2d48c3d28c4d05f03baaa948b174a902727389cfea04837b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ne-NP/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ne-NP/firefox-105.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "5c79c03bcfb2f81fe3ad3bb530fb7181c86e8615a096fe30b4bd207a6da3e395"; + sha256 = "f7ebdd85ad39793bceb7a3a4ceaaebc2189a82e03a2ab2feb50c2c925be4d576"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/nl/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/nl/firefox-105.0.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "63733782d97d22d00abd3f8ddf82da5ff5d9313e2c5c56d7f767d153fb9ff3ec"; + sha256 = "a8919d7112d934d55e14937fe7dc0718062fc3af24a85cb9790ca002e07fd9b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/nn-NO/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/nn-NO/firefox-105.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "6e7c22e2b4bb9edfeb9936dad41c686bc27b3dec0dbcbf779388fb0bafd33e7f"; + sha256 = "fbf06915fcdba83605cb1651f6e91b1bba5296b7d2e71ad7cf2e4b0262829f45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/oc/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/oc/firefox-105.0.3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "071afc449c6e9a2a2168c5ffb520a23970f95c8c1b9218ecbc36260d60d9690f"; + sha256 = "49e373108a6ab7b632179171e9f98c6c2188e863894bee4f702a735b493ff416"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/pa-IN/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/pa-IN/firefox-105.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "accfda66ed9b56182a95459ee2e0dacfea2991d47899826eeb1df89c390ef837"; + sha256 = "78c3f93f209260c4294ac128aa65c4a29a8acbf338725091348f049061e162ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/pl/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/pl/firefox-105.0.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "de2fc27c76605ed73b4685debcf0b6673bb0654282437b88df60a4594ff069bf"; + sha256 = "b58fe040c0a127e095b15ec3e68471f1765fd7a9626972b7312b74f054b5b8c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/pt-BR/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/pt-BR/firefox-105.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "cba9679f14dfef7fd092b38d2477a4f48ce23947798227ecdb7fc8d2750e014d"; + sha256 = "43b01a5e09a1f19f61b3cd86a5baa88ea5d02118562049a551c0aeae08c2b014"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/pt-PT/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/pt-PT/firefox-105.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "b04db51038bcdfe8dd6cc7d237f12a933d671c4f591742f4825f03e6f5675222"; + sha256 = "10d0d5d4a28d13d36dceb8f9a99fa6fba97dcc685afbe60ecba9a07dcf37bcfb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/rm/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/rm/firefox-105.0.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "967b15befae35083f0b1ded69fec4deb8250211a9b099df76a8e689df2ccb0b0"; + sha256 = "f9322f3568b1669ae7ffa17d5fb48fe8da0715e7c85e135638b8113365fe787d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ro/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ro/firefox-105.0.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "7aa8c11f8e0c2e54b7c25e3d71fbe3fa8f4e36714e42a3cc0cec8167cdfa3691"; + sha256 = "d727b95e668b4e09d8c393c1af3318ada365a579392e4591413107fde51c7bc6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ru/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ru/firefox-105.0.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "b934733462b2dad1ff962709b6597e7827cc2880041f20b9015f8f270ca8df42"; + sha256 = "89e413c2c59ad990fa4935f2a67ad399501d05f974c012a622e3ae62a38358ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/sco/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/sco/firefox-105.0.3.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "49a09268d03a2d92649dcddf34b3d0ceb94899529da1c15249883e3ef8c30ffc"; + sha256 = "8ea888b40e086ae5be65fb75a257d63da086a0456373d8a974d0717fe16a2e62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/si/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/si/firefox-105.0.3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "fbfe9ed75eb62b5c3404c99228ddd9341fb9a0ca873d03592061952b0a6d3864"; + sha256 = "7c4702dc16276c0e5b8ae9bf6b0c9a73aec37530b0948785a8c4ae4c181e4505"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/sk/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/sk/firefox-105.0.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "372d7fb0cffa5f89e2a9e44651f7a07dbb29911a9d5806809bf5db7a21005b51"; + sha256 = "3a154f41965d1b18188796ff0df0c6c2afad1a331e4321cb62ee2feccdb44fbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/sl/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/sl/firefox-105.0.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f6859b6e603261a3db82b368400d46a76bb10b9c0b3ce5eb39d493e41b534e6d"; + sha256 = "232b2f0d5b7748ddde518e0c3899a9924ac7fc32890535e4d7163dc45b1b1b1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/son/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/son/firefox-105.0.3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "0891be0acc6412889574416f09642ffd344579185a602384ae0bf1d82b43cd43"; + sha256 = "25232a28a0eb14a7cabda3ac3edd87a4d428db8bd069b95565aa1f744f0c5df2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/sq/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/sq/firefox-105.0.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "4f13416dc34f59a84043ab3dd018a4ce6d0f20a90458f637d836e4048dc9852a"; + sha256 = "25f2c0097e041e1b7eb160f18e0dd03e4e7cae01feda344c80941ccbc312770e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/sr/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/sr/firefox-105.0.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "47b49b18d3cf2f9cd1fe81b3e13386fcf188aff88eaea478e161f674e19d017e"; + sha256 = "cebb574e7931deb6a3f5a9eb23bfe011c0885bf2829806f73cf06646ae89992f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/sv-SE/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/sv-SE/firefox-105.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "af5052b8c4167b0f95dd0cd8b0265b67c4a3aba52c7b762424d6ee6462e783a1"; + sha256 = "a57e0bbf14516a3ad69bc5cfab784063cc3593678535cdeddd96a8a7a6de44a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/szl/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/szl/firefox-105.0.3.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "51dba44f903035373235f8b1a997387832e0a67fa74e1fe6d14ea44b9a363744"; + sha256 = "9c6ada967213b76935c675947abadf7b5be106a5f6e455712d94a7ae5e6e76db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ta/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ta/firefox-105.0.3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "0f6e7b5409bd90a7120577480188257d590996a75a6bf11dcffc1cef7c0df749"; + sha256 = "15c31dfd3d80fb66c334a4a64030ba649e52768def483b26e5db22049dfd4d39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/te/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/te/firefox-105.0.3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "831e373a64e2bcc0f9b60f18ac8e3f5a747e1042579bfd03f5d76d3f04f890c2"; + sha256 = "97e746e03c1f90ed1a0ec8ac1e072af0d3dc59edff99a81c4b26ec7a566901c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/th/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/th/firefox-105.0.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3e343b11ab2a93557c86daf5cf1a789154fb53fb7090e33225dd04ee30e9acd5"; + sha256 = "eef68d447b21c14ee34a383148ffa43bb1e4b57ef73d049ef29d4cfec12edcd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/tl/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/tl/firefox-105.0.3.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "4005e0e9a6078bca9c134862335d0d677af0cbd834a8e04e4720f8c2b59a4dc1"; + sha256 = "5991f5a368beee2deb554a7b0132361ad156780fdd6cfff63063ea054ab0e0a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/tr/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/tr/firefox-105.0.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "2ef97fceb2fe522ac83dd7b4db509e248eac83e6a5f7fab20064d3ceb4612d6e"; + sha256 = "ea276f0f853430b26ffea06318e233ca7995235660700015a253c71899d7386b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/trs/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/trs/firefox-105.0.3.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "131ce0fabb180156f04854fd3a78cacd7a07b8c45b78d219261cf76ad51a2f42"; + sha256 = "07f8aca6d6ceb32a9d862a6cef92013167e618915e8b28501748c85bc312ab4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/uk/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/uk/firefox-105.0.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a35637a2633969dea796cd374aa0cd684661ced36ce8cf118514072b08e4a325"; + sha256 = "1e94f245aef54002fd7ba55154f5a68db0149b2ba9ec7e63ac36df67c0246c35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/ur/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/ur/firefox-105.0.3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "24cb5ca13af2b770b0ce64cc2244b86a57aa70df6ce3d6234bd03527f72beb93"; + sha256 = "73d678e08bf52bee53ca428406fda8f7148208c3c15518bbc77cae3090f2e44a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/uz/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/uz/firefox-105.0.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "73008ac9452f1dbfdafcfd233a4dbd3fc2212030bbea5f1bc1e3efe8c291a4a3"; + sha256 = "8ab6a0e67504679f3dd6c9e30a33db9ab18c13bbe2d9cd79e780b638f09cd74c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/vi/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/vi/firefox-105.0.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "990bd18ca8bd08d65df488e728d434edccce43a93cc1253baa3bd8d67e9ede40"; + sha256 = "96208b8bc0d7420106132a2cb5d97751ec7ace98d22be3503d2ac6deb29b4b1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/xh/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/xh/firefox-105.0.3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "9efe95e531a2b42d4464d75bc2d54b1bed4830e548619aa23fe957bd372c663d"; + sha256 = "c40350afdce9a32b9fe962a773f4c3c091c1d98fd62f1a01d5a306bd85bb4454"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/zh-CN/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/zh-CN/firefox-105.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "03c12d452a4bc63f299f02868d79be87ee0b04ca76cad724964e11bf20bfed90"; + sha256 = "4223011139dac7e70991f986dca40268ebeaf2758ca0b15278391dde6821df9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-x86_64/zh-TW/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-x86_64/zh-TW/firefox-105.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "32c5e7ef19452f315d25c853c9bd24c34e67bda934221e2fe5f958fa789fc0e4"; + sha256 = "e151e82aa0ffe00ab48e9b65159ca7c5fa678c210157be70ce96fa4574f9c7db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ach/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ach/firefox-105.0.3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "c17485b51c8829882e8fb50bd4a0ccd6419ef2b4dc15fa7a15551ff45def53b1"; + sha256 = "13dc94158502eb7ea705d6bfcb03a5b12118ed318631cc9dbdcb5f9fe16af827"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/af/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/af/firefox-105.0.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "d12603bb7925dad96760de5731c895d287af7b05b1762eaeabab69d5bad61837"; + sha256 = "761d6c44b4abadc14f0b0eee2ab791be000db4bc7ab3f9794c0063c25de29390"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/an/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/an/firefox-105.0.3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "1140e17d0775c8e6ba1fa485aec35b9b7ac8434179a3faebfcd1e1cead070d03"; + sha256 = "e220611ecb3451e2267fc72e1e30632515b9c6422713de6b1d8bedec676e30ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ar/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ar/firefox-105.0.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "89d1cc5e45444f7aeb35e5fb094a6be4efb80d523cd0209188c61f10012102a5"; + sha256 = "7a647d8bf52809ec99457b8f9b30883b7a896a427e510af030516179b5a5d2fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ast/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ast/firefox-105.0.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "6bca591e2edf525e20d125e0f3ace831ddd217135537d958c070d2e00b852c26"; + sha256 = "98bd8e8913331f45d61c8c9bf338bf15a0029c9d555e5eb1fa0858afcf5d27fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/az/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/az/firefox-105.0.3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "f9eec0db663469d85e4f665969143a37860bc1043a3c5d83cf330dcafb1682c0"; + sha256 = "e878e8f4b6f932b7981d55f4c5af811b792506501571a7d5a36f46fbddf6b077"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/be/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/be/firefox-105.0.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "5f792f86c5fbb601ccb769818ee3755c01fa443e87ed8a1d7df7388bbfb1fa56"; + sha256 = "cfb65a329276f490b6e340f7d2702d88f880ee275f96404d393c61cc770e1da1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/bg/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/bg/firefox-105.0.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "32305448e9d4740eb64e41f073e498da9013b90559eecfc619d1476d455c2c44"; + sha256 = "95697a3e618f092986a5a5f7879c964bfe84d52efb5db5604de6655836286246"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/bn/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/bn/firefox-105.0.3.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "f3244f87fac769e054774e1ee6a5e72873fdfc08189f9e7d1fccba63cc75fa2e"; + sha256 = "3c575ef6538b90e29d1cdb4c3717e7ad20a1ed324d4feaf6e9862d5574bebb26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/br/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/br/firefox-105.0.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "2cd2a1b5b46b52470e14105960593da5da9ece3ef7cba2aa0157691968820016"; + sha256 = "89f19dffb2b14b80209367c7788e5d6a4921478c722e706444b9a1cf5903ff00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/bs/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/bs/firefox-105.0.3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "661d4dc2bc6e093e2c8221f626d7fce7a66bd1a427a3af6582959e0073db8dfe"; + sha256 = "4b5958c26babef5764ee8860c5b08d4406ca0e8d06ca226d71ae71550a299087"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ca-valencia/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ca-valencia/firefox-105.0.3.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "09c9bc54fc0c5b3527d5e2325d6b9b34f6dfaffe1e795efebd4d353a512c4f84"; + sha256 = "5c2e9169837edacee5d3c482cbf45bbd7bf51ff90e8dba1ec01c6e82f1d22744"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ca/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ca/firefox-105.0.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "930d3dfa38d78297eff4b49359016f9c3db05d05046333b39a63d22b87f38383"; + sha256 = "7ed89f9c281cc803dddab5ad62ff47a81ac1f0e4484cd53fe1b2824ed2504943"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/cak/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/cak/firefox-105.0.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "c8b9108011123ffa9f67a10de3b70384b9f3d4a886e46f4779be8220acc33a68"; + sha256 = "b55ca4396ced578f8c2d544a2ca0cc8661c46f32af107356834d7c8acc9fb870"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/cs/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/cs/firefox-105.0.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5f1ff971482d5626a5e4f1e77140cffa508f033049eab5b5036590e6ae8a4f81"; + sha256 = "8afdcc9d5b1812ebb93644690da9f796c790b3f6c2a987ed54acc27b84be40a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/cy/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/cy/firefox-105.0.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "af3352a2fcddda67ba32130f61209fca0b40ff04e1b68dc285dfc55be913c704"; + sha256 = "dfda2d78cd1a0c60bb7e66527b11df2ff86f5733a3b7516b86c6cc5c06357630"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/da/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/da/firefox-105.0.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "498ff4a5713bc063d20b3cf8218e33c33599a7ea663f06d8404a6380cffefbae"; + sha256 = "3062b6bebf9430f3181fff4e77b6b366b462048129b9d7726a3f4ae280710543"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/de/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/de/firefox-105.0.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "e870df16f1af88255ff245a1becdf801fc79da9e0b862677aace5033aafbf250"; + sha256 = "5ec53e0ee55cb8767ebfc82bb9795717ded89af7903af76bf0ec78dbb4335772"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/dsb/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/dsb/firefox-105.0.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "31a1d0c69e7be52417d5ba9d65cb1289a93b950966646b4bc53bd1676db0af49"; + sha256 = "ca56d014fa6cc2af72b170685610863766b0da74aae4470812cd8814aae655cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/el/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/el/firefox-105.0.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "7e75ccf8b0259e99e450efd6e05fe03ffe4be200b2d67ed1c095f5bf2db01bc7"; + sha256 = "f31dc7ccf5865482376cc216518649c88b0444c116abd1e4a0fe043ede4026f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/en-CA/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/en-CA/firefox-105.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0536023b7b2b9d9bcae78edb72851043b0be972d06fb6fd3767e2b877f24fb91"; + sha256 = "97d5cfbaa7e4db0a6990255d14c445e2435930496d20681ac5640c35fb10dc05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/en-GB/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/en-GB/firefox-105.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "85164c418b3e48b5c0f0d6203900c0ce8cc17a04eafeb862a24b0dc3a5bc587a"; + sha256 = "4f856283545699764d0e5413e2451bef76e3081df81bb895f39649aa02346eb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/en-US/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/en-US/firefox-105.0.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "69d823ec54825b1965280c454dbc7a63757080a4e5de72c6e567e72531ed895b"; + sha256 = "ee32c1d9542ccbd3ef1580e14aedcd4d826e9798ab3d2d92ad66f2901bc1fc52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/eo/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/eo/firefox-105.0.3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "abb83c2758cac013bf0cf6fbbf7acf05386567f55c571054e1b6dea8c0c0e43f"; + sha256 = "64e71a8db62a60af6b5d99aba3f679d14bc9c24e484cd8d90cb104c6a47c54b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/es-AR/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/es-AR/firefox-105.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ea93982ba143edaba06936c16284b5eb001c1e5424462e060699a3295119b75f"; + sha256 = "e11588e20066b3fd9a937e61e3d9b78910360ea7f2a73456108ae273e6cbef30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/es-CL/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/es-CL/firefox-105.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "aa92a0970c62f9e7d1909d643453986e41ea81a321871f2c8128ef916a8e1fe8"; + sha256 = "c30a01b1a1c39795276337b14e07f6e1fb8538abf09c047aa6f9da45881f4e37"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/es-ES/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/es-ES/firefox-105.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "06bd1d53d60a276a22a840d7353bfa20c226ac58cd7c465fb06c9fe177eb420a"; + sha256 = "b4874ecc37544358935eab9b10ec0b64f04d68f02fdf65b72c1eb5931abeeb3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/es-MX/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/es-MX/firefox-105.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "7e5ec5011643f3cfe8085c193b840fd1de8e369eb1bd67eb007f4341acac9487"; + sha256 = "fafeff66e92255a41b41c747b73b8f0ac73792570d0d2b51c7ca1679bdaace48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/et/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/et/firefox-105.0.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "018f41bea6254ae1385897945bf751983e0dc817c9035f9079840f67f6af3ed4"; + sha256 = "7332994f9c21977fbabe0f503dba93eebd8594dc1ac3bb9368833d1d6f3a4c5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/eu/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/eu/firefox-105.0.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "34c3f772a5fa16f80922728f11a11f96c6b0b2f7c7bb95a6dd2396c70fb39562"; + sha256 = "86b8eadfc374c00b7ad24b1307bb39b312a08262ffde8af1d10d5bfacf1f0f4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/fa/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/fa/firefox-105.0.3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "2b4021fcdf417558767f703505b4b1ad7e70293db27198def80c45988b3429f3"; + sha256 = "f320084ff16f36591b354a8d2d235eed4ee62826626d8e1540e4a89ab7bc3cf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ff/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ff/firefox-105.0.3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "9b1b52de7649d6852379e96324fa7e21426c73c6e1b8eeeb6cf18bf639b41c7f"; + sha256 = "a5b476cda93670e727a464ecc4fe28f832b961393a664422b8e1ae562ae55586"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/fi/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/fi/firefox-105.0.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "b7a225e82b76f4f16332463937303b1a3a8c22007033393659ab1daa02d27722"; + sha256 = "a1aa4a1664f6ef40d03889e3ff9b9f4d32d349d711ec8c3ed5d1b22ef3de839e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/fr/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/fr/firefox-105.0.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7fefa49faba7d92119f76d662d041428f883399aafb00331ffb97f060da2e32d"; + sha256 = "043cf0ed02dc1bc0b661290a542a3d68989a483fada922a7c8878ade1027e16c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/fy-NL/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/fy-NL/firefox-105.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "9550b148d724d2629fe3907c7d3eeba143a2c50d23ab14494f55da33e31454e1"; + sha256 = "327a189aeca03795337c89a1a8b3c74f4befff03f3f68c08c7086f4a663f9e55"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ga-IE/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ga-IE/firefox-105.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "5ec814aaeb6a430b794df8113d9481d96d97912b542f51950dd1c3c24a5cf220"; + sha256 = "66fb53e02ed85e55c9b33ef75bdbf64d6dfefae995428f1af994a36d47f5f049"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/gd/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/gd/firefox-105.0.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "227fddc59c3314ba62ac7d13e40f7c3112d99ae2a3d0676990329fc4d1874e1d"; + sha256 = "7841ade74e3c1ae03a7a5bdd42e0bf3d0cae84d973ebc63d392e28f94abd592b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/gl/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/gl/firefox-105.0.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "5f0f25b7ad58772e4948ad1a72e01bc1f2f33a1b0512954291c0c63c891b950e"; + sha256 = "f36796fb54015075c0ccaa62d18f1375c5562f4aaf77d57432257e3472f4f33c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/gn/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/gn/firefox-105.0.3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "e5dd4e06fbd220f1a21c471ee38e6653d38a303b2f5564b1e00f8eb35a3cf303"; + sha256 = "76378aee5b9e08f3dcf39a274b22d6c9a5beeb425ff3d3f5a1690496688d5472"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/gu-IN/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/gu-IN/firefox-105.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "181024bdfae07111738906baf996fe8faa4041b872804e725160d3b98b747fe9"; + sha256 = "e8c0e4e369e7921f86322988fbb90a1065548054d2523d416e05d153c1da9d29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/he/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/he/firefox-105.0.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "8968e235b288da41c7896a2d73574c7f8f018f0b0348c1e1c20626a3e29d73e8"; + sha256 = "3009c00e1f5667a90f68296a636a2ca854899e598f533c458a086657291974e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/hi-IN/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/hi-IN/firefox-105.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "4d57c54d40f965169cee2023afefad8dded92e2695e920031b95b28e98d04336"; + sha256 = "22de9e232b13211a288df7591a9092da08097424d3592da51cc158420df55004"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/hr/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/hr/firefox-105.0.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f7d5493712185009393d83470488bb3f8610132a6166d13ee1eb33d992cdbeab"; + sha256 = "f292e53cf42b508dbd1ca6b39909f4596a25adec924b3b1211cc0c8e77d4d392"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/hsb/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/hsb/firefox-105.0.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "39c333ede996d3d678a8673461072c5f25732fef4d39629df2a4b85912fd3b04"; + sha256 = "9ce8fca11383bf8892f25f4427da0972e9d064e6e454724a88cef28d8d63fcf1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/hu/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/hu/firefox-105.0.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "1f30c7756933e397f8817dafcb0c3265cde450720d3915e01374918774cc626c"; + sha256 = "43e6997bf1136e7ceaf8aa3aad29f5bfb0ed7f188a2f1d60ae9c6d0734b83dac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/hy-AM/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/hy-AM/firefox-105.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "481d7b3a31e3a95e12f1fd73e32da4ef7be1b1de5c24cf13779cd5b8de600216"; + sha256 = "1767835b4c87f056cac8c92ebd871381847b92cc5b8389c98b53747b036865a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ia/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ia/firefox-105.0.3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "9472b0cab6807dd844aca41bb5e4cc041fdbc414e902418192271efe6c6051ac"; + sha256 = "6d6c8edecdde5e7b9f3b29707bb185e8e2c74955a8353eee3501259e29d170e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/id/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/id/firefox-105.0.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "0d1573bad6adf59a8c738f5d841fa68800e24f41c1fdeffb2429e899df4e3ecb"; + sha256 = "6c45b503afd145f046cc75b21c15454e9dbdebb6ec0acc72620b36df48fe4d63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/is/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/is/firefox-105.0.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b420be8c79d1ec72e72d127c439a8828f5999c7d38e3781f99c68b1a64b8035f"; + sha256 = "1bc10eec344890a2b7965d78fd7c1075b55f011e25157d12b5fcada24c1438be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/it/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/it/firefox-105.0.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "2bf3cc8b4ea09af4acf9ddc8aa0028ac0166c94ac12d8202e2db17b512e4fffb"; + sha256 = "eaab133d00e207eb82c92279614ea981f721c181673acc9d7df221078f935c76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ja/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ja/firefox-105.0.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "666b5370f9d37434fc43d02904a2f101571611f5a12ebe7ea90f689dcf8c8b81"; + sha256 = "8f440f3517c88dbd760bb3d9772c664776e1531d3da99bc1c2d29f1c9a0d60e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ka/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ka/firefox-105.0.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f2b12e230c3ee6b3320508b192b4e3f427d562fe505abb99bed913218588bd74"; + sha256 = "13e4a15576c5b1251a494187495549982fe3a9e2953a9787f61da3d7ae45cee0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/kab/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/kab/firefox-105.0.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "b0a6a1e4aff4f340c1fddf2bde03a0e56397bff5dabaeea862f57b007f14cdc0"; + sha256 = "d691522589df270c1d8c11bbccde65912a927c21b1e908424d7ee27ada5693f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/kk/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/kk/firefox-105.0.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "783865df2e7095fafbcd6edde3e1dc3470bb301d625c0315ff83b293534eb263"; + sha256 = "8927e2a173fbc3550f7fa1bbf10b7f279fc2230c82923f8970b067c3a0f03c09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/km/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/km/firefox-105.0.3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "06c25152dd3cf32e89f5adf526d1f9ad8ce5e798ad6265b98b227d400190c617"; + sha256 = "3ebdc47b131615c763bf2c70d5227317e83e9eb29f99e8de5d06728217c2a7c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/kn/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/kn/firefox-105.0.3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "7a5bf4c31b625c46ebd82a4db8347e68e031892d9c9126c711ca43df63fc2649"; + sha256 = "e6bd0cc5005a4d940e435e45f8da1f7e9ce77967b17eb670b1a249d286bb8899"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ko/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ko/firefox-105.0.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a0780299835f875bedd0fc1908959817d27ae9e8df0854d762c09da0fbbb70e6"; + sha256 = "2183dfbf8f7326e8d7032937e20a07d40b945a2ac356b3d52284c7f86627b9e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/lij/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/lij/firefox-105.0.3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "636067354e25e0e88d2b5b679f4984a3cbee6a36ef360bcce77a4cea20993748"; + sha256 = "ce9a749e34524f4a794e0b9f16203c696387f8e50772f4a4570cee7aad2d4f70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/lt/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/lt/firefox-105.0.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f8643f2956b44a9f4127867154ad4e6d1924269fdcfd21a8e74b329d96d4a706"; + sha256 = "698b1c07e987b982ba79219bbd0f6520676fdbbff5deebb2d61e63b84f824545"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/lv/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/lv/firefox-105.0.3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "e8dfb8b33801ae7445aa43b767a9f51cc220d59b07f1c1367457653ac738d272"; + sha256 = "8f81574c7bbbeef860394442563735659043f9037bb1db2d9b8f4e861b3f924f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/mk/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/mk/firefox-105.0.3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "965030558d6bc43c8c07c32d7ac93d35d7d9962396c0e2b45d9a8499774a60a8"; + sha256 = "488dcef5415ad5705710eea19fd5fa998d1a6a4b84ec8575cba5b3ef7e1f9785"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/mr/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/mr/firefox-105.0.3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "2763857de9bc8fc41e01fbfbb63a479672fa38cadee59ddad514661bf345ce72"; + sha256 = "3fdb46231269e6980a8d0e255053537b6dac9426eecae3e275fbfe0e865d3fae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ms/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ms/firefox-105.0.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "0cbc063cff1ad5718028a81937280486feee3a63aba4fb13224a2a10fcddd561"; + sha256 = "13f3b1b733bc56f6c74125d41e31fcae26ec100b1e809b60b123a7c7cc7245a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/my/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/my/firefox-105.0.3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "d2adf75fc742fa205f1493a6b65d0646e83e942c348ebfafe385e528e721d71b"; + sha256 = "6220591b94ee888d0923714140afc9bee16bf3e65354853f0064e1d532e96b7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/nb-NO/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/nb-NO/firefox-105.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "1464a6619f1cceb564c1e9f32ae8b5cc3e8a9ee62cbbffe181226698c5ded161"; + sha256 = "44b8a4c53c4eac3b5a070aed067edf3cc5df016223a2d7f23a05963906621c0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ne-NP/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ne-NP/firefox-105.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "0ada42ddf96d8288bd325f99aaf91fac6779922dd2117fc74d9034112a1f985d"; + sha256 = "58c284124e69cb968df0ee24ec3e675298383a77300135f762a7c4c69aa90927"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/nl/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/nl/firefox-105.0.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "ebbfcdbab8ebc80dfb15eac0206efd68e559754fc1bafac3ab450c564ee1e8c6"; + sha256 = "43d15e1bc47e0353f10afa0b4b1ff78019fd1b9b94801f8c19366c2e4855c11c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/nn-NO/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/nn-NO/firefox-105.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "fdaad5508051c682a6949daa0e36ec84bfea17f016d24b2d2b93461b6a85ca87"; + sha256 = "6c2e14754de59c46407a392866d459a0703024eba02ca30c85d425f616915f41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/oc/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/oc/firefox-105.0.3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "eff46408202a97bbfa1885aa6a76835dfaeb33d1892f1294940d696d432c20c5"; + sha256 = "7a5be45cf9ac8cd05543c0176554d8a6a79746b4ae64241104217a1606a5378d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/pa-IN/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/pa-IN/firefox-105.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "840fbea8544d6baf81241c1b7a7d23560973ec3677214836a20137338cd41c33"; + sha256 = "8ee00f57db739bfa281d9ed34cf098ea454cb7daab987af44c6899a19483bbe9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/pl/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/pl/firefox-105.0.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "7238903aaed3625786dd315084238cfed31aace7a48dc19edfb40714b8ef8f0f"; + sha256 = "6ff08d1d2c99c3fb219608420942e652340aec3d9173fe9dca8d19c0c9e23179"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/pt-BR/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/pt-BR/firefox-105.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "75d5374dce1e4a6e25317ea050ea8819e8b855affbf306df2213822eba743c1b"; + sha256 = "8af52fe74cea46431a52e3b25fd1117ab5b0a3ca6a2f98de6a1b3a4aed934157"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/pt-PT/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/pt-PT/firefox-105.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "1f1cdaf6f3909558a38a4716539166f7e237c54485f4e53b6adc2aa25fff7f5f"; + sha256 = "f5eb2fe6f79566fdc15bc742889989f486c6a1e689fa1cc66bfea6a1226606d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/rm/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/rm/firefox-105.0.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "bf261fc9821f42901350982452e7ef69f0cf94fb4b4c3a8cc2e6a39611ccf4a7"; + sha256 = "9f3014f23a3e6b5705690c3e6191139a9a7d2b154061db9e426d3addc75e173a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ro/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ro/firefox-105.0.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "9f6ea3fb9af5f0ae117129548a2c6f3bba28765c103558756f672ded6bac9e78"; + sha256 = "2f0f597bd12f1a4829812ef7d37b385304e9b4f34640dcabb75e3e57e1533dfc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ru/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ru/firefox-105.0.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "933893a72cc90061cb0bf0a4efce8a8e5694c648201728fe2749612fc1ec2a7f"; + sha256 = "42aa24a51d8195cd5b775985e4649bbb90b09881c8079efb67c9e2c98981402d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/sco/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/sco/firefox-105.0.3.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "b67dde50849a7beb29bfdd57aea15dc78a1e53ebf511a1f96a7fb35c0e6532db"; + sha256 = "b427a10f867151eeef63e1c688c6ca8f8badd01fe6bc5679a4c7317187a63c70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/si/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/si/firefox-105.0.3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "6063bd9e5aee98e3f709127ebc2dba8c06b6089461983c3da621bce197f11d11"; + sha256 = "e2998353d246e09ad103e8996f5dfa09fc88ee8bcd448519e28164caf53820bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/sk/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/sk/firefox-105.0.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "3fdf0d10003878d73a2f5d0e07f7dd63bd9e7e363c039e200c5b2628edbf5343"; + sha256 = "6703272c7c5b82d17f540851ab8dd0bd4e22dc53bc207378e26f7ac980456df0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/sl/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/sl/firefox-105.0.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "008c46056e4d03bd31216c818858dcde07adbf3a7b87c273196ff8ac22e5979b"; + sha256 = "fdef0b818d06b40ef8afd5caa2f1c7527fe5ddc7404171913b0523e30bc10d4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/son/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/son/firefox-105.0.3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "3bfa44ec693f9bfb1813316bdd4f5e5be0c76dab938248fd4cdfb3259f22d98b"; + sha256 = "bd776e170be9f81a05d6257252ab8f918463ac5b06f4ce34014471eb89b3e0c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/sq/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/sq/firefox-105.0.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "070e7162c2ed8daab7adab7d08d93adda8d411a56bc8ca9d32daba7a333b4873"; + sha256 = "18c9106995e2fc3196f095fb682836fb1c2e934de91324a61815854130ed2803"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/sr/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/sr/firefox-105.0.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "df51f1310cf61c087c128999fe09c5cac56141a9ab7c0ed1faf9ca41992af756"; + sha256 = "a8ff60a41173b262139791ac5675a90864f6fe9dcd885095dd3cad40ee830463"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/sv-SE/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/sv-SE/firefox-105.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "df05aec1c9a34bc8392717522535f9b83a5adda4e57dcbfd9421b4f71caa2928"; + sha256 = "6e16e619a700c460807662aae598c2733e8c4d45be4dcb2a11f17afda9fcff81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/szl/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/szl/firefox-105.0.3.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "c39fabf4ae4d38411a5054365a97440a2ce14dc0aabfd1dfeb4b32c70e5cc84d"; + sha256 = "6f6e39fe204a09cd8b0531cc713aa001041f17091bcedfc6ecb12082a56b87a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ta/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ta/firefox-105.0.3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "e3648edda3e89e46c69cbbfa64835d7d1eea0df3cb34c224d85b21b9bf2de0a9"; + sha256 = "6a096797f2728a3e6f7f62563c8564c3633c792dd353314cf9fd93ed27d8640d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/te/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/te/firefox-105.0.3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "60e808bd5cc3d7e95c5815bf0718c7dcfa469f114485636abcac8b9f6f4598bd"; + sha256 = "2fcc10e8cd8605f66ea64434c2e86ca5038537f62dc0320ac7fe2a5593758671"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/th/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/th/firefox-105.0.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "5327332fa0fa7bb2b15553274f4867158723f7f778fe1b76e47e03b8286fe8c4"; + sha256 = "b84a5d5a1cbf6cf96e8b58cce0ffa4106f495893bc3ddc3f0926c42977e42b16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/tl/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/tl/firefox-105.0.3.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "417ed820ec567617b79029cc56572f82d68a54a194e281c0046329d247cc8321"; + sha256 = "29110abcd66455ea69051a6bf67a2a6d039e83117643c96eb3779c9642bd913c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/tr/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/tr/firefox-105.0.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "efadb1233f78517063d5ea01992a2e0b87e6bf0b7e059ab93cea9ec56b92fd5f"; + sha256 = "f63eb01f58376fedff264bb5b928c133b2dc5d1fe59ecfe1968499497caae6d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/trs/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/trs/firefox-105.0.3.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "d50741ee4a03767bc93f8c6fe6c3d4ae28d4279e491dc7f63a6d4d9c0b903636"; + sha256 = "bb5b894c541304f16b8b49e9c73ffdbec1845308b6d03ca89a7466cb3c8b8672"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/uk/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/uk/firefox-105.0.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "b793a691f4ba360110d8588d135fc9b6148114367cb511fa4109af9591031468"; + sha256 = "51d9df9ea5f3da901146428ecd59ec6ec5fe3f47bb4f2d1f8721ee07186653a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/ur/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/ur/firefox-105.0.3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "86779f16e1c6bd852a5bf2a6d3cf4d185318a0e8255f5e740320a0acdad7483b"; + sha256 = "2d5b7c2f5c0eca1a6ad23987d56b4621c05e610956486b69703f8555ba92b868"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/uz/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/uz/firefox-105.0.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "75923c30c7d2f4ae52cd85f08636d984c28413cd1e3c78d0c11dac5a217cb496"; + sha256 = "1cb92952cea218d021bb417d6e70f691531e2d47bf480ac63dd94ceaed4ab99d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/vi/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/vi/firefox-105.0.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "28f263131e02353e593906a289f9e6b929a6bd84be54647b486c9477c09596ce"; + sha256 = "c10a5bd0eb0c5264de3b5a5adcf722c38af5308d1e77c84469d6833cc1083390"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/xh/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/xh/firefox-105.0.3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "6c27086dc8136077ab1c18d134ba5d569675296e428f7eb06db12761a4a52d93"; + sha256 = "6811b7ab830b82e53ac6d6d6e66c2345cfa75fb334345387f33ac5e9ffc9f79f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/zh-CN/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/zh-CN/firefox-105.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "04e98684a9aaeb75e8e5e70ace60593fe200705ab055ffe1556f71e23ca77424"; + sha256 = "af851d028a17c3444382d49f429f86340d52f2d326bf0de1f4e5a66be18f0a0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.1/linux-i686/zh-TW/firefox-105.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0.3/linux-i686/zh-TW/firefox-105.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "55f58ba2ef1806f37493503aad5bffdaab69cfb31661933b01e8be5aeb963e64"; + sha256 = "9e2f93327b92bd7825530be238312a04ec848958053bfff69191181c1a9b520b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 682d4c37ee432..438f90bf19572 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 = "105.0.1"; + version = "105.0.3"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "66ef7cd5028953e7da9d55e127135739c9d85be68ec633b71c52d6c9427edb0bd8a38504148484cd322adcefb57bfefe6e57cb15855f195508fe438864f4322b"; + sha512 = "8a60ed26f3a6e3fafb1eb13a8daf067056d011a17835310f8ce814b86121014796e790f611058aea75334428529028a2e29ba81d9d2653e09517dc7c3cf48e76"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 3e20e6158c979..eeb72590df23e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,10 +1,10 @@ { stdenv, lib, makeDesktopItem, makeWrapper, makeBinaryWrapper, lndir, config -, fetchurl, zip, unzip, jq, xdg-utils, writeText +, jq, xdg-utils, writeText ## various stuff that can be plugged in , ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc , gnome/*.gnome-shell*/ -, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire +, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx_cast_bridge , udev @@ -65,7 +65,7 @@ let ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBukubrow or false) bukubrow ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native - ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell + ++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge diff --git a/pkgs/applications/networking/browsers/misc/widevine-cdm.nix b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix new file mode 100644 index 0000000000000..41021cfdaa7c2 --- /dev/null +++ b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchzip +}: + +stdenv.mkDerivation rec { + pname = "widevine-cdm"; + version = "4.10.2449.0"; + + src = fetchzip { + url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; + sha256 = "sha256-f2kAkP+s3fB+krEZsiujEoI4oznkzSyaIB/CRJZWlXE="; + stripRoot = false; + }; + + installPhase = '' + install -vD libwidevinecdm.so $out/libwidevinecdm.so + ''; + + meta = with lib; { + description = "Widevine CDM"; + homepage = "https://www.widevine.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ jlamur ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix index db4940093b309..72eeda8152955 100644 --- a/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook +{ lib, stdenv, fetchurl, makeWrapper, wrapGAppsHook # Buildtime dependencies. , check, pkg-config, xxd diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index cb11708fbee09..98a5b1cf50f84 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -31,14 +31,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "offpunk"; - version = "1.5"; + version = "1.6"; src = fetchFromGitea { domain = "notabug.org"; owner = "ploum"; repo = "offpunk"; rev = "v${finalAttrs.version}"; - sha256 = "1zg13wajsfrl3hli6sihn47db08w037jjq9vgr6m5sjh8r1jb9iy"; + sha256 = "1pfafb96xk7vis26zhfq254waz1ic9p0zdkxwpqs84p3vsmny775"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix new file mode 100644 index 0000000000000..ad7f6e5154ada --- /dev/null +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -0,0 +1,41 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "polypane"; + version = "10.0.1"; + + src = fetchurl { + url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; + name = "${pname}-${version}.AppImage"; + sha256 = "eujv99L5svMhDIKHFOfm7sOwNZ4xiUaIsimfOf4BBik="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname src version; + }; +in appimageTools.wrapType2 { + inherit pname src version; + + multiPkgs = null; + extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; + + extraInstallCommands = '' + ln -s $out/bin/${pname}-${version} $out/bin/${pname} + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/${pname}.png \ + $out/share/icons/hicolor/512x512/apps/${pname}.png + ''; + + meta = with lib; { + description = "Browser with unified devtools targeting responsability and acessibility"; + longDescription = '' + The stand-alone browser for ambitious developers that want to build responsive, + accessible and performant websites in a fraction of the time it takes with other browsers. + ''; + homepage = "https://polypane.app/"; + maintainers = with maintainers; [ zoedsoupe ]; + platforms = [ "x86_64-linux" ]; + changelog = "https://polypane.app/docs/changelog/"; + license = licenses.unfree; + }; +} diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index ce2392ab4edca..4f10e76d0e4f4 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, fetchzip, python3 -, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking +{ stdenv, lib, fetchurl, fetchzip, fetchFromGitHub, python3 +, wrapQtAppsHook, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null , withPdfReader ? true @@ -7,35 +7,58 @@ , backend ? "webengine" , pipewireSupport ? stdenv.isLinux , pipewire_0_2 -}: +, qtwayland +, mkDerivationWith ? null +, qtbase ? null +, qtwebengine ? null +, wrapGAppsHook ? null +, enableWideVine ? false +, widevine-cdm +}: let + isQt6 = mkDerivationWith == null; -assert withMediaPlayback -> gst_all_1 != null; - -let python3Packages = python3.pkgs; pdfjs = let version = "2.14.305"; in - fetchzip rec { + fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; hash = "sha256-E7t+0AUndrgi4zfJth0w28RmWLqLyXMUCnueNf/gNi4="; stripRoot = false; }; backendPackage = - if backend == "webengine" then python3Packages.pyqtwebengine else + if backend == "webengine" then if isQt6 then python3Packages.pyqt6-webengine else python3Packages.pyqtwebengine else if backend == "webkit" then python3Packages.pyqt5_with_qtwebkit else throw '' Unknown qutebrowser backend "${backend}". Valid choices are qtwebengine (recommended) or qtwebkit. ''; -in mkDerivationWith python3Packages.buildPythonApplication rec { + buildPythonApplication = if isQt6 then python3Packages.buildPythonApplication else mkDerivationWith python3Packages.buildPythonApplication; + pname = "qutebrowser"; - version = "2.5.2"; + version = if isQt6 then "unstable-2022-09-16" else "2.5.2"; + +in +assert withMediaPlayback -> gst_all_1 != null; +assert isQt6 -> backend != "webkit"; + +buildPythonApplication { + inherit pname version; + + src = if isQt6 then + # comes from qt6-v2 branch of upstream + # https://github.com/qutebrowser/qutebrowser/issues/7202 + fetchFromGitHub { + owner = "qutebrowser"; + repo = "qutebrowser"; + rev = "5e11e6c7d413cf5c77056ba871a545aae1cfd66a"; + sha256 = "sha256-5HNzPO07lUQe/Q3Nb4JiS9kb9GMQ5/FqM5029vLNNWo="; + } # the release tarballs are different from the git checkout! - src = fetchurl { + else fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; hash = "sha256-qb/OFN3EA94N6y7t+YPCMc4APgdZmV7H706jTkl06Qg="; }; @@ -54,7 +77,8 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt - ]; + ] + ++ lib.optional isQt6 python3Packages.pygments; propagatedBuildInputs = with python3Packages; ([ pyyaml backendPackage jinja2 pygments @@ -66,6 +90,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { adblock ] ++ lib.optional (pythonOlder "3.9") importlib-resources + ++ lib.optional stdenv.isLinux qtwayland ); patches = [ @@ -75,6 +100,12 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { dontWrapGApps = true; dontWrapQtApps = true; + preConfigure = '' + a2x -f manpage doc/qutebrowser.1.asciidoc + '' + lib.optionalString isQt6 '' + python scripts/asciidoc2html.py + ''; + postPatch = '' substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser" @@ -83,10 +114,6 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py ''; - postBuild = '' - a2x -f manpage doc/qutebrowser.1.asciidoc - ''; - postInstall = '' install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" install -Dm644 misc/org.qutebrowser.qutebrowser.desktop \ @@ -94,14 +121,15 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { # Install icons for i in 16 24 32 48 64 128 256 512; do - install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \ + install -Dm644 "${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser-''${i}x''${i}.png" \ "$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png" done - install -Dm644 icons/qutebrowser.svg \ + install -Dm644 ${lib.optionalString isQt6 "qutebrowser/"}icons/qutebrowser.svg \ "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg" # Install scripts sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh + ${lib.optionalString isQt6 "rm -rf scripts/{testbrowser,dev}"} install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f) install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* @@ -123,6 +151,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { --add-flags '--backend ${backend}' --set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}" ${lib.optionalString (pipewireSupport && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''} + ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/libwidevinecdm.so"''} ) ''; @@ -131,6 +160,6 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { description = "Keyboard-focused browser with a minimal GUI"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda ]; - inherit (backendPackage.meta) platforms; + platforms = if enableWideVine then [ "x86_64-linux" ] else backendPackage.meta.platforms; }; } diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index b5961c4adbc27..a0a9b10f068a0 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -25,6 +25,7 @@ , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 +, docutils , gobject-introspection , gst_all_1 , sofia_sip @@ -32,15 +33,15 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "42.0"; + version = "43.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = version; + rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-ASKK9PB5FAD10CR5O+L2WgMjCzmIalithHL8jV0USiM="; + hash = "sha256-fvG9N6HuuO8BMH8MJRquMSe1oEPNmX/pzsJX5yzs1CY="; }; outputs = [ "out" "devdoc" ]; @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + docutils ]; buildInputs = [ @@ -104,7 +106,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A phone dialer and call handler"; longDescription = "GNOME Calls is a phone dialer and call handler. Setting NixOS option `programs.calls.enable = true` is recommended."; - homepage = "https://source.puri.sm/Librem5/calls"; + homepage = "https://gitlab.gnome.org/GNOME/calls"; license = licenses.gpl3Plus; maintainers = with maintainers; [ craigem lheckemann tomfitzhenry ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/cisco-packet-tracer/7.nix b/pkgs/applications/networking/cisco-packet-tracer/7.nix index 422ccd05cffcb..413ed86619673 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/7.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/7.nix @@ -1,7 +1,6 @@ { stdenv , lib , buildFHSUserEnvBubblewrap -, callPackage , copyDesktopItems , dpkg , lndir diff --git a/pkgs/applications/networking/cisco-packet-tracer/8.nix b/pkgs/applications/networking/cisco-packet-tracer/8.nix index 05ced41827403..4d4f65c306617 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/8.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/8.nix @@ -3,7 +3,6 @@ , alsa-lib , autoPatchelfHook , buildFHSUserEnvBubblewrap -, callPackage , copyDesktopItems , dbus , dpkg diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 1d799c9fe9fdd..3fd45f3e9c28d 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.3.9"; + version = "3.4.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-BDanFiLhucNE4uvUxKDXAK1W755VfNytQ3gXuLIKfSE="; + sha256 = "sha256-bAfND84mbJulv0IO6JF2c+ZbwKeND8AVAJHmdMmhZ/s="; }; - vendorSha256 = "sha256-303+LE3n3lltuCf+Pc7S+qHdsjQDt9IAu9Kd4sUaiYI="; + vendorSha256 = "sha256-S4p56/OZpufpi71aueYTvPcM4LoZWyAhcAzUUUrUw4Q="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index ca4c7139adba6..8aef3f81af518 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-aC3U9Qeahji3xSuJWuMlf2TzKEqPDAOuB52A4Om/fRU="; }; - vendorSha256 = "sha256-ujDtfDL1VWe4XjTHD+pXMmMFp0AiuZcE+CKRkMsiv9Q="; + vendorSha256 = "sha256-waEvrIEXQMyzSyHpPo7H0OwfD5Zo/rwWTpeWvipZXv8="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 84cc0ee0f09a2..02ec3369501e1 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.4.12"; + version = "2.4.14"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-U3Qct7wL/oJDgU+PXL5UMMTsQo4maeKShDwU2crSWxk="; + sha256 = "sha256-txVNv/JowIGKMvNjsMUzwLT328qJg/DkS/R0RkN8b34="; }; vendorSha256 = "sha256-n6elT6ETOtbZsFqfwMo9d2qqamS8jdrROjFjStNkalc="; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 38408ed32ea7c..8ce7b0dcae00b 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atlantis"; - version = "0.19.8"; + version = "0.20.1"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-o8lBpiR8gIo1kyOTkPOIuMnJbJsi619Zl0bAAFGYM4E="; + sha256 = "sha256-5zchElzEjrIgODRUvQTQwlBz5371iJU5VOpz12Xtbcg="; }; - vendorSha256 = "sha256-aEMRCvZBaY1uwZqKtMmZ4aiPdNmtANcnuE7eykBiTQg="; + vendorSha256 = "sha256-n2yzqNjmPDP+8/ipiuUt6BqFYF0Oh0Y0TCdKsqCcrIQ="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index ef7c3787bdc92..e255611a1b3fc 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.8.2"; + version = "1.10.2"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rDbnny/qRU31ciAXKLGLXS3FhgOpxmkLT4oatYCbt9g="; + sha256 = "sha256-/rxGAfYjV5VzYs9h8eCpz5jhmW7jPdk1XB3bXHH+oQw="; }; - vendorSha256 = "sha256-Kfv3RlH80E/9yf/rvnY5vljaRr4cH5AhgXQn54x72Ds="; + vendorSha256 = "sha256-/b764auKkZF0oMqNlXmsW9aB5gcq4WFQRFjsVhNDiB4="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index f6e5aa4952f83..3892266c7f929 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.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-U9U1r74E4ryc8zUb1EogfBT57kfsd89i7DWO05tnQw4="; + sha256 = "sha256-QVzhRaNLFhH+5x+/X/Nc3bW/09txurhVd0yDU9LYhAo="; }; - vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg="; + vendorSha256 = "sha256-jPIrUW4el8sAO+4j20qMYVXqvov6Ac0cENd7gOrYj+U="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 4a990caf3b50d..82728cc1d2a2c 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -48,6 +48,6 @@ buildGoModule rec { downloadPage = "https://github.com/cert-manager/cert-manager"; license = licenses.asl20; homepage = "https://cert-manager.io/"; - maintainers = with maintainers; [ joshvanl superherointj ]; + maintainers = with maintainers; [ joshvanl ]; }; } diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index ad26d4f6cba98..0c9d90cd8aacd 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.37.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-Abp5JetsMqIXZK8BxNa22OBFCxquoLoy3npv6XxCWGo="; + sha256 = "sha256-etH/92Nhl5ZkmBeDtgFN0pLUOzgWhd3lClW4+zXYPr4="; }; - vendorSha256 = "sha256-uWPnBqT6lZSRClw2RyxHEOzue1Azj9VpPaulMA3qlug="; + vendorSha256 = "sha256-tvl0VlMUD7rVlB/OjyptYyllx6brX+ycGTp4In9yEvE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 71597daea2b05..c0886ff20430f 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -65,7 +65,7 @@ in buildGoModule rec { ''; homepage = "https://fluxcd.io"; license = licenses.asl20; - maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ]; + maintainers = with maintainers; [ bryanasdev000 jlesquembre ]; mainProgram = "flux"; }; } diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/applications/networking/cluster/gatekeeper/default.nix index 8dbe5f4659f04..192f37228a736 100644 --- a/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - sha256 = "sha256-hZ8PBJ+6G0A5tVrJfxy2rODxOxQarQg6mxG3sQCqjfY="; + sha256 = "sha256-XZASej26Mn4tq9c4nvjQNhQZWtu3L6jIgMNhyYyh5IE="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 1d9b10bfc39b3..365cac59f41ad 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -10,7 +10,7 @@ , which , bzip2 , cyrus_sasl -, protobuf3_7 +, protobuf , snappy , zlib , zstd @@ -92,8 +92,8 @@ in pname = "hadoop"; platformAttrs = rec { x86_64-linux = { - version = "3.3.3"; - hash = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q="; + version = "3.3.4"; + hash = "sha256-akg9GgsSNJDr2N8/cbZOs58zP3i5XwkK61jkM8vCQW0="; }; x86_64-darwin = x86_64-linux; aarch64-linux = { @@ -107,7 +107,7 @@ in jdk = jdk11_headless; inherit openssl; # TODO: Package and add Intel Storage Acceleration Library - nativeLibs = [ stdenv.cc.cc.lib protobuf3_7 zlib snappy ]; + nativeLibs = [ stdenv.cc.cc.lib protobuf zlib snappy ]; libPatches = '' ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/${untarDir}/lib/native/libsasl2.so.2 ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/${untarDir}/lib/native/ @@ -119,14 +119,17 @@ in patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 # Java 8 has libjvm.so at a different path patchelf --add-rpath ${jdk.home}/jre/lib/amd64/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0 + # NixOS/nixpkgs#193370 + # This workaround is needed to use protobuf 3.19 + patchelf --replace-needed libprotobuf.so.18 libprotobuf.so $out/lib/${untarDir}/lib/native/libhdfspp.so ''; tests = nixosTests.hadoop; }; hadoop_3_2 = common rec { pname = "hadoop"; platformAttrs.x86_64-linux = { - version = "3.2.3"; - hash = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU="; + version = "3.2.4"; + hash = "sha256-qt2gpMr+NHuiVR+/zFRzRyRKG725/ZNBIM69z9J9wNw="; }; jdk = jdk8_headless; # not using native libs because of broken openssl_1_0_2 dependency diff --git a/pkgs/applications/networking/cluster/hashi-up/default.nix b/pkgs/applications/networking/cluster/hashi-up/default.nix new file mode 100644 index 0000000000000..1efc1c438a5ab --- /dev/null +++ b/pkgs/applications/networking/cluster/hashi-up/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "hashi-up"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "jsiebens"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-PdZ8X2pJ5TfT0bJ4/P/XbMTv+yyL5/1AxIFHnL/qNcg="; + }; + + vendorSha256 = "sha256-dircE3WlDPsPnF+0wT5RG/c4hC8qPs8NaSGM5wpvVlM="; + + meta = with lib; { + description = "A lightweight utility to install HashiCorp Consul, Nomad, or Vault on any remote Linux host"; + homepage = "https://github.com/jsiebens/hashi-up"; + license = licenses.mit; + maintainers = with maintainers; [ lucperkins ]; + }; +} diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 55e5c77c733ce..5ec74e95e05cb 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-oYM7T0t/U7Y/O4u3t9eDjfoxjVeNFBPJdlPs+p9PXOM="; + sha256 = "sha256-OyU97zyN7fZMZAD2BEp8TW2z2E9Rl/yeiVkQaJ1GWZk="; }; - vendorSha256 = "sha256-cyqTed3IZ5JFHYTphrOzSmcAc9xyre2LuMC3p0rfh/Y="; + vendorSha256 = "sha256-vyHT/N5lat/vqM2jK4Q+jJOtZpS52YCYGcJqfa5e0KM="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 13d08e334786b..e469562bff2bc 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -42,7 +42,7 @@ buildGoModule rec { description = "Istio configuration command line utility for service operators to debug and diagnose their Istio mesh"; homepage = "https://istio.io/latest/docs/reference/commands/istioctl"; license = licenses.asl20; - maintainers = with maintainers; [ superherointj bryanasdev000 veehaitch ]; + maintainers = with maintainers; [ bryanasdev000 veehaitch ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 47caa17213363..0fdc7cc4f429a 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -47,10 +47,10 @@ with lib; # 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.0+k3s1"; # k3s git tag - k3sCommit = "26e9405767263a2915723cb72b1ffd7f50687a8f"; # k3s git commit at the above version - k3sRepoSha256 = "0rk0svqx26rn6qlvvyj5rsqb87195h1qcf84qmmvf874qwszwpgh"; - k3sVendorSha256 = "sha256-YX/yLOLtDxGhRB4tic6oTli/qeeSnpP+f+S+sVXXDSs="; + k3sVersion = "1.25.2+k3s1"; # k3s git tag + k3sCommit = "53c268d8eb90ceea5e1c7865f89db5c7fb8763bc"; # k3s git commit at the above version + k3sRepoSha256 = "1w040bsrf981k19rwaaxjsv52pgzc0k77x083fkhysmrca565z0y"; + k3sVendorSha256 = "sha256-8Xti08sjFk1WKimH/GEb99oqBdFO79WVCvYyXIWMpgo="; # 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. @@ -77,7 +77,7 @@ let description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank mic92 superherointj ]; + maintainers = with maintainers; [ euank mic92 ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index 6c9755334cde0..ac46e7ae51e5e 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -7,8 +7,8 @@ WORKDIR=$(mktemp -d) trap "rm -rf ${WORKDIR}" EXIT NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/ -NIXPKGS_K3S_FOLDER=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ -cd ${NIXPKGS_K3S_FOLDER} +NIXPKGS_K3S_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ +cd ${NIXPKGS_K3S_PATH} LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ @@ -60,7 +60,7 @@ CRI_CTL_VERSION=$(grep github.com/kubernetes-sigs/cri-tools ${FILE_GO_MOD} \ | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//') setKV () { - sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_FOLDER}default.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_PATH}default.nix } setKV k3sVersion ${K3S_VERSION} @@ -91,3 +91,11 @@ else echo "Update failed. K3S_VENDOR_SHA256 is empty." exit 1 fi + +# `git` flag here is to be used by local maintainers to speed up the bump process +if [ $# -eq 1 ] && [ "$1" = "git" ]; then + OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_ROOT. {}; k3s.version or (builtins.parseDrvName k3s.name).version" | tr -d '"')" + git switch -c "package-k3s-${K3S_VERSION}" + git add "$NIXPKGS_K3S_PATH"/default.nix + git commit -m "k3s: ${OLD_VERSION} -> ${K3S_VERSION}" +fi diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/applications/networking/cluster/k3sup/default.nix index 3bedb0195248f..f9586ffa46614 100644 --- a/pkgs/applications/networking/cluster/k3sup/default.nix +++ b/pkgs/applications/networking/cluster/k3sup/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "k3sup"; - version = "0.12.3"; + version = "0.12.7"; src = fetchFromGitHub { owner = "alexellis"; repo = "k3sup"; rev = version; - sha256 = "sha256-2S/VnxVb056aPxFd5LxtUdaNlosHLlu7Tl/RQbY/zpA="; + sha256 = "sha256-EOGYOxRhpPHOSo9ccCSvat9kq2SlujPqno8v7/zmuto="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index a18e60f051bf1..cf57113987105 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -49,15 +49,9 @@ in rec { mkKops = generic; - kops_1_22 = mkKops rec { - version = "1.22.4"; - sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE="; - rev = "v${version}"; - }; - kops_1_23 = mkKops rec { - version = "1.23.2"; - sha256 = "sha256-9GANjGRS9QaJw+CEeMv/f+rEu37QV2YxMvSRSH6+3PM="; + version = "1.23.4"; + sha256 = "sha256-hUj/kUyaqo8q3SJTkd5+9Ld8kfE8wCYNJ2qIATjXqhU="; rev = "v${version}"; }; @@ -67,4 +61,9 @@ rec { rev = "v${version}"; }; + kops_1_25 = mkKops rec { + version = "1.25.1"; + sha256 = "sha256-wKmEdcORXBKQ1AjYr0tNimxs//tSNPO3VQpEPC2mieA="; + rev = "v${version}"; + }; } diff --git a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix index 5e78cc9b72bd9..8e504294053b0 100644 --- a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "kubectl-doctor"; @@ -11,7 +11,16 @@ buildGoModule rec { sha256 = "sha256-yp5OfSDxIASiCgISUVNxfe3dsLukgIoHARVPALIaQfY="; }; - vendorSha256 = "sha256-pdg65q7iMkcpFvSVUTa07m5URLQNNEfWQ4mdGu4suBM="; + patches = [ + (fetchpatch { + # https://github.com/emirozer/kubectl-doctor/pull/21 + name = "go-1.19-client-go-0.25.patch"; + url = "https://github.com/emirozer/kubectl-doctor/commit/a987ef58063e305409034af280d688a11682dbb9.patch"; + sha256 = "sha256-NQd/WxUfYwBDowhnoUWaOV8k7msiOhff3Bjux+a9R9E="; + }) + ]; + + vendorSha256 = "sha256-qhffg/s1RZFNW0nHLbJ89yqLzdC72ARXdbSfMLJK2pQ="; postInstall = '' mv $out/bin/{cmd,kubectl-doctor} diff --git a/pkgs/applications/networking/cluster/kubectl-images/default.nix b/pkgs/applications/networking/cluster/kubectl-images/default.nix new file mode 100644 index 0000000000000..87d9b36f7b840 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubectl-images/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubectl-images"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "chenjiandongx"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-aDWtLTnMQklTU6X6LF0oBuh1317I5/kiEZVePgJjIdU"; + }; + + vendorSha256 = "sha256-FxaOOFwDf3LNREOlA7frqhDXzc91LC3uJev3kzLDEy8"; + + postInstall = '' + mv $out/bin/cmd $out/bin/kubectl-images + ''; + + meta = with lib; { + description = "Show container images used in the cluster."; + homepage = "https://github.com/chenjiandongx/kubectl-images"; + changelog = "https://github.com/chenjiandongx/kubectl-images/releases/tag/v${version}"; + license = licenses.mit; + maintainers = [ maintainers.ivankovnatsky ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/applications/networking/cluster/kubedog/default.nix new file mode 100644 index 0000000000000..9c1b14e6dd200 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubedog/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, testers +, kubedog +}: + +buildGoModule rec { + pname = "kubedog"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "werf"; + repo = "kubedog"; + rev = "v${version}"; + hash = "sha256-mwITvv2MuqzH1aB4iTVaFfZljyqOAu7vl4cORHT/OXQ="; + }; + + vendorHash = "sha256-HBo26cPiWJPDpsjPYUEBraHB2SZsUttrlBKpB9/SS6o="; + + subPackages = [ "cmd/kubedog" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/werf/kubedog.Version=${src.rev}" + ]; + + # There are no tests. + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = kubedog; + command = "kubedog version"; + version = src.rev; + }; + + meta = with lib; { + description = '' + A tool to watch and follow Kubernetes resources in CI/CD deployment + pipelines + ''; + homepage = "https://github.com/werf/kubedog"; + changelog = "https://github.com/werf/kubedog/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubent/default.nix b/pkgs/applications/networking/cluster/kubent/default.nix index 79c0fdf2186a0..5302917cdfff4 100644 --- a/pkgs/applications/networking/cluster/kubent/default.nix +++ b/pkgs/applications/networking/cluster/kubent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubent"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "doitintl"; repo = "kube-no-trouble"; rev = "${version}"; - sha256 = "0pwb9g1hhfqn3rl87fg6sf07m7aviadljb05bbnd241hhlcyslv6"; + sha256 = "sha256-aXuBYfXQfg6IQE9cFFTBCPNmDg7IZYPAAeuAxCiU0ro="; }; - vendorSha256 = "1z4cvk936l7011fbimsgpw89yqzyikw9jb4184l37mnj9hl5wpcp"; + vendorSha256 = "sha256-WQwWBcwhFZxXPFO6h+5Y8VDM4urJGfZ6AOvhRoaSbpk="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 66a11329d4106..983aeaba1947d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.23.12"; + version = "1.23.13"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-PuSjMyve7YxxuVr3ztM6nM86gl3GpcIa+LHajzfXODU="; + sha256 = "sha256-Te31+geLT2hzyDfSGkCoXS0pXC1gbIJmpfC0DNDecAI="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 1fa66767931c3..20bba7d405dcf 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { inherit pname ; - version = "1.8.0"; + version = "1.8.1"; tags = lib.optionals enableGateway ["gateway"]; vendorSha256 = "sha256-69uXHvpQMeFwQbejMpfQPS8DDXJyVsnn59WUEJpSeng="; @@ -24,7 +24,7 @@ buildGoModule rec { owner = "kumahq"; repo = "kuma"; rev = version; - sha256 = "sha256-5459Fl7AbzuNGIOfDpVYlhvzLzfLT2Ckhr5omxZr76w="; + sha256 = "sha256-hNfgiMX3aMb8yjXjFKz73MczOeJyOI3Tna/NRSJBSzs="; }; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index d00b1b38b2eef..da602ac6864bd 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.7.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-EzPd4D+pK9mFSoJx9gEWEw9izXum2NgACiBuQ6uTYGo="; + sha256 = "sha256-VJhn3z/utbcZdJjmVzsjyqPfpKMmDXSKUcoALSmawqs="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorSha256 = "sha256-bpuEEoWobFPVsNZKKuOKTQGvV+/NAgaM4M63bv5y0Rk="; + vendorSha256 = "sha256-8Sk36IFk3tL/wqDnKJw/K1MtKBZuVRRFkyMl4b/XwDI="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index 80150b45d866e..f21ee96ecd33b 100644 --- a/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -53,6 +53,6 @@ buildGoModule rec { downloadPage = "https://github.com/linkerd/linkerd2/"; homepage = "https://linkerd.io/"; license = licenses.asl20; - maintainers = with maintainers; [ bryanasdev000 Gonzih superherointj ]; + maintainers = with maintainers; [ bryanasdev000 Gonzih ]; }; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 3b95b4e8cd958..e0a16ab885b8b 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.27.0"; + version = "1.27.1"; - vendorSha256 = "sha256-wAjgeq//vRUDUyVNTsVIxLXhA6fzTrYvn4klAPAv7DE="; + vendorSha256 = "sha256-2sXWf+iK1v9gv2DXhmEs8xlIRF+6EM7Y6Otd6F89zGk="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-Pn0F3363YJoOdWyoPy46HmIUwWr/I5TekalBp9hHg7I="; + sha256 = "sha256-GmvxKWHo0meiR1r5IlgI8jQRiDvmQafxTS9acv92EPk="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/multus-cni/default.nix b/pkgs/applications/networking/cluster/multus-cni/default.nix index 2cfbcaa6bd113..2d01d470c8714 100644 --- a/pkgs/applications/networking/cluster/multus-cni/default.nix +++ b/pkgs/applications/networking/cluster/multus-cni/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "multus-cni"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "k8snetworkplumbingwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U5Ji+f7ckynBVMb4xsmoRZzYJx8obMO+bO9TU6GqcW0="; + sha256 = "sha256-AYSUJEoNYt4DYNcPynRBal5c5QAzRVltkjwoEM66VcY="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 58229718aa58a..a3ad35a4eabe2 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -10,7 +10,7 @@ let interpreter = ( poetry2nix.mkPoetryPackages { projectDir = ./.; - python = pkgs.python39; + python = pkgs.python310; overrides = [ poetry2nix.defaultPoetryOverrides (import ./poetry-git-overlay.nix { inherit pkgs; }) @@ -42,12 +42,22 @@ let overrides # Make nixops pluginable - (self: super: { + (self: super: let + # Create a fake sphinx directory that doesn't pull the entire setup hook and incorrect python machinery + sphinx = pkgs.runCommand "sphinx" {} '' + mkdir -p $out/bin + for f in ${pkgs.python3.pkgs.sphinx}/bin/*; do + ln -s $f $out/bin/$(basename $f) + done + ''; + + in { nixops = super.__toPluginAble { drv = super.nixops; finalDrv = self.nixops; - nativeBuildInputs = [ self.sphinx ]; + nativeBuildInputs = [ sphinx ]; + postInstall = '' doc_cache=$(mktemp -d) sphinx-build -b man -d $doc_cache doc/ $out/share/man/man1 diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index c388f6a9e2689..7166c3ac288ab 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -5,8 +5,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops.git"; - rev = "7220cbdc8a1cf2db5b3ad75b525faf145a5560a3"; - sha256 = "199cw25cvjb8gxs56nc8ilq7v4560c6vgi1sh1vqrsqxayq1g4cs"; + rev = "683baa66c613216a662aad3fd58b0cdc5cd41adb"; + sha256 = "00yyzsybn1fjhkar64albxqp46d1v9c6lf1gd10lh9q72xq979sf"; }; } ); @@ -15,8 +15,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops-aws.git"; - rev = "bc9de10b77aa74c9b245fd533f829e4307b984e8"; - sha256 = "12qsaxwlk67q04g13sqs4bxscpjspip5yphx6d8rq3iqki8yg4z9"; + rev = "d8a6679c413edd1a7075b2fe08017b4c7fa3b3ce"; + sha256 = "0aqkaskp6nkcnfxxf1n294xp4ggk36qldj5c3kzfgxim06jap7n5"; }; } ); @@ -25,8 +25,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/nix-community/nixops-digitalocean.git"; - rev = "b527b4bd27a419753e38c8231fd7528b3ea33886"; - sha256 = "069jlgcjqgyb1v3dnrp2h0w4gv5hfx624iq2xazaix2wxpx9w7f8"; + rev = "e977b7f11e264a6a2bff2dcbc7b94c6a97b92fff"; + sha256 = "020fg1kjh3x57dj95micpq6mxjg5j50jy6cs5f10i33ayy3556v8"; }; } ); diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index 7b287734c5e76..56405bc1460ef 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -19,14 +19,14 @@ python-versions = "*" [[package]] name = "boto3" -version = "1.24.16" +version = "1.24.88" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.7" [package.dependencies] -botocore = ">=1.27.16,<1.28.0" +botocore = ">=1.27.88,<1.28.0" jmespath = ">=0.7.1,<2.0.0" s3transfer = ">=0.6.0,<0.7.0" @@ -35,7 +35,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.27.16" +version = "1.27.88" description = "Low-level, data-driven core of boto 3." category = "main" optional = false @@ -47,11 +47,11 @@ python-dateutil = ">=2.1,<3.0.0" urllib3 = ">=1.25.4,<1.27" [package.extras] -crt = ["awscrt (==0.13.8)"] +crt = ["awscrt (==0.14.0)"] [[package]] name = "certifi" -version = "2022.6.15" +version = "2022.9.24" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -59,7 +59,7 @@ python-versions = ">=3.6" [[package]] name = "cffi" -version = "1.15.0" +version = "1.15.1" description = "Foreign Function Interface for Python calling C code." category = "main" optional = false @@ -70,11 +70,11 @@ pycparser = "*" [[package]] name = "charset-normalizer" -version = "2.0.12" +version = "2.1.1" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false -python-versions = ">=3.5.0" +python-versions = ">=3.6.0" [package.extras] unicode_backport = ["unicodedata2"] @@ -91,12 +91,12 @@ python-versions = ">=3.6" cffi = ">=1.12" [package.extras] -docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"] -docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] +docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx_rtd_theme"] +docstest = ["doc8", "pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"] pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] sdist = ["setuptools-rust (>=0.11.4)"] ssh = ["bcrypt (>=3.1.5)"] -test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"] +test = ["hypothesis (>=1.11.4,!=3.79.2)", "iso8601", "pretend", "pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pytz"] [[package]] name = "hetzner" @@ -108,7 +108,7 @@ python-versions = "*" [[package]] name = "idna" -version = "3.3" +version = "3.4" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false @@ -131,13 +131,13 @@ optional = false python-versions = ">=2.7" [package.extras] -docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-black-multipy", "pytest-cov", "ecdsa", "feedparser", "numpy", "pandas", "pymongo", "scikit-learn", "sqlalchemy", "pytest-flake8 (<1.1.0)", "enum34", "jsonlib", "pytest-flake8 (>=1.1.1)"] +docs = ["jaraco.packaging (>=3.2)", "rst.linker (>=1.9)", "sphinx"] +testing = ["ecdsa", "enum34", "feedparser", "jsonlib", "numpy", "pandas", "pymongo", "pytest (>=3.5,!=3.7.3)", "pytest-black-multipy", "pytest-checkdocs (>=1.2.3)", "pytest-cov", "pytest-flake8 (<1.1.0)", "pytest-flake8 (>=1.1.1)", "scikit-learn", "sqlalchemy"] "testing.libs" = ["simplejson", "ujson", "yajl"] [[package]] name = "libvirt-python" -version = "8.4.0" +version = "8.8.0" description = "The libvirt virtualization API python binding" category = "main" optional = false @@ -149,11 +149,11 @@ version = "2.0.0" description = "NixOS cloud provisioning and deployment tool" category = "main" optional = false -python-versions = "^3.7" +python-versions = "^3.10" develop = false [package.dependencies] -pluggy = "^0.13.1" +pluggy = "^1.0.0" PrettyTable = "^0.7.2" typeguard = "^2.7.1" typing-extensions = "^3.7.4" @@ -162,7 +162,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops.git" reference = "master" -resolved_reference = "7220cbdc8a1cf2db5b3ad75b525faf145a5560a3" +resolved_reference = "683baa66c613216a662aad3fd58b0cdc5cd41adb" [[package]] name = "nixops-aws" @@ -183,8 +183,8 @@ typing-extensions = "^3.7.4" [package.source] type = "git" url = "https://github.com/NixOS/nixops-aws.git" -reference = "master" -resolved_reference = "bc9de10b77aa74c9b245fd533f829e4307b984e8" +reference = "HEAD" +resolved_reference = "d8a6679c413edd1a7075b2fe08017b4c7fa3b3ce" [[package]] name = "nixops-digitalocean" @@ -196,14 +196,14 @@ python-versions = "^3.7" develop = false [package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"} +nixops = {git = "https://github.com/NixOS/nixops.git"} python-digitalocean = "^1.15.0" [package.source] type = "git" url = "https://github.com/nix-community/nixops-digitalocean.git" -reference = "master" -resolved_reference = "b527b4bd27a419753e38c8231fd7528b3ea33886" +reference = "HEAD" +resolved_reference = "e977b7f11e264a6a2bff2dcbc7b94c6a97b92fff" [[package]] name = "nixops-encrypted-links" @@ -215,12 +215,12 @@ python-versions = "^3.7" develop = false [package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"} +nixops = {git = "https://github.com/NixOS/nixops.git"} [package.source] type = "git" url = "https://github.com/nix-community/nixops-encrypted-links.git" -reference = "master" +reference = "HEAD" resolved_reference = "e2f196fce15fcfb00d18c055e1ac53aec33b8fb1" [[package]] @@ -241,7 +241,7 @@ nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-c [package.source] type = "git" url = "https://github.com/nix-community/nixops-gce.git" -reference = "master" +reference = "HEAD" resolved_reference = "712453027486e62e087b9c91e4a8a171eebb6ddd" [[package]] @@ -254,12 +254,12 @@ python-versions = "^3.8" develop = false [package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"} +nixops = {git = "https://github.com/NixOS/nixops.git"} [package.source] type = "git" url = "https://github.com/hercules-ci/nixops-hercules-ci.git" -reference = "master" +reference = "HEAD" resolved_reference = "e601d5baffd003fd5f22deeaea0cb96444b054dc" [[package]] @@ -280,7 +280,7 @@ typing-extensions = "^3.7.4" [package.source] type = "git" url = "https://github.com/NixOS/nixops-hetzner" -reference = "master" +reference = "HEAD" resolved_reference = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35" [[package]] @@ -294,12 +294,12 @@ develop = false [package.dependencies] libvirt-python = "^8.0" -nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"} +nixops = {git = "https://github.com/NixOS/nixops.git"} [package.source] type = "git" url = "https://github.com/nix-community/nixops-libvirtd.git" -reference = "master" +reference = "HEAD" resolved_reference = "bc3cf1c5c774a80e05991ca040baa2b23e3ecd51" [[package]] @@ -317,7 +317,7 @@ nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} [package.source] type = "git" url = "https://github.com/nix-community/nixops-vbox.git" -reference = "master" +reference = "HEAD" resolved_reference = "2729672865ebe2aa973c062a3fbddda8c1359da0" [[package]] @@ -340,14 +340,15 @@ resolved_reference = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8" [[package]] name = "pluggy" -version = "0.13.1" +version = "1.0.0" description = "plugin and hook calling mechanisms for python" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" [package.extras] dev = ["pre-commit", "tox"] +testing = ["pytest", "pytest-benchmark"] [[package]] name = "prettytable" @@ -390,7 +391,7 @@ requests = "*" [[package]] name = "requests" -version = "2.28.0" +version = "2.28.1" description = "Python HTTP for Humans." category = "main" optional = false @@ -398,13 +399,13 @@ python-versions = ">=3.7, <4" [package.dependencies] certifi = ">=2017.4.17" -charset-normalizer = ">=2.0.0,<2.1.0" +charset-normalizer = ">=2,<3" idna = ">=2.5,<4" urllib3 = ">=1.21.1,<1.27" [package.extras] socks = ["PySocks (>=1.5.6,!=1.5.7)"] -use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "s3transfer" @@ -437,8 +438,8 @@ optional = false python-versions = ">=3.5.3" [package.extras] -doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] -test = ["pytest", "typing-extensions", "mypy"] +doc = ["sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"] +test = ["mypy", "pytest", "typing-extensions"] [[package]] name = "typing-extensions" @@ -450,21 +451,21 @@ python-versions = "*" [[package]] name = "urllib3" -version = "1.26.9" +version = "1.26.12" 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.*, <4" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4" [package.extras] -brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"] -secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] +brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] +secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [metadata] lock-version = "1.1" -python-versions = "^3.9" -content-hash = "781bb4378f4491b427372322c3ec71131ed7a28e0a166e0bc43969b016b5d926" +python-versions = "^3.10" +content-hash = "dd5b4dffae860fa56cf6c00bf5aea7a89d7501b2839fdd5e25c5782548092e55" [metadata.files] apache-libcloud = [ @@ -476,72 +477,86 @@ boto = [ {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, ] boto3 = [ - {file = "boto3-1.24.16-py3-none-any.whl", hash = "sha256:2c6f7e4103d41ca07d6b934a6612e4b9a2666eae36e8289f88726868534b8de2"}, - {file = "boto3-1.24.16.tar.gz", hash = "sha256:422c000ff2ee5226e89fe427a9c4c09db095d69c179a3bcc3cfba37cbc5e787e"}, + {file = "boto3-1.24.88-py3-none-any.whl", hash = "sha256:6b4cf1cd0be65202c4cf0e4c69099bac3620bcd4049ca25a5e223c668401dd69"}, + {file = "boto3-1.24.88.tar.gz", hash = "sha256:93934343cac76084600a520e5be70c52152364d0c410681c2e25c2290f0e151c"}, ] botocore = [ - {file = "botocore-1.27.16-py3-none-any.whl", hash = "sha256:f117d59899d21beeb200130d7af2090a8112d702a06e2c2794ef576bcea36773"}, - {file = "botocore-1.27.16.tar.gz", hash = "sha256:b3b9710902f675a11f5bfd46afda770150530876ae6541d099584462bf949fd1"}, + {file = "botocore-1.27.88-py3-none-any.whl", hash = "sha256:de4e087b24cd3bc369eb2e27f8fe94a6499f7dea08c919fba13cefb2496bd2bb"}, + {file = "botocore-1.27.88.tar.gz", hash = "sha256:ded0a4035baf91eb358ef501c92a8512543f5ab7658f459df3077a70a555b5cd"}, ] certifi = [ - {file = "certifi-2022.6.15-py3-none-any.whl", hash = "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"}, - {file = "certifi-2022.6.15.tar.gz", hash = "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d"}, + {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"}, + {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"}, ] cffi = [ - {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"}, - {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"}, - {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"}, - {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"}, - {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"}, - {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"}, - {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"}, - {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"}, - {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"}, - {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"}, - {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"}, - {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"}, - {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"}, - {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"}, - {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"}, - {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"}, - {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, + {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"}, + {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"}, + {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"}, + {file = "cffi-1.15.1-cp27-cp27m-win32.whl", hash = "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3"}, + {file = "cffi-1.15.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e"}, + {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162"}, + {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b"}, + {file = "cffi-1.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21"}, + {file = "cffi-1.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e"}, + {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4"}, + {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01"}, + {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e"}, + {file = "cffi-1.15.1-cp310-cp310-win32.whl", hash = "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2"}, + {file = "cffi-1.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d"}, + {file = "cffi-1.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac"}, + {file = "cffi-1.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83"}, + {file = "cffi-1.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9"}, + {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c"}, + {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325"}, + {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c"}, + {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef"}, + {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8"}, + {file = "cffi-1.15.1-cp311-cp311-win32.whl", hash = "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d"}, + {file = "cffi-1.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104"}, + {file = "cffi-1.15.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405"}, + {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e"}, + {file = "cffi-1.15.1-cp36-cp36m-win32.whl", hash = "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf"}, + {file = "cffi-1.15.1-cp36-cp36m-win_amd64.whl", hash = "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497"}, + {file = "cffi-1.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c"}, + {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426"}, + {file = "cffi-1.15.1-cp37-cp37m-win32.whl", hash = "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9"}, + {file = "cffi-1.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045"}, + {file = "cffi-1.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02"}, + {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192"}, + {file = "cffi-1.15.1-cp38-cp38-win32.whl", hash = "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314"}, + {file = "cffi-1.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5"}, + {file = "cffi-1.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585"}, + {file = "cffi-1.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35"}, + {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27"}, + {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76"}, + {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3"}, + {file = "cffi-1.15.1-cp39-cp39-win32.whl", hash = "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee"}, + {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"}, + {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.12.tar.gz", hash = "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597"}, - {file = "charset_normalizer-2.0.12-py3-none-any.whl", hash = "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"}, + {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"}, + {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"}, ] cryptography = [ {file = "cryptography-3.4.8-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:a00cf305f07b26c351d8d4e1af84ad7501eca8a342dedf24a7acb0e7b7406e14"}, @@ -568,8 +583,8 @@ hetzner = [ {file = "hetzner-0.8.3.tar.gz", hash = "sha256:9a43dbbeb4a1f3efc86c5fe1c1d7039aaa635dfdb829506ec3aa34382d3a7114"}, ] idna = [ - {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, - {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, + {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"}, + {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, ] jmespath = [ {file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"}, @@ -580,7 +595,7 @@ jsonpickle = [ {file = "jsonpickle-2.2.0.tar.gz", hash = "sha256:7b272918b0554182e53dc340ddd62d9b7f902fec7e7b05620c04f3ccef479a0e"}, ] libvirt-python = [ - {file = "libvirt-python-8.4.0.tar.gz", hash = "sha256:6d252ad4e0f765620bbde450be8f2b844e4f85c568b207ac644f52c6a982f46c"}, + {file = "libvirt-python-8.8.0.tar.gz", hash = "sha256:3441dd34c8936393e195a1b046bc2cab1b14d35d66772e8a51fe4d9735ec6349"}, ] nixops = [] nixops-aws = [] @@ -593,8 +608,8 @@ nixops-virtd = [] nixopsvbox = [] nixos-modules-contrib = [] pluggy = [ - {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, - {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, + {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, + {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, ] prettytable = [ {file = "prettytable-0.7.2.tar.bz2", hash = "sha256:853c116513625c738dc3ce1aee148b5b5757a86727e67eff6502c7ca59d43c36"}, @@ -614,8 +629,8 @@ python-digitalocean = [ {file = "python_digitalocean-1.17.0-py3-none-any.whl", hash = "sha256:0032168e022e85fca314eb3f8dfaabf82087f2ed40839eb28f1eeeeca5afb1fa"}, ] requests = [ - {file = "requests-2.28.0-py3-none-any.whl", hash = "sha256:bc7861137fbce630f17b03d3ad02ad0bf978c844f3536d0edda6499dafce2b6f"}, - {file = "requests-2.28.0.tar.gz", hash = "sha256:d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b"}, + {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"}, + {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"}, ] s3transfer = [ {file = "s3transfer-0.6.0-py3-none-any.whl", hash = "sha256:06176b74f3a15f61f1b4f25a1fc29a4429040b7647133a463da8fa5bd28d5ecd"}, @@ -635,6 +650,6 @@ typing-extensions = [ {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] urllib3 = [ - {file = "urllib3-1.26.9-py2.py3-none-any.whl", hash = "sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14"}, - {file = "urllib3-1.26.9.tar.gz", hash = "sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e"}, + {file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"}, + {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"}, ] diff --git a/pkgs/applications/networking/cluster/nixops/pyproject.toml b/pkgs/applications/networking/cluster/nixops/pyproject.toml index 1a1097649493e..2f1132a51bc9f 100644 --- a/pkgs/applications/networking/cluster/nixops/pyproject.toml +++ b/pkgs/applications/networking/cluster/nixops/pyproject.toml @@ -5,7 +5,7 @@ description = "NixOps 2.0" authors = ["Adam Hoese <adam.hose@tweag.io>"] [tool.poetry.dependencies] -python = "^3.9" +python = "^3.10" nixops = {git = "https://github.com/NixOS/nixops.git"} nixops-aws = {git = "https://github.com/NixOS/nixops-aws.git"} nixops-digitalocean = {git = "https://github.com/nix-community/nixops-digitalocean.git"} diff --git a/pkgs/applications/networking/cluster/nixops/shell.nix b/pkgs/applications/networking/cluster/nixops/shell.nix index a40c600691ea9..a7926d0fd5333 100644 --- a/pkgs/applications/networking/cluster/nixops/shell.nix +++ b/pkgs/applications/networking/cluster/nixops/shell.nix @@ -2,9 +2,10 @@ pkgs.mkShell { packages = [ + pkgs.python310 pkgs.poetry2nix.cli pkgs.pkg-config pkgs.libvirt - pkgs.python39Packages.poetry + pkgs.poetry ]; } diff --git a/pkgs/applications/networking/cluster/nomad/1.2.nix b/pkgs/applications/networking/cluster/nomad/1.2.nix index 901f464c38f40..23d71704a04b1 100644 --- a/pkgs/applications/networking/cluster/nomad/1.2.nix +++ b/pkgs/applications/networking/cluster/nomad/1.2.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix { inherit buildGoModule; - version = "1.2.12"; - sha256 = "sha256-PdMo96/foN7rSNvMOQ16N3advy+h0GX7LYtfl23xRfs="; - vendorSha256 = "sha256-fmqhaM3yK2ThiD+qwQTr+d5FqhZWzkwcGTSPdXNNFTU="; + version = "1.2.13"; + sha256 = "sha256-yDcvN6cKG1BlBq1ygYB58bS1YRHWqJgLXRlqI7lrW1A="; + vendorSha256 = "sha256-dPErDlJ4oNpER3Ij4yrN77V8sZvDUuXY7dM39u9xT4I="; } diff --git a/pkgs/applications/networking/cluster/nomad/1.3.nix b/pkgs/applications/networking/cluster/nomad/1.3.nix index 0d33c5efd0874..eb3d81064213f 100644 --- a/pkgs/applications/networking/cluster/nomad/1.3.nix +++ b/pkgs/applications/networking/cluster/nomad/1.3.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix { inherit buildGoModule; - version = "1.3.5"; - sha256 = "sha256-WKS7EfZxysy/oyq1fa8rKvmfgHRiB7adSVhALZNFYgo="; - vendorSha256 = "sha256-byc6wAxpqhxlN3kyHyFQeBS9/oIjHeoz6ldYskizgaI="; + version = "1.3.6"; + sha256 = "sha256-E1+QFaakAsqeXxAfY80ExWVIud7Q/q2TaUVsmADjsgo="; + vendorSha256 = "sha256-kgTRjPr7GsoBeE/s9wrmUWE5jv1ZmszfVDsVaRbdx14="; } diff --git a/pkgs/applications/networking/cluster/nomad/1.4.nix b/pkgs/applications/networking/cluster/nomad/1.4.nix new file mode 100644 index 0000000000000..6c912ddf755ac --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/1.4.nix @@ -0,0 +1,10 @@ +{ callPackage +, buildGoModule +}: + +callPackage ./generic.nix { + inherit buildGoModule; + version = "1.4.1"; + sha256 = "sha256-LQ/fypao6Amun9MY5FRCRasxqnywzI5gpzcO2PPJdWg="; + vendorSha256 = "sha256-kfT2UGC8Wl7CM9lOU75UqKc0/O1okGCoGDpmQntakbU="; +} diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/applications/networking/cluster/pinniped/default.nix index ebc074d148a9d..32ce4d74a3d93 100644 --- a/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-VGvT0jj2f4+jiaPQkebL0GE+W4U8+RfSEsGr2sNBu2Q="; + sha256 = "sha256-JKZij9f6zlBzbYolxz03R5j95zKELVmEhX+QRTxF/cc="; }; subPackages = "cmd/pinniped"; - vendorSha256 = "sha256-7jQRUYJiRdYuAy3x+VPK4Nh5GF6ME7juloagm85oOVg="; + vendorSha256 = "sha256-szv/B7LG/In0j6MT6KCnuUfaCnK7RsJOLeuOtJ/ig9w="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 2a9046d94a0bb..e30a1214c3ae9 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -74,8 +74,8 @@ in { spark_3_2 = spark rec { pname = "spark"; - version = "3.2.1"; - sha256 = "0kxdqczwmj6pray0h8h1qhygni9m82jzznw5fbv9hrxrkq1v182d"; + version = "3.2.2"; + sha256 = "sha256-yKoTyD/IqvsJQs0jB67h1zqwYaLuikdoa5fYIXtvhz0="; }; spark_3_1 = spark rec { pname = "spark"; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 4ddde426e38ca..c19383c2b7936 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.2.3"; + version = "1.2.5"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - sha256 = "sha256-BCbbQQUk3iJJQhjkwlSAVz/SbVPvZGhGHwXSPgCPBHg="; + sha256 = "sha256-XCfT2uSYFszxxj9JS9A+nnFX6gz3gY03xokjoH3/kVA="; }; - vendorSha256 = "sha256-jUVPJ1mq9pMJGwS/0nBv9hsXotiqUksbKChjegF7KRk="; + vendorSha256 = "sha256-DVrGpWtHiWWDx4fCpA7fBGr8r+OUzworpwHcK0jj3AY="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index c9a5d7c60cee7..010527121e573 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,22 +2,22 @@ buildGoModule rec { pname = "tanka"; - version = "0.22.1"; + version = "0.23.1"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MMQv3/Ft6/FUueGEXGqYWAYy4zc2R6LASbh2x7eJNdQ="; + sha256 = "sha256-exPFlcbku51Bs/YISRyjl8iwLYRVS9ltRQPpd/QpnWk="; }; - vendorSha256 = "sha256-QwtcWzJbusa8BxtG5xmGUgqG0qCMSpkzbmes/x3lnWc="; + vendorSha256 = "sha256-eo4B2p5Yo1r5jro49mSetp9AFYhcTXbyy7wGuaFwbb0="; doCheck = false; subPackages = [ "cmd/tk" ]; - ldflags = [ "-s" "-w" "-extldflags '-static'" "-X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ]; + ldflags = [ "-s" "-w" "-extldflags '-static'" "-X github.com/grafana/tanka/pkg/tanka.CurrentVersion=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 23914a6a9fe82..c3c6355cd0cfc 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-mrTtg60LZpRONrEhX53EhSYpfdfGMvPK4WhTHeAKsoQ="; + sha256 = "sha256-8dCmORfTMFHSyc9FOpL01ywxGcH3uolzD2aOtyy191Q="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix index 5f71f8d70cb63..e60c4f14e3064 100644 --- a/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -10,7 +10,6 @@ , mock , netaddr , pytestCheckHook -, python3Packages , radish-bdd , semver }: diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 835198c94e635..fe4e052fd5118 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, buildGoModule +, buildGo119Module , fetchFromGitHub , callPackage , config @@ -21,7 +21,7 @@ let , vendorHash ? throw "use vendorHash instead of vendorSha256" # added 2202/09 , deleteVendor ? false , proxyVendor ? false - , mkProviderGoModule ? buildGoModule + , mkProviderGoModule ? buildGo119Module # Looks like "registry.terraform.io/vancluever/acme" , provider-source-address , ... @@ -52,7 +52,7 @@ let passthru = attrs // { updateScript = writeShellScript "update" '' provider="$(basename ${provider-source-address})" - ./pkgs/applications/networking/cluster/terraform-providers/update-provider --no-build "$provider" + ./pkgs/applications/networking/cluster/terraform-providers/update-provider "$provider" ''; }; }); diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b463facccbf66..8ca12f1326346 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -11,13 +11,14 @@ "version": "2.5.2" }, "acme": { - "hash": "sha256-nafJJ2Gr2jA09mjh8hozdDgl67h+10D35KtqjTUPgBE=", + "hash": "sha256-H+1/Au/jCxNxrV+kk6tylUF85taZcs44uWed1QH1aRo=", "owner": "vancluever", "provider-source-address": "registry.terraform.io/vancluever/acme", + "proxyVendor": true, "repo": "terraform-provider-acme", - "rev": "v2.10.0", - "vendorHash": "sha256-lNI0u8DCBl4mGVecRfAqieCooyJlqK+Z4eixPFFyBuU=", - "version": "2.10.0" + "rev": "v2.11.1", + "vendorHash": "sha256-QGZKoxiSiT78gk2vc8uE6k1LAi/S1o5W9TZN7T/1XfA=", + "version": "2.11.1" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -38,22 +39,21 @@ "version": "3.7.0" }, "akamai": { - "hash": "sha256-XlL8UcfZI1oxGti2Hr4mgmu34qbyPG5yJJ+h8ndgo/k=", + "hash": "sha256-+EHXB2VH1UWYQ1y6Ou+5VhjH7elhfgLYW/imhN2t15Q=", "owner": "akamai", "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v2.4.1", + "rev": "v2.4.2", "vendorHash": "sha256-BRPDsb0h9YINJ4dwGM5FEuUto3UFVImRUn/i6gHAkAc=", - "version": "2.4.1" + "version": "2.4.2" }, "alicloud": { - "deleteVendor": true, "hash": "sha256-lJsCXLSIbb/jLjNsvU0GFljlrKBR2TDDOGXDhBTaIKI=", "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", "rev": "v1.187.0", - "vendorHash": "sha256-aiybvpps/TyrMRP8vbfhBAUO+9kR7WWrgo1kOWKTj24=", + "vendorHash": null, "version": "1.187.0" }, "ansible": { @@ -75,13 +75,13 @@ "version": "2.2.0" }, "auth0": { - "hash": "sha256-0y7sS03/cvO49jo4IY+xyh3dYZYcHOTlbCV1JBiYZQ4=", + "hash": "sha256-xe9BWrkuQqmwjUy3ys7M3IWJjqZiWkox9NYmsH3VHJ8=", "owner": "auth0", "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.37.1", - "vendorHash": "sha256-8mGbTkAf42YQ5kKQmC0qSS8lj6Bd/KzpyX3MtS9r6Fk=", - "version": "0.37.1" + "rev": "v0.38.0", + "vendorHash": "sha256-e5mQ3NrWdFeyIjh38YbTd9fRVuxJB6FPmw7xNlEHzGY=", + "version": "0.38.0" }, "avi": { "hash": "sha256-BQ4M1e7wWDCq2HEJIoAAqSUmq9hV66auvH47p3j2M8I=", @@ -102,13 +102,13 @@ "version": "2.24.1" }, "aws": { - "hash": "sha256-btpN208sQQLCq5yj4w23AHbEG+ylX3o7GB5DHmGIrw0=", + "hash": "sha256-4h5VdCgzUKRAj8gYnFuDMv4fFYEguBaN6fCh4ny8pz4=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.33.0", - "vendorHash": "sha256-bQrf5s/6GPOfW5iYO7gBdSoxSnKRDUEoSVIn+NPQH20=", - "version": "4.33.0" + "rev": "v4.34.0", + "vendorHash": "sha256-bbt8scBf7VzhCX6C9cAwHDFbZPyuumcW7F88kbQ0og4=", + "version": "4.34.0" }, "azuread": { "hash": "sha256-rj/ODxmuK0Ro1KVHh4onR/evtUdKzay9BpQDgrx+eNA=", @@ -120,13 +120,13 @@ "version": "2.29.0" }, "azurerm": { - "hash": "sha256-dBrmoxkQ4KlAM3gW5JRMy96nI7BJ5UH647yZkAViosk=", + "hash": "sha256-MWbw0E5TtqHaoU9nxeMVrUCPlRE73KYxvC6A6tMrjC0=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.25.0", + "rev": "v3.27.0", "vendorHash": null, - "version": "3.25.0" + "version": "3.27.0" }, "azurestack": { "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=", @@ -138,13 +138,12 @@ "version": "1.0.0" }, "baiducloud": { - "deleteVendor": true, "hash": "sha256-LaehOof8T2LGgn6Q/oo+SPcld9QRVk+MjaEJnYvNNnQ=", "owner": "baidubce", "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", "rev": "v1.15.10", - "vendorHash": "sha256-v07NMx8caXvY97FefNnRV7gMQbUq4k2ZmE5huqqe354=", + "vendorHash": null, "version": "1.15.10" }, "bigip": { @@ -157,13 +156,13 @@ "version": "1.15.2" }, "bitbucket": { - "hash": "sha256-arNkR67rsqxVV2omEV9MWQmDO95PLuoVicifLjEfBTM=", + "hash": "sha256-0Sts826Yt6xVVwGpqTC1ZAiNB2+7S6z9rPXDGPNpmOk=", "owner": "DrFaust92", "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", - "rev": "v2.21.2", - "vendorHash": "sha256-UQw7+qsxVff9EtWTpAaBkBm0bOQzerfCGx1SUKS9wEQ=", - "version": "2.21.2" + "rev": "v2.21.3", + "vendorHash": "sha256-VFh86MFKzgN7LvSYG7TooYapOZOJbDC8sntPzGVaNs8=", + "version": "2.21.3" }, "brightbox": { "hash": "sha256-l4gN7gxLMTuUMjf50Hc2Els5pJ4BId1QlRAhykseK7c=", @@ -214,22 +213,22 @@ "version": "1.3.0" }, "cloudamqp": { - "hash": "sha256-z0tCNZTc7Lc8zw3ueRz3JR+rTNQifEH8RW7zgKe5xhs=", + "hash": "sha256-RllW85iootELA7iz+UPD0s4KKP7gGRNHVwHd/CCUv0c=", "owner": "cloudamqp", "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.19.2", - "vendorHash": "sha256-228hxOsa4CmJcp/AJYR5SACbcCfuO0y4Z9VzqzZ5iJQ=", - "version": "1.19.2" + "rev": "v1.19.3", + "vendorHash": "sha256-S8xlMpsHeJePYyydUpBSuOxW0APZw8qxcm+Ou9u1rWc=", + "version": "1.19.3" }, "cloudflare": { - "hash": "sha256-J7hKWt7aHhT9lNbbz73YljcpdfDTcwNsbNE60CHflw0=", + "hash": "sha256-nHA9z7IziBpMgR9ooCt6pGjE1CaxjNHQMpUdxl0l3ns=", "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.24.0", - "vendorHash": "sha256-s7VdZAQdXLGiA3q2+X4sQPIrI9f55sdd7HxbLQ8SdBk=", - "version": "3.24.0" + "rev": "v3.25.0", + "vendorHash": "sha256-9LZ8KjobPSSyZ02oYUrn1gftNYtui/zezfIYD9mkhQc=", + "version": "3.25.0" }, "cloudfoundry": { "hash": "sha256-VfGB0NkT36oYT5F1fh1N/2rlZdfhk+K76AXNh0NkO50=", @@ -305,22 +304,22 @@ "version": "0.0.3" }, "digitalocean": { - "hash": "sha256-FnVmkHNMuWF01eSOCMyPQescyao/cyUjXwimwYU5gqY=", + "hash": "sha256-iLwAkmzKRY8NfUHVGcstIHlSnZY+oi7fhCNP2kCzIxM=", "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.22.3", + "rev": "v2.23.0", "vendorHash": null, - "version": "2.22.3" + "version": "2.23.0" }, "dme": { - "hash": "sha256-Fz35J15S0JxxVy86xYuwHM1obOYpJVfzEhN1NqoAXbo=", + "hash": "sha256-QNkr+6lKlKY+os0Pf6dqlmIn9u2LtMOo6ONahDeA9mE=", "owner": "DNSMadeEasy", "provider-source-address": "registry.terraform.io/DNSMadeEasy/dme", "repo": "terraform-provider-dme", - "rev": "v1.0.5", + "rev": "v1.0.6", "vendorHash": null, - "version": "1.0.5" + "version": "1.0.6" }, "dns": { "hash": "sha256-aH9sDqlXSq2dJi0kzGreJZ5V8A0WU0UqTpxWPKn23rM=", @@ -350,13 +349,13 @@ "version": "2.22.0" }, "elasticsearch": { - "hash": "sha256-ir3bPtsghZkfJbRyh5nlK9cGPA49WGxZDb3jMtfWzms=", + "hash": "sha256-7sMF7LBM5tnOtERufh7LaJlfcJ5WHIynpzlTg/05u3I=", "owner": "phillbaker", "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", - "rev": "v2.0.4", + "rev": "v2.0.5", "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=", - "version": "2.0.4" + "version": "2.0.5" }, "equinix": { "hash": "sha256-gvI9awkKiWWnw6O/KvskFTHZfvajGfgYu8DGsT34Siw=", @@ -386,13 +385,13 @@ "version": "2.2.2" }, "fastly": { - "hash": "sha256-Ej7E/xbB8V6Pge/sAkgtQXJac1nuQ3liQDM531zOnu8=", + "hash": "sha256-WxFkJBi87IvO4a/8bmftMKCc/JcfoQILCtklvr9bcuc=", "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v2.3.2", + "rev": "v2.4.0", "vendorHash": null, - "version": "2.3.2" + "version": "2.4.0" }, "flexibleengine": { "hash": "sha256-2eXNumT1Hkc33bW635qYr5jxlByX+yZ8zSKRpgKWQJo=", @@ -405,14 +404,14 @@ }, "fortios": { "deleteVendor": true, - "hash": "sha256-jXaEGWt/O0Cv15ksFax571f6aoDhVpNZSbvbOFj6TZ4=", + "hash": "sha256-nvK5mbQdCB6lmdyhJbMS15eOER8eIAYv26mc1FCifXs=", "owner": "fortinetdev", "provider-source-address": "registry.terraform.io/fortinetdev/fortios", "proxyVendor": true, "repo": "terraform-provider-fortios", - "rev": "v1.15.0", - "vendorHash": "sha256-WkF2mVDrDlCefM4pjADoXsVwpa7E02c6kUyOgHxNFpo=", - "version": "1.15.0" + "rev": "v1.16.0", + "vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=", + "version": "1.16.0" }, "gandi": { "hash": "sha256-uXZcYiNsBf5XsMjOjjQeNtGwLhTgYES1E9t63fBEI6Q=", @@ -424,13 +423,13 @@ "version": "2.2.0" }, "github": { - "hash": "sha256-NJ5HvW3LOvshzea7t0/sAsp3SqiXErXd32Ej0Qp4zsk=", + "hash": "sha256-dUL01cuP5fQdPPm6+R1XDQNups5BJC2oq8LSjJ1+tB0=", "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v5.3.0", + "rev": "v5.5.0", "vendorHash": null, - "version": "5.3.0" + "version": "5.5.0" }, "gitlab": { "hash": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=", @@ -442,24 +441,24 @@ "version": "3.18.0" }, "google": { - "hash": "sha256-RveRVr5IdZrBX9uF0q0wyx/sh+cNBDp9CAv3zXOdATQ=", + "hash": "sha256-tjcG23chJwuaf/SRD6Kqz49fdWFKMaVygg/FGydaSR8=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.38.0", - "vendorHash": "sha256-U5J9X51PAq3Cq/XH5ggThzsPaEy+AveHqD4D6NbK/AU=", - "version": "4.38.0" + "rev": "v4.40.0", + "vendorHash": "sha256-PWSok1sTU/57Xeri4Un5B9Fbwg8gBP6Quy5oIZrjxUI=", + "version": "4.40.0" }, "google-beta": { - "hash": "sha256-zQ8GgmWM3frLTstcrO0GKBWk1pMQTNMqxDGH9EmlzcQ=", + "hash": "sha256-U27ZzjNMFP/TCpXrU0QQ0uYB0sgeWVmRrQFIzq7FAhs=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.38.0", - "vendorHash": "sha256-U5J9X51PAq3Cq/XH5ggThzsPaEy+AveHqD4D6NbK/AU=", - "version": "4.38.0" + "rev": "v4.40.0", + "vendorHash": "sha256-PWSok1sTU/57Xeri4Un5B9Fbwg8gBP6Quy5oIZrjxUI=", + "version": "4.40.0" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -480,13 +479,13 @@ "version": "1.29.0" }, "gridscale": { - "hash": "sha256-vbFrwAZBazZok4LwXTTa4QIZpHxIPKv3x6vUyVt2S2I=", + "hash": "sha256-3JB82wbZ6mosFJZ96rGOnv/f1VFhHk6WEfm2u6sop2E=", "owner": "gridscale", "provider-source-address": "registry.terraform.io/gridscale/gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.15.0", + "rev": "v1.16.0", "vendorHash": null, - "version": "1.15.0" + "version": "1.16.0" }, "hcloud": { "hash": "sha256-DWDM3yWKkRV9FJMzKK7JJQdI0WvFILF/bsZFv2CjrvM=", @@ -498,22 +497,22 @@ "version": "1.35.2" }, "helm": { - "hash": "sha256-oX6pchJcgv9w5xLGe09GBzngz9+a/OZn6FTBWURgiLk=", + "hash": "sha256-s8ZOzTG3qux+4Yh1wj3ArjB1uJ32bdGhxY9iSL5LOK8=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", - "rev": "v2.7.0", + "rev": "v2.7.1", "vendorHash": null, - "version": "2.7.0" + "version": "2.7.1" }, "heroku": { - "hash": "sha256-n6M7i7zompAGRoP9WxrcWdBHsK2RssfTgCKsvAE5XZM=", + "hash": "sha256-V6jShbhVwsUTxj2tp2msIseZnckHgB7bBswqIRlrwjQ=", "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.4", + "rev": "v5.1.5", "vendorHash": null, - "version": "5.1.4" + "version": "5.1.5" }, "hetznerdns": { "hash": "sha256-QmD9UlQpyvEz4in1I960J0eC6xNtgk5z8tZUxaApOwE=", @@ -531,7 +530,7 @@ "proxyVendor": true, "repo": "terraform-provider-htpasswd", "rev": "v1.0.4", - "vendorHash": "sha256-VlJO11t7uqAl0U26T/UY2u//+Vfq97+h4gABWt7iQwk=", + "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=", "version": "1.0.4" }, "http": { @@ -571,13 +570,13 @@ "version": "0.1.2" }, "ibm": { - "hash": "sha256-zcc7xUSTntTC0vLFBEW1PvvkSEtzD5VkKy/Jq8x5zKk=", + "hash": "sha256-OcOmcTZe2J0cz9glVi/oLp55QrhsOpT0sj0PS32vnow=", "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.45.1", - "vendorHash": "sha256-FAoRQxnc/vD5KYp0hb6iWGbZiWEtLzEr6R+vdruitKc=", - "version": "1.45.1" + "rev": "v1.46.0", + "vendorHash": "sha256-Zhk2Q7tnL3P/uLo/61o/XiiMKBdmb2749S/Ax1ZrxAo=", + "version": "1.46.0" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -607,31 +606,31 @@ "version": "0.5.1" }, "kafka-connect": { - "hash": "sha256-boSOXVxHMSNAd0vMgy+DhvPxfjm0dfVxxZHvrgSkGp8=", + "hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=", "owner": "Mongey", "provider-source-address": "registry.terraform.io/Mongey/kafka-connect", "repo": "terraform-provider-kafka-connect", - "rev": "v0.2.4", - "vendorHash": "sha256-IRDWTCJubSSvaYrsLRcGeqrUuOXrBH1hf1yRqGRElCk=", - "version": "0.2.4" + "rev": "v0.3.0", + "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=", + "version": "0.3.0" }, "keycloak": { - "hash": "sha256-JDMPr2uFi+9CcHdyigmP1DM3uRx2+eFnzSaHp+es2Tg=", + "hash": "sha256-1yV3w3hhZf113XMxvpRvr3ADaRcuCl7BCIa5SIZPcCs=", "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.10.0", - "vendorHash": "sha256-8x0MlwAzeA2O6wXXHSk++K0ePmzE9/2lfo2ID83LzRM=", - "version": "3.10.0" + "rev": "v4.0.1", + "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=", + "version": "4.0.1" }, "ksyun": { - "hash": "sha256-y7F6eCyiYVtiBaHCaZyUUPAE9GkKo/m/OY98EeBd8DU=", + "hash": "sha256-sfvmDByxAQbbdPHb9l5tIT5dyu8eA3r63i5FZJYEYTI=", "owner": "kingsoftcloud", "provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun", "repo": "terraform-provider-ksyun", - "rev": "v1.3.54", + "rev": "v1.3.55", "vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=", - "version": "1.3.54" + "version": "1.3.55" }, "kubectl": { "hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=", @@ -643,40 +642,40 @@ "version": "1.14.0" }, "kubernetes": { - "hash": "sha256-2/7sSgLt/t5e9YWi9D5hOfirHDrfHnuK3w684KjKIWI=", + "hash": "sha256-E8ew1MwQa1DVYZH//ePjZXLQdyRN7Q0yomH0ma0neks=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.13.1", + "rev": "v2.14.0", "vendorHash": null, - "version": "2.13.1" + "version": "2.14.0" }, "launchdarkly": { - "hash": "sha256-XseHo/PVNGV+TKR+DBOmNlwYozFPWDolQR6/mE/XwVQ=", + "hash": "sha256-yIFR0QvSLWxCuzmq1nd55EmStpAZzf5tTxRUU6jqWvI=", "owner": "launchdarkly", "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.9.2", + "rev": "v2.9.3", "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=", - "version": "2.9.2" + "version": "2.9.3" }, "libvirt": { - "hash": "sha256-PmaGBKAaOInLId6r6D29YOedqEA1EreVvI1oRtegPfQ=", + "hash": "sha256-j5EcxmkCyHwbXzvJ9lfQBRBYa3SbrKc3kbt1KZTm0gY=", "owner": "dmacvicar", "provider-source-address": "registry.terraform.io/dmacvicar/libvirt", "repo": "terraform-provider-libvirt", - "rev": "v0.6.14", - "vendorHash": "sha256-yrz6o2iEAVtc8+dn+KNAGaGy5TtfFMrL4I9sff7SAM8=", - "version": "0.6.14" + "rev": "v0.7.0", + "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=", + "version": "0.7.0" }, "linode": { - "hash": "sha256-gysdJOGUmhwFoRpR0Yp2p/Vjb69k+fDzcWatOgA+/AQ=", + "hash": "sha256-bwVHrgcxc2W5Lx1aheqkdgwfrFfk4YAhD5bqvHdcxtI=", "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.29.2", - "vendorHash": "sha256-Sp/e3QVdUeQGflDGYLSMPGqxcMWoIY8Q9nZUteFIryo=", - "version": "1.29.2" + "rev": "v1.29.4", + "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=", + "version": "1.29.4" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -754,10 +753,9 @@ "hash": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=", "owner": "mongodb", "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", - "proxyVendor": true, "repo": "terraform-provider-mongodbatlas", "rev": "v1.4.6", - "vendorHash": "sha256-jmT5SoJA4iQDmP9cRedQ4wTPoOXB4NL8hHClsp37ykU=", + "vendorHash": "sha256-OwyzkTgOcn9brsQS1bfOEaXYk9nNLyHsEwli+5PAIPE=", "version": "1.4.6" }, "namecheap": { @@ -779,13 +777,13 @@ "version": "0.6.12" }, "newrelic": { - "hash": "sha256-xh7ufhv0zHTHS1aMz15PKlKoNPSDhXOIeSxj6tvRKKo=", + "hash": "sha256-Sm5GwfILRCg0/gTNJtrDrWZY+uBXvuTYtrrtTnugP9Q=", "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.3.0", - "vendorHash": "sha256-vtpRDE6tAhJGtYDG65NvtKx/fyt0yBqJTg5s5kXls+8=", - "version": "3.3.0" + "rev": "v3.5.0", + "vendorHash": "sha256-1D66m18oWwuXgBIWstRWvjfy9iGrmO3gyVBucdPps2c=", + "version": "3.5.0" }, "nomad": { "hash": "sha256-HhocWB3ZCFdeYgmA64hv1CYwqIf4EB/Q+vNrFKVB31I=", @@ -834,22 +832,22 @@ "version": "1.7.1" }, "oci": { - "hash": "sha256-x1yrAYq8UXs69QkXMUq7mZ6in8o2+GPaS0EsAjn/pXg=", + "hash": "sha256-PSkD2HXGmSimJYQPZKuVCGvEa0sSNc4XMRRrM5O+/QE=", "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.95.0", + "rev": "v4.96.0", "vendorHash": null, - "version": "4.95.0" + "version": "4.96.0" }, "okta": { - "hash": "sha256-rgDBZsbXBzBcDgVoaFkPD27Ezef9J23oqtBJAHqJrrE=", + "hash": "sha256-yUWz6JiejI36QXSzGj36Pzu8/exK4U/DXCdbToSeCrE=", "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.36.0", - "vendorHash": "sha256-hjX5kVOM8idWK4F5ahuh6BgK/h5QdkJOn4dizneOkB4=", - "version": "3.36.0" + "rev": "v3.37.0", + "vendorHash": "sha256-qAnMwxTvvds3pOarRTWWVQqOCJKd0wSH2LZoPl4n2uA=", + "version": "3.37.0" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -861,13 +859,13 @@ "version": "1.0.1" }, "opennebula": { - "hash": "sha256-ChqOX6pEvFMUyDAKA6VnD1L9UD2vplVH7dgpMTeiUeA=", + "hash": "sha256-QD/JU1sk1uEdgyOxvU+vDDqlYe5uoRxHx6nB0fCi6ds=", "owner": "OpenNebula", "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", - "rev": "v1.0.0", + "rev": "v1.0.1", "vendorHash": "sha256-iT3c0CBSP+FKM4CFsTopY4W41ZCaC8E3Iz1o+THI/fQ=", - "version": "1.0.0" + "version": "1.0.1" }, "openstack": { "hash": "sha256-I2Rl/Z6KHEkhaoslqMD+ZQ8vOnIwLDDJIP3P/3sTWcw=", @@ -879,13 +877,13 @@ "version": "1.48.0" }, "opentelekomcloud": { - "hash": "sha256-X4e74tgqHbt9j5prq2Zjqbcmwvr6m1UDFp5y1xfwkEQ=", + "hash": "sha256-9JDRGya/2SJm4JsM6o6E7dqLQqDjfR8Gjf6BuSFEdpo=", "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.31.4", - "vendorHash": "sha256-ARlkXkty4/h86cmWnmKnP1Vhzt7oTOOxSFraNGp2BWs=", - "version": "1.31.4" + "rev": "v1.31.5", + "vendorHash": "sha256-7iDE/DKix9AKY0hX7m6V9KgDYmCiVFrpRMmgCSsm/5c=", + "version": "1.31.5" }, "opsgenie": { "hash": "sha256-hdLKa2usoDedzOlzPQrADJOqIxtANqTeTamn/DakRh4=", @@ -897,22 +895,22 @@ "version": "0.6.15" }, "ovh": { - "hash": "sha256-DHk1AUxHuXLrPiRhfAtJDDNT4TYH1XsUzBqjKGvPK7c=", + "hash": "sha256-QaJZQU6bnjXoTCxfP1NcsPqegFyZ6JwP2QgN7zrE0z0=", "owner": "ovh", "provider-source-address": "registry.terraform.io/ovh/ovh", "repo": "terraform-provider-ovh", - "rev": "v0.21.0", + "rev": "v0.22.0", "vendorHash": null, - "version": "0.21.0" + "version": "0.22.0" }, "pagerduty": { - "hash": "sha256-Kdm6WizssVdMwsTUyV4wUAW6QelUxDE9GZDGvnehFCw=", + "hash": "sha256-S55TSm3aFe9ACo+ysNRnyQ/U55C2KoZroQEHVBXsSPI=", "owner": "PagerDuty", "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.6.2", + "rev": "v2.6.3", "vendorHash": null, - "version": "2.6.2" + "version": "2.6.3" }, "panos": { "hash": "sha256-mscWNK113W7CVKI+qPGYX3irQI3YhkLdXox4pddOdF0=", @@ -996,13 +994,13 @@ "version": "0.4.3" }, "scaleway": { - "hash": "sha256-EPbh9lUcamFe33EKj2TzzaKChOU8fQb5/uigln2ALJ8=", + "hash": "sha256-MRZbVEUcjJL+leDCok1S+wsLW1N2IP76P0D7M8NzvHY=", "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.3.0", - "vendorHash": "sha256-C4viIkYpu9B79kDByyg8cTCsXW6fGued280kIPAYHjc=", - "version": "2.3.0" + "rev": "v2.4.0", + "vendorHash": "sha256-CEYDT2G/V+XeCwcQzJksNb4EVRzH0iiaWiaudhBiaLw=", + "version": "2.4.0" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1014,13 +1012,13 @@ "version": "1.2.1" }, "selectel": { - "hash": "sha256-27Sdez4coJ4Enc1zTg4lr1SzlW3r6wCjciC5ID8vo0w=", + "hash": "sha256-2PwqVzwl8UIO+334lp9zkwkr2zAdI8S/rO+6iqTLu+I=", "owner": "selectel", "provider-source-address": "registry.terraform.io/selectel/selectel", "repo": "terraform-provider-selectel", - "rev": "v3.8.4", - "vendorHash": "sha256-kmsO9jFoR/93PkOeIo0pkS/OjE+m3QbIspobAv/9+KI=", - "version": "3.8.4" + "rev": "v3.8.5", + "vendorHash": "sha256-/7YQa84hOrOAGQSW1kVE27aM2253IB4pvA0ASAJe8VQ=", + "version": "3.8.5" }, "sentry": { "hash": "sha256-dNyUp+gXrOvMQu5tEnv2dOsXihyd19gdYakIo7+h3pY=", @@ -1077,13 +1075,13 @@ "version": "0.7.1" }, "spotinst": { - "hash": "sha256-D/HFeozi5IRj7G+pRzY/V98+oejfmQlW4y6ddob7OBI=", + "hash": "sha256-hlTeN8dQWHU4yHDUqCeBbfapDI1lbxj05FlUN+vUOuM=", "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.84.0", + "rev": "v1.85.0", "vendorHash": "sha256-BDYX/4D3R2A1w3k14mON/2KZUg2kPbwePXQQpVanqdU=", - "version": "1.84.0" + "version": "1.85.0" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", @@ -1104,22 +1102,22 @@ "version": "2.0.4" }, "sumologic": { - "hash": "sha256-1wV+9RHgrqL6LvRE21KM1wBSpyOcoOt07tZcx2s5pGM=", + "hash": "sha256-DvEd1OdLmUEEmk0zl7jiTjdk/3Fp1Z/3KCpYRpxHTn4=", "owner": "SumoLogic", "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", - "rev": "v2.19.0", + "rev": "v2.19.1", "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=", - "version": "2.19.0" + "version": "2.19.1" }, "tencentcloud": { - "hash": "sha256-SoCXh0pRqEkto2K+ZfN7ncVGDVC32zDElS+rBdOfa0g=", + "hash": "sha256-kAbLfuENWHxu51Eu+7X1X4HiWkD8KAL4awZpGRg0BaU=", "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.78.3", + "rev": "v1.78.4", "vendorHash": null, - "version": "1.78.3" + "version": "1.78.4" }, "tfe": { "hash": "sha256-jh5bRe/3OsdgvSpraYEc1NgvBmYb1tFuVSPQ2ZAesSY=", @@ -1140,13 +1138,13 @@ "version": "1.0.0" }, "time": { - "hash": "sha256-r1AzzO1fxmDZkxWKg+LUiYU19oAg8TthIJA7c0tktZE=", + "hash": "sha256-tDYrKU/kggrv/p8QZ0LbHjQSOaNrQ0qy9ekY7DAXqEA=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/time", "repo": "terraform-provider-time", - "rev": "v0.8.0", - "vendorHash": "sha256-67V+lG6mkLuzoJnd8OoH73/XBnkgqDmv6aqpSSsHSqg=", - "version": "0.8.0" + "rev": "v0.9.0", + "vendorHash": "sha256-I4CnaSyn32S7FM56dYWZhzGUKByP2DXD0t/eBOL2ALs=", + "version": "0.9.0" }, "tls": { "hash": "sha256-q3zt+5zd/bJ42sWbFwuE+rDyHHcZoVBZF4c61aJJkMs=", @@ -1177,31 +1175,32 @@ "version": "1.9.1" }, "ucloud": { - "hash": "sha256-lx3LLBmqUjRc+Jn+SbLk6DChJJ2jbuh720wnO05qot0=", + "hash": "sha256-O/M864JY7nW+PZ53z26QvOAar5DeqBGk+dfzarfUy+g=", "owner": "ucloud", "provider-source-address": "registry.terraform.io/ucloud/ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.32.2", + "rev": "v1.32.4", "vendorHash": null, - "version": "1.32.2" + "version": "1.32.4" }, "utils": { - "hash": "sha256-FYOu48Bg8iMfNl+2EETBMxEfwg2ToO+Oexz1yPi0g38=", + "hash": "sha256-6o55uGTaqf3rbqoIGiYi5F4zOkK7D0YP+LdaMmBtw24=", "owner": "cloudposse", "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "1.2.0", - "vendorHash": "sha256-eDNA4zvOYnWvaCHhNHWOjy1VstG1nITWkCMOilu9Wxg=", - "version": "1.2.0" + "rev": "1.5.0", + "vendorHash": "sha256-D1QpZTh/4BgAbsoo4RRpJoIFwkHYBkN5JWfCOe5N/A0=", + "version": "1.5.0" }, "vault": { - "hash": "sha256-fEITfA3XXyUiILPse7fOmBW8M6dzEIUMg+7b3l4z2vo=", + "hash": "sha256-v+WhEJ9HsTdOqSVpbV/qVCEICsgY3nEqcIutYHi3aQ8=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", + "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.8.2", - "vendorHash": "sha256-x7uz6VFotS+/eLEeMfaTloKQe/zp47d8e5I63BsGvhM=", - "version": "3.8.2" + "rev": "v3.9.1", + "vendorHash": "sha256-/ZIGfLHkHq1Yv+AsSO7KueK5ANxnUWFKwLKyZ02q1cY=", + "version": "3.9.1" }, "vcd": { "hash": "sha256-qEElcMl6tCBfOTTTpTFjVYg6E6K9iTXfgmDDozrgNVg=", @@ -1213,13 +1212,13 @@ "version": "3.7.0" }, "venafi": { - "hash": "sha256-oGpIa+Up1bv6tf5ibna0DEwIxrZyAefqA8LSAy57QrE=", + "hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=", "owner": "Venafi", "provider-source-address": "registry.terraform.io/Venafi/venafi", "repo": "terraform-provider-venafi", - "rev": "v0.16.0", - "vendorHash": "sha256-F0lMZVMNJ/1SHX8e5v4waQPqZjan/Ll+db+dseZ+dsc=", - "version": "0.16.0" + "rev": "v0.16.1", + "vendorHash": "sha256-smeySV1kReZyF9bRCunEr89IV219f9845wcHHI1zFz8=", + "version": "0.16.1" }, "vercel": { "hash": "sha256-/LHyNxal5Il/UzXdCKfVRzK/VVfSYMgoeKerWsedmho=", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index edcf7a2497234..566b1112cc38e 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,8 +168,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.3.1"; - sha256 = "sha256-ugdMpp/YTCyXaUY6NTrIa9r/+C4bYLYqQEic4cvgoVo="; + version = "1.3.2"; + sha256 = "sha256-Xr6ZmKE7BoMh2gZcvcZgWwb8WuAb3Xb8vV9gZVjDZFE="; vendorSha256 = "sha256-+m7e49yN7OkiQQVvqimF0Tvz5wUr2M5bxs3yBU2lt7Y="; patches = [ ./provider-path-0_15.patch ]; passthru = { diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 98de91e3bd238..d638ddf1234bb 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.39.0"; + version = "0.39.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y8t5rThkPD3FzY25L2lOIvktU5+NwBZtq9Pn3VzQQf4="; + sha256 = "sha256-Ino16JARoQMudZ82kI/uJE+KyNpyqPu3/Dx2c155jcQ="; }; vendorSha256 = "sha256-CqImT90jFFLi6XR7jfzFKwhnCHK6B+aM+Ba/L+G3bEg="; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 9245a5439147e..339564f52a04f 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.8"; + version = "0.30.9"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dVaLeooTEiKYWp9CmEcSFOunLyJecB8jR9LIKRO8b9g="; + sha256 = "sha256-vZthFaIsgpZ2aap9kRSH//AHHnOpekPIkwpz9Tt0lI4="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index 5759257c4a05c..2d24365466b79 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KRm6+WRMGzM7L17ABj/g6Nu+eU6F3C4a9CAa0ePC6i8="; + sha256 = "sha256-PkayQ1sLjnA+1Xatgs0EvZTCTfWV5uoYYtnKX8OAwYQ="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index d4916770879ea..7649cc5b7dfe7 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "waypoint"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9iqHO+idW6Rxe0osD4fjkhvO5TF122r1J8QlV/haaNw="; + sha256 = "sha256-4RAnGPzXrPXMclDiTd38VrOy7zqvccD/xrm3QpeFubM="; }; vendorSha256 = "sha256-fBsRmUE72lot9Ju/hUqpdSSXvMktRGP+H4WQ0GOCxrY="; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 275bc98ac23df..325fb0309723f 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.176"; + version = "1.2.178"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-E6xRnEIo6ks8E9bWjo8d+mDhYe+nsKIFdUEGS6tbgXM="; + hash = "sha256-gmUamDV7gH30grFkG6rqDEf73wxe+FqhPi1GkNOeKuk="; }; - vendorHash = "sha256-NHRPl38/R7yS8Hht118mBc+OBPwfYiHOaGIwryNK8Mo="; + vendorHash = "sha256-4QVLxvprm27Bv/ZFgxTtqZcSAWak1e+G8s+heW1JZnA="; proxyVendor = true; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index ffbf42715f532..c6b0baa9d3f67 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -1,5 +1,6 @@ { lib, stdenv , substituteAll +, autoreconfHook , pkg-config , fetchurl , python3 @@ -28,6 +29,10 @@ stdenv.mkDerivation { strictDeps = true; patches = [ + # Fix extension for Nautilus 43 + # https://github.com/dropbox/nautilus-dropbox/pull/105 + ./nautilus-43.patch + (substituteAll { src = ./fix-cli-paths.patch; inherit dropboxd; @@ -35,6 +40,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ + autoreconfHook pkg-config gobject-introspection gdk-pixbuf diff --git a/pkgs/applications/networking/dropbox/nautilus-43.patch b/pkgs/applications/networking/dropbox/nautilus-43.patch new file mode 100644 index 0000000000000..b4b5578431977 --- /dev/null +++ b/pkgs/applications/networking/dropbox/nautilus-43.patch @@ -0,0 +1,195 @@ +diff --git a/configure.ac b/configure.ac +index 025289c..42b49fa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,7 +12,7 @@ AM_CONFIG_HEADER(config.h) + #AC_PROG_INTLTOOL([0.29]) + + # Dependency checks +-NAUTILUS_REQUIRED=2.16.0 ++NAUTILUS_REQUIRED=43.rc + GLIB_REQUIRED=2.14.0 + + # Used programs +@@ -26,8 +26,11 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then + AC_MSG_ERROR(you need to have pkgconfig installed !) + fi + +-PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED) ++PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension-4 >= $NAUTILUS_REQUIRED) + PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) ++PKG_CHECK_MODULES(GTK, gtk4 >= 4.6.0) ++ ++AC_SUBST(GTK_CFLAGS) + + AC_PATH_PROG([PYTHON3], [python3]) + +@@ -84,10 +87,10 @@ AC_MSG_CHECKING([for nautilus extension directory]) + if test -n "$with_nautilus_extension_dir"; then + NAUTILUS_EXTENSION_DIR=$with_nautilus_extension_dir + else +- NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` ++ NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension-4` + fi + if test -z "$NAUTILUS_EXTENSION_DIR"; then +- NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-1.0' ++ NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-4' + fi + + AC_MSG_RESULT([${NAUTILUS_EXTENSION_DIR}]) +diff --git a/src/Makefile.am b/src/Makefile.am +index 15d6687..c521ec5 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -13,6 +13,7 @@ libnautilus_dropbox_la_CFLAGS = \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(NAUTILUS_CFLAGS) \ ++ $(GTK_CFLAGS) \ + $(GLIB_CFLAGS) + + if DEBUG +diff --git a/src/dropbox.c b/src/dropbox.c +index 0d59559..8162aa9 100644 +--- a/src/dropbox.c ++++ b/src/dropbox.c +@@ -27,9 +27,6 @@ + + #include <glib-object.h> + +-#include <gdk/gdk.h> +-#include <gtk/gtk.h> +- + #include "nautilus-dropbox.h" + + static GType type_list[1]; +@@ -41,9 +38,6 @@ nautilus_module_initialize (GTypeModule *module) { + nautilus_dropbox_register_type (module); + type_list[0] = NAUTILUS_TYPE_DROPBOX; + +- dropbox_use_nautilus_submenu_workaround +- = (NAUTILUS_VERSION_MAJOR < 2 || +- (NAUTILUS_VERSION_MAJOR == 2 && NAUTILUS_VERSION_MINOR <= 22)); + dropbox_use_operation_in_progress_workaround = TRUE; + } + +diff --git a/src/nautilus-dropbox.c b/src/nautilus-dropbox.c +index c75ccbf..b9c10b4 100644 +--- a/src/nautilus-dropbox.c ++++ b/src/nautilus-dropbox.c +@@ -37,9 +37,7 @@ + #include <glib-object.h> + #include <gtk/gtk.h> + +-#include <libnautilus-extension/nautilus-extension-types.h> +-#include <libnautilus-extension/nautilus-menu-provider.h> +-#include <libnautilus-extension/nautilus-info-provider.h> ++#include <nautilus-extension.h> + + #include "g-util.h" + #include "dropbox-command-client.h" +@@ -49,7 +47,7 @@ + static char *emblems[] = {"dropbox-uptodate", "dropbox-syncing", "dropbox-unsyncable"}; + gchar *DEFAULT_EMBLEM_PATHS[2] = { EMBLEMDIR , NULL }; + +-gboolean dropbox_use_nautilus_submenu_workaround; ++ + gboolean dropbox_use_operation_in_progress_workaround; + + static GType dropbox_type = 0; +@@ -630,13 +628,6 @@ nautilus_dropbox_parse_menu(gchar **options, + g_object_set_property (G_OBJECT(item), "sensitive", &sensitive); + } + +- /* taken from nautilus-file-repairer (http://repairer.kldp.net/): +- * this code is a workaround for a bug of nautilus +- * See: http://bugzilla.gnome.org/show_bug.cgi?id=508878 */ +- if (dropbox_use_nautilus_submenu_workaround) { +- toret = g_list_append(toret, item); +- } +- + g_object_unref(item); + g_string_free(new_action_string, TRUE); + ret++; +@@ -661,7 +652,6 @@ get_file_items_callback(GHashTable *response, gpointer ud) + + static GList * + nautilus_dropbox_get_file_items(NautilusMenuProvider *provider, +- GtkWidget *window, + GList *files) + { + /* +@@ -778,14 +768,13 @@ add_emblem_paths(GHashTable* emblem_paths_response) + + gchar **emblem_paths_list; + int i; +- +- GtkIconTheme *theme = gtk_icon_theme_get_default(); ++ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); + + if (emblem_paths_response && + (emblem_paths_list = g_hash_table_lookup(emblem_paths_response, "path"))) { + for (i = 0; emblem_paths_list[i] != NULL; i++) { + if (emblem_paths_list[i][0]) +- gtk_icon_theme_append_search_path(theme, emblem_paths_list[i]); ++ gtk_icon_theme_add_search_path(theme, emblem_paths_list[i]); + } + } + g_hash_table_unref(emblem_paths_response); +@@ -804,15 +793,14 @@ remove_emblem_paths(GHashTable* emblem_paths_response) + goto exit; + + // We need to remove the old paths. +- GtkIconTheme * icon_theme = gtk_icon_theme_get_default(); + gchar ** paths; +- gint path_count; ++ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); + +- gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count); ++ paths = gtk_icon_theme_get_search_path(theme); + + gint i, j, out = 0; + gboolean found = FALSE; +- for (i = 0; i < path_count; i++) { ++ for (i = 0; paths[i] != NULL; i++) { + gboolean keep = TRUE; + for (j = 0; emblem_paths_list[j] != NULL; j++) { + if (emblem_paths_list[j][0]) { +@@ -834,7 +822,7 @@ remove_emblem_paths(GHashTable* emblem_paths_response) + accomodate the changes */ + if (found) { + paths[out] = NULL; /* Clear the last one */ +- gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, out); ++ gtk_icon_theme_set_search_path(theme, (const gchar **)paths); + } + + g_strfreev(paths); +@@ -888,13 +876,13 @@ on_disconnect(NautilusDropbox *cvs) { + + + static void +-nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderIface *iface) { ++nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderInterface *iface) { + iface->get_file_items = nautilus_dropbox_get_file_items; + return; + } + + static void +-nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderIface *iface) { ++nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderInterface *iface) { + iface->update_file_info = nautilus_dropbox_update_file_info; + iface->cancel_update = nautilus_dropbox_cancel_update; + return; +diff --git a/src/nautilus-dropbox.h b/src/nautilus-dropbox.h +index 65734be..44faa27 100644 +--- a/src/nautilus-dropbox.h ++++ b/src/nautilus-dropbox.h +@@ -27,7 +27,7 @@ + #include <glib.h> + #include <glib-object.h> + +-#include <libnautilus-extension/nautilus-info-provider.h> ++#include <nautilus-extension.h> + + #include "dropbox-command-client.h" + #include "nautilus-dropbox-hooks.h" diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 145fae2553a20..8d63a8b4c0734 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgs -, autoconf, automake, curl, iprange, iproute2, iptables, iputils +{ stdenv, lib, fetchFromGitHub, autoconf, automake, curl, iprange, iproute2, iptables, iputils , kmod, nettools, procps, tcpdump, traceroute, util-linux, whois # If true, just install FireQOS without FireHOL diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 79ed104def08b..7ce86986b7088 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.30"; + version = "3.3.35"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-LwMbqweRtH0l+89pRns6VbQgWOy3j34i76IwYdOUW0M="; + hash = "sha256-CVWeTjigfIrCFa9OZRfA4QWZArA2vkA6psITRFMKr4o="; }; postPatch = '' diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix new file mode 100644 index 0000000000000..94c049d52cbba --- /dev/null +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -0,0 +1,98 @@ +{ lib +, gcc12Stdenv +, fetchFromGitHub +, fetchpatch +, pkg-config +, curl +, glib +, gtk3 +, libssh2 +, openssl +, wxGTK32 +}: + +gcc12Stdenv.mkDerivation rec { + pname = "freefilesync"; + version = "11.26"; + + src = fetchFromGitHub { + owner = "hkneptune"; + repo = "FreeFileSync"; + rev = "v${version}"; + sha256 = "sha256-MKs9PfxKVxfDYYB8Dqop9dUd757ajjgvIdMtKJX5dNw="; + }; + + # Patches from ROSA Linux + patches = [ + # Disable loading of the missing Animal.dat + (fetchpatch { + url = "https://abf.io/import/freefilesync/raw/rosa2021.1-11.25-1/ffs_devuan.patch"; + sha256 = "sha256-o8T/tBinlhM1I82yXxm0ogZcZf+uri95vTJrca5mcqs="; + excludes = [ "FreeFileSync/Source/ffs_paths.cpp" ]; + postFetch = '' + substituteInPlace $out --replace " for Rosa" "" + ''; + }) + # Fix build with GTK 3 + (fetchpatch { + url = "https://abf.io/import/freefilesync/raw/rosa2021.1-11.25-1/ffs_devuan_gtk3.patch"; + sha256 = "sha256-NXt/+BRTcMk8bnjR9Hipv1NzV9YqRJqy0e3RMInoWsA="; + postFetch = '' + substituteInPlace $out --replace "-isystem/usr/include/gtk-3.0" "" + ''; + }) + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + curl + glib + gtk3 + libssh2 + openssl + wxGTK32 + ]; + + NIX_CFLAGS_COMPILE = [ + # Undef g_object_ref on GLib 2.56+ + "-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_54" + "-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_54" + # Define libssh2 constants + "-DMAX_SFTP_READ_SIZE=30000" + "-DMAX_SFTP_OUTGOING_SIZE=30000" + ]; + + buildPhase = '' + runHook preBuild + + chmod +w FreeFileSync/Build + cd FreeFileSync/Source + make -j$NIX_BUILD_CORES + cd RealTimeSync + make -j$NIX_BUILD_CORES + cd ../../.. + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -R FreeFileSync/Build/* $out + mv $out/{Bin,bin} + + runHook postInstall + ''; + + meta = with lib; { + description = "Open Source File Synchronization & Backup Software"; + homepage = "https://freefilesync.org"; + license = [ licenses.gpl3Only licenses.openssl licenses.curl licenses.libssh2 ]; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/gopher/geomyidae/default.nix b/pkgs/applications/networking/gopher/geomyidae/default.nix index 197cdaca00c4d..25f99ac2075c3 100644 --- a/pkgs/applications/networking/gopher/geomyidae/default.nix +++ b/pkgs/applications/networking/gopher/geomyidae/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ libressl ]; + patches = lib.optionals stdenv.isDarwin [ ./modification-time.patch ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { diff --git a/pkgs/applications/networking/gopher/geomyidae/modification-time.patch b/pkgs/applications/networking/gopher/geomyidae/modification-time.patch new file mode 100644 index 0000000000000..145d2239b3e9d --- /dev/null +++ b/pkgs/applications/networking/gopher/geomyidae/modification-time.patch @@ -0,0 +1,13 @@ +diff --git a/geomyidae-v0.51/handlr.c b/geomyidae-v0.51/handlr.c +index 0c230d32519..9fc043fa3c9 100644 +--- a/handlr.c ++++ b/handlr.c +@@ -71,7 +71,7 @@ handledir(int sock, char *path, char *port, char *base, char *args, + *type->type, + dirent[i]->d_name, + humansize(st.st_size), +- humantime(&(st.st_mtim.tv_sec)), ++ humantime(&(st.st_mtimespec.tv_sec)), + e, ohost, port); + free(file); + free(dirent[i]); diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 938626806caef..46394c107dec0 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0xrc7crchflfrk4x5dq5zx22zkmgcrbkww5r1pvkc3cyyr18cc6h"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index e310b2c0ba618..fd4e214cb0304 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -25,17 +25,14 @@ , libvpx }: stdenv.mkDerivation rec { - version = "2.7.0"; + version = "2.8.2"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; - sha256 = "sha256-ouevompKkWn5CXuDcPuKiTE9GrIXBs/NFsNu6GHgReE="; + sha256 = "sha256-+hkV9s4ORm4Kqu9zBmxtFZJFG3gh70OOxpjix052bM0="; }; - postPatch = '' - patchShebangs modules/ctrl_dbus/gen.sh - ''; nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 00b970cd68716..580af6e2e0ce0 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, glib, libgcrypt }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, libgcrypt }: with lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index fc9c4c10b2187..541bcc72f5ac1 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,15 +29,16 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.6.7"; + version = "unstable-2022-09-20"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "chatty"; - rev = "v${version}"; + # https://source.puri.sm/Librem5/chatty/-/tree/247c53fd990f7472ddd1a92c2f9e1299ae3ef4e4 + rev = "247c53fd990f7472ddd1a92c2f9e1299ae3ef4e4"; fetchSubmodules = true; - hash = "sha256-W4w/00mRgjfyQmLQ81/EAN+80qk7kDkBmMPJnOU+AIc="; + hash = "sha256-9hgQC0vLmmJJxrBWTdTIrJbSSwLS23uVoJri2ieCj4E="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix index c6a64212b558c..516c4dcd97454 100644 --- a/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2022-08-07"; + version = "unstable-2022-10-02"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "e0870784008a584229d3094e0988f5da155c7fd7"; - hash = "sha256-t0b2SFlDDBSQEkOCQME0jsLJ8NvoXROTxoQgnoXM9eQ="; + rev = "c72f1a3fc064f61cc5c5a578d7350240e26a27af"; + hash = "sha256-6V9vLmj5ptMALFV57pMU2IGxNbFNyVcdvnrPgCEaUJ0="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 550d01695ca04..362d7a096bfb2 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { chmod u+w . ./yarn.lock export HOME=$PWD/tmp mkdir -p $HOME - yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + 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/ diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh b/pkgs/applications/networking/instant-messengers/element/keytar/update.sh index 8ac65ea45d3eb..d18cc7d0e8bf8 100755 --- a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/keytar/update.sh @@ -2,7 +2,7 @@ #!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates packaging data for the seshat package." + echo "Regenerates packaging data for the keytar package." echo "Usage: $0 [git release tag]" exit 1 fi diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index ce17529cd3985..f5f38124ceb61 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.8", - "desktopSrcHash": "l6IwztPEPSo3WgdUBPO4ZNgfoLts8NaqvoHekAhfVGg=", - "desktopYarnHash": "105xj2xwc9g8cfiby0x93gy8w8w5c76mzzxck5mgvawcc6qpvmrc", - "webSrcHash": "Etxlq2TEaZM9Qz4ig5H00DsshJoFH6+wtt+RL1dR2n4=", - "webYarnHash": "1q05r2shv1c3kghwksjzrh9rl25ins6r2y46ng7smdml4f9vdcc0" + "version": "1.11.10", + "desktopSrcHash": "cywTZ5OgKaFkHh3i3KLfb8HH8ZlIAOY3Xn2WHyY0fNM=", + "desktopYarnHash": "1xwnw9hbbrr72xs2d43qwhbmhfk3w4z80cipyrmdj5y248y8sz84", + "webSrcHash": "r7WZUWgPDEBS9xpc1YmmPVGch7B2ouJOFAoKdcC/55Q=", + "webYarnHash": "0s8wxf13jc9x4zykhm4abgq3a38mjya7z43kjsags1fxhilf09bc" } diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index 97d6a7d5204a0..915e3faa3e40e 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -32,7 +32,7 @@ in rustPlatform.buildRustPackage rec { chmod u+w . ./yarn.lock export HOME=$PWD/tmp mkdir -p $HOME - yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + 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/ diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index d50e7118cc18d..22bbeb212f0eb 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -1,16 +1,16 @@ { lib , fetchFromGitLab -, flutter +, flutter2 , olm , imagemagick , makeDesktopItem }: -flutter.mkFlutterApp rec { +flutter2.mkFlutterApp rec { pname = "fluffychat"; version = "1.2.0"; - vendorHash = "sha256-co+bnsVIyg42JpM9FimfGEjrd6A99GlBeow1Dgv7NBI="; + vendorHash = "sha256-1PDX023WXRmRe/b1L+6Du91BvGwYNp3YATqYSQdPrRY="; src = fetchFromGitLab { owner = "famedly"; diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 3b5349d65ffe7..bfc322fea6cfa 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "fractal"; rev = version; - sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw="; + hash = "sha256-To6lr2I+JVrxvuK++2gLWntFGnEBm+B6KTRuOvjASek="; }; patches = [ @@ -40,14 +40,17 @@ stdenv.mkDerivation rec { # fractal-gtk/res/meson.build:5:0: ERROR: Function does not take positional arguments. (fetchpatch { url = "https://gitlab.gnome.org/GNOME/fractal/-/commit/6fa1a23596d65d94aa889efe725174e6cd2903f0.patch"; - sha256 = "3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc="; + hash = "sha256-3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc="; }) + + # This is in fractal v4.4.1b1+ so can be removed when fractal is updated. + ./update-socket2-for-rust-1.64.diff ]; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit src patches; name = "${pname}-${version}"; - hash = "sha256-xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc="; + hash = "sha256-d99zSaxp22YyLP3Wckgcm7wlz7nFrLJDHq2xPJmZFf0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/fractal/update-socket2-for-rust-1.64.diff b/pkgs/applications/networking/instant-messengers/fractal/update-socket2-for-rust-1.64.diff new file mode 100644 index 0000000000000..04e6f2cc1cb9b --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/fractal/update-socket2-for-rust-1.64.diff @@ -0,0 +1,195 @@ +diff --git a/Cargo.lock b/Cargo.lock +index c0b5e5e2..3009f183 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,5 +1,7 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "addr2line" + version = "0.13.0" +@@ -169,7 +171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293" + dependencies = [ + "addr2line", +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "miniz_oxide", + "object", +@@ -326,6 +328,12 @@ 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.13" +@@ -407,7 +415,7 @@ version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + ] + + [[package]] +@@ -417,7 +425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" + dependencies = [ + "autocfg 1.0.0", +- "cfg-if", ++ "cfg-if 0.1.10", + "lazy_static", + ] + +@@ -455,7 +463,7 @@ version = "2.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "dirs-sys", + ] + +@@ -465,7 +473,7 @@ version = "2.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "dirs-sys", + ] + +@@ -506,7 +514,7 @@ version = "0.8.23" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + ] + + [[package]] +@@ -549,7 +557,7 @@ version = "1.0.16" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "crc32fast", + "libc", + "miniz_oxide", +@@ -842,7 +850,7 @@ version = "0.1.14" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "wasi", + ] +@@ -979,7 +987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163" + dependencies = [ + "bitflags", +- "cfg-if", ++ "cfg-if 0.1.10", + "futures-channel", + "futures-core", + "futures-util", +@@ -1543,7 +1551,7 @@ version = "0.4.11" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + ] + + [[package]] +@@ -1648,7 +1656,7 @@ version = "0.6.22" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", +@@ -1703,7 +1711,7 @@ version = "0.2.34" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", + ] +@@ -1826,7 +1834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" + dependencies = [ + "bitflags", +- "cfg-if", ++ "cfg-if 0.1.10", + "foreign-types", + "lazy_static", + "libc", +@@ -2523,13 +2531,12 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" + + [[package]] + name = "socket2" +-version = "0.3.12" ++version = "0.3.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" ++checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" + dependencies = [ +- "cfg-if", ++ "cfg-if 1.0.0", + "libc", +- "redox_syscall", + "winapi 0.3.9", + ] + +@@ -2678,7 +2685,7 @@ version = "3.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "libc", + "rand 0.7.3", + "redox_syscall", +@@ -2818,7 +2825,7 @@ version = "0.1.18" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "log", + "tracing-core", + ] +@@ -2998,7 +3005,7 @@ version = "0.2.67" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "serde", + "serde_json", + "wasm-bindgen-macro", +@@ -3025,7 +3032,7 @@ version = "0.4.17" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699" + dependencies = [ +- "cfg-if", ++ "cfg-if 0.1.10", + "js-sys", + "wasm-bindgen", + "web-sys", diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index a7c7c30206fba..6a5f898348cf2 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256-FjRrAswoE1yuDoR42U3ppzvEvFN6K/VBdQ0w99wXPtM="; + sha256 = "sha256-kXpGaGp9OWdDa1q3hx7nrD1ZeKH5CKlTgZbyuNZ05/8="; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index dc94b07795200..3132faeb630d2 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.9"; + version = "4.4.10"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-xvKkFMZ7rUyEjnQK7rBkrzO8fhfHjpQ1DHQBUlizZ+o="; + sha256 = "sha256-V3vycO0kV6RTFZWi6uiCFSNfLq/09dBfyLk/5zw3kRA="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 127e94ab3e54f..50d68eeeba1c7 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , asciidoc , cmark diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index 52204d5c79c01..aa871df5e8af2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; - buildInputs = [ libotr pidgin intltool ]; + nativeBuildInputs = [ intltool ]; + buildInputs = [ libotr pidgin ]; meta = with lib; { homepage = "https://otr.cypherpunks.ca/"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix index 9afdee8cda164..70cb3a9028df2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-indicator/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-CdA/aUu+CmCRbVBKpJGydicqFQa/rEsLWS3MBKlH2/M="; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ glib intltool libappindicator-gtk2 libtool pidgin ]; + nativeBuildInputs = [ autoreconfHook intltool ]; + buildInputs = [ glib libappindicator-gtk2 libtool pidgin ]; meta = with lib; { description = "An AppIndicator and KStatusNotifierItem Plugin for Pidgin"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index f393a17c1bc6f..7c076cb372413 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b"; }; - buildInputs = [ pidgin intltool python2 ]; + nativeBuildInputs = [ intltool ]; + buildInputs = [ pidgin python2 ]; meta = with lib; { homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index 41c6a75310a6f..eb606f796cfbc 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { + broken = true; # unmaintained and not compatible with current Tox API. homepage = "https://github.com/jin-eld/tox-prpl"; description = "Tox plugin for Pidgin / libpurple"; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 84f8f327cad9a..f5d2479bdaa15 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -2,7 +2,7 @@ , gst_all_1, libstartup_notification, gettext, perlPackages, libxml2, nss , nspr, farstream, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn , lib, python3, libICE, libXext, libSM, libgnt, ncurses, cyrus_sasl, openssl -, gnutls, libgcrypt, symlinkJoin, cacert, plugins, withOpenssl, withGnutls, withCyrus_sasl ? true +, gnutls, libgcrypt, cacert, plugins, withOpenssl, withGnutls, withCyrus_sasl ? true }: # FIXME: clean the mess around choosing the SSL library (nss by default) @@ -16,7 +16,7 @@ let unwrapped = stdenv.mkDerivation rec { sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper intltool ]; NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; @@ -27,7 +27,7 @@ let unwrapped = stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good libxml2 nss nspr libXScrnSaver python-with-dbus - avahi dbus dbus-glib intltool libidn + avahi dbus dbus-glib libidn libICE libXext libSM cyrus_sasl libgnt ncurses # optional: build finch - the console UI ] diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 1905fd1b4f36b..e68941d2a51a0 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "profanity"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - hash = "sha256-cTkNtj1mN5EuCyniFibKNzY2fxe3NKpRXt8acO/p6WY="; + hash = "sha256-A9ZgHliLb4v/3W5tm5zD0WN8mRmxLE/MUSTBXGvBCCM="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 9dffd2f366b5e..95bd9de69ee30 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.8.9"; + version = "3.8.11"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - sha256 = "sha256-IapGlEUUl+iyW1rTCZugN2YOJUpNwd5NP2QPD3FHd0s="; + sha256 = "sha256-gRMoLzCAXByLVtzYAZnhmbgbfsav6CkbP3ZE0NDdlMw="; }; nativeBuildInputs = [ @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ gbtb ]; - platforms = platforms.x86_64; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index dd2a34a60fa4f..1ce7ed159ef35 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.10.11"; + version = "0.11.3"; # 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"; - sha256 = "sha256-tBgtSYKSoyze9qFWpy6IUdwMU9KCLZGEIpOkjLdHsHM="; + sha256 = "sha256-2Tn/04Bbj+mUsV0gftEUXQmFYWTQyVaPNHZQVk57Avo="; }; 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 a42ffc6ed8643..97a8d7d074e1b 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.61.1"; # Please backport all updates to the stable channel. + version = "5.62.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-iEWJ0/rzQMZaZKwume+akMgRg71tVwhlovIGC129B/8="; + sha256 = "sha256-ehRwGZM4lj+pgxUnBlBfcYt2JypuZ5PX3S5ymZriRWA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index ec142222a98c3..325d5330d62e3 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -47,8 +47,8 @@ let x86_64-darwin-version = "4.28.182"; x86_64-darwin-sha256 = "0x0zc45k0jh0hivgjymcxnnwc2lwyfq68rw39lbxp4i1ir2sbnxg"; - x86_64-linux-version = "4.28.171"; - x86_64-linux-sha256 = "sha256-rsHX/NLLGR0XZsg3Cc6GjNK6rSc9UmM2XkfjqwsJZV4="; + x86_64-linux-version = "4.28.184"; + x86_64-linux-sha256 = "sha256-qAc9rHJbM7lmqNxOcOSnqnuib5zJ0Ry3hAGri8DKIlo="; aarch64-darwin-version = "4.28.182"; aarch64-darwin-sha256 = "0bc8lhmpm0310gh1w9xkb8i1cpldchm4b4mzsr9h0mhvljxmvlyf"; @@ -194,10 +194,6 @@ let runHook preInstall mkdir -p $out/Applications/Slack.app cp -R . $out/Applications/Slack.app - '' + lib.optionalString (!stdenv.isAarch64) '' - # on aarch64-darwin we get: Could not write domain com.tinyspeck.slackmacgap; exiting - /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -Bool YES - '' + '' runHook postInstall ''; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 530e9377828ba..a820e4e015050 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -28,7 +28,7 @@ , tl-expected , hunspell , glibmm -, webkitgtk +, webkitgtk_4_1 , jemalloc , rnnoise , abseil-cpp @@ -93,7 +93,7 @@ env.mkDerivation rec { substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \ - --replace '"libwebkit2gtk-4.0.so.37"' '"${webkitgtk}/lib/libwebkit2gtk-4.0.so.37"' + --replace '"libwebkit2gtk-4.1.so.0"' '"${webkitgtk_4_1}/lib/libwebkit2gtk-4.1.so.0"' ''; # We want to run wrapProgram manually (with additional parameters) @@ -131,7 +131,7 @@ env.mkDerivation rec { tl-expected hunspell glibmm - webkitgtk + webkitgtk_4_1 jemalloc rnnoise tg_owt diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index a6d6cac4ac764..2f16cb78454fc 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,27 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libsodium, ncurses, curl +{ lib, stdenv, fetchFromGitHub, libsodium, ncurses, curl , libtoxcore, openal, libvpx, freealut, libconfig, pkg-config, libopus , qrencode, gdk-pixbuf, libnotify }: stdenv.mkDerivation rec { pname = "toxic"; - version = "0.11.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "sha256-5jLXXI+IMrYa7ZtdMjJrah1zB5TJ3GdHfvcMd1TYE4E="; + sha256 = "sha256-BabRY9iu5ccEXo5POrWkWaIWAeQU4MVlMK8I+Iju6aQ="; }; - patches = [ - # Pending for upstream inclusion fix for ncurses-6.3 compatibility. - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/JFreegman/toxic/commit/41e93adbdbd56db065166af5a6676a7996e9e451.patch"; - sha256 = "sha256-LYEseB5FmXFNifa1RZUxhkXeWlkEEMm3ASD55IoUPa0="; - }) - ]; - makeFlags = [ "PREFIX=$(out)"]; installFlags = [ "PREFIX=$(out)"]; @@ -32,10 +23,10 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config libconfig ]; - meta = with lib; { + meta = with lib; src.meta // { description = "Reference CLI for Tox"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 1d249794d4431..0d320485fe74c 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, rpmextract, undmg, autoPatchelfHook -, xorg, gtk3, gnome2, nss, alsa-lib, udev, libnotify +, xorg, gtk3, nss, alsa-lib, udev, libnotify , wrapGAppsHook }: let diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index f1a0de7338344..3e1d4e524d3d5 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -47,23 +47,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.11.9.10046"; - versions.x86_64-darwin = "5.11.9.10046"; - versions.x86_64-linux = "5.11.10.4400"; + versions.aarch64-darwin = "5.12.0.11129"; + versions.x86_64-darwin = "5.12.0.11129"; + versions.x86_64-linux = "5.12.0.4682"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-Z+K811azMRnhptZ1UvM+o5IgE0F4p9BrntJC9IgPU7U="; + hash = "sha256-0XhqJrls4X8wO9VNmmmUGexJkA9NDkwJkYRjmyV1kAU="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-7U7qT3xlm5LqcJByMWxhZnqs6XBzylEGhqTNUgiaXJY="; + hash = "sha256-E7+zMrW4y1RfsR1LrxCJRRVlA+BuhzwMI/sfzqNHObo="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-Pi1MtuCHzkQACamsNOIS6pbM03L1CmyosbpdrYVNCkQ="; + hash = "sha256-UNtxyR4SMCP9c1Dre/arfdSVZbAV8qoHyHlvj3ZbXIs="; }; }; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 5992453975d94..feeb87ab3fe2a 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -39,5 +39,7 @@ stdenv.mkDerivation rec { There is a 15-day free trial, and it is a paid application after that. ''; + # download URL removed + broken = true; }; } diff --git a/pkgs/applications/networking/insync/v3.nix b/pkgs/applications/networking/insync/v3.nix index 5efffab51c6cd..cf68308176fa7 100644 --- a/pkgs/applications/networking/insync/v3.nix +++ b/pkgs/applications/networking/insync/v3.nix @@ -3,8 +3,6 @@ , fetchurl , makeWrapper , dpkg -, glibc -, glib , libxcb , libGL , nss @@ -80,5 +78,7 @@ stdenv.mkDerivation rec { There is a 15-day free trial, and it is a paid application after that. ''; + # download URL removed + broken = true; }; } diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix deleted file mode 100644 index d8c5de150bb33..0000000000000 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildEnv -, makeWrapper -, ipfs-migrator-unwrapped -, ipfs-migrator-all-fs-repo-migrations -}: - -buildEnv { - name = "ipfs-migrator-${ipfs-migrator-unwrapped.version}"; - - nativeBuildInputs = [ makeWrapper ]; - - paths = [ ipfs-migrator-unwrapped ]; - - pathsToLink = [ "/bin" ]; - - postBuild = '' - wrapProgram "$out/bin/fs-repo-migrations" \ - --prefix PATH ':' '${lib.makeBinPath [ ipfs-migrator-all-fs-repo-migrations ]}' - ''; - - inherit (ipfs-migrator-unwrapped) meta; -} diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 0bc25c0f85926..3ab70167f7ac3 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, gtk2, lua, perl, python3Packages +{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2, lua, perl, python3Packages , pciutils, dbus-glib, libcanberra-gtk2, libproxy , enchant2, libnotify, openssl, isocodes , desktop-file-utils diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index e39f7b75bb5d9..8fcbdce972916 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ii"; - version = "1.9"; + version = "2.0"; src = fetchurl { url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz"; - sha256 = "sha256-hQyzI7WD0mG1G9qZk+5zMzQ1Ko5soeLwK1fBVL9WjBc="; + sha256 = "sha256-T2evzSCMB5ObiKrb8hSXpwKtCgf5tabOhh+fOf/lQls="; }; makeFlags = [ "CC:=$(CC)" ]; diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix index 20cadacb85a1a..d17fcb07a03ba 100644 --- a/pkgs/applications/networking/irc/srain/default.nix +++ b/pkgs/applications/networking/irc/srain/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "srain"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; rev = version; - sha256 = "sha256-zkSePzmbi/QnUYJO/henkxfhuN+BXTXtKGPW7M2QyBY="; + sha256 = "sha256-AJ02S5+A/n8kO6lic8EbPYqNDmHL/tKbXhIkHTrcXOM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 4631cef04fa13..132504a20e164 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,20 +1,25 @@ { stdenv, fetchurl, lib , ncurses, openssl, aspell, gnutls, gettext , zlib, curl, pkg-config, libgcrypt -, cmake, makeWrapper, libobjc, libresolv, libiconv +, cmake, libobjc, libresolv, libiconv , asciidoctor # manpages +, enableTests ? !stdenv.isDarwin, cpputest , guileSupport ? true, guile , luaSupport ? true, lua5 , perlSupport ? true, perl , pythonSupport ? true, python3Packages , rubySupport ? true, ruby , tclSupport ? true, tcl +, phpSupport ? !stdenv.isDarwin, php, systemd, libxml2, pcre2, libargon2 , extraBuildInputs ? [] -, fetchpatch }: let inherit (python3Packages) python; + php-embed = php.override { + embedSupport = true; + apxs2Support = false; + }; plugins = [ { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; } { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; } @@ -22,35 +27,37 @@ let { name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; } { name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; } { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON3"; buildInputs = [ python ]; } + { name = "php"; enabled = phpSupport; cmakeFlag = "ENABLE_PHP"; buildInputs = [ + php-embed.unwrapped.dev libxml2 pcre2 libargon2 + ] ++ lib.optional stdenv.isLinux systemd; } ]; enabledPlugins = builtins.filter (p: p.enabled) plugins; in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.6"; + version = "3.7"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "sha256-GkYN/Y4LQQr7GdSDu0ucXXM9wWPAqKD1txJXkOhJMDc="; + hash = "sha256-n5kvC//h85c4IvkrCVTz+F0DcCC5rdRkvj8W3fUPXI8="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; cmakeFlags = with lib; [ "-DENABLE_MAN=ON" - "-DENABLE_DOC=OFF" # TODO: Documentation fails to build, was deactivated to push through security update - "-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360 - "-DENABLE_PHP=OFF" + "-DENABLE_DOC=OFF" # TODO(@ncfavier): Documentation fails to build, was deactivated to push through security update + "-DENABLE_TESTS=${if enableTests then "ON" else "OFF"}" ] ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins ; - nativeBuildInputs = [ cmake pkg-config makeWrapper asciidoctor ]; + nativeBuildInputs = [ cmake pkg-config asciidoctor ] ++ lib.optional enableTests cpputest; buildInputs = with lib; [ ncurses openssl aspell gnutls gettext zlib curl libgcrypt ] @@ -85,7 +92,7 @@ let on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = with lib.maintainers; [ ncfavier ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index 5c06bb8517a29..353b7ffd6fda4 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -7,7 +7,11 @@ weechat: let wrapper = { installManPages ? true - , configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } + , configure ? { availablePlugins, ... }: { + # Do not include PHP by default, because it bloats the closure, doesn't + # build on Darwin, and there are no official PHP scripts. + plugins = builtins.attrValues (builtins.removeAttrs availablePlugins [ "php" ]); + } }: let @@ -21,6 +25,7 @@ let ''; withPackages = pkgsFun: (python // { extraEnv = '' + ${python.extraEnv} export PYTHONHOME="${python3Packages.python.withPackages pkgsFun}" ''; }); @@ -40,6 +45,7 @@ let ruby = simplePlugin "ruby"; guile = simplePlugin "guile"; lua = simplePlugin "lua"; + php = simplePlugin "php"; }; config = configure { inherit availablePlugins; }; diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index a3f00ab247449..22ea41ec4343a 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.34"; + version = "2.9.35"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-oytnWzIsxLOeQvy1iSWysyMQuJ3vTnv7Ot9izOvgPHg="; + sha256 = "sha256-tRuT4freMDtFjmZuBV9WD9jQFUat8QAias5d+AN7IVo="; }; - vendorSha256 = "sha256-1/EnIPUufPwJqH24mqok5ijMenaPUldHBx8dOydECj8="; + vendorSha256 = "sha256-2MevXSjjwXDjmiMhiZyv45a3OgDrliVcvHbXGRIOu1s="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/pkgs/applications/networking/ipfs-migrator/all-migrations.nix b/pkgs/applications/networking/kubo-migrator/all-migrations.nix index a376e9f895b1b..a9197c9db5fbc 100644 --- a/pkgs/applications/networking/ipfs-migrator/all-migrations.nix +++ b/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -2,23 +2,23 @@ , stdenv , symlinkJoin , buildGoModule -, ipfs-migrator-unwrapped +, kubo-migrator-unwrapped }: # This package contains all the individual migrations in the bin directory. -# This is used by fs-repo-migrations and could also be used by IPFS itself +# This is used by fs-repo-migrations and could also be used by Kubo itself # when starting it like this: ipfs daemon --migrate let fs-repo-common = pname: version: buildGoModule { inherit pname version; - inherit (ipfs-migrator-unwrapped) src; + inherit (kubo-migrator-unwrapped) src; sourceRoot = "source/${pname}"; vendorSha256 = null; doCheck = false; - meta = ipfs-migrator-unwrapped.meta // { + meta = kubo-migrator-unwrapped.meta // { mainProgram = pname; - description = "Individual migration for the filesystem repository of ipfs clients"; + description = "Individual migration for the filesystem repository of Kubo clients"; }; }; @@ -58,6 +58,6 @@ let in symlinkJoin { - name = "ipfs-migrator-all-fs-repo-migrations-${version}"; + name = "kubo-migrator-all-fs-repo-migrations-${version}"; paths = all-migrations; } diff --git a/pkgs/applications/networking/kubo-migrator/default.nix b/pkgs/applications/networking/kubo-migrator/default.nix new file mode 100644 index 0000000000000..e45cbf84d5241 --- /dev/null +++ b/pkgs/applications/networking/kubo-migrator/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildEnv +, makeWrapper +, kubo-migrator-unwrapped +, kubo-migrator-all-fs-repo-migrations +}: + +buildEnv { + name = "kubo-migrator-${kubo-migrator-unwrapped.version}"; + + nativeBuildInputs = [ makeWrapper ]; + + paths = [ kubo-migrator-unwrapped ]; + + pathsToLink = [ "/bin" ]; + + postBuild = '' + wrapProgram "$out/bin/fs-repo-migrations" \ + --prefix PATH ':' '${lib.makeBinPath [ kubo-migrator-all-fs-repo-migrations ]}' + ''; + + inherit (kubo-migrator-unwrapped) meta; +} diff --git a/pkgs/applications/networking/ipfs-migrator/unwrapped.nix b/pkgs/applications/networking/kubo-migrator/unwrapped.nix index c8ade793218f6..a99ab2b2cbb61 100644 --- a/pkgs/applications/networking/ipfs-migrator/unwrapped.nix +++ b/pkgs/applications/networking/kubo-migrator/unwrapped.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { - pname = "ipfs-migrator"; + pname = "kubo-migrator"; version = "2.0.2"; src = fetchFromGitHub { @@ -26,7 +26,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "Migrations for the filesystem repository of ipfs clients"; + description = "Migrations for the filesystem repository of Kubo clients"; homepage = "https://github.com/ipfs/fs-repo-migrations"; license = licenses.mit; maintainers = with maintainers; [ Luflosi elitak ]; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/kubo/default.nix index 6054bca1d8adb..01a8dd9ffface 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -1,24 +1,24 @@ { lib, buildGoModule, fetchurl, nixosTests, openssl, pkg-config }: buildGoModule rec { - pname = "ipfs"; - version = "0.15.0"; # When updating, also check if the repo version changed and adjust repoVersion below + pname = "kubo"; + version = "0.16.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; - passthru.repoVersion = "12"; # Also update ipfs-migrator when changing the repo version + passthru.repoVersion = "12"; # Also update kubo-migrator when changing the repo version - # go-ipfs makes changes to it's source tarball that don't match the git source. + # Kubo makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-GkOY1G2CKXbMbHXkw5v27HmfkJIl2nZOmjjZbzuaRWs="; + hash = "sha256-FS7lwQS7ybyoIKPkcUtPIe3srO1O/cZN+x1nzWUlF20="; }; # tarball contains multiple files/directories postUnpack = '' - mkdir ipfs-src + mkdir kubo-src shopt -s extglob - mv !(ipfs-src) ipfs-src || true - cd ipfs-src + mv !(kubo-src) kubo-src || true + cd kubo-src ''; sourceRoot = "."; @@ -29,7 +29,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; tags = [ "openssl" ]; - passthru.tests.ipfs = nixosTests.ipfs; + passthru.tests.kubo = nixosTests.kubo; vendorSha256 = null; @@ -57,6 +57,7 @@ buildGoModule rec { homepage = "https://ipfs.io/"; license = licenses.mit; platforms = platforms.unix; + mainProgram = "ipfs"; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 5a580cf0f705e..1e47c68526add 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -11,7 +11,7 @@ , enableSpellcheck ? true # Arguments to include external libraries -, enableLibSM ? true, libSM +, enableLibSM ? true, xorg , enableGnuTLS ? true, gnutls , enableEnchant ? enableSpellcheck, enchant , enableDbus ? true, dbus, dbus-glib @@ -76,7 +76,7 @@ let { flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; } { flags = [ "libetpan" ]; enabled = enableLibetpan; deps = [ libetpan ]; } { flags = [ "libravatar-plugin" ]; enabled = enablePluginLibravatar; } - { flags = [ "libsm" ]; enabled = enableLibSM; deps = [ libSM ]; } + { flags = [ "libsm" ]; enabled = enableLibSM; deps = [ xorg.libSM ]; } { flags = [ "litehtml_viewer-plugin" ]; enabled = enablePluginLitehtmlViewer; deps = [ gumbo ]; } { flags = [ "mailmbox-plugin" ]; enabled = enablePluginMailmbox; } { flags = [ "managesieve-plugin" ]; enabled = enablePluginManageSieve; } @@ -163,6 +163,6 @@ in stdenv.mkDerivation rec { homepage = "https://www.claws-mail.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 ]; + maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 srapenne ]; }; } diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 337aeaba1a2f4..f97bbea0023cb 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -1,32 +1,55 @@ -{ lib, stdenv, fetchurl, gnome, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution -, sqlite, gtk3, webkitgtk, libgdata, libmspack }: +{ stdenv +, lib +, fetchurl +, gnome +, cmake +, gettext +, intltool +, pkg-config +, evolution-data-server +, evolution +, gtk3 +, libsoup_3 +, libical +, json-glib +, libmspack +, webkitgtk_4_1 +}: stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.44.4"; + version = "3.46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "TxgrBaE6wbezOwj7Bm6DlcqpW6fagIiGqpGxQp1tfbM="; + sha256 = "vZe6IFzEW60SmXvuE0ii+R2LAtcUWD159PrheU2sG4A="; }; - nativeBuildInputs = [ cmake gettext intltool pkg-config ]; + nativeBuildInputs = [ + cmake + gettext + intltool + pkg-config + ]; buildInputs = [ - evolution-data-server evolution - sqlite libgdata - gtk3 webkitgtk + evolution-data-server + evolution + gtk3 + libsoup_3 + libical + json-glib libmspack + # For evolution-shell-3.0 + webkitgtk_4_1 ]; cmakeFlags = [ - # Building with libmspack as recommended: https://wiki.gnome.org/Apps/Evolution/Building#Build_evolution-ews - "-DWITH_MSPACK=ON" # don't try to install into ${evolution} "-DFORCE_INSTALL_PREFIX=ON" ]; - passthru = { + passthru = { updateScript = gnome.updateScript { packageName = "evolution-ews"; versionPolicy = "odd-unstable"; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 19d6469e96a72..6cac048cfd272 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -5,7 +5,7 @@ , intltool , fetchurl , libxml2 -, webkitgtk +, webkitgtk_4_1 , highlight , pkg-config , gtk3 @@ -14,7 +14,6 @@ , libpst , gspell , evolution-data-server -, libgdata , libgweather , glib-networking , gsettings-desktop-schemas @@ -23,7 +22,6 @@ , shared-mime-info , libical , db -, gcr , sqlite , gnome , gnome-desktop @@ -34,7 +32,7 @@ , nspr , icu , libcanberra-gtk3 -, geocode-glib +, geocode-glib_2 , cmark , bogofilter , gst_all_1 @@ -46,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.44.4"; + version = "3.46.0"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "8LFuerrTx5RaKcMi8X2rSgjWHpm9fMkbjfNQU8XBLow="; + sha256 = "4J6Sdrxrmr8NrTpOgT7qHQJfT2qvH6w7ew+IiVdCkT8="; }; nativeBuildInputs = [ @@ -68,7 +66,6 @@ stdenv.mkDerivation rec { bogofilter db evolution-data-server - gcr gdk-pixbuf glib glib-networking @@ -81,9 +78,8 @@ stdenv.mkDerivation rec { highlight icu libcanberra-gtk3 - geocode-glib + geocode-glib_2 cmark - libgdata libgweather libical libnotify @@ -97,7 +93,7 @@ stdenv.mkDerivation rec { procps shared-mime-info sqlite - webkitgtk + webkitgtk_4_1 ]; propagatedUserEnvPkgs = [ @@ -106,13 +102,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_AUTOAR=OFF" - "-DENABLE_LIBCRYPTUI=OFF" "-DENABLE_YTNEF=OFF" "-DWITH_SPAMASSASSIN=${spamassassin}/bin/spamassassin" "-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn" "-DWITH_BOGOFILTER=${bogofilter}/bin/bogofilter" "-DWITH_OPENLDAP=${openldap}" - "-DWITH_GWEATHER4=ON" ]; requiredSystemFeatures = [ @@ -128,6 +122,7 @@ stdenv.mkDerivation rec { }; }; + PKG_CONFIG_CAMEL_1_2_CAMEL_PROVIDERDIR = "${placeholder "out"}/lib/evolution-data-server/camel-providers"; PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index c039febb6d7c1..d750937c3ee13 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -2,7 +2,6 @@ , buildGoModule , fetchFromGitHub , pkg-config -, gobject-introspection , pango , cairo , gtk2 diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index 91161e5ab14a6..52aac148df36a 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.5.10"; + version = "0.6.0"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CXchZbXX7NH2ZXeAoPph3qxxdcAdDVZLBmOMwxFu+Yo="; + sha256 = "sha256-d+ERCUPUHx41HfBtjb6BjhGKzkUTGIb01BRWvAnLYwk="; }; - cargoSha256 = "sha256-sSQX7DHDgh1eO1Dwn1f0m51Bl2ZG1daRtrnYvsvPOkg="; + cargoSha256 = "sha256-ICaahkIP1uSm4iXvSPMo8uVTtSa1nCyJdDihGdVEQvg="; nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 8572bec3432c9..de82535cd5601 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -1,5 +1,5 @@ -{ coreutils, fetchFromGitHub, fetchpatch, file, gawk, gnugrep, gnused -, installShellFiles, less, lib, libiconv, makeWrapper, nano, stdenv, ruby +{ coreutils, fetchFromGitHub, file, gawk, gnugrep, gnused +, installShellFiles, lib, libiconv, makeWrapper, stdenv, ruby }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 65fb5458fa493..be8ba9c132a3d 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.3.1"; + version = "102.3.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/af/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/af/thunderbird-102.3.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "4e9ec93b6cadc5596aa61efbaaccb377b4666e48dc73237c6119f9a91478fdc9"; + sha256 = "be8247ed8d61d6a62958ec015e6e192b32dd897ba8fb1d1cdad00b992a65e838"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ar/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ar/thunderbird-102.3.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "ab00353e8e55395525fdb85d5b2e824a144d52117e113ef88d5b120e99ebd506"; + sha256 = "98b8a0d748e1c3ea7f776c7a79e04d16c14eddd2a6b2bd68bea2440cda9c716e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ast/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ast/thunderbird-102.3.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2d7fc95f771cb315791d7b5558a05cd0b897e407b456d464235c593afa8c8dd6"; + sha256 = "cc7e318a00a4dc7ea1094f01fd876bcf38712a3cf2ff9662fdd01e7be0509d80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/be/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/be/thunderbird-102.3.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "091e1da27b7590cd3a667c3a380d59723b2807e66401834a2d54dbbced4f98ea"; + sha256 = "d2452c7a69509a8ec5043151f2ffdb3aa40ae51fafbc7343a902c56ee3da833d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/bg/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/bg/thunderbird-102.3.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "02cb218c8f9b0407f1c7da2b688d3ced64c4e05166e6b234d89b7ec3f35204c3"; + sha256 = "ab50997f169d11d54f3873be2d0a75debb1d66853cbeb2a0f6716e215798d558"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/br/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/br/thunderbird-102.3.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4257d1f808ff6c4559f5710e5f3ba03f28a2a6725a8d707d10baca133bc28c0a"; + sha256 = "3959465afba39a3c77e03fa9b2c9f74e455af2122cc91fce743767430f96462f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ca/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ca/thunderbird-102.3.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "cc9deaa88c614ecf831cf7cebab21197f3f4eeae39934da474a60ce29b8e2ceb"; + sha256 = "c055af1ef096fd5b6269b230ccd37bc165172e6a21da1330d8b4ee6c3ff583d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/cak/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/cak/thunderbird-102.3.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "917854ff9d323a2c827450e3c37dc8b1b0de3d666f91b400999f290dbca00ecb"; + sha256 = "65fbb4680513d04a12f0acb476e485cffaa8cea977e8f17abe0371c990e5aff8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/cs/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/cs/thunderbird-102.3.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "9d785bb167ccdf14cffa6cefd78e40da6851c328ca898c332647639c79c2217e"; + sha256 = "0b21e350dba000535ca747207034c5b7665d9adc652905330adb3c0b2ed52025"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/cy/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/cy/thunderbird-102.3.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "2a7cf8397ad73f8f9beddfffc93950336d6619bacf8e5e3baca0cb6ce934927a"; + sha256 = "a998fc9979a679220e5078945a3aadf3168ac89278f6063ae8af410fd9ba11db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/da/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/da/thunderbird-102.3.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "5cd15b8266e6f27e676bc268e44dcac15f24bb385443dcda60ce6493a3a9694f"; + sha256 = "4fdc6aadee7fb96408d39d3454e77c03f09efd2110fed03450cb4076fca0f127"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/de/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/de/thunderbird-102.3.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "f765a23938acd9d7a34c16bf578ed2992d81981f7425b3ae0971f8daf6567d86"; + sha256 = "6780d62564adb5ec21c85b85535e92a2116e34829b873787003c70eef0f0fae9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/dsb/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/dsb/thunderbird-102.3.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "71bd0e2685b76081aaae2d30ec30f787c58d6c22d191f91c968e0e8393c1accb"; + sha256 = "9eaaab1db1d64482693fd9fe8194aae2d0d8b84822e78ac9f5819042059a4fb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/el/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/el/thunderbird-102.3.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "9c6312b6c76c388bfe85edf0c23df474224db5db804298eea2623229f82ba6c0"; + sha256 = "9a5a7ba9c532fd91a781fca68146634987d0546e237703cad0a5d71ed33076c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/en-CA/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/en-CA/thunderbird-102.3.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "cb0d81609be24e85454a7c52f05ef6f4557837e6ca63908376c6beefa4d6a7f5"; + sha256 = "ead8deb57af6f8fdee2a1cdb6ea19132ccc2c0a1c4fb87bb25ecc1c8992995e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/en-GB/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/en-GB/thunderbird-102.3.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8fce652d0f319812e1bcb485c011087a09034a81ebefc19d8e6bff6ce74897a0"; + sha256 = "3c7083ff11d817d7d29afb0fb144124ae33570eb1bb26a166e70d9a79f217cba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/en-US/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/en-US/thunderbird-102.3.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "23c48f5d92915d1ed823c2f47f3a611bf81dd6d69b9b1a5a0aeb939a405d7466"; + sha256 = "0cab200bb2acf7024f772a2762fcbc6b8a6d8cce4471cd95558b030e6b0547cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/es-AR/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/es-AR/thunderbird-102.3.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ffb7f0e9d6df315f9fe18dc955d2d5394a8b2413727ae674fa81d72fae0d8a14"; + sha256 = "973d0a573181b17461e9dfc80cd3b4d2d38b9d489caff2fea43b2ca307b24cd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/es-ES/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/es-ES/thunderbird-102.3.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a0442f1146c6c455c4934834b8b6dabe42afc29512a48f9ccdb28467de0d8800"; + sha256 = "ea745ba8bb2db5e1b53a88b9436b0a49d0644c53cc379c84588b0db82603728d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/es-MX/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/es-MX/thunderbird-102.3.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "84f7b65736a7c872ec6ac7283ff53d1c0b9e36edb1469784b5094fa963b44d59"; + sha256 = "fe408a962b117eb768a2b83da65301286331642c6fdb30def84669ea659b7cf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/et/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/et/thunderbird-102.3.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "6c2985ac3473f124b842daca57d97f584a58d1d5cd0864cbcc432e1af250e83d"; + sha256 = "419f37f72857d123594e2915571eefe91ff7a6b68c10c48b5efa7fc7d248ddd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/eu/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/eu/thunderbird-102.3.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "adafa0ecbb2f8a8ee2d4f06b38744c9bec60d1d0bee386b9840a4d5e08f28cb1"; + sha256 = "8cfdaea3cfbdac4143becdf49166934fcc9f55a826b424282d7af2df40e35f55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/fi/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/fi/thunderbird-102.3.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "ab7e814fe7e45f49bc6cb9451ad388b3d220af33d02071c8d9358ad1949937c3"; + sha256 = "2a8d309a5eaf7c558fc2337612ff8c6aab7de9e8d1f8787b603cbc9a1cf46de3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/fr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/fr/thunderbird-102.3.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f2bc22c3a12fa32c8c13e50a3fe502d5966fa082e6b07c84d2867b043f7770fd"; + sha256 = "7dd70ae9161f0a360febd3df1cbd0eb2b4c0ebf3f372e64abe2762e1614be6c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/fy-NL/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/fy-NL/thunderbird-102.3.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "eeba9b084a5cc818dd62f0bc60de98769c2a62923a121ed77b84f9b4409e60ae"; + sha256 = "5df8cd18f0cb1cbf8df3cc2377e9db499bab2615ef612fe6651e93b376cd03d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ga-IE/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ga-IE/thunderbird-102.3.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "6a86c5e24299ee5a24a573d5e598eb42686c4c5baf58798f487048bb18b9d892"; + sha256 = "7d65ee7e12ee587357b46b4f8cdf4941607e5c8166e0e9b70bb9ae0add8c762e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/gd/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/gd/thunderbird-102.3.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a53567a12afc89f3dbdc20976a098f085298414e9a2453e86608715e7500609b"; + sha256 = "5a9b6c76571dde94dcb8e17b375d0e294bed23c4805f08628b7d7261223efb47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/gl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/gl/thunderbird-102.3.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "fc47765f922e599b18903a9697493a3c939e5660b3efb19353c511876bc1e74e"; + sha256 = "78be935f676cfe736e0930eb5ce3fcc722ad3711bfda9b2e5d773c4407150867"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/he/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/he/thunderbird-102.3.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5ea02bf7572cf7568e508b42ebfc7dd8ceacc6675b80a609d6fb2448f99d111c"; + sha256 = "ad8ffd7c335c845826c477c59e6c830711d03a2420a1f1fe4931fe47c6673589"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/hr/thunderbird-102.3.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "cc304fdd627e3eb6286ef919bdc0afa08c13c06b9586e058724a30a58e06bda5"; + sha256 = "fff30dcff80b6bef6330287534ed4823b3e3cfcddc1c1af522c81ce498ec0084"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hsb/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/hsb/thunderbird-102.3.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "5b4daf66a885260f00d6142102830abe91cc3e4ba5f44dce89f9ea405edcb725"; + sha256 = "51e184549219cfa88f96b0d64e09aea00ffc6237fe658b899fdb17bacad52234"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hu/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/hu/thunderbird-102.3.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "eff03ec8945cbe8378651d8847aeeaf395c3c5a6351f8f77586969db13cff90a"; + sha256 = "140fbeaadf1aadab59f941a0d2bbb7bf1d26b5e3e71aaf5f600ddcd6bcfa144f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hy-AM/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/hy-AM/thunderbird-102.3.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e3e1d117ca12ab81c71ac412532691bac97488d4c4de0f2c6b3e04ad8842b8d5"; + sha256 = "abe9b2d0c3fcefd789e169a7dcb2ead15d55d6fa7638fa0dfa942a25dccf8ce8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/id/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/id/thunderbird-102.3.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "31783513a34d7c254bf256fece50303d19659d555ec9be6aa65d7c927331b613"; + sha256 = "600779207924004b413f8929337bad94749babf9881fff934fe22bad6b9653a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/is/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/is/thunderbird-102.3.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "6872d041b88b3ef63c576545f290306002af052bddf836755983f1cc04e0d88e"; + sha256 = "a1a30d74a88331e16a9e607987702ff8c586e0c1125e53e76e3ce58b94c7066d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/it/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/it/thunderbird-102.3.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "62b3f417ce64feec22cad34bed2ceff9b148e1c70fa6c113a6ebdffa03176790"; + sha256 = "48cf2fc404a1957b3e788f1744bbe09fa0c43da8a48fe2f16e620dc7897c42e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ja/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ja/thunderbird-102.3.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d532ffe63954e34a1fabf0c4fd82650d47b6149ed24e721ec8a982e41151656d"; + sha256 = "92519bb0731fe2f7c4e5977153a297c8d00e59a7e74df974d5c97511cb0d24ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ka/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ka/thunderbird-102.3.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "34f6c534c1a1e0765beddab6f282a37a433019bf34c8f682b34bb2043ee50873"; + sha256 = "680e31023d639d4f040b6c7c64e81169d28ed8d57b30aa9e26b6bf1a4c7d76e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/kab/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/kab/thunderbird-102.3.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c8eb3166d1969e61092b360387cc36225a40dd6a6bd02fb1770fe9038737725f"; + sha256 = "0011c0b32afa890108133f9c5ca56c5cac521f76e1462497facf3bd56ef80c4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/kk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/kk/thunderbird-102.3.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1ac2a9fa3c8c4d81011bfaf7832f1b0e8e90eb5d5e6244090d72147d2e2b8fb7"; + sha256 = "95c95f06d61ab3090908e24e58d19da58ac7f5581f8fa414796ef493a1bcdd61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ko/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ko/thunderbird-102.3.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "cf93f79fa959c5bdf95b4c35c55db071825026d251ee877901864e875b28cc0f"; + sha256 = "9b80bedc6791f41acbff75794d3fda188f112b3c010ad9c1cf070624a07055d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/lt/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/lt/thunderbird-102.3.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ae27c62284aa6884daf2e798f150d2d23134dc1a9f94fa6af707436af2018c13"; + sha256 = "42aedde250458f5764b0d79c551feb0f2d06e40cf7214f83e8d61401a700ee5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/lv/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/lv/thunderbird-102.3.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1866d66a091e4b8126b70371631e5c97ce0a5868c77355b8e918678b1864e982"; + sha256 = "a3b2cf7a102cebea1ff3bbe9eaefddddfc800a0b7a8500209be71e191ffaf62d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ms/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ms/thunderbird-102.3.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "01b3960e8316292b7e76ff1c43784120d515ce9f1dde3698db3242fb1b06edf2"; + sha256 = "b20af066f049d1763ace7da37255a5383a2d441cb9ba9135906fdc1aa76fc479"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/nb-NO/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/nb-NO/thunderbird-102.3.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "98afda50d6fe63681e643d6580a773bffac167a6b074fc2523ddeaa99b34b791"; + sha256 = "0a570b14610cde2fcb4ab0fc4db9ed5a2eb468690d5adf0518487d45b6866643"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/nl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/nl/thunderbird-102.3.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "fa8e08b8ed82590db431527c75f407365b01da7a8bf445060eabd3b1cb433191"; + sha256 = "440ecc50c0c245494e4fd8f32aa3b927744a096b4aacbe4fd11c72c6ba466e60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/nn-NO/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/nn-NO/thunderbird-102.3.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b1696f0c18425096daba4cf42000b62fb3e520b670b96c716dad159dfd87ea8d"; + sha256 = "abe9de2a4ed8d11c5f8b5f51b39eec4814eda96ef601b4feb5236779c259d04e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pa-IN/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/pa-IN/thunderbird-102.3.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "64d1d93e474178e58ecbb6a320334fcf282768a6670d7a4b61a9868028a2b872"; + sha256 = "343689c4aa8970ab7fc6681a43b0bcc4bd69d63c900cfb4e4f62c4ccbdd93181"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/pl/thunderbird-102.3.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "2944648239de42d63296117fd400f91f113f1abe43c07427d8bae171fc704178"; + sha256 = "d24b3718ebc598191f3ae650ecc6bbd800e6fc3725fcb8b6ef7fa7f63ef9eaea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pt-BR/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/pt-BR/thunderbird-102.3.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "8a90e2f181579f2f554323c0a517f39068261157fdb9c7a3e103b7e12bdaf85a"; + sha256 = "7cb226cbf2054aa34a27f2e9c033fd3f1fd5848d0737225da38f0fe22d2d9a01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pt-PT/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/pt-PT/thunderbird-102.3.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "daf5b99316e61405a791d4c08934135578b89046b9364f59d8ff3c96ae2aad8c"; + sha256 = "1f65677e9e595b39962d0ae6a9cc0942b69c9fbf7b3e22c21a12830678ca8fab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/rm/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/rm/thunderbird-102.3.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "21293b3675a5cf775840a197278538132ce6072fcf05c9752658d7b8c1733507"; + sha256 = "cf07014796cd820061490c0fcd0be3c429f80a8edf9ecd712a5252420c8333f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ro/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ro/thunderbird-102.3.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a488e2de83e8a644dd4943ae1fb1ef7e573044d896d40174c057d85b5c572bdd"; + sha256 = "6691874f03e8a39c570e8b1b51eb0a4ae0c9b7b7ec6e10d955a82fb86dc5628c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ru/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/ru/thunderbird-102.3.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "c442169025d3af45f6f17d93b4ee6b93a19dee8dc76aa3a86d05f909c7738f01"; + sha256 = "28cf9994e05d3ae6b6d740e73fe773486f4f80e94d9886ca356e22230a26f4a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sk/thunderbird-102.3.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ecdf233b3492989e4bfa8479603088bae5c01d91f803d0ef75217999727bfb96"; + sha256 = "9d07755c8471e85514c3b06a819b4acadaba1f5e19a83d64b6f33dc0e23ed4c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sl/thunderbird-102.3.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "4a50de5e9e4d521fe82dac6975fc0524cda87982dbb408fc49020d444fe4a517"; + sha256 = "f7be5127b7e7f10dbf0587c1593ca7ed6c06c8ab7c6027ae6e3e02d01887f294"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sq/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sq/thunderbird-102.3.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "85374a718f1968852318320d39dee77b1377aab49e9d16457a1a92b8606f0390"; + sha256 = "ef624dc3078b216c2364bd409b1a34aa7b7bfa85571b47c6ceff1acde0232fe9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sr/thunderbird-102.3.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "1a2799e9821b1eb49ec90e6b50fc2b306e53738e192fbb8bcccba0ddaad90cc7"; + sha256 = "3dc3281d8395ea38c877a28e0d825a61466092b2b1206db219e14d2a7ae761f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sv-SE/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/sv-SE/thunderbird-102.3.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3f1d06d90214103104788f2f874b0ec7b915fda8f2a2c54155706f6c8b9455c7"; + sha256 = "2a72cfaef31debb488acc070365764e6478c8c437b76eddcd783c4c0af8764b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/th/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/th/thunderbird-102.3.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1d611eb6a2a1dfeea5e08bdc1d46a580df25f172169a9752d865b89e44bd673c"; + sha256 = "8a668f1bb70ea4b93f18e7c8e0667605bd3f97a175d6887adbb38a1cb5247452"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/tr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/tr/thunderbird-102.3.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "3c9df11854ff3a775b9bafe57feeb585afd46e853e8be06b73f9fb5a06b21595"; + sha256 = "32dbd1790457f0224584115471366b09f1bc4a72a72467a3ec25c6cd4f1da520"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/uk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/uk/thunderbird-102.3.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "fa3a01b7a86a8885aa05fe9251ca8843b08268d338d73a4f26e790b76249e429"; + sha256 = "2f95ecb5ba9c725fed978f2a27d117cafa622eb3988ca3e0a3afd3bd38a1d529"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/uz/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/uz/thunderbird-102.3.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "8e87c7f295216f70d861ced167970968db3926ddfc597613b51be82724793e19"; + sha256 = "44e1c9893960f43dd74b9fbfc2cce481538b1eac76944dd57f9e580b99027bb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/vi/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/vi/thunderbird-102.3.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c8a75c6a87e5606037da51c57a9b0ca01cce95b9a6bf51f92645902be7fe666c"; + sha256 = "5fa13f379f064a7d070a32b4eeff8d8c80dae880ade4cea73ddd1d43bf3395df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/zh-CN/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/zh-CN/thunderbird-102.3.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "679f176ab93c5afe107c9afad67216c86f3b85fd95051da8a194e3f28bbc9c24"; + sha256 = "0636cb784ae1d4c17a2c9f34293a1bd0def3ba11ac38114d0230bc807a0b5cc6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/zh-TW/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-x86_64/zh-TW/thunderbird-102.3.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d9dac3efd9f3b6f8b3de483fb895b21079f9cda9cee4247dcf605e7d1a15ed71"; + sha256 = "37e13e04ccf331da55467ba0aeed7ab8be837eeb48b64a46a8dd975955cb2b8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/af/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/af/thunderbird-102.3.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "448bba05f7fc7982e189cd0b012b83695a16b7912050919ae15ccff23ac0e9c1"; + sha256 = "9f63be2b52e9eeaf0d17a23287f406af72a15a3469f699f31c78c0065ddafc01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ar/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ar/thunderbird-102.3.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ce5d762c58ae99327e1b40bb0a2fa39e66391d620b09d156299c1240f3cd6214"; + sha256 = "b796db3c8f75a0a20ee74e264a08c35e8f77788fa539951d184f78843f35cfcb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ast/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ast/thunderbird-102.3.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "2bb16102cbbf2d5ecf8a4d0cf7e52abe59e0e77bab8b99955753ed2833c7c60b"; + sha256 = "ec8ba04578e0a04d55dbfd8c59e79a7c57b0c43e577b1c675463509f6defe155"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/be/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/be/thunderbird-102.3.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "77480fd5f82259c02107072cfe572d8c13611279fd9a6ffb2a9203db8cf1e233"; + sha256 = "687c2a8a79423ed5641592c09df5e93526da5b03c9f8e19fd5accd019ab31e3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/bg/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/bg/thunderbird-102.3.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "317909be58eb0718ee8a38e07ba22ef78fa912a75f18b547a1a65840214c52a7"; + sha256 = "b233d9f0a61fe08bd6781edb25da9ed272ff670ded5be133d0cb8750f478d5b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/br/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/br/thunderbird-102.3.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a6b8d5c4012c00cbcd03beedb87826fd3553497da09710517d07ab5f26347f92"; + sha256 = "413384529739c1b4d38766e307c950a77dfb9924da394ab27dfd815cc9bf0d43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ca/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ca/thunderbird-102.3.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "337d21f0927c21e54009d0a38744230145e7ab36710940da1180517a946bf06f"; + sha256 = "f861c426676cf903d4ffa54b95472da384a387e0639c70692ec3b7481fbfe77b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/cak/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/cak/thunderbird-102.3.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "d626cc58418c56a6505087e3ce1b8387cbf371c86653e5576b24421ef1be8cff"; + sha256 = "87679b7dcc550f1813085a7152e478eaca0e6f4a330d58d9d19281228049a054"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/cs/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/cs/thunderbird-102.3.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "85422320690772a867f9128c77784f16270d739561e613505894ded2d5dea8bd"; + sha256 = "3c78f10ca1d7aa45f8267720ef3f6c6d7184f84103dd3fcf0445e05537528cba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/cy/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/cy/thunderbird-102.3.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1b01874769ddcde6a5e520034131a42418f2f7cadb07d0aa9e815ebd0c59dbda"; + sha256 = "6505b99879b9c689f1b6c29adecb020c6dab72e13f4e8604862760d6eaf522a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/da/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/da/thunderbird-102.3.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6381065e3e8841a6113d2cfdc2ccb6d8082f68e977940040ee85af2ad59162a0"; + sha256 = "782422e9469deec492c38f6e004828c972341650b36c86b74d86f511789838d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/de/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/de/thunderbird-102.3.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ce9525f4d3df6336f01c526d095292490a3ef8c50752140899ef01dd5a4822cf"; + sha256 = "07077a1d02803a9c510bbba3bce2efc3d987ab1df654c6d638a9e8717e11fc79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/dsb/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/dsb/thunderbird-102.3.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "5597b4565df7f09e2a5682fe252076c1f689a3c7f139a38b9415c1e1ff6d3255"; + sha256 = "5ca4dab28f2f912a56fd0c2377d9537001bd07ae09b9ce20050afd338d0dd615"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/el/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/el/thunderbird-102.3.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "4b1a586b566482d4a0b333642f6a3f8d4b68c6eebb0a0620713af4e5cea97997"; + sha256 = "12c8883d711ff39876dd481f94e078508513d4dd3ac74cbccf33c44ddb0bc0ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/en-CA/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/en-CA/thunderbird-102.3.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d6f1602354ac05f3220f8f4dc95164d511530f3aeee50e5f24141a9807359320"; + sha256 = "c169a179d6bfd912cf3b44bb7491d43f572bcb8044100d7f395504fb3b031c99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/en-GB/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/en-GB/thunderbird-102.3.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "14432051534a87a677318885cebe3e1ecd0d8121426bdf378251da28f8c1a3a0"; + sha256 = "a4d2a36f571537310f92bc6f15a7ced0f65f22d6c5392384ed8d7a41302832d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/en-US/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/en-US/thunderbird-102.3.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "24b0bbb9eb51289daa6dd422dda05b044f1a5a791d9d5108ea6eeb711c44de76"; + sha256 = "69f5fde05bcbfddce4e11e7e18efe535fde0f79011fa5f51d5713d4b987e3c36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/es-AR/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/es-AR/thunderbird-102.3.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b7624620c724a64b1d87f09bf685c26ce0a84d80b07ca6d9d3f784ad21967277"; + sha256 = "839318c257e33ea00be23d985f4ae59083e406fe08cbaa70853c8df762a98629"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/es-ES/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/es-ES/thunderbird-102.3.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "dfecfa47b402b90456dc5d4ae623816cbeda9c80c4938f741bf151fae0793f47"; + sha256 = "b33fd34807fcc93f6fa2d82a0a8f4043929163045d884756abb9ec1f63ac7259"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/es-MX/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/es-MX/thunderbird-102.3.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8e6527ad6aad041262d85f514ecafd9d62814844a8a29d7ca1ae883e79cef50d"; + sha256 = "d0e87997410023ab0a17b8e1787846794d8db04d39b79af909cee47ee34977ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/et/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/et/thunderbird-102.3.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "8d18b241852707454ced76b234b242b3779b8d6e1443dac325379be06e688e9c"; + sha256 = "c1181432421d40855719720d0523dded01e9a6c5a5bcaef70ac46a101e0e322d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/eu/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/eu/thunderbird-102.3.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b8aef6273a96f6e78ba194833fcfb31461fdc6bf6bba0fd6b2412fdf152ec53c"; + sha256 = "f9de976e9bc341963b7b74963a7c910a37072a4e9b873de488b058f3c43d6399"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/fi/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/fi/thunderbird-102.3.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "001c89758fc323fa0adcc687d9a593a7cd37a02bff039028876cbe29cbc30c2e"; + sha256 = "229dfceb87668c8107748095ac8675473fbee621b1b330c306d80a78832a75cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/fr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/fr/thunderbird-102.3.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "736754863283dfb3c3a4fed93d75fca3e7c91e8b82b501569931c34fe75610a3"; + sha256 = "c280b145e31d954ad61d65bbe18651abd82e0de916508bdaf82986bf6c5c137c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/fy-NL/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/fy-NL/thunderbird-102.3.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "99de0a63b7591e089fbe107c9054334dfba47a6c2b3fe5a1257dbdd6201d6ca2"; + sha256 = "9bd48a6794b2be0396a028ecf68d3a5ae3e36d758fb5459a28129a96aaa88ac6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ga-IE/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ga-IE/thunderbird-102.3.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b7e2fdf11b027c6ebc8854b1dc88c8bd0f9d7fd79cf8a795aaa3e915201fec80"; + sha256 = "b9c1200b4342f03bdc3e37ef28f902310e89d200befeff2eac27c77a7a128ea5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/gd/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/gd/thunderbird-102.3.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "8e8c4c8fc100186085c7a6fbbf5aa051effae790a6616e0b9443dac25b635da4"; + sha256 = "22fd8a830e0c35288ff80e26dac73fa8761bc830e3d3ecb85a9b463481d695e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/gl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/gl/thunderbird-102.3.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6961cbf70431de590dfb00037bb78872086405f0e6b769f75ed3d053e4d12ace"; + sha256 = "3bf4cc4bb3861ae6145930b269fc5130bb51c482ddcac32db2af366428c44a79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/he/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/he/thunderbird-102.3.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "2b7c4b2fc9ef21cc303435ce65361314c9e7621259384205658ea06fa191f91a"; + sha256 = "a46292647a3edd4f98bd7a228523d62c398ecb08cc6c589a63db8b7b59ae34ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/hr/thunderbird-102.3.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "2e223e3830b8d7b4747633c2450f654d6c92b822d04c7c652d9c5e5431d19cca"; + sha256 = "5fabbf58c7ffd50959e35bcb35d7ede411185c6243331410849db34544117ef1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hsb/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/hsb/thunderbird-102.3.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "b8b49ac96522c1e0a44aa0341a272bbfac68bc3022bced753baba929c276fe7e"; + sha256 = "eb7000d604770fe4ae252a084b873bf4daa21e63ee61b8ce55b9ebbafe602e5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hu/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/hu/thunderbird-102.3.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "b3a5aefaac3a95d4dd1d809835cc024338fcf2ed6820808dac1007e74cb11c2b"; + sha256 = "7ce1406fa995ae3970256f589bd0cb66a650c35eda023dc8ff581e6529a5743d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hy-AM/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/hy-AM/thunderbird-102.3.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "adc79864747e21dd293d46d91f57dae8a502964c5d6f952c010dc0f0a1d4c656"; + sha256 = "de6453eddbbae63e0336dba130fea7b3ea00cf7ffcafb3a24ab5ac42c5799411"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/id/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/id/thunderbird-102.3.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a154337146c6a8d5a8acab2f332ca8da6572bafdc9c888ba062bc29bc7ef37fd"; + sha256 = "d2e952ee9e4ef37d5024bbff1ea3f1b9c88c7aa0df4f9feba440101900e24390"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/is/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/is/thunderbird-102.3.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "5799af2df9dd50b0c6694335b12cb77783ab0f622a8415ff82fbf15aca2822ad"; + sha256 = "2804654ca434fdc9f80d8b32c75bfcccad25747f9d67c54752d6f313ecb0ed93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/it/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/it/thunderbird-102.3.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "6c2e9dc4c6a805f919840c22a75fd6acd4bb3078a82a16b3b27e5ae1a63e21d3"; + sha256 = "0907217dcb9896d9bca6d0c7c62a557c897102b3b45c9142bc51d3c6b185cc70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ja/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ja/thunderbird-102.3.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9e67f40ceb46fd39f50cc0f8f5d83ea3c677bd91810dd84d225c636f6c20a290"; + sha256 = "049b550bb8d8a1dd274ef696dfedbb84602d2811c14e893c7dbcdbb38fb367f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ka/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ka/thunderbird-102.3.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "765c999714bb3b897dfaa0fa3e6743123ba7e3d7dc9e54eea9252dc10e5535cd"; + sha256 = "c609dc4eed2de0e0a4537a3f9640ddff41403672c787471ee09fb02a476f9047"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/kab/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/kab/thunderbird-102.3.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "63380a855e8e68d5796d22c06beaf0c0021e5488cc8d408049126334e62fb70a"; + sha256 = "be17a41bd8d3b76d7cfe1d1f099efec944e2df53ec5a89ccc397217a258539c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/kk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/kk/thunderbird-102.3.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "694dfb86d441657d7fa3a5c9fb0aee04963fca34e6062278170b7ddb828bd6f4"; + sha256 = "289d699f0bddb51abd9df3628ec0a83990c0c15e434da471f3f3578c757a4630"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ko/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ko/thunderbird-102.3.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "533945ef9f5f4b47b8042e226a062fb0f406a70c89fd727c86360ff86ede56a8"; + sha256 = "494aa9bdf725a911f2494d33698daac3da429e653a89c0eaa33b6f833af6e5f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/lt/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/lt/thunderbird-102.3.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f59bc567e18f0a7bf6a8309ffd41d812196a4fb7328d0485ba01154b46b4bf89"; + sha256 = "68fe30d3246ef7de15cce1ee8c504759891dbbe70d7334ac5c30674083cdb114"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/lv/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/lv/thunderbird-102.3.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "48ba520948c2ca6e10e6a16bd7110538895780612fcd49eeb9485c6c77e6e43d"; + sha256 = "1fbb6f9f68053e4c321f4711f5aa21bb9367045f9468741cce43069ec891d6f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ms/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ms/thunderbird-102.3.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "9bdb1a669c831dc8a714d35adaaef8a25149462d7230efbee4daa1632b487425"; + sha256 = "f78b55d0319e53e1591e1a11982f51381e45a605849743f34091bb8413de4c45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/nb-NO/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/nb-NO/thunderbird-102.3.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "07016efab2eb7ed564cebcce06aa96842c2db9935e20627207ea81eb4febc583"; + sha256 = "481a74cb75fc088ddc47ebe4feda4148ff9ed826c7b2f8838c4fd6d2e34c8c03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/nl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/nl/thunderbird-102.3.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "6da0d6ddc98213620e9d9b20a008e1d419f9c183a379ce29a03113be3f168388"; + sha256 = "10ddf93f44666d0b7678bbbaa54b188178ad1bce7a47a804c29779f43cc0f5b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/nn-NO/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/nn-NO/thunderbird-102.3.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "8ede5e5a46e972d5b08e2c5afe316ca8f789faffc2b25e235eefda361073cbc3"; + sha256 = "d1dab28a6768aef75d0b2235b4b922ec8f6e54f03905e58a69d1ccb6c2c2c3ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pa-IN/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/pa-IN/thunderbird-102.3.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d7090dc233b508586d04c19b9f0a72d49207daf01f7dba009fbab6004bffa2da"; + sha256 = "1cad44aac21295951ee0422bea1324314ebbbf266a254ba7aa0335a16a83b17c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/pl/thunderbird-102.3.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "55728076e95a42ae58bd545f4a9a07d43937e3eeca432cf14cc5b990df993cb7"; + sha256 = "66c1d6c0a2924819bd7443852f2d6c03f5e4fe666260410fbd35a5446717c440"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pt-BR/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/pt-BR/thunderbird-102.3.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "4fcef15d7ff85a5dbfc8c30628ab50403715217ba90c28c10a46f6dfd54c806e"; + sha256 = "8fce80badd70051942bb1e8a2816907fe40a64302ec2c53db601adb76ae4b046"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pt-PT/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/pt-PT/thunderbird-102.3.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "3a52e1938df9e3905e628444fa39a8ec242d5035d22081b9b236f4c9530360a2"; + sha256 = "528e4d61fc6183cbc878c50794a624fec24dae7ecd0de723b052916a38dae8d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/rm/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/rm/thunderbird-102.3.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "fe1a9489fb05b630958419e9a861900f1f2208563cbfddca1535f2189fb22c9d"; + sha256 = "20175fc24b0422f8218dd2b9fe3c7272ab16d2c42bf908cf91d426d1df52aa7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ro/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ro/thunderbird-102.3.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "27faa3fe3ec2491bbba28719d1251b3b1708d533c7139d7ed9ae764cfff77b4f"; + sha256 = "3419299a3df936f428fd118f5728ca2583ee8674a9110b2846bfaebdc8fcac67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ru/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/ru/thunderbird-102.3.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "25d8d95ee2310f168ba3c3b9ac382f9faa7980e2993d53170007fd8430ea81de"; + sha256 = "c2e058b4e73579f8459364d0197b63f5fa47b159d936ef6d02fb7ddfac0dc0bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sk/thunderbird-102.3.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c20d3375ecd71abc3a2e0ac02ecd3eba94a551515f3359ef1b67ba0bf6bce00e"; + sha256 = "832bd202ba4eaedbdc1a56c240a80d01b897fa323bfde55e10d7b469ae96b04e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sl/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sl/thunderbird-102.3.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "0228e8468438a9aa8eac458e24b20bfafe6aefdb5e48b54954ed00e63706bc13"; + sha256 = "5caa4ef84763e5fedf0ce7bdba3c18c78d8e6adb9cb9393b192981473f5e7124"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sq/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sq/thunderbird-102.3.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5a8663228110c37300854bf27dcc7266ab7f644433b661504c45abba41aed2e8"; + sha256 = "4ab052d9941061b1754a2abc0327a416cfd3bf2d313f2763f71cdc3f2e9f1787"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sr/thunderbird-102.3.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "9a1df52ac44477ca7686408fe0581cdd72767ca72195799026ce5140623c096b"; + sha256 = "da52e326fa26db84cab3981dbadf1686c9657230d3a33725db07b089f310c252"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sv-SE/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/sv-SE/thunderbird-102.3.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "232aa296cc744b133127baffd286521dd9f07f3236619bd052b3f279860db9ff"; + sha256 = "a97b6001a6b4fb5b7797c745674f4d782b8b9eb6e969858aa64c7109734763c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/th/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/th/thunderbird-102.3.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "184a66243f02c8387e10cccaf8a464aba3da6f3e2f20d8493a7e6e491b16a329"; + sha256 = "aa3e07d59b55f5e691173fdf2876d75b470312823329b70b2812c39f6d70e2e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/tr/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/tr/thunderbird-102.3.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9ed55035f0d9348f5903bf80a8f4b9b25d024f42eb67c7f90e32546bbe8aad37"; + sha256 = "685d0005a6db08a644527167f7f72758ce1441a35dee17d67ca82ab567e9796e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/uk/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/uk/thunderbird-102.3.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "2c8b84d9cc9db19d8bfccba149c02f2b339967e2e97b3955a3628f9cec3e26f2"; + sha256 = "2bc50651e17ffbeebfc51ef7a91ae348da5372f2cefded4d2810e0587d6bcc3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/uz/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/uz/thunderbird-102.3.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "47e31e1aaf4b8cd9506bc22f25cc1b7be23b6c6aa36dc7828f2d56f3506f7def"; + sha256 = "a8f6901be7bae700cef8aed58341bbfee177688cc5629326446a5a00ef76fc84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/vi/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/vi/thunderbird-102.3.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d9253ed61361b5c7888429c10c2792f95c59b72dd56ab16c2707db5e4305f34b"; + sha256 = "b39bacae6af2aa1ba4b3bbbdcb7a9bd169d25878f90c7ca83b434c7fb4cb8c8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/zh-CN/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/zh-CN/thunderbird-102.3.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "f978eb65f70017c61f7e32994bbf5be19fe2f18176a58f1b1aa0e36e688dc2ef"; + sha256 = "0f033acd591aaa1252ffa987d27bd1ca8924c12c980e6a57824d4ac2c7576304"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/zh-TW/thunderbird-102.3.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.2/linux-i686/zh-TW/thunderbird-102.3.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7a337e36d45668e5c6b20e60b3617f9acdf0f0a9166ca234567a1f0e4a47181a"; + sha256 = "acfcb269900e6e24ab41fc6e6ef313b4a4e6f605de4642e1fa9398f2817fda80"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index aebb182dcb231..2e53260f08bd4 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.3.1"; + version = "102.3.2"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "8a127958b35c1c14b8acaa3ac256f8a3a7e9bde89fc810299ae4036c80c41d0c0d45c85ed47099d6ec37e2774a6bdeefe0de6b0b4b8bceca8206c7e54c3f93c1"; + sha512 = "e10b0322293a723c5683231e4337b1c3a214c064bbcc7f569c111c4ace42e74ddc312f2f30a260020dac48e44662f093538fab935a78ee0f6fc4a2a70488f74a"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 84ac952846f3c..cdaf4286f93c5 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -7,17 +7,25 @@ let }; in nodePackages.n8n.override { - nativeBuildInputs = with pkgs.nodePackages; [ - node-pre-gyp + nativeBuildInputs = [ + pkgs.nodePackages.node-pre-gyp ]; - dontNpmInstall = true; + buildInputs = [ + pkgs.postgresql + ]; - postInstall = '' - mkdir -p $out/bin - ln -s $out/lib/node_modules/n8n/bin/n8n $out/bin/n8n + # 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. + preRebuild = lib.optionalString stdenv.isAarch64 '' + rm -rf node_modules/oracledb ''; + dontNpmInstall = true; + passthru = { updateScript = ./generate-dependencies.sh; tests = nixosTests.n8n; diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/applications/networking/n8n/node-env.nix index 2590dd267a4ef..5dad9ec63d47c 100644 --- a/pkgs/applications/networking/n8n/node-env.nix +++ b/pkgs/applications/networking/n8n/node-env.nix @@ -165,7 +165,11 @@ let if(process.argv[2] == "development") { replaceDependencies(packageObj.devDependencies); } + else { + packageObj.devDependencies = {}; + } replaceDependencies(packageObj.optionalDependencies); + replaceDependencies(packageObj.peerDependencies); /* Write the fixed package.json file */ fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); @@ -270,7 +274,7 @@ let # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; + name = "reconstructpackagelock.js"; text = '' var fs = require('fs'); var path = require('path'); @@ -280,25 +284,43 @@ let var lockObj = { name: packageObj.name, version: packageObj.version, - lockfileVersion: 1, + lockfileVersion: 2, requires: true, + packages: { + "": { + name: packageObj.name, + version: packageObj.version, + license: packageObj.license, + bin: packageObj.bin, + dependencies: packageObj.dependencies, + engines: packageObj.engines, + optionalDependencies: packageObj.optionalDependencies + } + }, dependencies: {} }; - function augmentPackageJSON(filePath, dependencies) { + function augmentPackageJSON(filePath, packages, dependencies) { var packageJSON = path.join(filePath, "package.json"); if(fs.existsSync(packageJSON)) { var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + packages[filePath] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: packageObj.dependencies, + engines: packageObj.engines, + optionalDependencies: packageObj.optionalDependencies + }; dependencies[packageObj.name] = { version: packageObj.version, integrity: "sha1-000000000000000000000000000=", dependencies: {} }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); } } - function processDependencies(dir, dependencies) { + function processDependencies(dir, packages, dependencies) { if(fs.existsSync(dir)) { var files = fs.readdirSync(dir); @@ -314,23 +336,84 @@ let pkgFiles.forEach(function(entry) { if(stats.isDirectory()) { var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); + augmentPackageJSON(pkgFilePath, packages, dependencies); } }); } else { - augmentPackageJSON(filePath, dependencies); + augmentPackageJSON(filePath, packages, dependencies); } } }); } } - processDependencies("node_modules", lockObj.dependencies); + processDependencies("node_modules", lockObj.packages, lockObj.dependencies); fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); ''; }; + # Script that links bins defined in package.json to the node_modules bin directory + # NPM does not do this for top-level packages itself anymore as of v7 + linkBinsScript = writeTextFile { + name = "linkbins.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); + + if(packageObj.bin !== undefined) { + fs.mkdirSync(path.join(nodeModules, ".bin")) + + if(typeof packageObj.bin == "object") { + Object.keys(packageObj.bin).forEach(function(exe) { + if(fs.existsSync(packageObj.bin[exe])) { + console.log("linking bin '" + exe + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.bin[exe]), + path.join(nodeModules, ".bin", exe) + ); + } + else { + console.log("skipping non-existent bin '" + exe + "'"); + } + }) + } + else { + if(fs.existsSync(packageObj.bin)) { + console.log("linking bin '" + packageObj.bin + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.bin), + path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) + ); + } + else { + console.log("skipping non-existent bin '" + packageObj.bin + "'"); + } + } + } + else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { + fs.mkdirSync(path.join(nodeModules, ".bin")) + + fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { + if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { + console.log("linking bin '" + exe + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.directories.bin, exe), + path.join(nodeModules, ".bin", exe) + ); + } + else { + console.log("skipping non-existent bin '" + exe + "'"); + } + }) + } + ''; + }; + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; @@ -377,13 +460,18 @@ let npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + runHook postRebuild + if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install fi + + # Link executables defined in package.json + node ${linkBinsScript} ''; # Builds and composes an NPM package including all its dependencies diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 7feebd16a8a8a..fb578d0d05e79 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -58,13 +58,13 @@ let sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; }; }; - "@azure/core-lro-2.3.1" = { + "@azure/core-lro-2.4.0" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.3.1.tgz"; - sha512 = "nQ+Xnm9g1EWcmbqgxJGmkNHfOHRUmrbYIlRT4KjluzhHQooaGO55m/h6wCX0ho3Jte2ZNBzZPJRmi6yBWeb3yA=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz"; + sha512 = "F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ=="; }; }; "@azure/core-paging-1.3.0" = { @@ -103,13 +103,13 @@ let sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; }; }; - "@azure/core-util-1.1.0" = { + "@azure/core-util-1.1.1" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.0.tgz"; - sha512 = "+i93lNJNA3Pl3KSuC6xKP2jTL4YFeDfO6VNOaYdk0cppZcLCxt811gS878VsqsCisaltdhl9lhMzK5kbxCiF4w=="; + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.1.tgz"; + sha512 = "A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog=="; }; }; "@azure/identity-2.1.0" = { @@ -121,13 +121,13 @@ let sha512 = "BPDz1sK7Ul9t0l9YKLEa8PHqWU4iCfhGJ+ELJl6c8CP3TpJt2urNCbm0ZHsthmxRsYoMPbz2Dvzj30zXZVmAFw=="; }; }; - "@azure/keyvault-keys-4.5.0" = { + "@azure/keyvault-keys-4.6.0" = { name = "_at_azure_slash_keyvault-keys"; packageName = "@azure/keyvault-keys"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.5.0.tgz"; - sha512 = "F+0qpUrIxp1/uuQ3sFsAf4rTXErFwmuVLoXlD2e3ebrONrmYjqszwmlN4tBqAag1W9wGuZTL0jE8X8b+LB83ow=="; + url = "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.6.0.tgz"; + sha512 = "0112LegxeR03L8J4k+q6HwBVvrpd9y+oInG0FG3NaHXN7YUubVBon/eb5jFI6edGrvNigpxSR0XIsprFXdkzCQ=="; }; }; "@azure/logger-1.0.3" = { @@ -139,31 +139,58 @@ let sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; }; }; - "@azure/msal-browser-2.28.3" = { + "@azure/ms-rest-azure-env-2.0.0" = { + name = "_at_azure_slash_ms-rest-azure-env"; + packageName = "@azure/ms-rest-azure-env"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz"; + sha512 = "dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="; + }; + }; + "@azure/ms-rest-js-2.6.2" = { + name = "_at_azure_slash_ms-rest-js"; + packageName = "@azure/ms-rest-js"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.2.tgz"; + sha512 = "0/8rOxAoR9M3qKUdbGOIYtHtQkm4m5jdoDNdxTU0DkOr84KwyAdJuW/RfjJinGyig4h73DNF0rdCl6XowgCYcg=="; + }; + }; + "@azure/ms-rest-nodeauth-3.1.1" = { + name = "_at_azure_slash_ms-rest-nodeauth"; + packageName = "@azure/ms-rest-nodeauth"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.1.1.tgz"; + sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; + }; + }; + "@azure/msal-browser-2.29.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.28.3"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.28.3.tgz"; - sha512 = "2SdyH2el3s8BzPURf9RK17BvvXvaMEGpLc3D9WilZcmjJqP4nStVH7Ogwr/SNTuGV48FUhqEkP0RxDvzuFJSIw=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.29.0.tgz"; + sha512 = "ezrB0qL1WsJSNgvLmAN5vKr/4pH28UYLe8JUZeHzB6Z408JU8qYXXGnHAhDPzpDg0g91eG05IdIVrLwxk/i15g=="; }; }; - "@azure/msal-common-7.4.1" = { + "@azure/msal-common-7.5.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "7.4.1"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.4.1.tgz"; - sha512 = "zxcxg9pRdgGTS5mrRJeQvwA8aIjD8qSGzaAiz5SeTVkyhtjB0AeFnAcvBOKHv/TkswWNfYKpERxsXOAKXkXk0w=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.5.0.tgz"; + sha512 = "W+SIsGSjkUAyDggA/6QVMKErttQ/8Bq9l/7ADr7GJwt9JFsc+XNBdQDsOsUvZ7YCVkZcSgzJw2MZJLIBqfQtQA=="; }; }; - "@azure/msal-node-1.14.0" = { + "@azure/msal-node-1.14.1" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.0.tgz"; - sha512 = "3XB7FuHLhmGBjw7bxuz1LCHOXQgmNIO3J56tlbOjuJcyJtd4aBCgnYIXNKLed3uRcQNHEO0mlg24I4iGxAV/UA=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.1.tgz"; + sha512 = "RftjLd35xlafh5cPT17zrzpYdcsbHKJal7R/FTbThpbetSk8y8vQHUzNwWNhBM6GFFiyMS4IQ+zs+z8bgJ4sKQ=="; }; }; "@azure/storage-blob-12.11.0" = { @@ -175,22 +202,13 @@ let sha512 = "na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg=="; }; }; - "@babel/parser-7.19.1" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz"; - sha512 = "h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="; - }; - }; - "@babel/runtime-7.19.0" = { + "@babel/runtime-7.19.4" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.19.0"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz"; - sha512 = "eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz"; + sha512 = "EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA=="; }; }; "@colors/colors-1.5.0" = { @@ -202,6 +220,24 @@ let sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; }; }; + "@curlconverter/yargs-0.0.2" = { + name = "_at_curlconverter_slash_yargs"; + packageName = "@curlconverter/yargs"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@curlconverter/yargs/-/yargs-0.0.2.tgz"; + sha512 = "Q1YEebpCY61kxme4wvU0/IN/uMBfG5pZOKCo9FU+w20ElPvN+eH2qEVbK1C12t3Tee3qeYLLEU6HkiUeO1gc4A=="; + }; + }; + "@curlconverter/yargs-parser-0.0.1" = { + name = "_at_curlconverter_slash_yargs-parser"; + packageName = "@curlconverter/yargs-parser"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@curlconverter/yargs-parser/-/yargs-parser-0.0.1.tgz"; + sha512 = "DbEVRYqrorzwqc63MQ3RODflut1tNla8ZCKo1h83lF7+fbntgubZsDfRDBv5Lxj3vkKuvAolysNM2ekwJev8wA=="; + }; + }; "@dabh/diagnostics-2.0.3" = { name = "_at_dabh_slash_diagnostics"; packageName = "@dabh/diagnostics"; @@ -211,13 +247,31 @@ let sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@fontsource/open-sans-4.5.11" = { + "@fontsource/open-sans-4.5.12" = { name = "_at_fontsource_slash_open-sans"; packageName = "@fontsource/open-sans"; - version = "4.5.11"; + version = "4.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.12.tgz"; + sha512 = "WKCexsVbOECJUSOgG7GnrUxe+3ds4Sa1yhsTjSnszI+0TaJvMZnDnn5YDKwA/KwLbkZqCaV3nvMTH97jJuxWNA=="; + }; + }; + "@fortawesome/fontawesome-common-types-0.2.36" = { + name = "_at_fortawesome_slash_fontawesome-common-types"; + packageName = "@fortawesome/fontawesome-common-types"; + version = "0.2.36"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz"; + sha512 = "a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="; + }; + }; + "@fortawesome/fontawesome-common-types-0.3.0" = { + name = "_at_fortawesome_slash_fontawesome-common-types"; + packageName = "@fortawesome/fontawesome-common-types"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.11.tgz"; - sha512 = "nG0gmbx4pSr8wltdG/ZdlS6OrsMK40Wt6iyuLTKHEf0TQfzKRMlWaskZHdeuWCwS6WUgqHKMf9KSwGdxPfapOg=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.3.0.tgz"; + sha512 = "CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w=="; }; }; "@fortawesome/fontawesome-common-types-6.2.0" = { @@ -229,6 +283,15 @@ let sha512 = "rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg=="; }; }; + "@fortawesome/fontawesome-svg-core-1.3.0" = { + name = "_at_fortawesome_slash_fontawesome-svg-core"; + packageName = "@fortawesome/fontawesome-svg-core"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.3.0.tgz"; + sha512 = "UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg=="; + }; + }; "@fortawesome/free-regular-svg-icons-6.2.0" = { name = "_at_fortawesome_slash_free-regular-svg-icons"; packageName = "@fortawesome/free-regular-svg-icons"; @@ -238,6 +301,33 @@ let sha512 = "M1dG+PAmkYMTL9BSUHFXY5oaHwBYfHCPhbJ8qj8JELsc9XCrUJ6eEHWip4q0tE+h9C0DVyFkwIM9t7QYyCpprQ=="; }; }; + "@fortawesome/free-solid-svg-icons-5.15.4" = { + name = "_at_fortawesome_slash_free-solid-svg-icons"; + packageName = "@fortawesome/free-solid-svg-icons"; + version = "5.15.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz"; + sha512 = "JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w=="; + }; + }; + "@fortawesome/vue-fontawesome-2.0.8" = { + name = "_at_fortawesome_slash_vue-fontawesome"; + packageName = "@fortawesome/vue-fontawesome"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.8.tgz"; + sha512 = "SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw=="; + }; + }; + "@gar/promisify-1.1.3" = { + name = "_at_gar_slash_promisify"; + packageName = "@gar/promisify"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"; + sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; + }; + }; "@icetee/ftp-0.3.15" = { name = "_at_icetee_slash_ftp"; packageName = "@icetee/ftp"; @@ -247,13 +337,13 @@ let sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; }; }; - "@js-joda/core-5.3.1" = { + "@js-joda/core-5.4.1" = { name = "_at_js-joda_slash_core"; packageName = "@js-joda/core"; - version = "5.3.1"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.3.1.tgz"; - sha512 = "iHHyIRLEfXLqBN+BkyH8u8imMYr4ihRbFDEk8toqTwUECETVQFCTh2U59Sw2oMoRVaS3XRIb7pyCulltq2jFVA=="; + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.4.1.tgz"; + sha512 = "+uMco2Xm9VYJ81XYWwrvgsM9xEvqs9JvLNrN4/fOg7YJKk4yeqAg+O/cpoFPTGxvfL2Zy0mUcnKlIz9UV0Cadw=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -337,58 +427,67 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@oclif/command-1.8.16" = { - name = "_at_oclif_slash_command"; - packageName = "@oclif/command"; - version = "1.8.16"; + "@npmcli/fs-1.1.1" = { + name = "_at_npmcli_slash_fs"; + packageName = "@npmcli/fs"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.16.tgz"; - sha512 = "rmVKYEsKzurfRU0xJz+iHelbi1LGlihIWZ7Qvmb/CBz1EkhL7nOkW4SVXmG2dA5Ce0si2gr88i6q4eBOMRNJ1w=="; + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz"; + sha512 = "8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="; }; }; - "@oclif/config-1.18.2" = { - name = "_at_oclif_slash_config"; - packageName = "@oclif/config"; - version = "1.18.2"; + "@npmcli/move-file-1.1.2" = { + name = "_at_npmcli_slash_move-file"; + packageName = "@npmcli/move-file"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz"; + sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; + }; + }; + "@oclif/command-1.8.18" = { + name = "_at_oclif_slash_command"; + packageName = "@oclif/command"; + version = "1.8.18"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.2.tgz"; - sha512 = "cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.18.tgz"; + sha512 = "qTad+jtiriMMbkw6ArtcUY89cwLwmwDnD4KSGT+OQiZKYtegp3NUCM9JN8lfj/aKC+0kvSitJM4ULzbgiVTKQQ=="; }; }; - "@oclif/config-1.18.3" = { + "@oclif/config-1.18.5" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.18.3"; + version = "1.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.3.tgz"; - sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.5.tgz"; + sha512 = "R6dBedaUVn5jtAh79aaRm7jezx4l3V7Im9NORlLmudz5BL1foMeuXEvnqm+bMiejyexVA+oi9mto6YKZPzo/5Q=="; }; }; - "@oclif/core-1.16.3" = { + "@oclif/core-1.16.5" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.16.3"; + version = "1.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.16.3.tgz"; - sha512 = "SWrU/eGgN5kLyuZ+TqtKz2z2HTSrgaNEwkawNj4B31VXDrPv7aULS3ntVCboAKRldX/6J+Af+70BV07Rr5c5oA=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.16.5.tgz"; + sha512 = "Jb58K79AALkLmY0PNU1Jx4Z+/JIWtpgtRbei92PIIBx+TaAmYgVySNI1beInZFNOpGo2fhxVBp+yr3DZ38z3kQ=="; }; }; - "@oclif/errors-1.3.5" = { + "@oclif/errors-1.3.6" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.5.tgz"; - sha512 = "OivucXPH/eLLlOT7FkCMoZXiaVYf8I/w1eTAM1+gKzfhALwWTusxEx7wBmW0uzvkSg/9ovWLycPaBgJbM3LOCQ=="; + url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.6.tgz"; + sha512 = "fYaU4aDceETd89KXP+3cLyg9EHZsLD3RxF2IU9yxahhBpspWjkWi3Dy3bTgcwZ3V47BgxQaGapzJWDM33XIVDQ=="; }; }; - "@oclif/help-1.0.1" = { + "@oclif/help-1.0.3" = { name = "_at_oclif_slash_help"; packageName = "@oclif/help"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.1.tgz"; - sha512 = "8rsl4RHL5+vBUAKBL6PFI3mj58hjPCp2VYyXD4TAa7IMStikFfOH2gtWmqLzIlxAED2EpD0dfYwo9JJxYsH7Aw=="; + url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.3.tgz"; + sha512 = "AjjhSWFQkRb9rChEH+IRUmp0CxEacYpUbh+kQqtdCR9CDSsj2a3ibWjtMtJb4lFGAle6kVKfaal/juYe+6P5TQ=="; }; }; "@oclif/linewrap-1.0.0" = { @@ -400,13 +499,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.7" = { + "@oclif/parser-3.8.8" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.7"; + version = "3.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.7.tgz"; - sha512 = "b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.8.tgz"; + sha512 = "OgqQAtpyq1XFJG3dvLl9aqiO+F5pubkzt7AivUDkNoa6/hNgVZ79vvTO8sqo5XAAhOm/fcTSerZ35OTnTJb1ng=="; }; }; "@oclif/screen-3.0.2" = { @@ -436,6 +535,15 @@ let sha512 = "kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q=="; }; }; + "@sap/hana-client-2.14.18" = { + name = "_at_sap_slash_hana-client"; + packageName = "@sap/hana-client"; + version = "2.14.18"; + src = fetchurl { + url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.14.18.tgz"; + sha512 = "9TfoDuxWZyUYIwISVVMPguX9iirZrD0cI6rI0xXg6URRaqk71GZ5U0ueomeZapSY1nni2Yf+th1ZjU+jSUw/9g=="; + }; + }; "@segment/loosely-validate-event-2.0.0" = { name = "_at_segment_slash_loosely-validate-event"; packageName = "@segment/loosely-validate-event"; @@ -580,6 +688,15 @@ let sha512 = "TyPLQaF6w8UlWdv4gj8i46B+INBVzURBNRahCozCSXfsK2VTlL1wNyTlMKw817VHygBtlcl5jfnPadlydr06Yw=="; }; }; + "@types/js-nacl-1.3.0" = { + name = "_at_types_slash_js-nacl"; + packageName = "@types/js-nacl"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/js-nacl/-/js-nacl-1.3.0.tgz"; + sha512 = "juUvxo444ZfwDSwWyhssMxSN+snqTdiUoOVXZF+/ffVrGHq3rAf1fmczWn3z9TCEAuRbaTmgAcYlZ9MutyyOkQ=="; + }; + }; "@types/json-schema-7.0.11" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -589,13 +706,13 @@ let sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; }; }; - "@types/lodash-4.14.185" = { + "@types/lodash-4.14.186" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.185"; + version = "4.14.186"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.185.tgz"; - sha512 = "evMDG1bC4rgQg4ku9tKpuMh5iBNEwNa3tf9zRHdP1qlv+1WUg44xat4IxCE14gIpZRGUUWAx2VhItCZc25NfMA=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz"; + sha512 = "eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw=="; }; }; "@types/mime-3.0.1" = { @@ -616,13 +733,22 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.7.18" = { + "@types/node-12.20.55" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "12.20.55"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz"; + sha512 = "J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="; + }; + }; + "@types/node-18.8.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.7.18"; + version = "18.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz"; - sha512 = "m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.8.3.tgz"; + sha512 = "0os9vz6BpGwxGe9LOhgP/ncvYN5Tx1fNcd2TM3rD/aCGBkysb+ZWpXEocG24h6ZzOi13+VB8HndAQFezsSOw1w=="; }; }; "@types/node-fetch-2.6.2" = { @@ -652,6 +778,15 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; + "@types/readable-stream-2.3.14" = { + name = "_at_types_slash_readable-stream"; + packageName = "@types/readable-stream"; + version = "2.3.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.14.tgz"; + sha512 = "8jQ5Mp7bsDJEnW/69i6nAaQMoLwAVJVc7ZRAVTrdh/o6XueQsX38TEvKuYyoQj76/mg7WdlRfMrtl9pDLCJWsg=="; + }; + }; "@types/serve-static-1.15.0" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; @@ -697,13 +832,22 @@ let sha512 = "FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="; }; }; - "@vue/compiler-sfc-2.7.10" = { - name = "_at_vue_slash_compiler-sfc"; - packageName = "@vue/compiler-sfc"; - version = "2.7.10"; + "@xmldom/xmldom-0.7.5" = { + name = "_at_xmldom_slash_xmldom"; + packageName = "@xmldom/xmldom"; + version = "0.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz"; + sha512 = "V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A=="; + }; + }; + "a-sync-waterfall-1.0.1" = { + name = "a-sync-waterfall"; + packageName = "a-sync-waterfall"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz"; - sha512 = "55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q=="; + url = "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz"; + sha512 = "RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA=="; }; }; "abbrev-1.1.1" = { @@ -715,6 +859,15 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; + "abort-controller-3.0.0" = { + name = "abort-controller"; + packageName = "abort-controller"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"; + sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; + }; + }; "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; @@ -751,6 +904,15 @@ let sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; }; }; + "adal-node-0.2.3" = { + name = "adal-node"; + packageName = "adal-node"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/adal-node/-/adal-node-0.2.3.tgz"; + sha512 = "gMKr8RuYEYvsj7jyfCv/4BfKToQThz20SP71N3AtFn3ia3yAR8Qt2T3aVQhuJzunWs2b38ZsQV0qsZPdwZr7VQ=="; + }; + }; "address-1.2.1" = { name = "address"; packageName = "address"; @@ -787,6 +949,24 @@ let sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; + "agentkeepalive-4.2.1" = { + name = "agentkeepalive"; + packageName = "agentkeepalive"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; + sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; + }; + }; + "aggregate-error-3.1.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; + }; + }; "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; @@ -904,6 +1084,15 @@ let sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; }; }; + "are-we-there-yet-3.0.1" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"; + sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg=="; + }; + }; "argparse-1.0.10" = { name = "argparse"; packageName = "argparse"; @@ -967,6 +1156,15 @@ let sha512 = "WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw=="; }; }; + "asap-2.0.6" = { + name = "asap"; + packageName = "asap"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha512 = "BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="; + }; + }; "asn1-0.2.6" = { name = "asn1"; packageName = "asn1"; @@ -1030,6 +1228,15 @@ let sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; }; }; + "async-2.6.4" = { + name = "async"; + packageName = "async"; + version = "2.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz"; + sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; + }; + }; "async-3.2.4" = { name = "async"; packageName = "async"; @@ -1084,22 +1291,22 @@ let sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; }; }; - "avsc-5.7.5" = { + "avsc-5.7.6" = { name = "avsc"; packageName = "avsc"; - version = "5.7.5"; + version = "5.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/avsc/-/avsc-5.7.5.tgz"; - sha512 = "vkyt1+sj6qaD9oMtqqLE2pZ2IcHI66kFx8lpnVuXp55SnNPjKghfOhVfZpaDwDPpY0oVWP3Qu1uHZWxF3E856A=="; + url = "https://registry.npmjs.org/avsc/-/avsc-5.7.6.tgz"; + sha512 = "jyn9tfd9J3h7pgJSk4qQ/1c1Tk5qiXrvmdCDON2UjcFplqRu/KpmKmpi+Ess8ZKmmqK12U4Y3VHrfwQs1xSMZA=="; }; }; - "aws-sdk-2.1218.0" = { + "aws-sdk-2.1231.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1218.0"; + version = "2.1231.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1218.0.tgz"; - sha512 = "oreF2jKfUZ8VKnIKh8TrOOOsdSfv87jHGtWQNAHdvfeyrYK5FrnvGkHUZ3bu6g6u1gHwu5FhTPiRMbgS8Re+NA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1231.0.tgz"; + sha512 = "ONBuRsOxsu0zL8u/Vmz49tPWi9D4ls2pjb6szdfSx9VQef7bOnWe9gJpWoA94OTzcjOWsvjsG7UgjvQJkIuPBg=="; }; }; "aws-sign2-0.7.0" = { @@ -1219,6 +1426,15 @@ let sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; }; }; + "better-sqlite3-7.6.2" = { + name = "better-sqlite3"; + packageName = "better-sqlite3"; + version = "7.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.6.2.tgz"; + sha512 = "S5zIU1Hink2AH4xPsN0W43T1/AJ5jrPh7Oy07ocuW/AKYYY02GWzz9NH0nbSMn/gw6fDZ5jZ1QsHt1BXAwJ6Lg=="; + }; + }; "big-integer-1.6.51" = { name = "big-integer"; packageName = "big-integer"; @@ -1255,6 +1471,15 @@ let sha512 = "rA2CrUl1+6yKrn+XgLs8Hdy18OER1UW146nM+ixzhQXDY+Bd3ySkyIJGwF2a4I45JwbvF1mDL/nWkqBwpOcdBA=="; }; }; + "bindings-1.5.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; + }; + }; "bintrees-1.0.2" = { name = "bintrees"; packageName = "bintrees"; @@ -1273,6 +1498,24 @@ let sha512 = "ikAdCnrloKmFOugAfxWws89/fPc+nw0OOG1IzIE72uSOg/A3cYptKCjSUhDTuj7fhsJtzkzlv7l3b8PzRHLN0Q=="; }; }; + "bl-2.2.1" = { + name = "bl"; + packageName = "bl"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz"; + sha512 = "6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g=="; + }; + }; + "bl-3.0.1" = { + name = "bl"; + packageName = "bl"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-3.0.1.tgz"; + sha512 = "jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ=="; + }; + }; "bl-4.1.0" = { name = "bl"; packageName = "bl"; @@ -1318,13 +1561,13 @@ let sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; }; }; - "body-parser-1.20.0" = { + "body-parser-1.20.1" = { name = "body-parser"; packageName = "body-parser"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz"; - sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"; + sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; }; }; "body-parser-xml-2.0.3" = { @@ -1381,6 +1624,15 @@ let sha512 = "YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg=="; }; }; + "bson-1.1.6" = { + name = "bson"; + packageName = "bson"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz"; + sha512 = "EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg=="; + }; + }; "bson-4.7.0" = { name = "bson"; packageName = "bson"; @@ -1453,6 +1705,15 @@ let sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; }; }; + "bufferutil-4.0.6" = { + name = "bufferutil"; + packageName = "bufferutil"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.6.tgz"; + sha512 = "jduaYOYtnio4aIAyc6UbvPCVcgq7nYpVnucyxr6eCYg/Woad9Hf/oxxBRDnGGjPfjUm6j5O/uBWhIu4iLebFaw=="; + }; + }; "bull-3.29.3" = { name = "bull"; packageName = "bull"; @@ -1498,6 +1759,15 @@ let sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; + "cacache-15.3.0" = { + name = "cacache"; + packageName = "cacache"; + version = "15.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz"; + sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; + }; + }; "call-bind-1.0.2" = { name = "call-bind"; packageName = "call-bind"; @@ -1642,6 +1912,24 @@ let sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; }; }; + "chokidar-3.5.3" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; + sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; + }; + }; + "chownr-1.1.4" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + }; + }; "chownr-2.0.0" = { name = "chownr"; packageName = "chownr"; @@ -1669,6 +1957,15 @@ let sha512 = "yBUcQy07FPlGzUjoLuUfIOXzgynnQPPruyK1Ge2B74k9ROwnle1E+NxLWnUv5OLU8hA/qL5leAE9XnXq3byaBw=="; }; }; + "clean-stack-2.2.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; + }; + }; "clean-stack-3.0.1" = { name = "clean-stack"; packageName = "clean-stack"; @@ -1741,13 +2038,22 @@ let sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; }; - "cluster-key-slot-1.1.0" = { + "clone-2.1.2" = { + name = "clone"; + packageName = "clone"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; + sha512 = "3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="; + }; + }; + "cluster-key-slot-1.1.1" = { name = "cluster-key-slot"; packageName = "cluster-key-slot"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz"; - sha512 = "2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="; + url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.1.tgz"; + sha512 = "rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw=="; }; }; "codepage-1.15.0" = { @@ -1867,13 +2173,13 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "commander-9.4.0" = { + "commander-9.4.1" = { name = "commander"; packageName = "commander"; - version = "9.4.0"; + version = "9.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz"; - sha512 = "sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw=="; + url = "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz"; + sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; }; }; "commist-1.1.0" = { @@ -1885,6 +2191,15 @@ let sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; }; }; + "component-props-1.1.1" = { + name = "component-props"; + packageName = "component-props"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-props/-/component-props-1.1.1.tgz"; + sha512 = "69pIRJs9fCCHRqCz3390YF2LV1Lu6iEMZ5zuVqqUn+G20V9BNXlMs0cWawWeW9g4Ynmg29JmkG6R7/lUJoGd1Q=="; + }; + }; "component-type-1.2.1" = { name = "component-type"; packageName = "component-type"; @@ -1894,6 +2209,15 @@ let sha512 = "Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg=="; }; }; + "component-xor-0.0.4" = { + name = "component-xor"; + packageName = "component-xor"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/component-xor/-/component-xor-0.0.4.tgz"; + sha512 = "ZIt6sla8gfo+AFVRZoZOertcnD5LJaY2T9CKE2j13NJxQt/mUafD69Bl7/Y4AnpI2LGjiXH7cOfJDx/n2G9edA=="; + }; + }; "compressible-2.0.18" = { name = "compressible"; packageName = "compressible"; @@ -2047,13 +2371,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.25.2" = { + "core-js-3.25.5" = { name = "core-js"; packageName = "core-js"; - version = "3.25.2"; + version = "3.25.5"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.25.2.tgz"; - sha512 = "YB4IAT1bjEfxTJ1XYy11hJAKskO+qmhuDBM8/guIfMz4JvdsAQAqvyb97zXX7JgSrfPLG5mRGFWJwJD39ruq2A=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.25.5.tgz"; + sha512 = "nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw=="; }; }; "core-util-is-1.0.2" = { @@ -2173,13 +2497,22 @@ let sha512 = "FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="; }; }; - "csstype-3.1.1" = { - name = "csstype"; - packageName = "csstype"; - version = "3.1.1"; + "curlconverter-3.21.0" = { + name = "curlconverter"; + packageName = "curlconverter"; + version = "3.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/curlconverter/-/curlconverter-3.21.0.tgz"; + sha512 = "DXCnp1A/Xa69FujksUfdvWQFAnIn/C+4Wuv8t+UVdZkF/lY5bzj98GGKOGme7V/ckSHDLxE29Xp76sJ5Cpsp5A=="; + }; + }; + "currency-codes-2.1.0" = { + name = "currency-codes"; + packageName = "currency-codes"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz"; - sha512 = "DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="; + url = "https://registry.npmjs.org/currency-codes/-/currency-codes-2.1.0.tgz"; + sha512 = "aASwFNP8VjZ0y0PWlSW7c9N/isYTLxK6OCbm7aVuQMk7dWO2zgup9KGiFQgeL9OGL5P/ulvCHcjQizmuEeZXtw=="; }; }; "dashdash-1.14.1" = { @@ -2191,6 +2524,15 @@ let sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; + "data-api-client-1.3.0" = { + name = "data-api-client"; + packageName = "data-api-client"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-api-client/-/data-api-client-1.3.0.tgz"; + sha512 = "+Q+lChhl5PBogsB7nO/VZFF3X0WJe8y93dyft50HIg2Bg+c765wM/sXkfBz5pjmGoRESkB/GLesQJLTMBbK4dQ=="; + }; + }; "data-uri-to-buffer-3.0.1" = { name = "data-uri-to-buffer"; packageName = "data-uri-to-buffer"; @@ -2200,6 +2542,33 @@ let sha512 = "WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="; }; }; + "date-utils-1.2.21" = { + name = "date-utils"; + packageName = "date-utils"; + version = "1.2.21"; + src = fetchurl { + url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"; + sha512 = "wJMBjqlwXR0Iv0wUo/lFbhSQ7MmG1hl36iuxuE91kW+5b5sWbase73manEqNH9sOLFAMG83B4ffNKq9/Iq0FVA=="; + }; + }; + "dateformat-3.0.3" = { + name = "dateformat"; + packageName = "dateformat"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz"; + sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; + }; + }; + "de-indent-1.0.2" = { + name = "de-indent"; + packageName = "de-indent"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"; + sha512 = "e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg=="; + }; + }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -2209,6 +2578,15 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + }; + }; "debug-3.2.7" = { name = "debug"; packageName = "debug"; @@ -2245,6 +2623,51 @@ let sha512 = "syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw=="; }; }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha512 = "hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="; + }; + }; + "decompress-response-6.0.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz"; + sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; + }; + }; + "deep-equal-1.1.1" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"; + sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; + }; + }; + "deep-equal-2.0.5" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz"; + sha512 = "nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw=="; + }; + }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; "deep-is-0.1.4" = { name = "deep-is"; packageName = "deep-is"; @@ -2344,6 +2767,15 @@ let sha512 = "HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw=="; }; }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; + }; + }; "depd-2.0.0" = { name = "depd"; packageName = "depd"; @@ -2416,6 +2848,15 @@ let sha512 = "c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="; }; }; + "dom-iterator-1.0.0" = { + name = "dom-iterator"; + packageName = "dom-iterator"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-iterator/-/dom-iterator-1.0.0.tgz"; + sha512 = "7dsMOQI07EMU98gQM8NSB3GsAiIeBYIPKpnxR3c9xOvdvBjChAcOM0iJ222I3p5xyiZO9e5oggkNaCusuTdYig=="; + }; + }; "dom-serializer-1.4.1" = { name = "dom-serializer"; packageName = "dom-serializer"; @@ -2569,6 +3010,15 @@ let sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; + "encoding-0.1.13" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; + }; + }; "encoding-japanese-2.0.0" = { name = "encoding-japanese"; packageName = "encoding-japanese"; @@ -2596,6 +3046,15 @@ let sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; + "env-paths-2.2.1" = { + name = "env-paths"; + packageName = "env-paths"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz"; + sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; + }; + }; "env-variable-0.0.6" = { name = "env-variable"; packageName = "env-variable"; @@ -2614,13 +3073,13 @@ let sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; }; }; - "es-abstract-1.20.2" = { + "es-abstract-1.20.4" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.20.2"; + version = "1.20.4"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz"; - sha512 = "XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz"; + sha512 = "0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA=="; }; }; "es-aggregate-error-1.0.8" = { @@ -2641,6 +3100,15 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; + "es-get-iterator-1.1.2" = { + name = "es-get-iterator"; + packageName = "es-get-iterator"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz"; + sha512 = "+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ=="; + }; + }; "es-to-primitive-1.2.1" = { name = "es-to-primitive"; packageName = "es-to-primitive"; @@ -2713,6 +3181,15 @@ let sha512 = "NB/L/1Y30qyJcG5xZxCJKW/+bqyj+llbcCwo9DEz8bESIP0SLTOQ8T1DWCCFc+wJ61AMEstj4511PSScqMMfCw=="; }; }; + "esprima-1.2.2" = { + name = "esprima"; + packageName = "esprima"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz"; + sha512 = "+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A=="; + }; + }; "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; @@ -2749,6 +3226,24 @@ let sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; }; }; + "event-target-shim-5.0.1" = { + name = "event-target-shim"; + packageName = "event-target-shim"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"; + sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; + }; + }; + "eventemitter3-4.0.7" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; + }; + }; "events-1.1.1" = { name = "events"; packageName = "events"; @@ -2785,6 +3280,15 @@ let sha512 = "h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="; }; }; + "expand-template-2.0.3" = { + name = "expand-template"; + packageName = "expand-template"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz"; + sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; + }; + }; "expand-tilde-2.0.2" = { name = "expand-tilde"; packageName = "expand-tilde"; @@ -2794,13 +3298,13 @@ let sha512 = "A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw=="; }; }; - "express-4.18.1" = { + "express-4.18.2" = { name = "express"; packageName = "express"; - version = "4.18.1"; + version = "4.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.18.1.tgz"; - sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; + url = "https://registry.npmjs.org/express/-/express-4.18.2.tgz"; + sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; }; }; "express-openapi-validator-4.13.8" = { @@ -2857,6 +3361,15 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; + "fast-diff-1.2.0" = { + name = "fast-diff"; + packageName = "fast-diff"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"; + sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; + }; + }; "fast-glob-3.2.12" = { name = "fast-glob"; packageName = "fast-glob"; @@ -2902,13 +3415,13 @@ let sha512 = "OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="; }; }; - "fflate-0.7.3" = { + "fflate-0.7.4" = { name = "fflate"; packageName = "fflate"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/fflate/-/fflate-0.7.3.tgz"; - sha512 = "0Zz1jOzJWERhyhsimS54VTqOteCNwRtIlh8isdL0AXLo0g7xNTfTL7oWrkmCnPhZGocKIkWHBistBrrpoNH3aw=="; + url = "https://registry.npmjs.org/fflate/-/fflate-0.7.4.tgz"; + sha512 = "5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw=="; }; }; "figures-3.2.0" = { @@ -2920,6 +3433,15 @@ let sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; }; }; + "file-saver-2.0.5" = { + name = "file-saver"; + packageName = "file-saver"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz"; + sha512 = "P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="; + }; + }; "file-type-16.5.4" = { name = "file-type"; packageName = "file-type"; @@ -2929,6 +3451,15 @@ let sha512 = "/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw=="; }; }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + }; + }; "file-uri-to-path-2.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -2956,6 +3487,15 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; + "filter-obj-1.1.0" = { + name = "filter-obj"; + packageName = "filter-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz"; + sha512 = "8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ=="; + }; + }; "finalhandler-1.2.0" = { name = "finalhandler"; packageName = "finalhandler"; @@ -2965,6 +3505,15 @@ let sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; }; }; + "first-match-0.0.1" = { + name = "first-match"; + packageName = "first-match"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/first-match/-/first-match-0.0.1.tgz"; + sha512 = "VvKbnaxrC0polTFDC+teKPTdl2mn6B/KUW+WB3C9RzKDeNwbzfLdnUz3FxC+tnjvus6bI0jWrWicQyVIPdS37A=="; + }; + }; "flatted-3.2.7" = { name = "flatted"; packageName = "flatted"; @@ -3019,6 +3568,15 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; + "form-data-2.5.1" = { + name = "form-data"; + packageName = "form-data"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz"; + sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA=="; + }; + }; "form-data-3.0.1" = { name = "form-data"; packageName = "form-data"; @@ -3082,6 +3640,15 @@ let sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; }; }; + "fs-constants-1.0.0" = { + name = "fs-constants"; + packageName = "fs-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; + }; + }; "fs-extra-8.1.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -3163,6 +3730,15 @@ let sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; }; }; + "gauge-4.0.4" = { + name = "gauge"; + packageName = "gauge"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz"; + sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; + }; + }; "generate-function-2.3.1" = { name = "generate-function"; packageName = "generate-function"; @@ -3262,6 +3838,15 @@ let sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; }; }; + "github-from-package-0.0.0" = { + name = "github-from-package"; + packageName = "github-from-package"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"; + sha512 = "SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="; + }; + }; "glob-7.2.3" = { name = "glob"; packageName = "glob"; @@ -3316,13 +3901,13 @@ let sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; - "gm-1.24.0" = { + "gm-1.25.0" = { name = "gm"; packageName = "gm"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/gm/-/gm-1.24.0.tgz"; - sha512 = "HsB94GIi6D4KklPrcRtq85CUuQhgi292N7vOx00pBH95sKuuy9LfenL9UtqXV4XFU8AmP5EaIhYcCxYp9zjiGQ=="; + url = "https://registry.npmjs.org/gm/-/gm-1.25.0.tgz"; + sha512 = "4kKdWXTtgQ4biIo7hZA396HT062nDVVHPjQcurNZ3o/voYN+o5FUC5kOwuORbpExp3XbTJ3SU7iRipiIhQtovw=="; }; }; "google-timezones-json-1.0.2" = { @@ -3433,6 +4018,15 @@ let sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; }; }; + "hdb-pool-0.1.6" = { + name = "hdb-pool"; + packageName = "hdb-pool"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/hdb-pool/-/hdb-pool-0.1.6.tgz"; + sha512 = "8VZOLn1EHamm1NmTFQj2iqjVcfonYIsD7F5DU2bz2N+gF+knp6/MbAVeRXkJtya717IBkPeA5iv0/1iPuYo4ZA=="; + }; + }; "he-1.2.0" = { name = "he"; packageName = "he"; @@ -3505,6 +4099,15 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; + "http-cache-semantics-4.1.0" = { + name = "http-cache-semantics"; + packageName = "http-cache-semantics"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + }; + }; "http-errors-2.0.0" = { name = "http-errors"; packageName = "http-errors"; @@ -3577,6 +4180,15 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; + "iconv-lite-0.5.2" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz"; + sha512 = "kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="; + }; + }; "iconv-lite-0.6.3" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -3640,6 +4252,15 @@ let sha512 = "SW3LtfEJFjlJKS/h2CmpX2IKpya2RXobR3ENJJW4iMQ3QYPxWxf5oeaz1K3P4eGUwfGEndkqt7uVDKnEyG9zeQ=="; }; }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; + }; + }; "indent-string-4.0.0" = { name = "indent-string"; packageName = "indent-string"; @@ -3649,6 +4270,15 @@ let sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; }; }; + "infer-owner-1.0.4" = { + name = "infer-owner"; + packageName = "infer-owner"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -3667,6 +4297,15 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; + "ini-1.3.8" = { + name = "ini"; + packageName = "ini"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; + }; + }; "inquirer-7.3.3" = { name = "inquirer"; packageName = "inquirer"; @@ -3802,13 +4441,13 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-callable-1.2.6" = { + "is-callable-1.2.7" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz"; - sha512 = "krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"; + sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; }; }; "is-core-module-2.10.0" = { @@ -3892,6 +4531,24 @@ let sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; }; + "is-lambda-1.0.1" = { + name = "is-lambda"; + packageName = "is-lambda"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz"; + sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; + }; + }; + "is-map-2.0.2" = { + name = "is-map"; + packageName = "is-map"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz"; + sha512 = "cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="; + }; + }; "is-nan-1.3.2" = { name = "is-nan"; packageName = "is-nan"; @@ -3991,6 +4648,15 @@ let sha512 = "XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg=="; }; }; + "is-set-2.0.2" = { + name = "is-set"; + packageName = "is-set"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz"; + sha512 = "+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="; + }; + }; "is-shared-array-buffer-1.0.2" = { name = "is-shared-array-buffer"; packageName = "is-shared-array-buffer"; @@ -4054,6 +4720,15 @@ let sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; }; }; + "is-weakmap-2.0.1" = { + name = "is-weakmap"; + packageName = "is-weakmap"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz"; + sha512 = "NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="; + }; + }; "is-weakref-1.0.2" = { name = "is-weakref"; packageName = "is-weakref"; @@ -4063,6 +4738,15 @@ let sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; }; }; + "is-weakset-2.0.2" = { + name = "is-weakset"; + packageName = "is-weakset"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz"; + sha512 = "t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg=="; + }; + }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -4099,13 +4783,22 @@ let sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; - "isbot-3.5.3" = { + "isarray-2.0.5" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"; + sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; + }; + }; + "isbot-3.6.1" = { name = "isbot"; packageName = "isbot"; - version = "3.5.3"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.5.3.tgz"; - sha512 = "mMLxdBl0hB6UEDibl/nXPSmF+kjX9cOKEJw1YeiKBGr6AdZq/LQUsk7UlDfr/D3gU+PdR6hf8o72BLOxzgw6EA=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.6.1.tgz"; + sha512 = "e1RmjWns87x60QyiHberWWMJGutL3+Ad0nZ8cz735iDEDDS6ApPfKSFo4EMj0PmMZ0m0ntpWIM0ADdqDFvUJPQ=="; }; }; "isexe-2.0.0" = { @@ -4162,6 +4855,15 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; + "jquery-3.6.1" = { + name = "jquery"; + packageName = "jquery"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz"; + sha512 = "opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw=="; + }; + }; "js-md4-0.3.2" = { name = "js-md4"; packageName = "js-md4"; @@ -4171,6 +4873,15 @@ let sha512 = "/GDnfQYsltsjRswQhN9fhv3EMw2sCpUdrdxyWDOUK7eyD++r3gRhzgiQgc/x4MAv2i1iuQ4lxO5mvqM3vj4bwA=="; }; }; + "js-nacl-1.4.0" = { + name = "js-nacl"; + packageName = "js-nacl"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-nacl/-/js-nacl-1.4.0.tgz"; + sha512 = "HgYLcutGbMYBJrwgVICiHliuw1OJLy2U3tIuK6a1rZ06KC84TPl81WG1hcBRrBCiIIuBe3PSo9G4IZOMGdSg3Q=="; + }; + }; "js-yaml-3.14.1" = { name = "js-yaml"; packageName = "js-yaml"; @@ -4189,6 +4900,15 @@ let sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; }; + "jsbi-3.2.5" = { + name = "jsbi"; + packageName = "jsbi"; + version = "3.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbi/-/jsbi-3.2.5.tgz"; + sha512 = "aBE4n43IPvjaddScbvWRA2YlTzKEynHzu7MqOyTipdHucf/VxS63ViCjxYRg86M8Rxwbt/GfzHl1kKERkt45fQ=="; + }; + }; "jsbi-4.3.0" = { name = "jsbi"; packageName = "jsbi"; @@ -4207,6 +4927,15 @@ let sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; }; }; + "jsesc-3.0.2" = { + name = "jsesc"; + packageName = "jsesc"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz"; + sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; + }; + }; "json-diff-0.5.5" = { name = "json-diff"; packageName = "json-diff"; @@ -4279,6 +5008,15 @@ let sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; }; }; + "jsonpath-1.1.1" = { + name = "jsonpath"; + packageName = "jsonpath"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz"; + sha512 = "l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w=="; + }; + }; "jsonschema-1.4.1" = { name = "jsonschema"; packageName = "jsonschema"; @@ -4297,6 +5035,15 @@ let sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; }; }; + "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"; @@ -4423,6 +5170,15 @@ let sha512 = "b74iyWmwb4GprAUPjPkJ11GTC7KX4Pd3onpJfKxYyY8y9Rbb4ERY47LvCMEDM09WD3thiLDMXtkfDK/AX+zT7Q=="; }; }; + "libpq-1.8.12" = { + name = "libpq"; + packageName = "libpq"; + version = "1.8.12"; + src = fetchurl { + url = "https://registry.npmjs.org/libpq/-/libpq-1.8.12.tgz"; + sha512 = "4lUY9BD9suz76mVS0kH4rRgRy620g/c9YZH5GYC3smfIpjtj6KiPuQ4IwQSHSZMMMhMM3tBFrYUrw8mHOOZVeg=="; + }; + }; "libqp-1.1.0" = { name = "libqp"; packageName = "libqp"; @@ -4477,6 +5233,15 @@ let sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; }; }; + "lodash.camelcase-4.3.0" = { + name = "lodash.camelcase"; + packageName = "lodash.camelcase"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; + sha512 = "TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="; + }; + }; "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; @@ -4486,6 +5251,15 @@ let sha512 = "H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="; }; }; + "lodash.debounce-4.0.8" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; + }; + }; "lodash.defaults-4.2.0" = { name = "lodash.defaults"; packageName = "lodash.defaults"; @@ -4621,6 +5395,24 @@ let sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; }; }; + "lodash.orderby-4.6.0" = { + name = "lodash.orderby"; + packageName = "lodash.orderby"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.orderby/-/lodash.orderby-4.6.0.tgz"; + sha512 = "T0rZxKmghOOf5YPnn8EY5iLYeWCpZq8G41FfqoVHH5QDTAFaghJRmAdLiadEDq+ztgM2q5PjA+Z1fOwGrLgmtg=="; + }; + }; + "lodash.pick-4.4.0" = { + name = "lodash.pick"; + packageName = "lodash.pick"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; + sha512 = "hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q=="; + }; + }; "lodash.set-4.3.2" = { name = "lodash.set"; packageName = "lodash.set"; @@ -4819,6 +5611,15 @@ let sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg=="; }; }; + "make-fetch-happen-9.1.0" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz"; + sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; + }; + }; "mappersmith-2.40.0" = { name = "mappersmith"; packageName = "mappersmith"; @@ -4954,6 +5755,15 @@ let sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; + "mimic-response-3.1.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz"; + sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; + }; + }; "minimalistic-assert-1.0.1" = { name = "minimalistic-assert"; packageName = "minimalistic-assert"; @@ -4999,6 +5809,51 @@ let sha512 = "rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA=="; }; }; + "minipass-collect-1.0.2" = { + name = "minipass-collect"; + packageName = "minipass-collect"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + }; + }; + "minipass-fetch-1.4.1" = { + name = "minipass-fetch"; + packageName = "minipass-fetch"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz"; + sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; + }; + }; + "minipass-flush-1.0.5" = { + name = "minipass-flush"; + packageName = "minipass-flush"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; + }; + }; + "minipass-pipeline-1.2.4" = { + name = "minipass-pipeline"; + packageName = "minipass-pipeline"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; + }; + }; + "minipass-sized-1.0.3" = { + name = "minipass-sized"; + packageName = "minipass-sized"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz"; + sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; + }; + }; "minizlib-2.1.2" = { name = "minizlib"; packageName = "minizlib"; @@ -5026,6 +5881,15 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; + "mkdirp-classic-0.5.3" = { + name = "mkdirp-classic"; + packageName = "mkdirp-classic"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; + }; + }; "mock-require-3.0.3" = { name = "mock-require"; packageName = "mock-require"; @@ -5062,31 +5926,40 @@ let sha512 = "B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg=="; }; }; - "mongodb-4.9.1" = { + "mongodb-3.7.3" = { + name = "mongodb"; + packageName = "mongodb"; + version = "3.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb/-/mongodb-3.7.3.tgz"; + sha512 = "Psm+g3/wHXhjBEktkxXsFMZvd3nemI0r3IPsE0bU+4//PnvNWKkzhZcEsbPcYiWqe8XqXJJEg4Tgtr7Raw67Yw=="; + }; + }; + "mongodb-4.10.0" = { name = "mongodb"; packageName = "mongodb"; - version = "4.9.1"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.9.1.tgz"; - sha512 = "ZhgI/qBf84fD7sI4waZBoLBNJYPQN5IOC++SBCiPiyhzpNKOxN/fi0tBHvH2dEC42HXtNEbFB0zmNz4+oVtorQ=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.10.0.tgz"; + sha512 = "My2QxLTw0Cc1O9gih0mz4mqo145Jq4rLAQx0Glk/Ha9iYBzYpt4I2QFNRIh35uNFNfe8KFQcdwY1/HKxXBkinw=="; }; }; - "mongodb-connection-string-url-2.5.3" = { + "mongodb-connection-string-url-2.5.4" = { name = "mongodb-connection-string-url"; packageName = "mongodb-connection-string-url"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.3.tgz"; - sha512 = "f+/WsED+xF4B74l3k9V/XkTVj5/fxFH2o5ToKXd8Iyi5UhM+sO9u0Ape17Mvl/GkZaFtM0HQnzAG5OTmhKw+tQ=="; + url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.4.tgz"; + sha512 = "SeAxuWs0ez3iI3vvmLk/j2y+zHwigTDKQhtdxTgt5ZCOQQS5+HW4g45/Xw5vzzbn7oQXCNQ24Z40AkJsizEy7w=="; }; }; - "moo-0.5.1" = { + "moo-0.5.2" = { name = "moo"; packageName = "moo"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz"; - sha512 = "I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w=="; + url = "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz"; + sha512 = "iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q=="; }; }; "mqtt-4.2.6" = { @@ -5134,6 +6007,15 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; + "mssql-6.4.1" = { + name = "mssql"; + packageName = "mssql"; + version = "6.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mssql/-/mssql-6.4.1.tgz"; + sha512 = "G1I7mM0gfxcH5TGSNoVmxq13Mve5YnQgRAlonqaMlHEjHjMn1g04bsrIQbVHFRdI6++dw/FGWlh8GoItJMoUDw=="; + }; + }; "mssql-8.1.4" = { name = "mssql"; packageName = "mssql"; @@ -5179,49 +6061,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.134.0" = { + "n8n-core-0.137.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.134.0"; + version = "0.137.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.134.0.tgz"; - sha512 = "9NejfRS1FvD7vHn7Oz1465mBNZNAmZ01epxF1NFTjvqx4kNWEYWmKssYE30RINegFAt6He+KJCGzj0AMdtm2iw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.137.0.tgz"; + sha512 = "qNFzL20TDG7kdtW7rt46DEf6eAWi9MrYmCjmrliJqDOGp2CHtpwlQM8dsIDXuzHoLRX4vuYXDA4kEKA/8kPvlw=="; }; }; - "n8n-design-system-0.34.0" = { + "n8n-design-system-0.37.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.34.0"; + version = "0.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.34.0.tgz"; - sha512 = "4baEVsmgp+9bvwK0oecuzzq9d99ymfFD7rhL4wWlSyF1sC/4Ug7BJ1aoxS3LMOAwZxAZu3eeumXArHLYT7temw=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.37.0.tgz"; + sha512 = "P17+YgT5NjjuaBfqLD+CyTEaLM89q3UyuSDJgmyQdTmsg0tKwaWmVXL455a6L6syLILjwMDg77lTFKKMedBhtg=="; }; }; - "n8n-editor-ui-0.160.0" = { + "n8n-editor-ui-0.163.1" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.160.0"; + version = "0.163.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.160.0.tgz"; - sha512 = "ys0InljStAlGA9AHH/RutOvkmkDgnC4onkRlSDFZTy9YCSNr5k0sCmhjfQiPe+zrnJUH200kQupcsZQN06AiQA=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.163.1.tgz"; + sha512 = "bKn6DkK4GuFdjW9rcaBewYZE2wF5g5zfb5zamp+I4TlJXMAsR1bSHpiq8Z8BRyGg0bR76Ny35MQvmXCbvKTejQ=="; }; }; - "n8n-nodes-base-0.192.0" = { + "n8n-nodes-base-0.195.1" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.192.0"; + version = "0.195.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.192.0.tgz"; - sha512 = "k+xYWdjyM1wCXYfE8ak3lHbqiJrn4NPI2XiEM9oTdYIB9qDItlOSLLnGOVsypksJ71FJfSQVxkZfwpxVzTGbyg=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.195.1.tgz"; + sha512 = "EfTySsb3sc1RzGe8Da/FClXVkCwUIErDfOjl6me8ikRGntjf7Sco6FXS6Ib0iLi6XGbXbyKlJ1c9+Phe9A1I4g=="; }; }; - "n8n-workflow-0.116.0" = { + "n8n-workflow-0.119.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.116.0"; + version = "0.119.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.116.0.tgz"; - sha512 = "i+5fcN6a4m4sn9awGuKHDrsAXLNyFNrgSPffxcP4Vj5R9nRg9zjocWNse05WzcRgzBCvujCOZo7O1ispX0MLCg=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.119.0.tgz"; + sha512 = "BcSIBSbX1NZ9i8eFFk4Wp0k7esmzH6m8j0RDZK5KwhD4hla4mpx6z6i7kKmAOCuLWjKuY0OMQPEYFWrDEjt0fA=="; }; }; "named-placeholders-1.1.2" = { @@ -5233,6 +6115,15 @@ let sha512 = "wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA=="; }; }; + "nan-2.16.0" = { + name = "nan"; + packageName = "nan"; + version = "2.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz"; + sha512 = "UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA=="; + }; + }; "nanoclone-0.2.1" = { name = "nanoclone"; packageName = "nanoclone"; @@ -5251,6 +6142,15 @@ let sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; }; }; + "napi-build-utils-1.0.2" = { + name = "napi-build-utils"; + packageName = "napi-build-utils"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; + sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; + }; + }; "native-duplexpair-1.0.0" = { name = "native-duplexpair"; packageName = "native-duplexpair"; @@ -5323,6 +6223,15 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; + "node-abi-3.26.0" = { + name = "node-abi"; + packageName = "node-abi"; + version = "3.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz"; + sha512 = "jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg=="; + }; + }; "node-abort-controller-3.0.1" = { name = "node-abort-controller"; packageName = "node-abort-controller"; @@ -5359,6 +6268,24 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; + "node-gyp-8.4.1" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "8.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz"; + sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; + }; + }; + "node-gyp-build-4.5.0" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; + sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; + }; + }; "node-html-markdown-1.2.0" = { name = "node-html-markdown"; packageName = "node-html-markdown"; @@ -5404,13 +6331,13 @@ let sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g=="; }; }; - "nodemailer-6.7.8" = { + "nodemailer-6.8.0" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.7.8"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.8.tgz"; - sha512 = "2zaTFGqZixVmTxpJRCFC+Vk5eGRd/fYtvIR+dl5u9QXLTQWGIf48x/JXvo58g9sa0bU6To04XUv554Paykum3g=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz"; + sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ=="; }; }; "nopt-5.0.0" = { @@ -5458,6 +6385,15 @@ let sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="; }; }; + "npmlog-6.0.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz"; + sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; + }; + }; "nth-check-2.1.1" = { name = "nth-check"; packageName = "nth-check"; @@ -5467,6 +6403,24 @@ let sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="; }; }; + "nub-0.0.0" = { + name = "nub"; + packageName = "nub"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nub/-/nub-0.0.0.tgz"; + sha512 = "dK0Ss9C34R/vV0FfYJXuqDAqHlaW9fvWVufq9MmGF2umCuDbd5GRfRD9fpi/LiM0l4ZXf8IBB+RYmZExqCrf0w=="; + }; + }; + "nunjucks-3.2.3" = { + name = "nunjucks"; + packageName = "nunjucks"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.3.tgz"; + sha512 = "psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ=="; + }; + }; "oauth-1.0a-2.2.6" = { name = "oauth-1.0a"; packageName = "oauth-1.0a"; @@ -5503,6 +6457,15 @@ let sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; }; }; + "object-is-1.1.5" = { + name = "object-is"; + packageName = "object-is"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; + sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; + }; + }; "object-keys-1.1.1" = { name = "object-keys"; packageName = "object-keys"; @@ -5629,6 +6592,15 @@ let sha512 = "d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA=="; }; }; + "optional-require-1.1.8" = { + name = "optional-require"; + packageName = "optional-require"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/optional-require/-/optional-require-1.1.8.tgz"; + sha512 = "jq83qaUb0wNg9Krv1c5OQ+58EK+vHde6aBPzLvPPqJm89UQWsvSuFy9X/OSNJnFeSOKo7btE0n8Nl2+nE+z5nA=="; + }; + }; "optionator-0.8.3" = { name = "optionator"; packageName = "optionator"; @@ -5638,6 +6610,15 @@ let sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; }; }; + "oracledb-5.5.0" = { + name = "oracledb"; + packageName = "oracledb"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oracledb/-/oracledb-5.5.0.tgz"; + sha512 = "i5cPvMENpZP8nnqptB6l0pjiOyySj1IISkbM4Hr3yZEDdANo2eezarwZb9NQ8fTh5pRjmgpZdSyIbnn9N3AENw=="; + }; + }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -5701,6 +6682,15 @@ let sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; }; }; + "p-map-4.0.0" = { + name = "p-map"; + packageName = "p-map"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; + }; + }; "p-timeout-3.2.0" = { name = "p-timeout"; packageName = "p-timeout"; @@ -5746,6 +6736,15 @@ let sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; }; }; + "parchment-2.0.0-dev.2" = { + name = "parchment"; + packageName = "parchment"; + version = "2.0.0-dev.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parchment/-/parchment-2.0.0-dev.2.tgz"; + sha512 = "4fgRny4pPISoML08Zp7poi52Dff3E2G1ORTi2D/acJ/RiROdDAMDB6VcQNfBcmehrX5Wixp6dxh6JjLyE5yUNQ=="; + }; + }; "parse-github-url-1.0.2" = { name = "parse-github-url"; packageName = "parse-github-url"; @@ -6007,6 +7006,15 @@ let sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; + "pg-cursor-2.7.4" = { + name = "pg-cursor"; + packageName = "pg-cursor"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.7.4.tgz"; + sha512 = "CNWwOzTTZ9QvphoOL+Wg/7pmVr9GnAWBjPbuK2FRclrB4A/WRO/ssCJ9BlkzIGmmofK2M/LyokNHgsLSn+fMHA=="; + }; + }; "pg-int8-1.0.1" = { name = "pg-int8"; packageName = "pg-int8"; @@ -6025,6 +7033,15 @@ let sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="; }; }; + "pg-native-3.0.1" = { + name = "pg-native"; + packageName = "pg-native"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-native/-/pg-native-3.0.1.tgz"; + sha512 = "LBVNWkNh0fVx/cienARRP2y22J5OpUsKBe0TpxzAx3arEUUdIs77aLSAHS3scS7SMaqc+OkG40CEu5fN0/cjIw=="; + }; + }; "pg-pool-3.5.2" = { name = "pg-pool"; packageName = "pg-pool"; @@ -6052,6 +7069,24 @@ let sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; }; }; + "pg-query-stream-4.2.4" = { + name = "pg-query-stream"; + packageName = "pg-query-stream"; + version = "4.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.2.4.tgz"; + sha512 = "Et3gTrWn4C2rj4LVioNq1QDd7aH/3mSJcBm79jZALv3wopvx9bWENtbOYZbHQ6KM+IkfFxs0JF1ZLjMDJ9/N6Q=="; + }; + }; + "pg-types-1.13.0" = { + name = "pg-types"; + packageName = "pg-types"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-types/-/pg-types-1.13.0.tgz"; + sha512 = "lfKli0Gkl/+za/+b6lzENajczwZHc7D5kiUCZfgm914jipD2kIOIvEkAhZ8GrW3/TUoP9w8FHjwpPObBye5KQQ=="; + }; + }; "pg-types-2.2.0" = { name = "pg-types"; packageName = "pg-types"; @@ -6151,13 +7186,22 @@ let sha512 = "epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA=="; }; }; - "postcss-8.4.16" = { + "postcss-8.4.17" = { name = "postcss"; packageName = "postcss"; - version = "8.4.16"; + version = "8.4.17"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.17.tgz"; + sha512 = "UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q=="; + }; + }; + "postgres-array-1.0.3" = { + name = "postgres-array"; + packageName = "postgres-array"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz"; - sha512 = "ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ=="; + url = "https://registry.npmjs.org/postgres-array/-/postgres-array-1.0.3.tgz"; + sha512 = "5wClXrAP0+78mcsNX3/ithQ5exKvCyK5lr5NEEEeGwwM6NJdQgzIJBVxLvRW+huFpX92F2QnZ5CcokH0VhK2qQ=="; }; }; "postgres-array-2.0.0" = { @@ -6205,6 +7249,15 @@ let sha512 = "2+VhqiY/rKIqKIXyvemBFHbeijHE25sP7eKltnqcFqAssUE6+sX6vusN9A4luzToOqHQkUZexiCKxvuGagh7JA=="; }; }; + "prebuild-install-7.1.1" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz"; + sha512 = "jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw=="; + }; + }; "prelude-ls-1.1.2" = { name = "prelude-ls"; packageName = "prelude-ls"; @@ -6223,6 +7276,15 @@ let sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; }; }; + "prismjs-1.29.0" = { + name = "prismjs"; + packageName = "prismjs"; + version = "1.29.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz"; + sha512 = "Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q=="; + }; + }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -6277,6 +7339,15 @@ let sha512 = "a84F/zM2Z0Ry/ht3nXfV6Ze7BISOQlWrct/YObrluJn8qy2LVeeQ+IJ7jD4bkmM0N2xfXYy5nurz4L1KEj+rJg=="; }; }; + "promise-inflight-1.0.1" = { + name = "promise-inflight"; + packageName = "promise-inflight"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; + }; + }; "promise-retry-2.0.1" = { name = "promise-retry"; packageName = "promise-retry"; @@ -6403,13 +7474,13 @@ let sha512 = "UsI/mNvk25jRpGKYI38Nfbv84z48oiIWwG67DLVvjRhy8B/0aIK+5Ju5WOHgw/o9rnEmbAS00v4rgKFQeC332Q=="; }; }; - "qs-6.10.3" = { + "qs-6.11.0" = { name = "qs"; packageName = "qs"; - version = "6.10.3"; + version = "6.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz"; - sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"; + sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; }; }; "qs-6.5.3" = { @@ -6421,6 +7492,15 @@ let sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; }; + "query-string-7.1.1" = { + name = "query-string"; + packageName = "query-string"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz"; + sha512 = "MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w=="; + }; + }; "querystring-0.2.0" = { name = "querystring"; packageName = "querystring"; @@ -6448,6 +7528,33 @@ let sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; + "quill-2.0.0-dev.4" = { + name = "quill"; + packageName = "quill"; + version = "2.0.0-dev.4"; + src = fetchurl { + url = "https://registry.npmjs.org/quill/-/quill-2.0.0-dev.4.tgz"; + sha512 = "9WmMVCEIhf3lDdhzl+i+GBDeDl0BFi65waC4Im8Y4HudEJ9kEEb1lciAz9A8pcDmLMjiMbvz84lNt/U5OBS8Vg=="; + }; + }; + "quill-autoformat-0.1.2" = { + name = "quill-autoformat"; + packageName = "quill-autoformat"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/quill-autoformat/-/quill-autoformat-0.1.2.tgz"; + sha512 = "kRe2rTSmcBDg/oCxhzbjmXXOpQUl0Gak6ZCQshxek/RLvdR8o715qC0WcBRUozqaYbR6PJ+0Z/piINqlYStxWw=="; + }; + }; + "quill-delta-4.2.1" = { + name = "quill-delta"; + packageName = "quill-delta"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quill-delta/-/quill-delta-4.2.1.tgz"; + sha512 = "Y2nksOj6Q+4hizre8n0dml76vLNGK4/y86EoI1d7rv6EL1bx7DPDYRmqQMPu1UqFQO/uQuVHQ3fOmm4ZSzWrfA=="; + }; + }; "quoted-printable-1.0.1" = { name = "quoted-printable"; packageName = "quoted-printable"; @@ -6511,6 +7618,24 @@ let sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; }; + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; + "readable-stream-1.0.31" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.0.31"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz"; + sha512 = "tco/Dwv1f/sgIgN6CWdj/restacPKNskK6yps1981ivH2ZmLYcs5o5rVzL3qaO/cSkhN8hYOMWs7+glzOLSgRg=="; + }; + }; "readable-stream-1.1.14" = { name = "readable-stream"; packageName = "readable-stream"; @@ -6700,6 +7825,15 @@ let sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; + "require-at-1.0.6" = { + name = "require-at"; + packageName = "require-at"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/require-at/-/require-at-1.0.6.tgz"; + sha512 = "7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g=="; + }; + }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -6862,6 +7996,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=="; + }; + }; "safe-stable-stringify-2.4.0" = { name = "safe-stable-stringify"; packageName = "safe-stable-stringify"; @@ -6961,13 +8104,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.3.7" = { + "semver-7.3.8" = { name = "semver"; packageName = "semver"; - version = "7.3.7"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; }; }; "send-0.18.0" = { @@ -7123,6 +8266,24 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; + "simple-concat-1.0.1" = { + name = "simple-concat"; + packageName = "simple-concat"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; + }; + }; + "simple-get-4.0.1" = { + name = "simple-get"; + packageName = "simple-get"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz"; + sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; + }; + }; "simple-git-3.14.1" = { name = "simple-git"; packageName = "simple-git"; @@ -7177,22 +8338,22 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.13" = { + "snowflake-sdk-1.6.14" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.13"; + version = "1.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.13.tgz"; - sha512 = "X/eiT4v/yw6+aLdEJK85te4lvkB45lkTzad2CtJdofzxWqtfi1CB2hafTJTfXoDKKJTxLTyYVo+zIYhvhcEarA=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.14.tgz"; + sha512 = "sKg17Yz1/aydKxlA4unlprH+uw9ZsvRezdUmamLjNlvsXQsw+pok4PoMeCKtWs2OSVFnX0VO3eSacCPglQrAQA=="; }; }; - "socks-2.7.0" = { + "socks-2.7.1" = { name = "socks"; packageName = "socks"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz"; - sha512 = "scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA=="; + url = "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"; + sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; }; }; "socks-proxy-agent-5.0.1" = { @@ -7204,6 +8365,15 @@ let sha512 = "vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ=="; }; }; + "socks-proxy-agent-6.2.1" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz"; + sha512 = "a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ=="; + }; + }; "source-map-0.6.1" = { name = "source-map"; packageName = "source-map"; @@ -7231,6 +8401,15 @@ let sha512 = "9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg=="; }; }; + "split-on-first-1.1.0" = { + name = "split-on-first"; + packageName = "split-on-first"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz"; + sha512 = "43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="; + }; + }; "split2-3.2.2" = { name = "split2"; packageName = "split2"; @@ -7267,13 +8446,22 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "sqlite3-5.1.1" = { + "sql.js-1.8.0" = { + name = "sql.js"; + packageName = "sql.js"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sql.js/-/sql.js-1.8.0.tgz"; + sha512 = "3HD8pSkZL+5YvYUI8nlvNILs61ALqq34xgmF+BHpqxe68yZIJ1H+sIVIODvni25+CcxHUxDyrTJUL0lE/m7afw=="; + }; + }; + "sqlite3-5.1.2" = { name = "sqlite3"; packageName = "sqlite3"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.1.tgz"; - sha512 = "mMinkrQr/LKJqFiFF+AF7imPSzRCCpTCreusZO3D/ssJHVjZOrbu2Caz+zPH5KTmGGXBxXMGSRDssL+44CLxvg=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.2.tgz"; + sha512 = "D0Reg6pRWAFXFUnZKsszCI67tthFD8fGPewRddDCX6w4cYwz3MbvuwRICbL+YQjBAh9zbw+lJ/V9oC8nG5j6eg=="; }; }; "sqlstring-2.3.3" = { @@ -7330,6 +8518,15 @@ let sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; }; }; + "ssri-8.0.1" = { + name = "ssri"; + packageName = "ssri"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz"; + sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; + }; + }; "stack-trace-0.0.10" = { name = "stack-trace"; packageName = "stack-trace"; @@ -7348,6 +8545,15 @@ let sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="; }; }; + "static-eval-2.0.2" = { + name = "static-eval"; + packageName = "static-eval"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz"; + sha512 = "N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg=="; + }; + }; "statuses-1.5.0" = { name = "statuses"; packageName = "statuses"; @@ -7402,6 +8608,15 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; + "strict-uri-encode-2.0.0" = { + name = "strict-uri-encode"; + packageName = "strict-uri-encode"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz"; + sha512 = "QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ=="; + }; + }; "string-similarity-4.0.4" = { name = "string-similarity"; packageName = "string-similarity"; @@ -7420,6 +8635,15 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; + "string.prototype.startswith-1.0.0" = { + name = "string.prototype.startswith"; + packageName = "string.prototype.startswith"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.startswith/-/string.prototype.startswith-1.0.0.tgz"; + sha512 = "VHhsDkuf8gsw4JNRK9cIZjYe6r7PsVUutVohaBhqYAoPaRADoQH+mMgUg7Cs/TgQeDGEvI+PzPEMOdvdsCMvpg=="; + }; + }; "string.prototype.trimend-1.0.5" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; @@ -7465,6 +8689,15 @@ let sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; + }; + }; "strtok3-6.3.0" = { name = "strtok3"; packageName = "strtok3"; @@ -7510,13 +8743,13 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-4.14.0" = { + "swagger-ui-dist-4.14.2" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.14.0"; + version = "4.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.14.0.tgz"; - sha512 = "TBzhheU15s+o54Cgk9qxuYcZMiqSm/SkvKnapoGHOF66kz0Y5aGjpzj5BT/vpBbn6rTPJ9tUYXQxuDWfsjiGMw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.14.2.tgz"; + sha512 = "kOIU7Ts3TrXDLb3/c9jRe4qGp8O3bRT19FFJA8wJfrRFkcK/4atPn3krhtBVJ57ZkNNofworXHxuYwmaisXBdg=="; }; }; "swagger-ui-express-4.5.0" = { @@ -7537,6 +8770,33 @@ let sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; }; }; + "tar-fs-2.1.1" = { + name = "tar-fs"; + packageName = "tar-fs"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; + }; + }; + "tar-stream-2.2.0" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; + }; + }; + "tarn-1.1.5" = { + name = "tarn"; + packageName = "tarn"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tarn/-/tarn-1.1.5.tgz"; + sha512 = "PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g=="; + }; + }; "tarn-3.0.2" = { name = "tarn"; packageName = "tarn"; @@ -7564,6 +8824,15 @@ let sha512 = "d3qlmZcvZyt7akyPHiOdR+knfzObWZH3mW+gouQTSb7YTSwtpHuYHcvsQabfbY7oOvgbs51xRb7CwOahWK/t9w=="; }; }; + "tedious-6.7.1" = { + name = "tedious"; + packageName = "tedious"; + version = "6.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tedious/-/tedious-6.7.1.tgz"; + sha512 = "61eg/mvUa5vIqZcRizcqw/82dY65kR2uTll1TaUFh0aJ45XOrgbc8axiVR48dva8BahIAlJByaHNfAJ/KmPV0g=="; + }; + }; "test-console-2.0.0" = { name = "test-console"; packageName = "test-console"; @@ -7906,6 +9175,15 @@ let sha512 = "c0rCO8VMJ3ER7JQ73xfk0zDnVv0WDjpsP6Q1m6CVKul7DB9iVdWLRjPzc8v2eaeBuomsbZ2+gTaYr8k1gm3bYA=="; }; }; + "typeorm-aurora-data-api-driver-2.4.4" = { + name = "typeorm-aurora-data-api-driver"; + packageName = "typeorm-aurora-data-api-driver"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typeorm-aurora-data-api-driver/-/typeorm-aurora-data-api-driver-2.4.4.tgz"; + sha512 = "EqrdoXr0FbUrAMmkNQQuPwlhUGM7SJnpwUlWTWNlK2mOhOUyM+33fhm1f1hz3nnJJV8fTxzS3kTDq6pkVASLAw=="; + }; + }; "uc.micro-1.0.6" = { name = "uc.micro"; packageName = "uc.micro"; @@ -7942,6 +9220,15 @@ let sha512 = "eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg=="; }; }; + "underscore-1.12.1" = { + name = "underscore"; + packageName = "underscore"; + version = "1.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz"; + sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="; + }; + }; "unescape-1.0.1" = { name = "unescape"; packageName = "unescape"; @@ -7951,6 +9238,24 @@ let sha512 = "O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ=="; }; }; + "unique-filename-1.1.1" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; + }; + }; + "unique-slug-2.0.2" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; + }; + }; "unique-stream-2.3.1" = { name = "unique-stream"; packageName = "unique-stream"; @@ -8041,13 +9346,22 @@ let sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; - "urllib-2.38.1" = { + "urllib-2.39.1" = { name = "urllib"; packageName = "urllib"; - version = "2.38.1"; + version = "2.39.1"; + src = fetchurl { + url = "https://registry.npmjs.org/urllib/-/urllib-2.39.1.tgz"; + sha512 = "c3sLtY8uhc/WoyJt/nNcEwO4fFC9sFYMQmU5NKoUz9OqUYrPSbYFPflocZCA5oCTavky9weK+YA2EHjsva9AwQ=="; + }; + }; + "utf-8-validate-5.0.9" = { + name = "utf-8-validate"; + packageName = "utf-8-validate"; + version = "5.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/urllib/-/urllib-2.38.1.tgz"; - sha512 = "1tvjdL74oT9aV4X+SIjE1BXyes5PbfhHKhK4IlhoKhKqk4nD5/lXE90v10WZ02kELWIPI4w7ADneEQ4i7dPjiQ=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.9.tgz"; + sha512 = "Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q=="; }; }; "utf7-1.0.2" = { @@ -8203,13 +9517,22 @@ let sha512 = "PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg=="; }; }; - "vue-2.7.10" = { + "vue-2.6.14" = { name = "vue"; packageName = "vue"; - version = "2.7.10"; + version = "2.6.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"; + sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; + }; + }; + "vue-agile-2.0.0" = { + name = "vue-agile"; + packageName = "vue-agile"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz"; - sha512 = "HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg=="; + url = "https://registry.npmjs.org/vue-agile/-/vue-agile-2.0.0.tgz"; + sha512 = "5xkSLJQNRdQ7qpEnXj5FgLg33XKRHaTZKGP5qkvteOc/uGJX89MYCjPSgdNqJ1GYFGfdGAp0jvhihW8OMuXS3g=="; }; }; "vue-color-2.8.1" = { @@ -8239,6 +9562,51 @@ let sha512 = "QVzn7u2WVH8F7eSKIM00lujC7x1mnuGPaTnDTmB01Hd709jDtB9kYtBqM+MWmp5AJRx3gnqAdZbee9MelqwFBg=="; }; }; + "vue-json-pretty-1.9.2" = { + name = "vue-json-pretty"; + packageName = "vue-json-pretty"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-json-pretty/-/vue-json-pretty-1.9.2.tgz"; + sha512 = "FHAYmZAazhVC6Wi+Zi9DVYha+oZb9uylJPGkl/yTYLxlqLMxmnaVC2R8ZwaYzt6TBGvkLe3Y2D2vgyJCDBJy1w=="; + }; + }; + "vue-prism-editor-0.3.0" = { + name = "vue-prism-editor"; + packageName = "vue-prism-editor"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-prism-editor/-/vue-prism-editor-0.3.0.tgz"; + sha512 = "yNSuwql/xHMJrWghn/OhZ5WPBKdhx7FkvFjgq2uDm99jHSJhuGwhcgPyuoGzpm6w8DRDzi85lgerKCu8DTDWWg=="; + }; + }; + "vue-router-3.6.5" = { + name = "vue-router"; + packageName = "vue-router"; + version = "3.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz"; + sha512 = "VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="; + }; + }; + "vue-template-compiler-2.6.14" = { + name = "vue-template-compiler"; + packageName = "vue-template-compiler"; + version = "2.6.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz"; + sha512 = "ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g=="; + }; + }; + "vue-typed-mixins-0.2.0" = { + name = "vue-typed-mixins"; + packageName = "vue-typed-mixins"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-typed-mixins/-/vue-typed-mixins-0.2.0.tgz"; + sha512 = "0OxuinandPWv3nm5k/reYkuKtX3jjPZ40Sy9roJz0ih8PUzmI7zSRiXFEJ62LsyRegw9Tqy+qMkajk7ipKP8Vg=="; + }; + }; "vue2-boring-avatars-0.3.4" = { name = "vue2-boring-avatars"; packageName = "vue2-boring-avatars"; @@ -8257,6 +9625,24 @@ let sha512 = "hbY/Q0x8qXGFxo6h4KU4YYesUcN+uUjliqqC0PoNSgpcbS2QRb3qXi+7XMTgLYs0a8i7o1H6Mu43UV4Vbgkhgw=="; }; }; + "vue2-touch-events-3.2.2" = { + name = "vue2-touch-events"; + packageName = "vue2-touch-events"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vue2-touch-events/-/vue2-touch-events-3.2.2.tgz"; + sha512 = "rGV8jxgOQEJYkJCp7uOBe3hjvmG1arThrq1wGtJHwJTgi65+P2a+0l4CYcQO/U1ZFqTq2/TT2+oTE6H7Y+6Eog=="; + }; + }; + "vuex-3.6.2" = { + name = "vuex"; + packageName = "vuex"; + version = "3.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz"; + sha512 = "ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="; + }; + }; "webidl-conversions-3.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -8302,6 +9688,15 @@ let sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; }; + "which-2.0.2" = { + name = "which"; + packageName = "which"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + }; "which-boxed-primitive-1.0.2" = { name = "which-boxed-primitive"; packageName = "which-boxed-primitive"; @@ -8311,6 +9706,15 @@ let sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; + "which-collection-1.0.1" = { + name = "which-collection"; + packageName = "which-collection"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz"; + sha512 = "W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A=="; + }; + }; "which-typed-array-1.1.8" = { name = "which-typed-array"; packageName = "which-typed-array"; @@ -8482,6 +9886,15 @@ let sha512 = "7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ=="; }; }; + "xpath.js-1.1.0" = { + name = "xpath.js"; + packageName = "xpath.js"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz"; + sha512 = "jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ=="; + }; + }; "xregexp-2.0.0" = { name = "xregexp"; packageName = "xregexp"; @@ -8614,10 +10027,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.194.0"; + version = "0.197.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.194.0.tgz"; - sha512 = "xbOMzq5AuP7EbvFJQ8VNE3mQYySH1yRS/Eb2ZyBe4ae33FQyZokLEwxGXFLzV2Caf+lX7xv/7d+6cU/m1jliSQ=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.197.1.tgz"; + sha512 = "uswTJAfyDqMSBT0HZrNFFVKQ/s/FiaQl97+Pdl/MdrC74scPNSTBUrS/L2X08LR0UADO6ByPpB7uOrj+w29pdg=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -8650,7 +10063,7 @@ in ]; }) sources."@azure/core-http-compat-1.3.0" - (sources."@azure/core-lro-2.3.1" // { + (sources."@azure/core-lro-2.4.0" // { dependencies = [ sources."tslib-2.4.0" ]; @@ -8672,7 +10085,7 @@ in sources."tslib-2.4.0" ]; }) - (sources."@azure/core-util-1.1.0" // { + (sources."@azure/core-util-1.1.1" // { dependencies = [ sources."tslib-2.4.0" ]; @@ -8685,7 +10098,7 @@ in sources."tslib-2.4.0" ]; }) - (sources."@azure/keyvault-keys-4.5.0" // { + (sources."@azure/keyvault-keys-4.6.0" // { dependencies = [ sources."tslib-2.4.0" ]; @@ -8695,27 +10108,47 @@ in sources."tslib-2.4.0" ]; }) - sources."@azure/msal-browser-2.28.3" - sources."@azure/msal-common-7.4.1" - sources."@azure/msal-node-1.14.0" + sources."@azure/ms-rest-azure-env-2.0.0" + (sources."@azure/ms-rest-js-2.6.2" // { + dependencies = [ + sources."form-data-2.5.1" + ]; + }) + sources."@azure/ms-rest-nodeauth-3.1.1" + sources."@azure/msal-browser-2.29.0" + sources."@azure/msal-common-7.5.0" + sources."@azure/msal-node-1.14.1" (sources."@azure/storage-blob-12.11.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" sources."tslib-2.4.0" ]; }) - sources."@babel/parser-7.19.1" - sources."@babel/runtime-7.19.0" + sources."@babel/runtime-7.19.4" sources."@colors/colors-1.5.0" + sources."@curlconverter/yargs-0.0.2" + sources."@curlconverter/yargs-parser-0.0.1" (sources."@dabh/diagnostics-2.0.3" // { dependencies = [ sources."enabled-2.0.0" sources."kuler-2.0.0" ]; }) - sources."@fontsource/open-sans-4.5.11" - sources."@fortawesome/fontawesome-common-types-6.2.0" - sources."@fortawesome/free-regular-svg-icons-6.2.0" + sources."@fontsource/open-sans-4.5.12" + sources."@fortawesome/fontawesome-common-types-0.3.0" + sources."@fortawesome/fontawesome-svg-core-1.3.0" + (sources."@fortawesome/free-regular-svg-icons-6.2.0" // { + dependencies = [ + sources."@fortawesome/fontawesome-common-types-6.2.0" + ]; + }) + (sources."@fortawesome/free-solid-svg-icons-5.15.4" // { + dependencies = [ + sources."@fortawesome/fontawesome-common-types-0.2.36" + ]; + }) + sources."@fortawesome/vue-fontawesome-2.0.8" + sources."@gar/promisify-1.1.3" (sources."@icetee/ftp-0.3.15" // { dependencies = [ sources."isarray-0.0.1" @@ -8723,7 +10156,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."@js-joda/core-5.3.1" + sources."@js-joda/core-5.4.1" sources."@jsdevtools/ono-7.1.3" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" @@ -8733,20 +10166,26 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.16" - (sources."@oclif/config-1.18.3" // { + sources."@npmcli/fs-1.1.1" + (sources."@npmcli/move-file-1.1.2" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) + sources."@oclif/command-1.8.18" + (sources."@oclif/config-1.18.5" // { dependencies = [ sources."tslib-2.4.0" ]; }) - (sources."@oclif/core-1.16.3" // { + (sources."@oclif/core-1.16.5" // { dependencies = [ sources."supports-color-8.1.1" sources."tslib-2.4.0" sources."wrap-ansi-7.0.0" ]; }) - (sources."@oclif/errors-1.3.5" // { + (sources."@oclif/errors-1.3.6" // { dependencies = [ sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" @@ -8754,14 +10193,9 @@ in sources."wrap-ansi-7.0.0" ]; }) - (sources."@oclif/help-1.0.1" // { - dependencies = [ - sources."@oclif/config-1.18.2" - sources."tslib-2.4.0" - ]; - }) + sources."@oclif/help-1.0.3" sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.7" // { + (sources."@oclif/parser-3.8.8" // { dependencies = [ sources."tslib-2.4.0" ]; @@ -8769,6 +10203,12 @@ in sources."@oclif/screen-3.0.2" sources."@opentelemetry/api-1.2.0" sources."@rudderstack/rudder-sdk-node-1.0.6" + (sources."@sap/hana-client-2.14.18" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) sources."@segment/loosely-validate-event-2.0.0" sources."@selderee/plugin-htmlparser2-0.6.0" sources."@servie/events-1.0.0" @@ -8784,11 +10224,12 @@ in sources."@types/express-jwt-0.0.42" sources."@types/express-serve-static-core-4.17.31" sources."@types/express-unless-0.5.3" + sources."@types/js-nacl-1.3.0" sources."@types/json-schema-7.0.11" - sources."@types/lodash-4.14.185" + sources."@types/lodash-4.14.186" sources."@types/mime-3.0.1" sources."@types/multer-1.4.7" - sources."@types/node-18.7.18" + sources."@types/node-18.8.3" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -8796,20 +10237,39 @@ in }) sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" + sources."@types/readable-stream-2.3.14" sources."@types/serve-static-1.15.0" sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" - sources."@vue/compiler-sfc-2.7.10" + sources."@xmldom/xmldom-0.7.5" + sources."a-sync-waterfall-1.0.1" sources."abbrev-1.1.1" + sources."abort-controller-3.0.0" sources."accepts-1.3.8" sources."access-control-1.0.1" sources."acorn-8.8.0" sources."acorn-walk-8.2.0" + (sources."adal-node-0.2.3" // { + dependencies = [ + sources."async-2.6.4" + sources."uuid-3.4.0" + ]; + }) sources."address-1.2.1" sources."adler-32-1.2.0" sources."agent-base-6.0.2" + (sources."agentkeepalive-4.2.1" // { + dependencies = [ + sources."depd-1.1.2" + ]; + }) + (sources."aggregate-error-3.1.0" // { + dependencies = [ + sources."clean-stack-2.2.0" + ]; + }) sources."ajv-6.12.6" (sources."amqplib-0.8.0" // { dependencies = [ @@ -8838,6 +10298,7 @@ in sources."array-series-0.1.5" sources."array-union-2.1.0" sources."array.prototype.reduce-1.0.4" + sources."asap-2.0.6" sources."asn1-0.2.6" sources."asn1.js-5.4.1" sources."asn1.js-rfc2560-5.0.1" @@ -8859,8 +10320,8 @@ in ]; }) sources."available-typed-arrays-1.0.5" - sources."avsc-5.7.5" - (sources."aws-sdk-2.1218.0" // { + sources."avsc-5.7.6" + (sources."aws-sdk-2.1231.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -8891,10 +10352,16 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" + sources."better-sqlite3-7.6.2" sources."big-integer-1.6.51" 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."bintrees-1.0.2" (sources."bitsyntax-0.1.0" // { dependencies = [ @@ -8910,9 +10377,10 @@ in }) sources."bluebird-3.7.2" sources."bn.js-4.12.0" - (sources."body-parser-1.20.0" // { + (sources."body-parser-1.20.1" // { dependencies = [ sources."debug-2.6.9" + sources."iconv-lite-0.4.24" sources."ms-2.0.0" ]; }) @@ -8927,10 +10395,17 @@ in sources."buffer-from-1.1.2" sources."buffer-more-ints-1.0.0" sources."buffer-writer-2.0.0" + sources."bufferutil-4.0.6" sources."bull-3.29.3" sources."busboy-1.6.0" sources."byte-length-1.0.2" sources."bytes-3.1.2" + (sources."cacache-15.3.0" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."p-map-4.0.0" + ]; + }) sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."callback-stream-1.1.0" @@ -8962,7 +10437,7 @@ in sources."charenc-0.0.2" sources."cheerio-1.0.0-rc.6" sources."cheerio-select-1.6.0" - sources."chokidar-3.5.2" + sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."clamp-1.0.1" sources."class-validator-0.13.2" @@ -8983,7 +10458,8 @@ in sources."wrap-ansi-7.0.0" ]; }) - sources."cluster-key-slot-1.1.0" + sources."clone-2.1.2" + sources."cluster-key-slot-1.1.1" sources."codepage-1.15.0" (sources."color-3.2.1" // { dependencies = [ @@ -9000,7 +10476,9 @@ in sources."combined-stream-1.0.8" sources."commander-5.1.0" sources."commist-1.1.0" + sources."component-props-1.1.1" sources."component-type-1.2.1" + sources."component-xor-0.0.4" sources."compressible-2.0.18" (sources."compression-1.7.4" // { dependencies = [ @@ -9026,7 +10504,7 @@ in sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" sources."copy-to-2.0.1" - sources."core-js-3.25.2" + sources."core-js-3.25.5" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."cron-1.7.2" @@ -9042,11 +10520,24 @@ in sources."css-select-4.3.0" sources."css-what-6.1.0" sources."cssfilter-0.0.10" - sources."csstype-3.1.1" + sources."curlconverter-3.21.0" + sources."currency-codes-2.1.0" sources."dashdash-1.14.1" + sources."data-api-client-1.3.0" sources."data-uri-to-buffer-3.0.1" + sources."date-utils-1.2.21" + sources."dateformat-3.0.3" + sources."de-indent-1.0.2" sources."debug-4.3.4" sources."debuglog-1.0.1" + sources."decode-uri-component-0.2.0" + sources."decompress-response-6.0.0" + (sources."deep-equal-2.0.5" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) + sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-1.5.2" sources."default-user-agent-1.0.0" @@ -9068,6 +10559,7 @@ in }) sources."dir-glob-3.0.1" sources."discontinuous-range-1.0.0" + sources."dom-iterator-1.0.0" sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" @@ -9088,14 +10580,21 @@ in sources."emoji-regex-8.0.0" sources."enabled-1.0.2" sources."encodeurl-1.0.2" + sources."encoding-0.1.13" sources."encoding-japanese-2.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" + sources."env-paths-2.2.1" sources."env-variable-0.0.6" sources."err-code-2.0.3" - sources."es-abstract-1.20.2" + sources."es-abstract-1.20.4" sources."es-aggregate-error-1.0.8" sources."es-array-method-boxes-properly-1.0.0" + (sources."es-get-iterator-1.1.2" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) sources."es-to-primitive-1.2.1" sources."es5-ext-0.8.2" sources."escalade-3.1.1" @@ -9107,11 +10606,14 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" + sources."event-target-shim-5.0.1" + sources."eventemitter3-4.0.7" sources."events-3.3.0" sources."eventsource-2.0.2" sources."exit-on-epipe-1.0.1" + sources."expand-template-2.0.3" sources."expand-tilde-2.0.2" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ sources."cookie-0.5.0" sources."debug-2.6.9" @@ -9126,20 +10628,26 @@ in }) sources."extend-3.0.2" sources."extend-shallow-2.0.1" - sources."external-editor-3.1.0" + (sources."external-editor-3.1.0" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" + sources."fast-diff-1.2.0" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" sources."fecha-4.2.3" - sources."fflate-0.7.3" + sources."fflate-0.7.4" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" ]; }) + sources."file-saver-2.0.5" sources."file-type-16.5.4" sources."file-uri-to-path-2.0.0" (sources."filelist-1.0.4" // { @@ -9148,12 +10656,14 @@ in ]; }) sources."fill-range-7.0.1" + sources."filter-obj-1.1.0" (sources."finalhandler-1.2.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) + sources."first-match-0.0.1" sources."flatted-3.2.7" sources."fn.name-1.1.0" sources."follow-redirects-1.15.2" @@ -9169,6 +10679,7 @@ in sources."forwarded-0.2.0" sources."frac-1.1.2" sources."fresh-0.5.2" + sources."fs-constants-1.0.0" sources."fs-extra-9.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -9199,6 +10710,7 @@ in ]; }) sources."getpass-0.1.7" + sources."github-from-package-0.0.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" (sources."glob-stream-6.1.0" // { @@ -9209,7 +10721,7 @@ in }) sources."globalthis-1.0.3" sources."globby-11.1.0" - (sources."gm-1.24.0" // { + (sources."gm-1.25.0" // { dependencies = [ sources."cross-spawn-4.0.2" sources."debug-3.2.7" @@ -9229,6 +10741,7 @@ in sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" + sources."hdb-pool-0.1.6" sources."he-1.2.0" (sources."header-case-2.0.4" // { dependencies = [ @@ -9245,13 +10758,14 @@ in ]; }) sources."htmlparser2-6.1.0" + sources."http-cache-semantics-4.1.0" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" sources."hyperlinker-1.0.0" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.3" sources."ics-2.40.0" sources."ieee754-1.2.1" sources."ignore-5.2.0" @@ -9262,10 +10776,17 @@ in sources."string_decoder-0.10.31" ]; }) - sources."imap-simple-4.3.0" + (sources."imap-simple-4.3.0" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) + sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."ini-1.3.8" sources."inquirer-7.3.3" sources."internal-slot-1.0.3" sources."interpret-1.4.0" @@ -9280,7 +10801,7 @@ in sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.6" + sources."is-callable-1.2.7" sources."is-core-module-2.10.0" sources."is-date-object-1.0.5" sources."is-docker-2.2.1" @@ -9289,6 +10810,8 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.10" sources."is-glob-4.0.3" + sources."is-lambda-1.0.1" + sources."is-map-2.0.2" sources."is-nan-1.3.2" sources."is-negated-glob-1.0.0" sources."is-negative-zero-2.0.2" @@ -9300,6 +10823,7 @@ in sources."is-regex-1.1.4" sources."is-relative-1.0.0" sources."is-retry-allowed-2.2.0" + sources."is-set-2.0.2" sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" sources."is-string-1.0.7" @@ -9307,21 +10831,26 @@ in sources."is-typed-array-1.1.9" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" + sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" + sources."is-weakset-2.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" - sources."isbot-3.5.3" + sources."isbot-3.6.1" sources."isexe-2.0.0" sources."iso-639-1-2.1.15" sources."isstream-0.1.2" sources."jake-10.8.5" sources."jmespath-0.16.0" sources."join-component-1.1.0" + sources."jquery-3.6.1" sources."js-md4-0.3.2" + sources."js-nacl-1.4.0" sources."js-yaml-3.14.1" sources."jsbi-4.3.0" sources."jsbn-0.1.1" + sources."jsesc-3.0.2" sources."json-diff-0.5.5" sources."json-schema-0.4.0" sources."json-schema-ref-parser-9.0.9" @@ -9329,12 +10858,18 @@ in sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" + (sources."jsonpath-1.1.1" // { + dependencies = [ + sources."esprima-1.2.2" + ]; + }) sources."jsonschema-1.4.1" (sources."jsonwebtoken-8.5.1" // { dependencies = [ sources."semver-5.7.1" ]; }) + sources."jsplumb-2.15.4" sources."jsprim-1.4.2" sources."jwa-1.4.1" sources."jwks-rsa-1.12.3" @@ -9344,12 +10879,9 @@ in sources."leven-2.1.0" sources."levn-0.3.0" sources."libbase64-1.2.1" - (sources."libmime-5.1.0" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) + sources."libmime-5.1.0" sources."libphonenumber-js-1.10.13" + sources."libpq-1.8.12" sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-4.0.0" @@ -9360,7 +10892,9 @@ in }) sources."lodash-4.17.21" sources."lodash-es-4.17.21" + sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" + sources."lodash.debounce-4.0.8" sources."lodash.defaults-4.2.0" sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" @@ -9376,6 +10910,8 @@ in sources."lodash.merge-4.6.2" sources."lodash.omit-4.5.0" sources."lodash.once-4.1.1" + sources."lodash.orderby-4.6.0" + sources."lodash.pick-4.4.0" sources."lodash.set-4.3.2" sources."lodash.split-4.4.2" sources."lodash.throttle-4.1.1" @@ -9401,7 +10937,6 @@ in sources."luxon-2.5.0" (sources."mailparser-3.5.0" // { dependencies = [ - sources."iconv-lite-0.6.3" sources."nodemailer-6.7.3" ]; }) @@ -9413,6 +10948,11 @@ in }) sources."make-error-1.3.6" sources."make-error-cause-2.3.0" + (sources."make-fetch-happen-9.1.0" // { + dependencies = [ + sources."socks-proxy-agent-6.2.1" + ]; + }) sources."mappersmith-2.40.0" sources."material-colors-1.2.6" sources."md5-2.3.0" @@ -9426,6 +10966,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" + sources."mimic-response-3.1.0" sources."minimalistic-assert-1.0.1" (sources."minimatch-3.1.2" // { dependencies = [ @@ -9434,8 +10975,14 @@ in }) sources."minimist-1.2.6" sources."minipass-3.3.5" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-1.4.1" + sources."minipass-flush-1.0.5" + sources."minipass-pipeline-1.2.4" + sources."minipass-sized-1.0.3" sources."minizlib-2.1.2" sources."mkdirp-0.5.6" + sources."mkdirp-classic-0.5.3" (sources."mock-require-3.0.3" // { dependencies = [ sources."get-caller-file-1.0.3" @@ -9445,19 +10992,19 @@ in sources."moment-2.29.4" sources."moment-timezone-0.5.37" sources."monaco-editor-0.30.1" - (sources."mongodb-4.9.1" // { + (sources."mongodb-4.10.0" // { dependencies = [ sources."denque-2.1.0" ]; }) - (sources."mongodb-connection-string-url-2.5.3" // { + (sources."mongodb-connection-string-url-2.5.4" // { dependencies = [ sources."tr46-3.0.0" sources."webidl-conversions-7.0.0" sources."whatwg-url-11.0.0" ]; }) - sources."moo-0.5.1" + sources."moo-0.5.2" (sources."mqtt-4.2.6" // { dependencies = [ sources."concat-stream-2.0.0" @@ -9468,7 +11015,7 @@ in sources."ms-2.1.2" (sources."mssql-8.1.4" // { dependencies = [ - sources."commander-9.4.0" + sources."commander-9.4.1" ]; }) sources."multer-1.4.5-lts.1" @@ -9476,27 +11023,28 @@ in (sources."mysql2-2.3.3" // { dependencies = [ sources."denque-2.1.0" - sources."iconv-lite-0.6.3" ]; }) sources."mz-2.7.0" - sources."n8n-core-0.134.0" - sources."n8n-design-system-0.34.0" - sources."n8n-editor-ui-0.160.0" - (sources."n8n-nodes-base-0.192.0" // { + sources."n8n-core-0.137.0" + sources."n8n-design-system-0.37.0" + sources."n8n-editor-ui-0.163.1" + (sources."n8n-nodes-base-0.195.1" // { dependencies = [ - sources."iconv-lite-0.6.3" + sources."chokidar-3.5.2" ]; }) - sources."n8n-workflow-0.116.0" + sources."n8n-workflow-0.119.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" sources."yallist-2.1.2" ]; }) + sources."nan-2.16.0" sources."nanoclone-0.2.1" sources."nanoid-3.3.4" + sources."napi-build-utils-1.0.2" sources."native-duplexpair-1.0.0" sources."natural-orderby-2.0.3" (sources."nearley-2.20.1" // { @@ -9513,24 +11061,38 @@ in sources."tslib-2.4.0" ]; }) + sources."node-abi-3.26.0" sources."node-abort-controller-3.0.1" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" sources."node-fetch-2.6.7" + (sources."node-gyp-8.4.1" // { + dependencies = [ + sources."are-we-there-yet-3.0.1" + sources."gauge-4.0.4" + sources."npmlog-6.0.2" + sources."readable-stream-3.6.0" + sources."which-2.0.2" + ]; + }) + sources."node-gyp-build-4.5.0" sources."node-html-markdown-1.2.0" sources."node-html-parser-5.4.2" sources."node-ssh-12.0.5" sources."nodeify-1.0.1" - sources."nodemailer-6.7.8" + sources."nodemailer-6.8.0" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-wheel-1.0.1" sources."npmlog-5.0.1" sources."nth-check-2.1.1" + sources."nub-0.0.0" + sources."nunjucks-3.2.3" sources."oauth-1.0a-2.2.6" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-inspect-1.12.2" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-treeify-1.1.33" sources."object.assign-4.1.4" @@ -9544,7 +11106,9 @@ in sources."open-7.4.2" sources."openapi-types-10.0.0" sources."openurl-1.1.1" + sources."optional-require-1.1.8" sources."optionator-0.8.3" + sources."oracledb-5.5.0" sources."ordered-read-streams-1.0.1" sources."os-name-1.0.3" sources."os-tmpdir-1.0.2" @@ -9565,6 +11129,7 @@ in sources."tslib-2.4.0" ]; }) + sources."parchment-2.0.0-dev.2" sources."parse-github-url-1.0.2" sources."parse-passwd-1.0.0" sources."parse-srcset-1.0.2" @@ -9608,11 +11173,22 @@ in sources."performance-now-2.1.0" sources."pg-8.8.0" sources."pg-connection-string-2.5.0" + sources."pg-cursor-2.7.4" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" + (sources."pg-native-3.0.1" // { + dependencies = [ + sources."isarray-0.0.1" + sources."pg-types-1.13.0" + sources."postgres-array-1.0.3" + sources."readable-stream-1.0.31" + sources."string_decoder-0.10.31" + ]; + }) sources."pg-pool-3.5.2" sources."pg-promise-10.12.0" sources."pg-protocol-1.5.0" + sources."pg-query-stream-4.2.4" sources."pg-types-2.2.0" (sources."pgpass-1.0.5" // { dependencies = [ @@ -9628,7 +11204,7 @@ in sources."popsicle-transport-http-1.2.1" sources."popsicle-transport-xhr-2.0.0" sources."popsicle-user-agent-1.0.0" - sources."postcss-8.4.16" + sources."postcss-8.4.17" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" @@ -9639,8 +11215,10 @@ in sources."ms-2.1.3" ]; }) + sources."prebuild-install-7.1.1" sources."prelude-ls-1.1.2" sources."printj-1.1.2" + sources."prismjs-1.29.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prom-client-13.2.0" @@ -9651,6 +11229,7 @@ in ]; }) sources."promise-ftp-common-1.1.5" + sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."promise.prototype.finally-3.1.3" sources."property-expr-2.0.5" @@ -9672,17 +11251,30 @@ in }) sources."punycode-2.1.1" sources."python-struct-1.1.3" - sources."qs-6.10.3" + sources."qs-6.11.0" + sources."query-string-7.1.1" sources."querystring-0.2.0" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" + sources."quill-2.0.0-dev.4" + sources."quill-autoformat-0.1.2" + (sources."quill-delta-4.2.1" // { + dependencies = [ + sources."deep-equal-1.1.1" + ]; + }) sources."quoted-printable-1.0.1" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" sources."random-bytes-1.0.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + (sources."raw-body-2.5.1" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) + sources."rc-1.2.8" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -9720,6 +11312,7 @@ in sources."tough-cookie-2.5.0" ]; }) + sources."require-at-1.0.6" sources."require-directory-2.1.1" sources."requires-port-1.0.0" sources."resize-observer-polyfill-1.5.1" @@ -9741,6 +11334,7 @@ in sources."run-parallel-1.2.0" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" + sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-2.4.0" sources."safer-buffer-2.1.2" (sources."sanitize-html-2.7.0" // { @@ -9752,7 +11346,7 @@ in sources."sb-promise-queue-2.1.0" sources."sb-scandir-3.1.0" sources."selderee-0.6.0" - sources."semver-7.3.7" + sources."semver-7.3.8" (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -9782,11 +11376,13 @@ in sources."shelljs-0.8.5" (sources."showdown-2.1.0" // { dependencies = [ - sources."commander-9.4.0" + sources."commander-9.4.1" ]; }) sources."side-channel-1.0.4" sources."signal-exit-3.0.7" + sources."simple-concat-1.0.1" + sources."simple-get-4.0.1" sources."simple-git-3.14.1" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" @@ -9797,7 +11393,7 @@ in sources."tslib-2.4.0" ]; }) - (sources."snowflake-sdk-1.6.13" // { + (sources."snowflake-sdk-1.6.14" // { dependencies = [ sources."axios-0.27.2" sources."debug-3.2.7" @@ -9806,18 +11402,20 @@ in sources."uuid-3.4.0" ]; }) - sources."socks-2.7.0" + sources."socks-2.7.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."spex-3.2.0" + sources."split-on-first-1.1.0" (sources."split2-3.2.2" // { dependencies = [ sources."readable-stream-3.6.0" ]; }) sources."sprintf-js-1.0.3" - sources."sqlite3-5.1.1" + sources."sql.js-1.8.0" + sources."sqlite3-5.1.2" sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" @@ -9829,15 +11427,19 @@ in ]; }) sources."sshpk-1.17.0" + sources."ssri-8.0.1" sources."stack-trace-0.0.10" sources."standard-as-callback-2.1.0" + sources."static-eval-2.0.2" sources."statuses-2.0.1" sources."stealthy-require-1.1.1" sources."stoppable-1.1.0" sources."stream-shift-1.0.1" sources."streamsearch-1.1.0" + sources."strict-uri-encode-2.0.0" sources."string-similarity-4.0.4" sources."string-width-4.2.3" + sources."string.prototype.startswith-1.0.0" sources."string.prototype.trimend-1.0.5" sources."string.prototype.trimstart-1.0.5" (sources."string_decoder-1.1.1" // { @@ -9846,24 +11448,34 @@ in ]; }) sources."strip-ansi-6.0.1" + sources."strip-json-comments-2.0.1" sources."strtok3-6.3.0" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-4.14.0" + sources."swagger-ui-dist-4.14.2" sources."swagger-ui-express-4.5.0" (sources."tar-6.1.11" // { dependencies = [ sources."mkdirp-1.0.4" ]; }) + (sources."tar-fs-2.1.1" // { + dependencies = [ + sources."chownr-1.1.4" + ]; + }) + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."tarn-3.0.2" sources."tdigest-0.1.2" (sources."tedious-14.7.0" // { dependencies = [ sources."bl-5.0.0" sources."buffer-6.0.3" - sources."iconv-lite-0.6.3" sources."readable-stream-3.6.0" sources."sprintf-js-1.1.2" ]; @@ -9906,18 +11518,37 @@ in sources."typedarray-0.0.6" (sources."typeorm-0.2.45" // { dependencies = [ + sources."@types/node-12.20.55" sources."argparse-2.0.1" + sources."bl-2.2.1" + sources."bson-1.1.6" sources."buffer-6.0.3" + sources."iconv-lite-0.5.2" sources."js-yaml-4.1.0" + sources."jsbi-3.2.5" sources."mkdirp-1.0.4" + sources."mongodb-3.7.3" + sources."mssql-6.4.1" + sources."readable-stream-3.6.0" + sources."sprintf-js-1.1.2" + sources."tarn-1.1.5" + (sources."tedious-6.7.1" // { + dependencies = [ + sources."bl-3.0.1" + ]; + }) sources."tslib-2.4.0" ]; }) + sources."typeorm-aurora-data-api-driver-2.4.4" sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" sources."unc-path-regex-0.1.2" + sources."underscore-1.12.1" sources."unescape-1.0.1" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" sources."unique-stream-2.3.1" sources."universalify-2.0.0" sources."unpipe-1.0.0" @@ -9938,14 +11569,16 @@ in ]; }) sources."url-parse-1.5.10" - (sources."urllib-2.38.1" // { + (sources."urllib-2.39.1" // { dependencies = [ sources."debug-2.6.9" + sources."iconv-lite-0.4.24" sources."ip-1.1.8" sources."ms-2.0.0" sources."statuses-1.5.0" ]; }) + sources."utf-8-validate-5.0.9" (sources."utf7-1.0.2" // { dependencies = [ sources."semver-5.3.0" @@ -9968,16 +11601,25 @@ in ]; }) sources."vm2-3.9.11" - sources."vue-2.7.10" + sources."vue-2.6.14" + sources."vue-agile-2.0.0" sources."vue-color-2.8.1" sources."vue-fragment-1.5.1" sources."vue-i18n-8.27.2" + sources."vue-json-pretty-1.9.2" + sources."vue-prism-editor-0.3.0" + sources."vue-router-3.6.5" + sources."vue-template-compiler-2.6.14" + sources."vue-typed-mixins-0.2.0" sources."vue2-boring-avatars-0.3.4" sources."vue2-teleport-1.0.1" + sources."vue2-touch-events-3.2.2" + sources."vuex-3.6.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" + sources."which-collection-1.0.1" sources."which-typed-array-1.1.8" sources."wide-align-1.1.5" sources."widest-line-3.1.0" @@ -10006,6 +11648,7 @@ in sources."xlsx-0.17.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" + sources."xpath.js-1.1.0" sources."xregexp-2.0.0" (sources."xss-1.0.14" // { dependencies = [ diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index ae8aa4656c032..15b3c8a976a74 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.13.9"; + version = "1.14-RC1"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "IP3TSmnRekFebxeBh5JRegeSedx+y24e4X9muMAyhFk="; + sha256 = "cBtS+Km2d1n5Yl0wrQkN3Pg6OxSzhG7oVu7ZJ5RQuRQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 8452d3c26f651..2d23ece5e45c0 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -26,12 +26,12 @@ }: let - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "onionshare"; repo = "onionshare"; rev = "v${version}"; - sha256 = "xCAM+tjjyDg/gqAXr4YNPhM8R3n9r895jktisAGlpZo="; + sha256 = "sha256-LA7XlzoCXUiG/9subTddAd22336wO9sOHCIBlQK4Ga4="; }; meta = with lib; { description = "Securely and anonymously send and receive files"; diff --git a/pkgs/applications/networking/onionshare/fix-paths-gui.patch b/pkgs/applications/networking/onionshare/fix-paths-gui.patch index 4eb611c860db6..63bc3f68d3b18 100644 --- a/pkgs/applications/networking/onionshare/fix-paths-gui.patch +++ b/pkgs/applications/networking/onionshare/fix-paths-gui.patch @@ -1,6 +1,6 @@ --- a/onionshare/gui_common.py +++ b/onionshare/gui_common.py -@@ -410,52 +410,12 @@ class GuiCommon: +@@ -482,52 +482,12 @@ class GuiCommon: } def get_tor_paths(self): @@ -29,12 +29,12 @@ - - if self.common.platform == "Windows": - base_path = self.get_resource_path("tor") -- tor_path = os.path.join(base_path, "Tor", "tor.exe") -- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe") -- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe") -- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe") -- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip") -- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6") +- tor_path = os.path.join(base_path, "tor.exe") +- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe") +- snowflake_file_path = os.path.join(base_path, "snowflake-client.exe") +- meek_client_file_path = os.path.join(base_path, "meek-client.exe") +- tor_geo_ip_file_path = os.path.join(base_path, "geoip") +- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6") - elif self.common.platform == "Darwin": - base_path = self.get_resource_path("tor") - tor_path = os.path.join(base_path, "tor") diff --git a/pkgs/applications/networking/onionshare/fix-paths.patch b/pkgs/applications/networking/onionshare/fix-paths.patch index fec4b4e0395b4..62e69f927b564 100644 --- a/pkgs/applications/networking/onionshare/fix-paths.patch +++ b/pkgs/applications/networking/onionshare/fix-paths.patch @@ -1,6 +1,6 @@ --- a/onionshare_cli/common.py +++ b/onionshare_cli/common.py -@@ -318,67 +318,12 @@ class Common: +@@ -318,73 +318,12 @@ class Common: return path def get_tor_paths(self): @@ -18,21 +18,27 @@ - # In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package - base_path = self.get_resource_path("tor") - base_path = base_path.replace("onionshare_cli", "onionshare") -- tor_path = os.path.join(base_path, "Tor", "tor.exe") +- tor_path = os.path.join(base_path, "tor.exe") - - # If tor.exe isn't there, mayber we're running from the source tree - if not os.path.exists(tor_path): +- self.log( +- "Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}" +- ) - base_path = os.path.join(os.getcwd(), "onionshare", "resources", "tor") - -- tor_path = os.path.join(base_path, "Tor", "tor.exe") +- tor_path = os.path.join(base_path, "tor.exe") - if not os.path.exists(tor_path): +- self.log( +- "Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}" +- ) - raise CannotFindTor() - -- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe") -- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe") -- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe") -- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip") -- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6") +- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe") +- snowflake_file_path = os.path.join(base_path, "snowflake-client.exe") +- meek_client_file_path = os.path.join(base_path, "meek-client.exe") +- tor_geo_ip_file_path = os.path.join(base_path, "geoip") +- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6") - - elif self.platform == "Darwin": - # Let's see if we have tor binaries in the onionshare GUI package diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 47fe3e97c1d35..1b4f12874dbda 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null); with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.4.3.1"; + version = "4.4.5"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-byA6bzGdigmVptUFdgBjyg6Oimn5L6l1DDOuuBjwO0s="; + sha256 = "sha256-EgRDNOJ4szdZA5ipOuGy2R0oVdjWcuqPU3ecU3ZNK3g="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 49905cdbd213a..21b75cfe8846d 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -21,7 +21,7 @@ # Runtime dependencies; # A few additional ones (e.g. Node) are already shipped together with the # AppImage, so we don't have to duplicate them here. -, alsa-lib, dbus-glib, fuse, gnome, gsettings-desktop-schemas, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev +, alsa-lib, dbus-glib, fuse, gsettings-desktop-schemas, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev }: let diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index f247b5d148249..e480ab5f67b1c 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { pname = "protonvpn-cli"; - version = "3.12.0"; + version = "3.13.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,8 +17,8 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "protonvpn"; repo = "linux-cli"; - rev = version; - sha256 = "sha256-z0ewAqf8hjyExqBN8KBsDwJ+SA/pIBYZhKtXF9M65HE="; + rev = "refs/tags/${version}"; + sha256 = "sha256-KhfogC23i7THe6YZJ6Sy1+q83vZupHsS69NurHCeo8I="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index ef128932f7c0a..13f6e0186f689 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -18,13 +18,13 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "linux-app"; rev = "refs/tags/${version}"; - sha256 = "sha256-6IRkJKtdQQ9Yixb9CkT3tGNY0MYFZyvz1/6buZo5eYU="; + sha256 = "sha256-aov7Mkb3bGlS3q9zIWkeuWbrvfP1Gm2DhaeTprQNbeI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index c769b7de6c869..89e952945c87f 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-bVq/99jMkxTjckMjWoK4pBa0jD/AYezgKUPJziNSqI0="; + sha256 = "sha256-0heCwXFms6Ni/F1TaS5QEK+ePlR9DXUrzVj3vA5DvCk="; }; postPatch = '' diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 23b2727d695d6..0722561cb6f3b 100644 --- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix +++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -4,7 +4,6 @@ , glib , libX11 , gst_all_1 -, sqlite , libepoxy , pango , cairo diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 20496f38e8686..8a39e31aa9c68 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -3,7 +3,7 @@ , freerdp, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core +, libsecret, libsoup, spice-protocol, spice-gtk_libsoup2, libepoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz # The themes here are soft dependencies; only icons are missing without them. , gnome @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { freerdp libssh libgcrypt gnutls pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsoup spice-protocol spice-gtk libepoxy at-spi2-core + libsoup spice-protocol + # https://gitlab.com/Remmina/Remmina/-/issues/2754 + spice-gtk_libsoup2 + libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz python3 ] ++ optionals withLibsecret [ libsecret ] diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index bf236e179ccd7..70cb96ed1364f 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -21,6 +21,7 @@ in python.pkgs.buildPythonApplication rec { pname = "seahub"; version = "9.0.6"; + format = "other"; src = fetchFromGitHub { owner = "haiwen"; diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 7690bf6ee5403..3e52d664d5265 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir = true; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rsync - lua pkg-config + lua asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt ]; diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 9fa34e785b068..0945de2011b0c 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -43,13 +43,14 @@ stdenv.mkDerivation rec { postInstall = '' installShellCompletion --bash --name ${pname} contrib/completions/complete.bash installShellCompletion --zsh --name _${pname} contrib/completions/complete.zsh + installShellCompletion --fish --name ${pname} contrib/completions/complete.fish ''; meta = with lib; { description = "A complete tool to interact with OneDrive on Linux"; homepage = "https://github.com/abraunegg/onedrive"; license = licenses.gpl3Only; - maintainers = with maintainers; [ srgom peterhoeg ]; + maintainers = with maintainers; [ srgom peterhoeg bertof ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index e668b35d482f4..8ceca271f11af 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-Qgp9fo3yZabxsCFhn7U9B2AcVSUb9GCzm7B81HrI1jY="; + hash = "sha256-jAXxgSm0eEdFylukYGhIGtA0KniMiln1BIfuGZoboSM="; }; - vendorSha256 = "sha256-rde7oyEZA8uGmkvz078Cu+aFrn9TuLTv0i7SW0ytyxU="; + vendorSha256 = "sha256-yabX1A4Q/0ZQFMCrvO5oCI5y0o/dqQy3IplxZ6SsHuw="; doCheck = false; diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 2e4959ce0a520..be794c529ac3b 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "beamerpresenter"; - version = "0.2.3"; + version = "0.2.3-1"; src = fetchFromGitHub { owner = "stiglers-eponym"; repo = "BeamerPresenter"; - rev = "v${version}"; - sha256 = "1n9d0i0j67ymnghn8zkqf52c88zby6rqin8aicbw8cpn35fqf5a6"; + rev = "dd41a00b3c6c8b881fa62945165c965634df66f0"; + sha256 = "11yj1zl8hdnqbynkbyzg8kwyx1jl8c87x8f8qyllpk0s6cg304d0"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 54ad0753c72e8..1d0b06db248fe 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -99,6 +99,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; platforms = platforms.linux; mainProgram = "com.github.alainm23.planner"; + broken = true; # https://github.com/alainm23/planner/issues/928 }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 251c77951321e..9e5294c4b00d0 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { gettext makeWrapper wrapGAppsHook + pkg-config ]; buildInputs = [ @@ -55,7 +56,6 @@ stdenv.mkDerivation rec { libofx libxml2 libxslt - pkg-config swig webkitgtk ] diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index c9b4ef1391265..e93be60741bb3 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.52"; + version = "1.12.53"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "c89zBJoiodgoUGJ1ssk3jsN8X/N7aLsfL0lPDWQAgjs="; + sha256 = "VWjkyNzqu5Ao8TYdEEVSL5Xwpx2qWelzy90tObrdTwI="; }; configureFlags = [ "--disable-component" ]; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index ff0d75711cf0d..81f97b116b051 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -19,12 +19,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-vTrbq/xLTfwF7/YtKzZFiiSw8A0HzzWin2ry8gPHej8="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; buildInputs = [ gtk libgsf libofx - intltool libsoup gnome.adwaita-icon-theme ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 2a00811a449b6..17a9cbb592448 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-Rg6OjHLkwVIDnXqzqPXA8DxqSdrh2T6V/gLBND8vx9o="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool libsoup gnome.adwaita-icon-theme ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; + buildInputs = [ gtk libofx libsoup gnome.adwaita-icon-theme ]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/karlender/default.nix b/pkgs/applications/office/karlender/default.nix new file mode 100644 index 0000000000000..44cd2ed0051f9 --- /dev/null +++ b/pkgs/applications/office/karlender/default.nix @@ -0,0 +1,60 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, pkg-config +, gtk4 +, libadwaita +, wrapGAppsHook4 +, glib +, tzdata +}: + +rustPlatform.buildRustPackage rec { + pname = "karlender"; + version = "0.6.2"; + + src = fetchFromGitLab { + owner = "loers"; + repo = "karlender"; + rev = "v${version}"; + sha256 = "sha256-YF46C+Vz7eGl4lqOQXqiQqaa6ieo1p8l6QCh4oNSJEg="; + }; + + cargoSha256 = "sha256-Kx5K2tp5PAQWac8LVrmOsk8Qf9m34SJ1vyfv7Ef2Wr0="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + glib + ]; + buildInputs = [ + gtk4 + libadwaita + ]; + + postPatch = '' + substituteInPlace src/domain/time.rs --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + ''; + + postInstall = '' + substituteInPlace target/gra-gen/data/codes.loers.Karlender.desktop \ + --replace "Exec=codes.loers.Karlender" "Exec=karlender" + substituteInPlace target/gra-gen/data/codes.loers.Karlender.appdata.xml \ + --replace "<binary>codes.loers.Karlender</binary>" "<binary>karlender</binary>" + install -Dm444 target/gra-gen/codes.loers.Karlender.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas/ + glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/ + install -Dm444 target/gra-gen/data/codes.loers.Karlender.svg -t $out/share/icons/hicolor/scalable/apps/ + install -Dm444 target/gra-gen/data/codes.loers.Karlender.64.png -T $out/share/icons/hicolor/64x64/apps/codes.loers.Karlender.png + install -Dm444 target/gra-gen/data/codes.loers.Karlender.128.png -T $out/share/icons/hicolor/128x128/apps/codes.loers.Karlender.png + install -Dm444 target/gra-gen/data/codes.loers.Karlender.desktop -t $out/share/applications/ + install -Dm444 target/gra-gen/data/codes.loers.Karlender.appdata.xml -t $out/share/metainfo/ + ''; + + meta = with lib; { + description = "Mobile-friendly GTK calendar application"; + homepage = "https://gitlab.com/loers/karlender"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 3f17e46023ab9..6a6ddc28449ed 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -9,7 +9,7 @@ , sqlcipher # Needed for running tests: -, qtbase, xvfb-run +, xvfb-run , python3 }: diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c4435ca626985..43a1571b46ebd 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -555,7 +555,6 @@ in openssl pam perl - pkg-config poppler python3 sane-backends diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index a7d68da37ea58..fb1b0b57ebadf 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.59.1"; + version = "0.59.2"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-isa9hVs7bTWP0CDLLKKek7hUe4b5OuEkA5m9UARZZ30="; + sha256 = "sha256-qfetuy1Pa4kWu4ykuELVIE0iC9eAr6qAwVZkEbqqFi0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index f5ad715d87a64..d070d98d3f555 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchpatch, fetchurl, +{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, qtwebengine, qtscript, grantlee, kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive, diff --git a/pkgs/applications/office/timedoctor/default.nix b/pkgs/applications/office/timedoctor/default.nix deleted file mode 100644 index ab2f8df704791..0000000000000 --- a/pkgs/applications/office/timedoctor/default.nix +++ /dev/null @@ -1,125 +0,0 @@ -{ appimageTools -, fetchurl -, lib -}: - -# You can debug this package with: $ ELECTRON_ENABLE_LOGGING=true timedoctor -let - version = "3.12.12"; - sha256 = "01j149c6lacgysll3sajxlb43m1al08kdcwc6zyzw80nrp4iagf6"; -in -appimageTools.wrapType2 { - name = "timedoctor-${version}"; - src = fetchurl { - inherit sha256; - url = "https://repo2.timedoctor.com/td-desktop-hybrid/prod/v${version}/timedoctor-desktop_${version}_linux-x86_64.AppImage"; - }; - multiPkgs = _: with _; [ - alsa-lib - atk - at-spi2-atk - at-spi2-core - cairo - coreutils - cups - dbus - dbus.lib - desktop-file-utils - expat - expat.dev - file - freetype - gcc - gcc-unwrapped.lib - gdb - gdk-pixbuf - git - glib - glibc - gdk-pixbuf - gtk3 - gtk3.dev - gnome.zenity - gnome2.GConf - gnumake - gnutar - gpsd - gtk3 - gtk3.dev - gtk3-x11 - gtk3-x11.dev - plasma5Packages.kdialog - libappindicator-gtk2.out - libexif - (libjpeg.override { enableJpeg8 = true; }).out - libnotify - libpng - libxml2 - libxslt - netcat - nettools - nodePackages.asar - nspr - nss - openjdk - pango - patchelf - python38 - strace - sqlite - sqlite.dev - udev - unzip - util-linux - watch - wget - which - wrapGAppsHook - xdg-utils - xorg.libX11 - xorg.libXau - xorg.libXaw - xorg.libXaw3d - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXdmcp - xorg.libXext - xorg.libXfixes - xorg.libXfont - xorg.libXfont2 - xorg.libXft - xorg.libXi - xorg.libXinerama - xorg.libXmu - xorg.libXp - xorg.libXpm - xorg.libXpresent - xorg.libXrandr - xorg.libXrender - xorg.libXres - xorg.libXScrnSaver - xorg.libXt - xorg.libXTrap - xorg.libXtst - xorg.libXv - xorg.libXvMC - xorg.libXxf86dga - xorg.libXxf86misc - xorg.libXxf86vm - xorg.xcbutilkeysyms - zip - zlib - zsh - ]; - meta = with lib; { - description = "Employee time tracking software"; - homepage = "https://www.timedoctor.com"; - license = licenses.unfree; - maintainers = with maintainers; [ dsalaza4 ]; - platforms = [ "x86_64-linux" ]; - # gpgme for i686-linux failed to build. - broken = true; - }; -} diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index e39d7b5954c28..6a0bb48c7ded3 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -1,36 +1,49 @@ { lib , stdenv , fetchFromGitHub -, wxGTK , cmake , ninja , wrapGAppsHook +, makeWrapper +, wxGTK +, Cocoa , unstableGitUpdater }: stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2022-09-26"; + version = "unstable-2022-10-11"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "4778c343ac78a3b3ccdaf079187b53d8cd64e235"; - sha256 = "UyltzT9B+7/hME7famQa/XgrDPaNw3apwchKgxwscOo="; + rev = "be79e537c148d961d40137a7f83d7bdcc4119dd6"; + sha256 = "GKRxb6W9PDY7nzgPTPRPmA9GBvD4zLaZwnalZan3+m0="; }; nativeBuildInputs = [ cmake ninja wrapGAppsHook + makeWrapper ]; buildInputs = [ wxGTK + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa ]; NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\""; + postInstall = lib.optionalString stdenv.isDarwin '' + shopt -s extglob + mkdir -p $out/{share/treesheets,bin} + mv $out/!(share) $out/share/treesheets + makeWrapper $out/{share/treesheets,bin}/treesheets \ + --chdir $out/share/treesheets + ''; + passthru = { updateScript = unstableGitUpdater { }; }; @@ -49,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://strlen.com/treesheets/"; maintainers = with maintainers; [ obadz avery ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.zlib; }; } diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/plasma-mobile/angelfish.nix index 35f7b60a45a91..302dc1c7bfb7f 100644 --- a/pkgs/applications/plasma-mobile/angelfish.nix +++ b/pkgs/applications/plasma-mobile/angelfish.nix @@ -1,6 +1,5 @@ { lib , mkDerivation -, fetchurl , cmake , corrosion , extra-cmake-modules diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index 23b64e124c553..400927aed4d7a 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, - pkg-config, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: + pkg-config, soapysdr-with-plugins, wxGTK32, enableDigitalLab ? false, + Cocoa, WebKit }: stdenv.mkDerivation rec { pname = "cubicsdr"; @@ -14,7 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ]; + buildInputs = [ fftw hamlib liquid-dsp soapysdr-with-plugins wxGTK32 ] + ++ lib.optionals stdenv.isLinux [ libpulseaudio libGL libX11 ] + ++ lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; @@ -24,6 +27,6 @@ stdenv.mkDerivation rec { description = "Software Defined Radio application"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lasandell ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index ffd608edf7ff0..46303d9c92abf 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, espeak, glibc, gpsd +{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, espeak, gpsd , hamlib, perl, python3, udev }: with lib; diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/applications/radio/flex-ncat/default.nix index 24c2e08f5525f..e06b241905d3a 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-20220505.0"; + version = "0.1-20221007.1"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nCAT"; rev = "v${version}"; - hash = "sha256-Jqoqy+W5sKfg7U/F2OpK1jAVM8rm1Tbr4RHG/mMVE0g="; + hash = "sha256-9rxI3wsqjhaH7DD1Go/8s0r6jXaE15Z9PPtbsnsfrM0="; }; - vendorSha256 = "sha256-mWZRaPbmSPBUhTCWSkU33zOOq79ylEbnjPG3gLkWeQY="; + vendorSha256 = "sha256-lnJtFixgv4ke4Knavb+XKFPzHCiAPhNtfZS3SRVvY2g="; 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 6900e1eb4ed25..477953ab26fde 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-20220427"; + version = "0.2-20221007.1"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nDAX"; rev = "v${version}"; - hash = "sha256-KmvTLfGC6xzXcWYAzmBYiYSF65lqMdsdMQjUEk3siqc="; + hash = "sha256-QldbiJnCjWrlXEPvyAqV5Xwz9YvsnVobVy/E/OB0A1k="; }; buildInputs = [ libpulseaudio ]; - vendorSha256 = "sha256-u/5LiVo/ZOefprEKr/L1+3+OfYb0a4wq+CWoUjYNvzg="; + vendorSha256 = "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 9e400a11bee5f..ba86468854822 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -11,7 +11,7 @@ , portaudio , speexdsp , hamlib -, wxGTK31-gtk3 +, wxGTK32 , pulseSupport ? config.pulseaudio or stdenv.isLinux , AppKit , AVFoundation @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { lpcnetfreedv speexdsp hamlib - wxGTK31-gtk3 + wxGTK32 ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]) ++ lib.optionals stdenv.isDarwin [ AppKit @@ -60,6 +60,10 @@ stdenv.mkDerivation rec { "-DUSE_STATIC_DEPS:BOOL=FALSE" ] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ]; + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + "-DAPPLE_OLD_XCODE" + ]; + meta = with lib; { homepage = "https://freedv.org/"; description = "Digital voice for HF radio"; diff --git a/pkgs/applications/radio/klog/default.nix b/pkgs/applications/radio/klog/default.nix index 080011e167e63..248561b3ee139 100644 --- a/pkgs/applications/radio/klog/default.nix +++ b/pkgs/applications/radio/klog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }: +{ lib, stdenv, fetchurl, hamlib, pkg-config, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "klog"; diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 072d2d15b7ef3..f98eb7639c1ac 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake -, sqlite, wxGTK30-gtk3, libusb1, soapysdr +, sqlite, wxGTK32, libusb1, soapysdr , mesa_glu, libX11, gnuplot, fltk +, GLUT } : stdenv.mkDerivation rec { @@ -23,13 +24,15 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 sqlite - wxGTK30-gtk3 + wxGTK32 fltk gnuplot libusb1 soapysdr mesa_glu libX11 + ] ++ lib.optionals stdenv.isDarwin [ + GLUT ]; postInstall = '' @@ -42,7 +45,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/myriadrf/LimeSuite"; license = licenses.asl20; maintainers = with maintainers; [ markuskowa ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/applications/radio/rtl-ais/default.nix index c244868f65d89..407c18c1a0adc 100644 --- a/pkgs/applications/radio/rtl-ais/default.nix +++ b/pkgs/applications/radio/rtl-ais/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation { pname = "rtl-ais"; version = "0.8.1"; - buildInputs = [ pkg-config rtl-sdr libusb1 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ rtl-sdr libusb1 ]; src = fetchFromGitHub { owner = "dgiardini"; diff --git a/pkgs/applications/radio/sigdigger/default.nix b/pkgs/applications/radio/sigdigger/default.nix new file mode 100644 index 0000000000000..4273d148ce280 --- /dev/null +++ b/pkgs/applications/radio/sigdigger/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, qmake +, qtbase +, pkg-config +, sigutils +, fftwSinglePrec +, suwidgets +, wrapQtAppsHook +, suscan +, libsndfile +, soapysdr-with-plugins +, libxml2 +, volk +}: + +stdenv.mkDerivation rec { + pname = "sigdigger"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "BatchDrake"; + repo = "SigDigger"; + rev = "v${version}"; + sha256 = "sha256-dS+Fc0iQz7GIlGaR556Ur/EQh3Uzhqm9uBW42IuEqoE="; + }; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + sigutils + fftwSinglePrec + suwidgets + suscan + libsndfile + libxml2 + volk + soapysdr-with-plugins + ]; + + qmakeFlags = [ + "SUWIDGETS_PREFIX=${suwidgets}" + "SigDigger.pro" + ]; + + meta = with lib; { + description = "Qt-based digital signal analyzer, using Suscan core and Sigutils DSP library"; + homepage = "https://github.com/BatchDrake/SigDigger"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ polygon oxapentane ]; + }; +} diff --git a/pkgs/applications/radio/sigutils/default.nix b/pkgs/applications/radio/sigutils/default.nix new file mode 100644 index 0000000000000..8b384af02270d --- /dev/null +++ b/pkgs/applications/radio/sigutils/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, fftwSinglePrec +, libsndfile +, volk +}: + +stdenv.mkDerivation rec { + pname = "sigutils"; + version = "unstable-2022-07-05"; + + src = fetchFromGitHub { + owner = "BatchDrake"; + repo = "sigutils"; + rev = "1d7559d427aadd253dd825eef26bf15e54860c5f"; + sha256 = "sha256-wvd6sixwGmR9R4x+swLVqXre4Dqnj10jZIXUfaJcmBw="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + fftwSinglePrec + libsndfile + volk + ]; + + meta = with lib; { + description = "Small signal processing utility library"; + homepage = "https://github.com/BatchDrake/sigutils"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ polygon oxapentane ]; + }; +} diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix index 7e8a09d67b987..289a20d281ccb 100644 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ b/pkgs/applications/radio/soapyairspy/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake , airspy, soapysdr +, libobjc, IOKit, Security } : stdenv.mkDerivation rec { @@ -14,7 +15,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ airspy soapysdr ]; + buildInputs = [ airspy soapysdr ] + ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; @@ -23,6 +25,6 @@ stdenv.mkDerivation rec { description = "SoapySDR plugin for Airspy devices"; license = licenses.mit; maintainers = with maintainers; [ markuskowa ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/soapyaudio/default.nix b/pkgs/applications/radio/soapyaudio/default.nix index 74924de241d32..7434791b69f0b 100644 --- a/pkgs/applications/radio/soapyaudio/default.nix +++ b/pkgs/applications/radio/soapyaudio/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , hamlib, rtaudio, alsa-lib, libpulseaudio, libjack2, libusb1, soapysdr +, Accelerate, CoreAudio } : stdenv.mkDerivation rec { @@ -14,7 +15,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ hamlib rtaudio alsa-lib libpulseaudio libjack2 libusb1 soapysdr ]; + buildInputs = [ hamlib rtaudio libjack2 libusb1 soapysdr ] + ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ] + ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" @@ -26,6 +29,6 @@ stdenv.mkDerivation rec { description = "SoapySDR plugin for amateur radio and audio devices"; license = licenses.mit; maintainers = with maintainers; [ numinit ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index dca5b7702c31d..0f2b445b960e5 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , libbladeRF, soapysdr +, libobjc, IOKit, Security } : let @@ -17,7 +18,8 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libbladeRF soapysdr ]; + buildInputs = [ libbladeRF soapysdr ] + ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; @@ -27,6 +29,6 @@ in stdenv.mkDerivation { description = "SoapySDR plugin for BladeRF devices"; license = licenses.lgpl21Only; maintainers = with maintainers; [ markuskowa ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index 1d2aaca9362bb..be621c0d3135e 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , hackrf, soapysdr +, libobjc, IOKit, Security } : let @@ -17,7 +18,8 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ hackrf soapysdr ]; + buildInputs = [ hackrf soapysdr ] + ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; @@ -26,6 +28,6 @@ in stdenv.mkDerivation { description = "SoapySDR plugin for HackRF devices"; license = licenses.mit; maintainers = with maintainers; [ markuskowa ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix index 1433b1e9abba8..95f429aef43e0 100644 --- a/pkgs/applications/radio/soapyremote/default.nix +++ b/pkgs/applications/radio/soapyremote/default.nix @@ -19,11 +19,13 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-include sys/select.h" ]; + meta = with lib; { homepage = "https://github.com/pothosware/SoapyRemote"; description = "SoapySDR plugin for remote access to SDRs"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index 864ceff4e1ddb..9220df3f5f946 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , uhd, boost, soapysdr +, libobjc, IOKit, Security } : stdenv.mkDerivation rec { @@ -14,7 +15,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ uhd boost soapysdr ]; + buildInputs = [ uhd boost soapysdr ] + ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; @@ -27,6 +29,6 @@ stdenv.mkDerivation rec { description = "SoapySDR plugin for UHD devices"; license = licenses.gpl3Only; maintainers = with maintainers; [ markuskowa ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/suscan/default.nix b/pkgs/applications/radio/suscan/default.nix new file mode 100644 index 0000000000000..d2b13784a72cf --- /dev/null +++ b/pkgs/applications/radio/suscan/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, fftwSinglePrec +, libsndfile +, sigutils +, soapysdr-with-plugins +, libxml2 +, volk +}: + +stdenv.mkDerivation rec { + pname = "suscan"; + version = "unstable-2022-07-05"; + + src = fetchFromGitHub { + owner = "BatchDrake"; + repo = "suscan"; + rev = "37dad542b97aff24654f0bb80fb8e85af7cb84ab"; + sha256 = "sha256-h1ogtYjkqiHb1/NAJfJ0HQIvGnZM2K/PSP5nqLXUf9M="; + }; + + postPatch = '' + sed -i 's/fftw3 >= 3.0/fftw3f >= 3.0/' suscan.pc.in + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + fftwSinglePrec + libsndfile + sigutils + soapysdr-with-plugins + libxml2 + volk + ]; + + meta = with lib; { + description = "Channel scanner based on sigutils library"; + homepage = "https://github.com/BatchDrake/suscan"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ polygon oxapentane ]; + }; +} diff --git a/pkgs/applications/radio/suwidgets/default.nix b/pkgs/applications/radio/suwidgets/default.nix new file mode 100644 index 0000000000000..05f6cf12d6cdc --- /dev/null +++ b/pkgs/applications/radio/suwidgets/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, qmake +, qtbase +, pkg-config +, sigutils +, fftwSinglePrec +}: + +stdenv.mkDerivation rec { + pname = "suwidgets"; + version = "unstable-2022-04-03"; + + src = fetchFromGitHub { + owner = "BatchDrake"; + repo = "SuWidgets"; + rev = "826b3eeae5b682dc063f53b427caa9c7c48131ea"; + sha256 = "sha256-cyFLsP+8GbALdlgEnVX4201Qq/KAxb/Vv+sJqbFpvUk="; + }; + + dontWrapQtApps = true; + + postPatch = '' + substituteInPlace SuWidgets.pri \ + --replace "PKGCONFIG += sigutils fftw3" "PKGCONFIG += sigutils fftw3f" + ''; + + nativeBuildInputs = [ + qmake + pkg-config + ]; + + buildInputs = [ + qtbase + sigutils + fftwSinglePrec + ]; + + qmakeFlags = [ + "SuWidgetsLib.pro" + ]; + + meta = with lib; { + description = "Sigutils-related widgets"; + homepage = "https://github.com/BatchDrake/SuWidgets"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ polygon oxapentane ]; + }; +} diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index 0d352609cf0dd..3fd066ec7b7bb 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -10,7 +10,8 @@ mkDerivation rec { patches = [ ./remove-use-of-dlopen.patch ]; - buildInputs = [ libpulseaudio alsa-lib pkg-config qtbase ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpulseaudio alsa-lib qtbase ]; CFLAGS ="-lasound -lpulse-simple"; meta = with lib; { diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 59af9a94d96b4..d47bd418f513d 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - buildInputs = [ glib pkg-config gtk2 hamlib ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glib gtk2 hamlib ]; meta = with lib; { description = "An amateur radio logging program"; diff --git a/pkgs/applications/science/biology/angsd/default.nix b/pkgs/applications/science/biology/angsd/default.nix index ec714fa7a26b9..799ba87f073b7 100644 --- a/pkgs/applications/science/biology/angsd/default.nix +++ b/pkgs/applications/science/biology/angsd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "angsd"; - version = "0.938"; + version = "0.940"; src = fetchFromGitHub { owner = "ANGSD"; repo = "angsd"; - sha256 = "sha256-hNELuPim2caJCzJ63fQ7kIB0ZZnXcC8JIbk4dFcCs2U="; + sha256 = "sha256-Ppxgy54pAnqJUzNX5c12NHjKTQyEEcPSpCEEVOyZ/LA="; rev = "${version}"; }; diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index f758e41167942..7922438df5285 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, xz, ncurses, boost }: +{ lib, stdenv, fetchFromGitHub, htslib, zlib, bzip2, xz, ncurses, boost }: stdenv.mkDerivation rec { pname = "delly"; diff --git a/pkgs/applications/science/biology/gatk/default.nix b/pkgs/applications/science/biology/gatk/default.nix index c0818b8336dfa..9853b0322c01b 100644 --- a/pkgs/applications/science/biology/gatk/default.nix +++ b/pkgs/applications/science/biology/gatk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, stdenv, fetchzip, jre, makeWrapper, python3 }: stdenv.mkDerivation rec { pname = "gatk"; @@ -8,10 +8,19 @@ stdenv.mkDerivation rec { sha256 = "0hjlsl7fxf3ankyjidqhwxc70gjh6z4lnjzw6b5fldzb0qvgfvy8"; }; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 ]; + + dontUnpack = true; + installPhase = '' mkdir -p $out/bin - install -m755 -D $src/gatk $out/bin/ install -m755 -D $src/gatk-package-${version}-local.jar $out/bin/ + install -m755 -D $src/gatk-package-${version}-spark.jar $out/bin/ + install -m755 -D $src/gatk $out/bin/ + ''; + postFixup = '' + wrapProgram $out/bin/gatk --prefix PATH : ${lib.makeBinPath [ jre ]} ''; meta = with lib; { diff --git a/pkgs/applications/science/biology/meme-suite/default.nix b/pkgs/applications/science/biology/meme-suite/default.nix index bfa561437e745..c0f67c314161e 100644 --- a/pkgs/applications/science/biology/meme-suite/default.nix +++ b/pkgs/applications/science/biology/meme-suite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, perl, glibc, zlib }: +{ lib, stdenv, fetchurl, python3, perl, zlib }: stdenv.mkDerivation rec { pname = "meme-suite"; diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index 11530c6a72264..6884e1955f75e 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, rocksdb, rapidjson, pkg-config, fetchFromGitHub, fetchpatch, zlib }: +{ lib, stdenv, cmake, rocksdb, rapidjson, pkg-config, fetchFromGitHub, zlib }: stdenv.mkDerivation rec { pname = "sortmerna"; diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index 9f88079627e04..a4ec84d4d5060 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx"; }; - buildInputs = [ autoreconfHook pkg-config zlib perl ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ zlib perl ]; meta = with lib; { description = "A set of tools written in Perl and C++ for working with VCF files, such as those generated by the 1000 Genomes Project"; diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix index 6931c8621c96f..2ff0cab1847a9 100644 --- a/pkgs/applications/science/chemistry/avogadro2/default.nix +++ b/pkgs/applications/science/chemistry/avogadro2/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "avogadro2"; - version = "1.95.1"; + version = "1.97.0"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadroapp"; rev = version; - sha256 = "9GnsxQsMuik6CPDmJbJPF0/+LXbZHf/JLevpSsMEoP0="; + hash = "sha256-gZpMgFSPz70QNfd8gH5Jb9RTxQfQalWx33LkgXLEqOQ="; }; postUnpack = '' diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index 26cf411cb78aa..01fbfb1ccf9c0 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "cp2k"; - version = "9.1.0"; + version = "2022.2"; src = fetchFromGitHub { owner = "cp2k"; repo = "cp2k"; rev = "v${version}"; - hash = "sha256-P9RwZmrE1E0UTQVasQxWAqa3LBLyJNGeJo8T6u5WWcw="; + hash = "sha256-zDIsgPcLnA0ATJEN1vQClpkToqvIyW7KuXhyGiXJXDw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index ea0eba2249e96..c72a4ace2480a 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.75"; + version = "14.32.76"; 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-2D2WBrBmmA84RVLsICFMeQKLvv5nIekbS/EGlmlvtYQ="; + sha256 = "sha256-KdQZKiAJFKE2PW0/DdZGIOC8QQ1icQR+TY4hoXCQdxg="; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 25749b8947c4a..df9b35a244662 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -11,13 +11,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; - version = "11.4"; + version = "12.0"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "1z423sjpc4ajjy3s7623z3rfwmp2hgis7iiiy8gb5apw73k33dyv"; + sha256 = "sha256-OF6zcyxtWXxMUIAB8YxQ3453JAmw6Q3RnNMjr4HgTmE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index c281f63b3bf87..4ad0380ef1e31 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -7,12 +7,11 @@ , netcdf , glew , glm -, freeglut , libpng , libxml2 -, tk , freetype , msgpack +, qt5 }: let pname = "pymol"; @@ -47,12 +46,11 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-JdsgcVF1w1xFPZxVcyS+GcWg4a1Bd4SvxFOuSdlz9SM="; }; - buildInputs = [ python3Packages.numpy glew glm freeglut libpng libxml2 tk freetype msgpack netcdf ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + buildInputs = [ python3Packages.numpy python3Packages.pyqt5 glew glm libpng libxml2 freetype msgpack netcdf ]; NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; hardeningDisable = [ "format" ]; - setupPyBuildFlags = [ "--glut" ]; - installPhase = '' python setup.py install --home="$out" runHook postInstall @@ -60,13 +58,17 @@ python3Packages.buildPythonApplication rec { postInstall = with python3Packages; '' wrapProgram $out/bin/pymol \ - --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ Pmw tkinter ]} + --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5_sip ]} mkdir -p "$out/share/icons/" ln -s ../../lib/python/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg" cp -r "${desktopItem}/share/applications/" "$out/share/" ''; + preFixup = '' + wrapQtApp "$out/bin/pymol" + ''; + meta = with lib; { broken = stdenv.isDarwin; inherit description; diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix index 7aafa70f7fa1a..9645e5426ab11 100644 --- a/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -7,7 +7,6 @@ , hdf5 , vtkWithQt5 , qtbase -, wrapQtAppsHook , fparser , tinyxml , cgal diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 10dcb2327c060..57104cb045eee 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.111"; + version = "3.3.113"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "0cv222qhgldfniz6zys52zhrynfsp5v0h8ia857lng7v33vw5qdl"; + sha256 = "sha256-bv81puBSiFVkO2hNk63rMchbTSN3KtSnyHnL0/apQe0="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index cce72245bb34a..1503230b3afda 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -168,8 +168,7 @@ stdenv.mkDerivation rec { preInstallCheck = optionals (withNgspice) [ "export LD_LIBRARY_PATH=${libngspice}/lib" ]; # debug builds fail all but the python test - # stable release doesn't have the fix for upstream issue 9888 yet - doInstallCheck = !debug && !stable; + doInstallCheck = !debug; installCheckTarget = "test"; dontStrip = debug; diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index b6d6def4fca57..d46c941b8f0d7 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "6.0.7"; + version = "6.0.8"; src = { - rev = "77480857076960b2e8a70e01aee0b843db37f5f7"; - sha256 = "10bqn99nif9zyi5v0lkic3na2vac5lgacw01ayil359vaw7d0pzy"; + rev = "f2edbf62ab6eb123d605d06cffedadc424fed55b"; + sha256 = "0f5iriahskzflgfzahbjihiff7m7nbdmp3ip8dx69xa28b9012w9"; }; }; libVersion = { - version = "6.0.7"; + version = "6.0.8"; libSources = { - symbols.rev = "059abdef06a0b7b44994ae9948a4f98f7224cb1f"; - symbols.sha256 = "006ksx8r6cm6q7v701nalggivp21cmysj8p9zc18y3sch8n1mj4g"; - templates.rev = "16d1898d52f1277ce9bd75640a32f7d2c6d122bf"; + symbols.rev = "64a2f338f3f994975edfd33bc04f92fd6b9ed1c3"; + symbols.sha256 = "1nxz8r3h3j62fs3s77lj27333fsj5c4i01n05lv0gqx36h28hqxk"; + templates.rev = "549275966dd4f01ce656cec2b46599d1b7a3ca62"; templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "26e8be9805444cc25d03d2263277aa06620f5374"; - footprints.sha256 = "0c5fm4hlkka0ms43j02kbv7s9yrlkffn0jz6649ac3gpx6pk8lbf"; - packages3d.rev = "cd9551dfb37ab0c086cac63564e54a7bc7b611d8"; - packages3d.sha256 = "0rdhwyhknrc63sc5ykmq097rzrl36zibnkls7q5hf54lrhn0n3k4"; + footprints.rev = "8eedad538f5b8234d3889ad08a3f272832b724b1"; + footprints.sha256 = "19di37hi80rzlwd468w3b6bq5kzxbslp3daskv8xb4y4f7pk3n00"; + packages3d.rev = "471e36d23c2d4f9971a591e2ab6ce717709438f9"; + packages3d.sha256 = "0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr"; }; }; }; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 15b64938b2565..bd824ac288891 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "librepcb"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0gzf3asdgdicpikb412134ybqnbbark948yrfhvba2w4i9cwbk2r"; + sha256 = "sha256-zqvvc3CHqdRWVUFt4BkH5Vq50/FKNvMNW2NvGyfWwFM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix index e7b947450acc8..083f01a42881a 100644 --- a/pkgs/applications/science/electronics/openems/default.nix +++ b/pkgs/applications/science/electronics/openems/default.nix @@ -10,7 +10,6 @@ , zlib , cmake , octave -, gl2ps , mpi , withQcsxcad ? true , withMPI ? false diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index d28f1d1812159..f8623d9a7bf7b 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -8,7 +8,8 @@ , netpbm , imagemagick , dbus -, xlibsWrapper +, freetype +, fontconfig , libGLU , libGL , shared-mime-info @@ -40,7 +41,9 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 dbus - xlibsWrapper + xorg.libXrender + freetype + fontconfig libGLU libGL tcl diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index ee84c15a22cf6..b9cc2274a3d68 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.224"; + version = "4.226"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kn44yWkNcOLkc79HLDTxx5zQn/vqft+hhbvsoUAKR7I="; + sha256 = "sha256-X6Kwpcm+ugu+4gVkWfsqdCPFTESHzJ1jjCPnGqE3/vo="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index 59d7315ef4132..0cc8bcb0fb386 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { }; patches = [ ./struct.patch ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [libglade gtk2 guile libxml2 - perl intltool libtool pkg-config]; + perl libtool ]; prebuild = '' cp drgeo.desktop.in drgeo.desktop diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 4f37651a171c1..bf7bffd11591b 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 = "2022.07.27"; + version = "unstable-2022-09-08"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "7cc11f7f0c49d4ce7e0ed88950d1c4c8abb1cba4"; - hash = "sha256-6m8XpSYWT0uMpYHXm3ExnH7RMg923YqZAJPTBeFXMzg="; + rev = "ab5b16ede2ff3a4ab5209df24db2c76700899684"; + hash = "sha256-G4MnBViwIosFDiPfUimGqf6fq1KJlxj+LozmgoKaH3A="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index 82bfbd6dc3feb..cc8651f69cfa0 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -5,6 +5,7 @@ , cmake , lingeling , btor2tools +, symfpu , gtest , gmp , cadical @@ -19,13 +20,13 @@ stdenv.mkDerivation rec { pname = "bitwuzla"; - version = "unstable-2022-08-07"; + version = "unstable-2022-10-03"; src = fetchFromGitHub { owner = "bitwuzla"; repo = "bitwuzla"; - rev = "b6fb61736a5cf70cd0b35ec4aeeadf23971610ce"; - hash = "sha256-T5VnnWrcZ8K1NjFf5eeg0TRpXBLRCxC67v8zWPwYF/Y="; + rev = "3bc0f9f1aca04afabe1aff53dd0937924618b2ad"; + hash = "sha256-UXZERl7Nedwex/oUrcf6/GkDSgOQ537WDYm117RfvWo="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { picosat minisat btor2tools + symfpu gmp zlib ] ++ lib.optional withLingeling lingeling; diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 07c3b62d37dab..4750dd08c0a97 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.67.0"; + version = "5.68.0"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-9w6GGi/yW7IYv3NoflpzO/UH712+LWp6f10+ak2hLIA="; + sha256 = "sha256-Hup/E426sPAj8/vpgBz8j6C65fG6U59oq78mqmGkDD8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index f1ec27642fec9..a258c4f5cea7d 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -7,7 +7,9 @@ { lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 , customOCamlPackages ? null -, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses +, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12 +, ocamlPackages_4_14 +, ncurses , buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14 , glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems , csdp ? null @@ -68,11 +70,12 @@ let '' else ""; ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages else with versions; switch coq-version [ - { case = range "8.14" "8.14"; out = ocamlPackages_4_12; } + { case = range "8.16" "8.17"; out = ocamlPackages_4_14; } + { case = range "8.14" "8.15"; out = ocamlPackages_4_12; } { case = range "8.11" "8.13"; out = ocamlPackages_4_10; } { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } - ] ocamlPackages_4_12; + ] ocamlPackages_4_14; ocamlNativeBuildInputs = with ocamlPackages; [ ocaml findlib ] ++ optional (coqAtLeast "8.14") dune_2; ocamlPropagatedBuildInputs = [ ] diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/applications/science/logic/mcy/default.nix index dc1094f3e27d0..343b50dfd7ef9 100644 --- a/pkgs/applications/science/logic/mcy/default.nix +++ b/pkgs/applications/science/logic/mcy/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, yosys, symbiyosys, python3 +, yosys, python3 }: let diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix index e28137dde75b3..62d259f831871 100644 --- a/pkgs/applications/science/logic/petrinizer/default.nix +++ b/pkgs/applications/science/logic/petrinizer/default.nix @@ -1,7 +1,6 @@ { mkDerivation , async, base, bytestring, containers, fetchFromGitLab, mtl -, parallel-io, parsec, lib, stm, transformers, sbv_7_13, z3 -}: +, parallel-io, parsec, lib, stm, transformers, sbv_7_13}: mkDerivation rec { pname = "petrinizer"; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index aa01469bfbb87..5c476be06e4e7 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.cs.unm.edu/~mccune/mace4/"; - license = licenses.gpl1; + license = licenses.gpl2Only; description = "Automated theorem prover for first-order and equational logic"; longDescription = '' Prover9 is a resolution/paramodulation automated theorem prover diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 11cd19188965e..160d67094f4c0 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, lib, stdenv +{ callPackage, fetchurl, lib, stdenv , ocamlPackages, coqPackages, rubber, hevea, emacs }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix index 54aa22511742b..95d5b95718dd9 100644 --- a/pkgs/applications/science/logic/why3/with-provers.nix +++ b/pkgs/applications/science/logic/why3/with-provers.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, runCommand, symlinkJoin, why3 }: +{ stdenv, makeWrapper, runCommand, why3 }: provers: let configAwkScript = runCommand "why3-conf.awk" { inherit provers; } '' diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 74f27fa534e21..1c8c565528e9f 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { dontUseImakeConfigure = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu - pkg-config bison imake which blas lapack curl tcl tk jdk + bison imake which blas lapack curl tcl tk jdk ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index da66dc241d2e7..927a71b9ef135 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchFromGitHub , pkg-config -, fetchpatch , python3 , meson , ninja diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix new file mode 100644 index 0000000000000..51ee824b6ff14 --- /dev/null +++ b/pkgs/applications/science/math/readstat/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: + +stdenv.mkDerivation rec { + name = "readstat"; + version = "1.1.8"; + + src = fetchFromGitHub { + owner = "WizardMac"; + repo = "ReadStat"; + rev = "v${version}"; + sha256 = "1r04lq45h1yn34v1mgfiqjfzyaqv4axqlby0nkandamcsqyhc7y4"; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + meta = { + homepage = "https://github.com/WizardMac/ReadStat"; + description = "Command-line tool (+ C library) for converting SAS, Stata, and SPSS files"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ swflint ]; + }; +} diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 4fd18969a941e..6cdb7919d9ea8 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , fetchpatch -, runtimeShell }: # This file is responsible for fetching the sage source and adding necessary patches. diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 23069f335b8fe..7632b851773c2 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -28,9 +28,9 @@ assert (!blas.isILP64) && (!lapack.isILP64); # executable sage. No tests are run yet and no documentation is built. let + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pythonEnv # for patchShebangs - pkg-config blas lapack singular three @@ -72,7 +72,7 @@ let [] ); - allInputs = lib.remove null (buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]); + allInputs = lib.remove null (nativeBuildInputs ++ buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]); transitiveDeps = lib.unique (builtins.concatLists (map transitiveClosure allInputs )); # fix differences between spkg and sage names # (could patch sage instead, but this is more lightweight and also works for packages depending on sage) @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { pname = "sage-with-env"; src = sage-env.lib.src; - inherit buildInputs; + inherit nativeBuildInputs buildInputs; configurePhase = "#do nothing"; diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix index ed9e64347a87c..eea34fb778850 100644 --- a/pkgs/applications/science/math/symmetrica/default.nix +++ b/pkgs/applications/science/math/symmetrica/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , autoreconfHook }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix index a89b73eb8664f..6821e33d1a629 100644 --- a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix @@ -2,9 +2,6 @@ , stdenv , fetchgit , bash -, pkg-config -, jre8 -, libuuid , openmodelica , mkOpenModelicaDerivation }: diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 8db9245ed33ed..31aee617c44dc 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -20,14 +20,14 @@ in stdenv.mkDerivation rec { pname = "simgrid"; - version = "3.31"; + version = "3.32"; src = fetchFromGitLab { domain = "framagit.org"; owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-K6YkkCMxc2lqxHIwyuLiwcp3m49sqbEtOlwZh4L1YJg="; + sha256 = "sha256-o25wOROkUm07JPdNTJQcJw6apeoysnjd+YBMHlPpAYI="; }; propagatedBuildInputs = [ boost ]; diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index 85b18eb82fd76..81c1fdd6b0549 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -166,7 +166,7 @@ stdenv.mkDerivation rec { url = "https://www.desy.de/~twhite/${pname}/${pname}-${version}.tar.gz"; sha256 = "0i9d5ggalic7alj97dxjdys7010kxhm2cb4lwakvigl023j8ms79"; }; - nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers ] + nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers makeWrapper ] ++ lib.optionals withGui [ wrapGAppsHook ]; buildInputs = [ hdf5 diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index b65c23521395d..34509f05daa3d 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake +{ lib, mkDerivation, fetchFromGitHub, qmake , qtbase, qtscript, qtwebkit, qtserialport, qtsvg, qtdeclarative, qtquickcontrols2 , alsa-lib, libsndfile, flite, openssl, udev, SDL2 }: diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 4aee366e987cb..712374ef7520e 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.56"; + version = "1.8.57"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wyY9oYWABkXNhlZW4RFuyZy/HEnv7cGFVbXVoEnIF1Q="; + sha256 = "sha256-tsx3oVXPIa3OtbLWj3QWrW9leL9/jsdbbLG+Wd3nxn4="; }; postPatch = '' diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 2b145717fb38c..7c0bd8b6410a3 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -16,12 +16,7 @@ , fontconfig , freetype , libGL -, libX11 -, libXcursor -, libXi -, libXrandr -, libXxf86vm -, libxcb +, xorg , libxkbcommon , wayland , xdg-utils @@ -41,12 +36,12 @@ let fontconfig freetype libGL - libX11 - libXcursor - libXi - libXrandr - libXxf86vm - libxcb + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libXxf86vm + xorg.libxcb ] ++ lib.optionals stdenv.isLinux [ libxkbcommon wayland @@ -54,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.11.0-rc2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-svo7DIPgNQy+MkIrRtRQjKQ2ND0CRfofSCiXJqoWby0="; + hash = "sha256-2jNE0UdPXfOyAfPPVKhdBpuVVw4IpwWQ+RLQlJNnK0Y="; }; - cargoSha256 = "sha256-ClAW7WjnDs4Peu+UqcOwtuDDkWYWACMQU5p39CiIFm0="; + cargoSha256 = "sha256-t6ckX0PYI8UHfXhGRpcX8ly3DzE9A6i9P6f3Ny3DBzw="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix new file mode 100644 index 0000000000000..67a719d011701 --- /dev/null +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchurl +, meson +, ninja +, pkg-config +, vala +, gtk4 +, vte-gtk4 +, json-glib +, sassc +, libadwaita +, pcre2 +, libxml2 +, librsvg +, callPackage +, python3 +, gtk3 +, desktop-file-utils +, wrapGAppsHook +}: + +let + marble = callPackage ./marble.nix { }; +in +stdenv.mkDerivation rec { + pname = "blackbox"; + version = "0.12.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "raggesilver"; + repo = "blackbox"; + rev = "v${version}"; + sha256 = "sha256-8u4qHC8+3rKDFNdg5kI48dBgAm3d6ESXN5H9aT/nIBY="; + }; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + sassc + wrapGAppsHook + python3 + gtk3 # For gtk-update-icon-cache + desktop-file-utils # For update-desktop-database + ]; + buildInputs = [ + gtk4 + vte-gtk4 + json-glib + marble + libadwaita + pcre2 + libxml2 + librsvg + ]; + + meta = with lib; { + description = "Beautiful GTK 4 terminal"; + homepage = "https://gitlab.gnome.org/raggesilver/blackbox"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix new file mode 100644 index 0000000000000..6d100c0894e48 --- /dev/null +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, vala +, gobject-introspection +, gtk4 +, gtk3 +, desktop-file-utils +}: + +stdenv.mkDerivation { + pname = "marble"; + version = "unstable-2022-04-20"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "raggesilver"; + repo = "marble"; + # Latest commit from the 'wip/gtk4' branch + rev = "6dcc6fefa35f0151b0549c01bd774750fe6bdef8"; + sha256 = "sha256-0VJ9nyjWOOdLBm3ufleS/xcAS5YsSedJ2NtBjyM3uaY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gtk3 # For gtk-update-icon-cache + desktop-file-utils # For update-desktop-database + gobject-introspection # For g-ir-compiler + ]; + buildInputs = [ gtk4 ]; + + meta = with lib; { + description = "Raggesilver's GTK library"; + homepage = "https://gitlab.gnome.org/raggesilver/marble"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index 17af8457cb103..80d3d6187d1ad 100644 --- a/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -1,5 +1,4 @@ { stdenv -, buildGoModule , fetchFromGitHub , lib , go diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 790aa17259237..85ee654a989a0 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { pname = "gnome-console"; + # Do not upgrade until https://gitlab.gnome.org/GNOME/vte/-/issues/2584 is resolved! version = "42.2"; src = fetchurl { @@ -45,8 +46,6 @@ stdenv.mkDerivation rec { libhandy pcre2 vte - ] ++ lib.optionals stdenv.isLinux [ - gnome.nautilus ]; nativeBuildInputs = [ @@ -61,7 +60,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - mesonFlags = lib.optionals (!stdenv.isLinux) [ + mesonFlags = [ "-Dnautilus=disabled" ]; diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index cc2dc5c55d617..ee28a25047815 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -15,15 +15,15 @@ python3.pkgs.buildPythonApplication rec { pname = "guake"; - version = "3.6.3"; + version = "3.9.0"; format = "other"; src = fetchFromGitHub { owner = "Guake"; repo = "guake"; - rev = version; - sha256 = "13ipnmqcyixpa6qv83m0f91za4kar14s5jpib68b32z65x1h0j3b"; + rev = "refs/tags/${version}"; + sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU="; }; # Strict deps breaks guake @@ -51,16 +51,16 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ dbus-python - pbr pycairo pygobject3 - setuptools + setuptools-scm + pyyaml ]; - PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var + SETUPTOOLS_SCM_PRETEND_VERSION = version; makeFlags = [ - "prefix=${placeholder "out"}" + "PREFIX=${placeholder "out"}" ]; preFixup = '' diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 28dad82fe1626..b6a6ca7780fb6 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -4,6 +4,7 @@ , libxkbcommon, libXi, libXext, wayland-protocols, wayland , lcms2 , librsync +, openssl , installShellFiles , dbus , darwin @@ -27,14 +28,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.25.2"; + version = "0.26.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-o/vVz1lPfsgkzbYjYhIrScCAROmVdiPsNwjW/m5n7Us="; + sha256 = "sha256-IqXRkKzOfqWolH/534nmM2R/69olhFOk6wbbF4ifRd0="; }; buildInputs = [ @@ -42,6 +43,7 @@ buildPythonApplication rec { ncurses lcms2 librsync + openssl.dev ] ++ lib.optionals stdenv.isDarwin [ Cocoa CoreGraphics @@ -77,6 +79,9 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" "shell_integration" ]; patches = [ + # Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`. + ./fix-test_ssh_env_vars.patch + # Needed on darwin # Gets `test_ssh_shell_integration` to pass for `zsh` when `compinit` complains about @@ -98,14 +103,18 @@ buildPythonApplication rec { --update-check-interval=0 \ --shell-integration=enabled\ no-rc ''; + darwinOptions = '' + --disable-link-time-optimization \ + ${commonOptions} + ''; in '' runHook preBuild ${if stdenv.isDarwin then '' - ${python.interpreter} setup.py kitty.app \ - --disable-link-time-optimization \ - ${commonOptions} - make man + ${python.interpreter} setup.py build ${darwinOptions} + make docs + ${python.interpreter} setup.py kitty.app ${darwinOptions} '' else '' + ${python.interpreter} setup.py build-launcher ${python.interpreter} setup.py linux-package \ --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ @@ -126,7 +135,7 @@ buildPythonApplication rec { ]; # skip failing tests due to darwin sandbox - preCheck = if stdenv.isDarwin then '' + preCheck = lib.optionalString stdenv.isDarwin '' substituteInPlace kitty_tests/file_transmission.py \ --replace test_file_get dont_test_file_get \ --replace test_path_mapping_receive dont_test_path_mapping_receive @@ -138,15 +147,9 @@ buildPythonApplication rec { --replace test_ssh_connection_data dont_test_ssh_connection_data substituteInPlace kitty_tests/fonts.py \ --replace 'class Rendering(BaseTest)' 'class Rendering' - '' else ""; + ''; - checkPhase = - let buildBinPath = - if stdenv.isDarwin - then "kitty.app/Contents/MacOS" - else "linux-package/bin"; - in - '' + checkPhase = '' runHook preCheck # Fontconfig error: Cannot load default config file: No such file: (null) @@ -155,7 +158,8 @@ buildPythonApplication rec { # Required for `test_ssh_shell_integration` to pass. export TERM=kitty - env PATH="${buildBinPath}:$PATH" ${python.interpreter} test.py + make test + runHook postCheck ''; installPhase = '' diff --git a/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch b/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch new file mode 100644 index 0000000000000..719b38b48159d --- /dev/null +++ b/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch @@ -0,0 +1,13 @@ +diff --git a/kitty_tests/ssh.py b/kitty_tests/ssh.py +index 7b3bdbeb..710aeceb 100644 +--- a/kitty_tests/ssh.py ++++ b/kitty_tests/ssh.py +@@ -272,8 +272,6 @@ def check_bootstrap(self, sh, home_dir, login_shell='', SHELL_INTEGRATION_VALUE= + + def check_untar_or_fail(): + q = pty.screen_contents() +- if 'bzip2' in q: +- raise ValueError('Untarring failed with screen contents:\n' + q) + return 'UNTAR_DONE' in q + pty.wait_till(check_untar_or_fail) + self.assertTrue(os.path.exists(os.path.join(home_dir, '.terminfo/kitty.terminfo'))) diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index 006616bd944cd..b05872b11e4de 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; }; - buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype which ]; configureFlags = [ "--with-x" diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 0eccceb5a4f68..ede0638e7a042 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -44,9 +44,10 @@ stdenv.mkDerivation { sha256 = "0badnkjsn3zps24r5iggj8k5v4f00npc77wqg92pcn1q5z8r677y"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXt libXft ncurses # required to build the terminfo file - fontconfig freetype pkg-config libXrender + fontconfig freetype libXrender libptytty ] ++ optional perlSupport perl ++ optional gdkPixbufSupport gdk-pixbuf; diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index 917b179490c62..736b0e36d9567 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , meson , ninja , python3 @@ -13,7 +12,6 @@ , gettext , gtkd , libsecret -, glib , wrapGAppsHook , libunwind , appstream diff --git a/pkgs/applications/terminal-emulators/tym/default.nix b/pkgs/applications/terminal-emulators/tym/default.nix new file mode 100644 index 0000000000000..b85133e7aecb1 --- /dev/null +++ b/pkgs/applications/terminal-emulators/tym/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gtk3, vte, lua5_3, pcre2 }: + +stdenv.mkDerivation rec { + pname = "tym"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "endaaman"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "sha256-ufIYJgbHmSJJbnx4hyDx0DmIjaGCxKXtiekcXcyka14="; + }; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = [ + gtk3 + vte + lua5_3 + pcre2 + ]; + + meta = with lib; { + description = "Lua-configurable terminal emulator"; + homepage = "https://github.com/endaaman/tym"; + license = licenses.mit; + maintainers = [ maintainers.wesleyjrz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/x3270/default.nix b/pkgs/applications/terminal-emulators/x3270/default.nix index 7bc4941caf195..7ce5d95775c1f 100644 --- a/pkgs/applications/terminal-emulators/x3270/default.nix +++ b/pkgs/applications/terminal-emulators/x3270/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, m4, expat +{ lib, stdenv, fetchurl, m4, expat , libX11, libXt, libXaw, libXmu, bdftopcf, mkfontdir , fontadobe100dpi, fontadobeutopia100dpi, fontbh100dpi , fontbhlucidatypewriter100dpi, fontbitstream100dpi diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 278332ca6a36d..40bab79b89718 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 = "372"; + version = "373"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "xtCBJ8skCcOgS8rlWbcCUZbtdwu3vyZjCry0XZX2CrE="; + sha256 = "sha256-3rCYlHOmOQi1qNRN/uqDAchxD2zgH7V86MMAAjdXRrY="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index bed85a37f544d..fab2780d96440 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -1,4 +1,4 @@ -{ lib, autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, glibc, pango, gtk2, kcoreaddons, ki18n, kio, kservice +{ lib, autoPatchelfHook, bzip2, cairo, fetchurl, gdk-pixbuf, glibc, pango, gtk2, kcoreaddons, ki18n, kio, kservice , stdenv, runtimeShell, unzip }: diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index b8361d8bd7035..6f1c4fe185773 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -23,7 +23,8 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace setup.cfg \ --replace "grandalf==0.6" "grandalf" \ - --replace "scmrepo==0.0.25" "scmrepo" + --replace "scmrepo==0.0.25" "scmrepo" \ + --replace "pathspec>=0.9.0,<0.10.0" "pathspec" substituteInPlace dvc/daemon.py \ --subst-var-by dvc "$out/bin/dcv" ''; diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index e1e1fe17547f2..335a899b4da10 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.5.1"; + version = "3.6.2"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "3fb5de878b6470dc8ef65ce22f2709cb8baecb5f16d89497dfaa33a0f33f7920"; + sha256 = "sha256-/OckQD6r9WSMx9Vt44eFpzsacH6VMa6NJX6sj2HBQSs="; }; buildCommand = '' diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 60e0d9d28d056..4a4367bfdf7e5 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "2.16.1"; + version = "2.17.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-I8/vO7SfZr4JVbFNBgIaP7CwHn7q6CMIZMjLBsTLY2Q="; + sha256 = "sha256-2GDhDmk7AVb2DGxibIQM0b7hj2iGvjeLJ4+vAZggxtk="; }; vendorSha256 = "sha256-TVMFOit2pi+ZVcppzs0iKNXluDW9ZQDH2d7cPSzg+ak="; diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index af2bff403572b..a9bf9229e0247 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-3NlGS6DTTE0FCsvNPBNaxxbYcKKwE3gd1jsfdxlTl38="; + sha256 = "sha256-xB/TdeXC0V8dZs6N6Uq1+gzG84j9uhSrwkSbIMwUWSk="; }; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index c6cd7079191d4..640be8547c02a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , git , libiconv , ncurses @@ -15,24 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - sha256 = "sha256-jAc17poNTld3eptN1Vd1MOKS5iloMWkq3oZgpWBkGTY="; + sha256 = "sha256-xh+G9bKEL2ho1YrNVTLbCTxSWZtjEuEWutvYEFr2G/g="; }; - cargoPatches = [ - (fetchpatch { - name = "build-run-cargo-update"; - url = "https://github.com/arxanas/git-branchless/commit/0ac3f325520f79d15368aa9d14893ebc17313ab6.patch"; - sha256 = "sha256-S1kazUzvz3FzFpphSRhWiv/l2b/+zC9HtAl7ndq5aJA="; - }) - ]; - - cargoSha256 = "sha256-Lo/Q6OSIzWrRNiTGsOWRX+6FEcj4fk1kn7V9tw67UVo="; + cargoSha256 = "sha256-Zz1RQ/mhdIbPiw2StGtTiORXiJ2nVLyZakt1072ha6U="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index 6e2377bbec4bb..937a771b1e42e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,29 +1,21 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , unixtools , which }: stdenv.mkDerivation rec { pname = "git-extras"; - version = "6.4.0"; + version = "6.5.0"; src = fetchFromGitHub { owner = "tj"; repo = "git-extras"; rev = version; - sha256 = "sha256-Cn7IXMzgg0QIsNIHz+X14Gkmop0UbsSBlGlGkmg71ek="; + sha256 = "sha256-7VNkIFjz4stRT48a9uXks84W7/tP3p7esMJKnIe1O+8="; }; - patches = [ - (fetchpatch { - url = "https://github.com/tj/git-extras/commit/66961ad4911cd0f1a908530f2b725bacc7d198e1.patch"; - sha256 = "sha256-iC1lUf/NmuAPADxDWZ2JScHIMgYjIaR0edlGpq0qCOc="; - }) - ]; - postPatch = '' patchShebangs check_dependencies.sh ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 7a26b38b6b2d3..5bdab4b081ee8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,29 +1,27 @@ { lib , stdenv -, fetchFromGitea +, fetchFromGitHub , rustPlatform -, libiconv , Security , installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.4.1"; + version = "0.4.2"; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "flausch"; - repo = pname; + src = fetchFromGitHub { + owner = "lunaryorn"; + repo = "git-gone"; rev = "v${version}"; - sha256 = "sha256-kqKFs3xvTVHnsLpLC9gjj1dcPChhegmupNrbWy+7C6o="; + sha256 = "sha256-aKBNi797aMPawxD+BLpk0sazXz2g0XTzmDpR/mk07no="; }; - cargoSha256 = "sha256-8R13eHS69fQ3r3LYlnB3nPTPX7VesUPlAUCmQEpUUdw="; + cargoSha256 = "sha256-vO1ePqDIy5HEBauO3OkMCovrgtIVB9biJExw/q89ivE="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' installManPage git-gone.1 @@ -31,8 +29,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cleanup stale Git branches of merge requests"; - homepage = "https://codeberg.org/flausch/git-gone"; - changelog = "https://codeberg.org/flausch/git-gone/raw/tag/v${version}/CHANGELOG.md"; + homepage = "https://github.com/lunaryorn/git-gone"; + changelog = "https://github.com/lunaryorn/git-gone/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index b85f6d973cf22..97e2cf0537ac9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "MitMaro"; repo = pname; rev = version; - sha256 = "sha256-++KTMzTt84dowoZP+Bc9E/jUS21YN5ybKrlpQUKCir0="; + sha256 = "sha256-KqItunxh24jAkvsAMnByS+dhm+wyUqmdF96qEDs/5mI="; }; - cargoSha256 = "sha256-OUaP/nDs589FYaGYcleRMTQNu3/q/2wBjHSv2q8OyjA="; + cargoSha256 = "sha256-510kNtcSsuXADMmSqu2t0HsnPUS/Jedsfvjnh2k+vDs="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index b5c251f247af3..9dc5143790aa8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.12.0"; + version = "3.12.4"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o4OVA9cv+/JLiTUnDEAI/yj+YmOulFrX5XmlRZAb2vw="; + sha256 = "sha256-HRf6e6Qs1zghU01JmZQsR9CHyslUD1T+pCY8eq1JTmo="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-nomad/default.nix b/pkgs/applications/version-management/git-and-tools/git-nomad/default.nix new file mode 100644 index 0000000000000..f11e978ceafbd --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-nomad/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "git-nomad"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "rraval"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A="; + }; + + cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0="; + + meta = with lib; { + description = "Synchronize work-in-progress git branches in a light weight fashion"; + homepage = "https://github.com/rraval/git-nomad"; + license = licenses.mit; + maintainers = with maintainers; [ rraval ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-publish/default.nix b/pkgs/applications/version-management/git-and-tools/git-publish/default.nix new file mode 100644 index 0000000000000..0f0eeff156b06 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-publish/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, python, perl, fetchFromGitHub, installShellFiles }: +stdenv.mkDerivation rec { + pname = "git-publish"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "stefanha"; + repo = "git-publish"; + rev = "v${version}"; + sha256 = "14rz5kli6sz171cvdc46z3z0nnpd57rliwr6nn6vjjc49yyfwgl4"; + }; + + nativeBuildInputs = [ perl installShellFiles ]; + buildInputs = [ python ]; + + installPhase = '' + runHook preInstall + + install -Dm0755 git-publish $out/bin/git-publish + pod2man git-publish.pod > git-publish.1 + installManPage git-publish.1 + + runHook postInstall + ''; + + meta = { + description = "Prepare and store patch revisions as git tags"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lheckemann ]; + homepage = "https://github.com/stefanha/git-publish"; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 95327f31ddcde..9b2c755b1091a 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { done ''; - nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] + nativeBuildInputs = [ gettext perlPackages.perl makeWrapper pkg-config ] ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [ curl openssl zlib expat cpio libiconv bash ] @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] ++ lib.optionals stdenv.isDarwin [ Security CoreServices ] - ++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; + ++ lib.optionals withLibsecret [ glib libsecret ]; # required to support pthread_cancel() NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" @@ -252,7 +252,7 @@ stdenv.mkDerivation (finalAttrs: { '') + lib.optionalString withManual ''# Install man pages - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ + make -j $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ -C Documentation '' + (if guiSupport then '' diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 0359ed7ac6098..c06172aa216d4 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-Ic2AsPFdRk3XdTVGbPBByxcHRAGGQfYoQm9GlgmSvA4="; + sha256 = "sha256-YgW0Q1s3V9WvhYQJlAszD7DdEbfggV5w1uMKXhDrn0s="; }; vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ="; diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 6aa639be86c96..1f331ffd49623 100644 --- a/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -1,22 +1,21 @@ { lib -, fetchFromGitHub , crystal +, fetchFromGitHub }: crystal.buildCrystalPackage rec { pname = "thicket"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "taylorthurlow"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7X1RKj/FWgJdgA7P746hU0ndUM49fH79ZNRSkvNZYFg="; + sha256 = "sha256-sF+fNKEZEfjpW3buh6kFUpL1P0yO9g4SrTb0rhx1uNc="; }; format = "shards"; - shardsFile = ./shards.nix; crystalBinaries.thicket.src = "src/thicket.cr"; # there is one test that tries to clone a repo diff --git a/pkgs/applications/version-management/git-and-tools/thicket/shards.nix b/pkgs/applications/version-management/git-and-tools/thicket/shards.nix deleted file mode 100644 index 1c035d332e53b..0000000000000 --- a/pkgs/applications/version-management/git-and-tools/thicket/shards.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - ameba = { - owner = "veelenga"; - repo = "ameba"; - rev = "v0.14.3"; - sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1"; - }; -} diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index f4416dcc13408..344a10cf2ec56 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; - maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 ]; + maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 srapenne ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 06a2bb48989ca..0a366827e40d5 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pythonPackages, git }: +{ lib, pythonPackages, git }: pythonPackages.buildPythonApplication rec { pname = "git-up"; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index aee4ee3df1b62..47ca0f4f48d3c 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -50,15 +50,15 @@ let extraConfigPaths = lib.forEach data.vendored_gems (gem: "${src}/vendor/gems/${gem}"); }; - yarnOfflineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = data.yarn_hash; - }; - assets = stdenv.mkDerivation { pname = "gitlab-assets"; inherit version src; + yarnOfflineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + sha256 = data.yarn_hash; + }; + nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert ]; patches = [ @@ -91,7 +91,7 @@ let export HOME=$NIX_BUILD_TOP/fake_home # Make yarn install packages from our offline cache, not the registry - yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + yarn config --offline set yarn-offline-mirror $yarnOfflineCache # Fixup "resolved"-entries in yarn.lock to match our offline cache ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 261368272b3f3..feb1063503ff3 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext, installShellFiles +{ lib, stdenv, fetchurl, python3Packages, makeWrapper, gettext, installShellFiles , re2Support ? true , rustSupport ? stdenv.hostPlatform.isLinux, rustPlatform , fullBuild ? false @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-nvqdpfSXqHUKycSPpDHEq3IgnxNgGAxdSSDRMRsEIN8="; + sha256 = "sha256-mNGuAC9orfU9ZcWUf+i3o3n5jPBdm46h9Ad9LKXc6ds="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-hvjp45Iv+fjs8R5Q+k96chY5j0S2Vs6+VrXzMuc2Cwg="; + sha256 = "sha256-UWYXVPdEMITLNdBjnoo8IuLOGZiwUJL+dqSl26nf5qs="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 6f62a381a5045..866146e1d8ffb 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, boost, zlib, botan2, libidn +{ lib, stdenv, fetchFromGitHub, boost, zlib, botan2, libidn , lua, pcre, sqlite, perl, pkg-config, expect, less , bzip2, gmp, openssl , autoreconfHook, texinfo diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 4f61be6669aa1..8a54d4eb77bf2 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -1,31 +1,115 @@ -{ stdenv, fetchurl, lib, autoPatchelfHook }: +{ stdenv +, fetchurl +, fetchzip +, lib +, emptyDirectory +, linkFarm +, symlinkJoin +, jam +, libcxx +, libcxxabi +, openssl +, xcbuild +, CoreServices +, Foundation +, Security +}: +let + opensslStatic = openssl.override { + static = true; + }; + androidZlibContrib = + let + src = fetchzip { + url = "https://android.googlesource.com/platform/external/zlib/+archive/61174f4fd262c6075f88768465f308aae95a2f04.tar.gz"; + sha256 = "sha256-EMzKAHcEWOUugcHKH2Fj3ZaIHC9UlgO4ULKe3RvgxvI="; + stripRoot = false; + }; + in + linkFarm "android-zlib-contrib" [ + # We only want to keep the contrib directory as the other files conflict + # with p4's own zlib files. (For the same reason, we can't use the + # cone-based Git sparse checkout, either.) + { name = "contrib"; path = "${src}/contrib"; } + ]; + libcxxUnified = symlinkJoin { + inherit (libcxx) name; + paths = [ libcxx libcxxabi ]; + }; +in stdenv.mkDerivation rec { pname = "p4"; - version = "2021.2.2201121"; + version = "2022.1.2305383"; src = fetchurl { - # actually https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz but upstream deletes releases - url = "https://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz"; - sha256 = "sha256-SrfI2ZD7KDyttCd8+fo8g4UZKljYYO/SbzqrS9tAcC8="; + # Upstream replaces minor versions, so use archived URL. + url = "https://web.archive.org/web/20220901184735id_/https://ftp.perforce.com/perforce/r22.1/bin.tools/p4source.tgz"; + sha256 = "27ab3ddd7b178b05cf0b710e941650dac0688d294110ebafda9027732c0944c6"; }; - sourceRoot = "."; + nativeBuildInputs = [ jam ]; + + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation Security ]; + + outputs = [ "out" "bin" "dev" ]; - dontBuild = true; + hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; - nativeBuildInputs = [ autoPatchelfHook ]; + jamFlags = + [ + "-sEXEC=bin.unix" + "-sCROSS_COMPILE=${stdenv.cc.targetPrefix}" + "-sMALLOC_OVERRIDE=no" + "-sSSLINCDIR=${lib.getDev opensslStatic}/include" + "-sSSLLIBDIR=${lib.getLib opensslStatic}/lib" + ] + ++ lib.optionals stdenv.cc.isClang [ "-sOSCOMP=clang" "-sCLANGVER=${stdenv.cc.cc.version}" ] + ++ lib.optionals stdenv.cc.isGNU [ "-sOSCOMP=gcc" "-sGCCVER=${stdenv.cc.cc.version}" ] + ++ lib.optionals stdenv.isLinux [ "-sOSVER=26" ] + ++ lib.optionals stdenv.isDarwin [ + "-sOSVER=1013" + "-sMACOSX_SDK=${emptyDirectory}" + "-sLIBC++DIR=${libcxxUnified}/lib" + ]; + + CCFLAGS = + # The file contrib/optimizations/slide_hash_neon.h is missing from the + # upstream distribution. It comes from the Android/Chromium sources. + lib.optionals stdenv.isAarch64 [ "-I${androidZlibContrib}" ]; + + "C++FLAGS" = + # Avoid a compilation error that only occurs for 4-byte longs. + lib.optionals stdenv.isi686 [ "-Wno-narrowing" ] + # See the "Header dependency changes" section of + # https://www.gnu.org/software/gcc/gcc-11/porting_to.html for more + # information on why we need to include these. + ++ lib.optionals + (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0.0")) + [ "-include" "limits" "-include" "thread" ]; + + buildPhase = '' + runHook preBuild + jam $jamFlags -j$NIX_BUILD_CORES p4 + jam $jamFlags -j$NIX_BUILD_CORES -sPRODUCTION=yes p4api.tar + runHook postBuild + ''; installPhase = '' - install -D --target $out/bin p4 p4broker p4d p4p + runHook preInstall + mkdir -p $bin/bin $dev $out + cp bin.unix/p4 $bin/bin + cp -r bin.unix/p4api-${version}/include $dev + cp -r bin.unix/p4api-${version}/lib $out + runHook postInstall ''; - meta = { - description = "Perforce Command-Line Client"; + meta = with lib; { + description = "Perforce Helix Core command-line client and APIs"; homepage = "https://www.perforce.com"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ corngood ]; + license = licenses.bsd2; + mainProgram = "p4"; + platforms = platforms.unix; + maintainers = with maintainers; [ corngood impl ]; }; } diff --git a/pkgs/applications/version-management/p4d/default.nix b/pkgs/applications/version-management/p4d/default.nix index 5b98131303d3b..e2cf8e1013c3d 100644 --- a/pkgs/applications/version-management/p4d/default.nix +++ b/pkgs/applications/version-management/p4d/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation { license = licenses.unfree; mainProgram = "p4d"; platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ impl ]; + maintainers = with maintainers; [ corngood impl ]; }; } diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 3b22a9d50743f..7e5cf752bc884 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '>= 2.4.0', '< 2.8.0' gem 'bundler', '>= 1.12.0' -gem 'rails', '5.2.8' +gem 'rails', '5.2.8.1' gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') gem 'rouge', '~> 3.26.0' @@ -25,6 +25,7 @@ gem 'i18n', '~> 1.8.2' gem "rbpdf", "~> 1.20.0" gem 'addressable' gem 'rubyzip', '~> 2.3.0' +gem 'psych', '~> 3.1' if Gem.ruby_version < Gem::Version.new('2.6.0') # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 5ad1b80d3c776..c57844b49a28c 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.8) - actionpack (= 5.2.8) + actioncable (5.2.8.1) + actionpack (= 5.2.8.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.8) - actionpack (= 5.2.8) - actionview (= 5.2.8) - activejob (= 5.2.8) + actionmailer (5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.8) - actionview (= 5.2.8) - activesupport (= 5.2.8) + actionpack (5.2.8.1) + actionview (= 5.2.8.1) + activesupport (= 5.2.8.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -21,26 +21,26 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.8) - activesupport (= 5.2.8) + actionview (5.2.8.1) + activesupport (= 5.2.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.8) - activesupport (= 5.2.8) + activejob (5.2.8.1) + activesupport (= 5.2.8.1) globalid (>= 0.3.6) - activemodel (5.2.8) - activesupport (= 5.2.8) - activerecord (5.2.8) - activemodel (= 5.2.8) - activesupport (= 5.2.8) + activemodel (5.2.8.1) + activesupport (= 5.2.8.1) + activerecord (5.2.8.1) + activemodel (= 5.2.8.1) + activesupport (= 5.2.8.1) arel (>= 9.0) - activestorage (5.2.8) - actionpack (= 5.2.8) - activerecord (= 5.2.8) + activestorage (5.2.8.1) + actionpack (= 5.2.8.1) + activerecord (= 5.2.8.1) marcel (~> 1.0.0) - activesupport (5.2.8) + activesupport (5.2.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -62,7 +62,7 @@ GEM chunky_png (1.4.0) concurrent-ruby (1.1.10) crass (1.0.6) - css_parser (1.11.0) + css_parser (1.12.0) addressable csv (3.1.9) docile (1.4.0) @@ -72,7 +72,7 @@ GEM htmlentities (4.3.4) i18n (1.8.11) concurrent-ruby (~> 1.0) - loofah (2.18.0) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -83,15 +83,13 @@ GEM mini_mime (1.0.3) mini_portile2 (2.8.0) minitest (5.16.3) - mocha (1.14.0) + mocha (1.15.0) mysql2 (0.5.4) net-ldap (0.17.1) nio4r (2.5.8) nokogiri (1.13.8) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.8-x86_64-linux) - racc (~> 1.4) parallel (1.22.1) parser (3.1.2.1) ast (~> 2.4.1) @@ -106,27 +104,27 @@ GEM ruby-openid (>= 2.1.8) rack-test (2.0.2) rack (>= 1.3) - rails (5.2.8) - actioncable (= 5.2.8) - actionmailer (= 5.2.8) - actionpack (= 5.2.8) - actionview (= 5.2.8) - activejob (= 5.2.8) - activemodel (= 5.2.8) - activerecord (= 5.2.8) - activestorage (= 5.2.8) - activesupport (= 5.2.8) + rails (5.2.8.1) + actioncable (= 5.2.8.1) + actionmailer (= 5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) + activemodel (= 5.2.8.1) + activerecord (= 5.2.8.1) + activestorage (= 5.2.8.1) + activesupport (= 5.2.8.1) bundler (>= 1.3.0) - railties (= 5.2.8) + railties (= 5.2.8.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.3) loofah (~> 2.3) - railties (5.2.8) - actionpack (= 5.2.8) - activesupport (= 5.2.8) + railties (5.2.8.1) + actionpack (= 5.2.8.1) + activesupport (= 5.2.8.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -174,7 +172,7 @@ GEM ruby-openid (2.9.2) ruby-progressbar (1.11.0) rubyzip (2.3.2) - selenium-webdriver (4.4.0) + selenium-webdriver (4.5.0) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) @@ -194,7 +192,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.10) thread_safe (~> 0.1) - unicode-display_width (2.2.0) + unicode-display_width (2.3.0) webdrivers (4.7.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) @@ -231,7 +229,7 @@ DEPENDENCIES pg (~> 1.2.2) puma rack-openid - rails (= 5.2.8) + rails (= 5.2.8.1) rails-dom-testing rbpdf (~> 1.20.0) redcarpet (~> 3.5.1) @@ -255,4 +253,4 @@ RUBY VERSION ruby 2.7.6p219 BUNDLED WITH - 2.3.20 + 2.3.9 diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index a518a9cec2e88..9da39ba4b1c93 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }: let - version = "4.2.7"; + version = "4.2.8"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-7UvgO1q2PCZBqH24l4c53Zl8D2Rr+hAQrJ5SEMNDck4="; + sha256 = "sha256-C0McBS2P02uTIB2vrzYVzbjQNGDvzyQA59MmYrKrYnI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index a478796ca2264..5248ff369830d 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "123nrlrh5kikl314l4gjbc8ljw3h2ppzhpmm7cilisqvn71s5ysd"; + sha256 = "1v5bihkn3cdf7s1cv04wqpk3l5snjgyav0jz9x5vhzzdqyknvndr"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18vrdwdwfmrnpj8k30qhvdx23km233ffnhhzpbmx8m6spavwvli2"; + sha256 = "1x0qjs8v5z5wzk7vlg7pdr71hsm154d8d0gwhya573xpxfjzmjpx"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1knnka6n292f4hhbjfchpa4sbjj79wys5y8bcggm8ah894051kzk"; + sha256 = "0mqvz5dsg9zis34y8m4d2ackr3zs7h27mv6zx5yx00a58fifhyv3"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zndg7ax4bckayjw558p9hz92ic6x3r5acfbd5vnad0xh7hfdrmx"; + sha256 = "06bk0hyv2sq386qc7r96qbhskg91apdj3mrdpzhry6p6nby2afml"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kzb5y4lflmvi3vxz2zrj55k6xyys2h5bdqp2ki69rcyd4ay5qrg"; + sha256 = "12y07kvq9y30ycl4i45g9c2c9jv5a9vlxvrjaqfl79iim6gk1klz"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b6pskl8x4c1hcsf4xh4cl9qlh814s91bjv3yy94cdc4xpl76vr6"; + sha256 = "0vsyxbjpl47grlkzgh2rm0i9yksfwk11lsdi11jmqszc6lkj1b9g"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "078iiv5g02n1ivrgpkbw5bxkbihi85msvn88p5q37vbfr14ynk0a"; + sha256 = "0jk8qwdvq465nklxr7z0qzpiacxcqd72y6frimlalchhigl8ya0a"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xnxgg9j4nr6yw8g3l0jdr9m985k3wrvjql9j5qr5lfcsn9zwz4w"; + sha256 = "0qklddvw3v13dh79c7vljad8m25frlhnwcnw9xk510d676j3lr8a"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0anvhpxjgic1cv1h66lmz6x5nd7g0bbnwl0rgxnbdr3w76fa8w02"; + sha256 = "0r15sbhl4nrkh2g5ccbhmn3c2ngri71j0yfnarxkq90vdrhqqjgh"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -207,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; + sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; csv = { groups = ["default"]; @@ -280,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; + sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; type = "gem"; }; - version = "2.18.0"; + version = "2.19.0"; }; mail = { dependencies = ["mini_mime"]; @@ -361,10 +361,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ffd7zn24lwhp3xp747jfg4zxgqbm04ar7shhjy2iv5xg1pz01lr"; + sha256 = "0z2nzk106b6af6n0d9xqf2sphaff4gpjgxvwqcmvy6k719hqhkh9"; type = "gem"; }; - version = "1.14.0"; + version = "1.15.0"; }; mysql2 = { groups = ["default"]; @@ -523,10 +523,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0884z2ilm4by47qk7my856dr42vzy12ghj241rymp13flaf54449"; + sha256 = "1jy4jfkq0xpqp0d3ii9xhj69kacx8l4q3pincncw2g30bqd7a66g"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -556,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "157mmm2jhvq2g08xhq0780i3r4i679h14m68jj7265ik26gbchhc"; + sha256 = "0w9hm85jgbyar748z9nppsz8mgwywa2v9qqlbkzhpgirxhblifv2"; type = "gem"; }; - version = "5.2.8"; + version = "5.2.8.1"; }; rainbow = { groups = ["default" "test"]; @@ -786,10 +786,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vy0baak61wr652a7qf249n85sqq5k5mi51ws5ccyyirlsymz2gv"; + sha256 = "0fp7h5bnlqp649imgpnshgf3mxl8zwnpsl1ak1giii81r0cd6in3"; type = "gem"; }; - version = "4.4.0"; + version = "4.5.0"; }; simplecov = { dependencies = ["docile" "simplecov-html"]; @@ -870,10 +870,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn"; + sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; webdrivers = { dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index fc57024ea20fc..2c7836f1318a9 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, buildGoModule, git -, asciidoctor, ruby +{ lib, fetchurl, buildGoModule, asciidoctor, ruby }: buildGoModule rec { diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index aee65dee3bbb8..d5c8a97a5f898 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -1,5 +1,4 @@ { python3 -, openssl , callPackage , recurseIntoAttrs , nixosTests diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix new file mode 100644 index 0000000000000..8e32b42912c0d --- /dev/null +++ b/pkgs/applications/version-management/srvc/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "srvc"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "insilica"; + repo = "rs-srvc"; + rev = "v${version}"; + sha256 = "sha256-PBs86cvEacvCt/2JnURL4qKvXGXRZHWaGYrPUSsnt0I="; + }; + + cargoSha256 = "sha256-5CUbfI67gsINdHcxN8KbIN10Mu90rAU53DbmQ5QotWg="; + + meta = with lib; { + description = "Sysrev version control"; + homepage = "https://github.com/insilica/rs-srvc"; + license = licenses.asl20; + maintainers = with maintainers; [ john-shaffer ]; + }; +} diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index f83cbf69edb11..e77fe067670f8 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -130,6 +130,12 @@ stdenv.mkDerivation rec { ./remove-bundled-luajit.patch ]; + # error: unknown type name 'NSUInteger' + postPatch = '' + substituteInPlace src/dialog_colorpicker.cpp \ + --replace "NSUInteger" "size_t" + ''; + NIX_CFLAGS_COMPILE = "-I${luajit52}/include"; NIX_CFLAGS_LINK = "-L${luajit52}/lib"; @@ -153,7 +159,7 @@ stdenv.mkDerivation rec { # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd # softwares - so the resulting program will be GPL license = licenses.bsd3; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres wegank ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 5e60bb7fd9086..d7ad9846306a5 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -34,12 +34,11 @@ stdenv.mkDerivation { "-Wno-error=incompatible-pointer-types" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ which gnome.gnome-common glib - intltool libtool cairo gtk3 diff --git a/pkgs/applications/video/entangle/default.nix b/pkgs/applications/video/entangle/default.nix index 761a3849c315a..b163fc2aa60b8 100644 --- a/pkgs/applications/video/entangle/default.nix +++ b/pkgs/applications/video/entangle/default.nix @@ -33,6 +33,7 @@ , libxkbcommon , orc , pcre +, pcre2 , udev , util-linux , xorg @@ -94,7 +95,8 @@ stdenv.mkDerivation rec { libunwind libxkbcommon orc - pcre + pcre # required by libselinux before we USE_PCRE2 + pcre2 # required by glib-2.0 udev util-linux zstd diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index 0d058106a7c1a..5fab39fd396a0 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -1,14 +1,11 @@ { lib , stdenv , fetchFromGitHub -, gitUpdater -, writers , makeWrapper , bash , nodejs , gzip -, jq -, yq +, callPackage }: let @@ -33,7 +30,8 @@ let }); server = nodejs.pkgs.epgstation.override (drv: { - inherit src; + # NOTE: updateScript relies on version matching the src. + inherit version src; # This is set to false to keep devDependencies at build time. Build time # dependencies are pruned afterwards. @@ -108,17 +106,7 @@ let # NOTE: this may take a while since it has to update all packages in # nixpkgs.nodePackages - passthru.updateScript = import ./update.nix { - inherit lib; - inherit (src.meta) homepage; - inherit - pname - version - gitUpdater - writers - jq - yq; - }; + passthru.updateScript = callPackage ./update.nix { }; # nodePackages.epgstation is a stub package to fetch npm dependencies and # its meta.platforms is made empty to prevent users from installing it diff --git a/pkgs/applications/video/epgstation/update.nix b/pkgs/applications/video/epgstation/update.nix index 405dcf53837e2..41b7b9ab1e17b 100644 --- a/pkgs/applications/video/epgstation/update.nix +++ b/pkgs/applications/video/epgstation/update.nix @@ -1,67 +1,62 @@ -{ pname -, version -, homepage -, lib -, gitUpdater +{ gitUpdater , writers , jq , yq , gnused +, _experimental-update-script-combinators }: let - updater = gitUpdater { - inherit pname version; - attrPath = lib.toLower pname; + updateSource = gitUpdater { rev-prefix = "v"; }; - updateScript = builtins.elemAt updater.command 0; - updateArgs = map (lib.escapeShellArg) (builtins.tail updater.command); -in writers.writeBash "update-epgstation" '' - set -euxo pipefail - - # bump the version - ${updateScript} ${lib.concatStringsSep " " updateArgs} - - cd "${toString ./.}" - - # Get the path to the latest source. Note that we can't just pass the value - # of epgstation.src directly because it'd be evaluated before we can run - # updateScript. - SRC="$(nix-build ../../../.. --no-out-link -A epgstation.src)" - if [[ "${version}" == "$(${jq}/bin/jq -r .version "$SRC/package.json")" ]]; then - echo "[INFO] Already using the latest version of ${pname}" >&2 - exit - fi - - # Regenerate package.json from the latest source. - ${jq}/bin/jq '. + { - dependencies: (.dependencies + .devDependencies), - } | del(.devDependencies, .main, .scripts)' \ - "$SRC/package.json" \ - > package.json - ${jq}/bin/jq '. + { - dependencies: (.dependencies + .devDependencies), - } | del(.devDependencies, .main, .scripts)' \ - "$SRC/client/package.json" \ - > client/package.json - - # Fix issue with old sqlite3 version pinned that depends on very old node-gyp 3.x - ${gnused}/bin/sed -i -e 's/"sqlite3":\s*"5.0.[0-9]\+"/"sqlite3": "5.0.11"/' package.json - - # Regenerate node packages to update the pre-overriden epgstation derivation. - # This must come *after* package.json has been regenerated. - pushd ../../../development/node-packages - ./generate.sh - popd - - # Generate default streaming settings for the nixos module. - pushd ../../../../nixos/modules/services/video/epgstation - ${yq}/bin/yq -j '{ urlscheme , stream }' \ - "$SRC/config/config.yml.template" \ - > streaming.json - - # Fix generated output for EditorConfig compliance - printf '\n' >> streaming.json # rule: insert_final_newline - popd -'' + updateLocks = writers.writeBash "update-epgstation" '' + set -euxo pipefail + + cd "$1" + + # Get the path to the latest source. Note that we can't just pass the value + # of epgstation.src directly because it'd be evaluated before we can run + # updateScript. + SRC="$(nix-build ../../../.. --no-out-link -A epgstation.src)" + if [[ "$UPDATE_NIX_OLD_VERSION" == "$(${jq}/bin/jq -r .version "$SRC/package.json")" ]]; then + echo "[INFO] Already using the latest version of $UPDATE_NIX_PNAME" >&2 + exit + fi + + # Regenerate package.json from the latest source. + ${jq}/bin/jq '. + { + dependencies: (.dependencies + .devDependencies), + } | del(.devDependencies, .main, .scripts)' \ + "$SRC/package.json" \ + > package.json + ${jq}/bin/jq '. + { + dependencies: (.dependencies + .devDependencies), + } | del(.devDependencies, .main, .scripts)' \ + "$SRC/client/package.json" \ + > client/package.json + + # Fix issue with old sqlite3 version pinned that depends on very old node-gyp 3.x + ${gnused}/bin/sed -i -e 's/"sqlite3":\s*"5.0.[0-9]\+"/"sqlite3": "5.0.11"/' package.json + + # Regenerate node packages to update the pre-overriden epgstation derivation. + # This must come *after* package.json has been regenerated. + pushd ../../../development/node-packages + ./generate.sh + popd + + # Generate default streaming settings for the nixos module. + pushd ../../../../nixos/modules/services/video/epgstation + ${yq}/bin/yq -j '{ urlscheme , stream }' \ + "$SRC/config/config.yml.template" \ + > streaming.json + + # Fix generated output for EditorConfig compliance + printf '\n' >> streaming.json # rule: insert_final_newline + popd + ''; +in +_experimental-update-script-combinators.sequence [ + updateSource + [updateLocks ./.] +] diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index e873ac4a3bc14..0d063e707185c 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.9.1"; + version = "0.9.3"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-pkskrzpKDsMg7DOC335zXknEIKh9Ku2NgyeinawQtiY="; + hash = "sha256-JINvLmiS6EnkAmxbqPJI+J9Wk4+ZXwZZm1x5Ew7FCBg="; domain = "invent.kde.org"; }; diff --git a/pkgs/applications/video/kodi/addons/iagl/default.nix b/pkgs/applications/video/kodi/addons/iagl/default.nix index b8bbe3ae46fa1..a7dc758696c10 100644 --- a/pkgs/applications/video/kodi/addons/iagl/default.nix +++ b/pkgs/applications/video/kodi/addons/iagl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchFromGitHub, fetchzip, dateutil, requests, routing, vfs-libarchive, archive_tool, youtube }: +{ lib, buildKodiAddon, fetchFromGitHub, dateutil, requests, routing, vfs-libarchive, archive_tool, youtube }: buildKodiAddon rec { pname = "iagl"; diff --git a/pkgs/applications/video/kodi/addons/keymap/default.nix b/pkgs/applications/video/kodi/addons/keymap/default.nix index d7b45485d6837..aaaed78d4147c 100644 --- a/pkgs/applications/video/kodi/addons/keymap/default.nix +++ b/pkgs/applications/video/kodi/addons/keymap/default.nix @@ -1,4 +1,4 @@ -{ lib, addonDir, buildKodiAddon, fetchzip, defusedxml, kodi-six }: +{ lib, buildKodiAddon, fetchzip, defusedxml, kodi-six }: buildKodiAddon rec { pname = "keymap"; diff --git a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix new file mode 100644 index 0000000000000..851289bc06d46 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix @@ -0,0 +1,25 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, pkg-config, glm, libGL }: + +buildKodiBinaryAddon rec { + pname = "visualization-waveform"; + namespace = "visualization.waveform"; + version = "19.0.2"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + hash = "sha256-IQLW4CDNtt/ptE679hnoXbharq61Ru9S2m7QbJLtNSI="; + }; + + extraBuildInputs = [ pkg-config libGL ]; + + propagatedBuildInputs = [ glm ]; + meta = with lib; { + homepage = "https://github.com/xbmc/visualization.waveform"; + description = "Waveform visualization for kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index 66cac403727a4..37644b10252bd 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -4,8 +4,8 @@ , appstream-glib , desktop-file-utils , glib -, gobject-introspection , gst_all_1 +, pipewire , gtk4 , libadwaita , libpulseaudio @@ -13,27 +13,26 @@ , meson , ninja , pkg-config -, python3 , rustPlatform , wayland -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "kooha"; - version = "2.0.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - sha256 = "05ynpwjdpl7zp9f17zhhvb59rbz3gd7hc0amla1g85ldgfxbgl00"; + hash = "sha256-HgouIMbwpmR/K1hPU7QDzeEtyi5hC66huvInkJFLS2w="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256:16zf6vb001z7xdv2g4kpmb2vqsmaql2cpsx1rl9zrfhpl2z6frs9"; + hash = "sha256-rdxD9pys11QcUtufcZ/zCrviytyc8hIXJfsXg2JoaKE="; }; nativeBuildInputs = [ @@ -41,18 +40,15 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - python3 pkg-config rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc - wayland - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ glib - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-ugly @@ -60,18 +56,10 @@ stdenv.mkDerivation rec { libadwaita libpulseaudio librsvg + wayland + pipewire ]; - propagatedBuildInputs = [ python3.pkgs.pygobject3 ]; - - strictDeps = false; - - # Fixes https://github.com/NixOS/nixpkgs/issues/31168 - postPatch = '' - patchShebangs build-aux/meson_post_install.py - substituteInPlace meson.build --replace '>= 1.0.0-alpha.1' '>= 1.0.0' - ''; - installCheckPhase = '' $out/bin/kooha --help ''; diff --git a/pkgs/applications/video/losslesscut-bin/appimage.nix b/pkgs/applications/video/losslesscut-bin/appimage.nix index 87518479db4b9..8e84406c60ebf 100644 --- a/pkgs/applications/video/losslesscut-bin/appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/appimage.nix @@ -5,7 +5,7 @@ let nameRepo = "lossless-cut"; nameCamel = "LosslessCut"; name = "${pname}-${version}"; - nameSource = "${nameCamel}-linux.AppImage"; + nameSource = "${nameCamel}-linux-x86_64.AppImage"; nameExecutable = "losslesscut"; owner = "mifi"; src = fetchurl { diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index be7786f91020b..77dd6e0c35fa2 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -1,9 +1,9 @@ { callPackage, stdenvNoCC, lib }: let - version = "3.43.0"; - appimage = callPackage ./appimage.nix { inherit version; sha256 = "1xfr3i4gsi13wj374yr5idhgs0q71s4h33yxdr7b7xjdg2gb8lp1"; }; - dmg = callPackage ./dmg.nix { inherit version; sha256 = "1axki47hrxx5m0hrmjpxcya091lahqfnh2pd3zhn5dd496slq8an"; }; - windows = callPackage ./windows.nix { inherit version; sha256 = "1v00gym18hjxxm42dfqmw7vhwh8lgjz2jgv6fmg234npr3d43py5"; }; + version = "3.46.2"; + appimage = callPackage ./appimage.nix { inherit version; sha256 = "sha256-p+HscYsChR90JHdYjurY4OOHgveGXbJomz1klBCsF2Q="; }; + dmg = callPackage ./dmg.nix { inherit version; sha256 = "sha256-350MHWwyjCdvIv6W6lX6Hr6PLDiAwO/e+KW0yKi/Yoc="; }; + windows = callPackage ./windows.nix { inherit version; sha256 = "sha256-48ifhvIWSPmmnBnW8tP7NeWPIWJYWNqGP925O50CAwQ="; }; in ( if stdenvNoCC.isDarwin then dmg else if stdenvNoCC.isCygwin then windows diff --git a/pkgs/applications/video/losslesscut-bin/dmg.nix b/pkgs/applications/video/losslesscut-bin/dmg.nix index 3cbd77198b93b..e334c0a58b9a6 100644 --- a/pkgs/applications/video/losslesscut-bin/dmg.nix +++ b/pkgs/applications/video/losslesscut-bin/dmg.nix @@ -4,7 +4,7 @@ let pname = "losslesscut"; nameRepo = "lossless-cut"; nameCamel = "LosslessCut"; - nameSource = "${nameCamel}-mac.dmg"; + nameSource = "${nameCamel}-mac-x64.dmg"; nameApp = nameCamel + ".app"; owner = "mifi"; src = fetchurl { diff --git a/pkgs/applications/video/losslesscut-bin/windows.nix b/pkgs/applications/video/losslesscut-bin/windows.nix index 0e6ed9b04123a..89ccbca483231 100644 --- a/pkgs/applications/video/losslesscut-bin/windows.nix +++ b/pkgs/applications/video/losslesscut-bin/windows.nix @@ -1,7 +1,7 @@ { stdenvNoCC , lib , fetchurl -, unzip +, p7zip , version , sha256 , useMklink ? false @@ -11,8 +11,8 @@ let pname = "losslesscut"; nameRepo = "lossless-cut"; nameCamel = "LosslessCut"; - nameSourceBase = "${nameCamel}-win"; - nameSource = "${nameSourceBase}.zip"; + nameSourceBase = "${nameCamel}-win-x64"; + nameSource = "${nameSourceBase}.7z"; nameExecutable = "${nameCamel}.exe"; owner = "mifi"; getSymlinkCommand = if (customSymlinkCommand != null) then customSymlinkCommand @@ -27,10 +27,10 @@ in stdenvNoCC.mkDerivation { inherit sha256; }; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ p7zip ]; unpackPhase = '' - unzip $src -d ${nameSourceBase} + 7z x $src -o${nameSourceBase} ''; sourceRoot = nameSourceBase; diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index e9f2f7781b3aa..3d76b524e4421 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "media-downloader"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = pname; rev = "${version}"; - sha256 = "sha256-xoRbNbzFa1CEB4x9JLkVMrkEqaCgweFzvI0Qr9Fl4zs="; + sha256 = "sha256-pDldAg4q6qGvRHuffKU49akDwwSTNCZPJ6AgauxgotI="; }; nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 5ad81bc0a7680..6187584940114 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -1,33 +1,38 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, zip }: +{ lib, stdenv, fetchurl, makeWrapper, libglvnd, libnotify, jre, zip }: stdenv.mkDerivation rec { - version = "13.8.0"; + version = "13.9.1"; pname = "mediathekview"; src = fetchurl { url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; - sha256 = "0zfkwz5psv7m0881ykgqrxwjhadg39c55aj2wpy7m1jdara86c5q"; + sha256 = "4BYKkYhl1YjiAZyfNRdV5KQL+dVkL058uhTG892mXUM="; }; + nativeBuildInputs = [ makeWrapper zip ]; - installPhase = '' + installPhase = + let + libraryPath = lib.strings.makeLibraryPath [ libglvnd libnotify ]; + in + '' runHook preInstall mkdir -p $out/{bin,lib} - # log4j mitigation, see https://logging.apache.org/log4j/2.x/security.html - zip -d MediathekView.jar org/apache/logging/log4j/core/lookup/JndiLookup.class - install -m644 MediathekView.jar $out/lib makeWrapper ${jre}/bin/java $out/bin/mediathek \ - --add-flags "-jar $out/lib/MediathekView.jar" + --add-flags "-jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" makeWrapper ${jre}/bin/java $out/bin/MediathekView \ - --add-flags "-jar $out/lib/MediathekView.jar" + --add-flags "-jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \ - --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" + --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" runHook postInstall ''; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 32c1e4a9f637a..9cce7bb3b3337 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -3,7 +3,6 @@ , fetchFromGitLab , pkg-config , autoreconfHook -, qmake , rake , boost , cmark @@ -127,6 +126,7 @@ stdenv.mkDerivation rec { description = "Cross-platform tools for Matroska"; homepage = "https://mkvtoolnix.download/"; license = licenses.gpl2Only; + mainProgram = if withGUI then "mkvtoolnix-gui" else "mkvtoolnix"; maintainers = with maintainers; [ codyopel rnhmjoj ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index d4f75e7d9301f..01a2d973bf3d9 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -2,7 +2,6 @@ , lib , stdenv , fetchFromGitHub -, fetchpatch , addOpenGLRunpath , docutils , perl diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index a1179ef7aa3af..b59f9de387141 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -1,27 +1,26 @@ -{ lib, stdenvNoCC, fetchFromGitHub, youtube-dl }: +{ lib, stdenvNoCC, fetchFromGitHub, yt-dlp }: stdenvNoCC.mkDerivation rec { pname = "mpv-playlistmanager"; - version = "unstable-2021-09-27"; + version = "unstable-2022-08-26"; src = fetchFromGitHub { owner = "jonniek"; repo = "mpv-playlistmanager"; - rev = "9a759b300c92b55e82be5824fe058e263975741a"; - sha256 = "qMzDJlouBptwyNdw2ag4VKEtmkQNUlos0USPerBAV/s="; + rev = "07393162f7f78f8188e976f616f1b89813cec741"; + sha256 = "sha256-Vgh5F6c90ijp5LVrP2cdAOXo+QtJ9aXI9G/3C2HGqd4="; }; postPatch = '' substituteInPlace playlistmanager.lua \ - --replace "'youtube-dl'" "'${youtube-dl}/bin/youtube-dl'" \ + --replace "youtube-dl" "${lib.getBin yt-dlp}/bin/yt-dlp" ''; dontBuild = true; installPhase = '' runHook preInstall - mkdir -p $out/share/mpv/scripts - cp playlistmanager.lua $out/share/mpv/scripts + install -D -t $out/share/mpv/scripts playlistmanager.lua runHook postInstall ''; 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 1dbfef2a8649d..1696a2d9493b0 100644 --- a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix +++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libbfd, SDL2, obs-studio +{ lib, stdenv, cmake, libbfd, SDL2, obs-studio , looking-glass-client }: stdenv.mkDerivation { diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index b1f3e680ef2a3..80bcb6d41b9de 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -1,8 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch -, fetchurl , cmake , obs-studio }: diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix index f4d915374b830..620cedb6c1b29 100644 --- a/pkgs/applications/video/pipe-viewer/default.nix +++ b/pkgs/applications/video/pipe-viewer/default.nix @@ -6,7 +6,6 @@ , wrapGAppsHook , withGtk3 ? false , ffmpeg -, gtk3 , wget , xdg-utils , youtube-dl diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index acd0bb496b5d5..e268b05094edc 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , mkDerivation , SDL2 , frei0r diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix index 219010eeb393f..d50b7ababfa77 100644 --- a/pkgs/applications/video/showmethekey/default.nix +++ b/pkgs/applications/video/showmethekey/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , glib , meson , ninja @@ -10,10 +11,11 @@ , pango , libinput , gtk4 -, wrapGAppsHook +, wrapGAppsHook4 , libxkbcommon , pkg-config }: + stdenv.mkDerivation rec { pname = "showmethekey"; version = "1.7.3"; @@ -25,6 +27,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA="; }; + 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 @@ -36,7 +46,7 @@ stdenv.mkDerivation rec { libevdev libinput libxkbcommon - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 415790b4c11cb..9f2487734f024 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,11 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "3.2.0"; + version = "5.0.1"; + format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-l3DS2DhExTeKc+FBMNy3YKvIVlZsqgpB/FuXoN7V2SY="; + hash = "sha256-PKRioPBhTV6i3ckQgcKuhQFmpBvUQE4o3FLej8qx4mM="; }; checkInputs = with python3Packages; [ @@ -20,6 +21,10 @@ python3Packages.buildPythonApplication rec { freezegun ]; + nativeBuildInputs = with python3Packages; [ + versioningit + ]; + propagatedBuildInputs = (with python3Packages; [ isodate lxml diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 5584e63ab4466..68750ac918cba 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -50,7 +50,7 @@ homepage = "http://www.tvdr.de/"; description = "Video Disc Recorder"; maintainers = [ maintainers.ck3d ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.linux; license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 6719b0412b827..28528318c162f 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -32,9 +32,11 @@ in { buildInputs = [ vdr ]; - src = fetchurl { - url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${pname}-${version}.tgz"; - sha256 = "1hra1xslj8s68zbyr8zdqp8yap0aj1p6rxyc6cwy1j122kwcnapp"; + src = fetchFromGitHub { + repo = "vdr-plugin-femon"; + owner = "rofafor"; + sha256 = "sha256-0qBMYgNKk7N9Bj8fAoOokUo+G9gfj16N5e7dhoKRBqs="; + rev = "v${version}"; }; postPatch = "substituteInPlace Makefile --replace /bin/true true"; @@ -42,23 +44,23 @@ in { makeFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - homepage = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/"; + inherit (src.meta) homepage; description = "DVB Frontend Status Monitor plugin for VDR"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; markad = stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.0.25"; + version = "3.0.26"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-m7cUAxwXj62spelHYH6uTIoViSavSR0d4psr7+KLJg8="; + sha256 = "sha256-0J6XeLgr9IZSWsheQZWVNRLIxp8iyCvR9Y0z/yrbTnI="; rev = "v${version}"; }; @@ -88,11 +90,11 @@ in { installFlags = buildFlags; meta = with lib; { - homepage = "https://github.com/kfb77/vdr-plugin-markad"; + inherit (src.meta) homepage; description = "MarkAd marks advertisements in VDR recordings."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -101,8 +103,9 @@ in { pname = "vdr-epgsearch"; version = "2.4.1"; - src = fetchgit { - url = "git://projects.vdr-developer.org/vdr-plugin-epgsearch.git"; + src = fetchFromGitHub { + repo = "vdr-plugin-epgsearch"; + owner = "vdr-projects"; sha256 = "sha256-UlbPCkUFN0Gyxjw9xq2STFTDZRVcPPNjadSQd4o2o9U="; rev = "v${version}"; }; @@ -136,18 +139,18 @@ in { outputs = [ "out" "man" ]; meta = with lib; { - homepage = "http://winni.vdr-developer.org/epgsearch"; + inherit (src.meta) homepage; description = "Searchtimer and replacement of the VDR program menu"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; vnsiserver = stdenv.mkDerivation rec { pname = "vdr-vnsiserver"; - version = "1.8.0"; + version = "1.8.1"; buildInputs = [ vdr ]; @@ -155,17 +158,17 @@ in { src = fetchFromGitHub { repo = "vdr-plugin-vnsiserver"; - owner = "FernetMenta"; - rev = "v${version}"; - sha256 = "0n7idpxqx7ayd63scl6xwdx828ik4kb2mwz0c30cfjnmnxxd45lw"; + owner = "vdr-projects"; + rev = version; + sha256 = "sha256-1C0Z7NoU+FNch4BhrAcbJdzVvGuH1YDaxJ+9PflR78E="; }; meta = with lib; { - homepage = "https://github.com/FernetMenta/vdr-plugin-vnsiserver"; + inherit (src.meta) homepage; description = "VDR plugin to handle KODI clients."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -201,7 +204,7 @@ in { description = "VDR Text2Skin Plugin"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -222,11 +225,11 @@ in { installFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - homepage = "https://github.com/jowi24/vdr-fritz"; + inherit (src.meta) homepage; description = "A plugin for VDR to access AVMs Fritz Box routers"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; } diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 1b7f4128ca61d..187a493b2502e 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.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-IqG1Jr+fV4MMyTTOUGY34HNqS8qvAH+CSi2IEyVGVFo="; + sha256 = "sha256-2kh8qMxaAjekvgjMVRmm1nPzlN2wjY/6qYjFyo6CLlg="; rev = "v${version}"; }; @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/ua0lnj/vdr-plugin-softhddevice"; + inherit (src.meta) homepage; description = "VDR SoftHDDevice Plug-in"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; } diff --git a/pkgs/applications/video/vdr/streamdev/default.nix b/pkgs/applications/video/vdr/streamdev/default.nix index 6ef00deab0960..de45b31d86904 100644 --- a/pkgs/applications/video/vdr/streamdev/default.nix +++ b/pkgs/applications/video/vdr/streamdev/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with lib;{ - homepage = "https://github.com/vdr-projects/vdr-plugin-streamdev"; + inherit (src.meta) homepage; description = "This PlugIn is a VDR implementation of the VTP (Video Transfer Protocol) Version 0.0.3 (see file PROTOCOL) and a basic HTTP Streaming Protocol."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; diff --git a/pkgs/applications/video/video-trimmer/default.nix b/pkgs/applications/video/video-trimmer/default.nix index dbeb85821debd..230654d995798 100644 --- a/pkgs/applications/video/video-trimmer/default.nix +++ b/pkgs/applications/video/video-trimmer/default.nix @@ -3,7 +3,6 @@ , fetchFromGitLab , fetchpatch , rustPlatform -, gnome , pkg-config , meson , wrapGAppsHook4 diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index e870b8572d8de..f3d3bf38b634e 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -64,6 +64,7 @@ , systemd , taglib , unzip +, xlibsWrapper , xorg , zlib , chromecastSupport ? true, libmicrodns, protobuf @@ -149,6 +150,7 @@ stdenv.mkDerivation rec { srt systemd taglib + xlibsWrapper zlib ] ++ (with xorg; [ @@ -156,7 +158,6 @@ stdenv.mkDerivation rec { libXv libXvMC xcbutilkeysyms - xlibsWrapper ]) ++ optional (!stdenv.hostPlatform.isAarch && !onlyLibVLC) live555 ++ optional jackSupport libjack2 diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index b4f610c7a91d3..d88172a592bd0 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -12,6 +12,7 @@ , readline , shared-mime-info , xine-lib +, xlibsWrapper , xorg }: @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { ncurses readline xine-lib + xlibsWrapper ] ++ (with xorg; [ libXext libXft @@ -54,7 +56,6 @@ stdenv.mkDerivation rec { libXtst libXv libXxf86vm - xlibsWrapper xorgproto ]); diff --git a/pkgs/applications/virtualization/buildkit-nix/default.nix b/pkgs/applications/virtualization/buildkit-nix/default.nix index 1a7a8c9330462..5e0ddf6a04056 100644 --- a/pkgs/applications/virtualization/buildkit-nix/default.nix +++ b/pkgs/applications/virtualization/buildkit-nix/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "buildkit-nix"; - version = "0.0.2"; + version = "0.1.0"; src = fetchFromGitHub { - owner = "AkihiroSuda"; + owner = "reproducible-containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-k9YO4KFIDebfszhKG6RYDFlVfbUPFHRsHRQXXlJ6SoU="; + sha256 = "sha256-gKTCBz7om1M7UBzyMJDetNGcKLkQKMyuzwrHBbuuifM="; }; - vendorSha256 = "sha256-c+VHt2uTaEQIXsmJ9TA7X5lfMxGL9yKbbnnXn4drCLU="; + vendorSha256 = "sha256-1H5oWgcaamf+hocABWWnzJUjWiqwk1ZZtbBjF6EKzzU="; CGO_ENABLED = 0; @@ -19,7 +19,7 @@ buildGoModule rec { meta = with lib; { description = "Nix frontend for BuildKit"; - homepage = "https://github.com/AkihiroSuda/buildkit-nix/"; + homepage = "https://github.com/reproducible-containers/buildkit-nix/"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ lesuisse ]; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index cec54e0b2ed18..d19a764e4eb1d 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "colima"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hoxEf62EPD/WFXW6qbPCvEwViwmme3pSBfjeKOLsGjc="; + sha256 = "sha256-mVEp/4iL23rrw6HSl/7qMGK4YCJ6I+9gcSIhyPsAWzc="; # We need the git revision leaveDotGit = true; postFetch = '' diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 43c94682e0427..4f54b4044cd0e 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.25.0"; + version = "1.25.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-3J/fiaJL828P0L0vgwcR3DbMASt3fcwnLBu33SFDlx0="; + sha256 = "sha256-MFqCRHsIpc8ianyNW+PsDINQavbTZs2rZ2k6q/6wTkY="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index da77aaca0f256..0b8706e326733 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "amazon-ecs-agent"; - version = "1.63.1"; + version = "1.64.0"; goPackagePath = "github.com/aws/${pname}"; subPackages = [ "agent" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "aws"; repo = pname; - sha256 = "sha256-wnDwLpCDeIC2D2X/pzC6ZsudJz58xLo1PQB+K6WNxBE="; + sha256 = "sha256-n7iq9CcTjbFc5on5DPVjjS7FY4Bnf/KDdOoHHzDkL30="; }; meta = with lib; { diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 877bcc2f8b046..66932260886d1 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "1.1.1"; + version = "1.1.2"; suffix = { x86_64-linux = "x86_64"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-KRlOE4iDWMYzKZUZnuKIwIGooj5o8ARpROS7f2VIr1c="; + x86_64-linux = "sha256-RkFlc+atTB9zHRAjQSqe4nJ9N7I9FE/RBeEcXoCk0T8="; aarch64-linux = "sha256-AqVFqUbMtjPmOsSgAaJ2AFNc0McC708fAD36qLz0VAc="; }; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 9e611bddc844c..f50fbf6058e6d 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 = "0.8.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5ImGG3sovDFya1o6bbEu3JaS3xUaO9gfAnw28GZf2aU="; + sha256 = "sha256-dIQS/Z1vAVHyX58RfpQWcNHyNvNdYbnx73TDEQGQt80="; }; - cargoSha256 = "sha256-WAnFucDCG0h+tfy6wHyWjIU7HpJ4Qylxw2Q4sgZgp7I="; + cargoSha256 = "sha256-actzR0YCHOydqFp6KhwTUUj3dhGV6D+zk9+PHU3FKlM="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index 78da45fd854ac..88ae7318c5067 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -2,7 +2,6 @@ , stdenv , pkg-config , fetchFromGitHub -, fetchpatch , buildGoModule , btrfs-progs , gpgme @@ -13,23 +12,15 @@ }: buildGoModule rec { pname = "podman-tui"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - sha256 = "sha256-XLC1DqOME9xMF4z+cOPe5H60JnxU9gGaSOQQIofdtj8="; + sha256 = "sha256-9ZFyrRf4yMik4+TQYN+75fWuKHuI8hkaKJ6o5qWYb7E="; }; - patches = [ - # Fix flaky tests. See https://github.com/containers/podman-tui/pull/129. - (fetchpatch { - url = "https://github.com/containers/podman-tui/commit/7fff27e95a3891163da79d86bbc796f29b523f80.patch"; - sha256 = "sha256-mETDXoMLq7vb8Qhpz/CmNG1LmY2DTaogI10Qav/qN9Q="; - }) - ]; - vendorSha256 = null; nativeBuildInputs = [ pkg-config ]; @@ -39,9 +30,16 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - preCheck = '' - export HOME=/home/$(whoami) - ''; + preCheck = + let skippedTests = [ + "TestNetdialogs" + ]; in + '' + export HOME=/home/$(whoami) + + # Disable flaky tests + buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") + ''; passthru.tests.version = testers.testVersion { package = podman-tui; diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 5d811b59066b0..cb4cea09ec2c0 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -8,26 +8,26 @@ , ninja , pkg-config , rustPlatform -, wrapGAppsHook +, wrapGAppsHook4 , gtksourceview5 , libadwaita }: stdenv.mkDerivation rec { pname = "pods"; - version = "1.0.0-beta.4"; + version = "1.0.0-beta.5"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "1j5rz43860n17qcxmc5dj8sll3y593jj9zz1sfvnx4g0694sp0cl"; + sha256 = "sha256-Bp/ILQY5Xa8wrq7v9O9QohWzlevdN3MwMjjnlimt6HM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-tj0ROO8HmFWyQLYDrdywOneHz6X43dRZJFTB+aw+m7o="; + sha256 = "sha256-iToznqaNXArVrSdDXGPJol3OeFdM3J8VgYSs+mjM0SE="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch b/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch new file mode 100644 index 0000000000000..2e6f1699637b1 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch @@ -0,0 +1,371 @@ +From 8ab70b8958a8f9cb9bd316eecd3ccbcf05c06614 Mon Sep 17 00:00:00 2001 +From: Linus Heckemann <git@sphalerite.org> +Date: Tue, 4 Oct 2022 12:41:21 +0200 +Subject: [PATCH] 9pfs: use GHashTable for fid table +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The previous implementation would iterate over the fid table for +lookup operations, resulting in an operation with O(n) complexity on +the number of open files and poor cache locality -- for every open, +stat, read, write, etc operation. + +This change uses a hashtable for this instead, significantly improving +the performance of the 9p filesystem. The runtime of NixOS's simple +installer test, which copies ~122k files totalling ~1.8GiB from 9p, +decreased by a factor of about 10. + +Signed-off-by: Linus Heckemann <git@sphalerite.org> +Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> +Reviewed-by: Greg Kurz <groug@kaod.org> +[CS: - Retain BUG_ON(f->clunked) in get_fid(). + - Add TODO comment in clunk_fid(). ] +Message-Id: <20221004104121.713689-1-git@sphalerite.org> +[CS: - Drop unnecessary goto and out: label. ] +Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> +--- + hw/9pfs/9p.c | 194 +++++++++++++++++++++++++++++---------------------- + hw/9pfs/9p.h | 2 +- + 2 files changed, 112 insertions(+), 84 deletions(-) + +diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c +index aebadeaa03..9bf13133e5 100644 +--- a/hw/9pfs/9p.c ++++ b/hw/9pfs/9p.c +@@ -256,7 +256,8 @@ static size_t v9fs_string_size(V9fsString *str) + } + + /* +- * returns 0 if fid got re-opened, 1 if not, < 0 on error */ ++ * returns 0 if fid got re-opened, 1 if not, < 0 on error ++ */ + static int coroutine_fn v9fs_reopen_fid(V9fsPDU *pdu, V9fsFidState *f) + { + int err = 1; +@@ -282,33 +283,32 @@ static V9fsFidState *coroutine_fn get_fid(V9fsPDU *pdu, int32_t fid) + V9fsFidState *f; + V9fsState *s = pdu->s; + +- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { ++ f = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); ++ if (f) { + BUG_ON(f->clunked); +- if (f->fid == fid) { +- /* +- * Update the fid ref upfront so that +- * we don't get reclaimed when we yield +- * in open later. +- */ +- f->ref++; +- /* +- * check whether we need to reopen the +- * file. We might have closed the fd +- * while trying to free up some file +- * descriptors. +- */ +- err = v9fs_reopen_fid(pdu, f); +- if (err < 0) { +- f->ref--; +- return NULL; +- } +- /* +- * Mark the fid as referenced so that the LRU +- * reclaim won't close the file descriptor +- */ +- f->flags |= FID_REFERENCED; +- return f; ++ /* ++ * Update the fid ref upfront so that ++ * we don't get reclaimed when we yield ++ * in open later. ++ */ ++ f->ref++; ++ /* ++ * check whether we need to reopen the ++ * file. We might have closed the fd ++ * while trying to free up some file ++ * descriptors. ++ */ ++ err = v9fs_reopen_fid(pdu, f); ++ if (err < 0) { ++ f->ref--; ++ return NULL; + } ++ /* ++ * Mark the fid as referenced so that the LRU ++ * reclaim won't close the file descriptor ++ */ ++ f->flags |= FID_REFERENCED; ++ return f; + } + return NULL; + } +@@ -317,12 +317,11 @@ static V9fsFidState *alloc_fid(V9fsState *s, int32_t fid) + { + V9fsFidState *f; + +- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { ++ f = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); ++ if (f) { + /* If fid is already there return NULL */ + BUG_ON(f->clunked); +- if (f->fid == fid) { +- return NULL; +- } ++ return NULL; + } + f = g_new0(V9fsFidState, 1); + f->fid = fid; +@@ -333,7 +332,7 @@ static V9fsFidState *alloc_fid(V9fsState *s, int32_t fid) + * reclaim won't close the file descriptor + */ + f->flags |= FID_REFERENCED; +- QSIMPLEQ_INSERT_TAIL(&s->fid_list, f, next); ++ g_hash_table_insert(s->fids, GINT_TO_POINTER(fid), f); + + v9fs_readdir_init(s->proto_version, &f->fs.dir); + v9fs_readdir_init(s->proto_version, &f->fs_reclaim.dir); +@@ -424,12 +423,12 @@ static V9fsFidState *clunk_fid(V9fsState *s, int32_t fid) + { + V9fsFidState *fidp; + +- QSIMPLEQ_FOREACH(fidp, &s->fid_list, next) { +- if (fidp->fid == fid) { +- QSIMPLEQ_REMOVE(&s->fid_list, fidp, V9fsFidState, next); +- fidp->clunked = true; +- return fidp; +- } ++ /* TODO: Use g_hash_table_steal_extended() instead? */ ++ fidp = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); ++ if (fidp) { ++ g_hash_table_remove(s->fids, GINT_TO_POINTER(fid)); ++ fidp->clunked = true; ++ return fidp; + } + return NULL; + } +@@ -439,10 +438,15 @@ void coroutine_fn v9fs_reclaim_fd(V9fsPDU *pdu) + int reclaim_count = 0; + V9fsState *s = pdu->s; + V9fsFidState *f; ++ GHashTableIter iter; ++ gpointer fid; ++ ++ g_hash_table_iter_init(&iter, s->fids); ++ + QSLIST_HEAD(, V9fsFidState) reclaim_list = + QSLIST_HEAD_INITIALIZER(reclaim_list); + +- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &f)) { + /* + * Unlink fids cannot be reclaimed. Check + * for them and skip them. Also skip fids +@@ -514,72 +518,85 @@ void coroutine_fn v9fs_reclaim_fd(V9fsPDU *pdu) + } + } + ++/* ++ * This is used when a path is removed from the directory tree. Any ++ * fids that still reference it must not be closed from then on, since ++ * they cannot be reopened. ++ */ + static int coroutine_fn v9fs_mark_fids_unreclaim(V9fsPDU *pdu, V9fsPath *path) + { +- int err; ++ int err = 0; + V9fsState *s = pdu->s; +- V9fsFidState *fidp, *fidp_next; ++ V9fsFidState *fidp; ++ gpointer fid; ++ GHashTableIter iter; ++ /* ++ * The most common case is probably that we have exactly one ++ * fid for the given path, so preallocate exactly one. ++ */ ++ g_autoptr(GArray) to_reopen = g_array_sized_new(FALSE, FALSE, ++ sizeof(V9fsFidState *), 1); ++ gint i; + +- fidp = QSIMPLEQ_FIRST(&s->fid_list); +- if (!fidp) { +- return 0; +- } ++ g_hash_table_iter_init(&iter, s->fids); + + /* +- * v9fs_reopen_fid() can yield : a reference on the fid must be held +- * to ensure its pointer remains valid and we can safely pass it to +- * QSIMPLEQ_NEXT(). The corresponding put_fid() can also yield so +- * we must keep a reference on the next fid as well. So the logic here +- * is to get a reference on a fid and only put it back during the next +- * iteration after we could get a reference on the next fid. Start with +- * the first one. ++ * We iterate over the fid table looking for the entries we need ++ * to reopen, and store them in to_reopen. This is because ++ * v9fs_reopen_fid() and put_fid() yield. This allows the fid table ++ * to be modified in the meantime, invalidating our iterator. + */ +- for (fidp->ref++; fidp; fidp = fidp_next) { ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &fidp)) { + if (fidp->path.size == path->size && + !memcmp(fidp->path.data, path->data, path->size)) { +- /* Mark the fid non reclaimable. */ +- fidp->flags |= FID_NON_RECLAIMABLE; +- +- /* reopen the file/dir if already closed */ +- err = v9fs_reopen_fid(pdu, fidp); +- if (err < 0) { +- put_fid(pdu, fidp); +- return err; +- } +- } +- +- fidp_next = QSIMPLEQ_NEXT(fidp, next); +- +- if (fidp_next) { + /* +- * Ensure the next fid survives a potential clunk request during +- * put_fid() below and v9fs_reopen_fid() in the next iteration. ++ * Ensure the fid survives a potential clunk request during ++ * v9fs_reopen_fid or put_fid. + */ +- fidp_next->ref++; ++ fidp->ref++; ++ fidp->flags |= FID_NON_RECLAIMABLE; ++ g_array_append_val(to_reopen, fidp); + } ++ } + +- /* We're done with this fid */ +- put_fid(pdu, fidp); ++ for (i = 0; i < to_reopen->len; i++) { ++ fidp = g_array_index(to_reopen, V9fsFidState*, i); ++ /* reopen the file/dir if already closed */ ++ err = v9fs_reopen_fid(pdu, fidp); ++ if (err < 0) { ++ break; ++ } + } + +- return 0; ++ for (i = 0; i < to_reopen->len; i++) { ++ put_fid(pdu, g_array_index(to_reopen, V9fsFidState*, i)); ++ } ++ return err; + } + + static void coroutine_fn virtfs_reset(V9fsPDU *pdu) + { + V9fsState *s = pdu->s; + V9fsFidState *fidp; ++ GList *freeing; ++ /* ++ * Get a list of all the values (fid states) in the table, which ++ * we then... ++ */ ++ g_autoptr(GList) fids = g_hash_table_get_values(s->fids); + +- /* Free all fids */ +- while (!QSIMPLEQ_EMPTY(&s->fid_list)) { +- /* Get fid */ +- fidp = QSIMPLEQ_FIRST(&s->fid_list); +- fidp->ref++; ++ /* ... remove from the table, taking over ownership. */ ++ g_hash_table_steal_all(s->fids); + +- /* Clunk fid */ +- QSIMPLEQ_REMOVE(&s->fid_list, fidp, V9fsFidState, next); ++ /* ++ * This allows us to release our references to them asynchronously without ++ * iterating over the hash table and risking iterator invalidation ++ * through concurrent modifications. ++ */ ++ for (freeing = fids; freeing; freeing = freeing->next) { ++ fidp = freeing->data; ++ fidp->ref++; + fidp->clunked = true; +- + put_fid(pdu, fidp); + } + } +@@ -3205,6 +3222,8 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, + V9fsFidState *tfidp; + V9fsState *s = pdu->s; + V9fsFidState *dirfidp = NULL; ++ GHashTableIter iter; ++ gpointer fid; + + v9fs_path_init(&new_path); + if (newdirfid != -1) { +@@ -3238,11 +3257,13 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, + if (err < 0) { + goto out; + } ++ + /* + * Fixup fid's pointing to the old name to + * start pointing to the new name + */ +- QSIMPLEQ_FOREACH(tfidp, &s->fid_list, next) { ++ g_hash_table_iter_init(&iter, s->fids); ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &tfidp)) { + if (v9fs_path_is_ancestor(&fidp->path, &tfidp->path)) { + /* replace the name */ + v9fs_fix_path(&tfidp->path, &new_path, strlen(fidp->path.data)); +@@ -3320,6 +3341,8 @@ static int coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir, + V9fsPath oldpath, newpath; + V9fsState *s = pdu->s; + int err; ++ GHashTableIter iter; ++ gpointer fid; + + v9fs_path_init(&oldpath); + v9fs_path_init(&newpath); +@@ -3336,7 +3359,8 @@ static int coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir, + * Fixup fid's pointing to the old name to + * start pointing to the new name + */ +- QSIMPLEQ_FOREACH(tfidp, &s->fid_list, next) { ++ g_hash_table_iter_init(&iter, s->fids); ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &tfidp)) { + if (v9fs_path_is_ancestor(&oldpath, &tfidp->path)) { + /* replace the name */ + v9fs_fix_path(&tfidp->path, &newpath, strlen(oldpath.data)); +@@ -4226,7 +4250,7 @@ int v9fs_device_realize_common(V9fsState *s, const V9fsTransport *t, + s->ctx.fmode = fse->fmode; + s->ctx.dmode = fse->dmode; + +- QSIMPLEQ_INIT(&s->fid_list); ++ s->fids = g_hash_table_new(NULL, NULL); + qemu_co_rwlock_init(&s->rename_lock); + + if (s->ops->init(&s->ctx, errp) < 0) { +@@ -4286,6 +4310,10 @@ void v9fs_device_unrealize_common(V9fsState *s) + if (s->ctx.fst) { + fsdev_throttle_cleanup(s->ctx.fst); + } ++ if (s->fids) { ++ g_hash_table_destroy(s->fids); ++ s->fids = NULL; ++ } + g_free(s->tag); + qp_table_destroy(&s->qpd_table); + qp_table_destroy(&s->qpp_table); +diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h +index 994f952600..10fd2076c2 100644 +--- a/hw/9pfs/9p.h ++++ b/hw/9pfs/9p.h +@@ -339,7 +339,7 @@ typedef struct { + struct V9fsState { + QLIST_HEAD(, V9fsPDU) free_list; + QLIST_HEAD(, V9fsPDU) active_list; +- QSIMPLEQ_HEAD(, V9fsFidState) fid_list; ++ GHashTable *fids; + FileOperations *ops; + FsContext ctx; + char *tag; +-- +2.36.2 + diff --git a/pkgs/applications/virtualization/qemu/canokey-qemu.nix b/pkgs/applications/virtualization/qemu/canokey-qemu.nix new file mode 100644 index 0000000000000..9536b91ba5403 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/canokey-qemu.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: +stdenv.mkDerivation rec { + pname = "canokey-qemu"; + version = "unstable-2022-06-23"; + rev = "b70af31229f1858089c3366f71b8d771de4a1e84"; + + src = fetchFromGitHub { + owner = "canokeys"; + repo = "canokey-qemu"; + inherit rev; + fetchSubmodules = true; + hash = "sha256-VJb59K/skx+DhoJs5qGUu070hAjQZC2Z6hAMXuX0bMw="; + }; + + postPatch = '' + substituteInPlace canokey-core/CMakeLists.txt \ + --replace "COMMAND git describe --always --tags --long --abbrev=8 --dirty >>" "COMMAND echo '$rev' >>" + ''; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/canokeys/canokey-qemu"; + description = "CanoKey QEMU Virt Card"; + license = licenses.asl20; + maintainers = with maintainers; [ oxalica ]; + }; +} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 8e7a683ed33e7..410c3bf2d9e21 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -3,7 +3,7 @@ , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , makeWrapper, runtimeShell, removeReferencesTo , attr, libcap, libcap_ng, socat -, CoreServices, Cocoa, Hypervisor, rez, setfile +, CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet , guestAgentSupport ? with stdenv.hostPlatform; isLinux || isSunOS || isWindows , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp @@ -26,6 +26,7 @@ , smbdSupport ? false, samba , tpmSupport ? true , uringSupport ? stdenv.isLinux, liburing +, canokeySupport ? false, canokey-qemu , hostCpuOnly ? false , hostCpuTargets ? (if hostCpuOnly then (lib.optional stdenv.isx86_64 "i386-softmmu" @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { gnutls nettle curl ] ++ lib.optionals ncursesSupport [ ncurses ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile ] + ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile vmnet ] ++ lib.optionals seccompSupport [ libseccomp ] ++ lib.optionals numaSupport [ numactl ] ++ lib.optionals alsaSupport [ alsa-lib ] @@ -79,7 +80,8 @@ stdenv.mkDerivation rec { ++ lib.optionals virglSupport [ virglrenderer ] ++ lib.optionals libiscsiSupport [ libiscsi ] ++ lib.optionals smbdSupport [ samba ] - ++ lib.optionals uringSupport [ liburing ]; + ++ lib.optionals uringSupport [ liburing ] + ++ lib.optionals canokeySupport [ canokey-qemu ]; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build @@ -109,6 +111,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E="; revert = true; }) + ./9pfs-use-GHashTable-for-fid-table.patch ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; @@ -161,7 +164,8 @@ stdenv.mkDerivation rec { ++ lib.optional tpmSupport "--enable-tpm" ++ lib.optional libiscsiSupport "--enable-libiscsi" ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd" - ++ lib.optional uringSupport "--enable-linux-io-uring"; + ++ lib.optional uringSupport "--enable-linux-io-uring" + ++ lib.optional canokeySupport "--enable-canokey"; dontWrapGApps = true; diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index ec078f55aa59f..5ea14cae03352 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -6,7 +6,6 @@ , pkg-config , which , libapparmor -, apparmor-parser , libseccomp , libselinux , makeWrapper diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 95909e36d0c0e..ed882709aa143 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -19,7 +19,8 @@ , pkg-config , python3 , shared-mime-info -, spice-gtk ? null +# https://gitlab.com/virt-viewer/virt-viewer/-/issues/88 +, spice-gtk_libsoup2 ? null , spice-protocol ? null , spiceSupport ? true , vte @@ -29,7 +30,7 @@ assert spiceSupport -> ( gdbm != null && libcap != null - && spice-gtk != null + && spice-gtk_libsoup2 != null && spice-protocol != null ); @@ -78,12 +79,12 @@ stdenv.mkDerivation rec { ] ++ optionals spiceSupport [ gdbm libcap - spice-gtk + spice-gtk_libsoup2 spice-protocol ]; # Required for USB redirection PolicyKit rules file - propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2; strictDeps = true; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index cde71d2b87fa4..234d72e468287 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -66,9 +66,9 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "stackprotector" "fortify" "pic" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ - cmake which + which # Xen bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 68e1467c5a8cd..a097900707727 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dwm"; - version = "6.3"; + version = "6.4"; src = fetchurl { url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz"; - sha256 = "utqgKFKbH7of1/moTztk8xGQRmyFgBG1Pi97cMajB40="; + sha256 = "sha256-+pwNaaWESFB2z8GICf1wXlwggNr7E9XnKaNkbKdwOm4="; }; buildInputs = [ libX11 libXinerama libXft ]; diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 33a313eb8eec5..6dc22a664d3dc 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/fbpanel/${pname}-${version}.tbz2"; sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = - [ pkg-config libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; + [ libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index f4392408c9e6f..f6660b3c0c8fa 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -26,7 +26,7 @@ }: let pname = "gamescope"; - version = "3.11.45-2"; + version = "3.11.47"; in stdenv.mkDerivation { inherit pname version; @@ -35,7 +35,7 @@ stdenv.mkDerivation { owner = "Plagman"; repo = "gamescope"; rev = "refs/tags/${version}"; - hash = "sha256-OLPwUELahqzmOBPvJg8pm556RH+H6TzRD9PHLnM2Ruc="; + hash = "sha256-GkvujrYc7dBbsGqeG0THqtEAox+VZ3DoWQK4gkHo+ds="; }; patches = [ ./use-pkgconfig.patch ]; diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index bddaab6157831..3472c760428bc 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -4,7 +4,6 @@ , libnotify , gobject-introspection , python3Packages -, wrapGAppsHook , extraLibs ? [] }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 2bff603cbd99d..d9a103035668c 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "icewm"; - version = "2.9.9"; + version = "3.0.1"; src = fetchFromGitHub { owner = "ice-wm"; repo = pname; rev = version; - hash = "sha256-55xi4GsP41FXJ/B/zEnjru72FhZQhXnpEdHcN0WF9Kk="; + hash = "sha256-0mnhH/7Y4VXpNUU++ln2//9/vuTxq9sa2D933Cf7Ifw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 2374d23c1d640..fe3e46f7b47a6 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "sha256-AfE36u5xSfivkg+hmJ6ASh6zXmTnLOv5RFigkGzySng="; + sha256 = "sha256-4f9YOVkOXn7+TzTUZS2Lultgj9WhiOPUa/fHUeyLBUU="; }; - cargoSha256 = "sha256-MmxF1jt5VUZGbkEe858HBjAuHhgDY23MJJxpYQ4ckhs="; + cargoSha256 = "sha256-D00IFTELRlqeKQ7zheJKTvu5FBgYQXsZ+OnPnVzweC4="; buildInputs = rpathLibs; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index a9b16c53fd568..5c48953e79e35 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-NJLuOUBQmgphGMFZN3MsIOP99YI+CxyR+JuybX3Vnpc="; + sha256 = "sha256-I0BWwEKvOYQ1s2IpvV70GWxhARdX6AZ+B4ypnTlLlDw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix index 499713f966aaf..40ac908fe5807 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -1,6 +1,5 @@ { lib, stdenv -, fetchurl , coreutils , makeWrapper , sway-unwrapped diff --git a/pkgs/applications/window-managers/sway/wsr.nix b/pkgs/applications/window-managers/sway/wsr.nix index 64d9fd7d7db3e..23a82bd2df08d 100644 --- a/pkgs/applications/window-managers/sway/wsr.nix +++ b/pkgs/applications/window-managers/sway/wsr.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swaywsr"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "pedroscaff"; repo = pname; - rev = "6c4671c702f647395d983aaf607286db1c692db6"; - sha256 = "0bmpbhyvgnbi5baj6v0wdxpdh9cnlzvcc44vh3vihmzsp6i5q05a"; + rev = "0276b43824af5c40085248c1275feaa372c412a5"; + sha256 = "sha256-KCMsn9uevmmjHkP4zwfaWSUI10JgT3M91iqmXI9Cv2Y="; }; - cargoSha256 = "1pmkyw60ggn5filb47nyf97g1arrw7nfa4yjndnx35zw12mkj61d"; + cargoSha256 = "sha256-j/9p28ezy8m5NXReOmG1oryWd+GcY/fNW6i7OrEvjSc="; nativeBuildInputs = [ python3 ]; buildInputs = [ libxcb ]; diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/applications/window-managers/tinywm/default.nix index 8fa6a84b721de..50fbae605da2a 100644 --- a/pkgs/applications/window-managers/tinywm/default.nix +++ b/pkgs/applications/window-managers/tinywm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontConfigure = true; buildPhase = '' - ${stdenv.cc}/bin/cc -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm + $CC -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm ''; installPhase = '' diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index bd9bcb30d107d..51111932cd237 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git -, alsa-lib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, alsa-lib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 799c58283d934..177e185d82734 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,35 +1,27 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, wayland-scanner, python3 -, wayland, libGL, mesa, libxkbcommon, cairo, libxcb -, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev -, colord, lcms2, pipewire ? null -, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null -, libwebp ? null, xwayland ? null, wayland-protocols +{ lib, stdenv, fetchurl +, meson, ninja, pkg-config, python3, wayland-scanner +, cairo, colord, dbus, lcms2, libGL, libXcursor, libdrm, libevdev, libinput +, libjpeg, seatd, libxcb, libxkbcommon, mesa, mtdev, pam, udev, wayland +, wayland-protocols, xlibsWrapper +, pipewire ? null, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null +, libva ? null, libwebp ? null, xwayland ? null # beware of null defaults, as the parameters *are* supplied by callPackage by default }: stdenv.mkDerivation rec { pname = "weston"; - version = "10.0.1"; + version = "11.0.0"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - sha256 = "05a10gfbadyxkwgsncc5vc343f493csgh10vk0878nl6d98557la"; + sha256 = "078y14ff9wmmbzq314f7bq1bxx0rc12xy4j362n60iamr56qs4x6"; }; - patches = [ - # Fix race condition in build system - (fetchpatch { - url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/0d3e438d080433ed5d203c876e7de6c7f8a14f98.patch"; - sha256 = "sha256-d9NG1vUIuL4jpXqCo0myz/97JuFYesH+8kJnegQXeMU="; - }) - ]; - - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner python3 ]; + nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ - wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm - mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva - libwebp wayland-protocols - colord lcms2 pipewire + cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput + libjpeg seatd libunwind libva libwebp libxcb libxkbcommon mesa mtdev pam + pango pipewire udev vaapi wayland wayland-protocols xlibsWrapper ]; mesonFlags= [ @@ -44,7 +36,6 @@ stdenv.mkDerivation rec { "-Dtest-junit-xml=false" # TODO: #"--enable-clients" - #"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails ] ++ lib.optionals (xwayland != null) [ "-Dxwayland-path=${xwayland.out}/bin/Xwayland" ]; diff --git a/pkgs/applications/window-managers/xmonad/xmonadctl.nix b/pkgs/applications/window-managers/xmonad/xmonadctl.nix index da1e414d84168..e0c4523404562 100644 --- a/pkgs/applications/window-managers/xmonad/xmonadctl.nix +++ b/pkgs/applications/window-managers/xmonad/xmonadctl.nix @@ -1,16 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, ghcWithPackages, ... }: +{ stdenv, lib, fetchFromGitHub, ghcWithPackages, haskellPackages, ... }: let xmonadctlEnv = ghcWithPackages (self: [ self.xmonad-contrib self.X11 ]); in stdenv.mkDerivation rec { pname = "xmonadctl"; - version = "0.17.0"; - src = fetchFromGitHub { - owner = "xmonad"; - repo = "xmonad-contrib"; - rev = "v${version}"; - sha256 = "142ycg7dammq98drimv6xbih8dla9qindxds9fgkspmrrils3sar"; - }; + inherit (haskellPackages.xmonad-contrib) src version; installPhase = '' runHook preInstall |