diff options
Diffstat (limited to 'pkgs/applications')
988 files changed, 23710 insertions, 15727 deletions
diff --git a/pkgs/applications/accessibility/espeakup/default.nix b/pkgs/applications/accessibility/espeakup/default.nix new file mode 100644 index 0000000000000..00f432ff4138a --- /dev/null +++ b/pkgs/applications/accessibility/espeakup/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, meson +, ninja +, espeak-ng +, fetchFromGitHub +, pkg-config +, ronn +, alsa-lib +, systemd +}: + +stdenv.mkDerivation rec { + pname = "espeakup"; + version = "0.90"; + + src = fetchFromGitHub { + owner = "linux-speakup"; + repo = "espeakup"; + rev = "v${version}"; + sha256 = "0lmjwafvfxy07zn18v3dzjwwpnid2xffgvy2dzlwkbns8gb60ds2"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ronn + ]; + + buildInputs = [ + espeak-ng + alsa-lib + systemd + ]; + + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + + meta = with lib; { + homepage = "https://github.com/linux-speakup/espeakup"; + description = "Lightweight connector for espeak-ng and speakup"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ethindp ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 94129d05288bd..b2586ef76c2b3 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-51Grkn6NSR6azTRuq1vdbDg7d3HuQQ+ZJCsM2mSrSHk="; + sha256 = "sha256-U46OQ0bXkXv6za8vUZxtbxJKqiF/X/xxJsqQGpnRIpg="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cat Cargo.toml.in Cargo.deps > Cargo.toml ''; name = "${pname}-${version}"; - sha256 = "sha256-vQaiEENxaQxBGYP1br03wSkU7OGOYkJvMBUAOeb3jGk="; + sha256 = "sha256-4q8MW1n/xu538+R5ZlA+p/hd6pOQPKj7jOFwnuMc7sk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/applications/accessibility/wvkbd/default.nix new file mode 100644 index 0000000000000..a593b0d2ea2b0 --- /dev/null +++ b/pkgs/applications/accessibility/wvkbd/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, lib +, fetchFromGitHub +, wayland-scanner +, wayland +, pango +, glib +, harfbuzz +, cairo +, pkg-config +, libxkbcommon +}: + +stdenv.mkDerivation rec { + pname = "wvkbd"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "jjsullivan5196"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-5UV2PMrLXtF3AxjfPxxwFRkgVef+Ap8nG1v795o0bWE="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ wayland-scanner wayland pango glib harfbuzz cairo libxkbcommon ]; + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + homepage = "https://github.com/jjsullivan5196/wvkbd"; + description = "On-screen keyboard for wlroots"; + maintainers = [ maintainers.elohmeier ]; + platforms = platforms.linux; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/audio/ChowPhaser/default.nix b/pkgs/applications/audio/ChowPhaser/default.nix new file mode 100644 index 0000000000000..a828a1e1d0410 --- /dev/null +++ b/pkgs/applications/audio/ChowPhaser/default.nix @@ -0,0 +1,76 @@ +{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, freeglut +, freetype, gcc-unwrapped, gtk3, lib, libGL, libXcursor, libXdmcp, libXext +, libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux +, libsepol, libsysprof-capture, libthai, libxkbcommon, pcre, pkg-config +, python3, sqlite, stdenv }: + +stdenv.mkDerivation rec { + pname = "ChowPhaser"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "jatinchowdhury18"; + repo = "ChowPhaser"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-9wo7ZFMruG3QNvlpILSvrFh/Sx6J1qnlWc8+aQyS4tQ="; + }; + + nativeBuildInputs = [ pkg-config cmake ]; + + buildInputs = [ + alsa-lib + at-spi2-core + curl + dbus + libepoxy + freeglut + freetype + gtk3 + libGL + libXcursor + libXdmcp + libXext + libXinerama + libXrandr + libXtst + libdatrie + libjack2 + libpsl + libselinux + libsepol + libsysprof-capture + libthai + libxkbcommon + pcre + python3 + sqlite + gcc-unwrapped + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin $out/share/doc/ChowPhaser/ + cd ChowPhaserMono_artefacts/Release + cp libChowPhaserMono_SharedCode.a $out/lib + cp -r VST3/ChowPhaserMono.vst3 $out/lib/vst3 + cp Standalone/ChowPhaserMono $out/bin + cd ../../ChowPhaserStereo_artefacts/Release + cp libChowPhaserStereo_SharedCode.a $out/lib + cp -r VST3/ChowPhaserStereo.vst3 $out/lib/vst3 + cp Standalone/ChowPhaserStereo $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/jatinchowdhury18/ChowPhaser"; + description = "Phaser effect based loosely on the Schulte Compact Phasing 'A'"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/LibreArp/default.nix b/pkgs/applications/audio/LibreArp/default.nix new file mode 100644 index 0000000000000..2374059e95a8e --- /dev/null +++ b/pkgs/applications/audio/LibreArp/default.nix @@ -0,0 +1,53 @@ +{ stdenv, lib, fetchFromGitLab, cmake, pkg-config, cairo, libxkbcommon +, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor +, alsa-lib, libjack2, lv2, gcc-unwrapped, curl}: + +stdenv.mkDerivation rec { + pname = "LibreArp"; + version = "2.2"; + + src = fetchFromGitLab { + owner = "LibreArp"; + repo = "LibreArp"; + rev = version; + hash = "sha256-jCUT/sflO9L57xRTqNR90RbwJ0uZ+xJVXnB3n+FhWBo="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + cairo + libxkbcommon + xcbutilcursor + xcbutilkeysyms + xcbutil + libXrandr + libXinerama + libXcursor + alsa-lib + libjack2 + lv2 + curl + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" + ]; + + installPhase = '' + mkdir -p $out/lib/vst3 + cd LibreArp_artefacts/Release + cp -r VST3/LibreArp.vst3 $out/lib/vst3 + ''; + + meta = with lib; { + description = + "A pattern-based arpeggio generator plugin."; + homepage = "https://librearp.gitlab.io/"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/LibreArp/lv2.nix b/pkgs/applications/audio/LibreArp/lv2.nix new file mode 100644 index 0000000000000..ce70fd112f2f9 --- /dev/null +++ b/pkgs/applications/audio/LibreArp/lv2.nix @@ -0,0 +1,53 @@ +{ stdenv, lib, fetchFromGitLab, cmake, pkg-config, cairo, libxkbcommon +, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor +, alsa-lib, libjack2, lv2, gcc-unwrapped, curl}: + +stdenv.mkDerivation rec { + pname = "LibreArp-lv2"; + version = "2.2"; + + src = fetchFromGitLab { + owner = "LibreArp"; + repo = "LibreArp"; + rev = "${version}-lv2"; + hash = "sha256-j5SksuhC4ZXXILfOpwXNqIu5fO07a/6tiZ5qUo+p0Ug="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + cairo + libxkbcommon + xcbutilcursor + xcbutilkeysyms + xcbutil + libXrandr + libXinerama + libXcursor + alsa-lib + libjack2 + lv2 + curl + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 + cd LibreArp_artefacts/Release + cp -r LV2/LibreArp.lv2 $out/lib/lv2 + ''; + + meta = with lib; { + description = + "A pattern-based arpeggio generator plugin."; + homepage = "https://librearp.gitlab.io/"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index a501cd0a1d883..a0f5b48a63231 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -13,11 +13,22 @@ , libXinerama , libXext , libXcursor -, libobjc +, Foundation , Cocoa +, Carbon , CoreServices +, ApplicationServices +, CoreAudio +, CoreMIDI +, AudioToolbox +, Accelerate +, CoreImage +, IOKit +, AudioUnit +, QuartzCore , WebKit , DiscRecording +, CoreAudioKit # Enabling JACK requires a JACK server at runtime, no fallback mechanism , withJack ? false, jack @@ -35,25 +46,16 @@ let in stdenv.mkDerivation rec { pname = "${lib.strings.toLower type}plug"; - version = "1.0.2"; + version = "unstable-2021-12-17"; src = fetchFromGitHub { owner = "jpcima"; repo = "ADLplug"; - rev = "v${version}"; + rev = "a488abedf1783c61cb4f0caa689f1b01bf9aa17d"; fetchSubmodules = true; - sha256 = "0mqx4bzri8s880v7jwd24nb93m5i3aklqld0b3h0hjnz0lh2qz0f"; + sha256 = "1a5zw0rglqgc5wq1n0s5bxx7y59dsg6qy02236fakl34bvbk60yz"; }; - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/jpcima/ADLplug/83636c55bec1b86cabf634b9a6d56d07f00ecc61/resources/patch/juce-gcc9.patch"; - sha256 = "15hkdb76n9lgjsrpczj27ld9b4804bzrgw89g95cj4sc8wwkplyy"; - extraPrefix = "thirdparty/JUCE/"; - stripLen = 1; - }) - ]; - cmakeFlags = [ "-DADLplug_CHIP=${chip}" "-DADLplug_USE_SYSTEM_FMT=ON" @@ -61,9 +63,24 @@ stdenv.mkDerivation rec { ]; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ + # "fp.h" file not found "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers" ]); + NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ + # Framework that JUCE needs which don't get linked properly + "-framework CoreAudioKit" + "-framework QuartzCore" + "-framework AudioToolbox" + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + # JUCE dlopen's these at runtime + "-lX11" + "-lXext" + "-lXcursor" + "-lXinerama" + "-lXrandr" + ]); + nativeBuildInputs = [ cmake pkg-config @@ -81,17 +98,32 @@ stdenv.mkDerivation rec { libXext libXcursor ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc + Foundation Cocoa + Carbon CoreServices + ApplicationServices + CoreAudio + CoreMIDI + AudioToolbox + Accelerate + CoreImage + IOKit + AudioUnit + QuartzCore WebKit DiscRecording + CoreAudioKit ] ++ lib.optional withJack jack; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir $out/Applications + mkdir -p $out/{Applications,Library/Audio/Plug-Ins/{VST,Components}} + mv $out/bin/${mainProgram}.app $out/Applications/ ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram} + + mv vst2/${mainProgram}.vst $out/Library/Audio/Plug-Ins/VST/ + mv au/${mainProgram}.component $out/Library/Audio/Plug-Ins/Components/ ''; meta = with lib; { diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix new file mode 100644 index 0000000000000..c3cc1a21ffc58 --- /dev/null +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, lv2 }: + +stdenv.mkDerivation rec { + pname = "airwindows-lv2"; + version = "1.0"; + src = fetchFromGitHub { + owner = "hannesbraun"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-xokV4Af0evdo73D9JObzAmY1wD0aUyXiI0Z7BUN0m+M="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ lv2 ]; + + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/lv2" ]; + + meta = with lib; { + description = "Airwindows plugins (ported to LV2)"; + homepage = "https://github.com/hannesbraun/airwindows-lv2"; + license = licenses.mit; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix new file mode 100644 index 0000000000000..c0b90592cd246 --- /dev/null +++ b/pkgs/applications/audio/amberol/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitLab +, rustPlatform +, desktop-file-utils +, appstream-glib +, meson +, ninja +, pkg-config +, reuse +, m4 +, wrapGAppsHook4 +, glib +, gtk4 +, gst_all_1 +, libadwaita +, dbus +}: + +stdenv.mkDerivation rec { + pname = "amberol"; + version = "0.6.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = pname; + rev = version; + hash = "sha256-mbRBLhnALPFoHwvx05o0lH5Ld4BN+hPY2OyajgTFsek="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-/5AHwbolEWsj3ChLFJxQaccfookEGvSSkehw0THYnSE="; + }; + + postPatch = '' + patchShebangs build-aux + ''; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + meson + ninja + pkg-config + reuse + m4 + wrapGAppsHook4 + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + glib + gtk4 + libadwaita + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + dbus + ]; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/ebassi/amberol"; + description = "A small and simple sound and music player"; + maintainers = with maintainers; [ linsui ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index 6a4abbbdf5342..bb89cb45672bd 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -2,7 +2,7 @@ , pkg-config, intltool , glib, dbus, gtk3, libappindicator-gtk3, gst_all_1 , librsvg, wrapGAppsHook -, pulseaudioSupport ? true, libpulseaudio ? null }: +, pulseaudioSupport ? true, libpulseaudio }: stdenv.mkDerivation rec { pname = "audio-recorder"; diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix deleted file mode 100644 index df885c90371f0..0000000000000 --- a/pkgs/applications/audio/axoloti/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip -, gnumake, gcc-arm-embedded, binutils-arm-embedded -, dfu-util-axoloti, jdk, ant, libfaketime }: - -stdenv.mkDerivation rec { - version = "1.0.12-2"; - pname = "axoloti"; - - src = fetchFromGitHub { - owner = "axoloti"; - repo = "axoloti"; - rev = version; - sha256 = "1qffis277wshldr3i939b0r2x3a2mlr53samxqmr2nk1sfm2b4w9"; - }; - - chibi_version = "2.6.9"; - chibi_name = "ChibiOS_${chibi_version}"; - - chibios = fetchurl { - url = "mirror://sourceforge/project/chibios/ChibiOS_RT%20stable/Version%20${chibi_version}/${chibi_name}.zip"; - sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj"; - }; - - nativeBuildInputs = [ - makeWrapper - unzip - gcc-arm-embedded - binutils-arm-embedded - dfu-util-axoloti - ant - ]; - buildInputs = [jdk libfaketime ]; - - patchPhase = '' - unzip ${chibios} - mv ${chibi_name} chibios - (cd chibios/ext; unzip -q -o fatfs-0.9-patched.zip) - - # Remove source of non-determinism in ChibiOS - substituteInPlace "chibios/os/various/shell.c" \ - --replace "#ifdef __DATE__" "#if 0" - - # Hardcode path to "make" - for f in "firmware/compile_firmware_linux.sh" \ - "firmware/compile_patch_linux.sh"; do - substituteInPlace "$f" \ - --replace "make" "${gnumake}/bin/make" - done - - # Hardcode dfu-util path - substituteInPlace "platform_linux/upload_fw_dfu.sh" \ - --replace "/bin/dfu-util" "" - substituteInPlace "platform_linux/upload_fw_dfu.sh" \ - --replace "./dfu-util" "${dfu-util-axoloti}/bin/dfu-util" - - # Fix build version - substituteInPlace "build.xml" \ - --replace "(git missing)" "${version}" - - # Remove build time - substituteInPlace "build.xml" \ - --replace "<tstamp>" "" - substituteInPlace "build.xml" \ - --replace \ - '<format property="build.time" pattern="dd/MM/yyyy HH:mm:ss z"/>' \ - '<property name="build.time" value=""/>' - substituteInPlace "build.xml" \ - --replace "</tstamp>" "" - substituteInPlace "build.xml" \ - --replace \ - '{line.separator}</echo>' \ - '{line.separator}</echo> <touch file="src/main/java/axoloti/Version.java" millis="0" />' - ''; - - buildPhase = '' - find . -exec touch -d '1970-01-01 00:00' {} \; - (cd platform_linux; sh compile_firmware.sh) - faketime "1970-01-01 00:00:00" ant -Dbuild.runtime=true - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/axoloti - - cp -r doc firmware chibios platform_linux CMSIS *.txt $out/share/axoloti/ - install -vD dist/Axoloti.jar $out/share/axoloti/ - - makeWrapper ${jdk}/bin/java $out/bin/axoloti --add-flags "-Daxoloti_release=$out/share/axoloti -Daxoloti_runtime=$out/share/axoloti -jar $out/share/axoloti/Axoloti.jar" - ''; - - meta = with lib; { - homepage = "http://www.axoloti.com"; - description = '' - Sketching embedded digital audio algorithms. - - To fix permissions of the Axoloti USB device node, add a similar udev rule to <literal>services.udev.extraRules</literal>: - <literal>SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0442", OWNER="someuser", GROUP="somegroup"</literal> - ''; - license = licenses.gpl3; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix deleted file mode 100644 index a8a2f8813af87..0000000000000 --- a/pkgs/applications/audio/axoloti/dfu-util.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libusb1-axoloti }: - -stdenv.mkDerivation rec { - pname = "dfu-util"; - version = "0.8"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1-axoloti ]; - - src = fetchurl { - url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; - sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm"; - }; - - meta = with lib; { - description = "Device firmware update (DFU) USB programmer"; - longDescription = '' - dfu-util is a program that implements the host (PC) side of the USB - DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol. - - DFU is intended to download and upload firmware to devices connected over - USB. It ranges from small devices like micro-controller boards up to mobile - phones. With dfu-util you are able to download firmware to your device or - upload firmware from it. - ''; - homepage = "http://dfu-util.sourceforge.net"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix deleted file mode 100644 index 820a8998f0bd8..0000000000000 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, fetchurl, pkg-config, systemd, libobjc, IOKit, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "libusb"; - version = "1.0.19"; - - src = fetchurl { - url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2"; - sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; - }; - - outputs = [ "out" "dev" ]; # get rid of propagating systemd closure - - buildInputs = [ pkg-config ]; - propagatedBuildInputs = lib.optional stdenv.isLinux systemd - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit ]; - - patches = [ - (fetchpatch { - name = "libusb.stdfu.patch"; - url = "https://raw.githubusercontent.com/axoloti/axoloti/1.0.12/platform_linux/src/libusb.stdfu.patch"; - sha256 = "194j7j61i4q6x0ihm9ms8dxd4vliw20n2rj6cm9h17qzdl9xr33d"; - }) - ]; - - NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; - - preFixup = lib.optionalString stdenv.isLinux '' - sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la - ''; - - meta = with lib; { - homepage = "http://www.libusb.info"; - description = "User-space USB library"; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index a5ef585969e61..6c48c756ab24c 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -142,6 +142,7 @@ stdenv.mkDerivation rec { gpl3Plus ] ++ lib.optional enableVST2 unfree; maintainers = with maintainers; [ astro tobiasBora OPNA2608 ]; + mainProgram = "BespokeSynth"; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 10cbbeb21de0b..2f177c2f8c637 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-cpEV0EWW9vd2ZE+RaqN9fhyy7axgPlx4PmlOeX3TSfY="; + sha256 = "sha256-UCafrjrEwwHkhPum7sTOjtXzy7PNeK5/aeKg+b3CGJU="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/blanket/default.nix b/pkgs/applications/audio/blanket/default.nix index b343953f3f849..6c648ed711591 100644 --- a/pkgs/applications/audio/blanket/default.nix +++ b/pkgs/applications/audio/blanket/default.nix @@ -9,21 +9,21 @@ , appstream-glib , python3Packages , glib -, gtk3 -, libhandy +, gtk4 +, libadwaita , gobject-introspection , gst_all_1 }: python3Packages.buildPythonApplication rec { pname = "blanket"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "rafaelmardojai"; repo = "blanket"; - rev = version; - sha256 = "00i821zqfbigxmc709322r16z75qsw4rg23yhv35gza9sl65bzkg"; + rev = "refs/tags/${version}"; + sha256 = "sha256-4gthT1x76IfXWkLaLMPtFS4TRlRGk5Enbu/k1jAHzwE="; }; nativeBuildInputs = [ @@ -37,8 +37,8 @@ python3Packages.buildPythonApplication rec { buildInputs = [ glib - gtk3 - libhandy + gtk4 + libadwaita gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 1e77ade6cdb42..a1db5bb275bbb 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -23,23 +23,14 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "22.02"; + version = "22.04"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz"; - sha256 = "sha256-IVlAROFGFffTEU00NCmv74w1DRb7dNMp20FeBVoDrdM="; + sha256 = "sha256-7As4CckwByrTynOOpwAXa1R9Bpp/ft537f+PvAgz/BE="; }; - patches = [ - # see https://github.com/DISTRHO/Cardinal/issues/151#issuecomment-1041886260 - (fetchpatch { - url = - "https://github.com/DISTRHO/Cardinal/commit/13e9ef37c5dd35d77a54b1cb006767be7a72ac69.patch"; - sha256 = "sha256-NYUYLbLeBX1WEzjPi0s/T1N+EXQKyi0ifbPxgBYDjRs="; - }) - ]; - prePatch = '' patchShebangs ./dpf/utils/generate-ttl.sh ''; diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index bebc0320bb025..9e4e6a2880d01 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.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A0QmyphjsNU06kh2f9rXrR+GkDEI5HqXRA9J82E6qJU="; + sha256 = "sha256-FAQTIM5NpcOhLNMf62qiKaxg6QtK5uIJF/XT6KJVnUc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index a595f285c68a7..8b76425f6876f 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }: +{ lib, stdenv, fetchurl, makeWrapper, bc, findutils, flac, lame, opusTools, procps, sox }: stdenv.mkDerivation rec { pname = "caudec"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patchShebangs ./install.sh ''; - nativeBuildInputs = [ bash makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' ./install.sh --prefix=$out/bin diff --git a/pkgs/applications/audio/cdparanoia/configure.patch b/pkgs/applications/audio/cdparanoia/configure.patch new file mode 100644 index 0000000000000..81c50cec814ab --- /dev/null +++ b/pkgs/applications/audio/cdparanoia/configure.patch @@ -0,0 +1,22 @@ +diff --git a/configure.in b/configure.ac +similarity index 90% +rename from configure.in +rename to configure.ac +index 3ad98ca11da..8fad378faf4 100644 +--- a/configure.in ++++ b/configure.ac +@@ -1,13 +1,8 @@ + AC_INIT(interface/interface.c) + +-cp $srcdir/configure.guess $srcdir/config.guess +-cp $srcdir/configure.sub $srcdir/config.sub +- + AC_CANONICAL_HOST + +-if test -z "$CC"; then +- AC_PROG_CC +-fi ++AC_PROG_CC + AC_PROG_RANLIB + AC_CHECK_PROG(AR,ar,ar) + AC_CHECK_PROG(INSTALL,install,install) diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 10ff66de77ed4..7f699b82aefc8 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, gnu-config, IOKit, Carbon }: +{ lib, stdenv, fetchurl, fetchpatch +, updateAutotoolsGnuConfigScriptsHook, autoreconfHook +, IOKit, Carbon +}: stdenv.mkDerivation rec { pname = "cdparanoia-III"; @@ -10,16 +13,29 @@ stdenv.mkDerivation rec { }; patches = lib.optionals stdenv.isDarwin [ - (fetchurl { + (fetchpatch { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; - sha256 = "1n86kzm2ssl8fdf5wlhp6ncb2bf6b9xlb5vg0mhc85r69prqzjiy"; + sha256 = "0hq3lvfr0h1m3p0r33jij0s1aspiqlpy533rwv19zrfllb39qvr8"; + # Our configure patch will subsume it, but we want our configure + # patch to be used on all platforms so we cannot just start where + # this leaves off. + excludes = [ "configure.in" ]; }) (fetchurl { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad"; }) - ] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch - ++ [./fix_private_keyword.patch]; + ] ++ [ + # Has to come after darwin patches + ./fix_private_keyword.patch + # Order does not matter + ./configure.patch + ] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch; + + nativeBuildInputs = [ + updateAutotoolsGnuConfigScriptsHook + autoreconfHook + ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Carbon @@ -28,13 +44,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - preConfigure = '' - unset CC - '' + lib.optionalString (!stdenv.hostPlatform.isx86) '' - cp ${gnu-config}/config.sub configure.sub - cp ${gnu-config}/config.guess configure.guess - ''; - # Build system reuses the same object file names for shared and static # library. Occasionally fails in the middle: # gcc -O2 -fsigned-char -g -O2 -c scan_devices.c diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/applications/audio/cider/default.nix index edab6d109ef5f..bb59a6d498c5a 100644 --- a/pkgs/applications/audio/cider/default.nix +++ b/pkgs/applications/audio/cider/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "cider"; - version = "1.3.1308"; + version = "1.4.1.1680"; src = fetchurl { - url = "https://1308-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-${version}.AppImage"; - sha256 = "1lbyvn1c8155p039qfzx7jwad7km073phkmrzjm0w3ahdpwz3wgi"; + url = "https://github.com/ciderapp/cider-releases/releases/download/v${version}/Cider-${builtins.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}-alpha.${builtins.elemAt (lib.splitVersion version) 3}.AppImage"; + sha256 = "sha256-hEv+vfMMH+Trwa1UF5R8EtyYeyiRVLP0BrXOK2+1q8M="; }; extraInstallCommands = diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 550100574db40..a7f58e0d68bb6 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -51,24 +51,17 @@ let withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; - # On the update after all 1.4rc, qt5.15 and protobuf 3.15 will be supported. - version = "1.4.0rc1"; + version = "unstable-2022-04-11"; src = fetchFromGitHub { owner = "clementine-player"; repo = "Clementine"; - rev = version; - sha256 = "1rqk0hrsn8f8bjk0j0vq1af0ygy6xx7qi9fw0jjw2cmj6kzckyi2"; + rev = "250024e117fbe5fae7c62b9c8e655d66412a6ed7"; + sha256 = "06fcbs3wig3mh711iypyj49qm5246f7qhvgvv8brqfrd8cqyh6qf"; }; patches = [ ./clementine-spotify-blob.patch - (fetchpatch { - # "short-term" fix for execution on wayland (1.4.0rc1-131-g2179027a6) - # for https://github.com/clementine-player/Clementine/issues/6587 - url = "https://github.com/clementine-player/Clementine/commit/2179027a6d97530c857e43be873baacd696ff332.patch"; - sha256 = "0344bfcyvjim5ph8w4km6zkg96rj5g9ybp9x14qgyw2gkdksimn6"; - }) ]; nativeBuildInputs = [ @@ -91,6 +84,7 @@ let gettext glew gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad gst_all_1.gstreamer gvfs libechonest diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index ea7ad1015be9a..3a4cae32a1fdc 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config -, libiconv, CoreAudio, AudioUnit +, libiconv, CoreAudio, AudioUnit, VideoToolbox , alsaSupport ? stdenv.isLinux, alsa-lib ? null # simple fallback for everyone else @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ lib.optional stdenv.cc.isClang clangGCC - ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit ] + ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ] ++ flatten (concatMap (a: a.deps) opts); makeFlags = [ "LD=$(CC)" ]; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index ebcdb8f4290e3..4da3efbffe471 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -1,4 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, libsndfile, libsamplerate, flex, bison, boost, gettext +, Accelerate +, AudioUnit +, CoreAudio +, CoreMIDI , alsa-lib ? null , libpulseaudio ? null , libjack2 ? null @@ -26,21 +30,29 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp + ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib" ++ lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h"; nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ] - ++ builtins.filter (optional: optional != null) [ + ++ lib.optionals stdenv.isDarwin [ + Accelerate AudioUnit CoreAudio CoreMIDI + ] ++ lib.optionals stdenv.isLinux (builtins.filter (optional: optional != null) [ alsa-lib libpulseaudio libjack2 liblo ladspa-sdk fluidsynth eigen - curl tcltk fltk ]; + curl tcltk fltk + ]); + + postInstall = lib.optional stdenv.isDarwin '' + mkdir -p $out/Library/Frameworks + ln -s $out/lib/CsoundLib64.framework $out/Library/Frameworks + ''; meta = with lib; { description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; homepage = "https://csound.com/"; license = licenses.lgpl21Plus; maintainers = [maintainers.marcweber]; - platforms = platforms.linux; + platforms = platforms.unix; }; } - diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index e8b0ded4c00db..ac5cb06a21985 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -6,56 +6,35 @@ , pkg-config , jansson # deadbeef can use either gtk2 or gtk3 -, gtk2Support ? false, gtk2 ? null -, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null +, gtk2Support ? false, gtk2 +, gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook # input plugins -, vorbisSupport ? true, libvorbis ? null -, mp123Support ? true, libmad ? null -, flacSupport ? true, flac ? null -, wavSupport ? true, libsndfile ? null -, cdaSupport ? true, libcdio ? null, libcddb ? null -, aacSupport ? true, faad2 ? null -, opusSupport ? true, opusfile ? null -, wavpackSupport ? false, wavpack ? null -, ffmpegSupport ? false, ffmpeg ? null -, apeSupport ? true, yasm ? null +, vorbisSupport ? true, libvorbis +, mp123Support ? true, libmad +, flacSupport ? true, flac +, wavSupport ? true, libsndfile +, cdaSupport ? true, libcdio, libcddb +, aacSupport ? true, faad2 +, opusSupport ? true, opusfile +, wavpackSupport ? false, wavpack +, ffmpegSupport ? false, ffmpeg +, apeSupport ? true, yasm # misc plugins -, zipSupport ? true, libzip ? null -, artworkSupport ? true, imlib2 ? null -, hotkeysSupport ? true, libX11 ? null -, osdSupport ? true, dbus ? null +, zipSupport ? true, libzip +, artworkSupport ? true, imlib2 +, hotkeysSupport ? true, libX11 +, osdSupport ? true, dbus # output plugins -, alsaSupport ? true, alsa-lib ? null -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null +, alsaSupport ? true, alsa-lib +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio # effect plugins -, resamplerSupport ? true, libsamplerate ? null -, overloadSupport ? true, zlib ? null +, resamplerSupport ? true, libsamplerate +, overloadSupport ? true, zlib # transports -, remoteSupport ? true, curl ? null +, remoteSupport ? true, curl }: assert gtk2Support || gtk3Support; -assert gtk2Support -> gtk2 != null; -assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null; -assert vorbisSupport -> libvorbis != null; -assert mp123Support -> libmad != null; -assert flacSupport -> flac != null; -assert wavSupport -> libsndfile != null; -assert cdaSupport -> (libcdio != null && libcddb != null); -assert aacSupport -> faad2 != null; -assert opusSupport -> opusfile != null; -assert zipSupport -> libzip != null; -assert ffmpegSupport -> ffmpeg != null; -assert apeSupport -> yasm != null; -assert artworkSupport -> imlib2 != null; -assert hotkeysSupport -> libX11 != null; -assert osdSupport -> dbus != null; -assert alsaSupport -> alsa-lib != null; -assert pulseSupport -> libpulseaudio != null; -assert resamplerSupport -> libsamplerate != null; -assert overloadSupport -> zlib != null; -assert wavpackSupport -> wavpack != null; -assert remoteSupport -> curl != null; stdenv.mkDerivation rec { pname = "deadbeef"; diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix deleted file mode 100644 index 3f62e73e7e469..0000000000000 --- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, deadbeef, gtk3, libxml2 }: - -stdenv.mkDerivation rec { - pname = "deadbeef-infobar-plugin"; - version = "1.4"; - - src = fetchurl { - url = "https://bitbucket.org/dsimbiriatin/deadbeef-infobar/downloads/deadbeef-infobar-${version}.tar.gz"; - sha256 = "0c9wh3wh1hdww7v96i8cy797la06mylhfi0880k8vwh88079aapf"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ deadbeef gtk3 libxml2 ]; - - buildFlags = [ "gtk3" ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/deadbeef - cp gtk3/ddb_infobar_gtk3.so $out/lib/deadbeef - - runHook postInstall - ''; - - meta = with lib; { - broken = true; # crashes DeaDBeeF and is abandoned (https://bitbucket.org/dsimbiriatin/deadbeef-infobar/issues/38/infobar-causes-deadbeef-180-to-crash) - description = "DeaDBeeF Infobar Plugin"; - homepage = "https://bitbucket.org/dsimbiriatin/deadbeef-infobar"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.jtojnar ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index 3a2dbd139d76b..7e27bf7837059 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "denemo"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "https://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; - sha256 = "sha256-B6GbBL/o/z0emT+Iw6XvWmAsJCmIwSGCyV1DkhDyfBY="; + sha256 = "sha256-S+WXDGmEf5fx+HYnXJdE5QNOfJg7EqEEX7IMI2SUtV0="; }; buildInputs = [ diff --git a/pkgs/applications/audio/dsf2flac/default.nix b/pkgs/applications/audio/dsf2flac/default.nix index db07acf7c36c4..d47bff7fe8849 100644 --- a/pkgs/applications/audio/dsf2flac/default.nix +++ b/pkgs/applications/audio/dsf2flac/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dsf2flac"; - version = "unstable-2018-01-02"; + version = "unstable-2021-07-31"; src = fetchFromGitHub { owner = "hank"; repo = pname; - rev = "b0cf5aa6ddc60df9bbfeed25548e443c99f5cb16"; - sha256 = "15j5f82v7lgs0fkgyyynl82cb1rsxyr9vw3bpzra63nacbi9g8lc"; + rev = "6b109cd276ec7c7901f96455c77cf2d2ebfbb181"; + sha256 = "sha256-VlXfywgYhI2QuGQvpD33BspTTgT0jOKUV3gENq4HiBU="; }; buildInputs = [ boost flac id3lib taglib zlib ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "A DSD to FLAC transcoding tool"; homepage = "https://github.com/hank/dsf2flac"; license = licenses.gpl2; - maintainers = with maintainers; [ dmrauh ]; - platforms = with platforms; linux; + maintainers = with maintainers; [ artemist ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix index 220a7c4eb3ea2..eb6dd47105511 100644 --- a/pkgs/applications/audio/exaile/default.nix +++ b/pkgs/applications/audio/exaile/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/exaile \ --set PYTHONPATH $PYTHONPATH \ - ${lib.optionalString streamripperSupport "--prefix PATH : ${lib.makeBinPath [ streamripper ]}"} + --prefix PATH : ${lib.makeBinPath ([ python3 ] ++ lib.optionals streamripperSupport [ streamripper ]) } ''; meta = with lib; { diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 0309031cf7858..2ad98d3d6d8d8 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,13 +20,13 @@ with lib.strings; let - version = "2.37.3"; + version = "2.40.0"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-Jzauw8+vBjtbK73Bh4huhX1ql1cWmh80EzEET3x03rc="; + sha256 = "sha256-IsrLaoMDwrDPxtqCXIy/7tZCdogTUkJ00obSco9SR/A="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 46d63c84314b3..38d3bafdea6a5 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -1,37 +1,34 @@ { lib, stdenv, fetchFromGitHub , llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsa-lib, faust, curl -, bc, coreutils, which, libsndfile, pkg-config, libxcb +, bc, coreutils, which, libsndfile, flac, libogg, libvorbis, libopus, pkg-config, libxcb, cmake, gnutls, libtasn1, p11-kit }: stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.5"; + version = "2.5.8"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "0qbn05nq170ckycwalkk5fppklc4g457mapr7p7ryrhc1hwzffm9"; + sha256 = "sha256-dt5YlvaCZ6JiNGPwVXPrKzVGWxnhdyP4lnKgck7ZSF8="; fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook cmake ]; buildInputs = [ llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsa-lib faust curl - bc coreutils which libsndfile libxcb + bc coreutils which libsndfile flac libogg libvorbis libopus libxcb gnutls libtasn1 p11-kit ]; makeFlags = [ "PREFIX=$(out)" ]; - postPatch = "cd Build"; - - installPhase = '' - install -d "$out/bin" - install -d "$out/share/applications" - install FaustLive/FaustLive "$out/bin" - install rsrc/FaustLive.desktop "$out/share/applications" + postInstall = '' + wrapProgram $out/bin/FaustLive --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libmicrohttpd libsndfile faust llvm_10 ]}" ''; + postPatch = "cd Build"; + meta = with lib; { description = "A standalone just-in-time Faust compiler"; longDescription = '' diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index f9dbd3f80f0c4..bea08b0bfc9f6 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.37.3"; + version = "2.40.0"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-h6L+qRkN2chnI4821WrjD3uRFw3J0sUYVLL8w57vR1U="; + sha256 = "sha256-t3I3j5s2ACHfub+fxxaTwu+5ptEwH0JQpVdmHYOzbCA="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index ad57b6a690ff0..1e55dbe8f87fa 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,19 +5,19 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.2.3"; + version = "2.2.5"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3"; + sha256 = "sha256-aR8TLxl6OziP+DMSNro0DB/UtvzXDeDYQ3o/iy70XD4="; }; nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; - buildInputs = [ glib libsndfile libpulseaudio libjack2 ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] + buildInputs = [ glib libsndfile libjack2 ] + ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ] ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ]; cmakeFlags = [ "-Denable-framework=off" ]; diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 7e0fcf2717ebe..03c8e8d6ce699 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.52"; + version = "1.54"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-RyZ3PV7jaTN3DEYMT0BqKDHbb+7/IgiRaCra1xA0h1A="; + sha256 = "sha256-lNiQ0X2vvPGubb4Pde+eh0Z6ClCQgigIUM+PddaiVUg="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix index 841a65e541fc1..115c5b7767d2e 100644 --- a/pkgs/applications/audio/furnace/default.nix +++ b/pkgs/applications/audio/furnace/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , gitUpdater -, testVersion +, testers , furnace , fetchFromGitHub , cmake @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { inherit pname version; rev-prefix = "v"; }; - tests.version = testVersion { + tests.version = testers.testVersion { package = furnace; # The command always exits with code 1 command = "(furnace --version || [ $? -eq 1 ])"; diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix index 95f3bf9988cdc..2193447c02c70 100644 --- a/pkgs/applications/audio/greg/default.nix +++ b/pkgs/applications/audio/greg/default.nix @@ -2,15 +2,15 @@ with pythonPackages; buildPythonApplication rec { pname = "greg"; - version = "0.4.7"; + version = "0.4.8"; disabled = !isPy3k; src = fetchFromGitHub { owner = "manolomartinez"; repo = pname; - rev = "v" + version; - sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4="; }; propagatedBuildInputs = [ setuptools feedparser ]; diff --git a/pkgs/applications/audio/gspeech/default.nix b/pkgs/applications/audio/gspeech/default.nix index 21a4d6748beda..a48aa22809b4f 100644 --- a/pkgs/applications/audio/gspeech/default.nix +++ b/pkgs/applications/audio/gspeech/default.nix @@ -20,13 +20,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gSpeech"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "mothsart"; repo = pname; rev = version; - sha256 = "1i0jwgxcn94nsi7c0ad0w77y04g04ka2szijzfqzqfnacdmdyrfc"; + sha256 = "0z11yxvgi8m2xjmmf56zla91jpmf0a4imwi9qqz6bp51pw4sk8gp"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index e741f6fe29825..220d2d38e145d 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/gtkpod/${pname}-${version}.tar.gz"; sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; + postPatch = '' + sed -i 's/which/type -P/' scripts/*.sh + ''; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; buildInputs = [ @@ -19,15 +22,17 @@ stdenv.mkDerivation rec { gdl gnome.adwaita-icon-theme gnome.anjuta ] ++ (with perlPackages; [ perl XMLParser ]); - patchPhase = '' - sed -i 's/which/type -P/' scripts/*.sh - ''; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: .libs/autodetection.o:/build/gtkpod-2.1.5/libgtkpod/gtkpod_app_iface.h:248: multiple definition of + # `gtkpod_app'; .libs/gtkpod_app_iface.o:/build/gtkpod-2.1.5/libgtkpod/gtkpod_app_iface.h:248: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; enableParallelBuilding = true; meta = with lib; { description = "GTK Manager for an Apple ipod"; - homepage = "http://gtkpod.sourceforge.net"; + homepage = "https://sourceforge.net/projects/gtkpod/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.skeidel ]; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index b6ce0daef0d2e..724280fbcdd56 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -108,6 +108,8 @@ stdenv.mkDerivation rec { "--install-roboto-font" ] ++ optional optimizationSupport "--optimization"; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + meta = with lib; { description = "A virtual guitar amplifier for Linux running with JACK"; longDescription = '' diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index b36d977b2bdf1..9801f2d2b2adc 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-uwRSOJ5WvDH4mfL9pCTCGzuSRT8SIBrI+Wsbumzejv0="; + sha256 = "sha256-AtgKgw+F5lc0Ma3zOxmk3iaZQp2KZb2FP5F8QvvYTT4="; }; buildInputs = [ diff --git a/pkgs/applications/audio/hivelytracker/default.nix b/pkgs/applications/audio/hivelytracker/default.nix index 4cf20e3c89852..8f9e3809fd2de 100644 --- a/pkgs/applications/audio/hivelytracker/default.nix +++ b/pkgs/applications/audio/hivelytracker/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { # files passed as arguments anyway, so this works well enough until the # issue is fixed. wrapProgram $out/bin/hivelytracker \ - --run "cd $out/share/hivelytracker" + --chdir "$out/share/hivelytracker" # Also install the hvl2wav tool install -Dm755 hvl2wav/hvl2wav $out/bin/hvl2wav diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 38b7e04060386..5cfd9c7cbe898 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -86,6 +86,7 @@ mkDerivation rec { homepage = "https://www.signalyst.com/custom.html"; description = "High-end upsampling multichannel software HD-audio player"; license = licenses.unfree; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ lovesegfault ]; }; } diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index 16683564b2c76..944d40cd3ef1a 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -2,18 +2,31 @@ , mkDerivation , fetchFromGitHub , pipewire +, pulseaudio +, gst_all_1 , glibmm , qmake +, qtbase +, qtsvg +, wrapQtAppsHook , makeDesktopItem , pkg-config , libarchive , fetchpatch +, copyDesktopItems +, usePipewire ? true +, usePulseaudio ? false }: -mkDerivation rec{ +assert lib.asserts.assertMsg (usePipewire != usePulseaudio) "You need to enable one and only one of pulseaudio or pipewire support"; + +let + pluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); +in + mkDerivation rec { pname = "jamesdsp"; version = "2.3"; - src = fetchFromGitHub rec{ + src = fetchFromGitHub rec { owner = "Audio4Linux"; repo = "JDSP4Linux"; fetchSubmodules = true; @@ -27,15 +40,37 @@ mkDerivation rec{ 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 + copyDesktopItems + wrapQtAppsHook ]; - nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ glibmm libarchive - pipewire + qtbase + qtsvg + ] ++ lib.optional usePipewire pipewire + ++ lib.optionals usePulseaudio [ + pulseaudio + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer ]; + qtWrapperArgs = lib.optionals usePulseaudio [ "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${pluginPath}" ]; + + qmakeFlags = lib.optionals usePulseaudio [ "CONFIG+=USE_PULSEAUDIO" ]; + desktopItems = [ (makeDesktopItem { name = "jamesdsp"; @@ -54,7 +89,7 @@ mkDerivation rec{ description = "An audio effect processor for PipeWire clients"; homepage = "https://github.com/Audio4Linux/JDSP4Linux"; license = licenses.gpl3Only; - maintainers = with maintainers;[ pasqui23 ]; + maintainers = with maintainers; [ pasqui23 rewine ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 60df749a14268..94290ada7b353 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "JMusicBot"; - version = "0.3.6"; + version = "0.3.8"; src = fetchurl { url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar"; - sha256 = "sha256-Hc3dsOADC+jVZScY19OYDkHimntMjdw/BoB3EUS/d0k="; + sha256 = "sha256-wzmrh9moY6oo3RqOy9Zl1X70BZlvbJkQmz8BaBIFtIM="; }; dontUnpack = true; diff --git a/pkgs/applications/audio/libopenmpt/default.nix b/pkgs/applications/audio/libopenmpt/default.nix deleted file mode 100644 index b2b5ebecd7e23..0000000000000 --- a/pkgs/applications/audio/libopenmpt/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ config, lib, stdenv, fetchurl, fetchpatch, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac -, usePulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: - -stdenv.mkDerivation rec { - pname = "libopenmpt"; - version = "0.5.11"; - - outputs = [ "out" "lib" "dev" ]; - - src = fetchurl { - url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "1c54lldr2imjzhlhq5lvwhj7d5794xm97cby9pznr5wdjjay0sa4"; - }; - - patches = [ - # Fix pending upstream inclusion for gcc-12 include headers: - # https://github.com/OpenMPT/openmpt/pull/8 - (fetchpatch { - name = "gcc-12.patch"; - url = "https://github.com/OpenMPT/openmpt/commit/6e7a43190ef2f9ba0b3efc19b9527261b69ec8f7.patch"; - sha256 = "081m1rf09bbrlg52aihaajmld5dcnwbp6y7zpyik92mm332r330h"; - }) - ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] - ++ lib.optional usePulseAudio libpulseaudio; - - configureFlags = lib.optional (!usePulseAudio) "--without-pulseaudio"; - - doCheck = true; - - meta = with lib; { - description = "A cross-platform command-line based module file player"; - homepage = "https://lib.openmpt.org/libopenmpt/"; - license = licenses.bsd3; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 7c93760d2ca31..8b6e1c7aa4caa 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.26"; + version = "1.4.31"; format = "other"; doCheck = false; @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "sha256-Q/z9oET06DimMRZl03TgjEeheoVHtIkH+Z69qWZetcI="; + sha256 = "sha256-kWqTDhk7QDmN0yr6x8ER5oHkUAkP3i5yOabnNXSHSqA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/losslessaudiochecker/default.nix b/pkgs/applications/audio/losslessaudiochecker/default.nix index 551f56a3ce145..9fecf7b9ba924 100644 --- a/pkgs/applications/audio/losslessaudiochecker/default.nix +++ b/pkgs/applications/audio/losslessaudiochecker/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = "Utility to check whether audio is truly lossless or not"; homepage = "https://losslessaudiochecker.com"; license = lib.licenses.unfree; - platforms = lib.platforms.x86_64; + platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ p-h ]; }; } diff --git a/pkgs/applications/audio/lyrebird/default.nix b/pkgs/applications/audio/lyrebird/default.nix index 81c792d95e2dc..055662ce743f8 100644 --- a/pkgs/applications/audio/lyrebird/default.nix +++ b/pkgs/applications/audio/lyrebird/default.nix @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = [ "--prefix 'PATH' ':' '${lib.makeBinPath [ sox pulseaudio ]}'" "--prefix 'PYTHONPATH' ':' '${placeholder "out"}/share/lyrebird'" - "--run 'cd ${placeholder "out"}/share/lyrebird'" + "--chdir '${placeholder "out"}/share/lyrebird'" ''"''${gappsWrapperArgs[@]}"'' ]; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 1d26782b6ae02..4abf799d01551 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, pkg-config , ncurses, db , popt, libtool +, libiconv, CoreServices # Sound sub-systems -, alsaSupport ? true, alsa-lib +, alsaSupport ? (!stdenv.isDarwin), alsa-lib , pulseSupport ? true, libpulseaudio, autoreconfHook , jackSupport ? true, libjack2 , ossSupport ? true @@ -64,7 +65,8 @@ in stdenv.mkDerivation rec { ++ opt wavpackSupport wavpack # Misc ++ opt curlSupport curl - ++ opt samplerateSupport libsamplerate; + ++ opt samplerateSupport libsamplerate + ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]; configureFlags = [ # Sound sub-systems @@ -97,6 +99,6 @@ in stdenv.mkDerivation rec { homepage = "http://moc.daper.net/"; license = licenses.gpl2; maintainers = with maintainers; [ aethelz pSub jagajaga ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 62b63f7e1cabc..05647af2201aa 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -1,12 +1,22 @@ -{lib, stdenv, fetchurl}: +{lib, gcc10Stdenv, fetchurl}: -stdenv.mkDerivation rec { +gcc10Stdenv.mkDerivation rec { version = "3.99-u4-b5"; - pname = "monkeys-audio"; + pname = "monkeys-audio-old"; patches = [ ./buildfix.diff ]; src = fetchurl { + /* + The real homepage is <https://monkeysaudio.com/>, but in fact we are + getting an old, ported to Linux version of the sources, made by (quoting + from the AUTHORS file found in the source): + + Frank Klemm : First port to linux (with makefile) + + SuperMMX <SuperMMX AT GMail DOT com> : Package the source, include the frontend and shared lib, + porting to Big Endian platform and adding other non-win32 enhancement. + */ url = "https://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz"; sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz"; }; @@ -14,7 +24,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lossless audio codec"; platforms = platforms.linux; - license = licenses.lgpl2; + # This is not considered a GPL license, but it seems rather free although + # it's not standard, see a quote of it: + # https://github.com/NixOS/nixpkgs/pull/171682#issuecomment-1120260551 + license = licenses.free; maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 5dc6af60c2343..09d5e83567a2c 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; - rev = "v${version}"; - sha256 = "1l1rya48ykiq156spm8pfsm6li8apz66ppz7gs4s91fv7g7l5x2f"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-F0fIl9DrludZZdzsrl/xsp7TLMgTPbVGtGvMHyD52Yw="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/audio/musikcube/0001-apple-cmake.patch b/pkgs/applications/audio/musikcube/0001-apple-cmake.patch new file mode 100644 index 0000000000000..3c4630af4aa7d --- /dev/null +++ b/pkgs/applications/audio/musikcube/0001-apple-cmake.patch @@ -0,0 +1,14 @@ +diff --git a/src/musikcube/CMakeLists.txt b/src/musikcube/CMakeLists.txt +index f42748aa..ae339946 100644 +--- a/src/musikcube/CMakeLists.txt ++++ b/src/musikcube/CMakeLists.txt +@@ -98,9 +98,6 @@ else() + endif() + + if (APPLE) +- message(STATUS "[ncurses] detected Darwin, linking statically") +- set(CURSES_LIBRARY_NAME "lib${CURSES_LIBRARY_NAME}.a") +- set(PANEL_LIBRARY_NAME "lib${PANEL_LIBRARY_NAME}.a") + else() + message(STATUS "[ncurses] not Darwin! will attempt to link against libtinfo") + find_library(LIBTINFO NAMES tinfo) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index bf34e8cbe5bf9..0557ee2e676e7 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -1,60 +1,72 @@ { cmake , pkg-config -, alsa-lib , boost , curl , fetchFromGitHub , fetchpatch , ffmpeg +, gnutls , lame , libev , libmicrohttpd , ncurses -, pulseaudio , lib , stdenv , taglib +# Linux Dependencies +, alsa-lib +, pulseaudio , systemdSupport ? stdenv.isLinux , systemd +# Darwin Dependencies +, Cocoa +, SystemConfiguration }: stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.96.10"; + version = "0.97.0"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "sha256-Aa52pRGq99Pt++aEVZdmVNhhQuBajgfZp39L1AfKvho="; + sha256 = "sha256-W9Ng1kqai5qhaDs5KWg/1sOTIAalBXLng1MG8sl/ZOg="; }; patches = [ - # Fix pending upstream inclusion for ncuurses-6.3 support: + # Fix pending upstream inclusion for ncurses-6.3 support: # https://github.com/clangen/musikcube/pull/474 (fetchpatch { name = "ncurses-6.3.patch"; url = "https://github.com/clangen/musikcube/commit/1240720e27232fdb199a4da93ca6705864442026.patch"; sha256 = "0bhjgwnj6d24wb1m9xz1vi1k9xk27arba1absjbcimggn54pinid"; }) + ./0001-apple-cmake.patch ]; nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ - alsa-lib boost curl ffmpeg + gnutls lame libev libmicrohttpd ncurses - pulseaudio taglib - ] ++ lib.optional systemdSupport systemd; + ] ++ lib.optional systemdSupport [ + systemd + ] ++ lib.optional stdenv.isLinux [ + alsa-lib pulseaudio + ] ++ lib.optional stdenv.isDarwin [ + Cocoa SystemConfiguration + ]; cmakeFlags = [ "-DDISABLE_STRIP=true" diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index fc7ab505ac2df..050c54e168d2e 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -7,20 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.9.5"; + version = "0.9.8"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "sha256-HnP0dXKkMssDAhrsA99bTCVGdov9t5+1y8fJ+BWTM80="; + sha256 = "sha256-lrEIFPi55aP9utAaMIFtqocpkbDXRJqS/jlGUtE26kE="; }; - # Upstream now only supports rust 1.58+, but this version is not yet available in nixpkgs. - # See https://github.com/hrkfdn/ncspot/issues/714 - patches = [ ./rust_1_57_support.patch ]; - - cargoSha256 = "sha256-g6UMwirsSV+/NtFIfEZrz5h/OitPQcDeSawh7wq4TLI="; + cargoSha256 = "sha256-vkNGQ3SXKJpUqDZ4TfmlSleAPAOQnsEncE8475NLJ4M="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/ncspot/rust_1_57_support.patch b/pkgs/applications/audio/ncspot/rust_1_57_support.patch deleted file mode 100644 index ce4d473989c31..0000000000000 --- a/pkgs/applications/audio/ncspot/rust_1_57_support.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/ui/listview.rs b/src/ui/listview.rs -index 17fead7..e6c72b6 100644 ---- a/src/ui/listview.rs -+++ b/src/ui/listview.rs -@@ -85,7 +85,7 @@ impl<I: ListItem> ListView<I> { - - pub fn content_height_with_paginator(&self) -> usize { - let content_len = self.content.read().unwrap().len(); -- log::info!("content len: {content_len}"); -+ log::info!("content len: {}", content_len); - - // add 1 more row for paginator if we can paginate - if self.can_paginate() { -@@ -97,7 +97,7 @@ impl<I: ListItem> ListView<I> { - - fn can_paginate(&self) -> bool { - let loaded = self.get_pagination().loaded_content(); -- log::info!("can paginate: {loaded}"); -+ log::info!("can paginate: {}", loaded); - self.get_pagination().max_content().unwrap_or(0) > self.get_pagination().loaded_content() - } diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/applications/audio/noise-repellent/default.nix index 7aaa8ddd8435f..9a2a2f109b025 100644 --- a/pkgs/applications/audio/noise-repellent/default.nix +++ b/pkgs/applications/audio/noise-repellent/default.nix @@ -1,22 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat, lv2 }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, cmake, libspecbleach, lv2 }: stdenv.mkDerivation rec { pname = "noise-repellent"; - version = "0.1.5"; + version = "0.2.1"; src = fetchFromGitHub { owner = "lucianodato"; repo = pname; - rev = version; - sha256 = "0hb89x9i2knzan46q4nwscf5zmnb2nwf4w13xl2c0y1mx1ls1mwl"; - fetchSubmodules = true; + rev = "v${version}"; + sha256 = "sha256-hMNVzhJZFGFeu5aygLkfq495O0zpaIk41ddzejvDITE="; }; - mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2"); + mesonFlags = [ + "--prefix=${placeholder "out"}/lib/lv2" + "--buildtype=release" + ]; - nativeBuildInputs = [ meson ninja pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config cmake ]; buildInputs = [ - fftwFloat lv2 + libspecbleach lv2 ]; meta = with lib; { @@ -24,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/lucianodato/noise-repellent"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index b18f2b52f94c7..d08991a916bd2 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "NoiseTorch"; - version = "0.11.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "lawl"; repo = "NoiseTorch"; rev = version; - sha256 = "sha256-3+Yk7dqD7eyvd1I5CMmrg085ZtFxD2EnGqL5ttwx8eM="; + sha256 = "sha256-j/6XB3vA5LvTuCxmeB0HONqEDzYg210AWW/h3nCGOD8="; }; vendorSha256 = null; diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 50697c6c81a9e..c927d8997ed82 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.11.7"; + version = "3.11.10"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-fTeDRo7gCM1jXTQGm9MsmKu4KvTGDUogF3VSZWk91RM="; + sha256 = "sha256-Ah6Ni5EbFdIQ/wN7uGeMrSP5ybQfI4iy9gI1VT5LztU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/applications/audio/odin2/default.nix new file mode 100644 index 0000000000000..f0bd5e0156483 --- /dev/null +++ b/pkgs/applications/audio/odin2/default.nix @@ -0,0 +1,79 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, alsa-lib +, freetype +, libjack2 +, lv2 +, libX11 +, libXcursor +, libXext +, libXinerama +, libXrandr +, libGL +, gcc-unwrapped +}: + +stdenv.mkDerivation rec { + pname = "odin2"; + version = "unstable-2022-02-23"; + + src = fetchFromGitHub { + owner = "baconpaul"; + repo = "odin2"; + rev = "ed02d06cfb5db8a118d291c00bd2e4cd6e262cde"; + fetchSubmodules = true; + sha256 = "sha256-VkZ+mqCmqWQafdN0nQxJdPxbiaZ37/0jOhLvVbnGLvQ="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + alsa-lib + freetype + libjack2 + lv2 + libX11 + libXcursor + libXext + libXinerama + libXrandr + libGL + ]; + + # JUCE dlopen's these at runtime, crashes without them + NIX_LDFLAGS = (toString [ + "-lX11" + "-lXext" + "-lXcursor" + "-lXinerama" + "-lXrandr" + ]); + + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" + ]; + + installPhase = '' + mkdir -p $out/bin $out/lib/vst3 + cd Odin2_artefacts/Release + cp -r VST3/Odin2.vst3 $out/lib/vst3 + cp -r Standalone/Odin2 $out/bin +''; + + + meta = with lib; { + description = "Odin 2 Synthesizer Plugin"; + homepage = "https://thewavewarden.com/odin2"; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/osdlyrics/default.nix b/pkgs/applications/audio/osdlyrics/default.nix new file mode 100644 index 0000000000000..0c14b8be2b6b8 --- /dev/null +++ b/pkgs/applications/audio/osdlyrics/default.nix @@ -0,0 +1,87 @@ +{ lib +, stdenv +, fetchFromGitHub + +, autoreconfHook +, pkg-config +, intltool + +, glib +, gtk2 +, dbus-glib +, libappindicator-gtk2 +, libnotify +, python3 +, runtimeShell +}: + +stdenv.mkDerivation rec { + pname = "osdlyrics"; + version = "0.5.10"; + + src = fetchFromGitHub { + owner = "osdlyrics"; + repo = "osdlyrics"; + rev = version; + sha256 = "sha256-x9gIT1JkfPIc4RmmQJLv9rOG2WqAftoTK5uiRlS65zU="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + intltool + ]; + + buildInputs = [ + glib + gtk2 + dbus-glib + libappindicator-gtk2 + libnotify + python3.pkgs.wrapPython + (python3.withPackages (pp: with pp; [ + chardet + dbus-python + future + pycurl + pygobject3 + ])) + ]; + + postFixup = '' + extractExecLine() { + serviceFile=$1 + program=$2 + + execLine=$(grep --only-matching --perl-regexp 'Exec=\K(.+)' "$serviceFile") + echo "#!${runtimeShell}" > "$program" + echo "exec $execLine" >> "$program" + chmod +x "$program" + + substituteInPlace "$serviceFile" \ + --replace "Exec=$execLine" "Exec=$program" + } + + # Extract the exec line into a separate program so that it can be wrapped. + mkdir -p "$out/libexec/osdlyrics/" + for svcFile in "$out/share/dbus-1/services"/*; do + svc=$(basename "$svcFile" ".service") + if grep "python" "$svcFile"; then + extractExecLine "$svcFile" "$out/libexec/osdlyrics/$svc" + fi + done + + for p in "$out/bin/osdlyrics-create-lyricsource" "$out/bin/osdlyrics-daemon" "$out/libexec/osdlyrics"/*; do + wrapProgram "$p" \ + --prefix PYTHONPATH : "$out/${python3.sitePackages}" + done + ''; + + meta = with lib; { + description = "Standalone lyrics fetcher/displayer"; + homepage = "https://github.com/osdlyrics/osdlyrics"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix deleted file mode 100644 index c1bb1102bf1b6..0000000000000 --- a/pkgs/applications/audio/parlatype/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, hicolor-icon-theme }: - -stdenv.mkDerivation rec { - pname = "parlatype"; - version = "2.1"; - - src = fetchFromGitHub { - owner = "gkarsay"; - repo = pname; - rev = "v${version}"; - sha256 = "1k53q0kbwpnbgyr0lmfzf5sm4f93d8nbjrzdz9pdhzpxgihndg25"; - }; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gettext - appstream-glib - python3 - gobject-introspection - itstool - wrapGAppsHook - ]; - - buildInputs = [ - gtk3 - at-spi2-core - dbus - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav - sphinxbase - pocketsphinx - glib - gsettings-desktop-schemas - hicolor-icon-theme - ]; - - postPatch = '' - chmod +x data/meson_post_install.py - patchShebangs data/meson_post_install.py - ''; - - doCheck = false; - - buildPhase = '' - export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - - 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://gkarsay.github.io/parlatype/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.melchips ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix new file mode 100644 index 0000000000000..4acba5d75ee0f --- /dev/null +++ b/pkgs/applications/audio/pipecontrol/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, pipewire +, cmake +, extra-cmake-modules +, gnumake +, wrapQtAppsHook +, qtbase +, qttools +, kirigami2 +, kcoreaddons +, ki18n +, qtquickcontrols2 +}: + +stdenv.mkDerivation rec { + pname = "pipecontrol"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "portaloffreedom"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-BeubRDx82MQX1gB7GnGJlQ2FyYX1S83C3gqPZgIjgoM="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + wrapQtAppsHook + qttools + ]; + + buildInputs = [ + pipewire + qtbase + kirigami2 + kcoreaddons + ki18n + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Pipewire control GUI program in Qt (Kirigami2)"; + homepage = "https://github.com/portaloffreedom/pipecontrol"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ tilcreator ]; + }; +} diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index d86223dcdcb1f..91634cdf3fa29 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.1.0"; + version = "4.2.1"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "N+WkH6n7MWfRd2rsk/2b/rABL6pcjpKa1iBZSHslIOEc5fYWjGAxjwwTU0RgSaqptS1DyPeCUeWuphWPZJsQgw=="; + sha512 = "S2/T+T24X6D0oTbGPMp2BVfWTvzsUCWS1xsigLT/vFr12PlZgPfOWgo987W3YE30WJJDdybLqnkTl+uhNndC+A=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/42"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/44"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 2577f61e8d518..8b586c455e3bf 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.43"; + version = "1.46"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-+sHGjgDqizv/9n0dDj8knsl+4MBfO3/pMkmD+MPsuNM="; + sha256 = "sha256-xRq37hjuMiGxsWRnZ/ryXYLvQpjbfQEjQkMjjuqL7r8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 701e6fffbbb89..936fb2f54ecae 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -17,6 +17,7 @@ let # NOTE: check if we can drop any of these overrides when bumping the version overrideVersions = [ + "lxml" "pyparsing" "pyqt5" ]; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix deleted file mode 100644 index 331bce3e8be31..0000000000000 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ stdenv -, runCommand -, fetchFromGitHub -, pulseaudio -, pkg-config -, ffmpeg -, patchelf -, fdk_aac -, libtool -, ldacbt -, cmake -, bluez -, dbus -, sbc -, lib -}: - -let - pulseSources = runCommand "pulseaudio-sources" {} '' - mkdir $out - if [ -d ${pulseaudio.src} ]; then - ln -s ${pulseaudio.src}/* $out/ - else - tar -xf ${pulseaudio.src} - mv pulseaudio*/* $out/ - fi - ''; - -in stdenv.mkDerivation rec { - pname = "pulseaudio-modules-bt"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "EHfive"; - repo = "pulseaudio-modules-bt"; - rev = "v${version}"; - sha256 = "0bzg6x405j39axnkvc6n6vkl1hv1frk94y1i9sl170081bk23asd"; - }; - - patches = [ - ./fix-install-path.patch - ]; - - nativeBuildInputs = [ - pkg-config - patchelf - cmake - ]; - - buildInputs = [ - pulseaudio - ffmpeg - fdk_aac - libtool - ldacbt - bluez - dbus - sbc - ]; - - postPatch = '' - # Upstream bundles pulseaudio as a submodule - rm -r pa - ln -s ${pulseSources} pa - - # Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions - substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version} - substituteInPlace CMakeLists.txt --replace '${"\${PULSE_DIR}"}' ${pulseaudio.pulseDir} - - # Fraunhofer recommends to enable afterburner but upstream has it set to false by default - substituteInPlace src/modules/bluetooth/a2dp/a2dp_aac.c \ - --replace "info->aac_afterburner = false;" "info->aac_afterburner = true;" - ''; - - postFixup = '' - for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do - orig_rpath=$(patchelf --print-rpath "$so") - patchelf \ - --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/${pulseaudio.pulseDir}/modules:$orig_rpath" \ - "$so" - done - ''; - - meta = with lib; { - homepage = "https://github.com/EHfive/pulseaudio-modules-bt"; - description = "LDAC, aptX, aptX HD, AAC codecs (A2DP Audio) support for Linux PulseAudio"; - platforms = platforms.linux; - license = licenses.mit; - maintainers = with maintainers; [ adisbladis ]; - }; -} diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch deleted file mode 100644 index 7cdb7de4dd13e..0000000000000 --- a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8d20dbf..63fe7ba 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -213,5 +213,4 @@ INSTALL(TARGETS - module-bluez5-device - module-bluetooth-discover - module-bluetooth-policy -- LIBRARY DESTINATION ${PulseAudio_modlibexecdir}) -- -+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${PULSE_DIR}/modules/) diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 44f7b2613936c..3a0a3f0a4cf26 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.16"; + version = "0.8.9.17"; propagatedBuildInputs = with python3Packages; [ requests @@ -13,8 +13,8 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "coderholic"; repo = pname; - rev = version; - sha256 = "sha256-uerQfyGHWhLbO6UkLSMA1tdfW/8fDQkcm6hYIdwwC7I="; + rev = "refs/tags/${version}"; + sha256 = "sha256-lfDSD1+xbA6tAKeHKciq/n6YHWS4JTOvjIqOn+FQ2yA="; }; checkPhase = '' diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 860eca652e7a5..e415798b46049 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.2.2"; + version = "0.2.5"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-BBvF1L3IqkYqSghHxcbwOBizdu6GtxaWof3Q/bc+aTY="; + sha256 = "sha256-OYIBlTO1vXmmY4/ZacvsEQ5EnOfetBvnG2v5xL44czY="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -29,6 +29,6 @@ mkDerivation rec { homepage = "https://gitlab.freedesktop.org/rncbc/qpwgraph"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ kanashimia ]; + maintainers = with maintainers; [ kanashimia exi ]; }; } diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index ca51001dd62e1..af2ce6ae25bae 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -1,36 +1,50 @@ -{ stdenv, lib, pkg-config, fetchFromGitHub, sconsPackages -, glibmm, libpulseaudio, libao }: +{ lib +, stdenv +, fetchFromGitHub +, ensureNewerSourcesForZipFilesHook +, pkg-config +, scons +, glibmm +, libpulseaudio +, libao +, speechd +}: -let - version = "unstable-2018-02-10"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "rhvoice"; - inherit version; + version = "1.8.0"; src = fetchFromGitHub { - owner = "Olga-Yakovleva"; + owner = "RHVoice"; repo = "RHVoice"; - rev = "7a25a881b0465e47a12d8029b56f3b71a1d02312"; - sha256 = "1gkrlmv7msh9qlm0gkjqpl9gswghpclfdwszr1p85v8vk6m63v0b"; + rev = version; + fetchSubmodules = true; + hash = "sha256-G5886rjBaAp0AXcr07O0q7K1OXTayfIbd4zniKwDiLw="; }; + patches = [ + # SConstruct patch + # Scons creates an independent environment that assumes standard POSIX paths. + # The patch is needed to push the nix environment. + # - PATH + # - PKG_CONFIG_PATH, to find available (sound) libraries + # - RPATH, to link to the newly built libraries + ./honor_nix_environment.patch + ]; + nativeBuildInputs = [ - sconsPackages.scons_3_1_2 pkg-config + ensureNewerSourcesForZipFilesHook + pkg-config + scons ]; buildInputs = [ - glibmm libpulseaudio libao + glibmm + libpulseaudio + libao + speechd ]; - # SConstruct patch - # Scons creates an independent environment that assumes standard POSIX paths. - # The patch is needed to push the nix environment. - # - PATH - # - PKG_CONFIG_PATH, to find available (sound) libraries - # - RPATH, to link to the newly built libraries - - patches = [ ./honor_nix_environment.patch ]; - meta = { description = "A free and open source speech synthesizer for Russian language and others"; homepage = "https://github.com/Olga-Yakovleva/RHVoice/wiki"; diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch index ed180c92debc3..fed5a2ea5e1da 100644 --- a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch +++ b/pkgs/applications/audio/rhvoice/honor_nix_environment.patch @@ -1,14 +1,31 @@ diff --git a/SConstruct b/SConstruct -index 2421399..ba39254 100644 +index 3ad4d9a..fb02365 100644 --- a/SConstruct +++ b/SConstruct -@@ -147,6 +147,9 @@ def create_base_env(vars): +@@ -94,11 +94,8 @@ def CheckWiX(context): + return result + + def get_spd_module_dir(): +- env = Environment() +- try: +- return env.ParseConfig("pkg-config speech-dispatcher --variable=modulebindir", passthru) +- except: +- return False ++ # cannot write to ${speechd}/libexec/speech-dispatcher-modules ++ return os.path.join(os.environ["out"], "libexec/speech-dispatcher-modules") + + def validate_spd_version(key,val,env): + m=re.match(r"^\d+\.\d+",val) +@@ -208,9 +205,9 @@ def create_base_env(user_vars): env_args["package_name"]="RHVoice" env_args["CPPDEFINES"]=[("RHVOICE","1")] env=Environment(**env_args) +- if env["dev"]: +- env["prefix"]=os.path.abspath("local") +- env["RPATH"]=env.Dir("$libdir").abspath + env.PrependENVPath("PATH", os.environ["PATH"]) + env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"] -+ env["RPATH"]=env["libdir"] ++ env["RPATH"]=env.Dir("$libdir").abspath env["package_version"]=get_version(env["release"]) env.Append(CPPDEFINES=("PACKAGE",env.subst(r'\"$package_name\"'))) - env.Append(CPPDEFINES=("VERSION",env.subst(r'\"$package_version\"'))) + if env["PLATFORM"]=="win32": diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 2f35f1fe65ca7..0ba86567c7c8c 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -1,17 +1,30 @@ -{ lib, stdenv, fetchurl, pkg-config, fetchFromGitLab +{ stdenv +, lib +, fetchurl +, fetchpatch +, pkg-config +, meson +, ninja +, fetchFromGitLab , python3 -, perl -, perlPackages +, vala +, glib , gtk3 -, intltool , libpeas , libsoup +, libxml2 , libsecret , libnotify , libdmapsharing , gnome , gobject-introspection , totem-pl-parser +, libgudev +, libgpod +, libmtp +, lirc +, brasero +, grilo , tdb , json-glib , itstool @@ -19,38 +32,32 @@ , gst_all_1 , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: -let - # The API version of libdmapsharing required by rhythmbox 3.4.4 is 3.0. - - # This PR would solve the issue: - # https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/12 - # Unfortunately applying this patch produces a rhythmbox which - # cannot fetch data from DAAP shares. - - libdmapsharing_3 = libdmapsharing.overrideAttrs (old: rec { - version = "2.9.41"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = old.pname; - rev = "${lib.toUpper old.pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "05kvrzf0cp3mskdy6iv7zqq24qdczl800q2dn1h4bk3d9wchgm4p"; - }; - }); - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "rhythmbox"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf"; + sha256 = "l+u8YPN4sibaRbtEbYmQL26hgx4j8Q76ujZVk7HnTyo="; }; + patches = [ + # Fix stuff linking against rhythmdb not finding libxml headers + # included by rhythmdb.h header. + # https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/147 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/rhythmbox/-/commit/7e8c7b803a45b7badf350132f8e78e3d75b99a21.patch"; + sha256 = "5CE/NVlmx7FItNJCVQxx+x0DCYhUkAi/UuksfAiyWBg="; + }) + ]; + nativeBuildInputs = [ pkg-config - intltool perl perlPackages.XMLParser + meson + ninja + vala + glib itstool wrapGAppsHook ]; @@ -58,13 +65,20 @@ in stdenv.mkDerivation rec { buildInputs = [ python3 libsoup + libxml2 tdb json-glib + glib gtk3 libpeas totem-pl-parser - gnome.adwaita-icon-theme + libgudev + libgpod + libmtp + lirc + brasero + grilo gobject-introspection python3.pkgs.pygobject3 @@ -76,16 +90,14 @@ in stdenv.mkDerivation rec { gst_all_1.gst-plugins-ugly gst_all_1.gst-libav - libdmapsharing_3 # necessary for daap support + libdmapsharing # for daap support libsecret libnotify ] ++ gst_plugins; - configureFlags = [ - "--enable-daap" - "--enable-libnotify" - "--with-libsecret" - ]; + postInstall = '' + glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; preFixup = '' gappsWrapperArgs+=( @@ -93,8 +105,6 @@ in stdenv.mkDerivation rec { ) ''; - enableParallelBuilding = true; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index 49492d05d15f1..4642565e678ea 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/pkgs/applications/audio/shortwave/default.nix @@ -14,28 +14,29 @@ , ninja , openssl , pkg-config -, python3 , rustPlatform , sqlite -, wrapGAppsHook +, wrapGAppsHook4 +, cmake +, libshumate }: stdenv.mkDerivation rec { pname = "shortwave"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Shortwave"; rev = version; - sha256 = "sha256-25qPb7qlqCwYJzl4qZxAZYx5asxSlXBlc/0dGyBdk1o="; + sha256 = "sha256-qwk63o9pfqpAm6l9ioj3RccacemQU8R6LF6El4yHkjQ"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-00dQXcSNmdZb2nSLG3q7jm4sugF9XR4LbH0OmcuHVxA="; + hash = "sha256-YrB322nv9CgZqt5//VMvVwjWA51ePlX2PI6raRJGBxA="; }; nativeBuildInputs = [ @@ -46,11 +47,11 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 rustPlatform.rust.cargo rustPlatform.cargoSetupHook rustPlatform.rust.rustc - wrapGAppsHook + wrapGAppsHook4 + cmake ]; buildInputs = [ @@ -61,6 +62,7 @@ stdenv.mkDerivation rec { libadwaita openssl sqlite + libshumate ] ++ (with gst_all_1; [ gstreamer gst-plugins-base @@ -68,10 +70,6 @@ stdenv.mkDerivation rec { gst-plugins-bad ]); - postPatch = '' - patchShebangs build-aux/meson/postinstall.py - ''; - meta = with lib; { homepage = "https://gitlab.gnome.org/World/Shortwave"; description = "Find and listen to internet radio stations"; @@ -80,7 +78,6 @@ stdenv.mkDerivation rec { desktop. It is the successor to the older Gradio application. ''; maintainers = with maintainers; [ lasandell ]; - broken = true; # incompatible with latest libadwaita license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/sonixd/default.nix b/pkgs/applications/audio/sonixd/default.nix new file mode 100644 index 0000000000000..961fa2c8c1cd1 --- /dev/null +++ b/pkgs/applications/audio/sonixd/default.nix @@ -0,0 +1,27 @@ +{ lib +, fetchurl +, appimageTools +}: + +appimageTools.wrapType2 rec { + pname = "sonixd"; + version = "0.15.1"; + + src = fetchurl { + url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage"; + sha256 = "sha256-23WU1nwvrzyw0J+Pplm3JbsScjJxu+RhmwVoe/PjozY="; + }; + + extraInstallCommands = '' + mv $out/bin/sonixd-${version} $out/bin/sonixd + ''; + + meta = with lib; { + description = "Full-featured Subsonic/Jellyfin compatible desktop music player"; + homepage = "https://github.com/jeffvli/sonixd"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ onny ]; + platforms = [ "x86_64-linux" ]; + }; +} + diff --git a/pkgs/applications/audio/soundwireserver/default.nix b/pkgs/applications/audio/soundwireserver/default.nix index 17660599b6890..db8d28989b27a 100755 --- a/pkgs/applications/audio/soundwireserver/default.nix +++ b/pkgs/applications/audio/soundwireserver/default.nix @@ -34,6 +34,7 @@ qt5.mkDerivation { description = "Turn your Android device into wireless headphones / wireless speaker"; homepage = "https://georgielabs.net/"; maintainers = with maintainers; [ mkg20001 ]; + platforms = [ "x86_64-linux" ]; license = licenses.unfree; }; } diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix deleted file mode 100644 index 5de48d1b296fa..0000000000000 --- a/pkgs/applications/audio/split2flac/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper -, shntool, cuetools -, flac, faac, mp4v2, wavpack, mac -, imagemagick, libiconv, enca, lame, mutagen, vorbis-tools -, aacgain, mp3gain, vorbisgain -}: - -let - wrapSplit2flac = format: '' - makeWrapper $out/bin/.split2flac-wrapped $out/bin/split2${format} \ - --set SPLIT2FLAC_FORMAT ${format} \ - --prefix PATH : ${lib.makeBinPath [ - shntool cuetools - flac faac mp4v2 wavpack mac - imagemagick libiconv enca lame mutagen vorbis-tools - aacgain mp3gain vorbisgain - ]} - ''; - -in stdenv.mkDerivation rec { - pname = "split2flac"; - version = "122"; - - src = fetchFromGitHub { - owner = "ftrvxmtrx"; - repo = "split2flac"; - rev = version; - sha256 = "1a71amamip25hhqx7wwzfcl3d5snry9xsiha0kw73iq2m83r2k63"; - }; - - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - patchPhase = '' - substituteInPlace split2flac \ - --replace 'FORMAT="''${0##*split2}"' 'FORMAT=''${SPLIT2FLAC_FORMAT:-flac}' - ''; - - installPhase = '' - mkdir -p $out/share/bash-completion/completions - cp split2flac-bash-completion.sh \ - $out/share/bash-completion/completions/split2flac-bash-completion.sh - - mkdir -p $out/bin - cp split2flac $out/bin/.split2flac-wrapped - - ${wrapSplit2flac "flac"} - ${wrapSplit2flac "mp3"} - ${wrapSplit2flac "ogg"} - ${wrapSplit2flac "m4a"} - ${wrapSplit2flac "wav"} - ''; - - meta = with lib; { - description = "Split flac/ape/wv/wav + cue sheet into separate tracks"; - homepage = "https://github.com/ftrvxmtrx/split2flac"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau ]; - }; -} diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix index 3fe3b0d06d31d..7dab868b941a4 100644 --- a/pkgs/applications/audio/spot/default.nix +++ b/pkgs/applications/audio/spot/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { pname = "spot"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "xou816"; repo = "spot"; rev = version; - hash = "sha256-uZzylK9imEazwC/ogsDO8ZBvByE5/SNSV+mIlp7Z9Ww="; + hash = "sha256-0iuLZq9FSxaOchxx6LzGwpY8qnOq2APl/qkBYzEV2uw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-v5xdlsI6OlEpCYOTFePTyI8BkIrAwT6FR2JwiRTGgOA="; + hash = "sha256-g46BkrTv6tdrGe/p245O4cBoPjbvyRP7U6hH1Hp4ja0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 7395ca85d9f6d..055034df4ce2e 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Rigellute/spotify-tui/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jwijenbergh ]; + mainProgram = "spt"; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index d2fe381ac6aeb..65cf657d8a408 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -10,14 +10,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.80.699.gc3dac750"; + version = "1.1.84.716.gc5f8b819"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "58"; + rev = "60"; deps = [ alsa-lib @@ -80,7 +80,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "91385a5a8de31d6e9f1945d23108447fd369c1cdc2e4d95cbb7cec5d403c3be14a1b0fabe3fb01aef809a39b033d289add1bcb307ab19c7fcb63689dbae57c53"; + sha512 = "1209b956822d8bb661daa2c88616bed403ec26dc22c6b866cecff59235c56112284c2f99aa06352fc0df6fcd15225a6ad60afd3b4ff4d7b948ab83e70ab31a71"; }; nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/applications/audio/sptlrx/default.nix index 2ec9562c62021..4daab47047380 100644 --- a/pkgs/applications/audio/sptlrx/default.nix +++ b/pkgs/applications/audio/sptlrx/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, sptlrx }: buildGoModule rec { pname = "sptlrx"; @@ -15,9 +15,19 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; + passthru = { + updateScript = nix-update-script { attrPath = pname; }; + tests.version = testers.testVersion { + package = sptlrx; + # TODO Wrong version in `0.2.0`. Has been fixed upstream. + version = "v0.1.0"; + }; + }; + meta = with lib; { description = "Spotify lyrics in your terminal"; homepage = "https://github.com/raitonoberu/sptlrx"; + changelog = "https://github.com/raitonoberu/sptlrx/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ MoritzBoehme ]; }; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index ee77144104c2e..1ea01353f80ab 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -72,6 +72,7 @@ mkDerivation rec { ] ++ lib.optionals withGstreamer (with gst_all_1; [ glib-networking gstreamer + gst-libav gst-plugins-base gst-plugins-good gst-plugins-bad diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix index a08c25f016aa1..7d8cf72eba27d 100644 --- a/pkgs/applications/audio/surge-XT/default.nix +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -37,14 +37,14 @@ let in stdenv.mkDerivation rec { pname = "surge-XT"; - version = "unstable-2021-12-11"; + version = "1.0.1"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = "surge"; - rev = "320f68543d0279c11cea8dc7f5170399cccc9602"; + rev = "release_xt_${version}"; fetchSubmodules = true; - sha256 = "sha256-Jcs5FpX5AZl72aKYNbRcfYqb2PRt0r1pQXk957xk0aM="; + sha256 = "sha256-u7jXNCDFRzq9oFaxovfTEipQsN+e4+whLexJrSJdXWw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index 4a0035aadf533..a8889cab69773 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.6.10"; + version = "0.6.15"; src = fetchCrate { inherit pname version; - sha256 = "sha256-i+XxEPkLZK+JKDl88P8Nd7XBhsGhEzvUGovJtSWvRtg="; + sha256 = "sha256-e4hCo5a54EPp6/sd1/ivwHePu+e6MqbA9tvPWf41EhQ="; }; - cargoHash = "sha256-7nQzU1VvRDrtltVAXTX268vl9AbQhMOilPG4nNAJ+Xk="; + cargoHash = "sha256-kQjLmASJpo7+LT73vVjbPWhNUGJ1HI6S/8W6gJskJXE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; diff --git a/pkgs/applications/audio/viper4linux-gui/default.nix b/pkgs/applications/audio/viper4linux-gui/default.nix new file mode 100644 index 0000000000000..be495aa9c93b4 --- /dev/null +++ b/pkgs/applications/audio/viper4linux-gui/default.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitHub +, copyDesktopItems +, pkg-config +, qtbase +, qtsvg +, qtmultimedia +, qmake +, gst_all_1 +, libpulseaudio +, makeDesktopItem +, viper4linux +, wrapQtAppsHook +}: +let + gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-viperfx gst-plugins-base gst-plugins-good ]); +in +stdenv.mkDerivation rec { + pname = "viper4linux-gui"; + version = "unstable-2022-04-23"; + + src = fetchFromGitHub { + owner = "Audio4Linux"; + repo = "Viper4Linux-GUI"; + rev = "2d0c84d7dda76c59e31c850e38120002eb779b7a"; + sha256 = "sha256-5YlLCF598i/sldczPEgCB+1KJDA7jqM964QDSNjgTKM="; + }; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "viper-gui"; + icon = "viper"; + desktopName = "viper4linux"; + genericName = "Equalizer"; + comment = meta.description; + categories = [ "AudioVideo" "Audio" ]; + startupNotify = false; + }) + ]; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + copyDesktopItems + ]; + + buildInputs = [ + qtbase + qtmultimedia + qtsvg + gst_all_1.gstreamer + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-viperfx + libpulseaudio + viper4linux + ]; + + qmakeFlags = [ "V4L_Frontend.pro" ]; + + qtWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ viper4linux gst_all_1.gstreamer ]}" + "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${gstPluginPath}" + ]; + + installPhase = '' + runHook preInstalli + install -D V4L_Frontend $out/bin/viper-gui + install -D icons/viper.png $out/share/icons/viper.png + runHook postInstall + ''; + + meta = with lib; { + description = "Official UI for Viper4Linux2"; + homepage = "https://github.com/Audio4Linux/Viper4Linux-GUI"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/applications/audio/viper4linux/default.nix b/pkgs/applications/audio/viper4linux/default.nix new file mode 100644 index 0000000000000..118af6853e5ad --- /dev/null +++ b/pkgs/applications/audio/viper4linux/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, gst_all_1 +, libviperfx +, makeWrapper +}: +let + gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-viperfx gst-plugins-base gst-plugins-good ]); +in +stdenv.mkDerivation rec { + pname = "viper4linux"; + version = "unstable-2022-03-13"; + + src = fetchFromGitHub { + owner = "Audio4Linux"; + repo = "Viper4Linux"; + rev = "5da25644824f88cf0db24378d2c84770ba4f6816"; + sha256 = "sha256-CJNVr/1ehJzX45mxunXcRAypBBGEBdswOzAVG2H+ayg="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-viperfx + libviperfx + ]; + + dontBuild = true; + + postPatch = '' + substituteInPlace viper --replace "/etc/viper4linux" "$out/etc/viper4linux" + ''; + + installPhase = '' + runHook preInstall + install -D viper -t $out/bin + mkdir -p $out/etc/viper4linux + cp -r viper4linux/* $out/etc/viper4linux + runHook postInstall + ''; + + postFixup = '' + wrapProgram "$out/bin/viper" \ + --prefix PATH : $out/bin:${lib.makeBinPath [ gst_all_1.gstreamer ]} \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${gstPluginPath} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libviperfx ]} + ''; + + meta = with lib; { + description = "An Adaptive Digital Sound Processor"; + homepage = "https://github.com/Audio4Linux/Viper4Linux"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index a7a8f054172cd..f06907ad32f2c 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -8,6 +8,8 @@ , flac , sox , util-linux +, testers +, whipper }: let @@ -45,6 +47,7 @@ in python3.pkgs.buildPythonApplication rec { ruamel-yaml discid pillow + setuptools ]; buildInputs = [ libsndfile ]; @@ -71,6 +74,11 @@ in python3.pkgs.buildPythonApplication rec { runHook postCheck ''; + passthru.tests.version = testers.testVersion { + package = whipper; + command = "HOME=$TMPDIR whipper --version"; + }; + meta = with lib; { homepage = "https://github.com/whipper-team/whipper"; description = "A CD ripper aiming for accuracy over speed"; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 0a6ad4bdc4cde..4e2bb5600d3bc 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 = "20220107"; + version = "20220327"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "sha256-+lzgkRQHe6moid3h6az/iqt2XL5vbyM0BjSTwMBvd3I="; + sha256 = "sha256-IhuPqTlCbCxExT5B9Au42RQQl4sDEvz6+HhsuT02KVs="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 271efc0283d78..8e551f3db0347 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "vorta"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; - rev = "v${version}"; - sha256 = "06sb24pimq9ckdkp9hzp4r9d3i21kxacsx5b7x9q99qcwf7h6372"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-eS/+7s9KgGCEhA6NgIzPlGM1daP+Ir2d1mmqse4YbIE="; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 28ce7512129e4..d42ee291cf050 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.6.11"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "sha256-vm/JBJh58UaSem18RpJuPUzM2GCy4RfCb6Hr1B7KWQA="; + sha256 = "sha256-lamobXaDY+v8NpoI+TuuBO5Cdol9+7VPhdmLEH6sZIo="; }; - cargoSha256 = "sha256-8ijGO8up0qVQ/kVX5/DveKyovYLh7jm+d7vooS1waAA="; + cargoSha256 = "sha256-C5MCT4EG/lI4s2rVGSm9DgBu43FKpp3iTBbCf7N1jOA="; checkFlags = [ # these want internet access, disable them diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 869f8dcad05a6..b8c878755efef 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -10,7 +10,6 @@ , writeScript , bash , tor -, gnutar , zip , xz }: @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { sha256 = "09bpkmn22kal3cxg8sil02wy2f2gplsbdkp4viagn0jppma02jid"; }; - nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ]; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 35ab9791ec730..5ecbf4fc9790c 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -25,7 +25,7 @@ with lib; let - version = "22.0"; + version = "23.0"; majorVersion = versions.major version; desktop = fetchurl { url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorVersion}.x/debian/bitcoin-qt.desktop"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "d0e9d089b57048b1555efa7cd5a63a7ed042482045f6f33402b1df425bf9613b"; + sha256 = "26748bf49d6d6b4014d0fedccac46bf2bcca42e9d34b3acfd9e3467c415acc05"; }; nativeBuildInputs = diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index 7f4e438173b04..4f8a08333a86b 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -7,14 +7,14 @@ with lib; stdenv.mkDerivation rec { - pname = "btcdeb-unstable"; - version = "200806"; + pname = "btcdeb"; + version = "unstable-2022-04-03"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "btcdeb"; - rev = "f6708c397c64894c9f9e31bea2d22285d9462de7"; - sha256 = "0qkmf89z2n7s95vhw3n9vh9dbi14zy4vqw3ffdh1w911jwm5ry3z"; + rev = "3ba1ec7f4d37f7d2ff0544403465004c6e12036e"; + hash = "sha256-l/PGXXX288mnoSFZ32t2Xd13dC6JCU5wDHoDxb+fcp0="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Bitcoin Script Debugger"; - homepage = "https://github.com/kallewoof/btcdeb"; + homepage = "https://github.com/bitcoin-core/btcdeb"; license = licenses.mit; maintainers = with maintainers; [ akru ]; platforms = platforms.unix; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 4a06592ce018a..8b6812c66d33d 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,13 +3,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.4.7"; + version = "1.5.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Qz4BNrhK+NPnKBgjXGYl4P2R878LCuMGZxLECawA12E="; + sha256 = "sha256-DcxRrVUen+JxMpiLDPfknpwCe962ifaekBeBnxJ0y88="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 57602e2231c2b..ceefa656de305 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -31,18 +31,18 @@ }) (fetchNuGet { pname = "BTCPayServer.Lightning.All"; - version = "1.3.2"; - sha256 = "0xcfba8n9zf5m1nb48ilggp03kpki4nv4kx7k7a5w1gxgm6k6j9z"; + version = "1.3.6"; + sha256 = "0jdpqy6kxg0lyh4n88wsvrcqc0kk7s7zn5lw7ivwys716m69qrdl"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; - version = "1.3.1"; - sha256 = "1xakwnb839dl0qnhqprsnfq8png31iyb0fsngljis5jc8yvb4353"; + version = "1.3.2"; + sha256 = "0v5rss6dg7297kq1frhn2pj9gd0rd8g1p5d316x5wkd4w7pmrm2w"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; - version = "1.3.1"; - sha256 = "0a79p6i3xiq6svv08c4hhihkvqa2ac7fphi3g9i0cwh47ak0k5h2"; + version = "1.3.2"; + sha256 = "0qs5p6pm54il23j8yysw0pzvrki37y6z8cd2gdknpz2f3wg7slm9"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; @@ -51,23 +51,23 @@ }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; - version = "1.3.1"; - sha256 = "165p1246fn628hlwdrx7sanlxa6qqpn480rq1asn5r1602w21844"; + version = "1.3.2"; + sha256 = "119zplkc7iy9wc95iz1qnyi42fr99ar4hp8a11p708a22w941yi0"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; - version = "1.3.1"; - sha256 = "1vlwm5mw8wffp00xhkx19yavk59b5x540sg81vis3q7hjvvgca5c"; + version = "1.3.2"; + sha256 = "08gw1gqng1khxzvvhlwsg6lw1w56ylilg738wi6cbcwy7vl7f6bb"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; - version = "1.3.1"; - sha256 = "0qga34vi4fzfr0g4qk0ad8xkqdig2ishmdj9i32s5yrrjrkx7c8d"; + version = "1.3.4"; + sha256 = "1vyz63pi5j31y8pz0b4hp9c4j249rszzfcymk3z3b2clwq32s4i4"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; - version = "1.3.1"; - sha256 = "1b70jlyzy9xjvfywzi6i3l3sd4mkknxpni9akdi0phsfqysmy0wl"; + version = "1.3.3"; + sha256 = "137azpxxmp2q69bp07ky1jsgnfy9lf0dg5ba8l654flvvrgxaq6y"; }) (fetchNuGet { pname = "BuildBundlerMinifier"; @@ -90,6 +90,11 @@ sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) (fetchNuGet { + pname = "Dapper"; + version = "2.0.123"; + sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91"; + }) + (fetchNuGet { pname = "DigitalRuby.ExchangeSharp"; version = "0.6.3"; sha256 = "1vb7ahafcd3lcbiiz552aisilwm1yq3j600gkf1wik8vhvsk02fs"; @@ -376,11 +381,6 @@ }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "6.0.0"; - sha256 = "1aw13qjkpglc1mm3cv7s73s8fschy8lzdnigsp346b7mycpg7v92"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "6.0.1"; sha256 = "15mx86i7gqlak604vr853x7a4b4l48wz5vqh9qbib7wh4pkf4rp3"; }) @@ -831,8 +831,8 @@ }) (fetchNuGet { pname = "NBitcoin"; - version = "6.0.15"; - sha256 = "038dcl2k88w4cijws3pdnjflgy4lmqx70z0l7yqz355kmxjz8ain"; + version = "6.0.18"; + sha256 = "1dr669h68cx6yfzr3n97yzzwbgnsv5g2008diyxngdjm55nh3q9s"; }) (fetchNuGet { pname = "NBitcoin"; @@ -856,8 +856,8 @@ }) (fetchNuGet { pname = "NBXplorer.Client"; - version = "4.1.3"; - sha256 = "1nh4jj7yg81825hr7cc99qlnfmdm6jibap81qqi8a968b61z4251"; + version = "4.2.0"; + sha256 = "1adbn5cbr42cjfvijaf1lffhcrcn0ws1arfi7mrg3kjshbzfgims"; }) (fetchNuGet { pname = "NETStandard.Library"; @@ -931,13 +931,13 @@ }) (fetchNuGet { pname = "Npgsql.EntityFrameworkCore.PostgreSQL"; - version = "6.0.1"; - sha256 = "108sc62dqdb6ym2ck651kamcv6qf93cmaqzygfblmiglwzi6frnx"; + version = "6.0.3"; + sha256 = "0mgwm9psxvrq6vs2cy7m72wnknydgrs71hir2jqal5wbdh8g01np"; }) (fetchNuGet { pname = "Npgsql"; - version = "6.0.1"; - sha256 = "150paiwqxp6zsy5v7vl2a9h3ikzfv3pd04whxifmamq0h1ghw0ld"; + version = "6.0.3"; + sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q"; }) (fetchNuGet { pname = "NSec.Cryptography"; @@ -1086,8 +1086,8 @@ }) (fetchNuGet { pname = "Selenium.WebDriver.ChromeDriver"; - version = "98.0.4758.10200"; - sha256 = "10mc50gm78zbxrwvxlygzmj2a29liiacv8haax0534c26vj9dwkl"; + version = "100.0.4896.6000"; + sha256 = "1pfdvxjy4xiw1j7787lf07w9nr0dmj589vf6p4aqmk2cfz8j35c6"; }) (fetchNuGet { pname = "Selenium.WebDriver"; diff --git a/pkgs/applications/blockchains/chia-plotter/default.nix b/pkgs/applications/blockchains/chia-plotter/default.nix index 51ca4469bc484..25d4d8653466b 100644 --- a/pkgs/applications/blockchains/chia-plotter/default.nix +++ b/pkgs/applications/blockchains/chia-plotter/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "chia-plotter"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "madMAx43v3r"; repo = "chia-plotter"; - rev = "18cad340858f0dbcc8dafd0bda1ce1af0fe58c65"; - sha256 = "sha256-lXjeqcjn3+LtnVYngdM1T3on7V7wez4oOAZ0RpKJXMM="; + rev = "9d7fd929919d1adde6404cb4718a665a81bcef6d"; + sha256 = "sha256-TMAly+Qof2DHPRHqE1nZuHQaCeMo0jEd8MWy4OlXrcs="; fetchSubmodules = true; }; @@ -25,10 +25,17 @@ stdenv.mkDerivation { src = ./dont_fetch_dependencies.patch; pybind11_src = python3Packages.pybind11.src; relic_src = fetchFromGitHub { - owner = "relic-toolkit"; + owner = "Chia-Network"; repo = "relic"; - rev = "1885ae3b681c423c72b65ce1fe70910142cf941c"; - hash = "sha256-tsSZTcssl8t7Nqdex4BesgQ+ACPgTdtHnJFvS9josN0="; + rev = "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7"; + hash = "sha256-IfTD8DvTEXeLUoKe4Ejafb+PEJW5DV/VXRYuutwGQHU="; + }; + sodium_src = fetchFromGitHub { + owner = "AmineKhaldi"; + repo = "libsodium-cmake"; + rev = "f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65"; # pinned by upstream + sha256 = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA="; + fetchSubmodules = true; }; }) ]; diff --git a/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch b/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch index 05486473eef5a..b7474af4c9634 100644 --- a/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch +++ b/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch @@ -11,30 +11,43 @@ index 255e3bb..5f99c3a 100644 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11 relic) - -diff --git a/lib/bls-signatures/src/CMakeLists.txt b/lib/bls-signatures/src/CMakeLists.txt -index b762b5d..e06073b 100644 ---- a/lib/bls-signatures/src/CMakeLists.txt -+++ b/lib/bls-signatures/src/CMakeLists.txt -@@ -4,18 +4,11 @@ set (CMAKE_CXX_STANDARD 17) - # CMake 3.14+ + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6922167..23d8da6 100644 +--- a/lib/bls-signatures/CMakeLists.txt ++++ b/lib/bls-signatures/CMakeLists.txt +@@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH include(FetchContent) + FetchContent_Declare(Sodium +- GIT_REPOSITORY https://github.com/AmineKhaldi/libsodium-cmake.git +- # Latest commit at the moment this was added here +- # Anchored to libsodium v1.0.18 +- GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65 ++ URL @sodium_src@ + ) + set(SODIUM_PCH "on" CACHE STRING "") + set(SODIUM_DISABLE_TESTS "on" CACHE STRING "") + set(SODIUM_CHIA_MINIMAL "on" CACHE STRING "") + FetchContent_MakeAvailable(Sodium) + -if (DEFINED ENV{RELIC_MAIN}) - set(RELIC_GIT_TAG "origin/main") -else () -- set(RELIC_GIT_TAG "1885ae3b681c423c72b65ce1fe70910142cf941c") +- # This is currently anchored to upstream aecdcae7956f542fbee2392c1f0feb0a8ac41dc5 +- set(RELIC_GIT_TAG "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7") -endif () - message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") FetchContent_Declare( relic -- GIT_REPOSITORY https://github.com/relic-toolkit/relic.git -- GIT_TAG ${RELIC_GIT_TAG} +- GIT_REPOSITORY https://github.com/Chia-Network/relic.git +- GIT_TAG ${RELIC_GIT_TAG} + SOURCE_DIR @relic_src@ ) - FetchContent_MakeAvailable(relic) + + # Relic related options diff --git a/CMakeLists.txt b/CMakeLists.txt index 970ec74..948441a 100644 diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index b58524d1eee3e..2ac761edd0085 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -21,11 +21,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.10.2"; + version = "0.11.0.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "3c9dcb686217b2efe0e988e90b95777c4591e3335e259e01a94af87e0bf01809"; + sha256 = "e2ad6eead19a0cd8869e291c27d318cf553bb015339c1f0e8d8b30e7bc0910d8"; }; # when building on darwin we need dawin.cctools to provide the correct libtool diff --git a/pkgs/applications/blockchains/dashpay/default.nix b/pkgs/applications/blockchains/dashpay/default.nix deleted file mode 100644 index 0411f8cf32bf8..0000000000000 --- a/pkgs/applications/blockchains/dashpay/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook -, openssl, db48, boost, zlib, miniupnpc -, qrencode, glib, protobuf, yasm, libevent -, util-linux -, enable_Upnp ? false -, disable_Wallet ? false -, disable_Daemon ? false }: - -with lib; -stdenv.mkDerivation rec { - pname = "dashpay"; - version = "0.12.2.3"; - - src = fetchFromGitHub { - owner = "dashpay"; - repo= "dash"; - rev = "v${version}"; - sha256 = "sha256-DMoiUX8Q0HcBHA6ZIN58uPsTnHjEJMi8eGG2DW8z17Q="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ glib openssl db48 yasm boost zlib libevent - miniupnpc protobuf qrencode util-linux ]; - - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ] - ++ optional enable_Upnp "--enable-upnp-default" - ++ optional disable_Wallet "--disable-wallet" - ++ optional disable_Daemon "--disable-daemon" - ; - - meta = { - description = "A decentralized key/value registration and transfer system"; - longDescription = '' - Dash (DASH) is an open sourced, privacy-centric digital currency - with instant transactions. It allows you to keep your finances - private as you make transactions without waits, similar to cash. - ''; - homepage = "https://www.dash.org"; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - license = licenses.mit; - }; -} diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index f78c0fa3e355e..57eaeace12abb 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-BI7hxlpg2sggD1ag73n+tRre+Ja2ZFhDPzy1DV8aEHw="; + hash = "sha256-hdXc64gj7QtCnTq3f5mpQDEKLM6qaDBLkQE07xxNaDE="; }; - cargoHash = "sha256-Oy2mOulSB2a9LaT47G+BzjidcjPjHeaoesQ7g6M8M1Q="; + cargoHash = "sha256-xMATO+H3bGkM/tLRimmLGYtrOAX8hzkw5Hb0c6iVAXY="; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix new file mode 100644 index 0000000000000..635dff4f92e9e --- /dev/null +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -0,0 +1,63 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch +, cmake, pkg-config +, boost, miniupnpc, openssl, unbound +, zeromq, pcsclite, readline, libsodium, hidapi +, randomx, rapidjson +, easyloggingpp +, CoreData, IOKit, PCSC +, trezorSupport ? true, libusb1, protobuf, python3 +}: + +stdenv.mkDerivation rec { + pname = "haven-cli"; + version = "2.2.3"; + + src = fetchFromGitHub { + owner = "haven-protocol-org"; + repo = "haven-main"; + rev = "v${version}"; + sha256 = "sha256-nBVLNT0jWIewr6MPDGwDqXoVtyFLyls1IEQraVoWDQ4="; + fetchSubmodules = true; + }; + + patches = [ + ./use-system-libraries.patch + ]; + + postPatch = '' + # remove vendored libraries + rm -r external/{miniupnp,randomx,rapidjson,unbound} + # export patched source for haven-gui + cp -r . $source + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + boost miniupnpc openssl unbound + zeromq pcsclite readline + libsodium hidapi randomx rapidjson + protobuf + readline easyloggingpp + ] + ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DUSE_DEVICE_TREZOR=ON" + "-DBUILD_GUI_DEPS=ON" + "-DReadline_ROOT_DIR=${readline.dev}" + "-DReadline_INCLUDE_DIR=${readline.dev}/include/readline" + "-DRandomX_ROOT_DIR=${randomx}" + ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; + + outputs = [ "out" "source" ]; + + meta = with lib; { + description = "Haven Protocol is the world's only network of private stable asset"; + homepage = "https://havenprotocol.org/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ kim0 ]; + }; +} diff --git a/pkgs/applications/blockchains/haven-cli/use-system-libraries.patch b/pkgs/applications/blockchains/haven-cli/use-system-libraries.patch new file mode 100644 index 0000000000000..cbf8ff849b527 --- /dev/null +++ b/pkgs/applications/blockchains/haven-cli/use-system-libraries.patch @@ -0,0 +1,92 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fb71d2d..3a710a4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -200,11 +200,11 @@ if(NOT MANUAL_SUBMODULES) + endfunction () + + message(STATUS "Checking submodules") +- check_submodule(external/miniupnp) +- check_submodule(external/unbound) +- check_submodule(external/rapidjson) ++ # check_submodule(external/miniupnp) ++ # check_submodule(external/unbound) ++ # check_submodule(external/rapidjson) + check_submodule(external/trezor-common) +- check_submodule(external/randomx) ++ # check_submodule(external/randomx) + endif() + endif() + +@@ -300,7 +300,8 @@ endif() + # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*") + # set(BSDI TRUE) + +-include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external) ++include_directories(external/easylogging++ src contrib/epee/include external) ++#include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external) + + if(APPLE) + include_directories(SYSTEM /usr/include/malloc) +diff --git a/cmake/FindMiniupnpc.cmake b/cmake/FindMiniupnpc.cmake +index ad2004a..7f4bb68 100644 +--- a/cmake/FindMiniupnpc.cmake ++++ b/cmake/FindMiniupnpc.cmake +@@ -37,7 +37,7 @@ set(MINIUPNP_STATIC_LIBRARIES ${MINIUPNP_STATIC_LIBRARY}) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args( +- MiniUPnPc DEFAULT_MSG ++ Miniupnpc DEFAULT_MSG + MINIUPNP_INCLUDE_DIR + MINIUPNP_LIBRARY + ) +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +index 71b165f..10189ce 100644 +--- a/external/CMakeLists.txt ++++ b/external/CMakeLists.txt +@@ -37,19 +37,9 @@ + + find_package(Miniupnpc REQUIRED) + +-message(STATUS "Using in-tree miniupnpc") +-add_subdirectory(miniupnp/miniupnpc) +-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") +-if(MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") +-elseif(NOT MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") +-endif() +-if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE") +-endif() +- +-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) ++set(UPNP_STATIC false PARENT_SCOPE) ++set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) ++set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) + + find_package(Unbound) + +@@ -80,4 +70,3 @@ endif() + + add_subdirectory(db_drivers) + add_subdirectory(easylogging++) +-add_subdirectory(randomx EXCLUDE_FROM_ALL) +diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl +index c626e22..be570ed 100644 +--- a/src/p2p/net_node.inl ++++ b/src/p2p/net_node.inl +@@ -60,9 +60,9 @@ + #include "cryptonote_core/cryptonote_core.h" + #include "net/parse.h" + +-#include <miniupnp/miniupnpc/miniupnpc.h> +-#include <miniupnp/miniupnpc/upnpcommands.h> +-#include <miniupnp/miniupnpc/upnperrors.h> ++#include <miniupnpc/miniupnpc.h> ++#include <miniupnpc/upnpcommands.h> ++#include <miniupnpc/upnperrors.h> + + #undef MONERO_DEFAULT_LOG_CATEGORY + #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d72da2c060f17..59166149e6a6e 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.40.2"; + version = "2.40.4"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-2L1iVPLCCIQ6qBqkg+GmiqMmknHmdDLUrysN8vcW2YQ="; + hash = "sha256-ktmGXEWoCrhx9hGau2VkQi0GMa53EqHV1wGtUk6kicc="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/applications/blockchains/lightning-loop/default.nix index 2f4caad32553a..6e99e8fe4122c 100644 --- a/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.17.0-beta"; + version = "0.18.0-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - sha256 = "0hjawagn1dfgj67i52bvf3phvm9f9708z3jqs6cvyz0w7vp107py"; + sha256 = "1kg5nlvb4lb3cjn84wcylhq0l73d2n6rg4n1srnxmgs96v41y78f"; }; - vendorSha256 = "1fpc73hwdn3baz5ykrykvqdr5861gj9p6liy8qll5525kdv560f6"; + vendorSha256 = "0q3wbjfaqdj29sjlhx6fhc0p4d12aa31s6ia36jalcvf659ybb0l"; subPackages = [ "cmd/loop" "cmd/loopd" ]; diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index 198fdb0cf430c..baf2e20aae792 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "lnd"; - version = "0.14.2-beta"; + version = "0.14.3-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "sha256-JOKitxxWcTlGlxYR1XpySZlI2fT9jgBrOxNUwT/sqdQ="; + sha256 = "sha256-ZTvGFmjhQBIWqMGatMAlX59uVyl1oUKo7L5jiz571Gc"; }; vendorSha256 = "sha256-shDmJcEyobY7Ih1MHMEY2GQnzAffsH/y4J1bme/bT7I="; diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index 40ce59f92d682..39e416e430a76 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "monero-cli"; - version = "0.17.3.0"; + version = "0.17.3.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "1spsf7m3x4psp9s7mivr6x4886jnbq4i8ll2dl8bv5bsdhcd3pjm"; + sha256 = "19sgcbli7fc1l6ms7ma6hcz1mmpbnd296lc8a19rl410acpv45zy"; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index dfc5f8b326c67..6b2cc4a7f928a 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.17.3.1"; + version = "0.17.3.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "sha256-RrchaqFmL4W9F8DhZfvxm7mHMkx/OX8K9e8uNFXWubo="; + sha256 = "10gincmgc0qpsgm94m1fqfy9j8jn9g1gjk12lcqnf77kvcnz37hq"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix index d5c739e00f4a6..e9b9d1044107a 100644 --- a/pkgs/applications/blockchains/namecoin/default.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix @@ -1,15 +1,14 @@ { lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, qt4, protobuf, qrencode, hexdump , withGui }: -with lib; stdenv.mkDerivation rec { - pname = "namecoin" + optionalString (!withGui) "d"; - version = "nc22.0"; + pname = "namecoin" + lib.optionalString (!withGui) "d"; + version = "22.0"; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; - rev = version; + rev = "nc${version}"; sha256 = "sha256-Z3CLDe0c4IpFPPTie8yoh0kcuvGmiegSgl4ITNSDkgY="; }; @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { db4 miniupnpc eject - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ qt4 protobuf qrencode @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { "--with-boost-libdir=${boost.out}/lib" ]; - meta = { + meta = with lib; { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "https://namecoin.org"; license = licenses.mit; diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 5b25afd587ba8..c263b65601870 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.2.20"; + version = "2.3.20"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-C3REnfecNwf3dtk6aLYAEsedHRlIrQZAokXtf6KI8U0="; + sha256 = "sha256-cAko5s1bFSI7HOcXg/tZtdMMe0S9zkRBeZ6bispxgwc="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index e794e0a976bac..377b34e9a0e6a 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -1,5 +1,10 @@ { fetchNuGet }: [ (fetchNuGet { + pname = "Dapper"; + version = "2.0.123"; + sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91"; + }) + (fetchNuGet { pname = "DBTrie"; version = "1.0.39"; sha256 = "0kbvl3kf73hrh1w2n3d2wshlxpqsv1pwydhwv2wxigmvs70fn1xp"; @@ -250,6 +255,11 @@ sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; }) (fetchNuGet { + pname = "Npgsql"; + version = "6.0.3"; + sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q"; + }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; @@ -755,6 +765,11 @@ sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "6.0.0"; + sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; + }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix new file mode 100644 index 0000000000000..f9f0bd0c69bfb --- /dev/null +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -0,0 +1,42 @@ +{ rustPlatform, lib, fetchFromGitHub +, zlib, elfutils, openssl +, cmake, python3, pkg-config, protobuf, perl, llvmPackages +}: +rustPlatform.buildRustPackage rec { + #https://github.com/near/nearcore + pname = "nearcore"; + version = "1.25.0"; + src = fetchFromGitHub { + owner = "near"; + repo = "nearcore"; + # there is also a branch for this version number, so we need to be explicit + rev = "refs/tags/${version}"; + sha256 = "sha256-7hiBqJLGIf+kNKJvMQ7KtGZm/SWLY3pT7YDlwbm3HDM="; + }; + + cargoSha256 = "sha256-EGv4CibSHL9oTAdWK7d/SOzZWPcEB16hTWlWHjKU4wc="; + + # don't build SDK samples that require wasm-enabled rust + cargoBuildFlags = [ "-p" "neard" ]; + doCheck = false; # needs network + + buildInputs = [ zlib elfutils openssl ]; + nativeBuildInputs = [ + cmake + python3 + pkg-config + protobuf + perl + ]; + + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include"; + + meta = with lib; { + description = "Reference client for NEAR Protocol"; + homepage = "https://github.com/near/nearcore"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 24d1f2cd0f46d..f586b6cfd3996 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.18"; + version = "0.9.21"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-pjHSiVspBV15jKUFv+Uf2l3tah40l55Pv8vwDuwgwjc="; + sha256 = "HCj5WwfKa4QsfO+1u4ciukDg6Rzv/uvc8h+V/Duhksg="; # 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-Gc5WbayQUlsl7Fk8NyLPh2Zg2yrLl3WJqKorNZMLi94="; + cargoSha256 = "tHU8KygIhJDgID/tGGssYTnY8raI5qTdLEDwOKox3No="; buildInputs = lib.optional stdenv.isDarwin [ Security ]; diff --git a/pkgs/applications/blockchains/solana/default.nix b/pkgs/applications/blockchains/solana/default.nix index 0eb48b19c88f5..a91d1f3905348 100644 --- a/pkgs/applications/blockchains/solana/default.nix +++ b/pkgs/applications/blockchains/solana/default.nix @@ -10,19 +10,23 @@ , zlib , protobuf }: +let + pinData = lib.importJSON ./pin.json; + version = pinData.version; + sha256 = pinData.sha256; + cargoSha256 = pinData.cargoSha256; +in rustPlatform.buildRustPackage rec { pname = "solana-testnet-cli"; - version = "1.9.2"; + inherit version cargoSha256; src = fetchFromGitHub { owner = "solana-labs"; repo = "solana"; rev = "v${version}"; - sha256 = "sha256-wrv35vBohLztMZPb6gfZdCaXcjj/Y7vnQqINaI6dBM4="; + inherit sha256; }; - cargoSha256 = "sha256-A5uVa+cRmrkVyw7MFH4QAr0VIFi18wcc2VPFvQyT9EM="; - buildAndTestSubdir = "cli"; nativeBuildInputs = lib.optionals stdenv.isLinux [ protobuf pkg-config ]; @@ -53,4 +57,5 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ happysalada ]; platforms = platforms.unix; }; + passthru.updateScript = ./update.sh; } diff --git a/pkgs/applications/blockchains/solana/pin.json b/pkgs/applications/blockchains/solana/pin.json new file mode 100644 index 0000000000000..34ef479795927 --- /dev/null +++ b/pkgs/applications/blockchains/solana/pin.json @@ -0,0 +1,5 @@ +{ + "version": "1.10.9", + "sha256": "sha256-y7+ogMJ5E9E/+ZaTCHWOQWG7iR+BGuVqvlNUDT++Ghc=", + "cargoSha256": "sha256-7EULmmztt+INvSdluvvX5xbE2hWKAmHiW0MEYIPNPw4=" +} diff --git a/pkgs/applications/blockchains/solana/update.sh b/pkgs/applications/blockchains/solana/update.sh new file mode 100755 index 0000000000000..ffd8b0010cc26 --- /dev/null +++ b/pkgs/applications/blockchains/solana/update.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep + +# TODO set to `verbose` or `extdebug` once implemented in oil +shopt --set xtrace +# we need failures inside of command subs to get the correct cargoSha256 +shopt --unset inherit_errexit + +const directory = $(dirname $0 | xargs realpath) +const owner = "solana-labs" +const repo = "solana" +const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \ + jq -r '.tag_name') +const latest_version = $(echo $latest_rev | sd 'v' '') +const current_version = $(jq -r '.version' $directory/pin.json) +if ("$latest_version" === "$current_version") { + echo "solana is already up-to-date" + return 0 +} else { + const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev") + const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')" + + jq ".version = \"$latest_version\" | \ + .\"sha256\" = \"$tarball_hash\" | \ + .\"cargoSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json + + const new_cargo_sha256 = $(nix-build -A solana-testnet 2>&1 | \ + tail -n 2 | \ + head -n 1 | \ + sd '\s+got:\s+' '') + + jq ".cargoSha256 = \"$new_cargo_sha256\"" $directory/pin.json | sponge $directory/pin.json +} diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index c7f594e31b490..784b01192f706 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -32,7 +32,7 @@ buildDotnetModule rec { preConfigure = '' makeWrapperArgs+=( - --run "cd $out/lib/${pname}" + --chdir "$out/lib/${pname}" ) ''; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 8dc15e7c9d85d..5a72462b14252 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,24 +1,31 @@ -{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper -, cargo, pkg-config, curl, coreutils, boost175, db62, hexdump, libsodium -, libevent, utf8cpp, util-linux, withDaemon ? true, withMining ? true -, withUtils ? true, withWallet ? true, withZmq ? true, zeromq +{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook +, makeWrapper, cargo, pkg-config, curl, coreutils, boost179, db62, hexdump +, libsodium, libevent, testers, utf8cpp, util-linux, withDaemon ? true +, withMining ? true, withUtils ? true, withWallet ? true, withZmq ? true, zcash +, zeromq }: rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { pname = "zcash"; - version = "4.6.0-1"; + version = "5.0.0"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "sha256-YJ5ufo+LYbOTr9SyiEzzp1pcSx6+cHSvDLBOIcx9X+4="; + sha256 = "sha256-5PlqFs2njqNeZgmNz0VKMWcRY5lPaF9oTsoh/uLEWi8="; }; - cargoSha256 = "sha256-m/SBHv3BNYKkSXxHnCdVng3blbHrTc/HxX/nEIa1DnM="; + prePatch = lib.optionalString stdenv.isAarch64 '' + substituteInPlace .cargo/config.offline \ + --replace "[target.aarch64-unknown-linux-gnu]" "" \ + --replace "linker = \"aarch64-linux-gnu-gcc\"" "" + ''; + + cargoSha256 = "sha256-eRRRjUbOieRC88wf+f1jAYvqGFmogBEla67NnImicEc="; nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ]; - buildInputs = [ boost175 libevent libsodium utf8cpp ] + buildInputs = [ boost179 libevent libsodium utf8cpp ] ++ lib.optional withWallet db62 ++ lib.optional withZmq zeromq; @@ -37,7 +44,7 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { configureFlags = [ "--disable-tests" - "--with-boost-libdir=${lib.getLib boost175}/lib" + "--with-boost-libdir=${lib.getLib boost179}/lib" "CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp" "RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}" ] ++ lib.optional (!withWallet) "--disable-wallet" @@ -50,6 +57,12 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { # Requires hundreds of megabytes of zkSNARK parameters. doCheck = false; + passthru.tests.version = testers.testVersion { + package = zcash; + command = "zcashd --version"; + version = "v${zcash.version}"; + }; + postInstall = '' wrapProgram $out/bin/zcash-fetch-params \ --set PATH ${lib.makeBinPath [ coreutils curl util-linux ]} @@ -58,8 +71,8 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { meta = with lib; { description = "Peer-to-peer, anonymous electronic cash system"; homepage = "https://z.cash/"; - maintainers = with maintainers; [ rht tkerber ]; + maintainers = with maintainers; [ rht tkerber centromere ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 12324088b0401..ab9fcfe1ba4a8 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -6,6 +6,7 @@ , cacert , coreutils , dbus +, e2fsprogs , expat , fetchurl , findutils @@ -52,6 +53,7 @@ , xkeyboard_config , zlib , makeDesktopItem +, tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper }: let @@ -80,6 +82,7 @@ let --set-default JAVA_HOME "$out/jre" \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \ --set FONTCONFIG_FILE ${fontsConf} \ --prefix PATH : "${lib.makeBinPath [ @@ -115,6 +118,9 @@ let libXrender libXtst + # No crash, but attempted to load at startup + e2fsprogs + # Gradle wants libstdc++.so.6 stdenv.cc.cc.lib # mksdcard wants 32 bit libstdc++.so.6 @@ -216,9 +222,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ fabianhjr ]; - beta = [ fabianhjr ]; - canary = [ fabianhjr ]; + stable = [ ]; + beta = [ ]; + canary = [ ]; dev = canary; }."${channel}"; }; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index e7824cd93f1c0..cfd81fdfe5a2c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -1,4 +1,4 @@ -{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv }: +{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv, tiling_wm ? false }: let mkStudio = opts: callPackage (import ./common.nix opts) { @@ -7,18 +7,19 @@ let }; inherit (gnome2) GConf gnome_vfs; inherit buildFHSUserEnv; + inherit tiling_wm; }; stableVersion = { - version = "2021.1.1.21"; # "Android Studio Bumblebee (2021.1.1 Patch 1)" - sha256Hash = "PeMJIILfaunTlpR4EV76qQlTlZDcWoKes61qe9W9oqQ="; + version = "2021.1.1.23"; # "Android Studio Bumblebee (2021.1.1 Patch 3)" + sha256Hash = "1kxb19qf7bs5lyfgr8vamakp1nf2wlxlwwni1kihza67ib6hcxdk"; }; betaVersion = { - version = "2021.2.1.8"; # "Android Studio Chipmunk (2021.2.1) Beta 1" - sha256Hash = "bPfs4kw7czG9CbEgrzn0bQXdT03jyqPVqtaIuVBFSmc="; + version = "2021.2.1.11"; # "Android Studio Chipmunk (2021.2.1) Beta 4" + sha256Hash = "0in8x6v957y9hsnz5ak845pdpvgvnvlm0s6r9y8f27zkm947vbjd"; }; latestVersion = { # canary & dev - version = "2021.3.1.1"; # "Android Studio Dolphin (2021.3.1) Canary 1" - sha256Hash = "W3pNQBM7WdDScQo5b8q5Va5NTgl73uZu0ks/zDMb4aA="; + version = "2021.3.1.7"; # "Android Studio Dolphin (2021.3.1) Canary 7" + sha256Hash = "02jwy3q2ccs7l3snm8w40znzk54v2h1sljdr3d0yh7sy0qyn32k1"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index b8a651b2d44fa..552358319e15c 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, fetchurl, makeWrapper, jdk }: +{ lib, stdenv, fetchurl, jdk, glib, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "bluej"; version = "5.0.3"; + src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder @@ -11,26 +12,52 @@ stdenv.mkDerivation rec { sha256 = "sha256-OarqmptxZc7xEEYeoCVqHXkAvfzfSYx5nUp/iWPyoqw="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ glib ]; - unpackPhase = '' - ar xf $src - tar xf data.tar.xz + sourceRoot = "."; + preUnpack = '' + unpackCmdHooks+=(_tryDebData) + _tryDebData() { + if ! [[ "$1" =~ \.deb$ ]]; then return 1; fi + ar xf "$1" + if ! [[ -e data.tar.xz ]]; then return 1; fi + unpackFile data.tar.xz + } ''; installPhase = '' - mkdir -p $out - cp -r usr/* $out + runHook preInstall + + if [ -n "$prefix" ]; then + mkdir -p "$prefix" + fi + + mkdir -p "$out" + + if shopt -q dotglob; then dotglobOpt=$?; else dotglobOpt=$?; fi + shopt -s dotglob + for file in usr/*; do + cp -R "$file" "$out" + done + if (( !dotglobOpt )); then shopt -u dotglob; fi + + runHook postInstall + ''; + + dontWrapGApps = true; + preFixup = '' makeWrapper ${jdk}/bin/java $out/bin/bluej \ - --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/bluej/bluej.jar\" bluej.Boot" + "''${gappsWrapperArgs[@]}" \ + --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp $out/share/bluej/bluej.jar bluej.Boot" ''; meta = with lib; { description = "A simple integrated development environment for Java"; homepage = "https://www.bluej.org/"; license = licenses.gpl2ClasspathPlus; - maintainers = [ maintainers.chvp ]; + maintainers = with maintainers; [ chvp ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 8a5f4cf4b3a4e..032fd765b27f4 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, file, zip, wxGTK30-gtk3, gtk3 +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31-gtk3, gtk3 , contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook }: @@ -15,14 +15,55 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; - buildInputs = [ wxGTK30-gtk3 gtk3 ] + buildInputs = [ wxGTK31-gtk3 gtk3 ] ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; - patches = [ ./writable-projects.patch ]; + patches = [ + ./writable-projects.patch + ./fix-clipboard-flush.patch + # Fix build on non-x86 machines + (fetchpatch { + name = "remove-int3.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/d76c015c456561d2c7987935a5f4dc6c0932b0c4.patch"; + sha256 = "sha256-dpH33vGf2aNdYTeLwxglYDNbvwoY2bGSG6YFRyoGw+A="; + }) + (fetchpatch { + name = "remove-pragmas.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/966949d5ab7f3cb86e2a2c7ef4e853ee209b5a1a.patch"; + sha256 = "sha256-XjejjGOvDk3gl1/n9R69XATGLj5n7tOZNyG8vIlwfyg="; + }) + # Fix build with GCC 11 + (fetchpatch { + name = "use-gcc11-openfilelist.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/a5ea6ff7ff301d739d3dc8145db1578f504ee4ca.patch"; + sha256 = "sha256-kATaLej8kJf4xm0VicHfRetOepX8O9gOhwdna0qylvQ="; + }) + (fetchpatch { + name = "use-gcc11-ccmanager.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/04b7c50fb8c6a29b2d84579ee448d2498414d855.patch"; + sha256 = "sha256-VPy/M6IvNBxUE4hZRbLExFm0DJf4gmertrqrvsXQNz4="; + }) + # Fix build with wxGTK 3.1.5 + (fetchpatch { + name = "use-wxgtk315.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/2345b020b862ec855038dd32a51ebb072647f28d.patch"; + sha256 = "sha256-RRjwZA37RllnG8cJdBEnASpEd8z0+ru96fjntO42OvU="; + }) + (fetchpatch { + name = "fix-getstring.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/dbdf5c5ea9e3161233f0588a7616b7e4fedc7870.patch"; + sha256 = "sha256-DrEMFluN8vs0LERa7ULGshl7HdejpsuvXAMjIr/K1fQ="; + }) + ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; - configureFlags = [ "--enable-pch=no" ] - ++ optionals contribPlugins [ "--with-contrib-plugins" "--with-boost-libdir=${boost}/lib" ]; + configureFlags = [ "--enable-pch=no" ] ++ optionals contribPlugins [ + ("--with-contrib-plugins" + optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") + "--with-boost-libdir=${boost}/lib" + ]; + postInstall = optionalString stdenv.isDarwin '' + ln -s $out/lib/codeblocks/plugins $out/share/codeblocks/plugins + ''; meta = { maintainers = [ maintainers.linquize ]; diff --git a/pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch b/pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch new file mode 100644 index 0000000000000..ee4ebd61af0b6 --- /dev/null +++ b/pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch @@ -0,0 +1,24 @@ +diff --git a/src/src/app.cpp b/src/src/app.cpp +index 81130fd..f98d37b 100644 +--- a/src/src/app.cpp ++++ b/src/src/app.cpp +@@ -602,7 +602,8 @@ bool CodeBlocksApp::OnInit() + m_BatchWindowAutoClose = true; + m_pSingleInstance = nullptr; + +- wxTheClipboard->Flush(); ++ if (wxTheClipboard->IsOpened()) ++ wxTheClipboard->Flush(); + + wxCmdLineParser& parser = *Manager::GetCmdLineParser(); + parser.SetDesc(cmdLineDesc); +@@ -851,7 +852,8 @@ bool CodeBlocksApp::OnInit() + + int CodeBlocksApp::OnExit() + { +- wxTheClipboard->Flush(); ++ if (wxTheClipboard->IsOpened()) ++ wxTheClipboard->Flush(); + + if (g_DDEServer) delete g_DDEServer; + diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index c94ee471c28a3..9a872c91c95a3 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.160.0"; + version = "1.164.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-42V6RFa+mAXyaUuKeDQa9Voi1MjnzcVl+cOA65VabxM="; + sha256 = "sha256-LKLWZiA3Ya8xI2QvNW2f+5akndBloj5pQ7QNaVMoYSI="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index efb179333bf22..0eac78393711e 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -1,23 +1,23 @@ { "EncConv": { "owner": "Alexey-T", - "rev": "2022.03.02", - "sha256": "sha256-fBN6Ix5CqhzMbNrWGn6nw6+JRDmEfqe6o8JGHERkiPE=" + "rev": "2022.04.18", + "sha256": "sha256-UV07a9qNzd0JQWCq/eD0K9fA7kxAKj5OP7dOpECo8xw=" }, "ATBinHex-Lazarus": { "owner": "Alexey-T", - "rev": "2021.11.17", - "sha256": "sha256-wdYH0sISFNx42zt07gLn9ANxcyrq3WrbRhWfTFgPQWw=" + "rev": "2022.04.16", + "sha256": "sha256-7ye73KSpoPvvxBNwBC3uloufFE+448RDyNScumk1ViE=" }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2022.03.17", - "sha256": "sha256-zpirFZcqIT53tZhgxQGdwVB6pA98SQLr1o3f+Lhq2QY=" + "rev": "2022.05.06", + "sha256": "sha256-mYZ3mgtUpQ8sry5WmdluHca/CR7RqR9GRrxIoeZFLes=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.04.06", - "sha256": "sha256-EnPOAl1qsdcYzmUgT5rSYqY/xOLSfDcMNCXIG8LC4H0=" + "rev": "2022.05.09", + "sha256": "sha256-bzBO9Uf8Zkt/kFouQuiPagL7e+86ezH/mOpDCuInJlE=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,13 +26,13 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2022.03.28", - "sha256": "sha256-jh3lqisiPNMxCapP6O5oJdUL3PLQ3JyomtgWix+bML0=" + "rev": "2022.05.06", + "sha256": "sha256-ppm8Wuxhi5N3Er0f0h9d+v2spwEMr7ksf9tz4vI42+M=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.03.28", - "sha256": "sha256-TpAaL7/bhnrQgAq1mUTdEWXecSmznWy/iAw+TMMrQGo=" + "rev": "2022.05.08", + "sha256": "sha256-mAxqJ3PO1BCOYNctKfw/4fKbJsI7Ckb5PVcKdALZu0Q=" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix index 3f84666fe0294..4321119156e0e 100644 --- a/pkgs/applications/editors/deadpixi-sam/default.nix +++ b/pkgs/applications/editors/deadpixi-sam/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace config.mk.def \ --replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" \ - --replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc" + --replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc" \ + --replace "RXPATH=/usr/bin/ssh" "RXPATH=ssh" ''; CFLAGS = "-D_DARWIN_C_SOURCE"; @@ -24,8 +25,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; postInstall = '' + substituteInPlace deadpixi-sam.desktop \ + --replace "accessories-text-editor" "$out/share/icons/hicolor/scalable/apps/sam.svg" mkdir -p $out/share/applications + mkdir -p $out/share/icons/hicolor/scalable/apps mv deadpixi-sam.desktop $out/share/applications + mv sam.svg $out/share/icons/hicolor/scalable/apps ''; meta = with lib; { diff --git a/pkgs/applications/editors/emacs/27.nix b/pkgs/applications/editors/emacs/27.nix deleted file mode 100644 index 064231b24565c..0000000000000 --- a/pkgs/applications/editors/emacs/27.nix +++ /dev/null @@ -1,16 +0,0 @@ -import ./generic.nix (rec { - version = "27.2"; - sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk="; - patches = fetchpatch: [ - (fetchpatch { - name = "fix-aarch64-darwin-triplet.patch"; - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082"; - sha256 = "sha256-RF9b5PojFUAjh2TDUW4+HaWveV30Spy1iAXhaWf1ZVg="; - }) - # glibc 2.34 compat - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/emacs/raw/181aafcdb7ee2fded9fce4cfc448f27edccc927f/f/emacs-glibc-2.34.patch"; - sha256 = "sha256-2o3C/jhZPl2OW/LmVPt/fhdwbS9NOdF9lVEF1Kn9aEk="; - }) - ]; -}) diff --git a/pkgs/applications/editors/emacs/28.nix b/pkgs/applications/editors/emacs/28.nix new file mode 100644 index 0000000000000..948fa52c0797d --- /dev/null +++ b/pkgs/applications/editors/emacs/28.nix @@ -0,0 +1,5 @@ +import ./generic.nix (rec { + version = "28.1"; + sha256 = "sha256-D33wnlxhx0LyG9WZaQDj2II3tG0HcJdZTC4dSA3lrgY="; + patches = _: [ ]; +}) diff --git a/pkgs/applications/editors/emacs/at-fdcwd.patch b/pkgs/applications/editors/emacs/at-fdcwd.patch deleted file mode 100644 index 2d8099b737369..0000000000000 --- a/pkgs/applications/editors/emacs/at-fdcwd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h -index 84ede3e..8e8f42e 100644 ---- a/lib/careadlinkat.h -+++ b/lib/careadlinkat.h -@@ -23,6 +23,10 @@ - #include <fcntl.h> - #include <unistd.h> - -+#ifndef AT_FDCWD -+#define AT_FDCWD -2 -+#endif -+ - struct allocator; - - /* Assuming the current directory is FD, get the symbolic link value diff --git a/pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix b/pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix deleted file mode 100644 index 31106654ae6c7..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, fetchurl, stdenv, emacs, python }: - -stdenv.mkDerivation rec { - pname = "cedet"; - version = "1.1"; - - src = fetchurl { - url = "mirror://sourceforge/cedet/cedet-${version}.tar.gz"; - sha256 = "0p2bwlpwwa019axvgj09xkxbr53j0pq23d46s4la9jfhl47nbh22"; - }; - - buildInputs = [ emacs python ]; - - doCheck = true; - checkPhase = "make utest"; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp -v */*.el */*/*.el */*.elc */*/*.elc "$out/share/emacs/site-lisp" - chmod a-x "$out/share/emacs/site-lisp/"* - - mkdir -p "$out/share/info" - cp -v */*.info* */*/*.info* "$out/share/info" - ''; - - meta = { - description = "CEDET, a Collection of Emacs Development Environment Tools"; - - longDescription = '' - CEDET is a collection of tools written with the end goal of - creating an advanced development environment in Emacs. - - Emacs already is a great environment for writing software, but - there are additional areas that need improvement. Many new - ideas for integrated environments have been developed in newer - products, such as JBuilder, Eclipse, or KDevelop. CEDET is a - project which brings together several different tools needed to - implement advanced features. - - CEDET includes EIEIO (Enhanced Implementation of Emacs - Interpreted Objects), Semantic, SRecode, Speedbar, EDE (Emacs - Development Environment), and COGRE (COnnected GRaph Editor). - ''; - - license = lib.licenses.gpl2Plus; - - homepage = "http://cedet.sourceforge.net/"; - - # Fails with `semantic-idle.el:42:1:Error: Invalid function: class-p` - broken = true; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 49c1b6248cac7..0cee33fc81e4a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -114,10 +114,10 @@ elpaBuild { pname = "aggressive-completion"; ename = "aggressive-completion"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/aggressive-completion-1.6.tar"; - sha256 = "0i7kcxd7pbdw57gczbxddr2n4j778x2ccfpkgjhdlpdsyidfh2bq"; + url = "https://elpa.gnu.org/packages/aggressive-completion-1.7.tar"; + sha256 = "1rpy53kh19ljjr2xgna716jynajjpgkkjgcl3gzryxsmky8mwbfl"; }; packageRequires = [ emacs ]; meta = { @@ -234,10 +234,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.1.1"; + version = "13.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.1.1.tar"; - sha256 = "193sqq2wiq3lg99m8hifl9rjxdazpy638r99sqvmxmkfm98cr34r"; + url = "https://elpa.gnu.org/packages/auctex-13.1.3.tar"; + sha256 = "0v9rxwz6ngnwrgvzgdki861s136gq30lqhy2gcd9q0a36gb6zhwk"; }; packageRequires = [ emacs ]; meta = { @@ -309,10 +309,10 @@ elpaBuild { pname = "bbdb"; ename = "bbdb"; - version = "3.2.1"; + version = "3.2.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bbdb-3.2.1.tar"; - sha256 = "01vsnifs47krq1srgdkk9agbv3p2fykl9nydr4nrfjxbqpnyh3ij"; + url = "https://elpa.gnu.org/packages/bbdb-3.2.2.2.tar"; + sha256 = "0bf20r5xhxln6z4qp8zrlln0303dkci2ydsr74pxcj08aqgk5xxf"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -354,10 +354,10 @@ elpaBuild { pname = "bluetooth"; ename = "bluetooth"; - version = "0.3"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bluetooth-0.3.tar"; - sha256 = "1q27hk4j7k0q9vqgn9nq7q0vhn9jdqbygs7d9lv5gwfhdzdnl4az"; + url = "https://elpa.gnu.org/packages/bluetooth-0.3.1.tar"; + sha256 = "1p10kcim5wqnbj2kiqv6hgjkzznaa48qysnnf8ym90mylsczr70z"; }; packageRequires = [ dash emacs ]; meta = { @@ -384,10 +384,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-1.0.4.tar"; - sha256 = "0cwzjyj8yjg13b63va6pnj01m6kc5g3zx69c9w2ysl2wk24zn6dz"; + url = "https://elpa.gnu.org/packages/boxy-1.1.0.tar"; + sha256 = "17z0amn1klbzvq0z5g20a5gjq5agrrhnkp8amqlqzj7p0p31nbns"; }; packageRequires = [ emacs ]; meta = { @@ -399,10 +399,10 @@ elpaBuild { pname = "boxy-headings"; ename = "boxy-headings"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-headings-2.1.2.tar"; - sha256 = "0jyfp41jw33kmi7832x5x0mgh5niqvb7dfc7q00kay5q9ixg83dq"; + url = "https://elpa.gnu.org/packages/boxy-headings-2.1.3.tar"; + sha256 = "09k5x123db19v2k49y8acyk5y3r0fxw0xz61qqqidrgrx8fs3mg9"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -654,6 +654,21 @@ license = lib.licenses.free; }; }) {}; + comint-mime = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "comint-mime"; + ename = "comint-mime"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/comint-mime-0.1.tar"; + sha256 = "1ak0ylqdslsb6a64dkpvappdbqnl1i8lc17jla9pqqs7r16sh3n0"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/comint-mime.html"; + license = lib.licenses.free; + }; + }) {}; compact-docstrings = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "compact-docstrings"; @@ -737,14 +752,29 @@ license = lib.licenses.free; }; }) {}; + compat = callPackage ({ elpaBuild, emacs, fetchurl, lib, nadvice }: + elpaBuild { + pname = "compat"; + ename = "compat"; + version = "28.1.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/compat-28.1.1.1.tar"; + sha256 = "13ksa6q3m525gd6sdixmak6brfch2rhz8dzzmhvvdh1y04hcnam8"; + }; + packageRequires = [ emacs nadvice ]; + meta = { + homepage = "https://elpa.gnu.org/packages/compat.html"; + license = lib.licenses.free; + }; + }) {}; consult = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "consult"; ename = "consult"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.16.tar"; - sha256 = "172w4d9hbzj98j1gyfhzw2zz4fpw90ak8ccg35fngwjlk9mjdrzk"; + url = "https://elpa.gnu.org/packages/consult-0.17.tar"; + sha256 = "16yrp6scxg93anxrp5nww08ixxqk8ra9dn9zm8w5dry997kmkasa"; }; packageRequires = [ emacs ]; meta = { @@ -771,10 +801,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.20"; + version = "0.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.20.tar"; - sha256 = "03yycimbqs4ixz7lxp7f1b4fipq6kl2bbjnl87r0n9x8mzfslbdl"; + url = "https://elpa.gnu.org/packages/corfu-0.23.tar"; + sha256 = "1l988jmvn3x1x77sc89pg5ivwl9i4r2v4k74ymkplgcc9wpffm1v"; }; packageRequires = [ emacs ]; meta = { @@ -827,6 +857,21 @@ license = lib.licenses.free; }; }) {}; + cpupower = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "cpupower"; + ename = "cpupower"; + version = "1.0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cpupower-1.0.4.tar"; + sha256 = "12910d3qbkapr4bvqv88lr85fz6rkim0zrc24nxnvkhkh3yi8qvd"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/cpupower.html"; + license = lib.licenses.free; + }; + }) {}; crdt = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "crdt"; @@ -876,10 +921,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.18"; + version = "1.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.18.tar"; - sha256 = "0fv7hvsfbc9n4hsgg3ywk8qf4ig5a986zfq0lwnjj8pcz1bpmrxj"; + url = "https://elpa.gnu.org/packages/csv-mode-1.19.tar"; + sha256 = "0sslxlnw10ba6m711p4ps4zsfjz56dsp2945ga5z0y8d860pliqh"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -887,6 +932,21 @@ license = lib.licenses.free; }; }) {}; + cursory = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "cursory"; + ename = "cursory"; + version = "0.1.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cursory-0.1.4.tar"; + sha256 = "0yjwn6kpxl7b3m8si4sqmdkhr8imcgbvwhwki2sxgybs75lxdg97"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cursory.html"; + license = lib.licenses.free; + }; + }) {}; cycle-quotes = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "cycle-quotes"; @@ -951,10 +1011,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.31"; + version = "0.32"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.31.tar"; - sha256 = "11vdjrn5m5g6pirw8jv0602fbwwgdhazfrrwxxplii8x02gqk0sr"; + url = "https://elpa.gnu.org/packages/debbugs-0.32.tar"; + sha256 = "1xp3mj3ndaljma0g7x9abziphgi2a6j8k1v52sb8xwgn4p5gdvby"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1116,10 +1176,10 @@ elpaBuild { pname = "djvu"; ename = "djvu"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/djvu-1.1.1.el"; - sha256 = "0z2qk1v4qkvcwl27ycqfb8vyszq5v6b8ci29b4la00yaki16p04i"; + url = "https://elpa.gnu.org/packages/djvu-1.1.2.tar"; + sha256 = "0i7xwgg2fxndy81lnng6fh9iknals8xvx4f1nmxq7c099bzwb57c"; }; packageRequires = []; meta = { @@ -1146,10 +1206,10 @@ elpaBuild { pname = "dtache"; ename = "dtache"; - version = "0.5"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dtache-0.5.tar"; - sha256 = "10gcnkajpw7szd41l6ykkysv00yp93y1z9ajhcmk4wzni93w21z2"; + url = "https://elpa.gnu.org/packages/dtache-0.6.tar"; + sha256 = "1nv5hzn4rnm8pzfr5i209djaafj4ymg5j886yq2j19zkjadc8yx3"; }; packageRequires = [ emacs ]; meta = { @@ -1191,10 +1251,10 @@ elpaBuild { pname = "easy-kill"; ename = "easy-kill"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/easy-kill-0.9.4.tar"; - sha256 = "1pqqv4dhfm00wqch4wy3n2illsvxlz9r6r64925cvq3i7wq4la1x"; + url = "https://elpa.gnu.org/packages/easy-kill-0.9.5.tar"; + sha256 = "0h8rzd23sgkj3vxnyhis9iyq8n3xqp9x1mvxlm61s6wwj9j398j6"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1266,10 +1326,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20220324"; + version = "20220416"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20220324.tar"; - sha256 = "0x1fhjj7g96xmp8pnj3k23xi61nfzaj04bzx050qjc1dvdg8gpfa"; + url = "https://elpa.gnu.org/packages/eev-20220416.tar"; + sha256 = "174hwb3cyiqimzcsl62yhq51hb4gxmj5wni6w5ng4m24bfkx87nc"; }; packageRequires = [ emacs ]; meta = { @@ -1324,10 +1384,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eldoc-1.11.1.tar"; - sha256 = "065clc07nrgp56cgynqhq3fmnwd64ccg2jxzikzb0f2zkn10vc90"; + url = "https://elpa.gnu.org/packages/eldoc-1.12.0.tar"; + sha256 = "1npggpisqnfkc3gx7dr3pjnif7gf571z7s9g7n6vnb213353qskk"; }; packageRequires = [ emacs ]; meta = { @@ -1439,10 +1499,10 @@ elpaBuild { pname = "engrave-faces"; ename = "engrave-faces"; - version = "0.2.0"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/engrave-faces-0.2.0.tar"; - sha256 = "1d0hsfg3wvwbs82gjyvfjvy1sszcm7qa50bch1b6jy05kbc543ip"; + url = "https://elpa.gnu.org/packages/engrave-faces-0.3.1.tar"; + sha256 = "1q4sjl2rvcfwcirm32nmi53258ln71yhh1dgszlxwknm38a14v3i"; }; packageRequires = [ emacs ]; meta = { @@ -1650,6 +1710,21 @@ license = lib.licenses.free; }; }) {}; + fontaine = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "fontaine"; + ename = "fontaine"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/fontaine-0.2.1.tar"; + sha256 = "11g03gaiypqf0xi7s3xyjnbi2w154lkd7j0ybmn8scs6pbzdyl95"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/fontaine.html"; + license = lib.licenses.free; + }; + }) {}; frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "frame-tabs"; @@ -1912,6 +1987,21 @@ license = lib.licenses.free; }; }) {}; + gtags-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "gtags-mode"; + ename = "gtags-mode"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gtags-mode-1.0.tar"; + sha256 = "0nyzsr3fnds931ihw2dp5xlgv151kzph7qv1n751r1cajimzlp7n"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gtags-mode.html"; + license = lib.licenses.free; + }; + }) {}; guess-language = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -2028,10 +2118,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "7.1.3"; + version = "8.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/hyperbole-7.1.3.tar"; - sha256 = "0bizibn4qgxqp89fyik6p47s9hss1g932mg8k7pznn3kkhj5c8rh"; + url = "https://elpa.gnu.org/packages/hyperbole-8.0.0.tar"; + sha256 = "171x7jad62xd0n3xgs32dksyhn5abxj1kna0qgm65mm0v73hrv8d"; }; packageRequires = [ emacs ]; meta = { @@ -2273,10 +2363,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kind-icon-0.1.4.tar"; - sha256 = "00pyvnq4dx51l2wbhvm6k6cx5xmy32j4h1lkr5kr8s3j5w83ip25"; + url = "https://elpa.gnu.org/packages/kind-icon-0.1.5.tar"; + sha256 = "0qajj89vkgc9gbgff6akzll53jy0kgkv6c9jvwpl32rbg8v0wp63"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -2374,6 +2464,21 @@ license = lib.licenses.free; }; }) {}; + lin = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "lin"; + ename = "lin"; + version = "0.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/lin-0.3.1.tar"; + sha256 = "1blk9vc9fyw6djqh0465bayv2s5s0ap7fps383ihmazmmii6mp2a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lin.html"; + license = lib.licenses.free; + }; + }) {}; lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "lmc"; @@ -2453,10 +2558,10 @@ elpaBuild { pname = "logos"; ename = "logos"; - version = "0.2.0"; + version = "0.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/logos-0.2.0.tar"; - sha256 = "0cqmgvgyyn656rg60bbnxr2flmnw9h4z5i2w98bsf4krlp3s4i6x"; + url = "https://elpa.gnu.org/packages/logos-0.3.2.tar"; + sha256 = "1qpbp9f9lz7yrky42cq8b4k295593s7l892zsrdyifnqcgs50bfd"; }; packageRequires = [ emacs ]; meta = { @@ -2667,10 +2772,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-2.2.0.tar"; - sha256 = "1vgwr9q16d3hjwmqljmmzlpn177gvwbk3wg4l1fmgc5bpb7k78ky"; + url = "https://elpa.gnu.org/packages/modus-themes-2.3.0.tar"; + sha256 = "028c1z4p1bbgf34fml4i0prihxn44x288iyprz9gxrp7x3gl05n8"; }; packageRequires = [ emacs ]; meta = { @@ -2826,10 +2931,10 @@ elpaBuild { pname = "nano-modeline"; ename = "nano-modeline"; - version = "0.5"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-modeline-0.5.tar"; - sha256 = "0f6xgrxykd5jmlzf9xmywh0jc2jfq698m4nqk60h40dm6pi0gfi2"; + url = "https://elpa.gnu.org/packages/nano-modeline-0.7.tar"; + sha256 = "1fsjzbdawkn4vmk6zs6az1b42mx5ka7a618fgx5zdncr79wl0vjw"; }; packageRequires = [ emacs ]; meta = { @@ -2841,10 +2946,10 @@ elpaBuild { pname = "nano-theme"; ename = "nano-theme"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-theme-0.3.0.tar"; - sha256 = "1nq5x46467vnsfg3fzb0qyg97xpnwsvbqg8frdjil5zq5fhsgmrz"; + url = "https://elpa.gnu.org/packages/nano-theme-0.3.1.tar"; + sha256 = "003jhzh52iqrqlxh1gpv3y2wjlxx4ng3al5zcpm5q42kix8cjpd1"; }; packageRequires = [ emacs ]; meta = { @@ -3025,10 +3130,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.5.2"; + version = "9.5.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.5.2.tar"; - sha256 = "12pvr47b11pq5rncpb3x8y11fhnakk5bi73j9l9w4d4ss3swcrnh"; + url = "https://elpa.gnu.org/packages/org-9.5.3.tar"; + sha256 = "0i8lx7gsdz79qv0h3qdbwqd0m91z6ky33wjmkcbify75giixiv25"; }; packageRequires = [ emacs ]; meta = { @@ -3070,10 +3175,10 @@ elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-real-1.0.4.tar"; - sha256 = "0bn9vyx74lki2nggzir02mcrww94dnqpbkryjr7a4i6am0ylf705"; + url = "https://elpa.gnu.org/packages/org-real-1.0.5.tar"; + sha256 = "0g70bzhr094fah86cyvd9ci8q28qi9c44g33i4lw7clklgdx7mxl"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -3160,10 +3265,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osm-0.6.tar"; - sha256 = "0p19qyx4gw1rn2f5hlxa7gx1sph2z5vjw7cnxwpjhbbr0430zzwb"; + url = "https://elpa.gnu.org/packages/osm-0.7.tar"; + sha256 = "0k2phmh2sl50vx88cgndghcjfz0i20mjs2hg4mlh4hb5q9yjpcj4"; }; packageRequires = [ emacs ]; meta = { @@ -3321,6 +3426,21 @@ license = lib.licenses.free; }; }) {}; + plz = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "plz"; + ename = "plz"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/plz-0.1.tar"; + sha256 = "083qz6kfg4q8xy3vsfwlk2g9vbg8iym2axmyhh54naivrc096ghc"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/plz.html"; + license = lib.licenses.free; + }; + }) {}; poker = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "poker"; @@ -3400,10 +3520,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "0.2.0"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pulsar-0.2.0.tar"; - sha256 = "0vil6gv7w6d77hksc2pbrwjdd8dp3ka4kf5kihx04r95032pky62"; + url = "https://elpa.gnu.org/packages/pulsar-0.3.1.tar"; + sha256 = "0v3bdw0sgic98b7xj19g37hw1vinanagsbhyf5qpajx3gm2im9wx"; }; packageRequires = [ emacs ]; meta = { @@ -3415,10 +3535,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-4.1.0.tar"; - sha256 = "1q4b3y72gbkl5z31brlnjqjl30lgqm2d1zlqrbkqnnfy5hjgazk9"; + url = "https://elpa.gnu.org/packages/pyim-4.2.0.tar"; + sha256 = "1yb6yv92987kq0ls38d0fqwbj5jrf4cg3jvdbwjzr61gg3izf414"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3490,10 +3610,10 @@ elpaBuild { pname = "rainbow-mode"; ename = "rainbow-mode"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.5.el"; - sha256 = "159fps843k5pap9k04a7ll1k3gw6d9c6w08lq4bbc3lqg78aa2l9"; + url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.6.tar"; + sha256 = "04v73cm1cap19vwc8lqsw0rmfr9v7r3swc4wgxnk9dnzxi9j2527"; }; packageRequires = []; meta = { @@ -3695,10 +3815,10 @@ elpaBuild { pname = "rec-mode"; ename = "rec-mode"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rec-mode-1.8.2.tar"; - sha256 = "06mjj1la2v8zdhsflj3mwcp7qnkj7gxzm8wbk2pli1h8vnq2zvd0"; + url = "https://elpa.gnu.org/packages/rec-mode-1.8.3.tar"; + sha256 = "0lkmvvdj4xx3qhxqggizrcdawav0accyrza2wmhfdq88g2zh5575"; }; packageRequires = [ emacs ]; meta = { @@ -3785,10 +3905,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "4"; + version = "5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-4.tar"; - sha256 = "15vs982cxpc3g8cq2gj3a6dfn9i2r9b44x38ydvcmiy2brkd3psj"; + url = "https://elpa.gnu.org/packages/rt-liberation-5.tar"; + sha256 = "1gjj38rag3hh42xkf7qlvwn0qj45i8v30h5wgs3w2a2ccs46bpy4"; }; packageRequires = []; meta = { @@ -4151,6 +4271,21 @@ license = lib.licenses.free; }; }) {}; + sql-cassandra = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "sql-cassandra"; + ename = "sql-cassandra"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sql-cassandra-0.2.1.tar"; + sha256 = "1w9jhh4gf5nnjq8p2zfdli81yqvnfjri4qlwxiwb913ah48vyi2l"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sql-cassandra.html"; + license = lib.licenses.free; + }; + }) {}; sql-indent = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "sql-indent"; @@ -4305,10 +4440,10 @@ elpaBuild { pname = "taxy"; ename = "taxy"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/taxy-0.8.tar"; - sha256 = "00pc6lh35gj8vzcsn17fyazb9jsc4m6nr7cvb32w02isadv8qd3m"; + url = "https://elpa.gnu.org/packages/taxy-0.9.tar"; + sha256 = "1nzafs3yvcnmg07zi345n2yvjsw9wixlybzibnhf5k6jnd0vvpjh"; }; packageRequires = [ emacs ]; meta = { @@ -4316,6 +4451,25 @@ license = lib.licenses.free; }; }) {}; + taxy-magit-section = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , magit-section }: + elpaBuild { + pname = "taxy-magit-section"; + ename = "taxy-magit-section"; + version = "0.9.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/taxy-magit-section-0.9.1.tar"; + sha256 = "0ybkz5nqjdrg2z9bfd07xg4k49hrl26vsrwz2vqpfbsqqg5vr4pr"; + }; + packageRequires = [ emacs magit-section ]; + meta = { + homepage = "https://elpa.gnu.org/packages/taxy-magit-section.html"; + license = lib.licenses.free; + }; + }) {}; temp-buffer-browse = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "temp-buffer-browse"; @@ -4395,14 +4549,44 @@ license = lib.licenses.free; }; }) {}; + tmr = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "tmr"; + ename = "tmr"; + version = "0.2.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tmr-0.2.3.tar"; + sha256 = "0lys6g96cvfyhwr7z0yv9cx2ykzyixjppv5fh29qzq3h3dywx5wb"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tmr.html"; + license = lib.licenses.free; + }; + }) {}; + tomelr = callPackage ({ elpaBuild, emacs, fetchurl, lib, map, seq }: + elpaBuild { + pname = "tomelr"; + ename = "tomelr"; + version = "0.4.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tomelr-0.4.3.tar"; + sha256 = "03dj7mhqyfdpxr32nyvfgkqr6wr55cd7yk9a0izjs4468zx8vl0d"; + }; + packageRequires = [ emacs map seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tomelr.html"; + license = lib.licenses.free; + }; + }) {}; tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.2.2"; + version = "2.5.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.2.2.tar"; - sha256 = "104nn6xdmcviqqv4cx5llhwj1sh4q04w3h9s8gimmi2kg0z8s36r"; + url = "https://elpa.gnu.org/packages/tramp-2.5.2.4.tar"; + sha256 = "0ap1d34p1akrrm8z1r7ln6mj13xg2nrvjln2v3g8plhhp354jldz"; }; packageRequires = [ emacs ]; meta = { @@ -4470,6 +4654,21 @@ license = lib.licenses.free; }; }) {}; + transient-cycles = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "transient-cycles"; + ename = "transient-cycles"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/transient-cycles-1.0.tar"; + sha256 = "1gad71kqdw6rm9dy5rxm85l4a5qibs20ijl8bpaxbbq37j44lvjb"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/transient-cycles.html"; + license = lib.licenses.free; + }; + }) {}; trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }: elpaBuild { pname = "trie"; @@ -4695,10 +4894,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.21"; + version = "0.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.21.tar"; - sha256 = "0aw3hkr46zghvyp7s2b6ziqavsf1zpml4bbxcvs4kvm05qa0y1hv"; + url = "https://elpa.gnu.org/packages/vertico-0.23.tar"; + sha256 = "1d2r2y1bhvipn4xqzla5rv09cdpg7f19m9hrnv1pqypjvbgqv1m2"; }; packageRequires = [ emacs ]; meta = { @@ -4715,10 +4914,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.3.tar"; - sha256 = "12jcb4im1ys2s0wbv9nfmgpcrz037zagd677qjm8hz8fn29xdh6n"; + url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.4.tar"; + sha256 = "19lx6p06wkwfivxgswdljdsh9bgcd1b9zkzx426w3pwicdk0cvgg"; }; packageRequires = [ emacs posframe vertico ]; meta = { @@ -4789,6 +4988,21 @@ license = lib.licenses.free; }; }) {}; + vundo = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "vundo"; + ename = "vundo"; + version = "2.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vundo-2.0.0.tar"; + sha256 = "032aqcqq2xhh12qcpp8p3qldv0r9cnqr2y11jk1m5cvgal1cbb68"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vundo.html"; + license = lib.licenses.free; + }; + }) {}; wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "wcheck-mode"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index fd8d17da60eae..2bfc2f18e97dd 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -104,6 +104,21 @@ self: let maintainers = [ lib.maintainers.sternenseemann ]; }; }); + + plz = super.plz.overrideAttrs ( + old: { + dontUnpack = false; + postPatch = old.postPatch or "" + '' + substituteInPlace ./plz.el \ + --replace 'plz-curl-program "curl"' 'plz-curl-program "${pkgs.curl}/bin/curl"' + ''; + preInstall = '' + tar -cf "$pname-$version.tar" --transform "s,^,$pname-$version/," * .[!.]* + src="$pname-$version.tar" + ''; + } + ); + }; elpaPackages = super // overrides; diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix index caf7bbf24d285..f89d0ce8007c3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix @@ -5,23 +5,31 @@ , plz , cl-lib , ts +, magit-section +, taxy-magit-section +, taxy +, svg-lib }: trivialBuild { pname = "ement"; - version = "unstable-2021-10-08"; + version = "unstable-2022-05-14"; src = fetchFromGitHub { owner = "alphapapa"; repo = "ement.el"; - rev = "c951737dc855604aba389166bb0e7366afadc533"; - sha256 = "00iwwz4hzg4g59wrb5df6snqz3ppvrsadhfp61w1pa8gvg2z9bvy"; + rev = "961d650377f9e7440e47c36c0386e899f5b2d86b"; + sha256 = "sha256-4KTSPgso7UvzCRKNFI3YaPR1t4DUwggO4KtBYLm0W4Y="; }; packageRequires = [ plz cl-lib ts + magit-section + taxy-magit-section + taxy + svg-lib ]; patches = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch b/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch index 547fee164056b..271e1cd2dbac7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch +++ b/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch @@ -1,8 +1,8 @@ -diff --git a/ement.el b/ement.el -index c9596a7..1b33045 100644 ---- a/ement.el -+++ b/ement.el -@@ -682,14 +682,15 @@ can cause undesirable underlining." +diff --git a/ement-lib.el b/ement-lib.el +index f0b2738..025a191 100644 +--- a/ement-lib.el ++++ b/ement-lib.el +@@ -644,14 +644,15 @@ can cause undesirable underlining." "Return a copy of IMAGE set to MAX-WIDTH and MAX-HEIGHT. IMAGE should be one as created by, e.g. `create-image'." ;; It would be nice if the image library had some simple functions to do this sort of thing. @@ -24,5 +24,5 @@ index c9596a7..1b33045 100644 + (image-property new-image :max-height) max-height) + new-image))) - ;;;;; Reading/writing sessions - + (defun ement--room-alias (room) + "Return latest m.room.canonical_alias event in ROOM." diff --git a/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix new file mode 100644 index 0000000000000..139bddffa87a2 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix @@ -0,0 +1,30 @@ +{ trivialBuild +, lib +, fetchFromGitHub +}: + +trivialBuild { + pname = "header-file-mode"; + version = "unstable-2022-05-13"; + + src = fetchFromGitHub { + owner = "aidalgol"; + repo = "header-file-mode"; + rev = "bcfd19a2c70030ebf5fa68e87aca4b3db8fad13e"; + sha256 = "sha256-XMXOU+vWJ/0e0ny4Dz3DxWpdEfSNXGzm03sBke32Dwc="; + }; + + postUnpack = '' + sourceRoot="$sourceRoot/lisp" + ''; + + meta = { + description = '' + A major mode that, when associated with the .h file extension, will put + those file into the major mode of their corresponding implementation file. + ''; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ aidalgol ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index a27135032e184..80fde736ac422 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -178,6 +178,8 @@ git-undo = callPackage ./git-undo { }; + header-file-mode = callPackage ./header-file-mode { }; + helm-words = callPackage ./helm-words { }; isearch-plus = callPackage ./isearch-plus { }; @@ -192,8 +194,6 @@ control-lock = callPackage ./control-lock { }; - plz = callPackage ./plz { }; - pod-mode = callPackage ./pod-mode { }; power-mode = callPackage ./power-mode { }; @@ -231,10 +231,12 @@ sv-kalender = callPackage ./sv-kalender { }; + tree-sitter-langs = callPackage ./tree-sitter-langs { final = self; }; + tsc = callPackage ./tsc { }; + youtube-dl = callPackage ./youtube-dl { }; # From old emacsPackages (pre emacsPackagesNg) - cedet = callPackage ./cedet { }; cedille = callPackage ./cedille { cedille = pkgs.cedille; }; color-theme-solarized = callPackage ./color-theme-solarized { }; session-management-for-emacs = callPackage ./session-management-for-emacs { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 7c481c6d977e9..39835c58b6501 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -217,6 +217,12 @@ let flycheck-rtags = fix-rtags super.flycheck-rtags; pdf-tools = super.pdf-tools.overrideAttrs (old: { + # Temporary work around for: + # - https://github.com/vedang/pdf-tools/issues/102 + # - https://github.com/vedang/pdf-tools/issues/103 + # - https://github.com/vedang/pdf-tools/issues/109 + CXXFLAGS = "-std=c++17"; + nativeBuildInputs = [ pkgs.autoconf pkgs.automake diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index dc2e87c30e608..f85120c0c21d1 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.5.1"; + version = "1.5.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-1.5.1.tar"; - sha256 = "13xf8izl99y1aqwk9k9hgiwggibjycjh2lhwg0wk5hm7zp6gm8mx"; + url = "https://elpa.nongnu.org/nongnu/annotate-1.5.4.tar"; + sha256 = "1d11q4ddc2rw7n8jrxdddc5h42hf16sbc1l4v6zmmsriahxhgfdd"; }; packageRequires = []; meta = { @@ -219,10 +219,10 @@ elpaBuild { pname = "buttercup"; ename = "buttercup"; - version = "1.24"; + version = "1.25"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/buttercup-1.24.tar"; - sha256 = "1ch949xf03gw9r5v32akx7hqnq7zrp3qr3gcic5b52yl5nmy8mhn"; + url = "https://elpa.nongnu.org/nongnu/buttercup-1.25.tar"; + sha256 = "1iadgn56sfakv927g9bk7fq7yjg0f3r10ygrmjpy46vgvfz0fqs6"; }; packageRequires = [ emacs ]; meta = { @@ -258,10 +258,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.3.0.tar"; - sha256 = "10kg30s0gb09l0z17v2hqxy9v5pscnpqp5dng62cjh0x3hdi4i7x"; + url = "https://elpa.nongnu.org/nongnu/cider-1.4.0.tar"; + sha256 = "11a3ysvrywp79pp1yivpsgi8azgzbg7ayiai94p1dyd3viy29qn0"; }; packageRequires = [ clojure-mode @@ -469,10 +469,10 @@ elpaBuild { pname = "elpher"; ename = "elpher"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/elpher-3.3.2.tar"; - sha256 = "1w34agw5qfgbpk6s2bllvgkj4wm1rlcyn33yfgj2xr4a5gfcs30a"; + url = "https://elpa.nongnu.org/nongnu/elpher-3.4.1.tar"; + sha256 = "1vayhcamdp8nn6hrgffd0yx9k9q3mckbcsfwclhyyfc0x1hcwf92"; }; packageRequires = [ emacs ]; meta = { @@ -484,10 +484,10 @@ elpaBuild { pname = "evil"; ename = "evil"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-1.14.0.tar"; - sha256 = "11hzx3ya1119kr8dwlg264biixiqgvi7zwxxksql0a9hqp57rdpx"; + url = "https://elpa.nongnu.org/nongnu/evil-1.15.0.tar"; + sha256 = "0xp31w5mr6sprimd2rwy7mpa3kca5ivwf57jmaqyzpd96gh66pg1"; }; packageRequires = []; meta = { @@ -602,10 +602,10 @@ elpaBuild { pname = "evil-matchit"; ename = "evil-matchit"; - version = "2.4.1"; + version = "2.4.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-matchit-2.4.1.tar"; - sha256 = "0ybw0jfjkwiz4ln3z5pizbw5d9d612crpk410czcyi8adyj018nc"; + url = "https://elpa.nongnu.org/nongnu/evil-matchit-2.4.4.tar"; + sha256 = "1p8xsi0068wabsfn3jwhyinkk2684xp9hlapcbj6y58wkpzqj0f6"; }; packageRequires = [ emacs evil ]; meta = { @@ -617,10 +617,10 @@ elpaBuild { pname = "evil-nerd-commenter"; ename = "evil-nerd-commenter"; - version = "3.5.6"; + version = "3.5.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.5.6.tar"; - sha256 = "0bv7s2jcgi3ma3dspczy7jrb55vqkhsz0rq0nz14qiay5j9dwghd"; + url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.5.7.tar"; + sha256 = "1lar8hy9n29gv4cijalyy2ba23y0kyh9ycnsi5dzjs68pk3y4hca"; }; packageRequires = [ emacs ]; meta = { @@ -712,10 +712,10 @@ elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.23.2"; + version = "0.24"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.23.2.tar"; - sha256 = "1rdz13rjfp8j2ik3vbw1jvacjri3abghlq6aqfvkd7vwm21h30ih"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.24.tar"; + sha256 = "14qnni8ridrg3afh1wy9nvchbk0drn0h7ww5xgc6s03ivvmy7a71"; }; packageRequires = [ emacs project transient ]; meta = { @@ -909,6 +909,21 @@ license = lib.licenses.free; }; }) {}; + gnu-apl-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "gnu-apl-mode"; + ename = "gnu-apl-mode"; + version = "1.5.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gnu-apl-mode-1.5.1.tar"; + sha256 = "0almjbh35d0myyjaavmqi7yzk3jpqdcqrhsb2x6vcp6pb199g7z8"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/gnu-apl-mode.html"; + license = lib.licenses.free; + }; + }) {}; gnuplot = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gnuplot"; @@ -1096,10 +1111,10 @@ elpaBuild { pname = "highlight-parentheses"; ename = "highlight-parentheses"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/highlight-parentheses-2.1.0.tar"; - sha256 = "1rsixbvglar0k0x24xkxw80sx9i85q48jdzx6wbyjz2clz974ja5"; + url = "https://elpa.nongnu.org/nongnu/highlight-parentheses-2.1.1.tar"; + sha256 = "1r0sk4da3apgbik8d84vknwna45k1ks3n0s1fspj5c88b4r7xnsx"; }; packageRequires = [ emacs ]; meta = { @@ -1635,22 +1650,16 @@ license = lib.licenses.free; }; }) {}; - pacmacs = callPackage ({ cl-lib ? null - , dash - , elpaBuild - , emacs - , f - , fetchurl - , lib }: + pacmacs = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "pacmacs"; ename = "pacmacs"; - version = "0.1"; + version = "0.1.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/pacmacs-0.1.tar"; - sha256 = "0vhxxnk8n4h2klvr4xahsm845dwds895fxxgcs7dz2262g9myd93"; + url = "https://elpa.nongnu.org/nongnu/pacmacs-0.1.1.tar"; + sha256 = "0ni4jmvkdqiiw2xync6raxvq4gr2hc7b65cbil66z7g7vlw5y56y"; }; - packageRequires = [ cl-lib dash emacs f ]; + packageRequires = [ dash emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/pacmacs.html"; license = lib.licenses.free; @@ -1909,10 +1918,10 @@ elpaBuild { pname = "shellcop"; ename = "shellcop"; - version = "0.0.7"; + version = "0.0.9"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/shellcop-0.0.7.tar"; - sha256 = "1zwj22bf37ffdbz5iqkwz5mzzsxffhj521dmwkgp5sh4r1fwip8a"; + url = "https://elpa.nongnu.org/nongnu/shellcop-0.0.9.tar"; + sha256 = "0rv98s3w3pd2l477100d8kn2kqx21xn3axzcfbxbkgl8bc78mvci"; }; packageRequires = [ emacs ]; meta = { @@ -2029,10 +2038,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.0.3.tar"; - sha256 = "0wibakmp1lhfyr6sifb7f3jcqp2s5sy0z37ad9n1n9rhj5q8yhzg"; + url = "https://elpa.nongnu.org/nongnu/subed-1.0.5.tar"; + sha256 = "1wpkwab6scmc9d3bzp5161d8agmcjacpijs8xqb1mpbyvl1jvavc"; }; packageRequires = [ emacs ]; meta = { @@ -2321,6 +2330,24 @@ license = lib.licenses.free; }; }) {}; + xah-fly-keys = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "xah-fly-keys"; + ename = "xah-fly-keys"; + version = "17.7.20220429090059"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.7.20220429090059.tar"; + sha256 = "006lqjx88b0g0szxai82qdn3bv8qajp2x281arpmp3rpb7faggvq"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xah-fly-keys.html"; + license = lib.licenses.free; + }; + }) {}; xml-rpc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "xml-rpc"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix b/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix deleted file mode 100644 index 29f71d7f1580a..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ trivialBuild, lib, fetchFromGitHub, curl }: - -trivialBuild { - pname = "plz"; - version = "0.pre+date=2021-08-22"; - - src = fetchFromGitHub { - owner = "alphapapa"; - repo = "plz.el"; - rev = "7e456638a651bab3a814e3ea81742dd917509cbb"; - hash = "sha256-8kn9ax1AVF6f9iCTqvVeJZihs03pYAhLjUDooG/ubxY="; - }; - - postPatch = '' - substituteInPlace ./plz.el \ - --replace 'plz-curl-program "curl"' 'plz-curl-program "${curl}/bin/curl"' - ''; - - meta = { - description = "An HTTP library for Emacs"; - longDescription = '' - plz is an HTTP library for Emacs. It uses curl as a backend, which avoids - some of the issues with using Emacs’s built-in url library. It supports - both synchronous and asynchronous requests. Its API is intended to be - simple, natural, and expressive. Its code is intended to be simple and - well-organized. Every feature is tested against httpbin.org. - ''; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.all; - }; -} 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 1de739b5645c8..bc3466f4890f6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -153,8 +153,8 @@ 20210929, 1510 ], - "commit": "9ad2d18252b729174fe22ed0b2b7670c88f60c31", - "sha256": "0zkv4xvw1jdsfxqqkxskl2l380gfs13n86hj4hhzrqf0sb6aymws" + "commit": "93e5ed8c495794d1ba3c04b43041b95ce01079b1", + "sha256": "17wxgssx5myvmxxjwd455sl47sb9wblh8npm5wg199j1d8z097w9" }, "stable": { "version": [ @@ -204,11 +204,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20220301, - 1628 + 20220426, + 2058 ], - "commit": "8ce591165e0bdc1a6ea76e78bc10c6b55bab9634", - "sha256": "0v9hw8rf5ypxn7bbwdvv5wrmvdghp691xkfc7kj2zihc0f7vyxak" + "commit": "566944e3b336c29d3ac11cd739a954c9d112f3fb", + "sha256": "0walpgv18gx11hvij1mf9hgsd1x40rhccbzsnwsh86lka1g3na34" }, "stable": { "version": [ @@ -285,11 +285,11 @@ "repo": "jdtsmith/abridge-diff", "unstable": { "version": [ - 20210519, - 322 + 20220419, + 2358 ], - "commit": "85d0512e239f2ec2217da7f316a5aed350041fd9", - "sha256": "0ca375q90fg29c0y47s7ljb5ymwf8wnq6b8v375r06rkqvi7svdx" + "commit": "996d921da0a0ee651b3486c2afe29447f48be50f", + "sha256": "19k23326dwnnbf8gdm1b8zm1p8qx0515ak939vdp6falhqa9x4rn" }, "stable": { "version": [ @@ -1035,8 +1035,8 @@ "auto-complete", "yasnippet" ], - "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce", - "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc" + "commit": "f34e09783b77d1158ea139b7b3d8034bc52b0b9f", + "sha256": "1qi529lg3y5l4wrzfyk0w2fz36mpd432bp39s859z4cq06yybxga" }, "stable": { "version": [ @@ -1061,8 +1061,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20220120, - 754 + 20220418, + 419 ], "deps": [ "dash", @@ -1072,8 +1072,8 @@ "s", "xcscope" ], - "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce", - "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc" + "commit": "f34e09783b77d1158ea139b7b3d8034bc52b0b9f", + "sha256": "1qi529lg3y5l4wrzfyk0w2fz36mpd432bp39s859z4cq06yybxga" }, "stable": { "version": [ @@ -1816,11 +1816,11 @@ "repo": "louabill/ado-mode", "unstable": { "version": [ - 20210510, - 1902 + 20220415, + 1647 ], - "commit": "4832a51c2e94e969a99817ccdd13d656344d0afc", - "sha256": "0iyijlyj1d7k5m9mk3blb4wlam652487jhayrmgfy25snqd8b0sm" + "commit": "695ea71cf4d6ae5f0afbc37b6fd08458e5c584c4", + "sha256": "0qgypd7hpbcb0fmgiq5sjs4nxb46kcda1hjz61cnf1skpzvc7amh" }, "stable": { "version": [ @@ -1893,14 +1893,14 @@ "repo": "minad/affe", "unstable": { "version": [ - 20220308, - 1016 + 20220407, + 2313 ], "deps": [ "consult" ], - "commit": "36d8654a8d7e862d2e64f6bece370e664218ab1a", - "sha256": "1wj63vqr5vf2mzwsx1j837ahjkj0p20zn4vkxl52rxdl8m01m2yv" + "commit": "a61d593d0cbff65a93111be96b9f53d3e640cf8d", + "sha256": "1pkqr7asz6h4gjkrg8mc8qikxy4agiv0x6ragbasy0xm3q4wxm0h" }, "stable": { "version": [ @@ -2347,8 +2347,8 @@ "deps": [ "flycheck" ], - "commit": "1bcc7c68abcd6471604c9b7fe7f85b0878bbd435", - "sha256": "10kpdra8m015xsh7w25v18zd62csayji0p5jqgif20bw6g8g20a7" + "commit": "c8ab1ec50f7c62fb42a78c0617624b91ba62a162", + "sha256": "1jvy66cw9vb5nv0bmzaliqdhjxkkwzz2ydq6zkwax5p15y81sw0q" }, "stable": { "version": [ @@ -2489,11 +2489,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20220325, - 1238 + 20220427, + 1911 ], - "commit": "65c496d3d1d1298345beb9845840067bffb2ffd8", - "sha256": "05n68r1f9g0xhffv8da5142c1771ma0lbwh44fqiraw80zjp5ybi" + "commit": "68365b48f142d75ef4bdc3a274256d97752e3b65", + "sha256": "1nf6z5i9gpbv1qdrm7r0qb0mbzipdn9mnfwc478rrazmn2l0m5cs" }, "stable": { "version": [ @@ -2513,14 +2513,14 @@ "repo": "iyefrat/all-the-icons-completion", "unstable": { "version": [ - 20220106, - 1310 + 20220409, + 1204 ], "deps": [ "all-the-icons" ], - "commit": "9e7d456b0934ecb568b6f05a8445e3f4ce32261f", - "sha256": "04bnmmd6lyx0p39sgymqvmcy7bk8mr7sikbpy49adxi7d2891ldg" + "commit": "286e2c064a1298be0d8d4100dc91d7a7a554d04a", + "sha256": "19q35l8ljsgk5f5pcxals2wr7mq4gs278y8bhy983gnlwm80ww43" } }, { @@ -2579,14 +2579,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20220228, - 1513 + 20220424, + 1027 ], "deps": [ "all-the-icons" ], - "commit": "66317e945dc63b7947b99162d8c482ffe936ff96", - "sha256": "0wdlcgr11yq0f8ld8fkks51fbf63d8ddm2firga0402g5gs8ybqc" + "commit": "0fcb43eb440e18078c8faf67c27a2189bbb45dfb", + "sha256": "16g81kx77bn3n5ziksmmmsx9c6fvfw21czanq1pivclpw3vdqscb" }, "stable": { "version": [ @@ -2641,28 +2641,28 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220324, - 317 + 20220510, + 752 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "498ea281656569593b8fe4b47162447767daf408", - "sha256": "1zpqvzg76i5k48a2qvafls7fg3y0lrwfk9im0zhngczjy5gadldq" + "commit": "7c382ccbc8b1b2d0e18d280b24ee2029dca070d8", + "sha256": "0145agd3kg1m7ylishf4ypg6bc01jrps17rwxw0kdqrh3gp7xvg3" }, "stable": { "version": [ 1, 7, - 0 + 1 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "a866ed554932d4c52f802b2235e6d5c3382d8a67", - "sha256": "0id821qis6yqaicr0dv2cxyfdy8dh0m5xp7zbfrgnbzk1ah0npd5" + "commit": "42dead856fe4647fdc18bc5a8b64440f03026525", + "sha256": "167hwik7mjlvq502r0kx8hcrpizcyv532g5j3jayp5rvv2x6zwki" } }, { @@ -2673,11 +2673,11 @@ "repo": "cryon/almost-mono-themes", "unstable": { "version": [ - 20210306, - 1040 + 20220422, + 1714 ], - "commit": "a7dc21078e25dab2b054d64e5b40ecce2878edb2", - "sha256": "12q9wddkynl90hl8vcy69hwl2g9flfz7r4fsp81bwc3vv130s7cg" + "commit": "0641bf565c113caef8d5c2a93f38cff32ebb62b7", + "sha256": "17r605k8zb30l1sl8zy5w753mvzdppqr9lbkidancasvp1p47rs7" } }, { @@ -2715,8 +2715,8 @@ 20220212, 1526 ], - "commit": "490f9b781d6aa2be376b01326b4ccdea756ff382", - "sha256": "1bp5rcqni80izky8mzg0bmf8q8n3niwhjix6jsa9w81584kmcaha" + "commit": "45deed4b9aadcd5e2a5482b0fe5110bb78ba1dd6", + "sha256": "0g77kdr0lhv2w4gdcmc2bf4ix5kpjg9g358v0kjn26gr36m843j6" }, "stable": { "version": [ @@ -2947,7 +2947,7 @@ 20210221, 1727 ], - "commit": "c48518560815c49d8d78fb9069906d17e883385e", + "commit": "16b0ba14d94a5d7e55655efc9e1d6d069a9306f2", "sha256": "1fzsqd150gpmrj8kz3zy9cd78x9vank7ra720mljhyf04z0h1mj6" }, "stable": { @@ -2958,7 +2958,7 @@ "deps": [ "projectile" ], - "commit": "87760e8326a0e303ca66dda298a79742888b7254", + "commit": "b9ea996c651c43722a5e577f61b5f823f222d864", "sha256": "1l58l0gj3my61yi55hak0c8y26dc2sn8kzbs80v3vsfr6pq916vx" } }, @@ -3229,11 +3229,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20220225, - 1955 + 20220428, + 1339 ], - "commit": "5bf59f80389d03f11bc0daa7b9cb24a0bc29f6c5", - "sha256": "0xkv0b8d8zywv86160bxhb5z7v401lzgqssagk08rzvb3vrrjf31" + "commit": "e982a7b74a681a8c2c823d8dcaafd185ab5f719e", + "sha256": "13vnc9qkz2n121yf482sj19daxa262pnp49cy8p5cvrr75narh1r" }, "stable": { "version": [ @@ -3271,18 +3271,18 @@ 20200914, 644 ], - "commit": "724723ed0a6b179398f4105f5eb5ea088d1bac4a", - "sha256": "0qzg5qhf3p4ifspbz6l1yj4fl6sdgbi74kprql20sx9y58dyhamd" + "commit": "9a5f2b4a8cd14edbde9d16dcdfcb8db2a91be0d8", + "sha256": "1pn3w2prmz9ibhy5l22c6mmccr7lfy561gkd2s41hlcjsyd4ar00" }, "stable": { "version": [ 2, 6, 2, - 1 + 2 ], - "commit": "59c7944b1a2e8015e473eb1932353818614a1e5b", - "sha256": "0p6jh8hyyf7xg0sni2rchck2fd1wyr5v106dfxxm09krxxawh0nh" + "commit": "442c76badc353d1b621243c43293106f60f7d746", + "sha256": "0kskd56y71p4w1bgr15szbzjl05kfxpf1cs4bd9dnwdwfp5s0ygw" } }, { @@ -3609,34 +3609,34 @@ "repo": "wanderlust/apel", "unstable": { "version": [ - 20201106, - 2221 + 20220427, + 1121 ], - "commit": "4e3269b6e702db2dba48cf560563ac883e81e3bf", - "sha256": "1b4ljzq4qyslwxxl6n2izghbl20wwzxxvcq5wk111blnwap4kddw" + "commit": "6947dc4605ebbb87762edf7051a78a3f7b5f17c5", + "sha256": "0qfmnrr9v7r78amvi6qd3a3qyiy1hk0jqhj4bmsabifxwlsmbzlb" } }, { "ename": "apheleia", - "commit": "74ef92045e0f64b34cdb1ca686c9159b0623e61f", - "sha256": "0dmjvj7gw8qd8vh9m8ibs5pqgs63f5pv02686k97sawbkav7mg1r", + "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5", + "sha256": "17aknfx1ii97lsqm4228rxawa6klnxpi948pl5bzwls9fx91g31v", "fetcher": "github", - "repo": "raxod502/apheleia", + "repo": "radian-software/apheleia", "unstable": { "version": [ - 20220114, - 2329 + 20220512, + 1952 ], - "commit": "9ed3c9d72ada133426a40bac6f4a719706d99532", - "sha256": "1zg1yk6g7kx22vxg74srzkxgw4880lwf6aifxgz058v3fhk0zgks" + "commit": "b5dbab53eadf64529a0bfe217c7750f1d7d85fce", + "sha256": "1w7x7k5mrvp5yq5ppq9zps5z2c7h67yjxyaxcvbkjibvswb0c616" }, "stable": { "version": [ - 1, - 2 + 2, + 0 ], - "commit": "443f5aeb1a7115a2db7af4a0a66e111c13d4252c", - "sha256": "06i912zybc6c1djb9xqfqydl6achgxsmx6hjy50y9lxc0f2p5py9" + "commit": "84b04329d7c0ddf41e41433b3f732714995a2bfd", + "sha256": "0kd0aydpfvxzq8qc6cknx11hcc6vwp7lxzjwbkcr5w4jynza59v1" } }, { @@ -3699,11 +3699,11 @@ "repo": "alexmurray/apparmor-mode", "unstable": { "version": [ - 20211014, - 2319 + 20220411, + 648 ], - "commit": "9d1937af52cd8ecfeec27185644ea8cbf0dc1c08", - "sha256": "1kzvqxz0m2lgcm0whb121g1580vi7bvk4fj780d5xqqqlv0091a0" + "commit": "abc2a6adf563b89daee9f8fa07a71d78957defdb", + "sha256": "1gyvz9659r3563hn68644v4lahnsa0ax9np31p7y4p8j6mhsc0y8" } }, { @@ -3741,8 +3741,8 @@ 20210802, 1715 ], - "commit": "9b4b41cac699e85cb36bd0e4ef2cb39f7af1cf3d", - "sha256": "1khbqp8iqm6p5a83bvcvdiykd9qpa4c2545l3sbb5q3qg8js67cn" + "commit": "ea9a32aa33580b0695e7298d56c3d5f050a02b87", + "sha256": "13wm9g184lxzf55cwx1cc88d5a17yghbfqsqvyihsb7yv2i2xg8i" }, "stable": { "version": [ @@ -3761,11 +3761,11 @@ "repo": "vietor/aproject", "unstable": { "version": [ - 20190730, - 152 + 20220410, + 541 ], - "commit": "b534e2a62738ad59a8a3cddd386466c145dad3b2", - "sha256": "08nhfa845cn20kx0q9rchs24imfmvpywi1b8mn40d1lw587yr519" + "commit": "13e176ee69851403bec6471c5cceed17b7912b6f", + "sha256": "1kb1vlqla4l2mixkd5awmgbh0bzwbngj8sq5mjvrw6slf7i35xjn" }, "stable": { "version": [ @@ -3784,11 +3784,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20220323, - 1703 + 20220418, + 1554 ], - "commit": "7bcabbbbef2cb1dd12917f248402565b557d8f60", - "sha256": "1frlcjd82g0m3aj3wi45gv5gzqy16frj7as22v4c07b78xg1mzks" + "commit": "52ed4bf4aaa01c527271d71e6ce00f3607839777", + "sha256": "168z5i0y7rldbqpmxyvi5z19i57l14yhqzzyhl0sv7zdcqa66s21" }, "stable": { "version": [ @@ -3895,8 +3895,8 @@ 20220314, 1647 ], - "commit": "379dddfbe4e801df6fdb81a55528fab6c7dbb78e", - "sha256": "1w505zv614xsc0bjc0539fw68x88vfxmd8k9mnp5364pvjfc7g87" + "commit": "515d2230352fffcc982ae2e322d95cbee6aca760", + "sha256": "1x8mwhfwcpbwaha5qb5hnl6ga29cbi27a26m0q4840agpr53s1km" }, "stable": { "version": [ @@ -4336,8 +4336,8 @@ 20201026, 339 ], - "commit": "3f4b12016bd1d0115207013ebc3f02fa7f50917b", - "sha256": "07gf5p6c78kxyji4q89gz2ffyixdccn5h610d7nidiiix1bwvh1p" + "commit": "43ca538ecece4e14bb9bcd887854aeb14b3d45f4", + "sha256": "05l6wbhyh2jy5cqmy0b3bg5klafcc1fcfp5944r9wdah0lpg169k" }, "stable": { "version": [ @@ -4360,8 +4360,8 @@ 20210731, 609 ], - "commit": "7e07005dbbca6a5f409f37af37e5f5f81d057ded", - "sha256": "1mm9xfsk2kgqfy29k27b5z43j12nkpx1ssgp4y9k6bymrgbfx08v" + "commit": "e0d11744d9b2bca780322b1b282fb5ffb18cfd75", + "sha256": "1va7fhh4ppb9aily009m6nf43z5l8fdwinsqy46qj81w5apmbpg5" }, "stable": { "version": [ @@ -4661,8 +4661,8 @@ "keytar", "s" ], - "commit": "f235a34306e230dcbf60f63e19fdc3b06425f7cf", - "sha256": "1pa4syiq7ds1hfpi268krlkyi8vl7hfr23md2x16zh0wlnsxnpm2" + "commit": "5c6f0952f28ce722f4a75139f3dc1afc99e12396", + "sha256": "0v83s1gfyh1zbaaqgj2q9vg193k705kr18mszp6p8rdyffdw5fqi" }, "stable": { "version": [ @@ -4767,14 +4767,15 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20220111, - 1108 + 20220422, + 1600 ], "deps": [ + "compat", "packed" ], - "commit": "3b4d94b020a2557e439233dbaa9d83fdea68f05a", - "sha256": "1zymk8kzw1mvkasf0dryy2sbwxdr8ppr0a4j5r69y108dmvplqwn" + "commit": "16de66c381dab3c1fb7bc248e0f81ef68966bd7d", + "sha256": "0ls5n124rl8s3dyj0kr7n1sv3dkn9bw7k61s2f2ads43gp3744qp" }, "stable": { "version": [ @@ -4804,8 +4805,8 @@ "cl-lib", "popup" ], - "commit": "d515059ea5316c81223f6d969e45b16b47365b5c", - "sha256": "07xp981b1j9igcai930pqfiz16idp9898bpdl623d9175i5dnrjl" + "commit": "d546b18c3e83e38686d9b7316c6c705597e1a8b3", + "sha256": "1fwg2zn7digz22vf22h4kim3wkz2i2wvs42ak12lxg8aa3w6wn94" }, "stable": { "version": [ @@ -5141,14 +5142,14 @@ "repo": "elp-revive/auto-highlight-symbol", "unstable": { "version": [ - 20220223, - 1622 + 20220505, + 505 ], "deps": [ "ht" ], - "commit": "939aa7f58c555a05451238e40c34bc8da0150870", - "sha256": "1rqphhfvi91vgqqxahgm2zkxk12dvqxvqgraqgagc75xpqsgw423" + "commit": "e31a2d2bb97ffcbeb493f3501311b30c3f10952f", + "sha256": "0md8dlx1g5lxb4f5yxhm617kj49zysya9y6awjrvpj30crp78g5z" }, "stable": { "version": [ @@ -5297,8 +5298,8 @@ 20210805, 1344 ], - "commit": "5551157ab81b55322e7787ce16ba84162933aece", - "sha256": "18zrh7s8xn9spr5lg5zasdb3rkldnvmhi31z08d4rxjfpfhikcql" + "commit": "85b02fa6ce76ab872c025a82c2f14614af3d89e1", + "sha256": "1rnigp11xlxhzrfwqna0dqrd0a655gs0qf5m6bkzq41ssdvvdis8" }, "stable": { "version": [ @@ -5365,14 +5366,14 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20220209, - 554 + 20220421, + 1147 ], "deps": [ "f" ], - "commit": "df455f9723fbaab8ab550c7e7df79dc6b2d159c6", - "sha256": "14n77h7w69w0i845dbbq39nxnh1xw28kacp0cgf666r62vgdcvvj" + "commit": "39cb574a4b5ec74ad62857320bf5fec58abe876f", + "sha256": "1h9wh1gd7i0j3lg08l25p1n9pr24x9cyc3j1all4j77phl38sxhh" }, "stable": { "version": [ @@ -5465,15 +5466,15 @@ "repo": "Fuco1/autobookmarks", "unstable": { "version": [ - 20190919, - 841 + 20220509, + 1712 ], "deps": [ "cl-lib", "dash" ], - "commit": "224b24950d3ae57cd16d7417c07fda337fe0ea09", - "sha256": "0cfx447185shbiadhbar72bgqwzmbia82f8a2py215hgw9wrgqr9" + "commit": "8acd6f182181e23257e01c1b5cf90b872507a74d", + "sha256": "1q4r3l40lqdykhv4w675g6dz3mpp36abiilslhkyx2i7rxpa88z8" } }, { @@ -5505,8 +5506,8 @@ 20220215, 1204 ], - "commit": "00b87a82c4561b017052974eecd93c79b6790841", - "sha256": "1cnnw2cwhsrlp2nanvcgdpd90vpmzwxnr9sprwfgzldgk9651r58" + "commit": "c439cbe029f7ffeca6de0ea72258069c41350509", + "sha256": "1r7qan2v3kaykacnf98s2zcfb5ryk4jqpw7acrfvajgvdn3w03sh" } }, { @@ -5710,8 +5711,8 @@ "avy", "embark" ], - "commit": "b80d96ce0ab79e73829322e46c6d7493eb2b8c34", - "sha256": "1jsynjl0y7w0jqxqlibg8m4rwzv9lxj443m6dlac6zncz8plnizp" + "commit": "81c7f751be1de33dee9f7523fd3429ee3fe9a0d1", + "sha256": "11yvhhq251qmbnljjcfxnc53dqa63jm6ximfd0618hcwcgxlkkdc" }, "stable": { "version": [ @@ -5921,11 +5922,11 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20211120, - 1646 + 20220512, + 1931 ], - "commit": "e60de5ed107ffeb530a56d24d04f38988124d12b", - "sha256": "0p8kbxfcrx1ib8g17g6h2i2ygy35qq992n3s2xa6ysij7wrfn4hd" + "commit": "b52fa715285e7ad182c8e679ebf05b130dd5b5e2", + "sha256": "1hb4npfpg1iy9j0p29q1jrjgx0mrn333m45nmsnxw8nlaxzd97x6" } }, { @@ -6043,14 +6044,15 @@ "repo": "tarsius/backline", "unstable": { "version": [ - 20200104, - 1851 + 20220424, + 2212 ], "deps": [ + "compat", "outline-minor-faces" ], - "commit": "dc541a6daf82ab73774904ae9ccecd13e3c2af48", - "sha256": "0410p7144k2kh1bz050h45zrfd98j10sbx409la5x01l9xrmb03y" + "commit": "edc5f1e8ca049c06d18d703479c4737f3530602e", + "sha256": "19fzjqb1a5g504qwb01j447rf5q6sa0farf9acq3slwv03bbwva6" }, "stable": { "version": [ @@ -6275,19 +6277,19 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20211225, - 2032 + 20220510, + 423 ], - "commit": "ad2fd1137d6ec144f87b26dce15ce5c5d42bde39", - "sha256": "009k9j7bi7x8pmp5d12bdzng3ampqwy8l1jf1dxxf9989wv27hrc" + "commit": "43f3257aaf53e9c50f5db11b81fd66ec41ab2883", + "sha256": "07k73bgjb6ixfgbiwf8zswf6n0kb3bf1ka1pcv88h3a9hhndvgv5" }, "stable": { "version": [ 2, - 2 + 4 ], - "commit": "10180e88d6d9434cec367b6c91222dd2fc3bd8ae", - "sha256": "01w89g413s1da6rf94y1xnhw79cjy2bqb01yfjs58cy492cm0vr6" + "commit": "7b2bb8d05562fa8d75366e82eef895c03ab7b31c", + "sha256": "1jgqq52q2q7sgf46xip0sfpwyi8k43v2l688hx7p0whncjhd7cmr" } }, { @@ -6298,11 +6300,11 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20210821, - 1941 + 20220328, + 844 ], - "commit": "c5eaeed156ab906190c662d491269230967104b1", - "sha256": "0r221iirqsbz13s76r68i496izbirrvcw8ql3wsh205zmxa3jqg1" + "commit": "29b5fc860a5b0db9828acfceca09b773fbdb8e8a", + "sha256": "1gj62v4j3s21kbm1zapb7scv1zh4q9k1jjpgrr4wy0fqk7gzfprq" }, "stable": { "version": [ @@ -6538,19 +6540,21 @@ "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { "version": [ - 20220224, - 403 + 20220416, + 405 ], - "commit": "00a003c9a3788c3a0fe8bd89b827b4e9bbdf2261", - "sha256": "0iskn78ynz24wdbq1ja24m0pqcbhb4dfipnxx0nijdsbf6xpj37r" + "commit": "ed7648f723d3fd03476b8a007a76e9058f7f7f47", + "sha256": "05a6rh2chyafsw9n3aar4dscvq8wdb9bbl3b12vawilj3b5bv9jy" }, "stable": { "version": [ 3, + 2, + 2, 2 ], - "commit": "f18720ff5cd963a0bf6fc0e41293e50c0172b8ae", - "sha256": "1s5qi8njiqdpgnzlik36islzh13zfhybnynqisr61p602pn4ghk7" + "commit": "ed7648f723d3fd03476b8a007a76e9058f7f7f47", + "sha256": "05a6rh2chyafsw9n3aar4dscvq8wdb9bbl3b12vawilj3b5bv9jy" } }, { @@ -6770,20 +6774,20 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20210504, - 341 + 20220409, + 846 ], - "commit": "4b4e4808dc3248ea61b3d8bdd7c6b73edd3b6902", - "sha256": "0cx8k5vvqkhkaa9ay4cnb2gshi8118zq87ddbxmffai6ryj2lg7b" + "commit": "bbcfdc0909c20ddee41e95b7ade7de63af73b220", + "sha256": "06z0c2ryq8j3sd3m5pph5l6qnxy51bdqy6b8ya3z94qa63xm3ksb" }, "stable": { "version": [ 2, - 2, + 3, 0 ], - "commit": "9c7a92779d75f6fd985cf707ff5241bc98ccea6c", - "sha256": "1r9033zlx2q2dk3bjz004flxdiw79qiswq0zqdjnlzwassvk0f35" + "commit": "62c75804ba7d74f4c01c0629722c061c11bed393", + "sha256": "17r8v1sjvgcmprywny9fdg54x4pssp8p7a9ivv5mrygkqjz1vykk" } }, { @@ -6809,11 +6813,11 @@ "repo": "dholm/benchmark-init-el", "unstable": { "version": [ - 20150905, - 938 + 20220414, + 1612 ], - "commit": "7a0f263282bbc86b01b662636306f22813082647", - "sha256": "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94" + "commit": "02435560415bbadbcf5051fb7042880549170e7e", + "sha256": "19375vamhld4xm2qrdmhlp2nczfvalmz9x6ahl23zwkilr8n1nbw" }, "stable": { "version": [ @@ -6904,8 +6908,8 @@ 20220116, 2220 ], - "commit": "db2d945c44e26f32a658e9e743dd4b7a0d84b2fd", - "sha256": "0mlga8kk09ir66lqs5xx0bkr51vcc89hxq3ax2vaq1zsvlddl5h2" + "commit": "20ac176ccdc18ff8cb4a6b37cf1fe90fa7f88335", + "sha256": "0sagnkpaify1z6gc5xmw557j8s49z4yvkk2kfdw7q10cz7hy09gl" } }, { @@ -6934,8 +6938,8 @@ 20210715, 1004 ], - "commit": "7183369a489a12f4a776f03c8e1a9bfe62d0ab3d", - "sha256": "1fg0w1c1fdvqjf5rki4zw2m8zwdxsc2g43s9vm635v6akb8ryqmy" + "commit": "f04dad824b9879f7382f36780a0151e4ef544815", + "sha256": "1a3s6za2dlavknpmcbkbrdf4a75a1a0qgni3igq1657xfxk658gw" }, "stable": { "version": [ @@ -7129,8 +7133,8 @@ "a", "pdf-tools" ], - "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2", - "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj" + "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86", + "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri" } }, { @@ -7178,8 +7182,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20220117, - 1131 + 20220404, + 1608 ], "deps": [ "biblio", @@ -7189,8 +7193,8 @@ "parsebib", "s" ], - "commit": "db73156576ee3e4ea9d7fb06a20e3cc2c8225eaf", - "sha256": "086skvifcm6jnzbmhx9xlcjx303a9w6v00q557pc1qja0hanxic9" + "commit": "ce8c17690ddad73d01531084b282f221f8eb6669", + "sha256": "15b37xa3f9npbqmr9ml9km61v2l04csgnf61kfr5849zj423643s" }, "stable": { "version": [ @@ -7232,11 +7236,14 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20220101, - 1042 + 20220422, + 1600 ], - "commit": "c69b010c7b4899b6c016f926ad3a6e11ebfec0bc", - "sha256": "141mq2ivwpmb952zdh7rvr24awi0ffpz5nm7wyc6kz8wlm5pgavv" + "deps": [ + "compat" + ], + "commit": "e6d8ca47f77e0579fcb5a1dcb88218087102c355", + "sha256": "0hqrq3gcmsy20vsld6qkd8wsyqzy1kxmxl9hn0nxmc6cixz55qgj" }, "stable": { "version": [ @@ -7389,14 +7396,14 @@ "repo": "rnkn/binder", "unstable": { "version": [ - 20211030, - 511 + 20220429, + 2055 ], "deps": [ "seq" ], - "commit": "8cefdf0959f0da33250044cf4890b69cfdcf0c5b", - "sha256": "0q4cz07s8qzkvnym7ab2l111dk88nfigpf0r3x0jcxx2qivs52s4" + "commit": "127463a7cb8cc2fa9904d3feb3fca95d2244ddcc", + "sha256": "00nizafvpbhzkc5vnwdgrg5f208gwap79av2ayj8zp76fi718yfk" }, "stable": { "version": [ @@ -7490,16 +7497,16 @@ "repo": "canatella/bitbake-el", "unstable": { "version": [ - 20190107, - 1155 + 20220509, + 1236 ], "deps": [ "dash", "mmm-mode", "s" ], - "commit": "ba58bd051457ba0abd2fbc955ea0e75e78ff2c64", - "sha256": "09ncblz9x2qz6lqfywvj3b7qagrq34qb0wg17y03p1r3416g1zwr" + "commit": "434b088ab8715731d62978264cb934e34c75c4b3", + "sha256": "15p265zigxki80h3gfq61cmssqqwcnp0990zl8xmj8p377523l6m" } }, { @@ -7603,17 +7610,17 @@ }, { "ename": "blackout", - "commit": "9128d87569dc74b90f57dd65edead7199f5c7911", - "sha256": "06gxgald2vchfwhbiaap7rfjk7kirfv4yjc4r98g998v96bilw64", + "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5", + "sha256": "064k2xwk45sl0dfa2ck39lwlibh71yd4v03ba2zkbk9bva90arqs", "fetcher": "github", - "repo": "raxod502/blackout", + "repo": "radian-software/blackout", "unstable": { "version": [ - 20200404, - 1550 + 20220509, + 2350 ], - "commit": "c221fa2c8a204b4aff2e09c606f59be58b960b97", - "sha256": "1zzrmlxifplpskm3a7hbm4x6mpikr1nhgds10qaxqv0gfq312p1c" + "commit": "7707211370f03f03a2f74df15f42ac24a1e99300", + "sha256": "1lk7zvndd41aq67f9agjkzyp4xp1q9m9srjd30nfgsgi2qmbj45r" }, "stable": { "version": [ @@ -7632,26 +7639,20 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20220302, - 1936 - ], - "deps": [ - "a" + 20220404, + 1917 ], - "commit": "0dc1328b8640207ac75a009c690d392f63c44f4d", - "sha256": "1sdgbwv3iiwcw5af7hdk04ab841nl8y8xm854b9qdh9n0micwx3a" + "commit": "f5c0b5ef2ae46062ba13dd03215cdfc49d0fd30b", + "sha256": "1acwh5xcfizmd6m4kwlvpyysznknjwzqmgppc33khldqiv3ga9sp" }, "stable": { "version": [ 0, 4, - 4 - ], - "deps": [ - "a" + 6 ], - "commit": "0dc1328b8640207ac75a009c690d392f63c44f4d", - "sha256": "1sdgbwv3iiwcw5af7hdk04ab841nl8y8xm854b9qdh9n0micwx3a" + "commit": "f5c0b5ef2ae46062ba13dd03215cdfc49d0fd30b", + "sha256": "1acwh5xcfizmd6m4kwlvpyysznknjwzqmgppc33khldqiv3ga9sp" } }, { @@ -8035,8 +8036,8 @@ "repo": "boogie-org/boogie-friends", "unstable": { "version": [ - 20210703, - 238 + 20220419, + 2240 ], "deps": [ "cl-lib", @@ -8045,23 +8046,23 @@ "flycheck", "yasnippet" ], - "commit": "1e3b6a8aee9fa7c113468838c5b647080caf3703", - "sha256": "1h3j7a1y5p90dd1vj4kyngj5xvbr2z4dkzkq74s85bqf61j66yw2" + "commit": "d685a52259f50c2db51205ef9cc93f713ae8d8fa", + "sha256": "1879vjan19kdvfkck1xk30jllwbiqpyc4m3v1v6kmac7gxm10min" } }, { "ename": "bookmark-in-project", - "commit": "9d3b0aba3f67d2ecf3904ec1c3263375ba38a665", - "sha256": "131x0wmv4yv0h220zcyszd19r7j8xmih4848x9qsldqwv3g3n82z", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-bookmark-in-project", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0liii3f5276z76hkhd2g2xkkhx8v8dl6sv5f9w9lac66hz5a7qqv", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-bookmark-in-project.git", "unstable": { "version": [ - 20220212, - 156 + 20220507, + 1118 ], - "commit": "70ae40b4c4cdf44999ee4c738f5a4ae34a2d8421", - "sha256": "1hidzm6yv5fqx93shfxx70xsjbyzkia00ylxd06jniqpydl3fydh" + "commit": "0e08e4bd4fedc87b2371313d55691356bee0ad7d", + "sha256": "1a0wx4hrs954ff7chpadn95dajcmpgrk5j7yv6ppfh1ml4kx11mn" } }, { @@ -8072,11 +8073,11 @@ "repo": "minad/bookmark-view", "unstable": { "version": [ - 20220216, - 2024 + 20220403, + 2204 ], - "commit": "314e74e11386af72ca282e228996321a8a6d4c9a", - "sha256": "1bqajd2slg5gh33q84ps9cpv0g04y5gz6m8gy55m01f2zrwxvyqc" + "commit": "0d40ac67f53b7fa75fe65c38a5ef65701ce4c3da", + "sha256": "0sa5lypdxgffzz22kq2jpcc02xmcmr77bsc0iggh7b2khnxjppxj" }, "stable": { "version": [ @@ -8119,16 +8120,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20211217, - 737 + 20220502, + 1850 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "654fb8051a5c00dd524710fbf917b00f6afc8844", - "sha256": "0rhrq2nj1cqcqbnsf0npn5372yi85czi7r1h9lqjbyfgb2ifxvdn" + "commit": "db7b6083d390e3febf82f9af5782e1a36d30093c", + "sha256": "1i6wff18rlhdncm8qaz5zmrl4g5bl4h13yw9y635nlzzailmjjvj" }, "stable": { "version": [ @@ -8152,15 +8153,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20220216, - 1925 + 20220511, + 1643 ], "deps": [ "epkg", "magit" ], - "commit": "378089e179e439a4999e14a410868743694cb911", - "sha256": "07wygkg94m5xr0r4yfcvcxdy3a9mh7pxfg3gzvy8dka6cax7fj25" + "commit": "55271c12e05c14e30102bd64bd609af29d58846e", + "sha256": "104kf3km7450jj7brgjhmw5idrvk3s1qjxclzpv7xypyvi53ab8l" }, "stable": { "version": [ @@ -8447,11 +8448,11 @@ "repo": "browse-kill-ring/browse-kill-ring", "unstable": { "version": [ - 20200210, - 921 + 20220410, + 1509 ], - "commit": "c7a188a6148f6391b6926d25b9cf191d4a8b3f42", - "sha256": "12ajcdzqajhs1li0pd8vp2wm6kl5vxcsnka1ygd2144cbi0dx6gk" + "commit": "6e06736a8245a8cdf436f6585c71439239219836", + "sha256": "0i7np8bz7v3j19z33f0cq0fx096d3h6p130md0jmzgq945lxvp3a" }, "stable": { "version": [ @@ -8501,11 +8502,11 @@ "url": "https://git.madhouse-project.org/algernon/brutalist-theme.el.git", "unstable": { "version": [ - 20181023, - 1222 + 20220507, + 909 ], - "commit": "72adc339c433a98e944cbe76da4c45b9ba4400f5", - "sha256": "068a0z66bidzllz8jhkcfqjksjyffhzqkvddpazcbcnj9fq6ircy" + "commit": "c58131f3a8cb71cc0f8efa47766f29578c45bc59", + "sha256": "09kak8szdfbscd0byj1mdgb94ajrrr4kcqf5x3c2bwlgdazr15gx" } }, { @@ -8545,15 +8546,15 @@ "repo": "niedbalski/emacs-btc-ticker", "unstable": { "version": [ - 20151113, - 1459 + 20220409, + 1647 ], "deps": [ "json", "request" ], - "commit": "845235b545f070d0812cd1654cbaa4997565824f", - "sha256": "022j0gw5qkxjz8f70vqjxysifv2mz6cigf9n5z03zmpvwwvxmx2z" + "commit": "2ed18ac6338d5fe98c578f0875840af07f0bc42a", + "sha256": "0hx96ah2y1s5hj5f3i2y50v1m0lfphg71sr4fhssjls0yvl995sr" } }, { @@ -8624,8 +8625,8 @@ 20191119, 1950 ], - "commit": "1ef6f210f38c0686bc5b445b9704190f168f30ea", - "sha256": "054gbfdaqfj5psb3f06ba46x38gd9xak28h1la5b1szdzj61f23i" + "commit": "b8c0c2170c7113b515477b1bb39c58d22aad67e1", + "sha256": "1yplxc6zff266lrncvhlm64b420b1g4p4jbni3gh7ngl6443xal6" } }, { @@ -8651,11 +8652,11 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20220325, - 1659 + 20220506, + 1506 ], - "commit": "ba1c9d24d3f1ba58445cbf1f762ba6859b66f6bf", - "sha256": "0davkvlyqj78i6njhkjyrv4l7qnscysimssbwjsnl4lbk7c1z85k" + "commit": "7b7e5c2a79ad3b31b465387df0ccc18a5809f9d1", + "sha256": "1r4lbz5hadsxw9dkhi10xr54zmsgknmklfmb78yxnvqhwl30kk20" } }, { @@ -8720,11 +8721,11 @@ "repo": "lukhas/buffer-move", "unstable": { "version": [ - 20160615, - 1803 + 20220512, + 755 ], - "commit": "cb517ecf8409b5fdcda472d7190c6021f0c49751", - "sha256": "0gxy58v8nyv6pmzfn8552m8a14f5lzcbkndp5xpzq4g9qvmifmj6" + "commit": "e7800b3ab1bd76ee475ef35507ec51ecd5a3f065", + "sha256": "1g7g71fzxrak9qkps6f7j52y83dic9ccq9ykc8babla2y79jr7x1" }, "stable": { "version": [ @@ -8853,8 +8854,8 @@ 20200924, 345 ], - "commit": "1734ee6cadaa8094e6b06876c57dbca5dbd289cf", - "sha256": "0h8da68hclfjrxpq3h84fanldm8vgkriljw0qn2vwpdd5yw5258v" + "commit": "b918ba023212b0e223a7ca7df3a2ec12a7c54206", + "sha256": "0xj9k2i7dmnqg99k1kraq58fc1kzgvriy08g46zhka3dz2l2m5br" }, "stable": { "version": [ @@ -9100,14 +9101,14 @@ "repo": "alphapapa/burly.el", "unstable": { "version": [ - 20211005, - 1159 + 20220413, + 1529 ], "deps": [ "map" ], - "commit": "c94fe0a355859fe6ddfa34cf7d362dca896f38a1", - "sha256": "0jl8dj4mk4zc0kckdj3qmrhc21xxchp4x9cgd9fdhza50icbmy92" + "commit": "96f59fe24fdce14d14f204372f99bf522ab192bf", + "sha256": "0mzv82qd2w3nsfjj08kmsb8sjg0fmmhjldbymqd60ybx3gq9h9ba" }, "stable": { "version": [ @@ -9252,19 +9253,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20220321, - 1903 + 20220410, + 1557 ], - "commit": "c365dae776f823aa7489bcf0f750ca748fefdb28", - "sha256": "1p7c6p33nk23jywwd9b7c7062chr8x0bjffgall9rxsyqczdqzxx" + "commit": "ceedad5efa797e860dbb356bc2c3028a4e0321ec", + "sha256": "1fp9f0lprmzdacjsd78yrbbrzksk2kz0bvals1cbnrqr4dhknxhi" }, "stable": { "version": [ 1, - 24 + 25 ], - "commit": "1de6be465cfe2c3f00183de9351bd838690c9f81", - "sha256": "1w02p4bfkyga6sign4flq2kw0hawyvnv63410pyh8nm7acp311gg" + "commit": "ba62f80555d46faf49dc451c0ad20f39f6a170ab", + "sha256": "0fsysvsypda6b7azc15bpaprq3bwx4gb6rlq2mj6f8rgwdqc8153" } }, { @@ -9755,8 +9756,8 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20220305, - 1621 + 20220511, + 1104 ], "deps": [ "dash", @@ -9766,22 +9767,25 @@ "s", "transient" ], - "commit": "20337d39e3abe4baa38cc0ed5a6c65272df9af2d", - "sha256": "08ix2iq17xsl9dcnf0xik12ykpji77kb5xs91y23w1plfl1pl0zj" + "commit": "232fa1cf3af08200af439d1cbb5a131f38286183", + "sha256": "1ncyrrzk0a1wfyr3khvznda7l59g4vg9h3nglzbihnbvfkxqh6cn" }, "stable": { "version": [ 2, - 10, + 12, 0 ], "deps": [ "dash", + "esxml", + "org", + "request", "s", "transient" ], - "commit": "933140a3227ee61cfccf3cf0c567b5c9e64f1ded", - "sha256": "0s26a2fy1xldd0q57avds7zn0h7lkis2hjh9zmm1qhwn8409hys9" + "commit": "1e09bd7cdf7e3274a0f43a66bba3121ea6b42f4a", + "sha256": "1l30s3wv21mpybbxni5fziq2awai9k60i87s6fid56hg262r7jp0" } }, { @@ -9792,19 +9796,16 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20220214, - 1251 + 20220506, + 1214 ], "deps": [ - "anaconda-mode", - "beacon", - "cl-lib", "hierarchy", "ivy", "tree-mode" ], - "commit": "aa5ffb15cec39920012aa526e932d48e5c74bbb0", - "sha256": "12rsylxr9ls6br38vwq9h6fzqsqjxgqwyv76wf6qaazd4rp76m0y" + "commit": "42023e5d1781c75f425e8c72b63b28e53dae6e9c", + "sha256": "029ssw7k9prmh7rv4drjmwzcykrihpqkmkylz0fla40l7ycmdr5c" }, "stable": { "version": [ @@ -9876,11 +9877,11 @@ "repo": "ocaml/caml-mode", "unstable": { "version": [ - 20211226, - 27 + 20220503, + 1742 ], - "commit": "204bfde9ad21cb94c273db8b0c12d31a4eb425e5", - "sha256": "1pn6whyp66bf2a4zj7g3g1ljlzfn0ia1xwb8lclvmjv0ind12zsz" + "commit": "f2f170f46b758341d96385986e8a93b9b4d248f1", + "sha256": "0w9ypvvkm8qx88rldkhysp12inc8izn1qj9rpcchk8xzs0s7sqxp" }, "stable": { "version": [ @@ -9933,11 +9934,11 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220313, - 58 + 20220506, + 1814 ], - "commit": "79e8771c18c76a5bef5fdbf74718527e74b6d702", - "sha256": "1v5q066xppxf0crzcliqa2mya0x18qjmz5xp0mcr2szi1nps8z7s" + "commit": "e72edf2d6357beb64798ef1894cc807190f80901", + "sha256": "0l6slrbh7sr3r3zgxh4r1r0g2131mvpmy2vd1hrkjf9q9c5hpqq0" }, "stable": { "version": [ @@ -9959,8 +9960,8 @@ 20210707, 2310 ], - "commit": "281aacc18003ae103b8a04ea83d7b6f814c97b8b", - "sha256": "0v245k0fv0dsg706v34rg91h36avfvl3yfddll1gp9h87df04hkp" + "commit": "02dc92c900babbd232fbcdd14f7ccf44d234ee77", + "sha256": "0gar2j9vis9b2wj1fhqahcrmaw867z3pmsn5d70bb8mdr3xq3dmm" }, "stable": { "version": [ @@ -10119,8 +10120,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20220316, - 1557 + 20220504, + 1421 ], "deps": [ "ansi", @@ -10131,8 +10132,8 @@ "s", "shut-up" ], - "commit": "218433b408b95efdc026081ee3f44e976a3aa36b", - "sha256": "08bniq7hba6438nfwfnmhkvm1yqln5f27239ndq1gbhc3wnnq61q" + "commit": "2eb520e64c2e1047319761df0bcc6fa5149f8cd6", + "sha256": "1fg8c8wksban6kblrdsp008ga8srhyp7dbhzbk46dgmprvwmxbwn" }, "stable": { "version": [ @@ -10164,8 +10165,8 @@ 20160410, 1449 ], - "commit": "7c6719d3bb4fe552958634bd5a11abc56681f3a7", - "sha256": "0gywc2mzdzq3ny0jjffa3151vi7zb9i8ddy5d63x4yhicf5sxlh1" + "commit": "be8b69e55916cf2e78886927f58c7c49b969c0b8", + "sha256": "1sv5rcj04i374f9z7rg7d2p0gclhclczys4j5x4q493kv15c6zir" }, "stable": { "version": [ @@ -10275,6 +10276,21 @@ } }, { + "ename": "catppuccin-theme", + "commit": "8d488aefda7d252649daa5be0af70e5623a4b2ec", + "sha256": "1bhf7blfdbsbfwyj53nf5xnlagspn0nri6hbqziha3zv1vzlg741", + "fetcher": "github", + "repo": "catppuccin/emacs", + "unstable": { + "version": [ + 20220330, + 1021 + ], + "commit": "352ebf62099e95cb4a71060a7d4a228f00358b97", + "sha256": "01qh2q0vlgpni66mks4xzvdzm22yq314n5n4jx20bdknbhlvb8rq" + } + }, + { "ename": "cbm", "commit": "f28dbc97dc23cdb0b4c74f8805775c787635871e", "sha256": "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn", @@ -10329,8 +10345,8 @@ 20210501, 820 ], - "commit": "5c209e0306364118abf9d9440d7b8b9613183072", - "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" + "commit": "c664b26d0861621ac86b5b5f47835dd84f06dc93", + "sha256": "1qis1wmqdllzj46nsnlqskk0lld1bgn858gk8l03gcy92jrlh1bg" } }, { @@ -10348,8 +10364,8 @@ "dash", "lsp-mode" ], - "commit": "675a5704c14a27931e835a431beea3631d92e8e6", - "sha256": "0l4bhyr9d8ljz1f0cfg1s2cjcmh6fiwbk5mdlvc7rrwz5hxc21is" + "commit": "ae74a39303457a5e6976dd1c6816cde97d357a0d", + "sha256": "0y1fyiq3m3xsbc82cq3wdmsi549risvpm5xc2bsid6vmmfnafl1y" } }, { @@ -10378,8 +10394,8 @@ 20200904, 1431 ], - "commit": "5c209e0306364118abf9d9440d7b8b9613183072", - "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" + "commit": "c664b26d0861621ac86b5b5f47835dd84f06dc93", + "sha256": "1qis1wmqdllzj46nsnlqskk0lld1bgn858gk8l03gcy92jrlh1bg" } }, { @@ -10648,8 +10664,8 @@ 20171115, 2108 ], - "commit": "6bbfdf3109f044191750ac893aadbfc0d1b2fb0e", - "sha256": "0mz18pj1phxpjp54w4l7xcrm3lzp9jick4fws1wy8mk4566qiixm" + "commit": "0d98e5a6f0c08e2b1d2c8e96c3dfc7e619210f72", + "sha256": "1i5icnrvfi83kxf4n6a83aksllnaddb653kcjnmg3n70q5mffavf" }, "stable": { "version": [ @@ -10804,8 +10820,8 @@ 20220318, 1007 ], - "commit": "140a63995ca15d393c7e7003cf0e6edddcd4088c", - "sha256": "1ssl0nzm2bs3iyjak9x2gkl3206v5ihbzsspqrvrgijfv3h9yhzr" + "commit": "0a526709f55f8074f8846f8e7b9090431f1d6a47", + "sha256": "118pc03zpv9c7haxvmf4xkd6lby7xrxsal6pwq5lw5sw840g1nhr" }, "stable": { "version": [ @@ -11319,16 +11335,16 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220326, - 1439 + 20220415, + 1213 ], "deps": [ "dash", "seq", "ts" ], - "commit": "3f52469f31f0bc23dd63d0b3c29bc2040dfcd98a", - "sha256": "1mjvn02dwhnwq6x1llnlpxzvpfkl753mbs68dahd520fvyjglnrq" + "commit": "f7b2defceed8bafb87da704ce3e7774f53abf1c4", + "sha256": "176imva32l766llrj4171r7bb3z5isvprrr5cl28cm41vqg4szfx" }, "stable": { "version": [ @@ -11372,14 +11388,14 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220326, - 1439 + 20220414, + 726 ], "deps": [ "chronometrist" ], - "commit": "3f52469f31f0bc23dd63d0b3c29bc2040dfcd98a", - "sha256": "1mjvn02dwhnwq6x1llnlpxzvpfkl753mbs68dahd520fvyjglnrq" + "commit": "f7b2defceed8bafb87da704ce3e7774f53abf1c4", + "sha256": "176imva32l766llrj4171r7bb3z5isvprrr5cl28cm41vqg4szfx" }, "stable": { "version": [ @@ -11409,8 +11425,8 @@ "chronometrist", "spark" ], - "commit": "3f52469f31f0bc23dd63d0b3c29bc2040dfcd98a", - "sha256": "1mjvn02dwhnwq6x1llnlpxzvpfkl753mbs68dahd520fvyjglnrq" + "commit": "f7b2defceed8bafb87da704ce3e7774f53abf1c4", + "sha256": "176imva32l766llrj4171r7bb3z5isvprrr5cl28cm41vqg4szfx" }, "stable": { "version": [ @@ -11482,8 +11498,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220324, - 542 + 20220507, + 1357 ], "deps": [ "clojure-mode", @@ -11493,13 +11509,13 @@ "sesman", "spinner" ], - "commit": "36277802a47b0dbc9c1fd60f60908963c59c58d6", - "sha256": "0z05paq62aq520n3nqc089pyx58yn670r80cda896syqs7qrxpq9" + "commit": "69d374818bd0af1489ee8828b258c689ccc24a66", + "sha256": "0r585myfkdsqrmd7fydbfdakwsfh4wq4bkjgngyag8mkam88ms16" }, "stable": { "version": [ 1, - 3, + 4, 0 ], "deps": [ @@ -11510,8 +11526,8 @@ "sesman", "spinner" ], - "commit": "02ca53021682f426323dc7bb4e6b28e6c8f5eb30", - "sha256": "0mxlkxpzn7rzbzpzcw2z9x2ab2zvhrwr8h21kmfn3li3dha73gf1" + "commit": "b2cee7fc301735b403920583cc2c23dcf70990a3", + "sha256": "08gj8nm6qjjgn75aijhkbdhpwfd1qx6fy2c77m8ca99pbqvabmcq" } }, { @@ -11640,14 +11656,14 @@ "repo": "ailiop/cilk-mode", "unstable": { "version": [ - 20211222, - 1541 + 20220411, + 1342 ], "deps": [ "flycheck" ], - "commit": "6e46cdb72ae0348c77b70f1679b34a1155e70797", - "sha256": "02rrjjaak0kjm0kifdfb7a427b6q86whs1hkc515fdl1bdr7slaj" + "commit": "794821e129ea47b04fdeedc61d9ccb3c4240c72d", + "sha256": "0yvh3f165j3i4qk4qixk7xnqvfckz4dh5z7sdm3940f3wgk2g2mv" }, "stable": { "version": [ @@ -11714,25 +11730,25 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20220320, - 1811 + 20220421, + 1956 ], "deps": [ "cl-lib" ], - "commit": "e4c5bb69e6f1338239bdbf66baf57bb610828b2e", - "sha256": "05ddgcgqribdwbph7qkz5r24h1xsbrnhlg4yqgnyyw5kfxayapzj" + "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", + "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" }, "stable": { "version": [ 2, - 11 + 12 ], "deps": [ "cl-lib" ], - "commit": "6ccd4b494cbae9d28091217654f052eaea321007", - "sha256": "0cr9flk310yn2jgvj4hbqw9nj5wlfi0fazdkqafzidgz6iq150wd" + "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", + "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" } }, { @@ -11792,17 +11808,16 @@ "repo": "bdarcus/citar", "unstable": { "version": [ - 20220324, - 1539 + 20220509, + 2336 ], "deps": [ "citeproc", "org", - "parsebib", - "s" + "parsebib" ], - "commit": "e97e33128051b5311d640492a3dfaf8dd7cdfcfd", - "sha256": "0yyb3gq140cl4dxlaagm8rwxf4cvv51g20sv5d3xfkhbkymbqjf6" + "commit": "9a6fc6da11ad2b475244cc4cbd51c77615e9aad3", + "sha256": "0q1hl8xsqb64lx10kcc4az3azaa8j3zly3pkf3lixh0qrc74bil2" }, "stable": { "version": [ @@ -11905,11 +11920,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20220324, - 1741 + 20220427, + 1203 ], - "commit": "8b51e58819e0a4b65c15f01177d1a154d9a9d153", - "sha256": "0yrcqypj1paszp2iwv0c67bh7vy1p3fj9n4h1ghn1y0pcqgbccb9" + "commit": "87e2cbf3b2ae6d59ec919a2dcb38e56ccfa5ec14", + "sha256": "1wycbcwmls7lf1vn83pwfrb1bhxf8d5p7w25b1c9lrzq7l769i2k" }, "stable": { "version": [ @@ -12129,6 +12144,30 @@ } }, { + "ename": "clingo-mode", + "commit": "bbc61401703e33521a15cc1711d18c969c87afca", + "sha256": "1c347c6wvhdxr1xsc7vrjr8pg711hya9vxkgy1v37ii7asp4p0wb", + "fetcher": "github", + "repo": "llaisdy/clingo-mode", + "unstable": { + "version": [ + 20220502, + 2020 + ], + "commit": "cf56ce6b5c50506f6cea27e1dde0441dd8d15ee9", + "sha256": "1v3q3zhx7vf81dkyr2z8ljw8as4c8zcycinhx915aqjj85d923h7" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "commit": "9773d4e22acd9ddf6f159ee5634212f4ab4575ea", + "sha256": "1pirscsakm6gnrqj1rw21fwkb8ni61h3bjdzpfldlai054g7knyx" + } + }, + { "ename": "clipetty", "commit": "3f6895244ad88e79d9e5d98dd0ba28be96c79595", "sha256": "0471hrl5nw4v83fglgnsa5yh810idbsliwvrm2b5i6zwgn3mndci", @@ -12538,11 +12577,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220307, - 1903 + 20220418, + 2015 ], - "commit": "c339353f9e649b3af084f1bb6ce759e614a2f243", - "sha256": "062vkzp5y8f8afz0rbgagqrsmmfnwmhkg7n9ainqp7m2h52qqzbb" + "commit": "b6f41d74904daa9312648f3a7bea7a72fd8e140b", + "sha256": "0s9750x739biwbcc8m09spkvkwlf1nlrdz869imjpkagk0pci7xm" }, "stable": { "version": [ @@ -12568,8 +12607,8 @@ "deps": [ "clojure-mode" ], - "commit": "c339353f9e649b3af084f1bb6ce759e614a2f243", - "sha256": "062vkzp5y8f8afz0rbgagqrsmmfnwmhkg7n9ainqp7m2h52qqzbb" + "commit": "b6f41d74904daa9312648f3a7bea7a72fd8e140b", + "sha256": "0s9750x739biwbcc8m09spkvkwlf1nlrdz869imjpkagk0pci7xm" }, "stable": { "version": [ @@ -12654,16 +12693,17 @@ "repo": "clojure-emacs/clomacs", "unstable": { "version": [ - 20201224, - 1358 + 20220415, + 1035 ], "deps": [ "cider", + "dash", "s", "simple-httpd" ], - "commit": "ffcb122194507593815d67b26f5d2d8ffcc52bf8", - "sha256": "1dqcc5szghqxdhy8r0gq6s7bbv4zq0grsjjfh8n6wmsyd1svrd3k" + "commit": "9cd7c9fd86bc7bc627a31275d1ef131378b90a49", + "sha256": "0aj3739xxv4plyjslvvm7kxa520hn1v0p6f6qpihpx4f24dyh6hm" }, "stable": { "version": [ @@ -12688,14 +12728,15 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20220216, - 1906 + 20220422, + 1601 ], "deps": [ + "compat", "emacsql-sqlite" ], - "commit": "1ba85ce9f7094aeddce25044689278eda6739531", - "sha256": "1s9riibws28xjn2bjn9qz3m2gvcmrn18b7g5y6am4sy7rgkx3nwx" + "commit": "87d2edae8bc3d390bcfc5e909e9c13ff9fce994a", + "sha256": "1grxpxrjzziqad840cw5ivp4xym0p3y0p3jwrf1j4dkbp670c75d" }, "stable": { "version": [ @@ -12871,19 +12912,17 @@ 20220322, 1258 ], - "commit": "843d1d198d15f65781d71118573461fb03a3101c", - "sha256": "000ls9briydjr5akwm7zcia3ir9l9i7xwgn06qp3wl5j9wgasbh2" + "commit": "a1c61a7e1a9f7a019809010e097f1e4c42c50022", + "sha256": "1qabbyqn450lhb5f1kaxqwv37fc9ahj89rka5c374kgzscjgjdna" }, "stable": { "version": [ 3, 23, - 0, - -1, - 5 + 1 ], - "commit": "18b02cc127730e3b007c2b56c6e115d476f0d5e0", - "sha256": "0qglzmmy4kyylz5fxg25mhwg01d5x5dpblh4zm3vyvmydbrdik7r" + "commit": "efe08e289466683b0945a5396f6848064dec5ae0", + "sha256": "1sm70am8h6fxbpxv7ky2vnx394i3qvg0vl215hg2lqaf9p9ll0ld" } }, { @@ -13068,8 +13107,8 @@ "repo": "wandersoncferreira/code-review", "unstable": { "version": [ - 20220318, - 1429 + 20220503, + 1344 ], "deps": [ "a", @@ -13082,14 +13121,14 @@ "markdown-mode", "uuidgen" ], - "commit": "6a10610826990e62c99486e30c0b3ef5869559e3", - "sha256": "0zajjm560vyjryr9yclda0j6f13w44mqzh1rz7kqxfl5sp6sv53m" + "commit": "d38fbe59304ed31c759ce733cda16f69a8ef2d8c", + "sha256": "0ph2kp1yy08g0wr3wm55zisz04lwsrmlgxgsfcnznw0qj5c2d5cg" }, "stable": { "version": [ 0, 0, - 6 + 7 ], "deps": [ "a", @@ -13102,8 +13141,8 @@ "markdown-mode", "uuidgen" ], - "commit": "136c0933ba9dc19ce3efedb36a7dbd401e2e98b2", - "sha256": "1jlzh81m8knms0wm91hgxabpxa9v2v29wi6cvjfbk59xi4fmr8xs" + "commit": "9cf84cd867d27433e0c8097f0d33cb3ade64f5ca", + "sha256": "17n066qs73rqjmjaynhcr5q73azz8584a3vsgbc9sr1flp3sypwy" } }, { @@ -13283,14 +13322,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20220318, - 1558 + 20220327, + 1143 ], "deps": [ "dash" ], - "commit": "05dfc97b004f1a962313710d81cffae3b2f9c98a", - "sha256": "161mn6b14kbpf4lyqw9ijxqir8qxbz9rr7ydx03z6shjfp7ciz54" + "commit": "6fe76f0c3090f6023da3806e9d760e93810905d4", + "sha256": "05lsgksrif3isrlgr31fcwpmndgbl6qggj6jxznj3lqvhq9vz5zj" }, "stable": { "version": [ @@ -13376,11 +13415,11 @@ "repo": "emacs-jp/replace-colorthemes", "unstable": { "version": [ - 20200729, - 921 + 20220506, + 858 ], - "commit": "a996eca37f4df726eec95406deb76b538320771a", - "sha256": "1fgcd6vdqknqb1s1hwqqspk84a8xnxmrcnlic1j0x558i2yj4l2x" + "commit": "74ad69bbca6fcfff3c0960d888c7c9c1f9f3e2e8", + "sha256": "13ff4s372wsl5x13vh4vywhi6qcc54gybhp6rxl0r1l4wxidanwn" }, "stable": { "version": [ @@ -13426,11 +13465,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20210907, - 1208 + 20220412, + 1643 ], - "commit": "e2857533627f3eda3e9e21de7f2a99b8634c1c15", - "sha256": "0hi1wg9v5ax71q14jk6mpp3mpfx2ma490l0kxdq2wkajkmh4apr1" + "commit": "2b373a767129ed4e8c4d52e0ee827786224d7106", + "sha256": "13hkqpczf256r44vczf8nbbs4rwjikjwsshgj54alzzgcxsxc174" }, "stable": { "version": [ @@ -13535,8 +13574,8 @@ "deps": [ "s" ], - "commit": "d4958edf2a4a8cbe55097320e191045d496847d8", - "sha256": "1yi1ha4iyfb0362x7wk65lksh6377mga0xyva65s035i75r4k05n" + "commit": "fa85a6b9d852d725730a6ad1cc5afeb4ede93ca7", + "sha256": "1xmr4gxj3k4vy654270jgs3x8nv72q4hyk7q8zixycnymbqvby5f" }, "stable": { "version": [ @@ -13870,11 +13909,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20220326, - 48 + 20220425, + 1145 ], - "commit": "783287526a791590bea4f9a23992c2bfebdb4c8d", - "sha256": "1cxr4dc0yfnccjk3l3sc15ys0pzff0r133msq59nzk6r48ba9p0q" + "commit": "d5145006b948f93e673f439a766da01f636d39fc", + "sha256": "0ghdk8iif240bg9pv24837y619g1s19dp3akxqjwr89sj2llhyln" }, "stable": { "version": [ @@ -14012,8 +14051,8 @@ "axiom-environment", "company" ], - "commit": "e60de5ed107ffeb530a56d24d04f38988124d12b", - "sha256": "0p8kbxfcrx1ib8g17g6h2i2ygy35qq992n3s2xa6ysij7wrfn4hd" + "commit": "b52fa715285e7ad182c8e679ebf05b130dd5b5e2", + "sha256": "1hb4npfpg1iy9j0p29q1jrjgx0mrn333m45nmsnxw8nlaxzd97x6" } }, { @@ -14328,8 +14367,8 @@ "emojify", "ht" ], - "commit": "34f33e4bd1fc11da306c1d159def96cd92e4c00f", - "sha256": "0v6j7xjl5gs513gydxj2hn5f17p6y6fqbf8ik8v5ac5lifhwcn6q" + "commit": "6f095b419468b0443e1dcd8537ef4b84092f155c", + "sha256": "1ssjzhbngb5v7wzh40zzh1j0pfzv0paqync8jvd0diwaz983rwzx" }, "stable": { "version": [ @@ -14424,16 +14463,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20220325, - 1206 + 20220409, + 1753 ], "deps": [ "company", "ht", "s" ], - "commit": "4fd30469d50a5d49e035a02a29c6acf5fb72a494", - "sha256": "1qqdma87jvmybd0af5ls86v2k62586ijqkymg99w6dxvlsd8wj6w" + "commit": "e2e8a39976506cbf149f9c62a69c7a438be09579", + "sha256": "1lra119f4bbx6rhpm118yml6qnqy7s1lj2w1dnm8vbl68r255zyp" }, "stable": { "version": [ @@ -14663,8 +14702,8 @@ "lean-mode", "s" ], - "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df", - "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p" + "commit": "362bc6fa3efb1874c525ed6b4b6f24f76af22596", + "sha256": "1lr4h555fa1kdi3q7hkhsnznv7nh9rgjqjkbj2bqp9zwh06245w3" } }, { @@ -14838,8 +14877,8 @@ "company", "native-complete" ], - "commit": "5f94022fc9168971c77f8c12f9efd569c45f4850", - "sha256": "0lfqvm71lxxga06pjzcdydjpgd3548rql7bsjdvbknkwx2p54w4g" + "commit": "01d8a2048e13f29dd3aa06281ac8cb466caddb64", + "sha256": "069ch7h1fkm2zvw6nfndyrpxp9s2p7x3d0acswaa7isynygwkcy8" } }, { @@ -14962,8 +15001,8 @@ "cl-lib", "company" ], - "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce", - "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc" + "commit": "f34e09783b77d1158ea139b7b3d8034bc52b0b9f", + "sha256": "1qi529lg3y5l4wrzfyk0w2fz36mpd432bp39s859z4cq06yybxga" }, "stable": { "version": [ @@ -15096,15 +15135,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20220110, - 1017 + 20220331, + 2141 ], "deps": [ "company", "posframe" ], - "commit": "ede518dbe05c93b3699052204d0b7a98b2e1c0df", - "sha256": "0mginqfmf42h3f88s6mgpqngbnwsnbv1x6k08cr2mmqc1khg4xnw" + "commit": "df0e34f69dc8e9aaa1a6c5e88783898f4ae3f2df", + "sha256": "0qkyxjlzgrpg7vrpdknqhb7649qqhqp4m1ry6as6sf288nbnw28s" }, "stable": { "version": [ @@ -15122,21 +15161,21 @@ }, { "ename": "company-prescient", - "commit": "b92c34e493bbefab1d7747b0855d1ab2f984cb7c", - "sha256": "0cp918ihbjqxfgqnifknl5hphmvq5bl42dhp5ylvijsfa8kvbsb9", + "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5", + "sha256": "06cxvd7w7bw4gw061k3vsmvx7kvm2kz71nr4kmwya7zamz171gwh", "fetcher": "github", - "repo": "raxod502/prescient.el", + "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20211228, - 417 + 20220509, + 2300 ], "deps": [ "company", "prescient" ], - "commit": "c5295a9eecbd2935bb57684a4422638e03bf738c", - "sha256": "1wfmynbqaqvrkjdncx0wmqxz6v8zlfmqlh5l3h6876jin97i5fbv" + "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484", + "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c" }, "stable": { "version": [ @@ -15217,8 +15256,8 @@ "company-quickhelp", "popup" ], - "commit": "fe68967d901ec284022fd67d296866795476e60d", - "sha256": "1586vwl280z463h9yb5ijjhwi3dmizcmwxy54rh2pd8yljgxsjlm" + "commit": "75a2f5c7669833646fc653cabd531737b52fb469", + "sha256": "0zkjicfa5dlzq2834p70ks3mr48086lf0dlr0r5df7jrw8wrw8c9" }, "stable": { "version": [ @@ -15553,15 +15592,15 @@ "repo": "rafalcieslak/emacs-company-terraform", "unstable": { "version": [ - 20190607, - 1037 + 20220509, + 1759 ], "deps": [ "company", "terraform-mode" ], - "commit": "2d11a21fee2f298e48968e479ddcaeda4d736e12", - "sha256": "0hxilq7289djrn6kgw7n926zpz0pr7iyd1wm6cy8yfhxf546a4px" + "commit": "8d5a16d1bbeeb18ca49a8fd57b5d8cd30c8b8dc7", + "sha256": "0s3n2hi7x21pza8nfayy86w4m30l95x0lcbpsknl50v15z5sch0i" }, "stable": { "version": [ @@ -15638,26 +15677,26 @@ "repo": "johannes-mueller/company-wordfreq.el", "unstable": { "version": [ - 20210201, - 1839 + 20220405, + 2000 ], "deps": [ "company" ], - "commit": "3787785af2135c42af7b22562da554628141afdb", - "sha256": "0iwhi1pw14finc9n9avlv79wnyl8628cmdka5j83hjv1bs2fnysw" + "commit": "83569cf346c2320ef22f6a858e3424f771c4324e", + "sha256": "1rmv8985adf1vibs070fnzzjnbxaj0qgwjyqmnd5v7v020rkpmrc" }, "stable": { "version": [ 0, 1, - 1 + 2 ], "deps": [ "company" ], - "commit": "3787785af2135c42af7b22562da554628141afdb", - "sha256": "0iwhi1pw14finc9n9avlv79wnyl8628cmdka5j83hjv1bs2fnysw" + "commit": "83569cf346c2320ef22f6a858e3424f771c4324e", + "sha256": "1rmv8985adf1vibs070fnzzjnbxaj0qgwjyqmnd5v7v020rkpmrc" } }, { @@ -16077,19 +16116,52 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220319, - 2221 + 20220508, + 928 + ], + "deps": [ + "compat" ], - "commit": "47c4f405efdf4692c6b7e1dd2098573db9aeae6c", - "sha256": "1nph35a4q2a4sbsmh9hcxvwcr4pfshnmrc8ahk4qn825a7iny70w" + "commit": "1dfdf55f3d941f08089e5d0e611cd9daa8a44b19", + "sha256": "1hsxavf55xmy91xmv8yh6fb4aphv6sv947hs35ghvfm5s74sk47v" }, "stable": { "version": [ 0, - 16 + 17 ], - "commit": "800824601b610016066991d6e2dde198d4b0ad8f", - "sha256": "1mravx5aapy8bcgk6nvi1jvb5jgl7jsn7pd7br7v7fqadcp225m6" + "commit": "f517b70dd8a3be0b8c883633f2a7721448b40f0f", + "sha256": "08l3h7b5j1q9nwcq660667b245qspl20ikhfdvd9k3g3n2p6p5kz" + } + }, + { + "ename": "consult-ag", + "commit": "9fa648ca3822e65ee14fd8a8b294a80e5e7c3110", + "sha256": "138n5jlm9pw63s74vvvp7vbkgpgiv07dhlvi3yx26zdlm4xks0vp", + "fetcher": "github", + "repo": "yadex205/consult-ag", + "unstable": { + "version": [ + 20220419, + 1721 + ], + "deps": [ + "consult" + ], + "commit": "2460ae6829e86c9f1186a852304d919526838cb8", + "sha256": "0f5m66xgmm306ifh794q65wm4wwyayfgvm9fn1kip7aj86n0snfh" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "deps": [ + "consult" + ], + "commit": "2460ae6829e86c9f1186a852304d919526838cb8", + "sha256": "0f5m66xgmm306ifh794q65wm4wwyayfgvm9fn1kip7aj86n0snfh" } }, { @@ -16119,15 +16191,15 @@ "repo": "karthink/consult-dir", "unstable": { "version": [ - 20211007, - 2352 + 20220505, + 1037 ], "deps": [ "consult", "project" ], - "commit": "08f543ae6acbfc1ffe579ba1d00a5414012d5c0b", - "sha256": "1cff4ssrn1mw2s5n090pdmwdirnfih8idg5f0ll2bi2djc4hq5kn" + "commit": "d397ca6ea67af4d3c59a330a778affd825f0efd9", + "sha256": "07gq5ja8qzzar0qyl1ii6g3sy78mmzh3wnq868s2dhh18vxl5335" }, "stable": { "version": [ @@ -16150,28 +16222,30 @@ "repo": "mohkale/consult-eglot", "unstable": { "version": [ - 20210905, - 1830 + 20220409, + 1238 ], "deps": [ "consult", - "eglot" + "eglot", + "project" ], - "commit": "f93c571dc392a8b11d35541bffde30bd9f411d30", - "sha256": "1jqg6sg6iaqxpfn7symiy221mg9sn4y1rn0l1rw9rj9xmcnng7s0" + "commit": "0da8801dd8435160ce1f62ad8066bd52e38f5cbd", + "sha256": "1qxk1npxbf8m3g9spikgdxcf6mzjx6cwy3f5vn6zz5ksh14xw3sd" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "consult", - "eglot" + "eglot", + "project" ], - "commit": "2d0e08e92bccc5ed247d4e9244c5c9ee69207e2c", - "sha256": "01bjgabrw7kq6xy6m3b4assn7g5paq74m253pxrjzqa86rqh44sx" + "commit": "0da8801dd8435160ce1f62ad8066bd52e38f5cbd", + "sha256": "1qxk1npxbf8m3g9spikgdxcf6mzjx6cwy3f5vn6zz5ksh14xw3sd" } }, { @@ -16182,15 +16256,15 @@ "repo": "minad/consult-flycheck", "unstable": { "version": [ - 20210530, - 202 + 20220403, + 1810 ], "deps": [ "consult", "flycheck" ], - "commit": "0ad7e8ff15683a4d64b79c29b3fcf847edfe244b", - "sha256": "09h9p7axy4gavzz2fn847hx2xvfxlnz4x9lpvp9arivjzn0yqrzi" + "commit": "9b40f136c017fadf6239d7602d16bf73b4ad5198", + "sha256": "0m30kz2ixxih433kddkyi0sfh7hkwm746417l2f30b273vlfj7ya" }, "stable": { "version": [ @@ -16213,14 +16287,14 @@ "repo": "OlMon/consult-flyspell", "unstable": { "version": [ - 20220227, - 2210 + 20220419, + 2044 ], "deps": [ "consult" ], - "commit": "2e7b99dec6c51259d0bffbae3e863f4054dd2346", - "sha256": "1cj3ahxdihi4v4x5qsn1lgacl7dzswy79qli23zrkxaw78x8is0i" + "commit": "396def174495cc77413e2065ef79658a02490dad", + "sha256": "1yvxzkp81yn5k3z1fdkayhb3cn2x92z7wfxcxrqxlasjz9nax5cm" } }, { @@ -16256,6 +16330,24 @@ } }, { + "ename": "consult-ls-git", + "commit": "af90413953b4b6a4d6c1b9919835703035b565d7", + "sha256": "0vrvcjyjq3f4zs2jdyfk82xhr4n8yw5mxhrsmmd0ljhcqp6zxbmf", + "fetcher": "github", + "repo": "rcj/consult-ls-git", + "unstable": { + "version": [ + 20220501, + 1823 + ], + "deps": [ + "consult" + ], + "commit": "f2398b354994e583ad22af324a129cf94d06009e", + "sha256": "1brvhnlw72vhxjf6d984pjf5sq6l7d6vpnhzq2swp3zz4a5sfqvx" + } + }, + { "ename": "consult-lsp", "commit": "c2d4a871be8f52fcfd24c3823382a983d9dcce46", "sha256": "0qrillb8yg8lzilbf40y8c9jpf8jyhfdry2xp6d9mlfnkrdc1qr0", @@ -16263,29 +16355,29 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20220320, - 1125 + 20220507, + 856 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "0dfc9d55876d4cf7c32f8a663fe6343927f78052", - "sha256": "15w586gp8x4d52wlf4b6lcmgsidav8slqr97yrj1jfhyri2sryx9" + "commit": "19606a03cf854e1b0930c4526ed92c4560dccdc2", + "sha256": "1g4wimqghcph6jrk9y7sqk2pqppx63n4z0557fpgwd57x62rl7zv" }, "stable": { "version": [ - 0, - 6 + 1, + 0 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "c3d9f1bbb5ac8504b874d79fb3a573457d584640", - "sha256": "13haynm8s406rasqkdsl2x5j2lbjcw3q3knv6mr9z0da2igwrag9" + "commit": "a750a90c265176f0285cb13aded119383836a7b2", + "sha256": "14dyclspkf1a34nvjj800ckz1phsizq07ps8k4x0ah6ik0hfhy1w" } }, { @@ -16296,15 +16388,15 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20220302, - 229 + 20220421, + 717 ], "deps": [ "consult", "notmuch" ], - "commit": "883527072b56bb09dd921800bca13860caaa4ffe", - "sha256": "0xzpkpf2sb89qkbqcrwddp4pgnzdjp40bc5da22jq9r4pf67y7qs" + "commit": "16eb2c100ca144140f07014c32e99487c6a73e18", + "sha256": "0ynla60n7aksp8fqikpsxv45li68ccgklr3xq601z3zyiyjg54a2" }, "stable": { "version": [ @@ -16320,6 +16412,25 @@ } }, { + "ename": "consult-org-roam", + "commit": "f34e29fd26e1b708274dd0b44baa29af762cf1a5", + "sha256": "1h952zkb4a9a4l1kdgzs0lwlvmvqggqgwghcgxkxj3pk3qvf0slx", + "fetcher": "github", + "repo": "jgru/consult-org-roam", + "unstable": { + "version": [ + 20220508, + 1232 + ], + "deps": [ + "consult", + "org-roam" + ], + "commit": "05cec288f931a1f3cd5984b88a79f1339110e4b9", + "sha256": "0ar9qfkigwpifca05020p4144d6qh42milwz8wrn8ylxwsmm7v0m" + } + }, + { "ename": "consult-project-extra", "commit": "c7df62c7b77134617aa018025736a37760fad471", "sha256": "0s77hk2iq0q77cdw1j805a5w74hrcj6fvpwk1y9yy0bp0w4gcr4m", @@ -16327,15 +16438,15 @@ "repo": "Qkessler/consult-project-extra", "unstable": { "version": [ - 20220228, - 843 + 20220424, + 1815 ], "deps": [ "consult", "project" ], - "commit": "897f2f71a94ce1b72c3bf823e14791a332befbb7", - "sha256": "1c0nllj6hhgvjf7zzy44iacnl29flg54ahb26r4bi9lip8aw65xs" + "commit": "fa882a0bf9b697ebb59d0dfa2ffd81ea6daabf41", + "sha256": "00gf7fam9gfll9s7bw7bna64y1ynmlhqf4jcbkfhj02laff2virf" }, "stable": { "version": [ @@ -16357,15 +16468,15 @@ "repo": "OlMon/consult-projectile", "unstable": { "version": [ - 20220310, - 1840 + 20220511, + 2103 ], "deps": [ "consult", "projectile" ], - "commit": "df85d0f83c323f4672221c9e78d84027bcb9d96f", - "sha256": "178405z6vasr44p1rg1n1ar4vwbvp04n5fnyma1j327lp8lbppmi" + "commit": "130ba9d3879bc293d81b1aa9fbfd0dffae3b5579", + "sha256": "0gvrhh58097lry1d13xx4il2kbkljrk170hgr8ibxdzq0jf09aah" } }, { @@ -16424,15 +16535,15 @@ "repo": "mohkale/consult-yasnippet", "unstable": { "version": [ - 20211122, - 810 + 20220409, + 1209 ], "deps": [ "consult", "yasnippet" ], - "commit": "9f38ad510328e708370a3a6b41cf40e8bd031b04", - "sha256": "019m29j9xf49shd3qnkvxx8bb20d7xavq1y5a07k5vn9lahmzhj2" + "commit": "cdb256d2c50e4f8473c6052e1009441b65b8f8ab", + "sha256": "0sr0v6kd91sbz8zfg35b5y2s3mr047a75kwh9himn2jgrm75kl50" } }, { @@ -16708,14 +16819,14 @@ "repo": "galeo/corfu-doc", "unstable": { "version": [ - 20220318, - 1052 + 20220429, + 1348 ], "deps": [ "corfu" ], - "commit": "95fdae5755e6c88cf77b409b555290c36961ec6c", - "sha256": "09lmvb88nj7ivsr6gh93xhbfav80pm69z3dgnifnn1g2gfjnjjka" + "commit": "5a6f4f879de6dc2ca6e22789878d416e88e85905", + "sha256": "1rvymrs2vgcqr05xij719fyv5hd3bi34f8aragcabbiwbmjfhz7z" } }, { @@ -16796,15 +16907,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20211230, - 1909 + 20220402, + 953 ], "deps": [ "ivy", "swiper" ], - "commit": "c97ea72285f2428ed61b519269274d27f2b695f9", - "sha256": "05ivdsq6l6ixdn5p0rjh7mcgw19fm38m137xb8yi2c9gii6yk6g2" + "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", + "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" }, "stable": { "version": [ @@ -16841,20 +16952,20 @@ }, { "ename": "counsel-at-point", - "commit": "76600c160b01ac365ba6fed2304128961a8761cc", - "sha256": "1sq9jfzrbr5jai25irkz2nlpj20vw2la8hfchp3zf94vkcvswv27", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-counsel-at-point", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1bcgsyin3y33r91m89kfx9q7c9d0qx7ga97dcpzdnrvbhav9k2cs", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-counsel-at-point.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], "deps": [ "counsel" ], - "commit": "28b26ecac676d6a3942f1b96d2916f4c23d9b3ab", - "sha256": "0dmr5aa74kziwmf8w1jr38lb23yir0mff2wjiidgpxm452pwwrqy" + "commit": "3e731889dd4519d16c38d5ad20f4ecdea0c95475", + "sha256": "1c4y9j0dlwxcahg7r62llv6w66iz48zmsnfwj9pv9pdhw6cnpc23" } }, { @@ -17034,14 +17145,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20220213, - 1104 + 20220405, + 510 ], "deps": [ "counsel" ], - "commit": "80b5816c1fab8c0621601f7fbe7ba65b2c67e9cd", - "sha256": "10bprk9ixbsyfzrl7b23gc6wgwwyg4ksyw9w28071r2hpz2dssv7" + "commit": "c74ae94297c4a2dc0b6878c2e9460a4f386158d4", + "sha256": "01a11dij88ysnrpmrs0flc9m43mlbc41zcahwmaqdp58rvgc24ji" }, "stable": { "version": [ @@ -17428,16 +17539,16 @@ "repo": "AdamNiederer/cov", "unstable": { "version": [ - 20211203, - 416 + 20220410, + 2247 ], "deps": [ "elquery", "f", "s" ], - "commit": "6c951cca9867e26df316ca5dc313ceabd22070a5", - "sha256": "16xf7hfyq39wc363g6lqmdcl0vidk4i9wycdws17954w9gzhahq6" + "commit": "8396fa82a84965cd88fa23f5b361ab80ff28e231", + "sha256": "14qgws2zi9qvw7jvp155xh8437g409g02bv7042xkjxz13bwa5ss" } }, { @@ -18012,8 +18123,8 @@ 20211124, 1105 ], - "commit": "856ecbc0a78ae3bdc2db2ae4d16be43e2d9d9c5e", - "sha256": "18s3vj4hkxdmzbch4zh943p4fbm721kmh91vdkc2fjgpilr2imk3" + "commit": "fa06dfa206812476217ada6c4178de34ff1efc42", + "sha256": "1d8capbzdr69sr4xhz2l8aczys1ry5ns1k873575wp8xfdp02ppq" }, "stable": { "version": [ @@ -18121,11 +18232,11 @@ "repo": "zenozeng/css-eldoc", "unstable": { "version": [ - 20150125, - 323 + 20220415, + 1629 ], - "commit": "c558ac4c470742c98a37290e6b409db28183df30", - "sha256": "1mgc6bd0dzrp1dq1yj8m2qxjnpysd8ppdk2yp96d3zd07zllw4rx" + "commit": "73ebf9757a043b56b7d3b5befec5a38e6754b9e5", + "sha256": "1x2lvq8fqxsybny24d4jnnwn97j652i931qgi5y99zz2f0bvg2gj" } }, { @@ -18252,17 +18363,17 @@ }, { "ename": "ctrlf", - "commit": "46073c430c271aa1971e27948e7f6d4b65b3d533", - "sha256": "01d2zv7x588r55namcda58l21lg5sbwcn1ycnvg5md69pv5cg461", + "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5", + "sha256": "1lls531qj0ls61byx0546diq2d8jkvk6x250rvwaiw225476mc0i", "fetcher": "github", - "repo": "raxod502/ctrlf", + "repo": "radian-software/ctrlf", "unstable": { "version": [ - 20220130, - 2307 + 20220509, + 2344 ], - "commit": "56021fd53efd775d91db2730e4ab4d5c157c513f", - "sha256": "093ximdpb9bzrnayc47is6i6jya8s5jkq7f8njnqd07hh5bm3l20" + "commit": "d37d7a997e1e3ef5e2223aeecbbef92f369b0760", + "sha256": "1lfd20xknpxxb9qiqhj9mqabsgibzdkhf335mm4vl9jvgim6j7vs" }, "stable": { "version": [ @@ -18441,6 +18552,30 @@ } }, { + "ename": "cue-mode", + "commit": "5c0c13b152f9099cb92a431e374864eee3ca3808", + "sha256": "1ykhgxk0rcwpdqmjgbf47d9vsmml4wbbyrrkr8lzki4hfllzdcyp", + "fetcher": "github", + "repo": "russell/cue-mode", + "unstable": { + "version": [ + 20220512, + 2104 + ], + "commit": "f98b9f9088fcb66c97f9200f6c8a0cd16c11caae", + "sha256": "08nxlgf02v8gz92dif3fy72qz3yisybxlx1i0any3sxn5swi7g7y" + }, + "stable": { + "version": [ + 1, + 0, + 9 + ], + "commit": "f98b9f9088fcb66c97f9200f6c8a0cd16c11caae", + "sha256": "08nxlgf02v8gz92dif3fy72qz3yisybxlx1i0any3sxn5swi7g7y" + } + }, + { "ename": "curl-to-elisp", "commit": "11453864d71c7853bc743341db7ca071126ca160", "sha256": "16qyw6yx5vlm32ikmgxhf162jjl1nq7lmrcn6g43fkk93id0374n", @@ -18624,20 +18759,20 @@ }, { "ename": "cycle-at-point", - "commit": "033260c71bef524da774f7b51e744b919f1a7145", - "sha256": "1h8ar6dhfk2irbk90hnbxp1l5lmb48rr6r7yj24c9yc8manxyxjn", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-cycle-at-point", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "065jpz2c6mlx133wr41k7gkig4ygxy5i0a1j5rapiyrskg8dcyfj", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-cycle-at-point.git", "unstable": { "version": [ - 20220220, - 431 + 20220507, + 1118 ], "deps": [ "recomplete" ], - "commit": "ea22b90f35f4cef73387047b3ef3fad83787d4e2", - "sha256": "100aziv6wwrkalx07sy8za6kvnj30pknj1shbymspw13bpp7wqxj" + "commit": "85750fa695797b95608b331b64ea49d81f7c8a36", + "sha256": "1cf5mvkwy208dlc4jlax9cb9ffl41aibcpsbfp0sv8ibjrnsaldd" } }, { @@ -18723,8 +18858,8 @@ 20211111, 1407 ], - "commit": "d85cbf676dd7bec80fbfc23d038575a21859ac87", - "sha256": "16ix9zxwmr0m8c6p61dddwmgs95jv942pr9alz9az7dw71d0flac" + "commit": "89591f7c85f6b8eb580ac8f3a00014f28c61a139", + "sha256": "0yj3i2jrajh33v0h6djlzsl5l5gb2958z365d1zjbabqxj202wg3" }, "stable": { "version": [ @@ -18890,8 +19025,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20210301, - 1738 + 20220429, + 1454 ], "deps": [ "company", @@ -18902,8 +19037,8 @@ "lcr", "s" ], - "commit": "8741419333fb85ed2c1d71f5902688f5201b0a40", - "sha256": "1i4rz1lp78wzn8x9xgjar8h66csdkf5836ny8lwd68m7z5gh0w21" + "commit": "b81081c2eb8dcbd7e67e05cf5e1991df6cf3e57c", + "sha256": "0cr9d2kbikal1np7j0zd39ldhpicsn9xb7iqfbl4dgksnf8jc5rd" }, "stable": { "version": [ @@ -18931,8 +19066,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20220325, - 1144 + 20220512, + 513 ], "deps": [ "bui", @@ -18944,8 +19079,8 @@ "posframe", "s" ], - "commit": "f918c0580bd17105cbe50aa701a2375abca5a6ab", - "sha256": "12wnvj6bnz9xx9skzqjmldn9ak0pxm46b2g7ishj7q810fg5hzws" + "commit": "52ac284dafff3fbae561d1743b73131339421d76", + "sha256": "112qpba47csbhqha4y3vlccgzm14x7x522r2n1p9q4ssknn7va4i" }, "stable": { "version": [ @@ -19132,11 +19267,11 @@ "repo": "bradyt/dart-mode", "unstable": { "version": [ - 20210830, + 20220401, 0 ], - "commit": "3bac14200f9f8f8fcebc383087572da5c3823c34", - "sha256": "1vql8m4nj0brmv58b6lkbhykik8n6j4i7d3nylcls78y7ihc2cz8" + "commit": "9c846769abd37f7fdc7ba8388d1f3a2b844b75e3", + "sha256": "1qlxjfmw8hbg1d1ll4jivsjw6a3x6j5q00w6kkvl58n65pkpm5ng" }, "stable": { "version": [ @@ -19192,11 +19327,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210826, - 1149 + 20220417, + 2250 ], - "commit": "da167c51e9fd167a48d06c7c0ee8e3ac7abd9718", - "sha256": "14fwib33l32fmmjr03zyk9xynblrkggb1b47x2ihh6jfxq8i9qm1" + "commit": "7fd71338dce041b352f84e7939f6966f4d379459", + "sha256": "1q2p51348bpg35h9c9cg21k27c7svh52qvi6zlslvnig7wcx662s" }, "stable": { "version": [ @@ -19271,8 +19406,8 @@ "deps": [ "dash" ], - "commit": "da167c51e9fd167a48d06c7c0ee8e3ac7abd9718", - "sha256": "14fwib33l32fmmjr03zyk9xynblrkggb1b47x2ihh6jfxq8i9qm1" + "commit": "7fd71338dce041b352f84e7939f6966f4d379459", + "sha256": "1q2p51348bpg35h9c9cg21k27c7svh52qvi6zlslvnig7wcx662s" }, "stable": { "version": [ @@ -19295,11 +19430,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20220326, - 725 + 20220409, + 620 ], - "commit": "1d3fce6e8e8605f770f2b23184b055029128c477", - "sha256": "0kylaqz16xmc22xainarnwn31rlanw3ycapdxga0hgyg972p1z45" + "commit": "0a86c0eabe6bb5e188e6ae915d971103248a3d26", + "sha256": "1ki4g5s4n2c4zvsk56w4ync2rrwbchz63ms68a2xjkmnihy83x90" }, "stable": { "version": [ @@ -19347,8 +19482,8 @@ "deps": [ "dashboard" ], - "commit": "73d280e029dfb68c2666dbc20130300439b170b7", - "sha256": "1rsv008hfk8v8wkhfqhhpyf5k7hhhh0aisa36ram6a3y5gwj0ac5" + "commit": "f9e199a20c654c3d1d8f405fdec9acb294afc004", + "sha256": "0l0bylzd9r6cc04r1b5ky3dqshzc2k6j47hqini35ibk331dm804" }, "stable": { "version": [ @@ -19628,15 +19763,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20220305, - 522 + 20220501, + 2005 ], "deps": [ "ccc", "cdb" ], - "commit": "5c209e0306364118abf9d9440d7b8b9613183072", - "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" + "commit": "c664b26d0861621ac86b5b5f47835dd84f06dc93", + "sha256": "1qis1wmqdllzj46nsnlqskk0lld1bgn858gk8l03gcy92jrlh1bg" } }, { @@ -19678,16 +19813,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20220209, - 719 + 20220507, + 1755 ], "deps": [ "dash", "s", "spinner" ], - "commit": "0a3ba239c458ffc4f63a180b43d0e70b81742a3e", - "sha256": "0xavp98da1hr0jsq5dr2h4rfs5y1qgnv3b3pnpc08rfj1h4x211b" + "commit": "ae333e4069e296e98bf9631088c8198f50891d55", + "sha256": "000s08mwadvdwcsisw741pv3l5znii7qbdc2865i8ywbj5b3dadb" }, "stable": { "version": [ @@ -19878,17 +20013,17 @@ }, { "ename": "default-font-presets", - "commit": "3b8b731674a5c5d4f83d998258a5d4c9aabb2048", - "sha256": "0hracb7krwgpnispnjgi86zaywq08mc3c8cyaxl82lc8jc9b05j2", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-default-font-presets", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0dwdga1qk49l72yhmjxphlqzbxykxm70h64j534ffl2i1gjzkzff", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-default-font-presets.git", "unstable": { "version": [ - 20220214, - 2326 + 20220507, + 1118 ], - "commit": "1727055b59e21e91a5b72356968232e31a92f743", - "sha256": "098s8s9j8gvzkkyx6ivd84bi0dmf2p6a3nlz215ljl43l97134pw" + "commit": "7117ddadafcf0264c19b7a6bb912d52efe5553f9", + "sha256": "1m2l7ngrf8r4z873dir2b6ivbq2hqb8041bmd9xy76rwyy40v7x1" } }, { @@ -19946,19 +20081,20 @@ "repo": "jcs-elpa/define-it", "unstable": { "version": [ - 20211216, - 719 + 20220414, + 932 ], "deps": [ "google-translate", "popup", "pos-tip", + "posframe", "request", "s", "wiki-summary" ], - "commit": "ba801ce1851a83bad2b962c47aef1f86f56286dd", - "sha256": "0psf7cnps4qkxz48cqvkgqcqyll825d5zdlw297v670rjjxbpclm" + "commit": "51fd884c52faf61339aef3a3429fe91672b3e6a8", + "sha256": "10ch8ds5d27kry1ih2cwyp5pl2dlhwwfdsr0smpd1r23i74qlhmm" }, "stable": { "version": [ @@ -20258,11 +20394,11 @@ "repo": "DamienCassou/desktop-environment", "unstable": { "version": [ - 20210129, - 2018 + 20220425, + 1834 ], - "commit": "2c3e0750c11485931f447ea82f80bc90ae07aeba", - "sha256": "0ciha9q6j0fp0197ga0ifi4j527sp2pk6862mm70skpfv6bm8dx2" + "commit": "2863dc3d66aed9052c8af39cc8c8c264be300560", + "sha256": "1cn17igd9dwbqrds7k3p8lkfg4gq5vh6rqkmmjyagnaklj793van" }, "stable": { "version": [ @@ -20344,11 +20480,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20220326, - 943 + 20220410, + 1627 ], - "commit": "be6cdf690a49d5bb39da7ea29c10cec660f7c60a", - "sha256": "0wq220bv7k2aqqsfc83akg6ygrwshn5haaqibpzgr05n8w4264v6" + "commit": "4257e59dafbffb2616d240f84c5c25770ee28cac", + "sha256": "1ddzydqrgz2c12s24gy3c1gb2d9344z7ykxy2yn5gn6dzjynfnl9" } }, { @@ -20431,11 +20567,11 @@ "repo": "radian-software/diary-manager", "unstable": { "version": [ - 20210404, - 1821 + 20220508, + 128 ], - "commit": "0fa122be62dd296cefe23bcf5074cc6159bd9868", - "sha256": "0zhhfba9ak7j713xp2qhxfdc3h9a9a1grp1nprlz7qnz3pkl2rjj" + "commit": "c538504e606208fa902d040e54188072df6193d0", + "sha256": "1j10wl00mgfpw3554jngkmn44z4s28m5qvw3lg0zgca50xkjnyqa" }, "stable": { "version": [ @@ -20555,32 +20691,32 @@ }, { "ename": "diff-ansi", - "commit": "6bbfb72c3db4f774ffab9cf273b26e23fb027ee8", - "sha256": "0k25pfxm0w7i84z1qfzd87l75hv43m89ajaq7bl2ppq2h1fwf880", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-diff-ansi", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1mgn123nf8rq5ayphgvdgdz64ybrqsn9vcjy3hhw5d3dijy6i992", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-diff-ansi.git", "unstable": { "version": [ - 20220323, - 106 + 20220507, + 1118 ], - "commit": "39b39a7265c59e413ff32f1fccebe4dc1a7a966e", - "sha256": "1kw2fvkfydyc8fbwqf4r88qgzrl85qzypjwzklkpwsawdpp6vzs2" + "commit": "bfcce7f609a95b4b5e11c384c75fef8c7c972b95", + "sha256": "0gddzdx0f6l982ij9q2ljm9dbpjrwi12glxhqr599jnxnlcrxshn" } }, { "ename": "diff-at-point", - "commit": "d342698c94e145ecfebf204c1099dbe765b39c71", - "sha256": "1gjjnxafsxrhpxz3zs5kbdmy5wmhcqqfkgryzzc0mmm9iqbskd3j", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-diff-at-point", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "06j1yhl3b2vnm04p83ha1d2z26rr2wj54qbxhfwp0d1w77zrzjf2", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-diff-at-point.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "819da8d75762e1fb1a975d78c2b4666506048485", - "sha256": "1l3q7ks4ylr85ywyrg49hk0wvzlj97rznwmqsf74awgfcl1cy7nk" + "commit": "aabb96b2b59f0e0d94d7b6889fa30016927ea03d", + "sha256": "1zmk2yycsphhz8mqa3ffa3mk6x0cxvmpld7kpa0bn1sp1w8xvssp" } }, { @@ -20591,14 +20727,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20220124, - 323 + 20220506, + 2102 ], "deps": [ "cl-lib" ], - "commit": "4a08b02afec1fc6b1e84de46cc34f75f6c9c3bcc", - "sha256": "1c8v4c9cz9mcn70dws79yh1fd3nxkbb6mdrlqs5nwy7m3d2l567a" + "commit": "14f2db367e8023ab0027713315a38ecd703afdbf", + "sha256": "0ciyg1g9sil1pvmd53r57gyds85f11457anjcfi96p4jjyjg9sxx" }, "stable": { "version": [ @@ -20692,6 +20828,21 @@ } }, { + "ename": "diffsync", + "commit": "581413a6c017265568a89b08ad608bb0b4563123", + "sha256": "1kny243c3gy9wkyhc06mw12wwbmigsidicrhl7bzhrpbam7an4w4", + "fetcher": "github", + "repo": "ber-ro/diffsync", + "unstable": { + "version": [ + 20220502, + 1513 + ], + "commit": "3f8540ef0a677ea8c2b57aaf4a07937512bb148c", + "sha256": "0hgyi8s7f5r87y48a6x427xm8nkr2rms6fzsdjp840ma39pj7n2f" + } + }, + { "ename": "diffview", "commit": "0ea5dd4c9c114618ac20f565c878f509ce8d9872", "sha256": "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k", @@ -20855,11 +21006,14 @@ "repo": "tarsius/dim-autoload", "unstable": { "version": [ - 20220101, - 1042 + 20220422, + 1601 ], - "commit": "d7f5ba3169c1c6962bc7fb0bdbfb2c6fae018025", - "sha256": "1apipnqpmzfvlarsyjkpx02773krw878hxdgcax2y0f77vmqpnrr" + "deps": [ + "compat" + ], + "commit": "81c94b0707d5ddd9a3b9962ee441206db1d25967", + "sha256": "00xba7dpmsiq13zhcxcvwlb65v4mnbl8xd32vwvr3pm54bv59fzs" }, "stable": { "version": [ @@ -20935,8 +21089,8 @@ 20220218, 1541 ], - "commit": "8f517bbb04411a125860ce4fb169bcea06b364e9", - "sha256": "0frffd2b7q22xdvk9li9vivd810sy6xkw001ajc0q7c70wxj0ksk" + "commit": "3b3b24eb231af889b0eea50e6e0a20c2bca9c439", + "sha256": "0x2vx80rx8mcj1jf6p7qbf1sfy4zymnrbpkm1gzrs8k4jibmwyz7" }, "stable": { "version": [ @@ -21020,14 +21174,14 @@ "repo": "tilmanrassy/emacs-dir-treeview", "unstable": { "version": [ - 20210625, - 2358 + 20220505, + 27 ], "deps": [ "treeview" ], - "commit": "c48b0e12eb02ae046cf6dc97fe006db31ded3f2b", - "sha256": "07hhy41h1qx38rrf6f9b2r13chs3v4mzyplhpx1r6wjrj0nmh2pv" + "commit": "fa0b795b36740755ec37f5b41c3a734ad702e5a1", + "sha256": "17r27gvapc68dwyd4diw406k9nx2slicshdl923swqzyxm2c75vb" } }, { @@ -21131,19 +21285,20 @@ "repo": "juan-leon/dired-efap", "unstable": { "version": [ - 20140122, - 1656 + 20220421, + 1535 ], - "commit": "624757b2e54d9a13e2183118d6c113e37684b90c", - "sha256": "0jj9da880b4zwxba140fldai1x9p2sxc6hdf3wz6lnbvz1pyn1mv" + "commit": "360b369cb19998c6730ee1debfbec3edb7f349a9", + "sha256": "07yfks2gj15fw0arrf0nyh5ip8kjc46fyrgpdcviwr6lk739c3jk" }, "stable": { "version": [ 0, - 8 + 8, + 1 ], - "commit": "2b849bc5c09d0b752a177495ea1b851ee821f5bf", - "sha256": "1m0nx8wd6q56qbp5mbp9n466kyglrz34nflwvgd1qnmi08jwswgv" + "commit": "360b369cb19998c6730ee1debfbec3edb7f349a9", + "sha256": "07yfks2gj15fw0arrf0nyh5ip8kjc46fyrgpdcviwr6lk739c3jk" } }, { @@ -21633,14 +21788,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20220317, - 1546 + 20220413, + 753 ], "deps": [ "dired-subtree" ], - "commit": "aed7e44b5a4ef37fa7be6210ddfe73bb724bac6f", - "sha256": "1wc4lb7rpim4npjl7aszc1ddpsqf2an8v7j4dasxlvdq0n2zz6qn" + "commit": "0521cdc53e4a7ae7ea4728e5ac9f69287528dc56", + "sha256": "0r25hnij6yfdnspp0kmcp1j8dkw44xgq05ldvxqmricawxnsaxw8" }, "stable": { "version": [ @@ -21810,11 +21965,11 @@ "repo": "purcell/diredfl", "unstable": { "version": [ - 20220103, - 1744 + 20220508, + 805 ], - "commit": "f9140b2c42151dca669003d685c9f079b2e3dc37", - "sha256": "0m4hsg50ykbkgmv5kl6y0h4i20ln813fw9yzwslxgnz2479nad2b" + "commit": "62b559e1d6b69834a56a57eb1832ac6ad4d2e5d0", + "sha256": "18ggh4x7gqdnrdaknd4vkd34jgi8aw5s7r3a2xv54p8z22ipxrhh" }, "stable": { "version": [ @@ -21978,11 +22133,11 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220325, - 1418 + 20220512, + 1734 ], - "commit": "7d26d98df1a7af0266261e0e666a890a86a52bd0", - "sha256": "1yw1y5kdhs2213bvsmd65yhw3h2c7dzb70977bjd0pa083xddr0p" + "commit": "e40cc2dd1594d4285ec78100e98a0b0516d23782", + "sha256": "0qzz9bzl0rjllr84hqfczjg6h4ra4ylpcsikhdx25gc7jfvah1zi" }, "stable": { "version": [ @@ -22636,17 +22791,17 @@ }, { "ename": "doc-show-inline", - "commit": "4439485b5c582bc6a72789d07ca3b033c6195f3a", - "sha256": "1j1bwm5hfzcq683rl8k9362vlzxnddcqhmxsinwq2c9c7md8hfrv", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-doc-show-inline", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1d2mkk6a9r395vh4iyjdhzwzhn8wp1f9b3p56gls8sdqjpfwavk1", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-doc-show-inline.git", "unstable": { "version": [ - 20220314, - 57 + 20220507, + 1118 ], - "commit": "42954390621f281930a70104162db1bb70532a1b", - "sha256": "0nvk10nh2mkw430zdr0m2cnqzvi48ah32k8zay4lh0qgz4jl2kdy" + "commit": "0cceb39df31fd578cfc95d756f667874e6321001", + "sha256": "108w5v4mw7wj1ahg0bhh7bdvg31hq5iqgyjiyf9zdm02wnmz8jhh" } }, { @@ -22694,8 +22849,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20220320, - 1935 + 20220409, + 1157 ], "deps": [ "aio", @@ -22706,8 +22861,8 @@ "tablist", "transient" ], - "commit": "fbd896e3138f497b89a128d17b6f5e0e5286515b", - "sha256": "0d430ignd6yw117srysc8bxghlq0h8k533pl8k882q0mfgpnaqhw" + "commit": "cf137f5b8af7cbda17ef1d09c626db35e0e84078", + "sha256": "0rdi882r746nv8zzpcc3rv9p110ylwv1bk7nbzcychn7qsc05ydz" }, "stable": { "version": [ @@ -22909,8 +23064,8 @@ "deps": [ "s" ], - "commit": "6267907a6b57c32b430b481fe129a6cae8792784", - "sha256": "1blgf4jw5crd4daidcnj5hv57hzvhqwhfsgxvxb8rlzaapk751wc" + "commit": "bb7485d24a4fb147fc7fc7fcd1e1c7ddd3ff64b5", + "sha256": "18h39vrr66y0m16nfax6646qlnw1l0qd5c7dqpnr060ma52sbfkv" }, "stable": { "version": [ @@ -23070,16 +23225,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220325, - 554 + 20220412, + 853 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "edf18b93cceb5cf00e1006d0034663ef4d9fdc11", - "sha256": "0l0lb3in80p9hgqqbrjrnbcjb2vqxw4qxgxl42vz6kvx77fk77j7" + "commit": "85bdd9ed8674710f6b9815e9a1c41ad4b5a45ace", + "sha256": "1wmy080z709mn29w7h9m17a18jnr6a8dzip92k86kcg5z3mjg5ki" }, "stable": { "version": [ @@ -23123,14 +23278,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20220222, - 2326 + 20220504, + 1557 ], "deps": [ "cl-lib" ], - "commit": "83fd9545c2823b4b2610947802fa3a52995517b4", - "sha256": "0jrmmdz7s6jlq7h6dpxfgx1wvvzwam3rq5dgsqqcn383d9i7zbmb" + "commit": "e9bdd137116fa2037ed60037b8421cf68c64888d", + "sha256": "178ri980kwkndb73dawhsfr1dkl6xjdb451z0iar9ghk8z0r0wpg" }, "stable": { "version": [ @@ -23595,25 +23750,25 @@ }, { "ename": "dtache", - "commit": "6e0f64b768c13fb873dc1dcb849770b7b401603d", - "sha256": "1sw5wciadijskzp4cczik36ak08xx7491bqgjhbg2vf2yyg09sbz", - "fetcher": "gitlab", - "repo": "niklaseklund/dtache", + "commit": "0d69cbd12938e72bcaea6b2a79385f48a462713d", + "sha256": "08cmfhjdn30wnyfypx5qjscbi4wbfvypxnwfrcx09nn137qc3h55", + "fetcher": "git", + "url": "https://git.sr.ht/~niklaseklund/dtache", "unstable": { "version": [ - 20220320, - 1338 + 20220512, + 1524 ], - "commit": "e7d143df8a8f88cbbe0fa023cd1fc30219598d88", - "sha256": "02bpghhjcgfgcrlkvsrj652ki558pf9q5vj6j056lalfhcrckpvd" + "commit": "5a39733299cae60da2aab0e0b9f559bcc022369f", + "sha256": "166sbnq9n70yp7w8in2qkv921gzkzhzwkr3bjgnj427gxn34m1xd" }, "stable": { "version": [ 0, - 5 + 6 ], - "commit": "ecf4c57d96eda400d9b2d5cfeaa9244993ae3603", - "sha256": "1ii8zggw3db5nrkfnfhqsa7w7676bq3vl0z8larwhb34q6shi655" + "commit": "4ecda689e4ccddc23805a22484c95c4f3f65e3bb", + "sha256": "0lrj4dwcrx3s9mxnik9h9cppqjdfnbnlknfa40qwhlzxdvhxmfmq" } }, { @@ -23809,17 +23964,17 @@ 20210909, 1010 ], - "commit": "33d625d08bcf596a6c309d791a2cab70f2b8abce", - "sha256": "1pak38z3bq35b21lz3wm0jvhjznffhi7i6h9nvs1qcf9s7frw2b6" + "commit": "862831cd6e1146b0c18e6bdbf7daafb42868d439", + "sha256": "0kfykznv16lmbxhccnp9f1qn9wswadizp3mhq1kf1b29pvppf1yr" }, "stable": { "version": [ 3, - 0, - 3 + 1, + 1 ], - "commit": "68c36597dfb99187ccbadf578988deaf690c4e25", - "sha256": "1ndn560fg0fg8n3wplmkg5px69h0g38pyma9wik85cmmqfxry14k" + "commit": "09eac98ced1fff7dea4e5ac45b59e00c1874067e", + "sha256": "0ljv4gnalxq77byic23c8hrjmsqvn87gqj0ijm7rdx4xr1pff1jg" } }, { @@ -23836,8 +23991,8 @@ "deps": [ "reformatter" ], - "commit": "eda7a16ae378e7c482c11228c43ef32b893a1520", - "sha256": "0z39a1c227si435j3k8vkf4q6l01jdf70x69dywsmnrkcrcvrbf8" + "commit": "196f16a01f4c855de7becddbc4cfed2f6788693a", + "sha256": "0znk3z8khzkb068rqz9ms9c28i4f30cmb4kafqjhxf6980mcp9vn" }, "stable": { "version": [ @@ -24459,14 +24614,14 @@ "repo": "leoliu/easy-kill", "unstable": { "version": [ - 20220311, - 1506 + 20220511, + 557 ], "deps": [ "cl-lib" ], - "commit": "f9b450a87c41e5ef616df565ed158cb236aa5189", - "sha256": "05drsb7kaksdsk1v0i5gip255rvlziirl4wcana08cpm9v9p4m21" + "commit": "de7d66c3c864a4722a973ee9bc228a14be49ba0c", + "sha256": "0zr836c9c5bhf0cslwk6jqf1xn9w6wfjn4faisq5v8ydyxn78925" }, "stable": { "version": [ @@ -24575,25 +24730,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20220314, - 2256 + 20220430, + 2219 ], "deps": [ "parsebib" ], - "commit": "600b5e3d3dd98ba4017ad257470424b4507b4e59", - "sha256": "0mybyw2hh104z53lnp2pvcm9sg01wdad0hqyxl6msrq12n8pkr4x" + "commit": "0e243a78f435038dda31953c5b48cbddf2a89e27", + "sha256": "14br20mzxg84l8nbzglkwvam9ac1xlkdm6dpdfxw5ri6lkcd2bpf" }, "stable": { "version": [ 2, - 34 + 35, + 1 ], "deps": [ "parsebib" ], - "commit": "5d4012c1f1d47d2ab03e2280ad2b600ff40ce545", - "sha256": "0al846i1dn5wrx3r0ak63m80g9j9xk2q5cpcpk63lq0l0gfdff2m" + "commit": "a338d8b2007e9353a5ced6c98f12f3332e153f12", + "sha256": "0b8nb0pwpq0j5g7rgmdhjp4g9za4ppzxp7b3swkqr06vvhn7db7v" } }, { @@ -24989,20 +25145,20 @@ "repo": "Fanael/edit-indirect", "unstable": { "version": [ - 20220216, - 1812 + 20220511, + 1124 ], - "commit": "e3d86416bcf8ddca951d7d112e57ad30c5f9a081", - "sha256": "0f5vhppsjw63dkwka6xanmlliq44vf3kj1wp3dg8a6a837xx7z9x" + "commit": "f80f63822ffae78de38dbe72cacaeb1aaa96c732", + "sha256": "13v0fvzh3nv3bm4c3ld7pknw2g76cjkx81hsrmbrd1irlv4s4b00" }, "stable": { "version": [ 0, 1, - 8 + 10 ], - "commit": "e3d86416bcf8ddca951d7d112e57ad30c5f9a081", - "sha256": "0f5vhppsjw63dkwka6xanmlliq44vf3kj1wp3dg8a6a837xx7z9x" + "commit": "f80f63822ffae78de38dbe72cacaeb1aaa96c732", + "sha256": "13v0fvzh3nv3bm4c3ld7pknw2g76cjkx81hsrmbrd1irlv4s4b00" } }, { @@ -25103,8 +25259,8 @@ "cl-lib", "nadvice" ], - "commit": "1d4acc3ec73609990eabacb59c038708bc401003", - "sha256": "1blx38fyfl1zgfh5k1mgsnxxjlski7f0n890kiyjbaw2ba9zzmgr" + "commit": "1f6f16c24fd0030322d59c2853067a6dccc9e736", + "sha256": "10dm6igma7kqjpr6q1amncdixf58m81khwckjm5c3l8fn7svla55" }, "stable": { "version": [ @@ -25244,11 +25400,11 @@ "repo": "sinic/ednc", "unstable": { "version": [ - 20220226, - 1619 + 20220404, + 2105 ], - "commit": "bf588399e241742962613ce2a96f0cffc86417f6", - "sha256": "0y0rxiqa1vxz4ylhagr9mnh1x4lghg1md3k1pqzciq9gnqgl3fpn" + "commit": "d1a3c37235dd87e0bce6ffc75f5568218d6d83b4", + "sha256": "19k9mi6phdny1ihxf5apkxfv67cvyihl0za7al29dvim6172km4y" } }, { @@ -25259,8 +25415,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20220312, - 2132 + 20220415, + 1722 ], "deps": [ "auto-complete", @@ -25271,8 +25427,8 @@ "popup", "s" ], - "commit": "d815148f22ed194116dcde63a0150919e380ecd6", - "sha256": "11x1607fcpxzrf8kqi364qiiffbpwpwld0w9x0mjfsphyvdpg62g" + "commit": "5c096ecdf9462b125f2eb4092899ff63636cfc40", + "sha256": "1l97a55kg8dcvbdv9c2bk1acz4y9vl3x68mbybhbm0rs78170hx3" } }, { @@ -25467,8 +25623,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20220324, - 1606 + 20220509, + 1904 ], "deps": [ "eldoc", @@ -25478,8 +25634,8 @@ "seq", "xref" ], - "commit": "03fc783c4b701fc8c19096b7167b73bd5d8f63a8", - "sha256": "1w2j3rrbgh1mffhzbjgm3hcvijmfdcfp06pkgnacfi9dydwcap62" + "commit": "ba618d2cee55c8c339d46621b7e721957cc30a72", + "sha256": "08ynxy8wpb1ran8r7h51n5r1njpjvz7hdxkgvr5njlhwp5wz2jd5" }, "stable": { "version": [ @@ -25505,16 +25661,16 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20211020, - 1758 + 20220409, + 1811 ], "deps": [ "eglot", "fsharp-mode", "jsonrpc" ], - "commit": "b3aa4c53fc9e98648b25ad036e657632ae2fe192", - "sha256": "14n1xpj5waflhc1zj8mfnm4xavy560n1hamqk6a0dvsahpixjx6g" + "commit": "5208b54098c7534f4768b87c5f4c8a01b638737b", + "sha256": "04s37djxzy8v5xwc5hh8gq37zh7f6ih3y07g07q2fc39rk1xslpd" }, "stable": { "version": [ @@ -25536,15 +25692,15 @@ "repo": "yveszoundi/eglot-java", "unstable": { "version": [ - 20211213, - 1014 + 20220403, + 1815 ], "deps": [ "eglot", "jsonrpc" ], - "commit": "66b9615ab021d26d92de34e5131cee44f8e58886", - "sha256": "0lfifd43fz09avwgy6gs7j06s2xxlll6vkrbfbb9gl4r6q17786y" + "commit": "da76eb69b3f86992d62302649a987f157b7b7371", + "sha256": "0m64jdv20pch1f1n41rh28bgi4cxa84vdfpq7sdxjgs8laqc928g" } }, { @@ -25603,10 +25759,10 @@ }, { "ename": "eide", - "commit": "d952fa4c9b2ee754a14cea8aa818142f80f11eea", - "sha256": "0ylnjvyb598h6pq1x14ysbg5x9z773lvx2jlzrq6gwvfpjbzfb3q", + "commit": "932b2461a32c23477bffbc981cb26d9eb437cd76", + "sha256": "13n0mwfjxpjjndlmxlqpzpajjn0jcfgxhln0gz7z4p87myln6wsq", "fetcher": "git", - "url": "https://forge.chapril.org/hjuvi/eide.git", + "url": "https://forge.chalec.org/hjuvi/eide.git", "unstable": { "version": [ 20220316, @@ -25648,8 +25804,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20220324, - 204 + 20220419, + 735 ], "deps": [ "anaphora", @@ -25660,8 +25816,8 @@ "websocket", "with-editor" ], - "commit": "e04e1e19c63667e6847ae6341ab7fc7488f5eb8c", - "sha256": "16f1ka02n06li4griyrviv9bwzvj4s5fk7i2kqa5mkg0gibxmawc" + "commit": "388c8f753cfb99b4f82acbdff26bbe27189d2299", + "sha256": "03idq7z0ry3mjvsw0w3acnsnfjijqkp9lr1v1xn5jn3s58ciyw80" } }, { @@ -25696,8 +25852,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20211119, - 1910 + 20220511, + 1619 ], "deps": [ "clomacs", @@ -25705,8 +25861,8 @@ "direx", "spinner" ], - "commit": "b8d534cec8f75dc95961dca72e39a096c5eea980", - "sha256": "0xl6mb1s70ljb5wkd41qrjvr0gdnds4yli2y3mmrcvry0cp3kp0f" + "commit": "900cf3ff0a8cffeeb0155ca131fa2e425ca9137d", + "sha256": "0r7rfpfxxn620cafw2h3in384lql3qbnpdrc8j2yyqlqgp73yygk" }, "stable": { "version": [ @@ -25763,6 +25919,30 @@ } }, { + "ename": "el-fetch", + "commit": "97761f51eec22d45a64f6fcc9765b7ac924e56ef", + "sha256": "0mk9zyrx1bs9mii748vjvsj1h4frhqac7hda7jp6xyxlr6n4ys88", + "fetcher": "gitlab", + "repo": "xgqt/emacs-el-fetch", + "unstable": { + "version": [ + 20220510, + 1536 + ], + "commit": "3aa9594e807cb03af228c13224b381ecdd7ba2e3", + "sha256": "0rpdmhck3qn325jscysvgj2nzdy09rl895wsk5jhssmgmnp92zxs" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "commit": "3fa818577238adf9db7264e302d9614ce973d307", + "sha256": "0fbbnwxm96zmj2hlsjjxki901vs98qcxn8shyz8bs3qzb6kvlwyw" + } + }, + { "ename": "el-fly-indent-mode", "commit": "237311b98eec4b577409f55e16d8e640936d41a2", "sha256": "00iqiawbzijm515lswbkzxf1m6ys242xrg6lzf8k40g2ygyd1q1r", @@ -25881,8 +26061,8 @@ 20170824, 1954 ], - "commit": "5df1d3a956544f1d3ad0bcd81daf47fff33ab8cc", - "sha256": "06ldnrpqvbdxfzr8v7pj9xacgvkp36xjlhvjkpxldmqj1l5v8a6w" + "commit": "6ebfe64410d54b4cf76f655e416d49935d5e2ceb", + "sha256": "0s04nrcm7y9zljj4sni5ij2b3jciwqrxxscsm1ibchh48i1gffp7" }, "stable": { "version": [ @@ -25896,25 +26076,25 @@ }, { "ename": "el-patch", - "commit": "2f4f57e0edbae35597aa4a7744d22d2f971d5de5", - "sha256": "1imijmsni8c8fxjrzprnanf94c1pma3h5w9p75c4y99l8l3xmj7g", + "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5", + "sha256": "0xfpkpkyzf8bpp9fhlswc96vw9v3lwhhkc3qwsnzmqkzkim9idrk", "fetcher": "github", - "repo": "raxod502/el-patch", + "repo": "radian-software/el-patch", "unstable": { "version": [ - 20220115, - 34 + 20220509, + 2253 ], - "commit": "83bd1378ce4a920ce708e15f1d2caafe30d41a79", - "sha256": "1xpk4c3m5d89n2v2xfn55mj2qv60pb0rpx8ghbcsdyd04ir1llp6" + "commit": "156c61b72c1c9c61bd886b5931b8a382153f52fa", + "sha256": "043m4lpm7m7mbprnb5igx0rz2r6c425vl33m7is5j47pm1ysvp31" }, "stable": { "version": [ - 2, - 4 + 3, + 0 ], - "commit": "7378385a81ad9f033ee5033e0010c96f9b396b55", - "sha256": "0vankik1dh2yd554h59s5vlzanwx8sx9j31kr15830m3hfgikygz" + "commit": "d4f4574bcf4005f4fbafde8874cb19b907783956", + "sha256": "0qkx7f19kl85n56bp3q40200a6ynpkhimcnb3k6x4n6idn6ff2pa" } }, { @@ -25925,15 +26105,15 @@ "url": "https://git.sr.ht/~zetagon/el-secretario", "unstable": { "version": [ - 20211208, - 1038 + 20220422, + 2005 ], "deps": [ "hercules", "org-ql" ], - "commit": "dd7edc12568902561c8939e389626b3f0c7f6312", - "sha256": "0zc6d58plwnmmf0k0dgklfaya5k6ai6gmabpjl5n16r50x39jafs" + "commit": "c28a4f42829ed1f96a17abb63a8616216db913a5", + "sha256": "0s4smf6ldwivardvwnilg0p109dh51s04hqn6dna5qr9gal3ff26" } }, { @@ -25951,8 +26131,8 @@ "el-secretario", "elfeed" ], - "commit": "dd7edc12568902561c8939e389626b3f0c7f6312", - "sha256": "0zc6d58plwnmmf0k0dgklfaya5k6ai6gmabpjl5n16r50x39jafs" + "commit": "c28a4f42829ed1f96a17abb63a8616216db913a5", + "sha256": "0s4smf6ldwivardvwnilg0p109dh51s04hqn6dna5qr9gal3ff26" } }, { @@ -25963,15 +26143,15 @@ "url": "https://git.sr.ht/~zetagon/el-secretario", "unstable": { "version": [ - 20211214, - 1851 + 20220422, + 2006 ], "deps": [ "el-secretario", "org-ql" ], - "commit": "dd7edc12568902561c8939e389626b3f0c7f6312", - "sha256": "0zc6d58plwnmmf0k0dgklfaya5k6ai6gmabpjl5n16r50x39jafs" + "commit": "c28a4f42829ed1f96a17abb63a8616216db913a5", + "sha256": "0s4smf6ldwivardvwnilg0p109dh51s04hqn6dna5qr9gal3ff26" } }, { @@ -25982,15 +26162,15 @@ "url": "https://git.sr.ht/~zetagon/el-secretario", "unstable": { "version": [ - 20211214, - 1851 + 20220426, + 1905 ], "deps": [ "el-secretario", "notmuch" ], - "commit": "dd7edc12568902561c8939e389626b3f0c7f6312", - "sha256": "0zc6d58plwnmmf0k0dgklfaya5k6ai6gmabpjl5n16r50x39jafs" + "commit": "c28a4f42829ed1f96a17abb63a8616216db913a5", + "sha256": "0s4smf6ldwivardvwnilg0p109dh51s04hqn6dna5qr9gal3ff26" } }, { @@ -26001,16 +26181,16 @@ "url": "https://git.sr.ht/~zetagon/el-secretario", "unstable": { "version": [ - 20211222, - 1620 + 20220411, + 1419 ], "deps": [ "dash", "el-secretario", "org-ql" ], - "commit": "dd7edc12568902561c8939e389626b3f0c7f6312", - "sha256": "0zc6d58plwnmmf0k0dgklfaya5k6ai6gmabpjl5n16r50x39jafs" + "commit": "c28a4f42829ed1f96a17abb63a8616216db913a5", + "sha256": "0s4smf6ldwivardvwnilg0p109dh51s04hqn6dna5qr9gal3ff26" } }, { @@ -26233,19 +26413,19 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20220313, - 1510 + 20220501, + 1128 ], - "commit": "bdc729893ccfc52b2b7369624111cc175e4ce0b9", - "sha256": "1yii555k43v94cqlxv2n9k1d6pz3mjg1sc1zgpbnx5gqhzfk7m5r" + "commit": "7275089749779599d87bee878e5103921ea919f9", + "sha256": "07p8qz4fx2gvgk46sl076w1rgqmdpbxsn54m330627sla5wk5bpf" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "deaf16e832bbb4665fe5ccf825422566ce489ad6", - "sha256": "1y7ngdj2icn8zw5qpjxqj3j9dry4lb7ixgxa148ss5bgsl8pgqnd" + "commit": "e08d0135a7b484686a969f5987f07bc72285ded4", + "sha256": "1ipjrifscjynrbf0nm4siyv57cd7jdi0v16kb2byv9y0yr481ag1" } }, { @@ -26256,11 +26436,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20220228, - 631 + 20220506, + 28 ], - "commit": "c0cbb8d9191a1df8a289aafc8cb94a3ebb515d6b", - "sha256": "102z9wl7d563x7i44zhlc81bi7k030rlzfgs5cm8vbmalgqv1c63" + "commit": "8d523f4fddbd8986340cf76f349ab18c0b3d5581", + "sha256": "0sa97bxkl04s3kg1fd6c6dynp9jklw74jkgny2qhk1d2lzc64bja" }, "stable": { "version": [ @@ -26420,14 +26600,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20220313, - 911 + 20220417, + 809 ], "deps": [ "dash" ], - "commit": "8bcc6b02722adb21d3698df46db2426718aebf70", - "sha256": "0xh658xwx5bbzak4axdrwx90zv9vmba8lwcma4m7scinzwhnjfx5" + "commit": "f567f03da4a55d6eafa0e6e148ca4884d5370498", + "sha256": "1km5ghqldd0avbxr9drps6pik51yfkh2dj2gg4z7jkyvi8i0cxkm" }, "stable": { "version": [ @@ -26655,8 +26835,8 @@ "repo": "remyhonig/elfeed-org", "unstable": { "version": [ - 20210510, - 1219 + 20220420, + 1234 ], "deps": [ "cl-lib", @@ -26665,8 +26845,8 @@ "org", "s" ], - "commit": "268efdd0121fa61f63b722c30e0951c5d31224a4", - "sha256": "0krfklh3hyc72m9llz3j7pmf63n4spwlgi88b237vcml9rhlda5b" + "commit": "e6bf4268485703907a97896fb1080f59977c9e3d", + "sha256": "1md7nxayysd6pkxyp85jmmz3jh6civpd3y0qgn0zq865jcjv86l6" } }, { @@ -26677,15 +26857,15 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20220126, - 1404 + 20220419, + 1358 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "d2e22f5506bc75dbf4ca42ac87257fd1b259dd66", - "sha256": "0zmalhdd4xbn9wc5dmk4511ha955smrjpmzknwkwhqn8npgbj4m5" + "commit": "eaf1329ff221098eb6d4709245010d070c89b173", + "sha256": "14zn3h7v9vygi6syjnywd5j56xlqv4a1z2grlkgrr0jd0y427jzk" }, "stable": { "version": [ @@ -26709,26 +26889,45 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20220202, - 201 + 20220428, + 123 ], "deps": [ "elfeed" ], - "commit": "3448413280d5e8fce0d8098476d246c6c584771d", - "sha256": "0rkm3vyyklpcyaz7zs2a5azyf20bnbj9nd8ik3jgcg2lsd6jgj5m" + "commit": "419de17d681d75789271b8457509fa3f942eab54", + "sha256": "1mx134xj9n73v55i0yjn86zn19sg93m95gqacs2c6dxzq1v3q14f" }, "stable": { "version": [ 1, 2, - 2 + 3 ], "deps": [ "elfeed" ], - "commit": "3448413280d5e8fce0d8098476d246c6c584771d", - "sha256": "0rkm3vyyklpcyaz7zs2a5azyf20bnbj9nd8ik3jgcg2lsd6jgj5m" + "commit": "419de17d681d75789271b8457509fa3f942eab54", + "sha256": "1mx134xj9n73v55i0yjn86zn19sg93m95gqacs2c6dxzq1v3q14f" + } + }, + { + "ename": "elfeed-summary", + "commit": "18ebc0f8936a60ab06cb5da512d8b168179a06cb", + "sha256": "04jk4ncmnhv8l233vwlk1aj1jqi6yp885y505hw5shhx2wi1ps8d", + "fetcher": "github", + "repo": "SqrtMinusOne/elfeed-summary", + "unstable": { + "version": [ + 20220506, + 720 + ], + "deps": [ + "elfeed", + "magit-section" + ], + "commit": "641a453cfd03e098b5e6376e035eafd080b08781", + "sha256": "00sxk4pf58678lhjmzdi42dkiiszpnnjhv0dwdgi60mc31d7kqdc" } }, { @@ -26951,15 +27150,15 @@ "repo": "gonewest818/elisp-lint", "unstable": { "version": [ - 20211018, - 212 + 20220419, + 252 ], "deps": [ "dash", "package-lint" ], - "commit": "a5ae046c35a898a88eff05137fe9e5159ae610d8", - "sha256": "0vzgqjsx8crikr13r87vczjr47sh2xm3hckqc10s6b26hc2jbxrv" + "commit": "c5765abf75fd1ad22505b349ae1e6be5303426c2", + "sha256": "13g3nknb3rdq941avrjczvaa75jv7mdln4i65rwhz0nyh2sd6jnd" }, "stable": { "version": [ @@ -27143,8 +27342,8 @@ "s", "seq" ], - "commit": "d4e434fa1857ba2f58d27c7520ebeac0515cd140", - "sha256": "0vqqi7g2xwsldmgffi1ygfv87qar6xyqk9r2j23hpyqjh9pzcvx5" + "commit": "1e277684d8a6681a2410cce2dd589ee30a998369", + "sha256": "1gnr61ibzcznfqy5f8capmbz75rcfikwy106rjdmp45qz2jwp4di" }, "stable": { "version": [ @@ -27451,20 +27650,20 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20220228, - 1307 + 20220503, + 833 ], - "commit": "ecb5e17d37249bc38c25ee278094fb93b63b0a49", - "sha256": "0q2wmsxvcg6c98fbnldk64lc49zlzd42k8zisk03f8g91l12wxac" + "commit": "bf0dd36eb2f5b339c6b561dbe3ee9693565b484b", + "sha256": "0dv71zc95m5sa4824vk3d1xk726nh2v50i0yp6w3ydfzzsfph6j6" }, "stable": { "version": [ 3, - 3, - 2 + 4, + 1 ], - "commit": "6e3a8ef5af192eddcd834efac49866f84e2c73dd", - "sha256": "1p43x7mf14q84armxhp294xaclq5c6mpggq619ravia0kdrqij1w" + "commit": "bf0dd36eb2f5b339c6b561dbe3ee9693565b484b", + "sha256": "0dv71zc95m5sa4824vk3d1xk726nh2v50i0yp6w3ydfzzsfph6j6" } }, { @@ -27546,15 +27745,26 @@ "repo": "AdamNiederer/elquery", "unstable": { "version": [ - 20200628, - 1756 + 20220331, + 143 ], "deps": [ - "dash", - "s" + "dash" + ], + "commit": "38f3bd41096cb270919b06095da0b9ac1add4598", + "sha256": "169i8nd0iwapn2r9grni40qcgzkwsa7267c2z1cdwmwlb5whqs34" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "dash" ], - "commit": "cba7629ad886c4e51d66f8b509aad48bdfe100cc", - "sha256": "119g9ca40rg0aam7i2n4jhjzjzm8r7bg6q0yjaw5x1j7ywks5af6" + "commit": "8d82d0d3005d6ec6d1e7fcd7f26abb1a165cc79a", + "sha256": "035zjzmd7yfw0rsjpaklc2wwiqw6brkjadch9x8n8n2gjyxg05mn" } }, { @@ -27804,11 +28014,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20220321, - 1200 + 20220331, + 2252 ], - "commit": "fb5fe4e017d5a10a9ae4c9e17d6a9c8ac656530a", - "sha256": "1rhrvn9vmb00makvg2gdaaakg76wpsl7spn402hyzgg7jhmqhfgs" + "commit": "ea0b10340b22e8dd0454fe37ba84ff2157fada4f", + "sha256": "1p2jcq3yyasad6c9dbnc4sm3ksx1z023s1j55qfffl238rh0kgrh" }, "stable": { "version": [ @@ -27828,11 +28038,11 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20220220, - 1404 + 20220407, + 329 ], - "commit": "f23230e67c45536501d651ef6b93546b4ac9fe4f", - "sha256": "0x9kfrcf59l0ql9b71a4hbgxjl9lb5w0fwydxcyz5ib0yk5nca55" + "commit": "54b9ba1ac0d7f8b644354fd6d27c9e3aff111dcc", + "sha256": "165ba97ll0k8fsr3k2bxpwg4lnmd3513vn4mdgxcx9ll5p1jr4nd" } }, { @@ -27843,20 +28053,20 @@ "repo": "knu/emacsc", "unstable": { "version": [ - 20210302, - 806 + 20220420, + 1042 ], - "commit": "409fc548bb650c6e832b459c756b13de68147117", - "sha256": "04k3gnfhqy0i4vb03k1jr3r43sfpxs6dyx863gsgz6qnkkbqrydn" + "commit": "199c08147ebe98da1004c478c92ba8866950b637", + "sha256": "0jmbvpqbywp25dgyq0pxxpggvcjkq8lpff37374if1rhiyj0qac2" }, "stable": { "version": [ 1, - 3, - 20210302 + 4, + 20220420 ], - "commit": "409fc548bb650c6e832b459c756b13de68147117", - "sha256": "04k3gnfhqy0i4vb03k1jr3r43sfpxs6dyx863gsgz6qnkkbqrydn" + "commit": "199c08147ebe98da1004c478c92ba8866950b637", + "sha256": "0jmbvpqbywp25dgyq0pxxpggvcjkq8lpff37374if1rhiyj0qac2" } }, { @@ -27882,11 +28092,11 @@ "repo": "skeeto/emacsql", "unstable": { "version": [ - 20220101, - 1820 + 20220408, + 1614 ], - "commit": "374726060d74df0e2bcb9d0355ff41e2c400ed30", - "sha256": "0z382qksrwhkv0ayjp8nays65c3xwd4kylj41k1pc3nnqg6b2k45" + "commit": "373975cbccf7776af771e23f86043b236a330702", + "sha256": "0p4aj1h0qp201vywdlsc8snga8b6bn1ndzrzsaw7rwpa3b6c4i4s" }, "stable": { "version": [ @@ -27899,40 +28109,6 @@ } }, { - "ename": "emacsql-libsqlite3", - "commit": "4e7ce4ac946c7b7e2c4feecd3b753ea163ecc435", - "sha256": "0cpniv5r9k38qapyzhzcjhb0hpv7i6jxqnxy6nwm7ml6nhrgkai9", - "fetcher": "github", - "repo": "emacscollective/emacsql-libsqlite3", - "unstable": { - "version": [ - 20220129, - 2241 - ], - "deps": [ - "emacsql", - "emacsql-sqlite", - "sqlite3" - ], - "commit": "2aca80a3869d4fd654e79c4a1e20b5227fc2ba39", - "sha256": "0x0fmxgjs17hckx2a32y96nlqdcsx42wcw4lpyc6nk98ikraipgq" - }, - "stable": { - "version": [ - 0, - 3, - 0 - ], - "deps": [ - "emacsql", - "emacsql-sqlite", - "sqlite3" - ], - "commit": "2aca80a3869d4fd654e79c4a1e20b5227fc2ba39", - "sha256": "0x0fmxgjs17hckx2a32y96nlqdcsx42wcw4lpyc6nk98ikraipgq" - } - }, - { "ename": "emacsql-mysql", "commit": "9cc47c05fb0d282531c9560252090586e9f6196e", "sha256": "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy", @@ -27946,8 +28122,8 @@ "deps": [ "emacsql" ], - "commit": "374726060d74df0e2bcb9d0355ff41e2c400ed30", - "sha256": "0z382qksrwhkv0ayjp8nays65c3xwd4kylj41k1pc3nnqg6b2k45" + "commit": "373975cbccf7776af771e23f86043b236a330702", + "sha256": "0p4aj1h0qp201vywdlsc8snga8b6bn1ndzrzsaw7rwpa3b6c4i4s" }, "stable": { "version": [ @@ -27976,8 +28152,8 @@ "deps": [ "emacsql" ], - "commit": "374726060d74df0e2bcb9d0355ff41e2c400ed30", - "sha256": "0z382qksrwhkv0ayjp8nays65c3xwd4kylj41k1pc3nnqg6b2k45" + "commit": "373975cbccf7776af771e23f86043b236a330702", + "sha256": "0p4aj1h0qp201vywdlsc8snga8b6bn1ndzrzsaw7rwpa3b6c4i4s" }, "stable": { "version": [ @@ -28006,8 +28182,8 @@ "deps": [ "emacsql" ], - "commit": "374726060d74df0e2bcb9d0355ff41e2c400ed30", - "sha256": "0z382qksrwhkv0ayjp8nays65c3xwd4kylj41k1pc3nnqg6b2k45" + "commit": "373975cbccf7776af771e23f86043b236a330702", + "sha256": "0p4aj1h0qp201vywdlsc8snga8b6bn1ndzrzsaw7rwpa3b6c4i4s" }, "stable": { "version": [ @@ -28023,6 +28199,45 @@ } }, { + "ename": "emacsql-sqlite-builtin", + "commit": "780e7b4449c54f6ff5716b4953c85accfb7f0ebd", + "sha256": "1a062am3ff11i8nh368m8yq8vwcgl9d7i4bcfilpx9zzm1car1va", + "fetcher": "github", + "repo": "emacscollective/emacsql-sqlite-builtin", + "unstable": { + "version": [ + 20220422, + 1605 + ], + "deps": [ + "emacsql", + "emacsql-sqlite" + ], + "commit": "3e820c66fdaa9937f9e612900954dcd6c7d01943", + "sha256": "1mhffs3lxw5q9gccrdpj5bdg2ks04hbp183gmdn1rl5y51x8xp96" + } + }, + { + "ename": "emacsql-sqlite-module", + "commit": "0efbc8e05348b2e87f9d1f08629e7a2389a089f4", + "sha256": "1p3jh49r7cmbc3r79ws3l44pxyrf9faywvgwhiakpa51295ilcqc", + "fetcher": "github", + "repo": "emacscollective/emacsql-sqlite-builtin", + "unstable": { + "version": [ + 20220422, + 1605 + ], + "deps": [ + "emacsql", + "emacsql-sqlite", + "sqlite3" + ], + "commit": "3e820c66fdaa9937f9e612900954dcd6c7d01943", + "sha256": "1mhffs3lxw5q9gccrdpj5bdg2ks04hbp183gmdn1rl5y51x8xp96" + } + }, + { "ename": "emacsql-sqlite3", "commit": "5a25cf38b4f39b1c4d259143f1586fdad605b101", "sha256": "06zm6vs6sry2lwksikxp0rjyvs1rgiqyapyw7m8hgy336h810v84", @@ -28156,11 +28371,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220326, - 56 + 20220509, + 2259 ], - "commit": "b80d96ce0ab79e73829322e46c6d7493eb2b8c34", - "sha256": "1jsynjl0y7w0jqxqlibg8m4rwzv9lxj443m6dlac6zncz8plnizp" + "commit": "81c7f751be1de33dee9f7523fd3429ee3fe9a0d1", + "sha256": "11yvhhq251qmbnljjcfxnc53dqa63jm6ximfd0618hcwcgxlkkdc" }, "stable": { "version": [ @@ -28179,15 +28394,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220321, - 239 + 20220507, + 143 ], "deps": [ "consult", "embark" ], - "commit": "b80d96ce0ab79e73829322e46c6d7493eb2b8c34", - "sha256": "1jsynjl0y7w0jqxqlibg8m4rwzv9lxj443m6dlac6zncz8plnizp" + "commit": "81c7f751be1de33dee9f7523fd3429ee3fe9a0d1", + "sha256": "11yvhhq251qmbnljjcfxnc53dqa63jm6ximfd0618hcwcgxlkkdc" }, "stable": { "version": [ @@ -28335,16 +28550,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20220315, - 1727 + 20220422, + 1318 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "dd1ee74db3325d6a27e14df7ae882b5cbd84989a", - "sha256": "0s50ap75wsjapxdby7x2gk85jnsr6aaf0l1vzpb6ax96ag92d4lm" + "commit": "22f3d9e5359c565b33f55715f90fbde35e4f675e", + "sha256": "17lkc5r0zg7374fv9fqmnpdwvcyjl6q61gnwrvj3wc7ng5njjihh" }, "stable": { "version": [ @@ -28627,8 +28842,8 @@ "emojify", "request" ], - "commit": "8ebfc21d243fc17faf074b36dbc4be6141139906", - "sha256": "1mdh1f3lbng0nbwih3haf7wj4x4mmgviziv5fwki449495mw041q" + "commit": "434ccc9df8eb884f248d5934e7d465348bb203a4", + "sha256": "07mbh3a34qcb1d37fvy3g5z3mc436lc5vlqqk46x7bjwdbkzlsfs" }, "stable": { "version": [ @@ -28836,11 +29051,11 @@ "repo": "zenspider/enhanced-ruby-mode", "unstable": { "version": [ - 20210120, - 201 + 20220426, + 1750 ], - "commit": "e960bf941d9fa9d92eabf7c03a8bbb51ba1ac453", - "sha256": "0qmklr7d6g98ijd4l4j65x7cx18aafngppvynr4jvlinzsnr263q" + "commit": "f240ac00ccbbd0916b5e3d272c0064a26f527ef8", + "sha256": "0xh0849sr87zbmf7pqgaix6rbwsmkwpw1vqcvl9mxjqlr2ay9y05" }, "stable": { "version": [ @@ -28947,8 +29162,8 @@ "inheritenv", "seq" ], - "commit": "57d78f0138d9c676dff182e713249ad055ccf85d", - "sha256": "12bs9ywyf30qrmhibbdvcf5i24mvq8l2j3y0fv32fb2ydk4lpcmw" + "commit": "4730b31ff1479b6d822ccc7517251dcb52de45b3", + "sha256": "0w2fnqqihiqkkqw1x1gghgd0644gf7r5wp12dr7h1ljhfcb4kz83" }, "stable": { "version": [ @@ -29085,14 +29300,15 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20220216, - 1916 + 20220510, + 2036 ], "deps": [ - "closql" + "closql", + "compat" ], - "commit": "475bfb19e293edcdbeb23d30b2e4954ca7ab8f39", - "sha256": "0f4p5xrlsfmsn61xvh3mx9y84bklsyjz6jgkdajiyd7wrmhlyjzf" + "commit": "4524f9a8f19717c4afb84a184db7841b4ffcbf56", + "sha256": "01j2190srr9mkc68f1l9rcpxvqadn4qprddamj351n97079jw4cs" }, "stable": { "version": [ @@ -29115,15 +29331,16 @@ "repo": "emacscollective/epkg-marginalia", "unstable": { "version": [ - 20220131, - 1328 + 20220511, + 1942 ], "deps": [ + "compat", "epkg", "marginalia" ], - "commit": "d41cfe1a00d01a45938d2af2fb311fdb17d3c381", - "sha256": "0i295rr9fslhxrqh8967whq1h903i3a45c4x6ycff1fhrxb87frf" + "commit": "ee784211346c7c374accec2bda78788cc68fa641", + "sha256": "0pl4qwh3fhrj306qrhkfgp8w3yv2hbz2y88gsx1ifsipq22n2343" }, "stable": { "version": [ @@ -29217,21 +29434,6 @@ } }, { - "ename": "eprime-mode", - "commit": "41405ce2b327350415db3c4f13266856909d0cf9", - "sha256": "0vhp6ccsxjxnka4gsicnf71d7qy9wsxh2adnvhxk2v4p99ifygsl", - "fetcher": "github", - "repo": "VioletHynes/eprime-mode", - "unstable": { - "version": [ - 20140513, - 1816 - ], - "commit": "17a481af26496be91c07139a9bfc05cfe722506f", - "sha256": "1wwg46xdb488wxvglwvsy08vznrnmdmmbcvm9vb60dy3gqjmz7cw" - } - }, - { "ename": "eproject", "commit": "d7e82668617a9b599f8994c720f3f123ba1e008a", "sha256": "0kpg4r57khbyinc73v9kj32b9m3b4nb5014r5fkl5mzzpzmd85b4", @@ -29257,14 +29459,14 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20210913, - 145 + 20220424, + 350 ], "deps": [ "dash" ], - "commit": "4d6ef75a4d91ded22caad220909518ccb67b7b87", - "sha256": "11xfr71y78idcn461p4pz7b0k01nhz15cyl97bjqq6ii5xhbhvdx" + "commit": "ea5c0570f58b8e62249e001ed434a1056a50abe7", + "sha256": "0l85xks1m8yprd5q84gp0ryaagjd74kwb40r0mwdly6y4dzi0kvr" } }, { @@ -29699,14 +29901,14 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20220223, - 1148 + 20220411, + 338 ], "deps": [ "cl-lib" ], - "commit": "757475874a840f99b20c56182c7199257b6ae477", - "sha256": "1ipwzl0l26g5qvc1sgmz2ra5vn1j3hl0mnkgzpa3j4p8gsmxdiqr" + "commit": "9cd89eef490f6c9f4af273bb3dd2c68d5ed2de61", + "sha256": "10p8pi5hlaka2pbrrzfcxjsrv142394k17z8hdx1fq0gvjcycrpl" }, "stable": { "version": [ @@ -29752,18 +29954,18 @@ 20200914, 644 ], - "commit": "724723ed0a6b179398f4105f5eb5ea088d1bac4a", - "sha256": "0qzg5qhf3p4ifspbz6l1yj4fl6sdgbi74kprql20sx9y58dyhamd" + "commit": "9a5f2b4a8cd14edbde9d16dcdfcb8db2a91be0d8", + "sha256": "1pn3w2prmz9ibhy5l22c6mmccr7lfy561gkd2s41hlcjsyd4ar00" }, "stable": { "version": [ 2, 6, 2, - 1 + 2 ], - "commit": "59c7944b1a2e8015e473eb1932353818614a1e5b", - "sha256": "0p6jh8hyyf7xg0sni2rchck2fd1wyr5v106dfxxm09krxxawh0nh" + "commit": "442c76badc353d1b621243c43293106f60f7d746", + "sha256": "0kskd56y71p4w1bgr15szbzjl05kfxpf1cs4bd9dnwdwfp5s0ygw" } }, { @@ -29777,18 +29979,18 @@ 20220215, 1844 ], - "commit": "510b025db164ec18e49117d070f4e08ebe8f4da1", - "sha256": "1wliqzp5nw07qxmy9024i2dmbidn9216niz09299q9z447raisp3" + "commit": "4bf325feb5885056ad3315d9a0316b652613b3d9", + "sha256": "0dwjafw8ab71bqvwpv49cwqarrcd5pa0wyh7yxjn3spnl6f80j1l" }, "stable": { "version": [ 25, 0, -1, - 2 + 3 ], - "commit": "85d0a8366e64f8272e332a63a2cba59afa3f7eb9", - "sha256": "0nln44fd5kxjsgr0k95xn46jshp035s66rna7gb0lsm2iggcfwy8" + "commit": "47f121af8ee55a0dbe2a8c9ab85031ba052bad6b", + "sha256": "1ir42hz81bzxn1shqq0gn824hxd6j774889vjy68psi95psfs8r2" } }, { @@ -30310,14 +30512,14 @@ "repo": "Phundrak/eshell-info-banner.el", "unstable": { "version": [ - 20220326, - 933 + 20220402, + 1721 ], "deps": [ "s" ], - "commit": "9c17e92f0229c9002e071842a88396c3f2439d72", - "sha256": "08kqqlvia3hzl9yq5yia92a27rk3fsahdizlf7rpywkmj5aix43l" + "commit": "53fc69b8712b9869cee49468a6e418d64d2c3ab9", + "sha256": "16ma3z7sxj95p3jfaszdvaj45rjkmb806mlm2vv5pgcbzqjfhrp6" }, "stable": { "version": [ @@ -30452,14 +30654,14 @@ "repo": "iostapyshyn/eshell-vterm", "unstable": { "version": [ - 20211024, - 1443 + 20220506, + 1212 ], "deps": [ "vterm" ], - "commit": "f2212dbfa51aa4b67efda55304b2b3811e8e0625", - "sha256": "02q1iyh77m7vg9cip7c9wzpiggnsbhhicfs5rqzpc5d7n70gbk2p" + "commit": "4e8589fcaf6243011a76b4816e7689d913927aab", + "sha256": "0hsby6ardi9g37agh181sgvsdvjmvi1n6jsqp34mwslwx7xxjvbv" } }, { @@ -30492,6 +30694,30 @@ } }, { + "ename": "eslint-disable-rule", + "commit": "1098ad81fe2478db807fb7860f32368bef26f576", + "sha256": "0659b6yqi5hyq6sbvx759axx0ngfw3zmar08l84vdzs564zkcjy7", + "fetcher": "github", + "repo": "DamienCassou/eslint-disable-rule", + "unstable": { + "version": [ + 20220328, + 354 + ], + "commit": "7d4cc05d336fbc465f91a87b38bf360efaf76fcf", + "sha256": "08428v3w80v16c8a57gd6abfz2jafvrh0sbscsxm07ykcsp7y2cf" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "7d4cc05d336fbc465f91a87b38bf360efaf76fcf", + "sha256": "08428v3w80v16c8a57gd6abfz2jafvrh0sbscsxm07ykcsp7y2cf" + } + }, + { "ename": "eslint-fix", "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", "sha256": "0rzdd5jnhp5cwldxnq50cfdvmwwljwq9wv2cj4281dc45vy9p5k1", @@ -30516,6 +30742,24 @@ } }, { + "ename": "eslint-rc", + "commit": "05462dc69319f57b3f0a3eb0ecb7d3d97978f364", + "sha256": "1pn1mwlkqnb4cfb07wvqc39v2071sp0vhi275rrkhxip3gib1sgd", + "fetcher": "github", + "repo": "jjuliano/eslint-rc-emacs", + "unstable": { + "version": [ + 20220328, + 800 + ], + "deps": [ + "eslint-fix" + ], + "commit": "eb6f3e715792952bc957d5dc8ab1a607f3dbbd55", + "sha256": "1bdv3lbcq8wppcn8dcbp53zsxrz3qaz72iazpg5dbdq047rm6s1x" + } + }, + { "ename": "eslintd-fix", "commit": "c72d2b3ee9b8066d51d09e165e58e9846ca879cc", "sha256": "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v", @@ -30918,15 +31162,15 @@ "repo": "tali713/esxml", "unstable": { "version": [ - 20211122, - 1657 + 20220506, + 759 ], "deps": [ "cl-lib", "kv" ], - "commit": "f88a323bd15ad7bd94eda684e1a36525ba81a089", - "sha256": "1sx8mjk0pfbl664brfwmswn6q1z0iyz23d1457z1imh98b1g91xy" + "commit": "7ac1fec0e45f12836b301fd9b8e7297434db2f70", + "sha256": "040a9i202pxjxj34c6f49fj6rg70xha2ns6047vj3gcsa72ylm4n" }, "stable": { "version": [ @@ -31276,6 +31520,29 @@ } }, { + "ename": "everlasting-scratch", + "commit": "7d14ddda9729eec229a72a8827d0f0a5be779db7", + "sha256": "0ikpp9cvi4xh2bqlza8p2bnw26mv0km33ywp0l3a6n35n1f068v6", + "fetcher": "github", + "repo": "beacoder/everlasting-scratch", + "unstable": { + "version": [ + 20220412, + 921 + ], + "commit": "8706c55f3b7c267c15b8f10170ecec9998b3cc3d", + "sha256": "0rgmfwdjv3i9v67f22k03x2rfgx12yzkjbbk4307s93qdpqqha78" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "509cf24422d4047b110aac8ed077b52a8011cfe7", + "sha256": "04snf28gk7lc9pd5ilv9w1xjm14fi3ajp6dwaz4bbq8haacm3hpz" + } + }, + { "ename": "evil", "commit": "69567536a89f0294726ae58f748386a8d336c55e", "sha256": "0nbfhynlv213rjl6jh4lji1q94s99q4iv18mnd3x23r91sx7ssm3", @@ -31283,29 +31550,28 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220309, - 2216 + 20220510, + 2302 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "3e41a823334abbba9cf16e482855699054d9dfe0", - "sha256": "1ir4ybrnylx9slyb7znrshfjf0gw1xi7f9nf6bryidqxspsn2ri5" + "commit": "5a9cfbc443219c4063b17853b7828ec0a00d2736", + "sha256": "1vr46xn72l5m0r9v3d1xaz86q607ga5adxlqdh7mlymw15w004ha" }, "stable": { "version": [ 1, 14, - 0 + 2 ], "deps": [ "cl-lib", - "goto-chg", - "undo-tree" + "goto-chg" ], - "commit": "4dc63903d9688e2ce838a220b0e24d8f14a64c12", - "sha256": "17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p" + "commit": "162a94cbce4f2c09fa7dd6bd8ca56080cb0ab63b", + "sha256": "1mhm1hd6gzxc2vvihh1w1j8f30xp0ssqcxnp8fx22niz04fk5df8" } }, { @@ -31485,15 +31751,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220314, - 1559 + 20220505, + 619 ], "deps": [ "annalist", "evil" ], - "commit": "e55718869252a8cd46e61e350bb514194a37f2f8", - "sha256": "0inq608gk9kn3383qni7ll93qhw3qqy7yi22ympv0y3279n8725b" + "commit": "9707efcae4fc76fa204b1c29565aae35b99b865a", + "sha256": "0iyhxmaiqk0c72lmggv9jppxmlkb0vd9y0zqxgzjnznz9p08l3vz" }, "stable": { "version": [ @@ -32051,26 +32317,26 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20210923, - 931 + 20220513, + 230 ], "deps": [ "evil" ], - "commit": "14c7c7ed0a1ca8d3407688e0150f794db9389997", - "sha256": "1yhn38hh8rqi60h3pfqb18fvdgxks91v561dbfrbsnwnlw8babxn" + "commit": "b47931128c6b7924ea432895f469769986de410d", + "sha256": "1zjdwqqrc2znk2y8f424ygnkxsvx0hq46gicjb4nllbvvvbx6kyb" }, "stable": { "version": [ 2, 4, - 1 + 4 ], "deps": [ "evil" ], - "commit": "9b228b097a863e9deef8033b11747597e055674b", - "sha256": "0cxv1bmbnir59k778dip5mkjyqhbh10pk9b4ayvwpgiz25dlp4ss" + "commit": "b314e816bacfc01bb7df9b19a06b18638af5cdbe", + "sha256": "01r85bnmqbmvwlhv5ihglp0dhws1g2wsw2vy0vsw5mi5mmx2xsqr" } }, { @@ -32186,20 +32452,20 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20220106, - 1224 + 20220414, + 1201 ], - "commit": "42ba1a473b4f1df061baddd2f8b812a2f35e366e", - "sha256": "1y6qy4gv7k8aghi5snvh248nxpgxv0daryd2794n6gfb4ciwycrr" + "commit": "95ed1ad2448e7f49f1ee417061b61edbb69a0749", + "sha256": "0hypgk03yksvgakx24mrz9nrx2z0d691ls80by2fw96788d68k8x" }, "stable": { "version": [ 3, 5, - 6 + 7 ], - "commit": "42ba1a473b4f1df061baddd2f8b812a2f35e366e", - "sha256": "1y6qy4gv7k8aghi5snvh248nxpgxv0daryd2794n6gfb4ciwycrr" + "commit": "29ced6fda6a76771a8a054ef55c13a1330793d4d", + "sha256": "0xnm8i23c2p3mdf4xxjk00766ygvysk7c8iib2jkah5pfg6jc9vb" } }, { @@ -32620,15 +32886,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20211114, - 1647 + 20220428, + 1432 ], "deps": [ "cl-lib", "evil" ], - "commit": "a79177df406a79b4ffa25743c752f21363bba1cc", - "sha256": "0pz2s0g0859zhyryvn1glngw1aq7a04x9rydl1l89h50hf5avmvj" + "commit": "c07788c35cf8cd8e652a494322fdc0643e30a89f", + "sha256": "06zhpsmn67f2n0f2yqzcv978l10nkvdr25kkl3cwkhhj9a56x62g" }, "stable": { "version": [ @@ -32714,14 +32980,14 @@ "repo": "emacs-evil/evil-surround", "unstable": { "version": [ - 20210615, - 2119 + 20220504, + 802 ], "deps": [ "evil" ], - "commit": "282a975bda83310d20a2c536ac3cf95d2bf188a5", - "sha256": "0f9y5dwjkjv768s63bypp6nb51kklhkq58ixgzfs59r423y8l1nl" + "commit": "c9e1449bf3f740b5e9b99e7820df4eca7fc7cf02", + "sha256": "1ghc10rsrfvmd7m5qf7695gz241v9m5c2fg2mflwy8pw0h2l9nki" }, "stable": { "version": [ @@ -32787,14 +33053,14 @@ "repo": "7696122/evil-terminal-cursor-changer", "unstable": { "version": [ - 20211225, - 600 + 20220422, + 255 ], "deps": [ "evil" ], - "commit": "3d7db4d6b4a3121ffd7e505b12ea94fcdb8c5df8", - "sha256": "01haj9b1vhgmnc12csdfsw0lwv2kvgka9k0smlcc6rr840aapi72" + "commit": "69d562932f9ab9869ab1ed923e9789cbfa0ff14c", + "sha256": "14d9hyv2hhv0vzvmq5m1d59imzxmlm1qc484kn3sbc99553q0s1x" } }, { @@ -32805,26 +33071,26 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20201008, - 1515 + 20220425, + 2132 ], "deps": [ "evil" ], - "commit": "3e41a823334abbba9cf16e482855699054d9dfe0", - "sha256": "1ir4ybrnylx9slyb7znrshfjf0gw1xi7f9nf6bryidqxspsn2ri5" + "commit": "5a9cfbc443219c4063b17853b7828ec0a00d2736", + "sha256": "1vr46xn72l5m0r9v3d1xaz86q607ga5adxlqdh7mlymw15w004ha" }, "stable": { "version": [ 1, 14, - 0 + 2 ], "deps": [ "evil" ], - "commit": "4dc63903d9688e2ce838a220b0e24d8f14a64c12", - "sha256": "17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p" + "commit": "162a94cbce4f2c09fa7dd6bd8ca56080cb0ab63b", + "sha256": "1mhm1hd6gzxc2vvihh1w1j8f30xp0ssqcxnp8fx22niz04fk5df8" } }, { @@ -32835,15 +33101,15 @@ "repo": "iyefrat/evil-tex", "unstable": { "version": [ - 20211208, - 1631 + 20220415, + 842 ], "deps": [ "auctex", "evil" ], - "commit": "0fa85c3fc88d96621002b5a1b79efcc06776642f", - "sha256": "0r38d1z7xdmiwxvpkzfbisd8scjj5i4v1y629j5n73f2xapk83df" + "commit": "26035ec9a09f8b38ce0d495ff788e83ec8b195d5", + "sha256": "0agaibr21ncrv7zv1x24za2v4x35ihp0jv33z7zmgixqmlq074i5" }, "stable": { "version": [ @@ -33014,15 +33280,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20220325, - 1401 + 20220423, + 947 ], "deps": [ "evil", "tree-sitter" ], - "commit": "d488792ee1ceadf3ae4a8b7b93ca3a88d36111cc", - "sha256": "0mwxv0al1i8vplsh2bl8y5vl9zga6zlz6f8mjbbm6gvcnzpbz5ff" + "commit": "bfdef5a292f7dde36967bb86eb2f7009b03631b1", + "sha256": "18nxwn051rq2r4jhc21hy2lmla7aghc2l9cvj7ib97q2l4f0jv64" } }, { @@ -33051,8 +33317,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20220319, - 1652 + 20220425, + 2355 ], "deps": [ "avy", @@ -33061,8 +33327,8 @@ "tree-edit", "tree-sitter" ], - "commit": "63816d614e6e2112c2f26e65afd7440f022ba2ad", - "sha256": "1c0s9hsm5wisikgxzskmnkin0r2vs9yc5yhgkjrsrvaiiv05g9ip" + "commit": "eafee31ca4f532a9dbee326d3ec3bdd1e997223b", + "sha256": "1p8ghpj83smh1bh38ydhlpyaxfdx0f83wp4sdgzv3zxdfydmb4n9" } }, { @@ -33257,6 +33523,21 @@ } }, { + "ename": "evm-mode", + "commit": "6318c712774eff8dab62bcf13f9c70290d5d48ec", + "sha256": "0b15hf9k6p2f8k233q04p6vqicdz7q8838pxihsiklzbngr5qkn5", + "fetcher": "github", + "repo": "taquangtrung/emacs-evm-mode", + "unstable": { + "version": [ + 20220503, + 1106 + ], + "commit": "2b326751c9421842521e851d969b9c269c79f8b3", + "sha256": "1igbahaazscn80ny9ix3kvznbz6rl5b59a0jjzz1zcqkwspc5dgc" + } + }, + { "ename": "ewal", "commit": "b95fa8694bd49595da9fb56454e6539e76feff97", "sha256": "1gwq8n64v173g2jp2i23qm9lzbhjikr6y0j6nry720sa7j0y4pm2", @@ -33465,8 +33746,8 @@ "deps": [ "cl-lib" ], - "commit": "3a8d97c096c2c5714b667130fd8a80d5622ee067", - "sha256": "1fdfg9zblk82546fhmha84lz45g4nrgmqqq39jsr601axalfkl7q" + "commit": "6336db9be13d46e2d4bc3b50bc37a3fbf30fdc9e", + "sha256": "17nw4rim92mf5yvfgjwryx2r8cijkdrqxsvsjcyhhkcycylhkyjv" }, "stable": { "version": [ @@ -33766,11 +34047,11 @@ "repo": "agzam/exwm-edit", "unstable": { "version": [ - 20200728, - 8 + 20220414, + 106 ], - "commit": "2fd9426922c8394ec8d21c50dcc20b7d03af21e4", - "sha256": "1gwqwj50ch8iib5yqbyvski7vxiwid6s49lj2xcy5kksnx1a2410" + "commit": "b5b7e950f57e30befd68d51df34540b70e6ac28f", + "sha256": "11yjvry950xiq91rzbx9jsa8hx3lnabhkqzgiqlcgx36q6diw6fh" } }, { @@ -34035,15 +34316,15 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20210624, - 1103 + 20220511, + 1502 ], "deps": [ "dash", "s" ], - "commit": "50af874cd19042f17c8686813d52569b1025c76a", - "sha256": "0k6qp5vqyiql9f6i6z95iskjpv9wn6sd66wnf2x0jxbws4r2bjxy" + "commit": "ad2c7dd369a15988f1c6298b5edb901ce2e1f446", + "sha256": "0rjggym7a7sb12bspdydk2vx12hqjqv0qmkpfi0z6s7mcnpl7fhq" }, "stable": { "version": [ @@ -34206,19 +34487,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20220318, - 2213 + 20220512, + 21 ], - "commit": "c58c162a2d1284033497feff4bfa8c3210685d9d", - "sha256": "0v5xn0zpc2khy97pbhvhja724hfc9y3rm9fmqf0xzpm6czbgi4xr" + "commit": "33b3344848ae17d45c19d222e53b368ea6867e7e", + "sha256": "1yi2xzp1a945p11h6ac5ci0n56ffd40sm3ja6i4hrw4dd41axgyg" }, "stable": { "version": [ 3, - 1 + 2 ], - "commit": "1385058dfe1db579cc5e08bd81ad9b15282f0650", - "sha256": "1ph7myinasxbamr7vpiijihqniq06ng4h58jgh04xb7vvi4b07nx" + "commit": "fffae9ada9057e81812f90edbd589f4a4f346768", + "sha256": "1rcjawwjk0jkihv26wrhhp0ncnj9qq1q16gkb9c8ys1qvaqyaiah" } }, { @@ -34638,11 +34919,11 @@ "repo": "michaelklishin/cucumber.el", "unstable": { "version": [ - 20200815, - 1617 + 20220418, + 848 ], - "commit": "8e1464113b489b54067294cd988ff6a11a423fdb", - "sha256": "1lmfksx49ig4b7nqg0mmaalz08b280iaqgsc0x9i471m9kvbisp7" + "commit": "e204d9e204b767cf95d6a051ff283f05dc51e9d3", + "sha256": "0zg4nkwfwmil2a3n2gnrwsj14dkwb1hm1mbcgcrg2dgvh45idns6" }, "stable": { "version": [ @@ -34706,11 +34987,11 @@ "url": "https://git.sr.ht/~technomancy/fennel-mode", "unstable": { "version": [ - 20220309, - 445 + 20220510, + 748 ], - "commit": "c55eecd7c731a18c40be98684370c4c6903d243d", - "sha256": "1cg21a2p9pqx9dif35k0p393ckz8f433qznwxgircajjmz65b7b2" + "commit": "0e9ed013a163d91993a2883ad5c37c02694c2b92", + "sha256": "0rdrap1kyj0csaa25d46xvb5hgbwlcqvmwrq6yicmbsnpdrwpwy7" }, "stable": { "version": [ @@ -34719,7 +35000,7 @@ 1 ], "commit": "54ed0792d0ac43a2d5db39741cf070c627368419", - "sha256": "1bfd983zdhq097bb101k8p7x4jkmkgaxfj7s7aiyf4s3zq84v6xy" + "sha256": "0dwas3ivhxdyw6njkcadc8c17cirq325cmby04qls8zkmrvlil1w" } }, { @@ -34752,8 +35033,8 @@ "f", "s" ], - "commit": "dd51ad1a5a0d85ab3c71e9bd31499d50ec8b1f74", - "sha256": "1qvi1z6w8j94pp71gwvjd8h14m6fnf0wg824iwk7pvfyhfmi3p91" + "commit": "d81983cf389dd5d2ec6cf9d702ff28ffd1be676b", + "sha256": "109d5sz2prlih28nbzaq3anyr7kyjm9cr7krndgsf7n68w6dz5b4" }, "stable": { "version": [ @@ -34926,8 +35207,8 @@ 20210707, 354 ], - "commit": "466b2314f48aee2bab17810eb4fd7f9b061c9a46", - "sha256": "1dmdmgmb7gw2p62p1i1ii1b4b6wvh0kg1vvvlfpx5jmv2ix01drc" + "commit": "02ab2b3854df5515245ca2a924f89bf830f9c4de", + "sha256": "1jp3jcr9ni3rslhjv3wg7gqjg2iihdi3six4b65chcxryhkd21jd" }, "stable": { "version": [ @@ -34962,11 +35243,11 @@ "repo": "duckwork/filldent.el", "unstable": { "version": [ - 20220103, - 10 + 20220423, + 2216 ], - "commit": "5969bdf50a1fcf0bd3a1507782152effb5be85e7", - "sha256": "05g8jwd7qq3g6viayhr7szjb5vfj53ynj2krxnhl7cgqbpfbaq4v" + "commit": "2f32e0cf5e27c613f962fa41bf3427bbdc04e6c0", + "sha256": "02hjn163f8pvs3p4ka879fizlivaxhvj1lzkma5fgrrwzhhg5nh8" }, "stable": { "version": [ @@ -35073,20 +35354,20 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20220125, - 726 + 20220430, + 107 ], - "commit": "204b3d489a606c6e7b83518e46be3bbcef1bcb3d", - "sha256": "0h22rh88i11sz0kh1pq9fc9w58lja00xrany6mcy1hr6l0wy2g5h" + "commit": "116b976b526680c038109882d5cd2d9f218b62a5", + "sha256": "0sq8fyq19jw1hm0m6hiqnvzzvx0c3xigfx7x6i40ib5hnfjlqs0a" }, "stable": { "version": [ 6, - 1, - 2 + 2, + 0 ], - "commit": "52274e6001545bdf45c6477ba21bfaa8eca04755", - "sha256": "0v5c9cnwlbw6jj371swhd5bs8sb2zf6g5yjvhdsfnxly7g3dg636" + "commit": "116b976b526680c038109882d5cd2d9f218b62a5", + "sha256": "0sq8fyq19jw1hm0m6hiqnvzzvx0c3xigfx7x6i40ib5hnfjlqs0a" } }, { @@ -35195,8 +35476,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20220307, - 1527 + 20220427, + 1932 ], "deps": [ "async", @@ -35207,13 +35488,13 @@ "s", "transient" ], - "commit": "be1ae9bcb1b85d93f138c510dbc16c28af228916", - "sha256": "0jslc8j153sglagfjq5vrcnhgzjjxkf763h3md9735z231svvvk6" + "commit": "a0fe025086046aecf5490c993afe9e716324f7e5", + "sha256": "0g5pv08mv4c9jscsp1cyldwi3xdyppys6m1bsq293v5kk38agmdf" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ @@ -35225,8 +35506,8 @@ "s", "transient" ], - "commit": "b7cbb5fa672031cbc9d7de18797ecdd2df8e224f", - "sha256": "00rimqh2hmz9hzqq5piq0bn60rh820ym18r7irh6dv4vdk06zww8" + "commit": "a0fe025086046aecf5490c993afe9e716324f7e5", + "sha256": "0g5pv08mv4c9jscsp1cyldwi3xdyppys6m1bsq293v5kk38agmdf" } }, { @@ -35375,11 +35656,11 @@ "repo": "wwwjfy/emacs-fish", "unstable": { "version": [ - 20210215, - 1114 + 20220505, + 1111 ], - "commit": "a7c953b1491ac3a3e00a7b560f2c9f46b3cb5c04", - "sha256": "1spxxkji9xa930sbwvzyjm8jrqk9ra0xqhivw7zd12a4c56nhna9" + "commit": "d04478c0aba018cb789d77d591bfe315cb25132a", + "sha256": "1dkimwhf7l6bcv6wyh0x4z1zp28kcdakzpz20q279amghif4dymd" }, "stable": { "version": [ @@ -35768,15 +36049,15 @@ "repo": "wanderlust/flim", "unstable": { "version": [ - 20210529, - 1253 + 20220503, + 1442 ], "deps": [ "apel", "oauth2" ], - "commit": "02735dede6603987e8309a76d0bc7a9ff9a5a227", - "sha256": "1jy2wsm1xc6iaxa449wwz14ky4yiaxd8g05ry59r9pf60cpxxy1h" + "commit": "289e5bbd66f6f14306a6e0b922ee8f26267e2470", + "sha256": "00w0381nngj497jf240zrh26hhanm6fn9xl74k1f94crsfva3ccq" } }, { @@ -35885,32 +36166,32 @@ }, { "ename": "flower", - "commit": "c8a731715d360aea9af2b898242fd4eee5419d14", - "sha256": "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd", + "commit": "4f045c15da285bbc438b581489ca0e2a4dbd5071", + "sha256": "1ah2l1y8j1cvjqvd2mz82y4s43v4j54m24v2g0icnr3cgvj5wphk", "fetcher": "github", - "repo": "PositiveTechnologies/flower", + "repo": "FlowerAutomation/flower", "unstable": { "version": [ - 20201022, - 1904 + 20220416, + 1744 ], "deps": [ "clomacs" ], - "commit": "0d5dd8b9b844adab1a1b7a9641daa9e98918712c", - "sha256": "0d2vl8lclwcn03p4ch0alb5ib0hbjp1ry5g3mkchd0pzwx6wwsrz" + "commit": "047846409867b2dd0ba4e2047a414b498680cd9c", + "sha256": "0bbmyd03rhpkifgjk60pfg0knqh2d7nl3qfi0rzqk44f2f556j89" }, "stable": { "version": [ 0, 4, - 6 + 7 ], "deps": [ "clomacs" ], - "commit": "6ef1affa2d7090714ccc4494823de28cfc11da35", - "sha256": "1dp3g52j1i49bv802g27b7yszpxz0i28i4j74qp39qlld3k0gys0" + "commit": "0d5dd8b9b844adab1a1b7a9641daa9e98918712c", + "sha256": "0d2vl8lclwcn03p4ch0alb5ib0hbjp1ry5g3mkchd0pzwx6wwsrz" } }, { @@ -35936,11 +36217,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20220220, - 1423 + 20220502, + 50 ], - "commit": "08138f8c95488aaf315a1f5d52c33deb8d28672b", - "sha256": "0h4r6m9yi5pvqlc4a3m2kc8jl1ywp4vv8bgmnkzy1aa7i8lb94c3" + "commit": "e49cbcb70235fa39a7d243521e03ad874451a39a", + "sha256": "1hjfkcdi99yfld9jakhhrncpm2yvg03xz35dngc6nn23dkwdpidm" } }, { @@ -35951,15 +36232,15 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20220213, - 1335 + 20220502, + 50 ], "deps": [ "flutter", "flycheck" ], - "commit": "08138f8c95488aaf315a1f5d52c33deb8d28672b", - "sha256": "0h4r6m9yi5pvqlc4a3m2kc8jl1ywp4vv8bgmnkzy1aa7i8lb94c3" + "commit": "e49cbcb70235fa39a7d243521e03ad874451a39a", + "sha256": "1hjfkcdi99yfld9jakhhrncpm2yvg03xz35dngc6nn23dkwdpidm" } }, { @@ -36069,8 +36350,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20220314, - 27 + 20220504, + 830 ], "deps": [ "dash", @@ -36078,12 +36359,12 @@ "pkg-info", "seq" ], - "commit": "278d0810f05eb03600d835c2bdd67d6b55a58034", - "sha256": "1c722aapkqbkxqchpchd2id9kz4hv2dckyl851x4na3yd7k0dzky" + "commit": "1d7c1b20782ccbaa6f97e37f5e1d0cee3d5eda8a", + "sha256": "01hr9xpjyws32aap2jlyncbgl1rfig8ylspln01yxf1lljysicc2" }, "stable": { "version": [ - 31 + 32 ], "deps": [ "dash", @@ -36091,8 +36372,8 @@ "pkg-info", "seq" ], - "commit": "401b115d10e202a1b31f57340438420081af21ce", - "sha256": "141i6wzqlb0dslmca6930cal7q4y5wbwzmxrpjk3hgm6nxz483p8" + "commit": "3b5b4248074f016922c2674789d4a242528cf4c7", + "sha256": "0dx6wqxz1yfp4shas4yn6abqc8bz21ks3glcyzznm3xspjdaq21s" } }, { @@ -36163,14 +36444,14 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20220128, - 1518 + 20220411, + 826 ], "deps": [ "flycheck" ], - "commit": "ffe905560bb917ae4bbbbb8ad2d7e2c70664225a", - "sha256": "1rk5vlw8c2d0jycp1i7r030gldwg0fikj23fj7z3sw5x254p7waq" + "commit": "dcf7e6543e4d94d58375e00e4a10db615ef06941", + "sha256": "05fvfjsqvli3v809m0jdyh7970ldqdjv8x5bk1vr7a2rawk96ns9" } }, { @@ -36410,8 +36691,8 @@ "deps": [ "flycheck" ], - "commit": "d8a6ee9a16aa24b5be01f1edf9843d41bdc75555", - "sha256": "010gzxwvr2p2wv358r76ajkn48ilgmkmv7z6bckqbap0cjhrqq43" + "commit": "35daaccc75b0367844b249a8cb05bf73bcebd52a", + "sha256": "0id3jp0d2bkrk17l6svj5c518yp6ndlqg7py962qdrvzz82004j7" }, "stable": { "version": [ @@ -36995,8 +37276,8 @@ "deps": [ "flycheck" ], - "commit": "6b76fa9c43834fabe501c7ab1816797af4e4a7d1", - "sha256": "1l2lv9n159c04rk3z044ib5w1kpgld6j1i63106bmr3za3kkkqv6" + "commit": "c52ba814f299f62a2a339bae679f3d6d04566854", + "sha256": "11l69nj1f61lvw4arn9k0g9n5pczypn15qq4c02x1kljjlx0h1zs" }, "stable": { "version": [ @@ -37074,8 +37355,8 @@ "grammarly", "s" ], - "commit": "2b71f7708798aba0c766768eeb161bd2696d663d", - "sha256": "0vg9gpa4sifzdv6z5ax3cqgmqa1xzaq4g5fqpswsyr55jaxpi5r7" + "commit": "abc66e71d542f65a90c394058cdd3a7b2002c6a6", + "sha256": "0irp6cpi9qy80wssrncdlxjr2612l2mnprrfjjm5hjggflp5wygg" }, "stable": { "version": [ @@ -37130,8 +37411,8 @@ "repo": "flycheck/flycheck-haskell", "unstable": { "version": [ - 20211223, - 104 + 20220426, + 2358 ], "deps": [ "dash", @@ -37140,8 +37421,8 @@ "let-alist", "seq" ], - "commit": "8110ef5a1953594d065b67df25d5f0c05c711df4", - "sha256": "1qdgcykn2rdf9jj9pzd0zyk7pdcf9lr942hr6w3kmkc299qiajf8" + "commit": "d92dea78fb8638f7c27a3eb925d84c669fb257dd", + "sha256": "0sv8k40h4qxlfwz2g8qzrri5vwwan5aadk9snaif10ix84zyfzbn" }, "stable": { "version": [ @@ -37494,14 +37775,14 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20220228, - 737 + 20220402, + 1703 ], "deps": [ "flycheck" ], - "commit": "018b4e12b9b5e80e0169ce044fb2a898a747bd1f", - "sha256": "0v8wf6jax2gzqrsj8lijybc47bkz665mbw87a73iz6dcmlyrxsmy" + "commit": "63674d8b928377d763df40317e15f4ca257f77d6", + "sha256": "14fjv2wckymhfw0sm89bkbn6lvmcxsivv5m1dva0wr5j0gppaj47" }, "stable": { "version": [ @@ -37777,8 +38058,8 @@ "flycheck", "package-lint" ], - "commit": "ecd03f83790611888d693c684d719e033f69cb40", - "sha256": "00py39n1383761wq6wp194pvyk94ydqdbxj9kl64g9jnipkp7849" + "commit": "615c1ed8c6fb7c73abec6aaa73d3fef498d231bc", + "sha256": "1qlsnqw88qalnh3sa0mzjkf8nfbyk6cdy7xmqiwdshym878qj4q0" }, "stable": { "version": [ @@ -38201,14 +38482,14 @@ "repo": "Raku/flycheck-raku", "unstable": { "version": [ - 20210814, - 903 + 20220420, + 732 ], "deps": [ "flycheck" ], - "commit": "50ac228e658a7f86efc298ee3ebd0b9706f083d0", - "sha256": "18wyd7w26wkdpvr76rhblh368dqly7dldkcd71ddjkdi10zas493" + "commit": "4da1970a75396aff1957b07f7579c1de6b817e6b", + "sha256": "1dwi6zz4jk807r4vx26bldzh7zhk5gb2p6045ss5sgjcirsllvn2" } }, { @@ -38226,8 +38507,8 @@ "flycheck", "relint" ], - "commit": "4d112871b82d5ea6d0d3e4aaacc55a45536707b7", - "sha256": "1plqica209q1x8kzyy4iz97bvd8vqxgv1l00mlf946q201ps7yb1" + "commit": "c66d0c8d2e3a8abb6a3dfda597801e460b2eeb6f", + "sha256": "0ccvpj6bjjbski4kycdy97vhjxfz3wy4vsf62a3prygd1vjyplz5" }, "stable": { "version": [ @@ -38709,11 +38990,11 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20220128, - 1518 + 20220411, + 826 ], - "commit": "ffe905560bb917ae4bbbbb8ad2d7e2c70664225a", - "sha256": "1rk5vlw8c2d0jycp1i7r030gldwg0fikj23fj7z3sw5x254p7waq" + "commit": "dcf7e6543e4d94d58375e00e4a10db615ef06941", + "sha256": "05fvfjsqvli3v809m0jdyh7970ldqdjv8x5bk1vr7a2rawk96ns9" } }, { @@ -38746,6 +39027,25 @@ } }, { + "ename": "flymake-collection", + "commit": "125055719b7be14d8fd808ea48714108bd02d9e5", + "sha256": "1yixy4gx160s006as8bm95gkcw8z171xj65alrv8nymjb5gy8nh7", + "fetcher": "github", + "repo": "mohkale/flymake-collection", + "unstable": { + "version": [ + 20220410, + 1343 + ], + "deps": [ + "flymake", + "let-alist" + ], + "commit": "8f36fed9eef834cf94931fc8b813f9ac8db6d2a4", + "sha256": "0586g7qdcp2bh51ll1sv73ji6vh8l3xxsndpkqxgfkyckmc3iyhh" + } + }, + { "ename": "flymake-css", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5", @@ -38782,14 +39082,14 @@ "repo": "flymake/emacs-flymake-cursor", "unstable": { "version": [ - 20210126, - 1733 + 20220506, + 1458 ], "deps": [ "flymake" ], - "commit": "097c8754367f68ea84eac9f5f31664cecb95eeb9", - "sha256": "1nw2lib8c919bwiljqbj2b098frw6ciamyd66ms131pzm633iplc" + "commit": "6ce75c17bc02ae9755deda50d5ac366785c94091", + "sha256": "0nbggmz3b6r2rixbn20r58dca05h45lsdyfbbw74syd4fv5g8s9c" }, "stable": { "version": [ @@ -38910,8 +39210,8 @@ "deps": [ "flycheck" ], - "commit": "850a3f2f6908db5d4a3739e385b2c9fb3ad488f9", - "sha256": "1axr0wgmjr58fhhl2zwh5l4wd9x8h66rv2917ynxwq61p955wi87" + "commit": "9040be3763b8f9952dccd9a04be25ac20a0f8745", + "sha256": "1003mxx8xl62z4srbdd9sz8f2l3g6h6rs29nvx99gpz4alh0ycd2" } }, { @@ -39016,8 +39316,8 @@ "grammarly", "s" ], - "commit": "bb8bae85b0cd5a3d4603bbb35f9237bcd83d250f", - "sha256": "1a2mzmgp6sb0wylcasg764rczlqc0nj09wbxdfmdjghdcl679pr1" + "commit": "74ab6bb817205dbf1cd77a161be76904c1e17b75", + "sha256": "0ngs38h3zcg2znqbfy0m886g4spn39bnch4s1zcl8f8zcn3s24mg" }, "stable": { "version": [ @@ -39033,6 +39333,21 @@ } }, { + "ename": "flymake-hadolint", + "commit": "0d0ffd0d2b8c8b0557d5664b471c6050eeffa0fc", + "sha256": "16xn6i77r8c0m7v2m8n277gvifvvvn5mhpm06jgzhkgkkzdxn5g8", + "fetcher": "github", + "repo": "buzztaiki/flymake-hadolint", + "unstable": { + "version": [ + 20220328, + 823 + ], + "commit": "82a6df7f6cc95e1ab95c5d28f2edcd8c1d4c7382", + "sha256": "07fanb8ifdpwfnf1rr1h4v2dihmdnnxsikb9s9qxmfbpf0rmjnf9" + } + }, + { "ename": "flymake-haml", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1", @@ -39257,14 +39572,14 @@ "repo": "emacs-languagetool/flymake-languagetool", "unstable": { "version": [ - 20211227, - 1908 + 20220512, + 2355 ], "deps": [ "s" ], - "commit": "330a277f6469f3382fb758bd19117aa4ca5aabf9", - "sha256": "1sgcws103qbj259zi0qrpn5cgjiab36sl2w2nnfs96bky228byc9" + "commit": "c24339b50a4b42cc2bd7e8e167c77a75d8227774", + "sha256": "1lvpyn9s3x9wyhdsa9krra03appn8p0dv8086hixpmqm10d21wl1" }, "stable": { "version": [ @@ -39380,8 +39695,8 @@ "deps": [ "flymake" ], - "commit": "dba854423933224f0d983bde8981f7c6b62a7865", - "sha256": "08j9zcj42zxwdlycqcivhh58rr1abafb66vbgcik9h2givnkx2ys" + "commit": "06d819c6d1292f8c87ebc0681c83c9fb48620bbe", + "sha256": "1blzcr2c176wlqv8fr4mna0qqm20cd77s8b4gz21jzrq44d7qqf8" }, "stable": { "version": [ @@ -39469,8 +39784,8 @@ "deps": [ "flymake-easy" ], - "commit": "8f6222324e4f205312b51c8a862b24562db0e02e", - "sha256": "1cpfif8v9qrcfiklfy0rvj31f8ixj6npydzkqsn2xjxd8j8266zb" + "commit": "10d3e7e1c31c104e3da694b2b52cd34df61efa5e", + "sha256": "1gzg5xz2vchz6kq7hyc1pvd250kfnwkpy88gmh857v3mnzrq71dg" }, "stable": { "version": [ @@ -39601,34 +39916,35 @@ } }, { - "ename": "flymake-rest", - "commit": "810164452024d14dc4d31c7ed7a0ca4ca3f4eef1", - "sha256": "1bicrsmcdfy6fbpc59fv283n6vki4pcqaklwvalrzj8yylc2aifz", + "ename": "flymake-rakudo", + "commit": "deae8f07ccee183288487c3fd3580705feae0fae", + "sha256": "15gsmwai127i6zrn5iqvd927qlij63gri6rdnws77h5320gg42x1", "fetcher": "github", - "repo": "mohkale/flymake-rest", + "repo": "Raku/flymake-rakudo", "unstable": { "version": [ - 20220313, - 1311 + 20220424, + 637 ], "deps": [ - "flymake", + "flymake-collection", "let-alist" ], - "commit": "6c0f39ae1e8b476b195adfe477b40cf6c4a162b6", - "sha256": "1qmzf49ags9ymdfi7q4mk4amp522ssq2hnrknkrx1sj0lfxkkypw" + "commit": "f8e3d03a7207876cd891174702efd572d74f2e49", + "sha256": "1j6v1hdwp1jidx9i28gfkzp9hllzkw3r5qd3ggrb96lbqc5hmyi5" }, "stable": { "version": [ - 1, 0, + 1, 0 ], "deps": [ - "flymake" + "flymake-collection", + "let-alist" ], - "commit": "1fc9cd28e6f8527a7e5ae0333e487bf3354fa36c", - "sha256": "0rcx89v3hffk4rbwqfr2ai3bg61shqcg92qj4idsc45xdj6fk9rw" + "commit": "f8e3d03a7207876cd891174702efd572d74f2e49", + "sha256": "1j6v1hdwp1jidx9i28gfkzp9hllzkw3r5qd3ggrb96lbqc5hmyi5" } }, { @@ -39752,6 +40068,30 @@ } }, { + "ename": "flymake-swi-prolog", + "commit": "2cd3a22a666eaa1161860e7c45a46dd51187773b", + "sha256": "0r5xr8gg5sshyf5iacmqiad10jrb1xay92mrc6v6a34y4x9grlmg", + "fetcher": "git", + "url": "https://git.sr.ht/~eshel/flymake-swi-prolog", + "unstable": { + "version": [ + 20220404, + 950 + ], + "commit": "ae0e4b706a40b71c007ed6cb0ec5425d49bea4c3", + "sha256": "07wpm394vm026ihw1lzndmrw8bx9fk48bh6569llvcw439ni0mzy" + }, + "stable": { + "version": [ + 0, + 2, + 2 + ], + "commit": "ae0e4b706a40b71c007ed6cb0ec5425d49bea4c3", + "sha256": "07wpm394vm026ihw1lzndmrw8bx9fk48bh6569llvcw439ni0mzy" + } + }, + { "ename": "flymake-vala", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "1fs4alyf3dckdf1pm6vgh4wjpl22wrlhfx9nv072l0dg48zgyw16", @@ -40339,8 +40679,8 @@ 20170305, 1356 ], - "commit": "b64edc9f350beef07168621933d3e287bce28434", - "sha256": "1yss4akandva0rg05g6vfwjk3q9yj6p0pg85nq5glv1qxdx1rvxn" + "commit": "a5fafe89d4032fd1f0c21b7b04708ef2cce2517b", + "sha256": "0m9dwcgja1d33h6d5fbc42lgfxafwvzc3zwnj4ywx6vai9yqljhd" }, "stable": { "version": [ @@ -40424,8 +40764,8 @@ 20191004, 1850 ], - "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2", - "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj" + "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86", + "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri" } }, { @@ -40502,11 +40842,12 @@ "repo": "magit/forge", "unstable": { "version": [ - 20220326, - 908 + 20220506, + 420 ], "deps": [ "closql", + "compat", "dash", "emacsql-sqlite", "ghub", @@ -40516,8 +40857,8 @@ "transient", "yaml" ], - "commit": "2aaf4462e868acf6eca95e5ca2c3693c3f059c2b", - "sha256": "16d3zcjwxhy18jhgcznwx643v9fc93yxb6fxgkasrzb0dlxrhhwq" + "commit": "05babf69068de7a982bd2e8ad888f37dc7319003", + "sha256": "02mck5c2cbz61j2xwgpwaqlpbnp5svn6g05lylhmw7g0sprzcdvb" }, "stable": { "version": [ @@ -40572,15 +40913,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20220322, - 1003 + 20220510, + 2108 ], "deps": [ "inheritenv", "language-id" ], - "commit": "eb2a7fa6da15d23b57921218a36ac67d523e81f1", - "sha256": "1lf719fifgaci4hirz1bdnf918ijmkp017ynmlg1gq0lfx7ay7gj" + "commit": "828280eaf3b46112e17746a7d03235570a633425", + "sha256": "157bn3s0lrmfjzp7a8sw8sqbblp5r85yaqb1phjk0prvdn798q2n" }, "stable": { "version": [ @@ -40657,11 +40998,11 @@ "repo": "larsbrinkhoff/forth-mode", "unstable": { "version": [ - 20210829, - 1824 + 20220402, + 2103 ], - "commit": "38d5152011ee67e0cff9d4a5ddfb1f908e5be013", - "sha256": "09irbi8z1p2006abl4fnkyfj3c16nzzf55wqighlc2ri2v8bbisb" + "commit": "122a9916c1ad1f1e3f4888951e1ad92a2fc10804", + "sha256": "1fb99l3kmxhhd9dyl99wy48b0r7zz5279nf4iargv7641xwkksy8" } }, { @@ -40723,8 +41064,8 @@ "deps": [ "seq" ], - "commit": "0aab300c0a6225d93087ae112f123eb89048ce1d", - "sha256": "102g7n43ji47ssj7rdyx34frbgl84lgmppww4f3x6wbkvfwa2p6f" + "commit": "fba17c2b316122e26292ba995f1c62191b7b3eb0", + "sha256": "1ryj8qm8zgbms98vbzj728f57mq92vf8rp04aql4zq2ryzxv2rnd" }, "stable": { "version": [ @@ -40877,11 +41218,14 @@ "repo": "tarsius/frameshot", "unstable": { "version": [ - 20210819, - 2123 + 20220509, + 2010 ], - "commit": "029df561ef6572b1ab034490ac48d909d037ac1d", - "sha256": "1b6frjhv4gkix0yj6ibvjgaf4y2b94xq0x4y021v086sp5ifsh3g" + "deps": [ + "compat" + ], + "commit": "ea57484dbba917a437ad3a20ea956aa2275bdc9a", + "sha256": "18hv2ldysxf5s46a2pjbxfq9fc3bkbdlkr01mfqk7ghs0wg6h6xs" }, "stable": { "version": [ @@ -41199,16 +41543,16 @@ "repo": "waymondo/frog-jump-buffer", "unstable": { "version": [ - 20220129, - 539 + 20220414, + 1935 ], "deps": [ "avy", "dash", "frog-menu" ], - "commit": "d82cc1a449d368f5a3dac61695400926da222a84", - "sha256": "0c8x5a0rlyys8dqxsliy4m35c338srffl5387bmyzj68dj43vbfh" + "commit": "ff0cfe9cb4a60d855f0754b741a9417ee413dee0", + "sha256": "0pp0z6zk6lni6pgkrh8is4c99v6npddaarsykwdxai0qxim9q4f3" } }, { @@ -41268,14 +41612,11 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20211229, - 1121 - ], - "deps": [ - "s" + 20220429, + 1847 ], - "commit": "b3aa4c53fc9e98648b25ad036e657632ae2fe192", - "sha256": "14n1xpj5waflhc1zj8mfnm4xavy560n1hamqk6a0dvsahpixjx6g" + "commit": "5208b54098c7534f4768b87c5f4c8a01b638737b", + "sha256": "04s37djxzy8v5xwc5hh8gq37zh7f6ih3y07g07q2fc39rk1xslpd" }, "stable": { "version": [ @@ -41341,8 +41682,8 @@ "deps": [ "cl-lib" ], - "commit": "cd194eebbf3bfc8ab795b41f99613faae342df34", - "sha256": "1qj9wvggyakp0v1yyr2fkj13ddgjj67g0fad2yk1xma44d454xfm" + "commit": "041430cda31c73fd51d7c16e736dcf08db13eb11", + "sha256": "10kv8hpqh08mgyhn04i72kvzncdaqyflai6h0flg89wv1air0m46" }, "stable": { "version": [ @@ -41495,14 +41836,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20220211, - 1009 + 20220425, + 1144 ], "deps": [ "cl-lib" ], - "commit": "03c6ab09c8a580aaaab89709edcd999e66fca0e7", - "sha256": "12rf82ijlisvksq6jvkzgd73y3vgiwmprxfjssjzz8p5myp0m42i" + "commit": "7fd0a3c6c96ed8afd0249ab0734d9b63d4fd1cb1", + "sha256": "06y66lzhw2vl5y3lpcmgn71rpshq07ljah2p2ksgml87qml29r3s" } }, { @@ -41540,8 +41881,8 @@ 20211231, 1837 ], - "commit": "9c500225fc1e084935f4865e2117acef8e30c5f5", - "sha256": "1y7439ipgpj57asmxhdgnkjyakh7ijj2242al5ljpswqmb5404kk" + "commit": "7691a73a85f014a34cc161650e989801f2aba5a3", + "sha256": "1xm0cmfyvypxhygl36m3r68asixmrdq23q4c3vkx8y7i7yaml4w1" }, "stable": { "version": [ @@ -41608,11 +41949,14 @@ "repo": "tarsius/fwb-cmds", "unstable": { "version": [ - 20220101, - 1035 + 20220422, + 1610 ], - "commit": "1143188080e33afd3330f540c7e7df48898a4777", - "sha256": "032ykl67f5x1f98gm8s9jiynlvip16r4lkl64a7xn36g32a4g4x9" + "deps": [ + "compat" + ], + "commit": "e6eeac7552b61d4f7abd51aff6ce72394133663e", + "sha256": "0xs5fl74cxksab7pplvkaa0dd74fhlr35l3c7f80w44zh1mmpmff" }, "stable": { "version": [ @@ -41733,19 +42077,19 @@ "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20210701, - 36 + 20220512, + 222 ], - "commit": "64e3544726b77f10becb58a51d61993fbba433af", - "sha256": "1sn893lnqfr13p1m2g36i6f0ikpibhp7q7ak5271fhpzjzh0fi1r" + "commit": "d7f5bb688e569c7c517e4c3af32a5319c492362b", + "sha256": "19p84xr9xs0224wmy4r7r0167vwd99qx4804hnrxw0y1855qih3g" }, "stable": { "version": [ 6, - 7 + 9 ], - "commit": "52e984d64c48f518222e0f6bd326236f78d7bf7a", - "sha256": "0fjdm2mlwibi6cz0r7cm4ylxzg7i8fljkwfhflb84xqcaknwr2sk" + "commit": "1964d9a52693f3aa9279eed8864bc317ee5c6dc4", + "sha256": "070qmshqn6gz4av3rzbjihlw6psx5c61kbcwdymswzfzmhg5dyn6" } }, { @@ -41771,11 +42115,11 @@ "repo": "gvol/gap-mode", "unstable": { "version": [ - 20191110, - 2237 + 20220503, + 1555 ], - "commit": "62adb8935033eead7fbf2c107c2dfb79afa53c67", - "sha256": "1rhhls2ylc2jg3mman3zq0mknmmwhll09d9dxrqmk5262d2f7vw4" + "commit": "99237f714c28981142674e8cfeb155863c834858", + "sha256": "0bjrrjz6k7a83gxad9grmynr14s6mig4cihd21nk6x499fn3ssia" } }, { @@ -41840,11 +42184,11 @@ "repo": "godotengine/emacs-gdscript-mode", "unstable": { "version": [ - 20210328, - 2037 + 20220510, + 944 ], - "commit": "4badcf6a0c951daba4d7259db3913b78254c0423", - "sha256": "0m2nqgv6k5ficqym5z453ni12bncxyi5xhxx1dii4vfckx80b1n6" + "commit": "d9e1f7f766c73115de8ce2815bc249069636c3db", + "sha256": "165xf8sg0sfnw8cvgfpym0jcfkn1dm7skpnvhrl647wmhba175is" }, "stable": { "version": [ @@ -41941,15 +42285,15 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20220324, - 51 + 20220507, + 34 ], "deps": [ "project", "transient" ], - "commit": "cbfab92584072ba0e1c4119612a8438db61ecbf6", - "sha256": "1gxa5ba5n7k169klg3zyrl8ywyljmcp006x2fql3s7awz0c98rw0" + "commit": "d28d19b582347bffebbf0ca905297e744842a5f2", + "sha256": "0g96982zq5yarv1ky86qvin2an30n4fsxqgrcyg6yhas9vz7gc4b" }, "stable": { "version": [ @@ -42090,14 +42434,14 @@ "repo": "emacs-geiser/gauche", "unstable": { "version": [ - 20210911, - 1041 + 20220503, + 1700 ], "deps": [ "geiser" ], - "commit": "fd52cbaed9b0a0d0f10e87674b5747e5ee44ebc9", - "sha256": "1sv1a6lhxn8xhbgajz2knrblnaaryp3fz4yw19ggzdx4r30k278y" + "commit": "8ff743f6416f00751e24aef8b9791501a40f5421", + "sha256": "1ppracwfl1snq0ifdlyxpdlv7fbn3pbxm1hd1ihgqivii5nbya9r" }, "stable": { "version": [ @@ -42436,16 +42780,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20220323, - 1105 + 20220508, + 704 ], "deps": [ "dash", "magit", "s" ], - "commit": "b7603d14f3869e1fba6265bd8255469a47be7357", - "sha256": "1hshq5bv3cmd04mkq8lckk9cnmjlhb4l34wapgpqrsyhfnz18zxw" + "commit": "2ca9cf999534a94c9aa93b393f30ed373eb2ed86", + "sha256": "1pmjyd9b4b97fvm644gvhlg7jzxsys4kqswrp9rxdlp8w64zxn31" } }, { @@ -42528,11 +42872,11 @@ "repo": "leoliu/ggtags", "unstable": { "version": [ - 20211020, - 354 + 20220511, + 610 ], - "commit": "8e16861392d7499bf3a212db1f5e9e0ef2e4fba9", - "sha256": "01fhc6cc13i9nvyl3d692s0fsyymr6vjxqpj7ydxsh489nw7hj4a" + "commit": "40635a1effd3a9c2adef63c4760010c9468a7a4d", + "sha256": "0ycvia6zabh02idl2j26j4r2lxhf0srpg0s2qxxr82n3wsk7z00q" }, "stable": { "version": [ @@ -42736,15 +43080,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20220325, - 1028 + 20220429, + 1708 ], "deps": [ + "compat", "let-alist", "treepy" ], - "commit": "fdf2e5bb9ba34216d6a76444c1889863db447b29", - "sha256": "03c1934gck19gmhmy1cv3m2fma7f9pxi9l7p1pcz7iy1x6cyi6bm" + "commit": "f14c1bc84135fe149c42348dce6eaa23ba610224", + "sha256": "01ac9789ns56bsishxl904ypc3kvc1w6svfrww8phd6hpwl0f8wc" }, "stable": { "version": [ @@ -43035,15 +43380,15 @@ "repo": "walseb/git-backup-ivy", "unstable": { "version": [ - 20200709, - 818 + 20220412, + 1914 ], "deps": [ "git-backup", "ivy" ], - "commit": "0a5c52e64d0062f77ffefc9213e75690c6d7b111", - "sha256": "060x20c4q7cr5zrfsa28z2zgr6isfb2y2ys450h46a9yi3w9h60f" + "commit": "c53e1bc800963c0d826226c37c22e36f2353c70d", + "sha256": "02ilrrgb2vijhd7sylj8dxdbpxh83zxhkkb8m9kqn8mqxpj0ii1g" } }, { @@ -43102,15 +43447,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220222, - 1036 + 20220506, + 1936 ], "deps": [ + "compat", "transient", "with-editor" ], - "commit": "b1702991eec2c068d282fc2f1bd665726a14e10d", - "sha256": "0gyvbhwm5x7wgm4cdp3v0h8vv5vkw066fmwsvlvgyqqppkq5pqz3" + "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d", + "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c" }, "stable": { "version": [ @@ -43204,19 +43550,19 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20211222, - 913 + 20220423, + 1704 ], - "commit": "abe65ed3937fe038123549b948f37a3bbf1c4029", - "sha256": "1jkhvxlk4lkfjgd5vlfjy8z7w6n7j91rxqr48ricyzzl62p4v2wr" + "commit": "a50672b62a678922b8c0cab95225d520f493439b", + "sha256": "0xywglck2z06vgwf7m7a87plcrxca06pgd4y0iq8asbl046akj0g" }, "stable": { "version": [ 0, - 91 + 92 ], - "commit": "570067d4f4e54ef6003fe442de5536806ff19e98", - "sha256": "0zc9f73app1d7j4yb10sy4xidh5252ncyxlvr5kh0kiqk88ck6j9" + "commit": "a33a50c47bebd5d3f9f0ec7e71acf198e5fd4331", + "sha256": "1fkp6iyisb3g5afyjkxz4yj4ws5f8n7whklck4jdf3014vs01b3c" } }, { @@ -43321,30 +43667,30 @@ "repo": "akirak/git-identity.el", "unstable": { "version": [ - 20210905, - 1208 + 20220402, + 708 ], "deps": [ "dash", "f", "hydra" ], - "commit": "e2620767694d8cd2860b632c47fbe92e20a9ef14", - "sha256": "1wyfszd9jzg6c7lbl2rw7xpbr6fr4rj70h0jyqnwz081j9w92bb1" + "commit": "e7da2b3e3a5a790311431e3263b00df41d335136", + "sha256": "0mm5fbp9x1far97bk7n2y5hmcjbmd3iss9wx7iqh1852b4k4087x" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "dash", "f", "hydra" ], - "commit": "e2620767694d8cd2860b632c47fbe92e20a9ef14", - "sha256": "1wyfszd9jzg6c7lbl2rw7xpbr6fr4rj70h0jyqnwz081j9w92bb1" + "commit": "e7da2b3e3a5a790311431e3263b00df41d335136", + "sha256": "0mm5fbp9x1far97bk7n2y5hmcjbmd3iss9wx7iqh1852b4k4087x" } }, { @@ -43394,11 +43740,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20220217, - 2315 + 20220406, + 2328 ], - "commit": "f5691f8c66eb0f6050d9ab3834ab32661244b378", - "sha256": "1ifq9z4p0rbz2bpm6qz89xg5ycn5fflsyradzzxzsgyys0zc6szx" + "commit": "0197c9812417e18df2c7b5cd5c0084271c2f3286", + "sha256": "0vsgb6jridasscp45prqlwf8lh9x7br3cfqby2lwzgzr8kqphivv" }, "stable": { "version": [ @@ -43447,11 +43793,11 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20211020, - 2306 + 20220422, + 1611 ], - "commit": "62fbf2e5b84ca789e7bc2f87939386023b5ba3df", - "sha256": "0aqz65pcqc35h5z4s606f48iqn87h5v9nj3cp6n9yjxa2v7w5hfk" + "commit": "eca3bb42ea8abed9ef8549b2ac91bbea445c5bb5", + "sha256": "0vyxczxf1dsszdnv6jbgg5vj7fys5mam0jwgfsyzmhclrfgp5kwy" }, "stable": { "version": [ @@ -43707,8 +44053,8 @@ 20220313, 2033 ], - "commit": "2123bcd08fe42094b07180632be2cd2af606ee21", - "sha256": "1n41px99cs6q53lfs2dn9h7ml6hc4yz7mbjlg30hp4l8a3j74lz3" + "commit": "785d2192d7cd30fb7d9c6cd660133a4002f598cc", + "sha256": "0pm91mmpfflm5ids34nflhda7pxhq67qj187wkmpy9lr3wgz695l" }, "stable": { "version": [ @@ -43792,16 +44138,16 @@ "repo": "akirak/github-linguist.el", "unstable": { "version": [ - 20220324, - 548 + 20220418, + 22 ], "deps": [ "async", "map", "project" ], - "commit": "6e3fc58a465e6726dcba6da038f959028c62223b", - "sha256": "1zli3xzp44c61jrg0fn7h39ianxjp2r24sswm3i99hnx052pp8fp" + "commit": "e1055cba19d82620a735e8e40d094b538e1f4d94", + "sha256": "00abshhhm6pvzgwaqhw8g0gwfs915hpdnfh5bqxr9434a56hgkd2" }, "stable": { "version": [ @@ -44549,11 +44895,26 @@ "repo": "lokedhs/gnu-apl-mode", "unstable": { "version": [ - 20211012, - 1139 + 20220404, + 341 + ], + "commit": "c8695b0d55b5167263a843252ffd21a589018427", + "sha256": "03hwnzzxn5d1wdw93dgznflsx9m9hb133gv54pbrij2454pkvm4g" + } + }, + { + "ename": "gnu-indent", + "commit": "51c6eeb58d893e129177d5de77b3d53fb8139441", + "sha256": "17jrj1v0kvpqm1aa75zzn58yqariql5pj9ywf9iv1s9670ydhql9", + "fetcher": "git", + "url": "https://codeberg.org/akib/emacs-gnu-indent.git", + "unstable": { + "version": [ + 20220330, + 422 ], - "commit": "5d998206a963f2205dc6c4eddb41fb34187cb527", - "sha256": "1yzyq8k770j78f2gkkr1n1d5jpdfmj9l3w40pjd7fmn94xg3qw9a" + "commit": "cd5dc79ac65c24e9e775bd2582ad620e316f2182", + "sha256": "07ccrjlh5ph8sdsrd7k5ihrjl4qgsjf9qr54y90fq5b9hzy9ksgp" } }, { @@ -44799,11 +45160,11 @@ "repo": "eschulte/el-go", "unstable": { "version": [ - 20161111, - 249 + 20220414, + 1956 ], - "commit": "ff45fb44d9cb6579d8511d8b6156ed0b34d5ac97", - "sha256": "14av8zcxp9r4ka0h9x73i6gzwbf231wqkin65va3agrzwaf8swz1" + "commit": "79690579496b0df85a1c94199aca968371b58b3c", + "sha256": "1jygy0d3w86b963zv888b7kfg8bzs3hnhmi6r2lkjp6j25hd584i" } }, { @@ -45075,8 +45436,8 @@ "cl-lib", "go-mode" ], - "commit": "3273fcece5d9ab7edd4f15b2d6bce61f4e5a0666", - "sha256": "00qzn136d8cl3szbi44xf3iiv75r6n1m7wwgldmzn4i5mpz8dbq7" + "commit": "fa2693278637f56759480d2bf203bb8aad107230", + "sha256": "1dy96rgss19pwj3pp39wrm5kk933xbqmk79y6a599mnkiixdyaaz" }, "stable": { "version": [ @@ -45171,8 +45532,8 @@ 20220114, 2239 ], - "commit": "3273fcece5d9ab7edd4f15b2d6bce61f4e5a0666", - "sha256": "00qzn136d8cl3szbi44xf3iiv75r6n1m7wwgldmzn4i5mpz8dbq7" + "commit": "fa2693278637f56759480d2bf203bb8aad107230", + "sha256": "1dy96rgss19pwj3pp39wrm5kk933xbqmk79y6a599mnkiixdyaaz" }, "stable": { "version": [ @@ -45292,8 +45653,8 @@ "deps": [ "go-mode" ], - "commit": "3273fcece5d9ab7edd4f15b2d6bce61f4e5a0666", - "sha256": "00qzn136d8cl3szbi44xf3iiv75r6n1m7wwgldmzn4i5mpz8dbq7" + "commit": "fa2693278637f56759480d2bf203bb8aad107230", + "sha256": "1dy96rgss19pwj3pp39wrm5kk933xbqmk79y6a599mnkiixdyaaz" }, "stable": { "version": [ @@ -45409,11 +45770,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20220321, - 210 + 20220404, + 1240 ], - "commit": "2616a4c2e26827ecba0f2576d26b01a63546b452", - "sha256": "00bs8alcd2hj4c2yz1m6h1h0zddy9vicmhvipz5q1lsmnbaamwmr" + "commit": "b0898e6cd647e38e6f70e6cd121b789610573237", + "sha256": "19nffy0zqcjgqigbq0p03ldf31xki1cci48yfj620nh0cxvyd0vp" }, "stable": { "version": [ @@ -45495,11 +45856,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20220222, - 1514 + 20220403, + 1812 ], - "commit": "5d10b00b5f4ee686683c48804235f62d644ae2ef", - "sha256": "0q7vnvqr9283wg0gj7cwn8b540syhzyibjkhv3h81qi3cwk5a5fy" + "commit": "6941fd5bc19c0a2789dda38334d2be582ed34e5a", + "sha256": "16vc4j1hbs25vy414wjid8i821cx1pcld3ilnrlapix3hlsnnjbc" }, "stable": { "version": [ @@ -45682,8 +46043,8 @@ 20220210, 1659 ], - "commit": "af78b49ac4fef8083094d5105f72528ee7d09073", - "sha256": "00vryh0h5sc72f49172nxnxwkphw811k58ivkmal97zd2v3m6w7g" + "commit": "1faa779a126c3564e74d6254d596da8dd2b4bf56", + "sha256": "0lhlpl3ilkrpfk3r638avp85wvbyk3arlssa94xw99a4nz7ix4a2" } }, { @@ -45907,8 +46268,8 @@ 20210323, 332 ], - "commit": "573a53f070c71e02d89866f4cdc2ba5ccdc9cecb", - "sha256": "1am0l056dyi71wwzv7viigia9qybdh9b19w4ql1fkrr80zr5m0v3" + "commit": "ea845966423ce90526d717bb27d0022101c75796", + "sha256": "0cwp00677vw20xzrrf7sjjivdz5ny9imqdhj8719ibgqa0cq52zc" }, "stable": { "version": [ @@ -45994,8 +46355,8 @@ 20210323, 422 ], - "commit": "27fcc9e7062c9d672a513ba306fd32f7736dab78", - "sha256": "1zmpmv7121cv2v5sm3pg5jz7rfhikj8351isx2qa2z165b3ixssz" + "commit": "d4db955860de830ebc067b065cba16a776717e76", + "sha256": "0d9429y6nwmjywj7rbyjdxs9h98177s16szj6mr54clixvws57rg" }, "stable": { "version": [ @@ -46015,8 +46376,8 @@ "repo": "vmware/govmomi", "unstable": { "version": [ - 20191213, - 2131 + 20220509, + 1455 ], "deps": [ "dash", @@ -46024,14 +46385,14 @@ "magit-popup", "s" ], - "commit": "fcb4f7ccee1a01bd759c3d4e7331d40c61a1feca", - "sha256": "1qdlmj8gpsc5365kplm0wif93y8bwfnya47y013nqjk748ins8vv" + "commit": "b4c0b4fe98b2692cf84e445ad2528911e3e1a622", + "sha256": "1wcr3bw7ck5v5w1x3ivhmgm4lq7ln0fvszl7sw0cyj95jqcd7brd" }, "stable": { "version": [ 0, - 27, - 4 + 28, + 0 ], "deps": [ "dash", @@ -46039,8 +46400,8 @@ "magit-popup", "s" ], - "commit": "285e80cd79d6daee7d5f0ac9555d885f368346f0", - "sha256": "004r3n3y019zvds45h6gk49gailvdy77ql49cmryajd2cifmw2sz" + "commit": "ac1eba30136e553e799a7e59846ca5750b64c054", + "sha256": "0y3wl27zrb7qlc1zn451cmklm2d2ihkrzh4n20fyzx222aq4kbdq" } }, { @@ -46172,20 +46533,20 @@ "repo": "lifeisfoo/emacs-grails", "unstable": { "version": [ - 20200519, - 1909 + 20220407, + 1847 ], - "commit": "d47273a619d6731683afe60636259b02e2c78a2e", - "sha256": "1j2sd51bnn6ngz5sd01akmrnh9938g7v1fh6mxq4lbzjwgnzbvgy" + "commit": "350869ecc4f429fc4e26f826d6050d068e724c5d", + "sha256": "1zw8hh97jlxjdgi5spsfd40qgahwbcca2cg2wbqyn1pgq4rjdx0i" }, "stable": { "version": [ 0, - 4, - 2 + 5, + 0 ], - "commit": "d47273a619d6731683afe60636259b02e2c78a2e", - "sha256": "1j2sd51bnn6ngz5sd01akmrnh9938g7v1fh6mxq4lbzjwgnzbvgy" + "commit": "350869ecc4f429fc4e26f826d6050d068e724c5d", + "sha256": "1zw8hh97jlxjdgi5spsfd40qgahwbcca2cg2wbqyn1pgq4rjdx0i" } }, { @@ -46196,11 +46557,11 @@ "repo": "Groovy-Emacs-Modes/groovy-emacs-modes", "unstable": { "version": [ - 20160504, - 911 + 20220407, + 1954 ], - "commit": "bf732d367b16887f81d404481c11ed1a58671d4e", - "sha256": "1w7ly961mqb1396653ali52h0311f0dz3pbmlaxml67dshidjjci" + "commit": "29210e5a969c02169b68e04f2e28e3bf2fc13363", + "sha256": "1m1j5c7pjs4iv39m8axxp5cq648misvhh7fyyfs22lv3yf805q1l" }, "stable": { "version": [ @@ -46251,16 +46612,16 @@ "repo": "emacs-grammarly/grammarly", "unstable": { "version": [ - 20220222, - 638 + 20220509, + 1937 ], "deps": [ "request", "s", "websocket" ], - "commit": "067c58d79a90071a0d70012fa1722c5c79abdc01", - "sha256": "1w3mj1izjs0y7xpbpy7vrkj7ljpbiz7ivkv4h17847q6w79y92wa" + "commit": "3e14e53b87465ca35b08b5355061e380afb87b31", + "sha256": "0zia9hpamwjhyc38l903jwfij06y237j5c2sx600g5r9y36byg9z" }, "stable": { "version": [ @@ -46669,11 +47030,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20220323, - 1519 + 20220430, + 1545 ], - "commit": "3b06e0f594efc5d835eb30a4b89ad951e7b4d7a1", - "sha256": "026r6wh0plpwb6ag05ysfhcsw7l4001xwb7wqw1xchxh7jhvpmdy" + "commit": "7fa9e9e6b650f7a6c026b7e24c2af171e8818667", + "sha256": "0jhdj6hvfv5psq5xixjjr13i92q5a2fkibzw25dz5c1f4ky0crcl" }, "stable": { "version": [ @@ -46759,8 +47120,8 @@ "dash", "s" ], - "commit": "bf732d367b16887f81d404481c11ed1a58671d4e", - "sha256": "1w7ly961mqb1396653ali52h0311f0dz3pbmlaxml67dshidjjci" + "commit": "29210e5a969c02169b68e04f2e28e3bf2fc13363", + "sha256": "1m1j5c7pjs4iv39m8axxp5cq648misvhh7fyyfs22lv3yf805q1l" }, "stable": { "version": [ @@ -46809,8 +47170,8 @@ 20211119, 815 ], - "commit": "1b3b807e84cb250f0cc70876a438fed3b27eb756", - "sha256": "1p99lrq6p6xyn9lc2zmf68ns70kayhri1xls0h1h6ibxsqzvxyac" + "commit": "ac92a8d54efe000557564a9b01a426f34cc01dfa", + "sha256": "0i46i060ndls8pvczmgr7myfbj2cljg4q178n4a6dfa9sr5z6ja2" }, "stable": { "version": [ @@ -47036,14 +47397,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20210623, - 1505 + 20220408, + 1545 ], "deps": [ "cl-lib" ], - "commit": "e6b78ed2a36bf5debd3d07ffd99a5a8ca60609d6", - "sha256": "0g0vdz42s6hns249lfxcha7l7ihqpyay3n5iijziwrbrrhqi6rx6" + "commit": "b1fc363ca2c30b8a8ddaf2e366bca7770c8cfbec", + "sha256": "1sgzvi6ax05rfnjdlmhkd52sr26b6w3q1lfcrrv6rdzsifarh2iv" } }, { @@ -47449,20 +47810,20 @@ "repo": "iain/hamburger-menu-mode", "unstable": { "version": [ - 20160825, - 2031 + 20220509, + 1341 ], - "commit": "3568159c693c30bed7f61580e4f3b6241253ad4e", - "sha256": "1nykpp8afa0c0wiax1qn8wf5hfjaixk5kn4yhcw40z00pb8i2z5f" + "commit": "06bc9d6872007a31226d7410d497a0acd98b272b", + "sha256": "0wwsfc114s1rksrja2cxhl2kkk550imm3rnwnwq9ng0nv855qc5m" }, "stable": { "version": [ 1, 0, - 5 + 6 ], - "commit": "fd37f013c2f2619a88d3ed5311a9d1308cc82614", - "sha256": "1nykpp8afa0c0wiax1qn8wf5hfjaixk5kn4yhcw40z00pb8i2z5f" + "commit": "06bc9d6872007a31226d7410d497a0acd98b272b", + "sha256": "0wwsfc114s1rksrja2cxhl2kkk550imm3rnwnwq9ng0nv855qc5m" } }, { @@ -47640,15 +48001,16 @@ "repo": "otavioschwanck/harpoon.el", "unstable": { "version": [ - 20220301, - 607 + 20220402, + 446 ], "deps": [ "f", - "hydra" + "hydra", + "project" ], - "commit": "331eea2ed64e34cdbea024fa0fd6ba930b60d95f", - "sha256": "0clfdvsw08hb68iq9rhhlfb8rzp1dd81yx5k0d7zs0nqbldr71av" + "commit": "a23571eaab94fb2da0569ed5ab3c1b469f123b97", + "sha256": "0xl7lfj9cc9qp72ibjyilrdxrknvfd07fk206c8933yngrkqf376" } }, { @@ -47777,11 +48139,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20220324, - 1803 + 20220331, + 1645 ], - "commit": "b1505b727b1fb8ae352e59dc90ec6dd05369ce32", - "sha256": "1a2znlg42jg5v2ml1n6a5chrh4365kppfrrd2y6f8rk4x6jwr6mx" + "commit": "4ec2aa32b1772e629a6a2b47b84048e1990d6728", + "sha256": "0m0irwlwz17dmx4k1x82slmbxaxkmhxdjm9ha1490jf4wbbh93q4" }, "stable": { "version": [ @@ -47877,26 +48239,26 @@ "repo": "purplg/hass", "unstable": { "version": [ - 20211222, - 2321 + 20220402, + 1326 ], "deps": [ "request" ], - "commit": "6b025d526dbb9f701a318f4163b4bab0d3b47e59", - "sha256": "1zrkfdf1dmjbfblswl3bhsa3dbwdcbxzmjkqlx06ayjbq48q990f" + "commit": "c6bded14ae4b68194bd9e35428e9973ca144569b", + "sha256": "1qklrp1gskcr93j8gzi1nsp6kzjq7pra1rnyls67l4nchff2knl3" }, "stable": { "version": [ 2, - 0, - 0 + 1, + 2 ], "deps": [ "request" ], - "commit": "3deecf853a1089186973dddf3a1a2a78d874feac", - "sha256": "14aiybj07w65a1hd8izc6awlqffz02gl670szwrk4lj9abxrs0gj" + "commit": "22873f7df205cc1144ebff7aa2dc9bb85031c8a3", + "sha256": "1qklrp1gskcr93j8gzi1nsp6kzjq7pra1rnyls67l4nchff2knl3" } }, { @@ -47947,8 +48309,8 @@ 20210108, 1835 ], - "commit": "b6daf4c8bfd7fa6ba7b4bdbfe03c0be7704add04", - "sha256": "0g4xp5z6wqhfivyls6asjnqdxmafbyl24fvcqk2s5zd9j94x6649" + "commit": "6641a0d7c00ce633887baf3f8c594d9a8a504e9b", + "sha256": "0395f1pwrga0vfd153s7xlgiw5m2d89s5lx6xn9dm8x31q78ghq6" }, "stable": { "version": [ @@ -48087,15 +48449,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220319, - 1850 + 20220512, + 1048 ], "deps": [ "helm-core", "popup" ], - "commit": "5e035c9193bf1e1d4bb709794a154957544dcfc7", - "sha256": "1my6c87ia7h99dbbbw1yxcmgacwss1j36rf3swn3k2ab6k34hsf4" + "commit": "0f7d7acf5724d79ed51ae22349ceb743c4868a3e", + "sha256": "177gpf0s722xdya74gdx8my3jw49f38im31i3impw5c25g8x9ajs" }, "stable": { "version": [ @@ -48194,8 +48556,8 @@ "deps": [ "helm" ], - "commit": "9109208978bc739fb8fdae760abcea4225048dd1", - "sha256": "0cm1r1qmmmvdmr0sshsndvi9s99n52y4nkirq7cs8alg86iyiyrk" + "commit": "9820ba1893c8a7e31e756c891f9b4cf0eff1e50b", + "sha256": "173n4s1i9zi4yizvlzfr2qsj6rb2qizkmhwm21ijd701ac3v9xcs" }, "stable": { "version": [ @@ -48387,8 +48749,8 @@ "cl-lib", "helm" ], - "commit": "db73156576ee3e4ea9d7fb06a20e3cc2c8225eaf", - "sha256": "086skvifcm6jnzbmhx9xlcjx303a9w6v00q557pc1qja0hanxic9" + "commit": "ce8c17690ddad73d01531084b282f221f8eb6669", + "sha256": "15b37xa3f9npbqmr9ml9km61v2l04csgnf61kfr5849zj423643s" }, "stable": { "version": [ @@ -48993,14 +49355,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220319, - 1850 + 20220512, + 856 ], "deps": [ "async" ], - "commit": "5e035c9193bf1e1d4bb709794a154957544dcfc7", - "sha256": "1my6c87ia7h99dbbbw1yxcmgacwss1j36rf3swn3k2ab6k34hsf4" + "commit": "0f7d7acf5724d79ed51ae22349ceb743c4868a3e", + "sha256": "177gpf0s722xdya74gdx8my3jw49f38im31i3impw5c25g8x9ajs" }, "stable": { "version": [ @@ -49557,8 +49919,8 @@ "deps": [ "helm" ], - "commit": "6a1d1fefad4b7f3723220da2edaef0b7d6f09a0e", - "sha256": "0wzq9pj1gbyv7cyar0r4hgmskwmksq7xfpjldibw30vzrpiqapas" + "commit": "f9ffd81c3b7fa3e5f79f511a6c2226b5e99b73e6", + "sha256": "0g4gy812ahch4p4nqw8wz0a7qsn637lm85x3iahphy53qvyzc9rf" }, "stable": { "version": [ @@ -49600,15 +49962,15 @@ "repo": "emacs-helm/helm-firefox", "unstable": { "version": [ - 20210331, - 1900 + 20220420, + 1346 ], "deps": [ "cl-lib", "helm" ], - "commit": "58a7ff023c76857ca9cd82075c8743446a50c055", - "sha256": "06ihkw61ivgghasxignalr0zrfrh5nayky9adrqid9bgmiah3q9y" + "commit": "571cf8dfcbe43d91f9890eebefc88d7572c62e75", + "sha256": "0x93x29d74mqbq78jcxq06w9myfml7yni5p2zfdyqva7q725wsgb" }, "stable": { "version": [ @@ -49662,15 +50024,15 @@ "repo": "PythonNut/helm-flx", "unstable": { "version": [ - 20180103, - 516 + 20220402, + 21 ], "deps": [ "flx", "helm" ], - "commit": "6640fac5cb16bee73c95b8ed1248a4e5e113690e", - "sha256": "1fh1dy6xpc476hs87mn9fwxhxi97h7clfnnm7dxb7hg43xmgsjjs" + "commit": "27dd9e3ce385a3ca15092150e65781de14b5b00b", + "sha256": "1ipg6sfwnv9ilhy3qy84ml3awf74gm18vjmkw42adcsvyg54w843" } }, { @@ -49822,8 +50184,8 @@ "flx", "helm" ], - "commit": "e0cf739c0765c3f0186b9d5f691c2c7750a484c2", - "sha256": "1kkcnczk295aib8r37qfl0bcvrvki12wi0r5aqjc1g8vklaf9vbp" + "commit": "dd092e8eea5257d49bbdf694df4fefd86252e54b", + "sha256": "1w6625gd5k149wm54m7ci6l9pzrcma6z8hppj965vqlwqc8fj4xa" }, "stable": { "version": [ @@ -50169,8 +50531,8 @@ "deps": [ "helm" ], - "commit": "06255ec6347efb8f1884b4a844f40f94239137bb", - "sha256": "1yp1l6na6mf91wym28pnmc06zwbhg2i3p9i1z7kx9wf3mc3982gn" + "commit": "6285c083d885ea8e110868c6a5b9df69c3f3c4af", + "sha256": "1di39sbwf3yi01jh8nbiayqqnms1dddfqnz5g0gg935f5w3l1phm" }, "stable": { "version": [ @@ -50555,8 +50917,8 @@ "helm", "lean-mode" ], - "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df", - "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p" + "commit": "362bc6fa3efb1874c525ed6b4b6f24f76af22596", + "sha256": "1lr4h555fa1kdi3q7hkhsnznv7nh9rgjqjkbj2bqp9zwh06245w3" } }, { @@ -50623,14 +50985,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20220113, - 1752 + 20220418, + 657 ], "deps": [ "helm" ], - "commit": "736f642ffa0f92706f71c3b7a995f9b97069b069", - "sha256": "19bvcwfv7nzvm3qx41nh0x66c1jldciq2qcn9gkf4r64xwc32yz1" + "commit": "c6494a462e605d6fd16c9355e32685c3e0085589", + "sha256": "02gx6a8n7csip5wm818bmhrq4r0r394r3vvfsn8fja8fagmg3z1a" }, "stable": { "version": [ @@ -51995,8 +52357,8 @@ "s", "searcher" ], - "commit": "fedb0c735270764a0fd38cebcd2b3c32612fd455", - "sha256": "0jv8qbffr5wckblkdy2ka0rryczr72m8kgmg5y2is1jajnxsfwam" + "commit": "d0a3aa7c4a882c6563c053c3317600582043d71c", + "sha256": "10hvm4xym1886b02jqpg83p2pz6s9nkkrs7ifnydhn2zn5khn855" }, "stable": { "version": [ @@ -52476,8 +52838,8 @@ "deps": [ "helm-core" ], - "commit": "c1d5f9a2ccdb133aaf6122632166ba4b6fbc188b", - "sha256": "05vd7gxa21lg49hhs0pg0skpidav9qmhcijkjakzi4v8p29qjg72" + "commit": "b6bd3379b98d306935731e9632907387b078e000", + "sha256": "0ki38i2qiysba6xm6hc4xmy4vkpsvc85lh1vgjy8741wkysija2x" }, "stable": { "version": [ @@ -52529,15 +52891,15 @@ "repo": "Giedriusj1/helm-tree-sitter", "unstable": { "version": [ - 20220124, - 2246 + 20220328, + 1345 ], "deps": [ "helm", "tree-sitter" ], - "commit": "1cace1f9a8c5c519b985f7ee542ba3375eabd0e1", - "sha256": "1ka0xq5ghhn4r82k1aq5v4scariwvpwbr7c179j36axxlyvr6zkn" + "commit": "ef5209bd1deb56d6cab7a26e6d55615161f2115a", + "sha256": "1cmjz8dl8r218r1bx85slzb91xwlrhxq9w73p5ql967wd9dzi60g" } }, { @@ -52548,8 +52910,8 @@ "repo": "BenediktBroich/helm-twitch", "unstable": { "version": [ - 20220207, - 1314 + 20220420, + 1625 ], "deps": [ "dash", @@ -52557,8 +52919,8 @@ "streamlink", "twitch-api" ], - "commit": "533216a1add8acc2d6f2b4039c67528b97d06549", - "sha256": "14686l3idn34scz9a3bai2x42zsrbfazpv1am6j64y7mrp284p8g" + "commit": "27fbec24cc250d508cd2f4286da16262752908eb", + "sha256": "1sair8har6blwn1s12msz780cfsjpn0fzhy6ckhjh4sw9747808b" } }, { @@ -52859,8 +53221,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20220220, - 2308 + 20220412, + 421 ], "deps": [ "dash", @@ -52868,8 +53230,8 @@ "f", "s" ], - "commit": "67cdd1030b3022d3dc4da2297f55349da57cde01", - "sha256": "064rnxcf1w7zrjr39a72hngyndj24wkmmyqrgr1bpgsl87zgvbrg" + "commit": "c2729a236a84a1fbd3d184c163fbd10e0fd62077", + "sha256": "0q5a1s4wkxjp56gy95qzkxzz8w46djacgh9fhwm509rkkdxpp30c" }, "stable": { "version": [ @@ -53427,20 +53789,20 @@ "url": "https://git.sr.ht/~tsdh/highlight-parentheses.el", "unstable": { "version": [ - 20210821, - 1957 + 20220408, + 845 ], - "commit": "98178e79a92515fcacd278fb486702dedde0bed3", - "sha256": "02psp4sfirvab6bv9nylfqqfrmmz87wv8x1sf8bmrrqqk0rwn37p" + "commit": "438a1cb2563e2a2496be4678cc0df8d5b22caf5d", + "sha256": "0ixjai9w9x4sm1lx9yljl58r7ydbbjlkb0a2pbv316l8qph8w44r" }, "stable": { "version": [ 2, - 0, - 4 + 1, + 1 ], - "commit": "8d43acc799328023ea1ca687122bbf8f068b4989", - "sha256": "0i3fcrkkwalgcb9whw6gjcl5f4yr7vd4vp450i8lj9nab22p7mqc" + "commit": "438a1cb2563e2a2496be4678cc0df8d5b22caf5d", + "sha256": "0ixjai9w9x4sm1lx9yljl58r7ydbbjlkb0a2pbv316l8qph8w44r" } }, { @@ -53784,17 +54146,17 @@ }, { "ename": "hl-block-mode", - "commit": "68b7cb0ffe90cd56e2ca6e91e33668be586a1da7", - "sha256": "17ghc2hbvckp68blk8izwmx6far9ampalik2f9idz27982h49ia8", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-hl-block-mode", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0jav8lk7vyfmvb10l4zy12zq9cbiw2f8biw5cp2hg95829hwlin9", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-hl-block-mode.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "3dd29cfbf24fec16eaf3d47936338adb6b34f5c8", - "sha256": "0c0533id01lx0xf5dkkddd3gwb3k2jh55fa6z0d2xzrmc7p1971x" + "commit": "7e0452c768a4e309d1cdc15025683ebfe71e626f", + "sha256": "0ymkxmpfd19qjdc80a6hrljbwpn78xvj6r769zfskyhqj3a3a2xd" } }, { @@ -53835,17 +54197,17 @@ }, { "ename": "hl-prog-extra", - "commit": "d4ababc787d4dd173c65cc1b4b4a0fc0bb6e6d07", - "sha256": "1dgjskhz1jq01j19dmy8d3fzrg1d8jzrycdsxmkjlc2h05285wkg", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-hl-prog-extra", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0fgs70wfrlk99j439ypnjysa0d3fw6h4rf5w1878p9f69azwpz2f", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-hl-prog-extra.git", "unstable": { "version": [ - 20220324, - 16 + 20220507, + 1118 ], - "commit": "3312497ddfc7b7bc0e773ae98fc02477a4b0c7a0", - "sha256": "1n436z6dg7c1vw6sl5bswny059d2629yx9cvlkf076xg8dmlhwdv" + "commit": "a8e2ee5d43ce70c59e57d2ab90b39a6cf9e7b851", + "sha256": "08vs56lvq9ihhxd7vhcgd9lry2bm8q14mx18ap1izj6r52njdsy5" } }, { @@ -53878,20 +54240,23 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20220323, - 1714 + 20220422, + 1611 ], - "commit": "c0f0555a6b9f3818f29e6394db0b45d6d5675edf", - "sha256": "15sndz0dd8aasg23yp298rlrw17pn73irzn048fmvri8wl8951hv" + "deps": [ + "compat" + ], + "commit": "2337eac8cab0d4b73a96fb3936d2ac87600e3c91", + "sha256": "1l64inwrjvmjgm5852aclz3izy58vnf0xpxhr7rp3kg947qhr72a" }, "stable": { "version": [ 3, 4, - 1 + 2 ], - "commit": "c0f0555a6b9f3818f29e6394db0b45d6d5675edf", - "sha256": "15sndz0dd8aasg23yp298rlrw17pn73irzn048fmvri8wl8951hv" + "commit": "e52285965b5ee89c18080661d4f80270143ae8dc", + "sha256": "03i3dvg7scvbxx6z07916zqc7p8w5s9nxv4v2phr68046zjz05dw" } }, { @@ -54192,8 +54557,8 @@ 20210924, 936 ], - "commit": "e963cef1bf24b2da491c1aafd4260ee6ae3a766c", - "sha256": "1w51drd0zchgl5yxyg1a3rd0xkxf6cybfalzdz7cjprd8kmipmj5" + "commit": "95a1be449624aa2b25128b900b6211034d0e17bb", + "sha256": "1lfwa6r3z79kvahgily4drmpf2y4sfwkv5gqbpn57fjxh2sq4rwp" } }, { @@ -54483,8 +54848,8 @@ 20200929, 559 ], - "commit": "a221c1af3d0a2bdc849adabd4044bb3f63895b54", - "sha256": "1warqfy5gq56mxypkpzd29k280yka2zzi131rrm1j2rr49ipj6dq" + "commit": "049efcadbd9b51a601cca60fc78616bcef0799ae", + "sha256": "09l1n4jmw2cr89jfss3zmlbzpbglir1h548kv3zdl44hbyb4wlk9" }, "stable": { "version": [ @@ -55244,11 +55609,11 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20210603, - 1343 + 20220418, + 2119 ], - "commit": "3bee30b374226deecde8a5cbbc6ca8471c303348", - "sha256": "1c7riqgm5fi13kb2k7qfykr0zsx3hkwyzgcxh4kqnd1y5w54pgs2" + "commit": "f5775d535630199703c936380d210d38249b342c", + "sha256": "1xc1sy51xf3mcbx6bprb6g4hzgg1rm7as3nx8q54wma7dllmh092" }, "stable": { "version": [ @@ -55370,17 +55735,17 @@ }, { "ename": "idle-highlight-mode", - "commit": "43c7b0d74b482de5134de097e982934cd72c5f04", - "sha256": "1yrvvizw48lky06zjsx2n2w5cb2c5qz2kvcm9bpqyr5gp2w63pls", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-idle-highlight-mode", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "15was00580bx5wqvmyp6fc6l54zx5gcwnqgdzpbmyvnxx4v39znl", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-idle-highlight-mode.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "0a24f8e402383b0da1f956d946781317fba14bbc", - "sha256": "11mbm87rx4i093csdqrgin550wgkps69ysgy2ig56m3l1hs5pp78" + "commit": "5418252a11b00377a59295e50b7436f53afe68bb", + "sha256": "0dmqvpck1hwlw8z2lppyc1cnjw62gm9yykk2j4j3ckdvgcpkj6cj" } }, { @@ -56048,11 +56413,14 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20210918, - 2046 + 20220422, + 1611 ], - "commit": "e69a09e7962afe81474aa6c88974a1e6add15624", - "sha256": "0953irnlzx0nl4iirpgf7llyld2n8yl1w9yjkh0lvlz1l9gcpvqy" + "deps": [ + "compat" + ], + "commit": "4dbc59789835396fdc76bfde4ae4971c8a9ceaed", + "sha256": "0hq6hvp5cvys13ms7zfd8477c4mwvwxgk6rqczyfnzgi4qjyjz54" }, "stable": { "version": [ @@ -56339,8 +56707,8 @@ "deps": [ "impatient-mode" ], - "commit": "8376bcfc2bbb3762e26dfc1bb8866c452f7935fe", - "sha256": "01g5r3sh1qma3vpyzzhixpw62y0kvphznpnfd80w4a5a3gbwp5m2" + "commit": "6825147ebacb1d738b1c96baf0534a5ed3e6b289", + "sha256": "10kjxm93cdll6a5l1lzk0ciya5z6d02x5rl7har507ac1laj1v23" }, "stable": { "version": [ @@ -56480,8 +56848,8 @@ 20220227, 653 ], - "commit": "c6373bdfaf43255141983aea245571364f04d3cb", - "sha256": "0iphkl27ihnv2dmjaj1b3292xsx8g8m11r7hjikh421n9f1p5xy0" + "commit": "6fb6c9326077105febe2cd9c77b683b7c310cf03", + "sha256": "069mcbj3gwpbw1fwrpyfb81s0kyk3vklymfj9z7nr7yl8ra986ym" }, "stable": { "version": [ @@ -56686,14 +57054,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20220315, - 1102 + 20220421, + 559 ], "deps": [ "clojure-mode" ], - "commit": "f511dcad0e0684c9609c7526930e88d11da989ab", - "sha256": "1xxjqf3j2k92sj4zwhkjywc6yr5x183r8n33lba2v3w5hcfgahd0" + "commit": "abeab8d6d4cb3bdded5e9083776aab0c06cbdf57", + "sha256": "0b73dm3kyard035jfijcah8vp96vzgywmkl0ajnhyzzxmbl26hqa" }, "stable": { "version": [ @@ -57005,8 +57373,8 @@ 20210204, 354 ], - "commit": "7e4c8b0d0a43b6f1c6c4d6dbd2f3bf5ce7f20067", - "sha256": "1qc54wx5f1yvap9hxi1k5qqsascxxs9lq317qpzipmbazw7qk7ch" + "commit": "c2c879acf89682559b157fb069e1da008f4912ea", + "sha256": "1j7vrrdwxr1m78i08aciws4bacb30fxfrix7ciscx0ii7ifx3hc4" }, "stable": { "version": [ @@ -57131,17 +57499,17 @@ }, { "ename": "inkpot-theme", - "commit": "68b7cb0ffe90cd56e2ca6e91e33668be586a1da7", - "sha256": "1avgzjwppmmhdmljwpy75acylm3f74d3x0q94ld2n1yhi8xx40i9", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-inkpot-theme", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "07d6344a0x7dhlgw9i8dzw7mcdz71d1mig5y307rdqj27ic3bbqn", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-theme-inkpot.git", "unstable": { "version": [ - 20220326, - 733 + 20220507, + 1118 ], - "commit": "a8d0d2ecd4855ba91e21d0481b02dff3755f8afd", - "sha256": "0qz91mzfp8ywk9ngaw60q0nczxykanl5sbgf42v9xfgm6fys8yal" + "commit": "59056ef2e8850d33abc6e787219fcff404217afc", + "sha256": "1fayzcc9ixpnhma7968y70zdfslcvxrx3sgqsln0kp5zdkzm2691" } }, { @@ -57716,8 +58084,8 @@ "deps": [ "f" ], - "commit": "1ccf7219c2f78485aa23174e46aa8cd77a98a6a0", - "sha256": "0bws8fiqysqjcyw1y1ng1dic7nv7g1syml9hldb9gf7b0xan35yz" + "commit": "e6c9d5e19533eda6b74505a86198416eeecb915a", + "sha256": "00chrr0i1bw0dzrlznahca8zj4q9yqwl187m9dm9d1kgh0dwhn3s" }, "stable": { "version": [ @@ -57871,19 +58239,19 @@ "repo": "doublep/iter2", "unstable": { "version": [ - 20211119, - 1718 + 20220501, + 1542 ], - "commit": "077684feec98ce6d5e283a13f056c083986628a2", - "sha256": "12flc98nv353cqr9qbkasgdmiyf9c3iw4apzh899xw857j1h5qdr" + "commit": "1abca3665ecfa6b016311906560f8be4fbb3e3db", + "sha256": "1jzd9kzxf3ncw40d55r1apw0cpk4i1a3s5p85mg9n20553cb6lhj" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "077684feec98ce6d5e283a13f056c083986628a2", - "sha256": "12flc98nv353cqr9qbkasgdmiyf9c3iw4apzh899xw857j1h5qdr" + "commit": "1abca3665ecfa6b016311906560f8be4fbb3e3db", + "sha256": "1jzd9kzxf3ncw40d55r1apw0cpk4i1a3s5p85mg9n20553cb6lhj" } }, { @@ -57949,11 +58317,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20211231, - 1730 + 20220406, + 1052 ], - "commit": "c97ea72285f2428ed61b519269274d27f2b695f9", - "sha256": "05ivdsq6l6ixdn5p0rjh7mcgw19fm38m137xb8yi2c9gii6yk6g2" + "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", + "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" }, "stable": { "version": [ @@ -57980,8 +58348,8 @@ "avy", "ivy" ], - "commit": "c97ea72285f2428ed61b519269274d27f2b695f9", - "sha256": "05ivdsq6l6ixdn5p0rjh7mcgw19fm38m137xb8yi2c9gii6yk6g2" + "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", + "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" }, "stable": { "version": [ @@ -58013,8 +58381,8 @@ "cl-lib", "ivy" ], - "commit": "db73156576ee3e4ea9d7fb06a20e3cc2c8225eaf", - "sha256": "086skvifcm6jnzbmhx9xlcjx303a9w6v00q557pc1qja0hanxic9" + "commit": "ce8c17690ddad73d01531084b282f221f8eb6669", + "sha256": "15b37xa3f9npbqmr9ml9km61v2l04csgnf61kfr5849zj423643s" }, "stable": { "version": [ @@ -58227,8 +58595,8 @@ "ivy", "s" ], - "commit": "eb358d8460b944bf764cb6c01f205e6af94c4861", - "sha256": "07lazz8ca9sshrgswl47zz8gvc0niwyi397m3x3vrn5738qd0bf9" + "commit": "942b2565097c97c1afc4fa395fac5788eabc730b", + "sha256": "03q15h6ckbrxmwskf19dhzcr8whgcipbf4nilpqfnhpsn5f4zl8l" }, "stable": { "version": [ @@ -58341,15 +58709,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210311, - 1108 + 20220402, + 1348 ], "deps": [ "hydra", "ivy" ], - "commit": "c97ea72285f2428ed61b519269274d27f2b695f9", - "sha256": "05ivdsq6l6ixdn5p0rjh7mcgw19fm38m137xb8yi2c9gii6yk6g2" + "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", + "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" }, "stable": { "version": [ @@ -58543,21 +58911,21 @@ }, { "ename": "ivy-prescient", - "commit": "a92495d09689932ab9f0b716078ceeeb9cc154e0", - "sha256": "017ibpbj390q5d051k3wn50774wvcixzbwikvi5ifzqkhgixqk9c", + "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5", + "sha256": "15fynfhsr75v285szkqqamlcs25pzsz5nywp5j1asp33dnkvqdhi", "fetcher": "github", - "repo": "raxod502/prescient.el", + "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20211228, - 417 + 20220509, + 2300 ], "deps": [ "ivy", "prescient" ], - "commit": "c5295a9eecbd2935bb57684a4422638e03bf738c", - "sha256": "1wfmynbqaqvrkjdncx0wmqxz6v8zlfmqlh5l3h6876jin97i5fbv" + "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484", + "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c" }, "stable": { "version": [ @@ -58681,8 +59049,8 @@ "s", "searcher" ], - "commit": "63d55b3c333881d3c9d1e3f1ee50a72e79fd9e0e", - "sha256": "1mydy1akn25xb9wy8y08vmk997h2nvqdm48fnxldxbkli2d0zv1j" + "commit": "17a93eadb8a681d878e1d66b90073ed1be2e1dc2", + "sha256": "0m0lvpqamikmg957jj2nkr8xqzxl0kxyjl68577h4r83b60xrnhh" }, "stable": { "version": [ @@ -59288,8 +59656,8 @@ "auto-complete", "jedi-core" ], - "commit": "e942a0e410cbb2a214c9cb30aaf0e47eb0895b78", - "sha256": "1c4nqgg1w2qv0mhpi6hhz3xr5kk4bbxc951fhik6dpi2c2w8p73s" + "commit": "81c5a42b83f3a3c9d062b487f48009def11310f8", + "sha256": "0pg6yl2bgx6gh74nnvicak12fwsi257fivkvgy4zlikhbi2b17ar" }, "stable": { "version": [ @@ -59321,8 +59689,8 @@ "epc", "python-environment" ], - "commit": "e942a0e410cbb2a214c9cb30aaf0e47eb0895b78", - "sha256": "1c4nqgg1w2qv0mhpi6hhz3xr5kk4bbxc951fhik6dpi2c2w8p73s" + "commit": "81c5a42b83f3a3c9d062b487f48009def11310f8", + "sha256": "0pg6yl2bgx6gh74nnvicak12fwsi257fivkvgy4zlikhbi2b17ar" }, "stable": { "version": [ @@ -59463,14 +59831,14 @@ "repo": "john2x/jenkinsfile-mode", "unstable": { "version": [ - 20200929, - 428 + 20220428, + 1113 ], "deps": [ "groovy-mode" ], - "commit": "65bf3925852c35c6bd499978f08f83c1193f4347", - "sha256": "0w38g88yykslg71xr99ff4vx1ffgy90b7xqvvdflr189gwk3avx1" + "commit": "fa5545be1329df3067dcfd81749bbd99df070d6b", + "sha256": "1cg1k3c4k21im499i09yajqhh20igmd2riyia8y65swvvksnzyrc" } }, { @@ -59688,11 +60056,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20220312, - 1945 + 20220510, + 430 ], - "commit": "44280538a2b780536c56ee2a51b7a5b03d376a2e", - "sha256": "1x5k9d1iq33ds8cszcyl2bhbr8hkldq6hph1b77zayqyg00pnly4" + "commit": "f968413df2c2bd1e00c5b6c61c53bdd208b90ee3", + "sha256": "0gyf61krqy6d5sjvj5c9z57vqx2nq0fia2pxmk32slisxc9drcqm" } }, { @@ -59867,8 +60235,8 @@ 20180807, 1352 ], - "commit": "516abed166d687aa8b197973315bd6ea0900fb62", - "sha256": "0l0hk6lfn6rvfxjmnkyigc0qqh6k1jbfg4i3g2s2d994hihdynhp" + "commit": "b8b4e3e54118b38fd6003cb97e1ff6e456a24f26", + "sha256": "18wx2lrww2qa2ig7g2vry14ql767hyy01sf6kb6ml1f1fs0crqn9" }, "stable": { "version": [ @@ -60058,14 +60426,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20220316, - 1506 + 20220402, + 2211 ], "deps": [ "cl-lib" ], - "commit": "b9ed9e406d59661bb099cb2307dfbfcc1d47beae", - "sha256": "15c5smxfh2dgk6da012fsvjz9c075cxfp2q8fglbalazplzwv4zc" + "commit": "fed41615b26404e0bfd7e4f64643981ca798a34b", + "sha256": "007b4z3qpdy6apljb48aay9v1pf6pkrq0prhwhdqcqkq9rbghg7m" }, "stable": { "version": [ @@ -60551,11 +60919,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20211023, - 1434 + 20220418, + 809 ], - "commit": "47f43f7d839019cac3ba6559d93b29487ca118cb", - "sha256": "0gfm6xnijxxgc1fjqgbsvzf9m68pfcbdhrii6c7a29v5cw6khkaj" + "commit": "adf4029be778c5983c436873b8a78bc72a6b09f8", + "sha256": "0z6vx541vskgzb1dmlcijbch4z84lrz5fm2ay0n15sypvxfp2yks" }, "stable": { "version": [ @@ -60574,14 +60942,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20220225, - 810 + 20220428, + 541 ], "deps": [ "s" ], - "commit": "6c1d63511fb2b3b3f2e342eff6a375d78be6c12c", - "sha256": "07fl2bcl1drscp94gpy0v3n31rml8fffc7iv5v80qh8zwvn57d6h" + "commit": "2342003662071cf7b256f0a7cd8f545bcffaf22a", + "sha256": "0i38n3s0fc32a1jzw0nchapjkfqxqfkl7r9zzvckbsxkcn2fldwj" }, "stable": { "version": [ @@ -60622,18 +60990,19 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20220325, - 2038 + 20220512, + 539 ], "deps": [ "dash", "julia-mode", + "popup", "s", "spinner", "vterm" ], - "commit": "80a2def11e444d8ba2b640d0ea76720cfefccb65", - "sha256": "1k5wqlxgijz73qscbdnkaia3ffw55x08xyqmfppvqv1w4gdvr0ya" + "commit": "88ce4fadc065736e154506538d365a8f1dd643e1", + "sha256": "1gj9mnv0kyq20hdz506qlz80kx28zwng12vnnahshji6bh6wbwj5" }, "stable": { "version": [ @@ -60660,14 +61029,14 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20210410, - 40 + 20220510, + 2259 ], "deps": [ "vterm" ], - "commit": "d57448466c11833d4fd67f5dbbea9cb9a07a74e2", - "sha256": "0v7l4jxq71vcw3sjs476smbw9ln6xfrq7n3vzw26apzkrplizqyy" + "commit": "5374776991232de966efca245f9ce24c59728588", + "sha256": "0cg5mqiciawigb5n7w8q5hi8q1h253nbjif3p9n7vhbckwx318rx" }, "stable": { "version": [ @@ -60813,8 +61182,8 @@ "repo": "nnicandro/emacs-jupyter", "unstable": { "version": [ - 20220212, - 210 + 20220419, + 1852 ], "deps": [ "cl-lib", @@ -60822,8 +61191,8 @@ "websocket", "zmq" ], - "commit": "0a7055d7b12cf98723110415b08ee91869fa7d94", - "sha256": "183313jlmfnbndczllkqm47y4495prw4ks2jav3pdwn5qqfmpznx" + "commit": "7d20c0aee2f9c896215f35232905b23532ef04c5", + "sha256": "0lrg43xas5dx1qlhzk7irq5hwgpfpxkv27zgcrcy0sbhd9y8dad6" }, "stable": { "version": [ @@ -60849,20 +61218,20 @@ "repo": "leon-barrett/just-mode.el", "unstable": { "version": [ - 20210818, - 1526 + 20220401, + 1814 ], - "commit": "8cf9e686c8c7bb725c724b5220a4a3ed17d005d0", - "sha256": "0i280w7nv6zdzpwsyc9njlz5n75awqgpmmh3wklzrfh7mh1vzp89" + "commit": "35f1bd4748cd3e960e6930b34310e5506212b304", + "sha256": "19piyjnkvy8g87s7gyn07wh67kdygxksv3k7xiq49wb3rpqdrr0g" }, "stable": { "version": [ 0, 1, - 5 + 6 ], - "commit": "8cf9e686c8c7bb725c724b5220a4a3ed17d005d0", - "sha256": "0i280w7nv6zdzpwsyc9njlz5n75awqgpmmh3wklzrfh7mh1vzp89" + "commit": "35f1bd4748cd3e960e6930b34310e5506212b304", + "sha256": "19piyjnkvy8g87s7gyn07wh67kdygxksv3k7xiq49wb3rpqdrr0g" } }, { @@ -61229,15 +61598,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20220317, - 1238 + 20220422, + 1305 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "78df90fa411c0d24d884abd47bf63a167231a84c", - "sha256": "05z7w4ig17w5vxz3g4waghkq8ay9cdjc22aihn34h3q7h1vlv5dd" + "commit": "51b1f719bc300a4f684b6dc7511dfb044f75f575", + "sha256": "0nq78kb751lgz398w8xbbl63cznb1g3l6j0j4limylmi8rlzvsnd" }, "stable": { "version": [ @@ -61568,11 +61937,14 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20220211, - 2035 + 20220422, + 1611 ], - "commit": "a94f9839addabc2d491ee5c8927453ae2c5ce0fb", - "sha256": "0yxi1s4czkxhzl6dp3b9iaqds35gjccqgrghvfmqyyvmzi0lzss4" + "deps": [ + "compat" + ], + "commit": "296fba536287e7a0d88109e75a0bc0181647dc5e", + "sha256": "14v77x0knvjb7czrhgarq0apxavbnxqi3ra833qf0f1s599wkv77" }, "stable": { "version": [ @@ -61665,14 +62037,14 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20220101, - 1036 + 20220422, + 1612 ], "deps": [ - "cl-lib" + "compat" ], - "commit": "753fa7b5bdb761a1eb9a7b09db50c0bee3ae5241", - "sha256": "0604l1rxvxq88i2pnb4q0jaf9i3pmf3756nkrivvaj1l4v6nswlk" + "commit": "f95fded924a7184a638ef233324fcda34c60ff7e", + "sha256": "0rbngqw577clsrxjkrhcpw9347796w52dqi2v94a2xmzvhq4rff8" }, "stable": { "version": [ @@ -61803,8 +62175,8 @@ 20220222, 639 ], - "commit": "33e5e50b795a48315d869d9545c650b7641eed0a", - "sha256": "12zkfsbsbf3s5ifyfrbv5xyyrif59rkk89in83ghys03qp5kmybs" + "commit": "d6fe2d51769ee5d1d84a74adeae5c3a0aa66a602", + "sha256": "0hkp0dl8aqc2javsnl3pm37iy9f534l6wf1vgh44ba6ws6bxxgl5" }, "stable": { "version": [ @@ -62059,8 +62431,8 @@ 20210318, 2106 ], - "commit": "06c15c1f7567c6dbc97248c85467bdfd2fcf3cf8", - "sha256": "0w36wggnmf7dq0kqkkm66zq9adq2r1f8zrdjw6qnbg7b9bdxwxik" + "commit": "93ccd2058c1980207848810942dbb1a6d9edebe9", + "sha256": "1ciqb2simq7fdc31pjav30rlskami70dcg4abqairfq3yvx5nb7k" }, "stable": { "version": [ @@ -62359,11 +62731,11 @@ "repo": "r0bobo/kubedoc.el", "unstable": { "version": [ - 20211005, - 810 + 20220401, + 1113 ], - "commit": "20692189359ce0517726a945c8ab798bb91a8624", - "sha256": "1f1lv4wbfx4w371gvnplzmm4rmgr4zlbk2fy4cmck5vp8g179q4h" + "commit": "f8503f121e38f0ff9343544a5c912e50b25efd4c", + "sha256": "0j4w8dqbcmdy571xn870jib92fmsl6sj71pm1mi39bgh28yfqbvg" } }, { @@ -62374,8 +62746,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20220318, - 2124 + 20220509, + 104 ], "deps": [ "dash", @@ -62383,8 +62755,8 @@ "transient", "yaml-mode" ], - "commit": "6ce4a13b1de666a90f5acfdfd8c78f6ea2013c60", - "sha256": "16xam2yhj77mj388hrzbh2ah8y1k5sbfacavjmriaxrnn5c8v16d" + "commit": "c45e19a215e8e7df80a61c10ca1fa26dcfd1de35", + "sha256": "03i6iyhiqhi2vxb8qvw99n6h6xg8jnxkazikw6sqnp0flnrgcf7q" }, "stable": { "version": [ @@ -62416,8 +62788,8 @@ "evil", "kubel" ], - "commit": "6ce4a13b1de666a90f5acfdfd8c78f6ea2013c60", - "sha256": "16xam2yhj77mj388hrzbh2ah8y1k5sbfacavjmriaxrnn5c8v16d" + "commit": "c45e19a215e8e7df80a61c10ca1fa26dcfd1de35", + "sha256": "03i6iyhiqhi2vxb8qvw99n6h6xg8jnxkazikw6sqnp0flnrgcf7q" }, "stable": { "version": [ @@ -62440,8 +62812,8 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20220213, - 1809 + 20220331, + 1314 ], "deps": [ "dash", @@ -62452,8 +62824,8 @@ "transient", "with-editor" ], - "commit": "d52ad7dacf17b659060e52d5e3318cafd7946616", - "sha256": "05ibxsbfdaqdiabwl92j3mgcyf0gk5bzlwdlfms2f76wbrmpqw0l" + "commit": "e0d0cd6b949802fe63ff8940cc743cc7efedb089", + "sha256": "1xnl8bci3j0l14gkb0n23kr4867cmypyxcydjn59niwab9srg7pm" }, "stable": { "version": [ @@ -62487,8 +62859,8 @@ "evil", "kubernetes" ], - "commit": "d52ad7dacf17b659060e52d5e3318cafd7946616", - "sha256": "05ibxsbfdaqdiabwl92j3mgcyf0gk5bzlwdlfms2f76wbrmpqw0l" + "commit": "e0d0cd6b949802fe63ff8940cc743cc7efedb089", + "sha256": "1xnl8bci3j0l14gkb0n23kr4867cmypyxcydjn59niwab9srg7pm" }, "stable": { "version": [ @@ -62548,26 +62920,26 @@ "repo": "emacsfodder/kurecolor", "unstable": { "version": [ - 20200113, - 2027 + 20220508, + 929 ], "deps": [ "s" ], - "commit": "3fc84840cbbd75e646cafa2fd3a00004b55e37ec", - "sha256": "0y8wj8f2wzhg5vl4kjrqny3333616s4lcil085190yyb7mjakvn5" + "commit": "61d7211469ea3e2c429937869c5a29584103361a", + "sha256": "0mi5jln34pd372h7f3rvigis6dll6sxdqg9izj9bip93917cff0y" }, "stable": { "version": [ 1, 2, - 6 + 7 ], "deps": [ "s" ], - "commit": "a27153f6a01f38226920772dc4917b73166da5e6", - "sha256": "04av67q5841jli6rp39hav3a5gr2vcf3db4qsv553i23ffplb955" + "commit": "1c80df0f2c542f54920f18aa4eb837f0a51c7676", + "sha256": "0hmsf7kgzmpzri3ggb7l6y3pvfpinfv0d24fnxpbp1zd17lfwks1" } }, { @@ -62632,14 +63004,14 @@ "url": "https://git.sr.ht/~tarsius/l", "unstable": { "version": [ - 20211118, - 1837 + 20220422, + 1612 ], "deps": [ "seq" ], - "commit": "5e2c05478868e9e5fac909ac1bee535ffc5c6695", - "sha256": "11fmcqn9xpq8hqwf914yd715xrbfyymki95iq5y3r4x42gl30q7s" + "commit": "3ab31ef28596ac2f95be4c4280cd86489232da97", + "sha256": "1vgwwzqnbd936lid4aniyvg27p593psnapzk9g8xncssagx7wc64" }, "stable": { "version": [ @@ -62662,16 +63034,16 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20220301, - 1629 + 20220509, + 1234 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "b372f9a44bea03cce09b20cd2409e3ae3fa2d651", - "sha256": "1f2cfvc4iz71x43z8f7v24cnfdvn249685qqz9lz16j2sga9f3y1" + "commit": "44533de4968fee924d9cc81ce9a23c9d82847db3", + "sha256": "13rflldz3684qv6xvg44sj6r1dzaqclmjcg0rxfnksf6cb47l1yg" }, "stable": { "version": [ @@ -62757,11 +63129,11 @@ "repo": "HenryNewcomer/laguna-theme", "unstable": { "version": [ - 20220109, - 1015 + 20220419, + 1459 ], - "commit": "579bbd2453bd88673873a012dd70522e7d4265ce", - "sha256": "1lnmsicybg02i7yrl3gfngmwa4yyskkq4qrba7cgsgvhadg9fdmq" + "commit": "48d14ffad6f0ffb4bd60c341e618c47ddbb7a2d8", + "sha256": "0s2pm1ykkg4r39sigbpr5rjqv25dxpiz47jg3j38m2qpihgi03nw" } }, { @@ -62795,8 +63167,8 @@ "highlight", "math-symbol-lists" ], - "commit": "c73645f35868bf436f9b50dc81a75b58c7e10806", - "sha256": "0bpyzm71b1fh48yp73m4vh99c7q4sd69lynkww6c8yrjdqlwbb27" + "commit": "67ae434d6ce2073e9c914817d21269f5c6a2a66f", + "sha256": "14m9i4ikppbf4ffrxibhdlvanyvjfhx68xalga66lj5chhhdqbk5" }, "stable": { "version": [ @@ -62935,19 +63307,19 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20220321, - 638 + 20220411, + 1932 ], - "commit": "46a44793a2ac73c7b70f8b4c11818423aa1582e3", - "sha256": "0i3qww2lc7kcvw27iwwvi871k81s8jc2rbfbpcnrsy3cnrxx7smd" + "commit": "5325af36d9cd726de47a698ac159fce59f3fd6d9", + "sha256": "0fyalqpipw6855dacrv72fqmvbmn7nvbgb5byz8wl68qpykyla6b" }, "stable": { "version": [ 0, - 18 + 19 ], - "commit": "c945568a2e40e8d7e9738a534ce54e9ff59779c6", - "sha256": "0ny0sicma48snzyhh6xv1zv4vc87mmf4jyacpky3i6mk6gdwxfl8" + "commit": "9efb210e5f746dd83bb3f132b46fb0b1f035def4", + "sha256": "0p1kx67fdg8r8fp479170b4hl5j9r3n2x41bi189aq29b02qh94m" } }, { @@ -63303,6 +63675,24 @@ } }, { + "ename": "le-thesaurus", + "commit": "4534fab1d43c425745f44465adbd1f8a9168ced8", + "sha256": "14sg1c7wn9f6xk1sychw857f88ddlx9c6b71p8cw08gz5hdm2463", + "fetcher": "github", + "repo": "AnselmC/le-thesaurus.el", + "unstable": { + "version": [ + 20220509, + 2120 + ], + "deps": [ + "request" + ], + "commit": "2af1ab37097cdd17044ab217e9aa6839add98626", + "sha256": "1w2k2pvzgd5v008ma9bc6y16aiyjixhgvrn7bxf6cy43056mh0wf" + } + }, + { "ename": "leaf", "commit": "24afe5b39979e2f17e104ae97d840645d2a5c2f1", "sha256": "0h4v3fswbwa40hws8l29mmnka5wl9kyj6f01dnvadc725a34az38", @@ -63464,8 +63854,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20220124, - 1813 + 20220501, + 1007 ], "deps": [ "dash", @@ -63473,8 +63863,8 @@ "flycheck", "s" ], - "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df", - "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p" + "commit": "362bc6fa3efb1874c525ed6b4b6f24f76af22596", + "sha256": "1lr4h555fa1kdi3q7hkhsnznv7nh9rgjqjkbj2bqp9zwh06245w3" } }, { @@ -63573,8 +63963,8 @@ 20220307, 854 ], - "commit": "b55384d9cd14aa0ba3eb100660f929cfa6674558", - "sha256": "0wn9v7qarciq16hhcl8dy8yp1hcdhmircqkla59g5khv3qybjphs" + "commit": "11e850395448ee7012dba16bd6df103f5552ebfb", + "sha256": "0hzky36vrlb7kvpyz4gy3zn01zdlmlx0s58w6ggk5djbcvjc2rfx" }, "stable": { "version": [ @@ -63609,8 +63999,8 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20220206, - 1515 + 20220503, + 534 ], "deps": [ "aio", @@ -63619,14 +64009,14 @@ "log4e", "spinner" ], - "commit": "b3103bd08c8943091f702c66d674f0f27ef7fe0b", - "sha256": "184dxfgsy1l6r1pn9c9jb22b8gw5hah1cnhl3sncd79mzv6gjhl0" + "commit": "682f7a44d0bea0daf6f9a2888fa7f905d3a0cd70", + "sha256": "1y6b5sh83n5daz6p0n33ynf4j6227dpa54x4hpjwr8n7fkjfjwiq" }, "stable": { "version": [ 0, 1, - 24 + 27 ], "deps": [ "aio", @@ -63635,8 +64025,8 @@ "log4e", "spinner" ], - "commit": "b3103bd08c8943091f702c66d674f0f27ef7fe0b", - "sha256": "184dxfgsy1l6r1pn9c9jb22b8gw5hah1cnhl3sncd79mzv6gjhl0" + "commit": "b95221179bd51b43bb2c5e810e1a2de88ef54d82", + "sha256": "1gmap7472cakcigibydgg0zjd5yha4dp22w0ffqk6zl4qrh7hcdb" } }, { @@ -63852,11 +64242,11 @@ "repo": "tecosaur/lexic", "unstable": { "version": [ - 20220211, - 1347 + 20220501, + 1432 ], - "commit": "6301a5ad00cf8eb74e7a522c84c7ccabbec16241", - "sha256": "1bh5x3zhcx0pdfbqr90dvh6b4q361z6nsmzzcry4pld093wji0dn" + "commit": "f9b3de4d9c2dd1ce5022383e1a504b87bf7d1b09", + "sha256": "02iz8dh18gb1q97v8ghcd3lavkf28sqbrk0bx6jzzryp69ickk4h" } }, { @@ -63889,8 +64279,8 @@ 20220102, 1653 ], - "commit": "fc5ae30f6738dfd0664864698bfebb5423241ff8", - "sha256": "1ici0jqx136vcqh3rzcg4xgqsh3kjg65d5hnpivvhmflbjhkbxzr" + "commit": "6e1e42768d40528e7a13f7cebf0a56cffbeda3c6", + "sha256": "03ml1jk2d25f7rcz08f4g354sw3vb4yx5fanqaa9dnkr9zwrn9wr" }, "stable": { "version": [ @@ -64002,6 +64392,29 @@ } }, { + "ename": "liblouis", + "commit": "13f11dc010e5ba2bb722b7cbff31207be9074128", + "sha256": "08i3kbq9x3sw3i8fhlam8cwzzncqk5nzb24kd29nv7wa2q5g16kw", + "fetcher": "github", + "repo": "liblouis/liblouis-mode", + "unstable": { + "version": [ + 20220426, + 657 + ], + "commit": "a341a0c434cdbe7f46956c8db13203c3fc941a34", + "sha256": "1pkrwxqf1qyxfyyinsnmvvlydgydxazfi0xsl28f08a5zgknv0ab" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "36ec3f98c0a3a84669444a9b3726824f1aaa9682", + "sha256": "1s910nr7cdwwafbdp4kg2j3xcavhrzjla3klrjyndv7skfh2vaad" + } + }, + { "ename": "libmpdee", "commit": "fc91db6f80463a1baea9759f9863b551ae21e180", "sha256": "0z4d8y8jlsjw20b31akkaikh5xl0c05lj77d2i1xbgzam4iixma0", @@ -64113,8 +64526,8 @@ "deps": [ "request" ], - "commit": "52fcd8efc293694af1b23ea401a2991f8554dbbc", - "sha256": "1cp0301l3byhzd4gyil9p7iljfgkjn2c93ilc9b88b1kj7cvbp2z" + "commit": "e03f4a30c4abf354fb961babe4dce1dfa733aa82", + "sha256": "11mjypjv1h2qsfbqxfwknv6lp2fql4cnfsivcpj68475grn1g3s5" }, "stable": { "version": [ @@ -64155,8 +64568,8 @@ 20220209, 755 ], - "commit": "618d98641a4fc1c55d07de72c12754b85da27910", - "sha256": "1kvkbj4rpvilxl6w119xh7x9w8xdw4cgnw7gd3vl50krzj9s1ajz" + "commit": "7d706986636b5cfc04f14341c19046b56b61b51c", + "sha256": "0v7306fq02q36smg157xcsil0r99vznzf7fx0xnys2df5id0ww36" }, "stable": { "version": [ @@ -64165,7 +64578,7 @@ 3 ], "commit": "8fcf8424cbfb06d3b5a89b2ce60826a5e4bf76f4", - "sha256": "0h81778qq5j18gq8vyynb4x41zczvvprvvnis0xjl1mhpi5z2l72" + "sha256": "12c0g379jx2m30c3m9rarhh7hwg8sjsb2bbh0j6f3k51ya90kcbh" } }, { @@ -64176,8 +64589,8 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20220309, - 848 + 20220502, + 1210 ], "deps": [ "fringe-helper", @@ -64185,8 +64598,8 @@ "indicators", "ov" ], - "commit": "d60c0d498f12d550200d505cd8b43f953eff2ae4", - "sha256": "1kx2k2fsygf9qq9wq9cs6h7c4lr58ip781l9yrffj2vhhhmrg5kj" + "commit": "c0cebef629a98556f5696f78436f4d8428ce8135", + "sha256": "0k7gzx3g33wf7w3wbpiv6b3amnl2miyynvr3x6wlpzmh3q57s11a" }, "stable": { "version": [ @@ -64319,14 +64732,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20220320, - 1727 + 20220414, + 56 ], "deps": [ "avy" ], - "commit": "44e98956e04dfa8e440951c6cc6cefb9e64f1658", - "sha256": "0fhs1ha2j4k1pkfhyvc3x2mp9r3xl7slj6y4hqfzgllmhzmr93g0" + "commit": "a24546e0dee901bce94e3a11c20b1ed12a22b9c6", + "sha256": "0zdsm2wp04nlnlixgwgrs49hcg6a0pwyxv44y9is449kk5593m11" } }, { @@ -64431,8 +64844,8 @@ 20211004, 1429 ], - "commit": "08e6da70e485307b7c5777caeb60737de183d228", - "sha256": "0d5vkm5cpnl38zfbjfhbl6wffmrlxx4bxkh4w4f04pr97i899n9z" + "commit": "22dd4c3ea4c0d2bd82270e2fb272317d0bc87752", + "sha256": "02aa3ci9cfxswpv5nf0bqpp9lkbqirpmksg5hwxl0xxr672mv7kc" }, "stable": { "version": [ @@ -64936,14 +65349,14 @@ "repo": "Atreyagaurav/litex-mode", "unstable": { "version": [ - 20220308, - 1707 + 20220415, + 1704 ], "deps": [ "cl-lib" ], - "commit": "59ef93dca6618c42db1b61fe0a44bdc8faf04506", - "sha256": "08i5v97azfxkp4aqsg2kijyy2w5swxhkplvp40v1bswyy3kn176v" + "commit": "5d5750af2990c050c8d36baa4b8e7a45850d5a6a", + "sha256": "0kfij90iqslc6lnlpvj0hmfhfrfhp28ljd4zj6gv8wz02aldkjgd" }, "stable": { "version": [ @@ -65022,20 +65435,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20220208, - 308 + 20220512, + 34 ], - "commit": "d3c813f90083ee1a146b3e2d96c8bc47b9e7ff7b", - "sha256": "18kak48a6zs065xx7q47kqs9hx5n0lbr0a2pvlh1wxhncnh8vgpj" + "commit": "7eaf6dc55caaaa65c5d6937b25e1748df75dbdb3", + "sha256": "0gcszam4qsl64jx5yggbawsawrj74cqsp7mbzmvvs40gr8pvx2yp" }, "stable": { "version": [ 4, 8, - 0 + 1 ], - "commit": "cc2adbd4455dcc70cc1366af5e0754a619e75242", - "sha256": "14n8cf020hpz9hrhf7pxcxszvbkp19s5j5cz3a42n4jh7jpacdzp" + "commit": "b10020b0414f15990f4139c363910b58c7ca0852", + "sha256": "0lch1m9xw5xq71sllkhiaxls8rbq9gdj24pyi66p7g6026n5fc21" } }, { @@ -65136,14 +65549,14 @@ "url": "https://git.sr.ht/~tarsius/llama", "unstable": { "version": [ - 20211118, - 1847 + 20220428, + 1405 ], "deps": [ "seq" ], - "commit": "22278a95474ccd665f84c16aa8760534ced9b150", - "sha256": "1f5hnimnz9vjwnqk0m07g6rrhnxbv84mdybxiblzqgbgrh7x0cx3" + "commit": "3dd1d99ebc99aa39b165569b3d02a87368d4849a", + "sha256": "0x41fagf4917yb5y3na5y1x60vfzdi44cpimdmg4dz4vcp3g23mm" }, "stable": { "version": [ @@ -65421,8 +65834,8 @@ "ht", "s" ], - "commit": "b5ca8bd44a900fb85636fec9b326d0c117d3b8a6", - "sha256": "1ay81g4s02jkwwy62s2c3218b5z9z012nyrqihlx44fyglyi27b1" + "commit": "b3366ec866b6e3b5c608fee23e86eb832d132ef8", + "sha256": "106fgd8id9xrrl7qyyzxxmi690m29i7zcfk6anc5h52lm52ydk0j" }, "stable": { "version": [ @@ -65447,11 +65860,11 @@ "url": "https://hg.osdn.net/view/lognav-mode/lognav-mode", "unstable": { "version": [ - 20191124, - 1011 + 20220410, + 1344 ], - "commit": "7eb9cd2af5b47116fe475870b41dded55052c14c", - "sha256": "10f3im4x55ag6mhrrsjkylmaxm5s7dj7mwmppzm2yvs1nq0fxa79" + "commit": "100541ec31468b771073a7d2ad4512c1dcb1eb07", + "sha256": "11kk4irx6mgq4frfbwinx9bw1lg5nyk4js137j50rq3wfgkbjsbs" } }, { @@ -65656,28 +66069,28 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20220209, - 320 + 20220510, + 323 ], "deps": [ "map", "seq" ], - "commit": "e3933cccbce289eef2591cd0bbd42de55a56cba7", - "sha256": "14wd16dkqcn8ip6ijhzchdm9i6i205lgin66g7amrqs26vx6wqw6" + "commit": "98537cb29e28d32d3607fa61253ff1bf04db2539", + "sha256": "1skl536wmygbnnvcdh307zh5d3y0vz31q0nkwvbd5rpifl4rpk2h" }, "stable": { "version": [ 0, - 9, + 10, 1 ], "deps": [ "map", "seq" ], - "commit": "f75f906397fb95a20ecdb61589d02712de0264fb", - "sha256": "02za26xsivayqmdbs2fy36vp1jvlvr5zanb19ayglbpakmg8ply2" + "commit": "cd49433244ef450a1dd10a65a7839076d61bdcf1", + "sha256": "0mdr09vqy4xrqb2l4g3j8n99zvqajw1jxxvvm9zv03zkwvcink1c" } }, { @@ -65688,28 +66101,28 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20211020, - 157 + 20220330, + 127 ], "deps": [ "dash", "loopy" ], - "commit": "e3933cccbce289eef2591cd0bbd42de55a56cba7", - "sha256": "14wd16dkqcn8ip6ijhzchdm9i6i205lgin66g7amrqs26vx6wqw6" + "commit": "98537cb29e28d32d3607fa61253ff1bf04db2539", + "sha256": "1skl536wmygbnnvcdh307zh5d3y0vz31q0nkwvbd5rpifl4rpk2h" }, "stable": { "version": [ 0, - 9, + 10, 1 ], "deps": [ "dash", "loopy" ], - "commit": "f75f906397fb95a20ecdb61589d02712de0264fb", - "sha256": "02za26xsivayqmdbs2fy36vp1jvlvr5zanb19ayglbpakmg8ply2" + "commit": "cd49433244ef450a1dd10a65a7839076d61bdcf1", + "sha256": "0mdr09vqy4xrqb2l4g3j8n99zvqajw1jxxvvm9zv03zkwvcink1c" } }, { @@ -65776,8 +66189,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20220313, - 1835 + 20220430, + 1535 ], "deps": [ "dap-mode", @@ -65787,8 +66200,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "fda433671f38874f0ebe66c43c64fec14af3f492", - "sha256": "1zszzw0a58s1clsvhvqxymivrw2x6p96cxx9pygr8is8f9353hpg" + "commit": "7ca60ce9a703ad7a950dcd5ec36ef4251f57d207", + "sha256": "1snsnd9pgq2lz3avypps73qfdl3ky2i5sx04sybj7gj41yz834bc" }, "stable": { "version": [ @@ -65816,8 +66229,8 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20211203, - 1659 + 20220501, + 1056 ], "deps": [ "dash", @@ -65826,8 +66239,8 @@ "lsp-mode", "yaml" ], - "commit": "c2da2a65cb11e92d23c480dcc12387aa53997181", - "sha256": "067bc37v14mvrmayah95qkcmi8gh3fdhdh8493wabm47kgszsfh4" + "commit": "c57863609abfb93fccabf81dc3112ac38f93c4a2", + "sha256": "007rf2zbkskidskmcnlsx56dxv0saqm2nl9ih1rk6h9vm27yl24z" } }, { @@ -65870,8 +66283,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20220222, - 638 + 20220511, + 707 ], "deps": [ "grammarly", @@ -65880,14 +66293,14 @@ "request", "s" ], - "commit": "20112b40fd3f6cbd20c659ef43a6da6635e610df", - "sha256": "1p3f90f0gsa8mj9pv905f51zb1ymyfbhz20171hv69klz4hlqfsn" + "commit": "709c522df7a68e2724dbfb5bd210199dff5a2264", + "sha256": "188sx0a6n1kl9awcic1pjbzxsqhq2cbbk8chbp8zgpl0x67ph7d6" }, "stable": { "version": [ 0, - 2, - 2 + 3, + 0 ], "deps": [ "grammarly", @@ -65896,8 +66309,8 @@ "request", "s" ], - "commit": "984037557b7e445183453faffc965fbe56df12f2", - "sha256": "12q3j0sgsgm73m3i0sw72dzkqa55zn0dbqjgp0g2wryhfhg0zq1p" + "commit": "fe47a75700dc4f16ec4ff77d6d0306f39566464b", + "sha256": "09kylilfw9qysd8bqf9dbc4mlzxam5iph64c09c5xyfzagmmhx8n" } }, { @@ -65914,8 +66327,8 @@ "deps": [ "lsp-mode" ], - "commit": "7cf64944ab3a25ea5d6f8d5e0cd33124182df991", - "sha256": "037wcvan0185bhzzhi4phw9z245a28s29zvyfik04c27n0bhm2xf" + "commit": "daa51072e1718ca075987901fccbbc2357bca1fc", + "sha256": "0d2myk2906j0ngivca1yf4vdi8bfk5pz706nx279bf0pil7irdy0" } }, { @@ -65990,8 +66403,8 @@ "request", "treemacs" ], - "commit": "0968038b9aea52ef3bf499e597cf3800d913c059", - "sha256": "1rpssrv1avbfq47h23qiymzhzddcxgs77diwq3mavqkxkqrkj3vz" + "commit": "39ca56e24d6f9db2c9d889f79808713e4afde027", + "sha256": "011c2b25k650fbxvpifmld6v0bga1s5679zfl10f1srhlk56p47v" }, "stable": { "version": [ @@ -66040,26 +66453,26 @@ "repo": "fredcamps/lsp-jedi", "unstable": { "version": [ - 20210602, - 1925 + 20220430, + 18 ], "deps": [ "lsp-mode" ], - "commit": "ab265f7fb26f4fa0385158a9f9d3649b606d2e23", - "sha256": "013vmhcxz7648jxxhk69rr0v5br2839517l72fwzk770l02mc6si" + "commit": "5e3eb3e160c2d38b8bd2b5cd3b86fa4f823f9330", + "sha256": "0kax988drrzsx103v71bz4vczh4bg0n80arrzm4r6sgrk01219j0" }, "stable": { "version": [ 1, - 0, - 0 + 2, + 2 ], "deps": [ "lsp-mode" ], - "commit": "a6a6dcfbab69caee0b88dbe4244772e0bea5531a", - "sha256": "0l2dawi7avzb9i1wfff4kdfbz9s7vp4443y7x3va0jrsn3v33485" + "commit": "5e3eb3e160c2d38b8bd2b5cd3b86fa4f823f9330", + "sha256": "0kax988drrzsx103v71bz4vczh4bg0n80arrzm4r6sgrk01219j0" } }, { @@ -66132,14 +66545,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20220222, - 656 + 20220508, + 533 ], "deps": [ "lsp-mode" ], - "commit": "435128d5cdc8822ccf1bb58f45184cdd9fb8589f", - "sha256": "197drh6lwghdcf52hdk7kc315jlpxlaz8cj76b4q28s0g63bh8bc" + "commit": "8c2ba735ed1e21777408167f6a7c7d9681d9e7bc", + "sha256": "1iqmvy870vllb794cpmsnpm65hindxym9dnhb0pnxz0mf6hcvz2v" }, "stable": { "version": [ @@ -66164,8 +66577,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20220314, - 1111 + 20220510, + 1457 ], "deps": [ "dap-mode", @@ -66177,8 +66590,8 @@ "scala-mode", "treemacs" ], - "commit": "b7fe3ade85d020560947f1a4f4913130c9dd1809", - "sha256": "0dq18p5bqqyf36mqck0iprydjm77y29k8n2d25xz26i64s3pkykq" + "commit": "6980fb902c3c7b43ff0d4056a6cd7d8b4709866e", + "sha256": "0v2zj1jrgvx6gwhp414v9jg8j0qz724dv2fh8xwqksl5qjiq6kaz" }, "stable": { "version": [ @@ -66208,8 +66621,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220325, - 1415 + 20220511, + 1331 ], "deps": [ "dash", @@ -66219,8 +66632,8 @@ "markdown-mode", "spinner" ], - "commit": "95a5270ff783af063392286e8f45cf338c5a9765", - "sha256": "1sbww4m1pm5n0y3gzsqdggv39ic39gy0l15va5m26pvz9ffd7367" + "commit": "465bcc5fbeb6293446a3241f5f2c1b872337958c", + "sha256": "151vc741rwi2gggkw39msql1y050b1n46rrjnzalz9nqsk6l5dp2" }, "stable": { "version": [ @@ -66258,8 +66671,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "88319a61a06e27fc1d3ea2e7b853ec1692b4c166", - "sha256": "0007lv95cqh8makipas2m4rkllig5zvi51hv3zadlhw57xnvlhjw" + "commit": "8d5d4d4a7f72b4cae89a48ea8618f3ef28bcb121", + "sha256": "1q7d6cbmdr00a36q5nhs2fpqvgapx7fh1rwzp7ih079w7aszm002" } }, { @@ -66277,8 +66690,8 @@ "lsp-mode", "origami" ], - "commit": "5b88ab77dc2696c93fa5dd9debe183821c533b71", - "sha256": "0chf7b8qdgzm173crpbz3vl3kjhgcdsmkprz8bf6w3qb5lpvaysw" + "commit": "7df9c91a309aa4229bec41f109920b37c4197618", + "sha256": "1kq2r2rjwk0ryc832fqfqb3l1yr2ysrj36dzwnj7h1np06rdzpwv" }, "stable": { "version": [ @@ -66367,16 +66780,30 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20211103, - 619 + 20220411, + 1753 + ], + "deps": [ + "dash", + "ht", + "lsp-mode" + ], + "commit": "ab7369d96f4d7d058d0e06e743f86fda8ecc191c", + "sha256": "0dr47dhp0ymb4gmx4xiayiapbkri1hgr2faivp4fqs6gz3w4z4kn" + }, + "stable": { + "version": [ + 0, + 2, + 0 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "fa6698a6e33880feb16d264172aa665d14cb8a6f", - "sha256": "10y3gsc4wawh4rjv25dr10wb65wmwmrz1wnf5qsaglq2c5svhxhy" + "commit": "3598bc7c47c2f2ff6fc94ca50b5a4e4db4c25f97", + "sha256": "020njrx0g4isjshldq4gd3f0jp6h3xgk7xs0n0a7czp5hakx9p3n" } }, { @@ -66393,8 +66820,8 @@ "deps": [ "lsp-mode" ], - "commit": "ab052be5c4347e909dbfeecc83d43b9d75ccedda", - "sha256": "1bdlkqkqssz56kskff2pm2bkdb0bscfbqbd1vk3li20036c5dq05" + "commit": "f8e7c4bcaefbc3fd96e1ca53d17589be0403b828", + "sha256": "1z7cs2linikm54a7dqn66p58vnsnhy2rj99l2wixa6cdfxlmacn0" }, "stable": { "version": [ @@ -66444,8 +66871,8 @@ "ht", "lsp-mode" ], - "commit": "3af97828f9c08d782fb2086e3a73bda5759e6788", - "sha256": "1d1yfgvdyas6vbg992f5s4sayaxjxs33gh13z629x67hx6p22n3r" + "commit": "a429be2aea7797369a3c751ef54e3554733117be", + "sha256": "11rgfn9sdwxsncc4xrchiqn9dbqi3zirjvbz91kc5rvjv436077b" }, "stable": { "version": [ @@ -66476,8 +66903,8 @@ "deps": [ "lsp-mode" ], - "commit": "97ff36b228a61e69734c7180f33cc6951b1a600f", - "sha256": "1pal3mga7nwfcvri1cffsjgcbbhk7wd1icd622qspqgq0zkfs8jd" + "commit": "f877659babd3b5f8ec09a8ad7d08193d95b6822e", + "sha256": "0v7nz76wah1ihdi3rjrcm3xljj7p16161rzdiqk0ds4y0xll00xs" } }, { @@ -66494,8 +66921,8 @@ "deps": [ "lsp-mode" ], - "commit": "010318052021ec041727e58e41752af094c8827a", - "sha256": "1rwszx7qza3nshcwvgq0lq3bnrggyq45k4363bhcqf95fbjl5jxl" + "commit": "8c04fc4ac6f5eb8053ecdaaedffa35e0f7a5b865", + "sha256": "01qn3qkr06jz0xsqvz76pc2x8aby0hv1f84mh1v3zsmcjdb64vy8" }, "stable": { "version": [ @@ -66517,8 +66944,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20220102, - 1517 + 20220502, + 459 ], "deps": [ "dash", @@ -66527,8 +66954,8 @@ "lsp-mode", "treemacs" ], - "commit": "72d367757a89453a712f6ba1df9b6e789ece2bbd", - "sha256": "0jy4zq1b5l6m2nd2zz99m0fy88w570d4n8v84lrkkzllc1n488lk" + "commit": "9859326df6b8e8c954a3c227e53b6878e54aaae8", + "sha256": "0g1azw6638hig4bwy00wyr8pdj13dwf3v5lsjbgxsgckz831wl79" }, "stable": { "version": [ @@ -66554,16 +66981,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20220311, - 1634 + 20220510, + 627 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "96b1ecbfbf87a775f05b5f0b55253376a3bd61e7", - "sha256": "0xjskdws354zbs906frcmx37862xldpai09sicdk8jy2sdwhamk6" + "commit": "eba9c4eaa255a14e2facd658e7122674c05390f8", + "sha256": "09c6qy17dlqh2jnzk6xf6cj8r7gbwgn59cmhaadzhh3v3n13362z" }, "stable": { "version": [ @@ -66667,11 +67094,11 @@ "repo": "hawk/lux", "unstable": { "version": [ - 20220121, - 913 + 20220328, + 1301 ], - "commit": "4304c89b3c9cccb256655b7d1058d7619e926dc7", - "sha256": "1fynv13wv13dzl7s84x6b4sav1im3rhrzds38w4vl1nx2jvgiya4" + "commit": "924dcda3e4212c0b28e8ce140b9d8e9a1117c5ef", + "sha256": "0gq5f2jg0nlmqg6vlgkvms0axa1yjqbql6xjkgv1qh5iwwgkiinx" } }, { @@ -66891,6 +67318,24 @@ } }, { + "ename": "macports", + "commit": "90d3395497abafe2016555dc000c21fa0c829ec7", + "sha256": "0s2ipwgwnrwp2x8gzlkr2y488ij4pah3mymjy3z2nivqs5lg5chv", + "fetcher": "github", + "repo": "amake/macports.el", + "unstable": { + "version": [ + 20220512, + 1330 + ], + "deps": [ + "transient" + ], + "commit": "ebca27f8e16d3607070582849bea81d40ca5f584", + "sha256": "0xz5y5smfa69ylngkfck935c03ak40i4aazzklzyslv385vv9kd4" + } + }, + { "ename": "macro-math", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "072ycszl4cjc9nvv4axsgyfzz9djpgh4y1xqfr1nxi41nsdfc9kn", @@ -67050,11 +67495,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20220311, - 1219 + 20220422, + 837 ], - "commit": "86f1ca9f0f45e61a1ac7b96c809a85defc4ca665", - "sha256": "0scg4n7p9k7kj18w2v73f3w5f6xwf7fpjvf0sa253jwpdk6ln5b8" + "commit": "af1b83786c95d448dcb4df5406eb1cdba975abf5", + "sha256": "0aa1fg658j11990h9dfv9n92qa1f36szamfnq37pw27d08n4vkb8" }, "stable": { "version": [ @@ -67074,18 +67519,19 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220326, - 946 + 20220512, + 1218 ], "deps": [ + "compat", "dash", "git-commit", "magit-section", "transient", "with-editor" ], - "commit": "b1702991eec2c068d282fc2f1bd665726a14e10d", - "sha256": "0gyvbhwm5x7wgm4cdp3v0h8vv5vkw066fmwsvlvgyqqppkq5pqz3" + "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d", + "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c" }, "stable": { "version": [ @@ -67158,20 +67604,20 @@ }, { "ename": "magit-commit-mark", - "commit": "2d6e8cd768a8d119f1ac3407f9d5793b084e8f1d", - "sha256": "0dvw9plzhm3yql719xi2n4j1v9q31g67jnwx5n5pzjk90v2rzqxm", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-magit-commit-mark", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "04j8sr7yzl9ipwsra19vczk025v9kba8w43sy37r335dy6h7vr74", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-magit-commit-mark.git", "unstable": { "version": [ - 20220315, - 250 + 20220511, + 2341 ], "deps": [ "magit" ], - "commit": "f0fff86ffb669357b0897132d386c4c19dbf300e", - "sha256": "0l9fg19izp4f4ph9by1zz6nwpxpvgdl77kcbxykphf22wx5j0jyr" + "commit": "ce2cd6daeb46eaea597a3b2c9d9ead80da9f0d09", + "sha256": "0kawy31kd0ywmrz705i5yf7blpd3zllpik0688j7cn0rq663vv2r" } }, { @@ -67443,15 +67889,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220130, - 2007 + 20220429, + 1720 ], "deps": [ + "compat", "libgit", "magit" ], - "commit": "b1702991eec2c068d282fc2f1bd665726a14e10d", - "sha256": "0gyvbhwm5x7wgm4cdp3v0h8vv5vkw066fmwsvlvgyqqppkq5pqz3" + "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d", + "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c" }, "stable": { "version": [ @@ -67599,14 +68046,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220325, - 1720 + 20220506, + 1936 ], "deps": [ + "compat", "dash" ], - "commit": "b1702991eec2c068d282fc2f1bd665726a14e10d", - "sha256": "0gyvbhwm5x7wgm4cdp3v0h8vv5vkw066fmwsvlvgyqqppkq5pqz3" + "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d", + "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c" }, "stable": { "version": [ @@ -68181,8 +68629,8 @@ 20210108, 1832 ], - "commit": "3a8398de3a79ca03f9fe55f6f31f70f3f62f8999", - "sha256": "1788n96c5h2s0qmwc7xw9anhcw6l0qqfbgx8mrp2n95mdix04n18" + "commit": "e1af20253fbc5a91034ccd01cf00141130c11863", + "sha256": "1pvyv1yhhm5ziqrlvd0hfphp3mcdh8iwwqs5awb54frj9j61fsi8" }, "stable": { "version": [ @@ -68207,8 +68655,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "492307c6c67c1b397084d85129e2b82cfd2c6556", - "sha256": "1di0m42hxi276a1axqayzvwqalw77zxy89qlnshldh373r5s20ax" + "commit": "e4c38aeb8ef6a85d8c082ad683720e5a4174aa79", + "sha256": "18w2xazs6hw49z7v2z8dcjwbzn696vny22ncdh0s2szp0acwvlaa" }, "stable": { "version": [ @@ -68231,11 +68679,11 @@ "repo": "choppsv1/emacs-mandm-theme", "unstable": { "version": [ - 20191112, - 1832 + 20220426, + 1131 ], - "commit": "4e6ce4f222c1fa175d56e926628f37caa5f398ce", - "sha256": "05lb7izcwivjlyx6442hkskppr2158wg0b8g9k435xl083vxmpfw" + "commit": "4991bbc4b17308f5dc53742dc528cbfdc467ee01", + "sha256": "1wykcvsw54fla7n01xqclbm4vmfpp4iikw3aqb7m04h0ayx56y02" } }, { @@ -68384,11 +68832,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20220312, - 1357 + 20220426, + 449 ], - "commit": "e63d27e6fb24ed16339de9d813c555d40aa1e4ca", - "sha256": "0pfl2h0xgd9jbpzw8b25pa601gad8p4l470yrkhzyzv5hs7774s4" + "commit": "26f2bd9ee7b63bcad6604108e2f565b34bc6083b", + "sha256": "0bbmhgcx6266rljbw641c7q8q7ygz8i4xvk6zyaqwvmnq09xqfch" }, "stable": { "version": [ @@ -68504,11 +68952,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20220212, - 728 + 20220508, + 1219 ], - "commit": "521658eb32e456681592443e04ae507c3a59ed07", - "sha256": "162xfchw2nxsx5a53kx15qlhr0vqqsn1vpqjnfp3ys7yngs3vvdm" + "commit": "5b6e660c13ca3f4d15dbc1aa3d7ab2f228491ef9", + "sha256": "11phyiblvxzx3dqqqrqlfi0q67ih1hy1630rlx6pi7w835npn0wz" }, "stable": { "version": [ @@ -68719,8 +69167,8 @@ 20200720, 1034 ], - "commit": "9fb36834f151ff47ae4122cc18c341f366f035fc", - "sha256": "0yb4kr5986shjjd8j6sjvynh4ijmq38y4yjy2hmrzk7chd658qnc" + "commit": "c36dcf8c282f547da5b3666f025a3000b5dbd1d9", + "sha256": "135j7i4y5jhypbknknmpha6mfjfzphb3n7pb303dss0amxfs0430" }, "stable": { "version": [ @@ -68800,24 +69248,28 @@ "url": "https://codeberg.org/martianh/mastodon.el", "unstable": { "version": [ - 20220216, - 1103 + 20220405, + 1531 ], "deps": [ "request", "seq" ], - "commit": "f7de456e918fdde1c7728e6fe435d9d40d98dd4b", - "sha256": "0hk3w0z9qh5wn76rab6glb269s2fardcy82llg4azjp2vna4zb4l" + "commit": "e5ff349d23c71a521db41dcdb1ac9765bac5388f", + "sha256": "1iq7m0acvhb86l5p7ah2pq2fz1716l94dw1m7pbi6asbnypgnavy" }, "stable": { "version": [ + 1, 0, - 9, 0 ], - "commit": "5095797ef32b922d2a624fa6beb970b5e9cf5ca0", - "sha256": "0hwax6y9dghqwsbnb6f1bnc7gh8xsh5cvcnayk2sn49x8b0zi5h1" + "deps": [ + "request", + "seq" + ], + "commit": "b3649a12a398537ade7136d704f2f05ccc856e23", + "sha256": "13swcbvwhjl8ksrgzvmfafkgd3iz8znk49bs1n48w3g9qvh097w7" } }, { @@ -68851,15 +69303,30 @@ "repo": "matsievskiysv/math-preview", "unstable": { "version": [ - 20211221, - 1611 + 20220512, + 1853 + ], + "deps": [ + "dash", + "json", + "s" + ], + "commit": "0f0b2315d23e5d18b627c9faa8f231f175b728a0", + "sha256": "003ih3nrv753rj4ssdvs6ddqzxgl63vzmrypd41xf4g5dfsbmsf0" + }, + "stable": { + "version": [ + 4, + 0, + 0 ], "deps": [ "dash", + "json", "s" ], - "commit": "75dd44ad8dcfa12fe03f8e65babe0ea04e1a7d1a", - "sha256": "183m24yj54j8mix27q731wdxp1yyjm9qgd82hqflfivldlabm0x8" + "commit": "0f0b2315d23e5d18b627c9faa8f231f175b728a0", + "sha256": "003ih3nrv753rj4ssdvs6ddqzxgl63vzmrypd41xf4g5dfsbmsf0" } }, { @@ -68908,11 +69375,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20220311, - 1955 + 20220412, + 913 ], - "commit": "45febb409c474417562f79e90387d3568b4fc024", - "sha256": "0sn4c8gbvf68sn3qh75lq499lqds1rcc7ccifj5zgzxcgaf2x2wf" + "commit": "5069e3ca0034e0da64eb9b3cd426f52992938d06", + "sha256": "02b4gayf67fgsridj2a57p0x298pj4dly8nkimyjm15k8152s9c9" } }, { @@ -68923,11 +69390,11 @@ "repo": "rudi/maude-mode", "unstable": { "version": [ - 20200725, - 2035 + 20220419, + 1454 ], - "commit": "008f372631a1efe15be033792cfb1686b1736aeb", - "sha256": "07a51iwlzj88b6jaxzz8p8r7l9kcbflw8l11h67sx5y0gv23a6vv" + "commit": "68de3c11ae16c409afa74516aaf465996d1a9e59", + "sha256": "18dwn1wp29yr9k8967qnm9avmdi2wxn82kjsyykj1xy3sh9n28my" } }, { @@ -69026,8 +69493,8 @@ 20211205, 1100 ], - "commit": "ca0a3878763180fe2d775feae88b87d21dd8dcb8", - "sha256": "101fynqcw8hnhrgkxb3wdh9a2iqp35q1rh7hijnzz5xpxds2sj96" + "commit": "09f32af1a58d0b042b699c76d2b30e9226508f5e", + "sha256": "12pjmg7jxr7gjamjdgkgnmf05ivg7sxilfdqmd7mjzlr1n73iby7" }, "stable": { "version": [ @@ -69415,11 +69882,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20220321, - 2047 + 20220501, + 1918 ], - "commit": "979acca991cdada7438f360ef0fec573b20f4f96", - "sha256": "0m46nil2bbmks6d9zg18246xfwjyghdfsim5fvfhxq39amw5rp9j" + "commit": "72d6ff36b62a57aa9c9dbfbd44cdb3002a0e940a", + "sha256": "0vaam51wg8a7ilk9kp3lvz3p0vfcc3fl2nkpwswdadgr69f2d4qb" }, "stable": { "version": [ @@ -69439,21 +69906,21 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20220318, - 2012 + 20220502, + 811 ], - "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", - "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" + "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee", + "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm" }, "stable": { "version": [ 4, - 4, + 5, -4, - 413 + 414 ], - "commit": "7607238326a9352cbee9ecf612669e28ae9fa36e", - "sha256": "0wijg1vh2q6yr46vkv34vvksligd0ajl4hv7m6qbz3ywqr8akg23" + "commit": "cc1582373e5baea1d236a63be39493858032a182", + "sha256": "125gyk63fg9plqkyrkl3wvpr3czjxgvshf4496fc4swldl7z587c" } }, { @@ -69471,22 +69938,22 @@ "auto-complete", "merlin" ], - "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", - "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" + "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee", + "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm" }, "stable": { "version": [ 4, - 4, + 5, -4, - 413 + 414 ], "deps": [ "auto-complete", "merlin" ], - "commit": "7607238326a9352cbee9ecf612669e28ae9fa36e", - "sha256": "0wijg1vh2q6yr46vkv34vvksligd0ajl4hv7m6qbz3ywqr8akg23" + "commit": "cc1582373e5baea1d236a63be39493858032a182", + "sha256": "125gyk63fg9plqkyrkl3wvpr3czjxgvshf4496fc4swldl7z587c" } }, { @@ -69504,22 +69971,22 @@ "company", "merlin" ], - "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", - "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" + "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee", + "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm" }, "stable": { "version": [ 4, - 4, + 5, -4, - 413 + 414 ], "deps": [ "company", "merlin" ], - "commit": "7607238326a9352cbee9ecf612669e28ae9fa36e", - "sha256": "0wijg1vh2q6yr46vkv34vvksligd0ajl4hv7m6qbz3ywqr8akg23" + "commit": "cc1582373e5baea1d236a63be39493858032a182", + "sha256": "125gyk63fg9plqkyrkl3wvpr3czjxgvshf4496fc4swldl7z587c" } }, { @@ -69559,29 +70026,29 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210615, - 1208 + 20220330, + 1736 ], "deps": [ "iedit", "merlin" ], - "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", - "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" + "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee", + "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm" }, "stable": { "version": [ 4, - 4, + 5, -4, - 413 + 414 ], "deps": [ "iedit", "merlin" ], - "commit": "7607238326a9352cbee9ecf612669e28ae9fa36e", - "sha256": "0wijg1vh2q6yr46vkv34vvksligd0ajl4hv7m6qbz3ywqr8akg23" + "commit": "cc1582373e5baea1d236a63be39493858032a182", + "sha256": "125gyk63fg9plqkyrkl3wvpr3czjxgvshf4496fc4swldl7z587c" } }, { @@ -69592,14 +70059,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20210505, - 1635 + 20220426, + 1631 ], "deps": [ "f" ], - "commit": "562ffe86cad91627e2b94b8684818562c3ad2b5d", - "sha256": "0g90fy27ivjaad1wp6rg8jx8dm44vb6zmsrlchzpwcyhkxs7zv8l" + "commit": "1a6526bc68561b7da6a612152b842a41ffb0aa09", + "sha256": "1l8vcdsgqgfbd5lp3jjjbcpxcrvgn7bz4q9g6hxqrcvkzj0radv0" } }, { @@ -69761,14 +70228,20 @@ "repo": "AdamNiederer/metamorph", "unstable": { "version": [ - 20201025, - 2357 + 20220328, + 129 ], - "deps": [ - "ov" + "commit": "3633e32a9601c491df32d6c2212dbe63dc6484f4", + "sha256": "1wpibd9ib27xp4693d1hq2qcf0yfcdyrc97i5b7zkc4h6ll3hxyc" + }, + "stable": { + "version": [ + 1, + 0, + 0 ], - "commit": "ec74c733d78c995af69ed24aa5b8a3d84e0c1b29", - "sha256": "0xkj9m9j2mgd61lxnag1n97zd01dkh9dgwpvinq142v145rd4xvn" + "commit": "3633e32a9601c491df32d6c2212dbe63dc6484f4", + "sha256": "1wpibd9ib27xp4693d1hq2qcf0yfcdyrc97i5b7zkc4h6ll3hxyc" } }, { @@ -69923,8 +70396,8 @@ 20210131, 2152 ], - "commit": "0ab2406db9b4d5dac2348dd033d5fd37abd92a94", - "sha256": "0jdv58k2h90jr2a7sxkif4diwj3c0978ajyhaapk58icihfn66sa" + "commit": "00f6045b1292d23a0579208521a470d685bdc59f", + "sha256": "05w41l2n7y2xrckx95hxa3m96py42m2wnzw2h1278zzbwpn5w1fm" }, "stable": { "version": [ @@ -70326,11 +70799,14 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20211110, - 142 + 20220422, + 1615 ], - "commit": "fca3ba548dccc6e553affca8068c9aecb6a9a789", - "sha256": "1bzxxs8mxaihpjkbxgynhsi39lbbnij28grdc3sk9sq09j9752vw" + "deps": [ + "compat" + ], + "commit": "19dae1c41542777cb5b0311b6e2e77f43e2fd407", + "sha256": "0rngii17j938hpri6dlijrwyr18mdbxjkq9nkgi57h6aqvh2s49c" }, "stable": { "version": [ @@ -70843,11 +71319,14 @@ "repo": "tarsius/mode-line-debug", "unstable": { "version": [ - 20210525, - 2014 + 20220422, + 1615 ], - "commit": "41184eb66a3205abcc32a885780004207df86dbd", - "sha256": "0qnrvddbka8klmihfaydpkwrigrjmbabxnm0vkybdqwzx619hwyi" + "deps": [ + "compat" + ], + "commit": "e8e17b96df1b9fdc448bfc5367a24c2917de88d4", + "sha256": "1m13xvbh3msnxsr2q3ir88vmhd832rw5rih648064b0fbismszmc" }, "stable": { "version": [ @@ -70861,17 +71340,17 @@ }, { "ename": "mode-line-idle", - "commit": "6c854955505f809f7a70e8918ea3a0187e62257c", - "sha256": "0wvy7p27d4qa5f6cg1zqrm8wzfvd0wfwcc5aimcs1hkxlzl1kr6b", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-mode-line-idle", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0lw9cj9wz992hzz39x91zmf6p4jqydxjv7227gwv7h4mzw0js5i1", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-mode-line-idle.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "ab45689351aa089c9fa82805b2cf34847d26b407", - "sha256": "08flayni445wfzkmzzvppw6ak03c0asipxdl3b8rwmwjjxglx9pd" + "commit": "28658a54fbf20e8224cbc71b074670309ec2e998", + "sha256": "0l9iks709cl62yyj547fzikpc3xfpf9lg0bb1iya1hscix6njbc3" } }, { @@ -70906,19 +71385,19 @@ "repo": "SpecialBomb/emacs-modern-fringes", "unstable": { "version": [ - 20200321, - 1817 + 20220401, + 202 ], - "commit": "108daba8407dc8acf140157e7f49137c397a0af7", - "sha256": "15370yw3147fzx8ly1svk7xvm0l9fg2gbzd8sx9ls93nyml7c5k7" + "commit": "98473694a33922cfdddb18b4791028e4854b53b5", + "sha256": "0j1lyzia3i37q6b35pd06j5bkz2yji0f0r6xcgg79177zyyqj0lp" }, "stable": { "version": [ 4, - 4 + 5 ], - "commit": "6884dd16e4d76dedd792f0c5fed48ca8a2f11222", - "sha256": "10h5557sppi41pgbbjsffc9n67h8ja28skhdlklc0n6zap71m87s" + "commit": "98473694a33922cfdddb18b4791028e4854b53b5", + "sha256": "0j1lyzia3i37q6b35pd06j5bkz2yji0f0r6xcgg79177zyyqj0lp" } }, { @@ -70981,26 +71460,26 @@ }, { "ename": "modus-themes", - "commit": "1d0f3490e4b5d9b04398bc0ecd1e9a997c269d78", - "sha256": "1f1c9dkmrxn4ih50w3xnkl0j5n03sp8zc201h2iga1ig22rgy7h4", - "fetcher": "gitlab", - "repo": "protesilaos/modus-themes", + "commit": "efe3a60d8d9f467713e928b3890233c1224c3128", + "sha256": "1j4vp4j6z916mh0b2g5rzii0h9xnl1ambiaqvl5i8jycmwd38gg0", + "fetcher": "git", + "url": "https://git.sr.ht/~protesilaos/modus-themes", "unstable": { "version": [ - 20220325, - 617 + 20220512, + 1808 ], - "commit": "03f7046dff86c5342af778ad3f9850af7e950aed", - "sha256": "1ab0s4jqav3l66zzgxpx9gr6p0s3d6rhd98jkh3i3hba7qqsjn7x" + "commit": "b6285162d80fe438b4ac99acff74d33b5f901c35", + "sha256": "139ycd3p63hlxs70g266xj6i7bng1p2xavwcsxf4j4nvfayib9r7" }, "stable": { "version": [ 2, - 2, - 0 + 3, + 3 ], - "commit": "7b203db9e4295903792d999c40eb912b107ad30c", - "sha256": "14sik5hf3k2p4p6h2qrr5cknfzmksxyhng4xb2fg2cxdvxw7s1aa" + "commit": "ee0670f85bc55a3178c18774e141b4e58b2f6fe7", + "sha256": "14nfb94y9vcnpmwj9acwl6h5v0h1c6swqf33ch4zimxxqgx9zrm4" } }, { @@ -71334,11 +71813,14 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20220120, - 1155 + 20220422, + 1616 ], - "commit": "aa6666eb344947bf1eb9d14619f4249403048321", - "sha256": "09yyihx6cpa724z6cj2rqspajwj325ipgpmckklpgq6l4h5xnwy4" + "deps": [ + "compat" + ], + "commit": "d56a70bc71cdf90cfd5cf4d8517aa1d808659241", + "sha256": "07n4sqxbifkhsph45waa81ayqk9lpg51zr1zi9474s6wm9vmpf8i" }, "stable": { "version": [ @@ -71455,20 +71937,23 @@ "repo": "tarsius/morlock", "unstable": { "version": [ - 20220223, - 1454 + 20220422, + 1616 + ], + "deps": [ + "compat" ], - "commit": "ca6d72900392f1940914ee38ac3ebbce89f11373", - "sha256": "1bb1z1ycbafzyd3rq7mdr9akjcyfyvx3p0l68akkach1yj4gk137" + "commit": "3b3716e3f865dd71e3acc3f54a0a9f7e2445695a", + "sha256": "01chyar1mss073c90ixnwjzkrxzi1fvvid9hwaddwfg224w3phql" }, "stable": { "version": [ 1, 0, - 3 + 4 ], - "commit": "ca6d72900392f1940914ee38ac3ebbce89f11373", - "sha256": "1bb1z1ycbafzyd3rq7mdr9akjcyfyvx3p0l68akkach1yj4gk137" + "commit": "6683502bdb4ad0a1c37862df10b3ebfeb8ac6391", + "sha256": "16bnxp066ll5rd1f2vasrdc0zhvvpf001ssn3zrdnn12g778v555" } }, { @@ -71637,8 +72122,8 @@ 20210306, 1053 ], - "commit": "1b950579e8a422ef3aaaa1e183db330a448f18e5", - "sha256": "1gay1s7kgpkml9bk6s9a2srp19g64m57q2cc6r42h89z128wgh0k" + "commit": "247db142f7251062978ade3fd27c815259eaa05b", + "sha256": "16bdqpmj4lsc3nx78ikvgqslb6jrzc5qmkhfl8m5gy26gfd37dxn" }, "stable": { "version": [ @@ -72039,16 +72524,16 @@ "repo": "xzz53/mu4e-alert", "unstable": { "version": [ - 20220320, - 1917 + 20220416, + 1840 ], "deps": [ "alert", "ht", "s" ], - "commit": "cfd8bf3edab29ba7babb7cbe75c67aeb15a8a386", - "sha256": "1wgfs61x2m9prjnmc0019km177p9ayzyhxxf8py97fckxn2hkwlz" + "commit": "b34d0ea7b75709cc25d842a783cebea855dc9f7d", + "sha256": "09qzph8madnhd8kqnj662sgfcyvp1wg35ll6i5xbh98yazc0r64s" }, "stable": { "version": [ @@ -72371,11 +72856,11 @@ "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20220312, - 2321 + 20220415, + 2334 ], - "commit": "c0a37d5ee969ca8a783bf6c4a9084c4efeace86d", - "sha256": "0rn0iixl37px4sbkqxrfnfkq6kmb9dsn4x83rbz335dwniqxx5iw" + "commit": "d51551296425b1febd102a38a46f2d3dc4548559", + "sha256": "1bbykm7aalhpx6ndgsd8riy9xszvbghcpbkgbn64hbymsy57nvs5" } }, { @@ -72502,14 +72987,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20211112, - 2223 + 20220328, + 1724 ], "deps": [ "cl-lib" ], - "commit": "8a60fc7ef0ae6e5ca089a7c95264cd0ae83e7274", - "sha256": "14yayh8hmv00f27kgz5y57z035ccv94cmsgqpyl15p1vnwiq2if3" + "commit": "aae47aebc0ae829211fa1e923232715d8e327b36", + "sha256": "1rpimqf8srlvilnqi02lr7my9ccxc89gc14pzs6jdffc60gb4659" }, "stable": { "version": [ @@ -73301,8 +73786,8 @@ 20220124, 1806 ], - "commit": "5f94022fc9168971c77f8c12f9efd569c45f4850", - "sha256": "0lfqvm71lxxga06pjzcdydjpgd3548rql7bsjdvbknkwx2p54w4g" + "commit": "01d8a2048e13f29dd3aa06281ac8cb466caddb64", + "sha256": "069ch7h1fkm2zvw6nfndyrpxp9s2p7x3d0acswaa7isynygwkcy8" } }, { @@ -73520,6 +74005,30 @@ } }, { + "ename": "neil", + "commit": "ecede2ec0a03469b06df1fd92c5703726e33c81a", + "sha256": "1r65b7pkgsjhqxs895206s6qqmcsh04yq5sfrhci3wglg2pkw0kd", + "fetcher": "github", + "repo": "babashka/neil", + "unstable": { + "version": [ + 20220501, + 2053 + ], + "commit": "239c16655431b27ee558bf250bece4f4b10a0e83", + "sha256": "1d31g7a9js378cq56gqwrd978bzc57848j169lsykz24yqx3sf22" + }, + "stable": { + "version": [ + 0, + 0, + 28 + ], + "commit": "6e8620c1a3001d1541ad934ae2847905451a21cf", + "sha256": "0ipg6d8vm7i4jgdxa56w8a4al2nnj09pivfplfja7791mgl0qk30" + } + }, + { "ename": "nemerle", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "1rbalq3s2inwz9cf6bfmnxgqd9ylba3crflfjs6b4mnp33z4swny", @@ -74018,11 +74527,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20220106, - 2017 + 20220513, + 240 ], - "commit": "f9bcec4ce0f6cd656a56034ace7811dea769a7bb", - "sha256": "1mfx03mjm8w5djvwafd9p3zyw4aysalw4j57x1sv51shf1fzz2g6" + "commit": "958a92a979c88bee909d03a78b2faf6726d0069b", + "sha256": "0l4bi6hnwk4lssmya8x6av0j0nhvwccxaiv2ar1byiy7i3bxvr16" }, "stable": { "version": [ @@ -74045,8 +74554,8 @@ 20181024, 1439 ], - "commit": "25cdbae0ee1270a5c8dd6ba67696e29ad8076919", - "sha256": "1fwqvjg39l7321ykph3fd8dmkdy4q381jlg1jwr7ynmm285rfs9j" + "commit": "7905dee5ac62f7a1e0dfec4d936b97d96c7566d7", + "sha256": "17q8sqnrrsyxz6zld2zarp44wsjn53nsp8bz8k007wd5lbwylvg2" }, "stable": { "version": [ @@ -74144,15 +74653,15 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20220228, - 1520 + 20220505, + 1706 ], "deps": [ "magit-section", "transient" ], - "commit": "20ee8d88900b169831d6b0783bd82d2625e940c7", - "sha256": "0qv5cin9668pxm5cjhrl5sf170g62qqi954q4y2yj7zh3q0qhwpi" + "commit": "8fe2ccf0b01f694a77d2528e06c10f06057784f6", + "sha256": "08kz9qp4gp55z1i87ig0ysq6pgqgwlgr765g1vp8gsh6lp3myh36" }, "stable": { "version": [ @@ -74254,8 +74763,8 @@ "deps": [ "reformatter" ], - "commit": "0df268136d14f27770fa5bb3bdb991e987337cf4", - "sha256": "137hvv9ry2h5975v06x22bdirdn7ms0gv216wkz6y68897k7hv3p" + "commit": "487b8e26c1ea816894c590790978762daf2ee339", + "sha256": "1nqrp2jmsw21cq01xmy285nyb5rj5s5ikzi8hb981jifcdy7bdji" }, "stable": { "version": [ @@ -74383,8 +74892,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20220124, - 351 + 20220423, + 2302 ], "deps": [ "anaphora", @@ -74394,8 +74903,8 @@ "s", "virtualenvwrapper" ], - "commit": "ddb59e309018416d1f867b6dddca44f17a1b6bb9", - "sha256": "1qj1yzpgcdn550lb1c9hqc3wb46pah6h00y3m3q3n2v6cks8lnmc" + "commit": "8f247dce12bd10de37f0903f3027a1ddbc318eff", + "sha256": "0g4l2d7mji7wl2bzwj1h6p5cyw8w6bw63fcy3kqsgdjny2mkijl5" } }, { @@ -74441,14 +74950,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20220315, - 2232 + 20220509, + 1733 ], "deps": [ - "cl-lib" + "compat" ], - "commit": "13414b7a294fa6f35bbeb535cdcab6b256e39da7", - "sha256": "1grc5fk7ng4d6i8fwfpm3cb2b19s9sbdjbdn8ybchk7cj45kkl24" + "commit": "fed46eb7060aca624bfe1a18f13b73f94e70f013", + "sha256": "169asd32iask7h6m861j1qfg60mxnmxxcwc3f8ddxkpfjb6b27sq" }, "stable": { "version": [ @@ -74486,15 +74995,15 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20210606, - 2050 + 20220509, + 1600 ], "deps": [ "dash", "request" ], - "commit": "e2a4870fd5f8e37956d9317b74317d99f17b87ad", - "sha256": "1djlfvnmzcjva1s4pjhr4hhmqmd30mm48933lpgy3pnwp7gq910x" + "commit": "507831164b09a2d769bd68d5a45608fc0de626dd", + "sha256": "1xsnr4y3al9ps2v1y8yjapmghrvcgk8671h300l3w9w0gjcwkbhj" } }, { @@ -74716,19 +75225,18 @@ "repo": "p3r7/norns.el", "unstable": { "version": [ - 20220315, - 1155 + 20220422, + 2152 ], "deps": [ "dash", "f", - "osc", "request", "s", "websocket" ], - "commit": "b70ab2f9a58859243762c633628ad515f5563da8", - "sha256": "0cw0ry30im3b4b70n7rsp8pyv1567kl7byjck3rdlfrl7ll9bzr6" + "commit": "0eb487e15cf4aaaa30efde9068e205f014fd1dd2", + "sha256": "09z85fzbcibhj5mcp3i003zihqqxx8qpwrq99fjd0szjmk8g8zj7" } }, { @@ -74787,16 +75295,16 @@ 20220226, 1200 ], - "commit": "8ed6a172b35708428f84f30af44fa81c12852e43", - "sha256": "1gknm711bfyvl7mrd0an1rjlw584vrxj8j922wy60j9mrka1wmgz" + "commit": "37492858b61907e4728b2e68e67238c68e9a0d49", + "sha256": "0kc750z3p23rkn2nr3z7y205xb58qi77f2vr8w33nj4ykgil65ar" }, "stable": { "version": [ 0, - 35 + 36 ], - "commit": "7b5921877e748338359a25dae578771f768183af", - "sha256": "1jkninm2ynavacmz835s0v5iy10fw7b3v6hrnhvk1yr7zyiwhy88" + "commit": "a9b5f8959a20bbce774dec8a65a8b207555e52bd", + "sha256": "0dxvavdn97gicsjdfbrfbx1qz140ri3qdyfyxs5xxmmmc3c6gxjd" } }, { @@ -74807,14 +75315,15 @@ "url": "https://git.sr.ht/~tarsius/notmuch-addr", "unstable": { "version": [ - 20210615, - 1512 + 20220422, + 1618 ], "deps": [ + "compat", "notmuch" ], - "commit": "c447ddb94b3c2a473ec1762fc083794acd6057f0", - "sha256": "0x6vvi3j27xi2gkgd9mf7mfprmymdhc4zvna9gn71padpaqf9v50" + "commit": "dd852b09415e755cef6a345a2ee454a6cf1e1d06", + "sha256": "1v8idjm2z2jh6dqnwkslbj0masc04qw9yz6q3jxg7xm4biidw9sq" }, "stable": { "version": [ @@ -74896,14 +75405,15 @@ "url": "https://git.sr.ht/~tarsius/notmuch-maildir", "unstable": { "version": [ - 20210615, - 1513 + 20220422, + 1621 ], "deps": [ + "compat", "notmuch" ], - "commit": "fd0e2199da746906eca080d4ca5bca17068cdce5", - "sha256": "1fqnx6hhg0cqj82yjpl7llg6vvppc3y8q9k6g67mqr7z3712bw0x" + "commit": "b39cdeaec1afda6015cd0d5f4d851b3d59d0fd2b", + "sha256": "1y8nvxn715wpfxh48nxqpil277lknd70dmwnv3czr8iir909fmi1" }, "stable": { "version": [ @@ -74926,14 +75436,15 @@ "url": "https://git.sr.ht/~tarsius/notmuch-transient", "unstable": { "version": [ - 20210703, - 2133 + 20220503, + 1117 ], "deps": [ + "compat", "notmuch" ], - "commit": "d43ac12e397e1f014deef6c76aaf9b187b17ba5b", - "sha256": "1hv3p124wg8lc9jzb8llp47q9x3c9bwy7k6zvsncb1p513n7z8di" + "commit": "4f64de401b8d955dce528f76575142edd9815dc7", + "sha256": "0hrki24izxq34w7m21nqhv2rmngkjxra9s5mdr8mr6shl1678pvz" }, "stable": { "version": [ @@ -74956,28 +75467,26 @@ "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20220320, - 1009 + 20220428, + 1417 ], "deps": [ - "dash", "esxml" ], - "commit": "b6ea69a83fef6c4f547da3a4551ebed2cfe436a7", - "sha256": "1jxqwn8ybb61y59p7302ac9ph65xlqyrk8nqmswrr2czm1px7zjb" + "commit": "8f5b42e9d9f304b422c1a7918b43ee323a7d3532", + "sha256": "0xnzwmv44pfqrh7rhqw8v6rd39kshxfah6d9fxrrbv33vlqy8kpl" }, "stable": { "version": [ 0, - 3, - 4 + 4, + 0 ], "deps": [ - "dash", "esxml" ], - "commit": "b3c7cc28e95fe25ce7b443e5f49e2e45360944a3", - "sha256": "0va9xjrq30cv5kb59a4rq5mcm83ggnv774r8spmskff3hj8012wf" + "commit": "12faf16fbbaf09aadec26dfbda5809d886248c02", + "sha256": "10507fdfx02wb3j7g34w4ii8rgnjbmriq63ir6x1agf38s3i9p52" } }, { @@ -75027,26 +75536,27 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20220222, - 1650 + 20220428, + 839 ], "deps": [ "jest", "transient" ], - "commit": "45d8084aeafae415dc45ddc9c3a18b546315fcc6", - "sha256": "1iai69sdjfl9ynif7cbg654r8wdcjlkk8w8qzd2x4wxg72bfa2d2" + "commit": "6eb0a58274870dd75bf848cf5a916a9f2c6ddae5", + "sha256": "1shl3ixvbfs84cw62dh0xzc0kacpbvrg49qnbkyvk9kn91x6k9c1" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ + "jest", "transient" ], - "commit": "a699cba6a8798af709b2576f2df54abd7eb1701b", - "sha256": "1w9a9pjpp3lchl4k8y1zhdpdnmd090s8vp7vbfb89xawp1gavhxg" + "commit": "6eb0a58274870dd75bf848cf5a916a9f2c6ddae5", + "sha256": "1shl3ixvbfs84cw62dh0xzc0kacpbvrg49qnbkyvk9kn91x6k9c1" } }, { @@ -75177,11 +75687,11 @@ "repo": "joostkremers/nswbuff", "unstable": { "version": [ - 20210721, - 741 + 20220426, + 2050 ], - "commit": "fa9dcf131697ea7af066e11a1edcc881c397e07f", - "sha256": "0bkx7mwy3zbb0ixawvn4cysxk3jjc7ahssvdprvw19ls9xx3wbsp" + "commit": "7633674c89e3dbfc0c07cd7fd8b1d206ed4859d3", + "sha256": "1bxxf20nbk4amvlillyrhjiyv6l4q4ilxkxgfanvmr58nrq3illq" }, "stable": { "version": [ @@ -75300,11 +75810,11 @@ "repo": "enricoflor/numbex", "unstable": { "version": [ - 20220323, - 2011 + 20220504, + 1329 ], - "commit": "c1db2846cf7448307500fec718fab7a02b179c8b", - "sha256": "0kssw66g4hy5xs8map2vn3vygjhawp9jl0wx7nmjaaz8vagv8zca" + "commit": "55d4977c74ca33d1ad4c10fea7369f4bcdfd3f86", + "sha256": "0d43ad14b2k1w3my2nwrnw58z594hw18k6p37xvvpnx8r4fdxbl2" } }, { @@ -75426,11 +75936,11 @@ "repo": "TeMPOraL/nyan-mode", "unstable": { "version": [ - 20200526, - 1054 + 20220408, + 2334 ], - "commit": "06e67ab2c490756d3eeed4a68aba7c33e508a5d5", - "sha256": "0d0hdjliad8afz4br38gwidph9zhmm5s09y45n95kqlazq62jfsx" + "commit": "09904af23adb839c6a9c1175349a1fb67f5b4370", + "sha256": "03xp4dvq3y3q9xyb6pm9m5gb756rvbxcqk52ind08n7prqv4w1lp" }, "stable": { "version": [ @@ -75507,6 +76017,37 @@ } }, { + "ename": "ob-ada-spark", + "commit": "4f04564c778f9d404f50381c895a75f22361dae3", + "sha256": "0iyyhq8xvjs3a263xdmnba7gx8lzwgqbsqk64dcr2bcrpqiia9f8", + "fetcher": "github", + "repo": "rocher/ob-ada-spark", + "unstable": { + "version": [ + 20220401, + 926 + ], + "deps": [ + "f" + ], + "commit": "1213b877bc893ac5990a20052ea2bf2d8f086260", + "sha256": "18v4psk9ilvbnsbdksarix7zak7pbyxbn0rfy3kv9r2p0nrw9brj" + }, + "stable": { + "version": [ + 1, + 2, + 5, + 2 + ], + "deps": [ + "f" + ], + "commit": "1213b877bc893ac5990a20052ea2bf2d8f086260", + "sha256": "18v4psk9ilvbnsbdksarix7zak7pbyxbn0rfy3kv9r2p0nrw9brj" + } + }, + { "ename": "ob-applescript", "commit": "23b075774be913539c3f057dcb7f24fbc05c37a4", "sha256": "1gk8cgscj9wbl5k8ahh1a61p271xpk5vk2w64a8y3njnwrwxm9jc", @@ -75569,8 +76110,23 @@ "deps": [ "axiom-environment" ], - "commit": "e60de5ed107ffeb530a56d24d04f38988124d12b", - "sha256": "0p8kbxfcrx1ib8g17g6h2i2ygy35qq992n3s2xa6ysij7wrfn4hd" + "commit": "b52fa715285e7ad182c8e679ebf05b130dd5b5e2", + "sha256": "1hb4npfpg1iy9j0p29q1jrjgx0mrn333m45nmsnxw8nlaxzd97x6" + } + }, + { + "ename": "ob-bitfield", + "commit": "4032df23d0f2fdab9655a386bf5645d30acf5f53", + "sha256": "0aiq97h595h03fv6hz276vx1aaacl6gk4yn60ncizkas3vs8sj6h", + "fetcher": "github", + "repo": "gsingh93/ob-bitfield", + "unstable": { + "version": [ + 20220401, + 600 + ], + "commit": "28e01448ee66b8b6858294cad1b7dae0b9a85e6a", + "sha256": "16j2f54ys401q8h4hj4qvd0z7fqwk2lnfi8995sgvs00xnx2wdzk" } }, { @@ -75697,11 +76253,11 @@ "repo": "TxGVNN/ob-compile", "unstable": { "version": [ - 20220320, - 1343 + 20220413, + 228 ], - "commit": "cbfad24503491ba2bb0fff7454c339e655968c90", - "sha256": "01jmyvan8f5p4v8yyafyvv6j6fm01y184b3y6wxfk4c80m2zh86f" + "commit": "eb4fca6dc728cdc1e73d5d7ca8cad0f4cb1ad36a", + "sha256": "0y7pfb6q90mxh8rv0cdz4m28jb2alnwpkhhb7iyyhh0n4166da23" } }, { @@ -75813,6 +76369,21 @@ } }, { + "ename": "ob-dsq", + "commit": "aeef41c7d1882f400d30615e9718a22445f14697", + "sha256": "16g99k7v1x3n3bsc92kf692xx7d4016x378m4ndhh1jpvbg2gmn0", + "fetcher": "github", + "repo": "fritzgrabo/ob-dsq", + "unstable": { + "version": [ + 20220425, + 716 + ], + "commit": "b8dbf53e5d9ed359fbf69e9d14adf68a7c08af10", + "sha256": "0v721spl9n4lz70dh9vx0pc3as5crmyrwfn0zg8hsbf0gq0m745v" + } + }, + { "ename": "ob-elixir", "commit": "287e4758f6f1df0152d68577abd91478c4a3f4ab", "sha256": "1l5b9hww2vmqnjlsd6lbjpz9walck82ngang1amfnk4xn6d0gdhi", @@ -76051,14 +76622,15 @@ "repo": "shg/ob-julia-vterm.el", "unstable": { "version": [ - 20210418, - 2306 + 20220512, + 820 ], "deps": [ - "julia-vterm" + "julia-vterm", + "queue" ], - "commit": "e04ee53d67cbd715c2d84fe5bc367526edfadc74", - "sha256": "18866agjrkx2gv38zr14mhf3rlvjdjvn3i8hxg12lrbv6q4rn8aq" + "commit": "448b1d0d2edf908c13a99a2424fec20de636f5a3", + "sha256": "040k25ikvngczd8yxm8i6qa0q6vbqgsiq1ddwq1wlvhaw9iam6qm" }, "stable": { "version": [ @@ -76761,6 +77333,21 @@ } }, { + "ename": "oblivion-theme", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1w814y5q66amiz117maq297k59ng5fx3ab04cddwl8awqws58ssg", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-theme-oblivion.git", + "unstable": { + "version": [ + 20220507, + 1118 + ], + "commit": "4129672f60d55c820adf260002476d038ac18165", + "sha256": "12dlvkb3vsfgz3k7cchbcn9g5q5w8g3m1xr21d31zq67wnm3h8lg" + } + }, + { "ename": "obsidian-theme", "commit": "e90227252eb69d3eac81f5a6bd5e3a582d33f335", "sha256": "17ckshimdma6fqiis4kxczxkbrsfpm2a0b41m5f3qz3qlhcw2xgr", @@ -76786,8 +77373,8 @@ 20220307, 1315 ], - "commit": "f490dbb90052516e532b7cc2f4e6bce149e1cfb3", - "sha256": "141rd4a80vvf4hmlnfzprjg6hzgjs6g09rpy0wzxi1jsz7f0xc9j" + "commit": "c490e5b7c4b5f5e5848a5cbdb1e669588dfeaae3", + "sha256": "1kq8290g494z48a1g1myzyazzfl33gz1hws984kxv8i29lp7jqr3" }, "stable": { "version": [ @@ -76980,26 +77567,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20220321, - 1632 + 20220402, + 1505 ], "deps": [ "org-re-reveal" ], - "commit": "8ac1829bbe3458a100ef7de1195a9714b59db98b", - "sha256": "0f75k0vvikvzlkd6yr7wl53lh167njfwd0hkfp8mkxfzls36rwxk" + "commit": "df7180a8d75dedb2fd8878843a3d3cc654be508d", + "sha256": "0wf02hziqxmjvcxbnl8nr6dmgw9ivmx2n1ybrqh2k75zz1rnzasc" }, "stable": { "version": [ 4, - 3, + 4, 0 ], "deps": [ "org-re-reveal" ], - "commit": "8ac1829bbe3458a100ef7de1195a9714b59db98b", - "sha256": "0f75k0vvikvzlkd6yr7wl53lh167njfwd0hkfp8mkxfzls36rwxk" + "commit": "df7180a8d75dedb2fd8878843a3d3cc654be508d", + "sha256": "0wf02hziqxmjvcxbnl8nr6dmgw9ivmx2n1ybrqh2k75zz1rnzasc" } }, { @@ -77050,15 +77637,16 @@ "url": "https://git.sr.ht/~tarsius/ol-notmuch", "unstable": { "version": [ - 20210530, - 2054 + 20220428, + 1337 ], "deps": [ + "compat", "notmuch", "org" ], - "commit": "126fb446d8fa9e54cf21103afaf506fd81273c02", - "sha256": "1pkb333m1rryhxf26p8661y7w9fnsaarn0qkzys1pyfj09q9rsmj" + "commit": "1a53d6c707514784cabf33d865b577bf77f45913", + "sha256": "16p7j51z8r047alwn2hkb6944f7ds29ckb97b4k8ia00vwch0d67" }, "stable": { "version": [ @@ -77136,11 +77724,11 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20211030, - 838 + 20220330, + 635 ], - "commit": "a31ac05a161a91fe5c157930b62a6c07037982ee", - "sha256": "0wc0rki4zvzdxs126g5c8d92h1vfn9slfkdx831rr9d0jx93wc7s" + "commit": "8d287a80c5e3d72ac01b56c8afe60b01f18500b4", + "sha256": "0axgfpnwsi2wfr8nrzmfqkmj7y31h28sadl4yqv58m849x90gdra" }, "stable": { "version": [ @@ -77727,11 +78315,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20220312, - 1944 + 20220418, + 2119 ], - "commit": "f2c78c4a6059c5f892e48a3887d4368a547515ff", - "sha256": "1zr3pk1ifvn9j4f4n7g53q4wcd3r4zybjni8kyiil4jadmvsglfl" + "commit": "75eeae21971d86b51a712ed8ecd6434463b2d866", + "sha256": "0rl3na97qkl5a5p2ifs1sli80rq38qqmjqkv6khn60f05rj5yvk3" }, "stable": { "version": [ @@ -77923,14 +78511,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20220211, - 727 + 20220405, + 1146 ], "deps": [ "org" ], - "commit": "ffbd742267ff81ba8433177fac5d7fe22b6d68a9", - "sha256": "0h1689mzkcgnrnpjwlh3a9ks9vb0a8sj60nlyn9x2nkcalg6vsw4" + "commit": "8dd1e564153d8007ebc4bb4e14250bde84e26a34", + "sha256": "0aq6vqya8cj6wjgi8yjbrvkjg9if2ampyx4g6szdpmyc5mq7zgll" }, "stable": { "version": [ @@ -77953,11 +78541,11 @@ "repo": "bkaestner/org-arbeitszeit", "unstable": { "version": [ - 20220127, - 754 + 20220328, + 1951 ], - "commit": "5b307ebc0db0d58ed6b94d4db30f2653b5782e41", - "sha256": "0dcawxni158af3jdhr22zkh39b39qvzsdk6kc5l8vjwjd37r1kks" + "commit": "60e6adfe457bcc4ee47e3e5805b6b40544f98ee0", + "sha256": "0m93d60bybw2sjw75h65y76r9aspdfpv846pwm6xvjph9v614dgy" } }, { @@ -78012,20 +78600,20 @@ "deps": [ "async" ], - "commit": "5d9f2734c96166722c5057f3a2641ff8e08184cc", - "sha256": "10isxdaw7mqnw8flc76rva9y04wsyzpv6v0f3lsvkrx044rcz3cr" + "commit": "c3cbde261fd66b747374b667cb715ca9ee8c52ba", + "sha256": "084pfgjyf41nmwyixvza9vhmfbaq587hx78knpg7c19aiki2r8zx" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "async" ], - "commit": "ad3c332f062b5830e88b2ab13287a096ae434657", - "sha256": "05yrw59zrzxj1p8n65sk6mvy7jzik812mp9i2nsimwhlhn3si1pj" + "commit": "c3cbde261fd66b747374b667cb715ca9ee8c52ba", + "sha256": "084pfgjyf41nmwyixvza9vhmfbaq587hx78knpg7c19aiki2r8zx" } }, { @@ -78110,10 +78698,10 @@ }, { "ename": "org-board", - "commit": "d8063ee17586d9b1e7415f7b924239826b81ab08", - "sha256": "00jsrxc8f85cvrh7364n7337frdj12yknlfp28fhdgk2ph6d7bp4", + "commit": "92100b66bac72090515e957ab53d654829c922cf", + "sha256": "0rvwycaq6xsnnz2l8mnyj5vdq5bc0zj7iax0kz18lv2gr4cpx4sx", "fetcher": "github", - "repo": "scallywag/org-board", + "repo": "charlesroelli/org-board", "unstable": { "version": [ 20200619, @@ -78310,14 +78898,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20210930, - 1418 + 20220422, + 300 ], "deps": [ "org" ], - "commit": "87e9a6c4844ff32f47c8d1108ec0f087a3148a8e", - "sha256": "0xdfaf3shl3iij7nnshb5ryccqq70rpk0zm0d3fdwdbfa8rf7fkp" + "commit": "6a786e77e67a715b3cd4f5128b59d501614928af", + "sha256": "0ik5akhsh9aji6n477i1jnk0wnljj7n1d0ybp8szgj2nr5258mhk" } }, { @@ -78343,15 +78931,14 @@ "repo": "dfeich/org-clock-convenience", "unstable": { "version": [ - 20200705, - 1527 + 20220503, + 530 ], "deps": [ - "cl-lib", "org" ], - "commit": "efc9773a8dedf834cf4a78fb6f5f8fffe55ef8eb", - "sha256": "0xnzw4p0wvahkfnxpj2ysz9nylzndp4pvy90vlf0l0d2ff5dymbh" + "commit": "988d4e3c9f0ae6df098b0ab1985b79eed2c5b808", + "sha256": "0b1i013likxba92z3bwrg9in3g3daaz31fdsn1cfxbn3yha6yzai" } }, { @@ -79213,14 +79800,14 @@ "repo": "shg/org-inline-pdf.el", "unstable": { "version": [ - 20210119, - 529 + 20220429, + 1012 ], "deps": [ "org" ], - "commit": "b2dfbf41efac55edacde8a8a6bd0275418de6454", - "sha256": "1gs62qjllsz23qbs9zq767c8xxvxwknl1x6r4ixx9090j7bsrhpd" + "commit": "b790818ecbb85cd6dee44754935eb12153a79679", + "sha256": "0a5fk5wkzljrjwclq8x1lbg9krzfj336pc5kid5ncq947p0m04bn" }, "stable": { "version": [ @@ -79262,16 +79849,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20220225, - 158 + 20220509, + 2058 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "96e92585ed6f510f87363be3cb10d804f67e1b52", - "sha256": "1n1h3xby4998hdv6j4gllznzbhh4gl2wr9bm4235n859zypq9b4l" + "commit": "c0c0086419b4e68bb45bf609931916d6d8ae48a2", + "sha256": "0yrmgr4jr49qr94j50cbbpgwszgsw6w7c2c0q4pdz2ckqff0y1fx" }, "stable": { "version": [ @@ -79296,14 +79883,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20220103, - 829 + 20220408, + 629 ], "deps": [ "org" ], - "commit": "f121450610650c63aabf13afd0d2089e05fad2e4", - "sha256": "0hai9m2bxwhnk3xcbcdis93spz4ncvcrhdwi8cdp1j5gsvgdxm86" + "commit": "839a2e19865a03bec30ef32431f981f33880a754", + "sha256": "0ggg9p1i016pkwa2322chpwisbllzp1vd4p3qbkzyd5mdp59gwph" }, "stable": { "version": [ @@ -79341,21 +79928,21 @@ "repo": "SqrtMinusOne/org-journal-tags", "unstable": { "version": [ - 20220305, - 2019 + 20220416, + 1507 ], "deps": [ "magit-section", "org-journal", "transient" ], - "commit": "b395f5c90aa06885aa9441217cc0abaaa53ccc11", - "sha256": "1kkf6sryj9xgplxpf69lz3wz1zaifarr1cwgq5if3yc1bb868ax2" + "commit": "ca6327161f4994ea0e98d7c6c3f662222e2650bf", + "sha256": "1pg7wxjlhbh3fls17zgh9wdzk0mjc3sfi873207kc5rcd4araq89" }, "stable": { "version": [ 0, - 1, + 3, 0 ], "deps": [ @@ -79363,8 +79950,8 @@ "org-journal", "transient" ], - "commit": "16e7ad11ca3ff3085f3098f492c5cfb3f6ded253", - "sha256": "12l0r1ayi7qwczaaa9590rqfmib8rj0f287c0s7gphmvyds078j7" + "commit": "ca6327161f4994ea0e98d7c6c3f662222e2650bf", + "sha256": "1pg7wxjlhbh3fls17zgh9wdzk0mjc3sfi873207kc5rcd4araq89" } }, { @@ -79375,30 +79962,30 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20220218, - 1845 + 20220510, + 2150 ], "deps": [ "dash", "org", "s" ], - "commit": "5310e208d151f460f9b7e3961b4796842e91a3ae", - "sha256": "1d7v9vn9bli4lj59lbcldhplg46g79038j9avzicwgrysm74ybic" + "commit": "1d3234359fa52fce5ac1006e2c51f14c760d275e", + "sha256": "1kvmr1sz3jcd4wc4gybazpigb9yv5wl246axbr7z4m6wjiq0k5nv" }, "stable": { "version": [ 0, 6, - 3 + 4 ], "deps": [ "dash", "org", "s" ], - "commit": "198ffa2066aadcdd9530dcc9b82cb5626c49e257", - "sha256": "1lh7hgzbkmhv7hqc0fvgvivkihg96c41ms1v7rcknnp3f1kj195h" + "commit": "1d3234359fa52fce5ac1006e2c51f14c760d275e", + "sha256": "1kvmr1sz3jcd4wc4gybazpigb9yv5wl246axbr7z4m6wjiq0k5nv" } }, { @@ -79437,8 +80024,8 @@ "posframe", "s" ], - "commit": "d18e73dbed8ae104699295143a44356fa1029358", - "sha256": "0387n6z3kyqvslv395wajmbsg3p05918wn1wgm2bi4d9kjw6y3qm" + "commit": "832bbb9bbdee8b58170c984ead487f3ad612820c", + "sha256": "1m459hv1064yjg4dhif5b249rfrb70590kgdxx818w5x3va80i3l" } }, { @@ -79449,14 +80036,14 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20220321, - 145 + 20220503, + 458 ], "deps": [ "all-the-icons" ], - "commit": "75a0f3bc427b9449f6f7ae3b2ac67e16e24153bd", - "sha256": "0p33n195xl6pgvyf7z47mq48fh8ihkq7wx70z1vn9js3xvig2ahm" + "commit": "b20e296b497360de12d5d973aa273cab70c77126", + "sha256": "17vcrz99759sh75swd94w1pajq5kknj7bgw5n12frwgfjlq6hi3s" } }, { @@ -79581,8 +80168,8 @@ 20220204, 42 ], - "commit": "a7bf07316f93015e4f853ea0fc5b8d05b4a7695d", - "sha256": "01f04xpqkgja34a0z4smh2kxzn3lvx2391fnbfxmq92pxqp3gk0j" + "commit": "98504d043c8421ac390b7358b146733c7c0b4479", + "sha256": "0n0bm9xddlgvlrmc2yjkdyvag7690yphdkcjx4w3cb04xlcac9ns" }, "stable": { "version": [ @@ -79673,11 +80260,11 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20220325, - 1506 + 20220422, + 940 ], - "commit": "dc19304f409259d1b258c51cedd2d362e0ff9b98", - "sha256": "1b0cis1n786c4lkrsi71ak2wv21mhgbfk3q2pp6qiqhddah0l1cg" + "commit": "ff1046705b3950b7a49da50bc34c11da86c6226d", + "sha256": "0zg2bi6jprigvqy4zglb8f8357sxikcfx0b8vjbwcjl08iimxp6j" }, "stable": { "version": [ @@ -79751,14 +80338,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210916, - 1114 + 20220331, + 1707 ], "deps": [ "htmlize" ], - "commit": "77f5911b7d390a069104db20be86293506ffbff2", - "sha256": "08kv8639zdfr3fpzx4zpbgf40vjpa1xwkhxzz7vdpmjq19i3c28w" + "commit": "60e22e446325a9b3387396459d98be7c1c52579d", + "sha256": "077g7gvn1k6i2x4m2kd3dkrznc89f5a5pd916wsmpy703pv0aca5" } }, { @@ -80423,28 +81010,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20220315, - 1704 + 20220402, + 1456 ], "deps": [ "htmlize", "org" ], - "commit": "e5bae22b9ef63a9fcfbbaa000e087703751eaad0", - "sha256": "1njib0ah1913lk3ma18y8m5k8jqki17i9298cc03k7vvfw3l19wz" + "commit": "c787ebf93d51b63b8726df241e3e2fcda35d4ae1", + "sha256": "02y6qm4va43c25i7b0q3pvk888war64rrb2p9bmv5p8176dy1mjw" }, "stable": { "version": [ 3, - 12, - 5 + 13, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "e5bae22b9ef63a9fcfbbaa000e087703751eaad0", - "sha256": "1njib0ah1913lk3ma18y8m5k8jqki17i9298cc03k7vvfw3l19wz" + "commit": "c787ebf93d51b63b8726df241e3e2fcda35d4ae1", + "sha256": "02y6qm4va43c25i7b0q3pvk888war64rrb2p9bmv5p8176dy1mjw" } }, { @@ -80599,8 +81186,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20220318, - 2105 + 20220509, + 1414 ], "deps": [ "avy", @@ -80614,8 +81201,8 @@ "parsebib", "s" ], - "commit": "ec449195438f815698241f0b01a5395221b3306e", - "sha256": "19hf4lp1z14gczs0d39vi8lcl67bbraz2wkimshk8fwhjc14wf4l" + "commit": "0d2355d1eb4dcac1095a03d885788a12fe566610", + "sha256": "019pbp02fnbb7rcr80cfyi7pa9b413lgdfmbwaak2icb5cpmj452" }, "stable": { "version": [ @@ -80648,15 +81235,15 @@ "repo": "alezost/org-ref-prettify.el", "unstable": { "version": [ - 20220112, - 1746 + 20220507, + 649 ], "deps": [ "bibtex-completion", "org-ref" ], - "commit": "cbf9a709a10304981c38eba1149def17151aca3c", - "sha256": "1n1rgm2i3mn8cyyslbkrh6gyln59sn03bld0m5ib0s1a8k9099pp" + "commit": "0ec3b6e398ee117c8b8a787a0422b95d9e95f7bb", + "sha256": "14cs9qg1fszg9gxpkrf74b49avcx4smpr39z7a9k3n2w6v4dn19x" } }, { @@ -80698,8 +81285,8 @@ "dash", "org" ], - "commit": "c42078f8601b7f600135f66e75246a53c5f9975f", - "sha256": "1afmv6ncjbm6dalgz459lhh0rif8rlag23n05jwdv7izibwb1dm2" + "commit": "9ebd42b521e7adf26a35cbb17144113a83f73264", + "sha256": "0wjz26qmjwiz1594b4s9vycbbz7zhs52xpa0ksph92fcl21c5fp5" }, "stable": { "version": [ @@ -80723,11 +81310,11 @@ "repo": "brabalan/org-review", "unstable": { "version": [ - 20160907, - 537 + 20220411, + 1205 ], - "commit": "058e75b7f28d2ad2390290fe17a63d98ef5ab763", - "sha256": "1j917zblg5ncls9lbvpzhqal55mx27d3kpvhzvjw2h7x47ji6iym" + "commit": "466f7d8f183f226f1e665cf806cb094471903d9c", + "sha256": "122l2n1qz5qps3jphimp1dd743ckbqcvnjdwc5zcdzp9x70yy3nh" } }, { @@ -80762,8 +81349,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220319, - 1902 + 20220512, + 1634 ], "deps": [ "dash", @@ -80772,14 +81359,14 @@ "magit-section", "org" ], - "commit": "d71675fb479d11da3ae597bb13bc1c96256ff0b0", - "sha256": "056gkk7fxla2rm8lzzig1rq8brhznciifdn0pqfxwwyvpa6sy1i5" + "commit": "2657f0b444194e1de6957f9cfc112383980d62f9", + "sha256": "1x1222nvy5fq2cyz8ds271xq03bcyn4252vxzdch9gai3n0vg00b" }, "stable": { "version": [ 2, 2, - 1 + 2 ], "deps": [ "dash", @@ -80788,8 +81375,8 @@ "magit-section", "org" ], - "commit": "3782e88d50f83c5b9fbb4b10df71df3f37e27156", - "sha256": "0c5vxz423lz386dxa9nqyf396jmyb36q79paxf27is1dhq1vwd5w" + "commit": "69116a4da49448e79ac03aedceeecd9f5ae9b2d4", + "sha256": "09wcqdqy2gcsyd1mbcm90b70y3qj921m4ky8l3avhzpdwgyw8wy5" } }, { @@ -80903,28 +81490,19 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20220107, - 451 + 20220512, + 1927 ], - "commit": "dd11d253d3ee94b70f0d2cc74c6e85c6f5ac189d", - "sha256": "1vjmpdvcsqrry4jg07l84nfp7kx0wmjn60l60bcfmzj2mwcz4nak" + "commit": "ec8b933c1269804546c356fe379169d1f0fce9ea", + "sha256": "09lg1ycfb3qkzqnhk088ija62kvv0z5jgg4apcbr2y4plb0bgc6h" }, "stable": { "version": [ 1, - 1, - 4 - ], - "deps": [ - "dash", - "f", - "ht", - "mustache", - "s", - "seq" + 2 ], - "commit": "e5d1e30a05552ce1d63d13ada1487643a41b92cb", - "sha256": "093jbpanvpwxxdyb9136r804ai1147rbq1gfb7pdy0iymhrv3d9r" + "commit": "253c2876446650249d59ac35200b373a0aee4e68", + "sha256": "007n6rjyvfk9ip0hz0wcfdj4qw86rwg05dk5l7zfynnkbb7ggkp6" } }, { @@ -81186,20 +81764,20 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20220110, - 739 + 20220508, + 1410 ], - "commit": "a1a1738b14dfb73be759023e2bd3dffb0792ebeb", - "sha256": "18c4kjmab089073npcvh1qi4g6m9yqyb0ifm96nay7rivw4rchj2" + "commit": "a6cd8f651f971eaa68be1cbfd30cc775e3a7ee93", + "sha256": "0i5r35my8sbnbic8jskzpnjlp6fjn7vglxaa9pkknjxs0dvj1x6m" }, "stable": { "version": [ 1, - 5, + 6, 0 ], - "commit": "734dd263cf79e4d5a0077f8b5ce344ea45bf7f3d", - "sha256": "1p9v40mm8p25b9xgfahwqqx4c36aqnl9yyjjdhkp6x5xkhkdf7by" + "commit": "61a3ab0e2e8e1ac0ef8772e89ae320c07142f7f5", + "sha256": "0p3bhnp91x65xr5d40kdmyj7vgyq62bvq3b1gfwv7881sh8p6hr9" } }, { @@ -81426,15 +82004,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220315, - 1159 + 20220427, + 1552 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "aad66c775e3010f7af2ebd3e0914aa6a57127f1b", - "sha256": "01y53nh9z7y77gns28dg5s2sr672i3sb39vpflx7mhfcijkribzj" + "commit": "88fde267441118836a5c4ed28bb5958fca37a800", + "sha256": "1f7acxpc133abqzhc667syd7dkazarazndwl1dg8clcms4v6xaqq" } }, { @@ -81807,8 +82385,8 @@ 20220220, 1757 ], - "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2", - "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj" + "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86", + "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri" } }, { @@ -81858,20 +82436,20 @@ "repo": "nullman/emacs-org-visibility", "unstable": { "version": [ - 20220227, - 1536 + 20220404, + 1502 ], - "commit": "623d596ff02e54d7e090fa30c67a4d0dd4e7fe72", - "sha256": "0cnwrjhbp8jfsbax7v46xiq6xzcp4by73dbkkgw19bjj5mywiqc9" + "commit": "a3aef6573d23309f9a6f340b41fa103cca3c79a6", + "sha256": "0fc9zisw87kn5jp5pkac13jwai9m5jrm9xvbmsig7s2yr12ifwch" }, "stable": { "version": [ 1, 1, - 4 + 5 ], - "commit": "623d596ff02e54d7e090fa30c67a4d0dd4e7fe72", - "sha256": "0cnwrjhbp8jfsbax7v46xiq6xzcp4by73dbkkgw19bjj5mywiqc9" + "commit": "71b888c9c5cbabb762e83ae7b2b5b9b4e4f4283c", + "sha256": "0fc9zisw87kn5jp5pkac13jwai9m5jrm9xvbmsig7s2yr12ifwch" } }, { @@ -81935,16 +82513,16 @@ "repo": "akhramov/org-wild-notifier.el", "unstable": { "version": [ - 20220221, - 928 + 20220402, + 2331 ], "deps": [ "alert", "async", "dash" ], - "commit": "860392e309e75474ae03128ce52b6592bd28027a", - "sha256": "1npl118j457zcsmn2b4vsx6kmz8v6k8czrqgmi2fl7aql5xhvp6j" + "commit": "4b1d874aafdee90815136c308f1f3bd3577971ec", + "sha256": "0wqcm65gisiapkx9m8zd5l6ysir2m7vk0px8adv04kjb5j937isq" }, "stable": { "version": [ @@ -81970,30 +82548,30 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20220228, - 1652 + 20220414, + 1402 ], "deps": [ "dash", "org", "s" ], - "commit": "25ddd0169eafece581bbb4919427a4d64dab8ae8", - "sha256": "08s9rf57yci4xla6dlkb9av9qd2nwls487vxr4zfyb932j8vdp4h" + "commit": "6af54ed3a5d9bf90629223157803c42f5d3b152c", + "sha256": "1jpiyjzvqqzrnp95vysp7b742pxlfqd1g6srxhv3fjlq65px6z5a" }, "stable": { "version": [ 2, 6, - 1 + 4 ], "deps": [ "dash", "org", "s" ], - "commit": "25ddd0169eafece581bbb4919427a4d64dab8ae8", - "sha256": "08s9rf57yci4xla6dlkb9av9qd2nwls487vxr4zfyb932j8vdp4h" + "commit": "d5375818919f21910a97c4617b2a316c40272fb9", + "sha256": "0kdb3m36msy2hqq1mkzzdvbp5dxazv3rfgr17vhi4nm0na47wk2p" } }, { @@ -82026,14 +82604,14 @@ "repo": "ymherklotz/emacs-zettelkasten", "unstable": { "version": [ - 20211002, - 1132 + 20220503, + 1357 ], "deps": [ "org" ], - "commit": "4048bf9e1be7ab759696a9541eec8f435359bcf3", - "sha256": "1rnir9mc9cp12wg5p19f0m6g6mvfyv1ahr7zq7azl8hvwmnb6gx7" + "commit": "603a5b692a08340c1865a6f73cacf57c4fd64cb2", + "sha256": "1hwibhqmm7a4zz0fw6qhbgyyw7rx73zd6gn7mg2g4m0c4kwwfifa" }, "stable": { "version": [ @@ -82246,8 +82824,8 @@ "ht", "s" ], - "commit": "3cdd1985ec06fe42b81f3029512c7530a33f15c8", - "sha256": "0xg4vikw8k3kzn5vlqcf1jagalnq2xwd4wps8l37fr1iqkpr7wqb" + "commit": "6fe53900ead434f3e18e63e9d22a8fa8380ccb37", + "sha256": "0h33ih533dirghhpjlyzm3k8iss007f9npk2fpbc75z3q4ws67wp" }, "stable": { "version": [ @@ -82305,15 +82883,16 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20220211, - 25 + 20220425, + 1157 ], "deps": [ + "compat", "magit", "org" ], - "commit": "42b7f682b3e4e487ff209a44221a729921241133", - "sha256": "0vns8fbavfgyazlhbvwgc17w3v5iaf7ng92na2sl4lvc33rk941j" + "commit": "b33b916915db5f91d2c9da4cb1a2457ccbb09332", + "sha256": "16cbyaafwlfkrnxr7vzcpd3qpg55k6v59qj77njqbzps5axq145b" }, "stable": { "version": [ @@ -82337,17 +82916,18 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20220211, - 26 + 20220422, + 1625 ], "deps": [ + "compat", "forge", "magit", "org", "orgit" ], - "commit": "36e57a0359992e02312f453b8086512e77beb150", - "sha256": "0mrq7mrgvj5r0bmxa4365xycfwp6m42mdqi5l5pljr5xz6k3rnc4" + "commit": "8baf1dee795f026d4555687022487fab89c9bcdf", + "sha256": "0zdp3yi4vmrhpl8v0vk5d4b8kz77k0qnnhmapm7arv7719ydwzff" }, "stable": { "version": [ @@ -82373,15 +82953,16 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20220101, - 1045 + 20220422, + 1626 ], "deps": [ + "compat", "org", "seq" ], - "commit": "d0210403b62eaf5c68f04a313f509589f253bc12", - "sha256": "1619ly90vh2lla5rbw87a4n0rfal3wpbf7005jjiyv2ay88nc7l9" + "commit": "59bec36eb91e78d508e290b69c4383b27466513f", + "sha256": "116c6vbpisdwkh51084768ar8djzl1bsaafgzfjwhc9f9mb9n384" }, "stable": { "version": [ @@ -82663,19 +83244,19 @@ "repo": "minad/osm", "unstable": { "version": [ - 20220325, - 2356 + 20220511, + 1756 ], - "commit": "881b1c969fcf3dae5c020ce520e5a16f8f2b6f18", - "sha256": "06ryshf804m6npygf8546kxg1xsjsl52kgbzr147h2ay5kq90q06" + "commit": "471f21f0f8bffc078d5ccfd86610a83e5269c2a0", + "sha256": "1w8xc4g2fgg9l0yibqc0190afgk71z697ni4yx1v1z1vy46s76c4" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "f76decfd0e94d5fc030a1d5c3230c213c87b47ef", - "sha256": "0aiq2z9vv4jsl0s0x9vpjgp0mnn27wanhirzj3h80ivgiphzs7l5" + "commit": "e3ea969ce1bf84343f357efa2de97e1dd857f481", + "sha256": "0d037512llpny669m6mhvwhnm90g6ysgjqdx45gqxfwdc65s4a46" } }, { @@ -82942,11 +83523,14 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20210530, - 1259 + 20220424, + 1803 ], - "commit": "942bd43ea7099984e9ebccf48db70af345d4b6bf", - "sha256": "0xnzwb1ybhq38qgd3ml18565bbagfx6yzcfndc5d4ll7bzij6jbh" + "deps": [ + "compat" + ], + "commit": "ff862866a2c5eb7b20aa96a97fa982e2db1b6640", + "sha256": "0wjrf1b5hjrgxgwqz1701xr6hhlmbnnr79f99162py49clljd5mw" }, "stable": { "version": [ @@ -83240,14 +83824,14 @@ "repo": "yashi/org-asciidoc", "unstable": { "version": [ - 20211224, - 538 + 20220428, + 740 ], "deps": [ "org" ], - "commit": "27bf9a3e900c782bd57719c81c0aa68d9a1e3b46", - "sha256": "1xz5qr1kfhc9r5krdvg4lqc39gdszip44qqwkrkj9jm8pw713yfq" + "commit": "c8bc184f9088b76fdf1ce20e6e5d0a1588e1b327", + "sha256": "0799wah7ywzpzjjhmqkyj9v8krzh0j6qa5gs4a7iwvp9r66jwcpl" } }, { @@ -83351,11 +83935,11 @@ "url": "https://git.sr.ht/~abrahms/ox-gemini", "unstable": { "version": [ - 20220110, - 2102 + 20220418, + 1433 ], - "commit": "7c3300ace135e94467942f77f0a2c07a93ab00ad", - "sha256": "1kggmlj8qr0657skrixk1532smp5946a3vkg1xnwy5kwh8z0n8sf" + "commit": "168f820ea401fb813435a3a55af295873a4c110b", + "sha256": "0jmiya3f9vv4v64p5kxla6wiiyv4wg4w7f4a6zmdrjcn11hflqmm" } }, { @@ -83382,6 +83966,25 @@ } }, { + "ename": "ox-gist", + "commit": "d376675eec6ebaa711431b296b467385dc02d44a", + "sha256": "1svl5m50fcyygiljybaawz6380xkq3vlznnb4kchqbhy20020riz", + "fetcher": "github", + "repo": "punchagan/ox-gist", + "unstable": { + "version": [ + 20220410, + 2034 + ], + "deps": [ + "gist", + "s" + ], + "commit": "e9f1f11af0e97fee30c2b15b56c236b1f4e1f400", + "sha256": "0qxbqrcqvxs2pz5and0lxpc813v68j7a7qpw4y2l2adxx4zjazzj" + } + }, + { "ename": "ox-haunt", "commit": "94b0a0a20d25dbe10333bb167d81f036b9fd03e0", "sha256": "00fbljwkinx50b57srziw51k16kbzq2k0xylgjxg9ayy3hqqn5j1", @@ -83436,25 +84039,27 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20220322, - 137 + 20220512, + 1805 ], "deps": [ - "org" + "tomelr" ], - "commit": "d04f41af6d128ccb9421c9bcd83b5fb12d14f440", - "sha256": "0qqaqykcm3pzc8a3ap4jnspn2p1034f6qhv6xyf43iqy8nhvrl03" + "commit": "cab606a2098524ea7ac97704cc8df6d2d9d190f8", + "sha256": "13gfchjdhalijbf5d4xmz1zvl904syl4lm07ssrqck4h66y4nr9y" }, "stable": { "version": [ 0, - 8 + 11, + 1 ], "deps": [ - "org" + "org", + "tomelr" ], - "commit": "9751d34e1133b89a533a978c085b0715f85db648", - "sha256": "11h464cyc28ld0b0zridgm4drydc1qjxbm1y24zrwlkyqqjk6yr7" + "commit": "4fc594eda0d0cb41cc3b634b43fbd055db7ae67e", + "sha256": "1qrxy32g8brmc3psfg458ca6r91wqq55bgmsk76w6zm8cgrvsnyc" } }, { @@ -83532,14 +84137,14 @@ "repo": "stig/ox-jira.el", "unstable": { "version": [ - 20220121, - 1015 + 20220423, + 1403 ], "deps": [ "org" ], - "commit": "a8019237a8f5e016a7c952fc2f673a2498a0e779", - "sha256": "0pa7pwk0yjcgak3f9w9jggj3ghlig1azf15ng954r646810j9i4v" + "commit": "00184f8fdef02a3a359a253712e8769cbfbea3ba", + "sha256": "1zyq4d0fvyawvb3w6072zl4zgbnrpzmxlz2l731wqrgnwm0l80gy" } }, { @@ -83700,16 +84305,16 @@ "repo": "emacsorphanage/ox-pandoc", "unstable": { "version": [ - 20211224, - 1240 + 20220419, + 750 ], "deps": [ "dash", "ht", "org" ], - "commit": "b2e43b936249de2a100afb4262698105c39ce289", - "sha256": "1fj0d37xdn0xgr5xihc6g24j75snwpq5vijyc2n1w2qrw8sav0ak" + "commit": "0a35d0fbfa56bdd9ec5ba5bac2fe002b61c05c52", + "sha256": "00fx05jkz3mbgqw5y1g7pfrhrpkcqn5zf0s51r25ykzdfiggcn7a" }, "stable": { "version": [ @@ -83772,8 +84377,8 @@ "deps": [ "org-msg" ], - "commit": "37a173e9fa40728f121eb0da2ece0ebab4102d1e", - "sha256": "0xz6n8zabaimdh7dqikh3hm41akfwwm49hyjxbfyshbg8r4kld0s" + "commit": "c6d8c2f4a0d762ea1732ffdb7bec2ba98aeecdd9", + "sha256": "05jky43c6bcvvgfkdds4kb2gplnv1my5wqk8qj16qggmdvwiqfwb" }, "stable": { "version": [ @@ -83795,14 +84400,44 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20220216, - 1506 + 20220410, + 1533 ], "deps": [ "org" ], - "commit": "fed9be1f4c317c08ca2372bd45cb9d1bcf8a3f7e", - "sha256": "1vmkj60lmah79r62k2gigkblilkw21ciyj324iwvk6hqmaahw6km" + "commit": "862b41df7734f57019543f6bd82ff7dad7183358", + "sha256": "1009w8bp2rkqjvks97xlzbprrb1fxhcdb9fzx08ak229glvwav08" + } + }, + { + "ename": "ox-review", + "commit": "67bf75e1dee7c7d83e66234afb18104b844b1719", + "sha256": "062ifdcgk4iwhz5k8srdd38z34gib5i36rcfhj90bn07d7jsrh2y", + "fetcher": "github", + "repo": "masfj/ox-review", + "unstable": { + "version": [ + 20220502, + 1146 + ], + "deps": [ + "org" + ], + "commit": "4abb1aa4665d246a38a9a53e5b365b3e57ec6d85", + "sha256": "0gxlps90xnmmd2dv9s82c2p2r8zl8nzdlhadw1zq2rxqqhilxn4w" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "org" + ], + "commit": "8b2e7dcd580ce2c0df9067c699b104b04c330682", + "sha256": "0gxlps90xnmmd2dv9s82c2p2r8zl8nzdlhadw1zq2rxqqhilxn4w" } }, { @@ -84241,25 +84876,22 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20220210, - 1334 - ], - "deps": [ - "cl-lib" + 20220510, + 2024 ], - "commit": "032e9bd086029b2fdff09c3c2e606e29682e1fb1", - "sha256": "0jjb1gl6qqkrvf4v03fp9sv69xc6qh3lc65blms46zkx64995c6r" + "commit": "899bb08963c21028a02894426a9d86f768fe06d8", + "sha256": "1zw68gg8ai5921kly35fnxapnxqzdqx8ll7w8bdxpv8f06vq24xj" }, "stable": { "version": [ - 2, - 4 + 3, + 0 ], "deps": [ "cl-lib" ], - "commit": "bc06686806d676658b5e962497770e47025c17f1", - "sha256": "1lm5mgvjhpxqfw5gcv99h4mwbq728b6f2hj5vjh1j67kdwy7ws8k" + "commit": "032e9bd086029b2fdff09c3c2e606e29682e1fb1", + "sha256": "0jjb1gl6qqkrvf4v03fp9sv69xc6qh3lc65blms46zkx64995c6r" } }, { @@ -84285,15 +84917,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20220213, - 1457 + 20220412, + 1648 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "873025ffc85b5e40ec361e953218fa09c6ebd621", - "sha256": "10sinzpnk41xvdb1va9vv6nnwyyryvmyrvxxwq6xska9ab580g6y" + "commit": "80a9d9815ab2919c992ad29ae4846443dec43a35", + "sha256": "0sfxpw19vi7hsr3j86wbwxfi02020z38qg1w72j8k6mm0m9m21yi" }, "stable": { "version": [ @@ -84322,8 +84954,8 @@ "deps": [ "package-lint" ], - "commit": "873025ffc85b5e40ec361e953218fa09c6ebd621", - "sha256": "10sinzpnk41xvdb1va9vv6nnwyyryvmyrvxxwq6xska9ab580g6y" + "commit": "80a9d9815ab2919c992ad29ae4846443dec43a35", + "sha256": "0sfxpw19vi7hsr3j86wbwxfi02020z38qg1w72j8k6mm0m9m21yi" }, "stable": { "version": [ @@ -84420,11 +85052,14 @@ "repo": "emacscollective/packed", "unstable": { "version": [ - 20211021, - 1753 + 20220422, + 1626 ], - "commit": "51f22a68e23b87626d162c58a0afbc21ad22f210", - "sha256": "1gpv2vaci0m48fzn0sy7iwl1mnkkqc30bf05jjrqlpn9kpbjyf1p" + "deps": [ + "compat" + ], + "commit": "6a427d9da742d78a8f6bd6ed9e31fbf241b2ea82", + "sha256": "03ypbz7m6qq37v0d2c6pbg17dclmrdyqxfcl7rzl4xfzy89q688p" }, "stable": { "version": [ @@ -84506,8 +85141,8 @@ 20210104, 2224 ], - "commit": "28783cd6b86b3cd41e51e6b2486173e2485a76cc", - "sha256": "0c9971l4xz2qm6pskad9fga6rcz72lyr2jfzwjxwhqx1v7ss46bc" + "commit": "cc283621c64e4f1133a63e0945658a4abecf42ef", + "sha256": "1rivzf1brs45sh4pcdc0cyx0kads0pfqsz62csh4njs9mhxlxp2k" }, "stable": { "version": [ @@ -84559,8 +85194,8 @@ "repo": "r0man/paimon.el", "unstable": { "version": [ - 20220325, - 1032 + 20220326, + 2051 ], "deps": [ "aio", @@ -84572,14 +85207,14 @@ "request", "transient" ], - "commit": "8e28efe96a171b04b1fd83f763ca26e939dd44ed", - "sha256": "1d3bcy1wb7wsw6qqihwdy835z32pibz9d8ia8xcarzcg5c983is8" + "commit": "01675ff30ce0f29ad81f9275b4fc0797c0a7073f", + "sha256": "0kpn9i8dd1ij5fx8h9ycilfhz9ik2kaw5dq2xn4j5jifqrfbl268" }, "stable": { "version": [ 0, 1, - 3 + 5 ], "deps": [ "aio", @@ -84591,8 +85226,8 @@ "request", "transient" ], - "commit": "b29ccfcedefd03cc05d98cd06a5935ecf4bd6917", - "sha256": "1wd1z2l0jyx20y2h95w6ybjabjn613m09gmrp6bj13ry4355sfvs" + "commit": "01675ff30ce0f29ad81f9275b4fc0797c0a7073f", + "sha256": "0kpn9i8dd1ij5fx8h9ycilfhz9ik2kaw5dq2xn4j5jifqrfbl268" } }, { @@ -84811,8 +85446,8 @@ 20200510, 5 ], - "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2", - "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj" + "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86", + "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri" } }, { @@ -84993,11 +85628,14 @@ "repo": "tarsius/paren-face", "unstable": { "version": [ - 20220129, - 2216 + 20220422, + 1627 ], - "commit": "4f6ad761a7d508bb6b3e6539559929d2706caa10", - "sha256": "13d8psgd2j3vqmgwwf62gwyq7h6qlj8rrs31fxwjqmzzdblwqy1y" + "deps": [ + "compat" + ], + "commit": "2c5de87c494ccfbe92c3f1da45f1720d7ecf4acf", + "sha256": "0pgwdd6406nldsgbazpr4qmg31k0n60hk6b73p74iimjs3l27ri3" }, "stable": { "version": [ @@ -85109,8 +85747,8 @@ "deps": [ "s" ], - "commit": "c6330d9fc28fe92c83415c2a56e675a6e04841fa", - "sha256": "1bgpbc38f37ja6xsny7q28wwvg0m6hs34zgqk3q39zadq595q6iy" + "commit": "c2bdc5ee1d1f029886245f9a5c409e47c1db2cb8", + "sha256": "050b932qa0ll66pa68i8bbjdmi8bgdvklqm65cvm5ssc5hcwjq3k" }, "stable": { "version": [ @@ -85133,11 +85771,11 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20220116, - 2336 + 20220426, + 2049 ], - "commit": "63e85c8477fdf98ba920437c9df15f8f06c315e9", - "sha256": "1pk6n1nzvq01miswdddf6ny49zswjlc6cghd5ga0af0nmn61fl6z" + "commit": "dd4c5540fa6c2cd990cba324741d7abbc8ed2f23", + "sha256": "16jx7qay8ipyd202xrslfrcbjrvzzal77iqc69rwci3nlwax8vy5" }, "stable": { "version": [ @@ -85186,11 +85824,11 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20220313, - 1649 + 20220422, + 936 ], - "commit": "f32c041f2b301e790429fd16677c8cab11645702", - "sha256": "1i3xrhfhdjadq6qyn492r37ayd88cna1yih87b9n3iky1ziryljj" + "commit": "4d0e780e00f1828b00c43099e6eebc6582998f72", + "sha256": "11m1kvd85rj53xj3h32wwvn2s5v7fdw5hhhyjh7drbzlm90s4kcv" }, "stable": { "version": [ @@ -85210,15 +85848,15 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20220207, - 1352 + 20220512, + 1328 ], "deps": [ "map", "parseclj" ], - "commit": "ea7b5281ec80aca0bd1cc93a348aebb302497339", - "sha256": "01j8nrkcm2s0ps277b5zb4pys29lk4cq49rlcqpj19gbfpkwcvdv" + "commit": "35e9f3173a6cca60b6851dddace470b29654ac77", + "sha256": "06in2r87rn398bnqfc7bmpfvfbvrx9ybqs8r5yzy5y84f9gbfnm4" }, "stable": { "version": [ @@ -85706,11 +86344,11 @@ "repo": "JonWaltman/pcmpl-args.el", "unstable": { "version": [ - 20220131, - 2316 + 20220510, + 2056 ], - "commit": "94a19b693a226aa11b15627e01f9f4c9af752bab", - "sha256": "0y0mnm2fhshvvc9iz4mgzvxhvhj0xriinn155dilnm4skglzgxk1" + "commit": "43229e1096f89c277190f09a3d794781f8fa0015", + "sha256": "0p2mpifr3ycy4ibr9y1r5lvq91dbw6vvi8g6n3jx1mqnxnh9ld63" }, "stable": { "version": [ @@ -85892,16 +86530,16 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20220214, - 344 + 20220512, + 145 ], "deps": [ "let-alist", "nadvice", "tablist" ], - "commit": "326552eef71ae6d53e215c46be5bf532575b7abb", - "sha256": "1gvaw0684svv9v294f8zgmqa2ym2wa3gymn9y9v2slhamf51r4vk" + "commit": "fedd930a09a497c03df3ce5204ccbd80da724662", + "sha256": "13yl83ld5z1asjqrsfdzyhnz4nrrr064lwbsgfvk3mmlqpas7b08" }, "stable": { "version": [ @@ -86072,14 +86710,14 @@ "repo": "mpwang/perfect-margin", "unstable": { "version": [ - 20190722, - 126 + 20220426, + 1701 ], "deps": [ "cl-lib" ], - "commit": "94b055c743b1859098870c8aca3e915bd6e67d9d", - "sha256": "02k379nig43j85wfm327pw6sh61kxrs1gwz0vgcbx9san4dp83bk" + "commit": "d5cb5f075264ff2e625099aebca3151f4f35019a", + "sha256": "05nh0fi7k9amz6wnkbsznhyr9j8jzmr55d4qg2c60pp3ygfrbzn1" } }, { @@ -86304,14 +86942,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20220320, - 437 + 20220420, + 1550 ], "deps": [ "cl-lib" ], - "commit": "d3afc52ed098b713b6607943bd1ee0ef899db267", - "sha256": "0bbpmrjyz0zfgbfhf340axnx93ln39ml58frpqiiablz9n1xvj0j" + "commit": "4e38680793585a907ae46b148697030c2b552a00", + "sha256": "0jgd2vzfza3pnnksh1kss5mqhbirqn93lvzanhgjr4vb4fv8x13f" }, "stable": { "version": [ @@ -86417,20 +87055,20 @@ "repo": "Alexander-Miller/pfuture", "unstable": { "version": [ - 20211229, - 1513 + 20220425, + 1242 ], - "commit": "bde5b06795e3e35bfb2bba4c34b538d506a0856e", - "sha256": "0cks18fwir8h9b35ryz2yr5rligv1da2iqkqz0fcb5dx2a4fxwjj" + "commit": "f9e67bd7edbd5b4e033efd82c0acc4a85ff860a8", + "sha256": "0ifasmkfj06fb9whk7gg47fiim0bbwyh3279sd72psqbbxfixddf" }, "stable": { "version": [ 1, 10, - 2 + 3 ], - "commit": "bde5b06795e3e35bfb2bba4c34b538d506a0856e", - "sha256": "0cks18fwir8h9b35ryz2yr5rligv1da2iqkqz0fcb5dx2a4fxwjj" + "commit": "f9e67bd7edbd5b4e033efd82c0acc4a85ff860a8", + "sha256": "0ifasmkfj06fb9whk7gg47fiim0bbwyh3279sd72psqbbxfixddf" } }, { @@ -86754,26 +87392,26 @@ "repo": "OVYA/php-cs-fixer", "unstable": { "version": [ - 20210923, - 718 + 20220510, + 1407 ], "deps": [ "cl-lib" ], - "commit": "7e12a1af5d65cd8a801eeb5564c6268a4e190c0c", - "sha256": "1i0jlszc5z59arwknclhi3vmwp0mf6jk18axisvh5xdqggiwpjqf" + "commit": "225ca7127052e2b3d660495d04319e817ec302ab", + "sha256": "1zwl6hpw0ka4pdsk9i67dbv42idb0nhi5i3yajy1wzdihj7hqg3y" }, "stable": { "version": [ 1, 0, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "ebf78243b468592f4fbeb714923ecc8709d33ae0", - "sha256": "0ik5va5q7gpz6kmaaiarh6wjaafal22qcimflfwizs3nbl49y9mx" + "commit": "ac2d64c4b672a01744d14cc8ad80e9c9ff55c63c", + "sha256": "1jyjqwv4haibv526bwpvyyszs7ga9lmsjhn47hyk3ddffrr84c0y" } }, { @@ -86802,8 +87440,8 @@ 20220120, 1959 ], - "commit": "5f26bec865ee159dc30d3922f17bc42adfcfed50", - "sha256": "0132az773sk6w1wdz4a1wxmxy5w69x4h2jrgd67h94k845nyl348" + "commit": "4503672471b8fdaaea6c454344817a119c87fcc6", + "sha256": "0fxmqhpw0i54davcg9h8gxf8zxix02g2wnxxly6m0p5g785yng2h" }, "stable": { "version": [ @@ -87415,15 +88053,15 @@ "repo": "arifer612/pippel", "unstable": { "version": [ - 20220225, - 1128 + 20220416, + 1743 ], "deps": [ "dash", "s" ], - "commit": "682a40af266f395cf39862ad0bfb30152ddee204", - "sha256": "1gb7nf047gm57jdggj49ri46hgz8gphqy58abniqlqxjcx9zp4z7" + "commit": "cb194952ee150e77601d3233dabdb521b976ee79", + "sha256": "17606l24yyrjxa4rc0p2zj50lfbayqldw4phhi59yqf61289d520" } }, { @@ -87521,11 +88159,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20220312, - 1316 + 20220428, + 556 ], - "commit": "3cbf38c22d783ac77d5dbc69a38afa04e0aa4803", - "sha256": "14ll9z57jlnbvsnzarqi0k0a0bxnkc9y4r52xah1h09v5fmcyi8a" + "commit": "8faee70e4640bd6ec1857651ec64e139e4dc2833", + "sha256": "1a18kc2rjkgdm8s816pf3nrdjxkwi9yrvkvwwqbxg915rzyv9858" }, "stable": { "version": [ @@ -88851,11 +89489,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20220309, - 457 + 20220406, + 336 ], - "commit": "60297066e31e012b8087b1b7818febd73e02d2cf", - "sha256": "1ivj61hjg5gqlivb04ynnk2mry8bac9mmf9f473naplzwnd741p1" + "commit": "6599c9b5a12b411c6cf1536bf200ae233fa24389", + "sha256": "0k306s29qj8dxgjzv24lxz3xnykra99h2gv76802snlyjbnzc50y" }, "stable": { "version": [ @@ -88877,8 +89515,8 @@ 20211231, 1823 ], - "commit": "e112ef1cc6c86151ea97a0bad49026fbbacc768c", - "sha256": "1iwq7p7f1xpiwzlizqqm2jzf2ly0cgaj8zskjrya0lymfz8rw7dx" + "commit": "114d646f0f4dd49de19dfedd78630018f71470e5", + "sha256": "1hgia0d2j81mlkcl8bilznn4044qjjpy00cdd96zs7p2lbvaz3sb" }, "stable": { "version": [ @@ -89021,8 +89659,8 @@ 20210215, 1849 ], - "commit": "8f90c6faeecd77c88883cafc03c37a5cce4b1982", - "sha256": "0zs4z22ib34jg1lblqr5b0gdywb88fp769dk2x53s6sq1gi7cvkp" + "commit": "f90f3a09622993bf34704bb11c24984f6b1f10e2", + "sha256": "05gmc5wrj4pn1s1k4p6vvnl1z75bj4w163mpy8rybxdhsqhhf9a4" }, "stable": { "version": [ @@ -89127,12 +89765,12 @@ }, "stable": { "version": [ - 0, - 8, - 5 + 1, + 1, + 7 ], - "commit": "3454a4cb9d218c38f9c5b88798dfb2f7f85ad936", - "sha256": "039a84gwb0phjm7jcklmji1pcpbxmp4s40djhac8sbzmwdv39zi4" + "commit": "c91d4d53fa479ceb604071008ce0a901770eff57", + "sha256": "15h809mf8d8w8axbfzjs40j8yrh5ms88x4pmlx1qlcac8j6qrilf" } }, { @@ -89262,11 +89900,11 @@ "repo": "jschaf/powershell.el", "unstable": { "version": [ - 20220103, - 925 + 20220402, + 643 ], - "commit": "ce1f0ae0b2e41cd0934a9dfbf2ff016b1d14e9c0", - "sha256": "111aqj1858ykimwdp2kh2j599n3rzz0nnv0sq424jn8dypx0fcvr" + "commit": "77b27faf8a292f1dc9f54c872241dc53b6791bf1", + "sha256": "0i66gq5pzgnh4x2y05vsd54cnb8v3adp7gxljwzzljm2jpwmb8hn" } }, { @@ -89277,15 +89915,15 @@ "repo": "SavchenkoValeriy/emacs-powerthesaurus", "unstable": { "version": [ - 20220221, - 1004 + 20220414, + 1453 ], "deps": [ "request", "s" ], - "commit": "810a25056c623f304de6a72123652d9c35936718", - "sha256": "13pzfqjh734lma8yfmp6a7r0j4a8jk3r0dc38hlx1vxwp0pw5ags" + "commit": "88bc5229cba1604c8f74db0a1456d99259d538cc", + "sha256": "19fvibfv3skvs77k3bsd0q5cg3shn9wrdjfyrcybgc9sjfcngv7n" } }, { @@ -89352,8 +89990,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20220213, - 1524 + 20220412, + 440 ], "deps": [ "ghub", @@ -89361,8 +89999,8 @@ "magit-section", "markdown-mode" ], - "commit": "5c44b06e314a43a30de8323cae75b1e87594f991", - "sha256": "1f2lrwbb85i31vcjin9b0gi89m2zn9w2npwi1sqp0bjd0ndimwp5" + "commit": "cfc5643c4ab66f17a31d82418465ae434486d8db", + "sha256": "0gf5s7f4906qypy3imaqh7zy24xd1ijz57rh72vdvjd33n4x857f" } }, { @@ -89396,28 +90034,28 @@ "repo": "LaurenceWarne/prefab.el", "unstable": { "version": [ - 20220314, - 2005 + 20220403, + 1026 ], "deps": [ "f", "transient" ], - "commit": "4d9cac415a4ee86bb5793ce18a350a30f562c2fd", - "sha256": "0f4cm5kvsa14yl93vw750ll51vf1g4b04vl6zivq1nzrb8gjj6zr" + "commit": "ffcf9c640c8c458a58b752ef2608e07a929a1104", + "sha256": "119gbadnzgxhrw5y5swyzkm5268wjpjnxfy21ybsxw8dj2rsvvzj" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "f", "transient" ], - "commit": "70c20db8423e39e9889222531ba52715c6d5ce87", - "sha256": "1f4qikrs9zdnnr6f1a5vwb0f9kqn1b7fb5n5n9r14h1wc6pn6y48" + "commit": "e4775959e5410a24f84fa2855b9709fb65fc89b3", + "sha256": "0c6kr1m28gf8yvn9rcbdrrwmyfma3c27l3iy8jhsd8rm6girm102" } }, { @@ -89437,17 +90075,17 @@ }, { "ename": "prescient", - "commit": "ec02349e31531c347e4a43fbde56ae4386898cc6", - "sha256": "04js3hblavfrc6kqp942x5yjdl3ndazf3n64p83423ldsmhbip6s", + "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5", + "sha256": "04anqfn48ibmg11s8gp3i8wyghy724hg1qzbw44jfndmv6nibifz", "fetcher": "github", - "repo": "raxod502/prescient.el", + "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20211228, - 417 + 20220509, + 2300 ], - "commit": "c5295a9eecbd2935bb57684a4422638e03bf738c", - "sha256": "1wfmynbqaqvrkjdncx0wmqxz6v8zlfmqlh5l3h6876jin97i5fbv" + "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484", + "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c" }, "stable": { "version": [ @@ -89558,14 +90196,14 @@ "repo": "jjuliano/prettier-rc-emacs", "unstable": { "version": [ - 20220321, - 1516 + 20220330, + 145 ], "deps": [ "prettier-js" ], - "commit": "f2aa1a7469d62a11479a3abb826c8fb96dd00082", - "sha256": "1rlfh2c680nl2bbv82mp4y6k6cp7qwp2axi0v998zb62ymw6p1bv" + "commit": "99e40a9783299e41911f6b37156626d53e43809e", + "sha256": "0qbjrrmkm1qnmmki80didis903dmc60aacxh773xlvglyxlvgyxn" }, "stable": { "version": [ @@ -89786,6 +90424,30 @@ } }, { + "ename": "private-comments-mode", + "commit": "ee5f195654dbb1b55ab1a31f39e497a85bf23639", + "sha256": "0ncmka1r5p79amiy9pkikcvnxwzfm9blkr6jm8nd6fm41mp12ld9", + "fetcher": "github", + "repo": "masukomi/private-comments-mode", + "unstable": { + "version": [ + 20220330, + 1316 + ], + "commit": "57eb1ba3812e44344b7d5336c3a3ad14a28e4f9e", + "sha256": "0m5qksmzbjwzv10n7hb3v8sa6zab4kp2w7ayv2g7fc94cm1aljz2" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "9d7a650278749cdbcc2564b54b15d66be8213efc", + "sha256": "0mzrrk1j07arc126h70v9plib32gnfr0haavf2qb219rh6hrljzg" + } + }, + { "ename": "private-diary", "commit": "ef39950941c522e64ea991c9eeecfb5f6f18f6a2", "sha256": "0dgnf375c00nlkp66kbkzsf469063l03b9miiplbhd63zshlv1i1", @@ -89897,21 +90559,21 @@ "repo": "rejeep/prodigy.el", "unstable": { "version": [ - 20210116, - 816 + 20220507, + 1753 ], "deps": [ "dash", "f", "s" ], - "commit": "168f5ace1671876d8c3bd350c0853bd0196bddda", - "sha256": "15rshpq0h5i252xamxh70acdz9jddn5xwgswzk5h2b24kxsbfnli" + "commit": "535789e32028133fa9dfb4c9135b6a65c199472f", + "sha256": "0x68c7c40cafg4lbi1lwlli3bghnhcb21wm4idg6qr07y351fjqd" }, "stable": { "version": [ + 1, 0, - 7, 0 ], "deps": [ @@ -89919,8 +90581,8 @@ "f", "s" ], - "commit": "3bacca898db9b3493883c95f923a87eb1ce807eb", - "sha256": "1whnk1902f8q03clm9xlfl47gkpsywf3mx0ykp70c1q496ab39qj" + "commit": "b67e4112eaca7ef7c8596c4728e9bc53418982d7", + "sha256": "04xspdj67nas1ivv0ldlmmkr6v7zd7y3k346pnfgvq8wzqi6x4vz" } }, { @@ -90009,8 +90671,8 @@ 20210715, 1213 ], - "commit": "7bd4d77808e15bc3845b0ab2421bb31c20e981cc", - "sha256": "16ybwsqlw5j92bynm9x56s351y4mh2s51ycbcfcl3460b9adqsxl" + "commit": "d47f08f64cce595cbd4e9fbe3544986b3c4cee83", + "sha256": "0pp9f8kcgnsgz0mykss4jppnwvlfx7ny58y4pb1rm4l2xvs8y6yj" }, "stable": { "version": [ @@ -90126,6 +90788,21 @@ } }, { + "ename": "project-rootfile", + "commit": "0fdd6cb9b09cfa3941c0d4dc8271d4c86863bd31", + "sha256": "0yz3dg7r8pr9i79svd67vh2axskraxq2cjkavzjl9i8nidkyfjxn", + "fetcher": "github", + "repo": "buzztaiki/project-rootfile.el", + "unstable": { + "version": [ + 20220512, + 443 + ], + "commit": "cb87657c4426e39aa2c481190e594c68fb0de8be", + "sha256": "07gb9b72gkwz748xwnsjayn68x5qn8b0ka8wmwvqgwgak14f1da3" + } + }, + { "ename": "project-shells", "commit": "becf54de5ae9582d7c76382dff16d40b04b1a464", "sha256": "0mhifxcpgsfwrhbs7axg6ja4klgzzy9pc0nqa7w3qg45xgi9s4m8", @@ -90151,11 +90828,11 @@ "repo": "fritzgrabo/project-tab-groups", "unstable": { "version": [ - 20211018, - 2252 + 20220331, + 918 ], - "commit": "f0a6c93c2cefdb781b6f1ef6628aff54aac35e7d", - "sha256": "1y8xzabh7n7p4g0b2zhv4z9n771skr1fpxfwlm0lia1g4c37rsyh" + "commit": "837267a23fa57199599b96af94c2db2e80a859d3", + "sha256": "1yrypgykgvvfq0qpkv4arc766r5kq1cidpmkk6ymlj376rviivvf" } }, { @@ -90166,11 +90843,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20220313, - 1334 + 20220430, + 800 ], - "commit": "20df208385ce7b80207602c9931e31094eca85fb", - "sha256": "15nnmnapyclk6v69l2l0vhy5k5x682l0kj9nj454nmdqqh4lmkwy" + "commit": "a4f86f981c84a546530d5904253fa266431ef806", + "sha256": "02303v7y79vdl4n2qga42892cqd5hdajwzp4vk3a4fxcyl8yhv8k" }, "stable": { "version": [ @@ -90240,8 +90917,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20210810, - 1303 + 20220403, + 1621 ], "deps": [ "dash", @@ -90251,8 +90928,8 @@ "projectile", "rake" ], - "commit": "30828afbfa7b0e07970e3e668e975e7916b824c4", - "sha256": "1m1n1rvna9qhq3dl4sd90lnkzvk7vaz2832r3zhfyg6l5d7dybh6" + "commit": "2a0107e83d8320507e288c853e0762bec110cd15", + "sha256": "1vihbp5phm1mkhjlr7vdlvpz6cm7664sgwkxp8dif2h3q9ggrzla" }, "stable": { "version": [ @@ -90572,11 +91249,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20220310, - 2253 + 20220329, + 655 ], - "commit": "f34a4938399e6b863f14315ba5eeefb5ce047c50", - "sha256": "1cgnjpxjrdwf1sk8a7b76gsdvlsl8p0cwb4yhizvafm5p4276v5s" + "commit": "2a8701209b273db5a35f15145ec62f32799e03b1", + "sha256": "05l65cwyw2pdyv6rn14h0axplgnlm5z7v90iwcxk9vysz74icdd7" } }, { @@ -90671,17 +91348,18 @@ 20220303, 1716 ], - "commit": "b5a35bcc7e4cc4ff00eb105449b300fca3a8b0d2", - "sha256": "1gydvww2n64gsa2nyi5150jwsgxg0mdpxr3h9kpzdd4rqxab07z7" + "commit": "b3cbea18ea02ab82379ba5d014899035aad4b8f4", + "sha256": "0x60jy244xm1gkqvsidyj8xfqdfwpn0q8knr28n4giycwlzncgyr" }, "stable": { "version": [ - 3, - 20, - 0 + 21, + 0, + -1, + 1 ], - "commit": "bc799d78f81115940eec953e2937245c70e3e6e4", - "sha256": "0qnr8dp0cc2sfhacgjws1kc3s5c1xvbcrn5pi83p0axj0kdhjdbm" + "commit": "3cede25cef0c2f5f5b60461b608d8c07a621ac04", + "sha256": "0q024rd5y8kd9pjslh118vhl3awr95gfvc6zxxr6i4qwqq1jy5nj" } }, { @@ -91014,11 +91692,11 @@ "repo": "flexibeast/pulseaudio-control", "unstable": { "version": [ - 20200406, - 752 + 20220418, + 742 ], - "commit": "a931533140547510decdc368f39b2d2b97ca725f", - "sha256": "1jvjn9jszjjapi167an49jxcvr88cvgjwykglhp4b8lwhbjfqw76" + "commit": "22f54ae7282b37eaec0231a21e60213a5dbc7172", + "sha256": "0y87i8qpf1fvz37zly9srss1y9hpn4jjj8gsikc72c4qs9n0ljv0" } }, { @@ -91083,11 +91761,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20220204, - 1645 + 20220405, + 1808 ], - "commit": "e6681214afc6b5ae06e4813492633bb4ad9b2b1b", - "sha256": "0jqii5ijbnppayawrl27b22accpxayf5i4h15zx1s0wpb77km0s8" + "commit": "bb9b1e271b51b3dfae984da15f0e40f5be5b2473", + "sha256": "1m581adq9pp6q22n2dfazzmnlyb375ggk4f0ihpccrwccf2kzdk3" } }, { @@ -91145,8 +91823,8 @@ 20210109, 244 ], - "commit": "0acd1af446424ba855153161fe07a20f67dc0a89", - "sha256": "0rxdsmx8826az4blhnnvqrx7bjky9hwph6gkyrh33sck26xhh3g5" + "commit": "9c37067e611b5253a095f03245c247aa97bd7614", + "sha256": "03kxds61qzn5f8ffz4mdcsck8nlnp4z87h1wm4l4560qkcx2p95y" } }, { @@ -91261,17 +91939,17 @@ }, { "ename": "py-autopep8", - "commit": "c400e0f3cfe70821e621fe85d239b4f6596d5171", - "sha256": "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp", - "fetcher": "github", - "repo": "paetzke/py-autopep8.el", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "06blvhb65lp3jvwiznagqskf4gb7w8ly9vvghwrlvwg960m72h61", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-py-autopep8.git", "unstable": { "version": [ - 20160925, - 1052 + 20220502, + 310 ], - "commit": "68e12d8788c91c7ec53a68acf1d23adb2ffa4788", - "sha256": "16fmym6hvi2lx0mmbrrhld1vzki5iqfqx2m0xa9021gjjzb33lw6" + "commit": "89c9ed8de2deab6bb891ae25c85cc6498e60b90a", + "sha256": "0ygvl8zq8d6lbv8x6j6vklxhc6xrmii4fd9c74py1bjqvx4d1fjh" }, "stable": { "version": [ @@ -91577,27 +92255,28 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20220130, - 722 + 20220512, + 930 ], "deps": [ "async", "xr" ], - "commit": "028e443527166e8cd6ecc903e635fbe89aca9c91", - "sha256": "1qpskp8jqxwfbg274lkl95fmilygzxqpy2i7vv0vdl7pdknvbkgk" + "commit": "dcdae4db85646de85b1ca75e4604691cf9273273", + "sha256": "1432ph59plnh41xrmq59n9z987r41xf34qsxl3sbzfw6v8m927ys" }, "stable": { "version": [ - 3, - 2 + 4, + 2, + 0 ], "deps": [ "async", "xr" ], - "commit": "0c8cd00d2da981e3833bface7d0c476cbb3e93d2", - "sha256": "102ns8vjmpb56afc3vyd62zfvvrnjdclm1fsn4jzj45b2in5wmxx" + "commit": "cd1bfd2bbc10fe0ac47d0ec383cde453f6019e6c", + "sha256": "0lvf50p97fns4pc6ilm4pqzp7s4srhcx2gyg6x5ywd5wv32nd04d" } }, { @@ -91762,17 +92441,17 @@ 20210411, 1931 ], - "commit": "556304eb1e54c67940d0f9d0497ffa368b50a22a", - "sha256": "0j6vwjw83wyhalwzic94pimjvjwsxyyz6mh6zsic44hc80ycnrj0" + "commit": "2ea65b12176e575748db64d740ef834cba577d70", + "sha256": "18fv0kibj3rj8aydyxzda4mk7qi19hg82q3rm2mdi85082628wmy" }, "stable": { "version": [ 2, 13, - 1 + 8 ], - "commit": "0e1ca11ac65cbe5a65437518fca1e25f1ad0e48e", - "sha256": "049mfnlwan1qq0awnxriw29v285ly4d3r8a8xgxhzpwg3k2z3sdn" + "commit": "45cbae2bab9001bb2f159103490a02d63e75ee5b", + "sha256": "1wc3h25p7pid3pzh6vaiaynzs1bqrl62dpb2g486hp3kbqdzlwp3" } }, { @@ -92086,11 +92765,11 @@ "repo": "jdtsmith/python-mls", "unstable": { "version": [ - 20220128, - 1953 + 20220505, + 1523 ], - "commit": "97e58c6b785f7096c0e02f6c1d12b008cc0219c1", - "sha256": "0nhk2jwzlnc0c1fzzdbc7dwil9wwk2ghizgynvdp9b2kg3jyd76n" + "commit": "6016c780865b3b9dcf90d9452367e0d39bbc1d1f", + "sha256": "00n2vrc7yq2cfsiwpwdga0yjl483rd59zvbdf41nxa92sircvjp2" }, "stable": { "version": [ @@ -92110,11 +92789,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20220315, - 1118 + 20220512, + 1206 ], - "commit": "29c6815c585c200eda2541b678e499d06c3e14d2", - "sha256": "1b146lq5hwr76fl1abg189xsjdvz8ggaas18n8d3yx4zvjskiqs9" + "commit": "97bb2d5ca50bec43a22ffc6187d13e3afb38238f", + "sha256": "02i5mqx3ip6k9n09yzr395ayhf4i1l7n8sk9q0ibcm2zadxnlqc7" }, "stable": { "version": [ @@ -92134,8 +92813,8 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20211215, - 1101 + 20220502, + 1237 ], "deps": [ "dash", @@ -92143,8 +92822,8 @@ "s", "transient" ], - "commit": "ea53891a219659d9339220d5db50a8c525f199af", - "sha256": "176c4banbgd474iw49cw17wbvncr13xwgqjsfpvvakd0awpyvzw1" + "commit": "5e72c343cb81866358e4437390c5eb84c3203440", + "sha256": "16inr0vqfas907bifbd9jh8m7p41hpk6n6ca7x42qkz80ay3i9px" }, "stable": { "version": [ @@ -92305,11 +92984,11 @@ "repo": "psaris/q-mode", "unstable": { "version": [ - 20220123, - 1721 + 20220306, + 1629 ], - "commit": "0bc3cdb32636278b1dc0bcc55741b147441347f6", - "sha256": "0dyf35fhm2wzq6p2wcgdhf81y4rs92j5np7jvrwp9ic9xzw51cx5" + "commit": "3eac36d23131088e32057716a3241407fa8dc041", + "sha256": "1wlgkyh8ci03448n5fm0p4z7jkhbrvrd3s8rbxvbdbl6ll1d9x15" } }, { @@ -92420,8 +93099,8 @@ "repo": "quarto-dev/quarto-emacs", "unstable": { "version": [ - 20220306, - 2243 + 20220405, + 1556 ], "deps": [ "markdown-mode", @@ -92429,8 +93108,8 @@ "polymode", "request" ], - "commit": "9250975a4602d7a78efa2b0e477088aa2df5659c", - "sha256": "0n0cqcfmq9d36vdqa47scpny8hpdr975ykw01nf7924zacwgnjfb" + "commit": "2a199735866dc34126a061c6f2990378b381e687", + "sha256": "0bdigc8d2b9g2dgdcalf5f0a7hh56sji7k78vv23ikdydmag5bi1" } }, { @@ -92494,8 +93173,8 @@ "leaf", "quelpa" ], - "commit": "1fb156302a4b14ee003720b7dbac5f3041345842", - "sha256": "18cy7kjhi6jcixnbl3vvmszrbkh04cbpkjk8ls1m6apvc0l0g9ll" + "commit": "ea60d14a6c8dbe65ad0b3353185945d43ae4393d", + "sha256": "0xddhjal99q3s537kcdrcimykmzca73ic3v2abv2ymwby2wm52b9" }, "stable": { "version": [ @@ -92633,8 +93312,8 @@ 20210904, 1553 ], - "commit": "c680f5137c49e352ff3779f9c82a3f1bd4a2d9b6", - "sha256": "1jjvjdig87krjmnwlxmlal56ks0nx4pgwrb5836srkd3aqlir90b" + "commit": "30e9a1333fe4a83424385df53ddaf7016df3679d", + "sha256": "1k6iyzajrw7kvz027l7yddvxq4a0jsahrdhsv8is4bnz8ws36s15" }, "stable": { "version": [ @@ -92792,11 +93471,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220325, - 1342 + 20220512, + 1447 ], - "commit": "c1774ad168bd0857cf695ad39ae4d61cd668f6d9", - "sha256": "1rksxymhadsj6zikhbn68j9iq0b01m9ajdddkk4kbaczh35vwyx5" + "commit": "3b351fbb0d3e81bf260cb3fc7b623f1b782550cc", + "sha256": "0gcyb47ld10jvrf3wm63njz0d9y70fi8dwsx14pbdcrw2xs2p4s3" } }, { @@ -92946,14 +93625,14 @@ "url": "https://repo.or.cz/emacs-rainbow-fart.git", "unstable": { "version": [ - 20220210, - 1359 + 20220427, + 2227 ], "deps": [ "flycheck" ], - "commit": "4e5d3cca6cdc667e5da3300c04e1b3d1b00664a8", - "sha256": "06874ymiqpmx2isys0bf1fxw83xfzx64sxjq01xjzb3zv5ydy13w" + "commit": "6504424707b6e9101dfbd9fdd4b7b963b9a4f323", + "sha256": "1rp8z10rggd1yzx979kwkldcqhqy19i03r9lw93d7137jassb9qp" } }, { @@ -93617,15 +94296,15 @@ "repo": "realgud/realgud-lldb", "unstable": { "version": [ - 20210417, - 1434 + 20220419, + 2006 ], "deps": [ "load-relative", "realgud" ], - "commit": "abffd0d2d23f6c87be5dc5d36e948af92de5df86", - "sha256": "1zjrjgs9vjaqsf5h9sxw1pf2f9sfngx1gxp37lb8myan52qmhlz1" + "commit": "19a2c0a8b228af543338f3a8e51141a9e23484a5", + "sha256": "1yyh945w13qh8isj5p0v8sjwzmvzh330szd2hdy3fgc3d58r7sym" }, "stable": { "version": [ @@ -93796,20 +94475,20 @@ "repo": "xendk/reaper", "unstable": { "version": [ - 20220211, - 1223 + 20220426, + 2048 ], - "commit": "d073fa8d00411af58fced861b7236aaa23b0692d", - "sha256": "0qg81yasilwk15jpxm0177slh9byihni9kc217m44pn0fxgpnsmi" + "commit": "2cfe54e9f5470415ab5f59d3c0829bfce41525ad", + "sha256": "1050bv05ljgr61jpvcahfd0cjc00n5kvdvdsawnq4fgpfj2j3vih" }, "stable": { "version": [ 1, - 2, - 1 + 3, + 0 ], - "commit": "d30397ffccc91b633bc0bdca9d3d1a340981009b", - "sha256": "0i46fkhrd14x21grqrmf9avkqxm81dsmrisndwmvkxk6jy5i6dd6" + "commit": "5a69cc206c8719bde897394376555bb74e77b915", + "sha256": "0c0a0mvhs0cx2lq3rkimxagyc33gn8ha1vb3p3py6h466lmyqbh4" } }, { @@ -93980,17 +94659,17 @@ }, { "ename": "recomplete", - "commit": "4a3938f413ff1ceeb7ed6aedf0e3067073208068", - "sha256": "0ym5l5cpx464hxzww4m35rrlr4c5h8kl6090w2a7hck47kwyv8ni", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-recomplete", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1y3m8vi3xkdlb7zf3b7hjdpw8isx6ncs2mw86ijf1brapmwpa99f", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-recomplete.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "d0d380929460ff35534900e34ababad43d23c966", - "sha256": "178415wsvjvji4caz72mksrv4krr7aykh02cggnp41w66chm503y" + "commit": "021ca9b047caadd4903aa6f417890d6497ae437a", + "sha256": "1a78hmq8p5a8w0pciansci69vm3m65kcxsfp184bajq1nx8ydn6d" } }, { @@ -94101,11 +94780,11 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20220224, - 1333 + 20220403, + 1812 ], - "commit": "e9bca04318fef45badd487cda002ff9617429f6b", - "sha256": "0cjn61dn67vxz3495h7klszqwkjv17bmlfv01adj8d2cibc5wqi3" + "commit": "63d946c5cb11b81184151f1385efed325f6cac2d", + "sha256": "1p0m1fklflvfd78p506js2i687fxv061j8n959wiiv6avm41nccp" }, "stable": { "version": [ @@ -94175,14 +94854,14 @@ "repo": "emacs-pe/redis.el", "unstable": { "version": [ - 20150531, - 1948 + 20220429, + 1758 ], "deps": [ "cl-lib" ], - "commit": "2c33f3397bc14e7a8192867b55920492d4eead8c", - "sha256": "1rjpf23a8rggjmmxvm1997d3xz03kz84xams486b9ky0n2v02d57" + "commit": "a6ad30d6a43b7be083c13f8725b45571d623001a", + "sha256": "048jvvxb6cskhs95n2ngl4cfgf8hbqidvbi1xsyb0gyzvvqbrhj1" } }, { @@ -94334,8 +95013,8 @@ 20210831, 1405 ], - "commit": "b57f5d480003ab7b0880e0059dcc51747fb2e088", - "sha256": "16ajp4p26aaswxcxpqgh43p3dk699gab1xc3l3aj7x1sjf3ag3zq" + "commit": "452a99b556ebf1953f92fe3e16c20d10d1fed466", + "sha256": "1brdpwnjl46hzlbyhkizy73p9vvfqyydi140rbmxap29y9iyzi1d" }, "stable": { "version": [ @@ -94928,8 +95607,8 @@ 20210902, 2140 ], - "commit": "9c32dc6fcd05c72177ec1659c33f3b834233b890", - "sha256": "0vpxk1hmic9r1z7z2yxh1pff2m7zlvrh3j27bdcc0q3xnbzkmh7m" + "commit": "350d717f5c2564817179c4b6b1c615b10fd062e8", + "sha256": "1068ypgnlza1y8zpzpr1fayda72bxcfcy9ikmhrpkzhpvznqr2x4" } }, { @@ -94996,8 +95675,8 @@ 20220101, 1239 ], - "commit": "9e2cfa86529133eba6c9ef53794be182f15e4c21", - "sha256": "0cq7vqfj8g2wd4ip2ia60rs2bpwkxd2rlz4wpp6as6ncidnzwzzc" + "commit": "ae79e7dd283890072da69b8f48aeec1afd0d9442", + "sha256": "0hbxrwp8nqd12x9z9krddlcm9b9adjzp1az90ywyr1a30bdmv5sk" } }, { @@ -95015,8 +95694,27 @@ "helm", "restclient" ], - "commit": "9e2cfa86529133eba6c9ef53794be182f15e4c21", - "sha256": "0cq7vqfj8g2wd4ip2ia60rs2bpwkxd2rlz4wpp6as6ncidnzwzzc" + "commit": "ae79e7dd283890072da69b8f48aeec1afd0d9442", + "sha256": "0hbxrwp8nqd12x9z9krddlcm9b9adjzp1az90ywyr1a30bdmv5sk" + } + }, + { + "ename": "restclient-jq", + "commit": "34f6696a0015aafd44f48de4cd220f62130c4ccd", + "sha256": "0hkrwnq15kf2qnpkzpji47bhja9h0h54gxc6497ww5vkbmmrnidr", + "fetcher": "github", + "repo": "pashky/restclient.el", + "unstable": { + "version": [ + 20220426, + 1734 + ], + "deps": [ + "jq-mode", + "restclient" + ], + "commit": "ae79e7dd283890072da69b8f48aeec1afd0d9442", + "sha256": "0hbxrwp8nqd12x9z9krddlcm9b9adjzp1az90ywyr1a30bdmv5sk" } }, { @@ -95101,8 +95799,8 @@ "f", "s" ], - "commit": "4ff5fd1660eabaccca1fdbec8bdfbe0ad84eeb6a", - "sha256": "18c5gg6cgxg6dijrc6ijiw0mkxfkyb6pw3dd8vzipz17pszf2bjf" + "commit": "dd72004f6f7b0d554dbd979f22a31c350e211089", + "sha256": "126dn4d0f301pybvrkjw3h5c729kbnaglzbgpsv5v7r35wrmxfgs" }, "stable": { "version": [ @@ -95194,17 +95892,17 @@ }, { "ename": "revert-buffer-all", - "commit": "02ff00238a8af45d9e26e0b7b6b19a507ea06f86", - "sha256": "1lyxwh3kjlhyi5ln2lmbhyn28fxdd3l58djc9mqbzwdfm81qprsv", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-revert-buffer-all", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1mlx015qspp7lrfpq5942azk9qlggai4157i8bl9c3hkh4q1sgfj", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-revert-buffer-all.git", "unstable": { "version": [ - 20220211, - 548 + 20220509, + 1045 ], - "commit": "0343c04a4408ff6cb3c8a9dff7d1ffee8256aa70", - "sha256": "16ws4j2fpnv96338z7vcibhscjrjmym910hsxc137lqrkavqhm19" + "commit": "91d0f4f7a0c0c3015887f4ed808537ebebd6385e", + "sha256": "1sja06pzvx1hds786q4a071zl8r8034is3l8s8zp5k4kxd6vg760" } }, { @@ -95272,28 +95970,28 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20220319, - 1216 + 20220511, + 1328 ], "deps": [ "transient", "wgrep" ], - "commit": "5673681708685cce34521a1af48609b00a642b15", - "sha256": "0b1lq45vsn6fylwn1wmmfwc8mzwg4mgmj0kfqic039yagf9rvnpv" + "commit": "c46c5167ac03f68fd6fee07972017282c62bc942", + "sha256": "1pkbkh260k2r7x158b691ppqvxxzqkyylbapwlrxzc2ly23rmaxs" }, "stable": { "version": [ 2, 2, - 0 + 1 ], "deps": [ "transient", "wgrep" ], - "commit": "77a709626609e7069f457e1b1885b76ebb98a354", - "sha256": "0a16g9phyy6c6vn5zfkpcpi90ixbx1ivp4wapwg189v77k2810by" + "commit": "444a8ccfea0b38452a0bc4c390a8ee01cfe30017", + "sha256": "1nxzplpk5cf6hhr2v85bmg68i6am96shi2zq7m83fs96bilhwsp5" } }, { @@ -95304,11 +96002,11 @@ "repo": "ROCKTAKEY/rhq", "unstable": { "version": [ - 20220308, - 1254 + 20220329, + 1027 ], - "commit": "9cd8c2d61c3b8d4c92542a8c7f7493f61a850dc0", - "sha256": "0pj9900jmlid6ygwv5r8nnz1j4axcspyk73hl2vi1xvlna93yxdr" + "commit": "46a3108436cc4a2c5343b010f2086088d7b9682b", + "sha256": "1swc4i5fb1b7khwk01n0hyz4k473mxfigihqca1b8xfi8vsa3bvy" }, "stable": { "version": [ @@ -95429,11 +96127,11 @@ "repo": "wavexx/rigid-tabs.el", "unstable": { "version": [ - 20170903, - 1559 + 20220416, + 2123 ], - "commit": "eba84ceaba2e57e76ad2dfbb7a7154238a25d956", - "sha256": "18rba101m9vmjl4mf3x0k7wvbgn6qmay9la745vzpr3lx1f4nn98" + "commit": "872a10c8751574c9610cba1800f541a6eda24997", + "sha256": "170j67x499a76nfa8s5nzh5d7b602a4j31y61jaxa82877gi2j25" }, "stable": { "version": [ @@ -95476,8 +96174,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20220222, - 228 + 20220421, + 1811 ], "deps": [ "cl-lib", @@ -95485,8 +96183,8 @@ "popup", "posframe" ], - "commit": "e5727c5218a4345adb9b960cf6f4202246aea70c", - "sha256": "14vifq3ksmr0dg4lp293pgr70j76ajasvrm9j9hf3jspq7hbxb0x" + "commit": "e6a89e9fa9eabc32063bffb2eacfcece46f7a049", + "sha256": "0rzynl2n6bk5lwff2rvpj0p3djnr421i1a9vm53554hk0vljzksr" }, "stable": { "version": [ @@ -95676,11 +96374,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20220325, - 1526 + 20220510, + 1621 ], - "commit": "2e1ff0653e5355a2214e735f0ada287071457c6a", - "sha256": "1ra2q2wnman6zdfmky296r8h73zhjwkika8r3czjx5nsg24464vi" + "commit": "3fe322e5739e57cceea37c4104ac7bc5231555c3", + "sha256": "1nc7hh3psw548mzzbcz7226i7pbyrdadmlrw955cl91z51rahxah" } }, { @@ -95748,8 +96446,8 @@ 20190812, 1858 ], - "commit": "8bf67285a25a6756607354d184e36583f2847e7d", - "sha256": "07255pn80w4742sz2h9vbmfxxd8ps2kcn73p7m2bgy02kgbzw42b" + "commit": "0d79161dfece3920600ad155ab1cc1a59da06964", + "sha256": "12yziw3mqhm4xzmkvzfm3w3agwjm4f7650gi99szpankdncma9xy" }, "stable": { "version": [ @@ -95916,15 +96614,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20220203, - 211 + 20220401, + 306 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "4215ff1f2d1cee24a144ff08297276dc7b971c25", - "sha256": "11bada87rji78pw0d3l9g70vz2i1cvdlwxl4ixxcyc6whlfbff3f" + "commit": "a54ac64097b6ccc6acc52a8b077ceb63766fc4d1", + "sha256": "0s512jgd62rh0x5x24jzkmnw7hs6m1s1bcys41hr1vv27i0j2zvh" }, "stable": { "version": [ @@ -96437,17 +97135,17 @@ }, { "ename": "run-stuff", - "commit": "68b7cb0ffe90cd56e2ca6e91e33668be586a1da7", - "sha256": "038brammgivaq2423sx0iy6n7d7lyx3r939a0b85ix8zvkcbinia", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-run-stuff", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "07h849w8s72vf1drvs0dvf2jmf47f3hxn30by630fp76bfif8i7g", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-run-stuff.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "3723346dc6d867bdc3fd86ca11c32efc43704d7c", - "sha256": "0082mv45a8ybfrrvw8jnc52rk2zw80i52gid1387q2hxsdil0csm" + "commit": "0aeabc7ef3f2a209c0c69300f6d61921ec448ffc", + "sha256": "0ylsj92fq98i7vbibav7807070adaz24jn497qcd15n8ndfrvri5" } }, { @@ -96537,8 +97235,8 @@ 20220217, 2009 ], - "commit": "26ecc903c50b2ffd289bbe981f9ad03626fc0057", - "sha256": "0jr7i85zacpwx3kqg7yb7mbz0ap8w3ydzb8rlf0syccqjiqwslnl" + "commit": "d17be3051b22a06d7742178cd1367aed61807a66", + "sha256": "0yslscybdvnmak1h99qgjrwqim9aiwxhnp5kw4wb4nfqr1nwm3yd" }, "stable": { "version": [ @@ -96581,8 +97279,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220323, - 1159 + 20220509, + 716 ], "deps": [ "dash", @@ -96596,8 +97294,8 @@ "spinner", "xterm-color" ], - "commit": "6eec9713876d698510ee3715698fd42c1571e307", - "sha256": "17lcys2sm56c8bnj9vjs9mz6liir8cnybax0fxgcrjgfp38wxc48" + "commit": "3b379fc25b7a097a014147d9c8b83ec1a418cd76", + "sha256": "129mclfyy6nji7c3avni4y3kzi3z67dv3cv40jmlv1m4isxf59n1" }, "stable": { "version": [ @@ -96900,8 +97598,8 @@ 20181130, 101 ], - "commit": "46352169bd6d2a86ca9c2052cd05ecd16fc7657b", - "sha256": "1k0b1w9a3b89ricji92nq4cqbh1l2fm7ly1bdl8pvf59drp7cpd4" + "commit": "369178c2dd0348250c2ec0019567688376c637f7", + "sha256": "1klwn7crvn7769b5kan91fj5lpz5sanghi4way8h77b2iciya7bf" } }, { @@ -97106,8 +97804,8 @@ 20200830, 301 ], - "commit": "e34e756d264800b701c07414ceffd9dd768cdf84", - "sha256": "0v6njsp1g7m0qjss4rhmbnrg8yccxyk7dy477cbpdijxw3fdi2yv" + "commit": "b929e705e76e8ff47d170c5e9849f86002f3e09f", + "sha256": "1iflrjldvabilvji1zmx1rmkl6z16s50k3hldn3l871gz16wa0h6" } }, { @@ -97183,6 +97881,26 @@ } }, { + "ename": "scholar-import", + "commit": "ee2e936ba4ce724e304446fd03c8ad13fccd2807", + "sha256": "0c50p19wxs1g6qn4vxazgv83x9r0b9h2wk0wh6mhpgn4irp2sx3g", + "fetcher": "github", + "repo": "teeann/scholar-import", + "unstable": { + "version": [ + 20220504, + 1101 + ], + "deps": [ + "org", + "request", + "s" + ], + "commit": "cd0b42e5026426af2bfad57b692760bcb5d05dbb", + "sha256": "1kda2yrpm2c8c8p9lg183hf8limc4b2ay5gdssfhc7r29nvvagpv" + } + }, + { "ename": "schrute", "commit": "505fc4d26049d4e2973a54b24117ccaf4f2fb7e7", "sha256": "1sr49wr3738sqfzix7v9rj6bvv7q2a46qdkimn9z7rnsjys9i7zy", @@ -97214,11 +97932,11 @@ "repo": "emacs-pe/scihub.el", "unstable": { "version": [ - 20211020, - 420 + 20220423, + 421 ], - "commit": "aac29628d4eea2d6ec0bfda39503c1f71a379bc9", - "sha256": "0pa054hanclapkj73wwwwwjmk2b3p36w2p44d1fz3w3lfjkf852v" + "commit": "57333c849bcd4953663cbf7c271e9f3a62179765", + "sha256": "0pla2qzpnilx73z3mjflc2a1pp5fnh7ynm749w2fxlrnhz7cmwx8" } }, { @@ -97453,32 +98171,32 @@ }, { "ename": "scroll-on-drag", - "commit": "0cc172bb1b4194b66827bf5be0b6658fb330a11a", - "sha256": "1i4i19qkin19h2xc1r6a66rsll1rfbbvf2nsm75f9vvvrdi4sjyf", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-scroll-on-drag", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0f5d4m1rf2ggac7yy6wdxx61sw10v48wxfsdj70b2wm6fqcz6fqi", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-scroll-on-drag.git", "unstable": { "version": [ - 20220211, - 548 + 20220510, + 1204 ], - "commit": "d93b69eed6947cabdfde53dfbcf4bd919cb1f154", - "sha256": "0r1c3b7w1mh7hpi7pi1szdac297w1ig0i1a9c1r7qs41id2bvw51" + "commit": "01c14f4c024548ed1f644263faa0786c10afc978", + "sha256": "09fifi2gsjk47aif3j0vysfgpshh7az3zlyiblpw5zqnmq3xl1a1" } }, { "ename": "scroll-on-jump", - "commit": "824ab5881f045a43056d9b143cc59267c43aec81", - "sha256": "03ra46xclmxrygpbbf05j9rx2q8qx70cxsqmhygqad5ij75h253k", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-scroll-on-jump", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0vp7pj8ib4h0a7x74pdrknxiqpbkxyhblw5jkbsxzmjbbjwaclk8", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-scroll-on-jump.git", "unstable": { "version": [ - 20220211, - 548 + 20220509, + 1046 ], - "commit": "99386fc01b3c7bc2e75458efca408a23220a5f87", - "sha256": "0b3d5bw635jjirkmym4w0y5x450zd88ic3k74jmmgf4fw0fl1q0z" + "commit": "8fde237ae6d6a54730445b399513bc6d31d7daba", + "sha256": "0fbqmwz519bqdafjygpbk5zj08m3z3rm62sd2071qsxqrf70z72v" } }, { @@ -97575,20 +98293,20 @@ "repo": "t-e-r-m/sculpture-themes", "unstable": { "version": [ - 20220311, - 2122 + 20220512, + 2235 ], - "commit": "407cbed4145af8feb5232b1161a5f79b6a9878fb", - "sha256": "0x15fwrc53z1g517jrqyjdd8diil8sjdp9qhbhnbm2nsp97f07yk" + "commit": "be3adaf9db276e899b44e5093316cae2014b22c9", + "sha256": "0wn066zc72djac8ccss95ydi69ggngknkjh2hg0hi17g3m2pj6f6" }, "stable": { "version": [ 1, - 3, - 0 + 4, + 3 ], - "commit": "07d74b29908447ff33365c23686682066549d671", - "sha256": "1azfr5np6m2zg7r3ga172mls3x64gb3m57lcfzwxgb9l8pmjy3an" + "commit": "a21871b75cc7cb575ceb43640d039307fbb412e1", + "sha256": "0ki45bvc93p76mxpsm5pyknqgf67xz6c122yssps1hcxhdazij5v" } }, { @@ -97665,8 +98383,8 @@ "dash", "f" ], - "commit": "09ae519ce825affeb6a033dac81bf7af946127ad", - "sha256": "1gprpjnm7r2faj53qcnch7s05s4jjrsh94hiji50kdi3lrwf2rs3" + "commit": "26ecae6a6d028fcbffc576a69ef8f787646bc12a", + "sha256": "1v9clc25pwbdq50xqabk36iypg2n68ip7znnhy6qwk9b3ir00zm5" }, "stable": { "version": [ @@ -97864,11 +98582,11 @@ "repo": "Kungsgeten/selected.el", "unstable": { "version": [ - 20200528, - 606 + 20220509, + 1810 ], - "commit": "3043fd2609f7e71d809763ae6e8dd4b6c904e63d", - "sha256": "11cr55g7rrr4gqb9r2znmff0bp112l7a96d26mznfdprzj7pdzvd" + "commit": "81cb32521a05ff2a9125e001b83608e108e480f6", + "sha256": "0zk5fnjw5czq71z3qgi7kl9r5y3cw5mx1hswyhli7xhxzjpldxp4" } }, { @@ -97920,21 +98638,21 @@ }, { "ename": "selectrum-prescient", - "commit": "5724ebca5ab5a1c3087cc13ae0693548666ed62b", - "sha256": "1zr83pq39i56v5bx78cp5cg2lrwz01975ng4h1ziv6nrh9p7vvr0", + "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5", + "sha256": "0wwcjqqprz0yikc3cyg6n503dk6rrx8xbw5xjqvydq0204mvw1y9", "fetcher": "github", - "repo": "raxod502/prescient.el", + "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20211228, - 417 + 20220509, + 2300 ], "deps": [ "prescient", "selectrum" ], - "commit": "c5295a9eecbd2935bb57684a4422638e03bf738c", - "sha256": "1wfmynbqaqvrkjdncx0wmqxz6v8zlfmqlh5l3h6876jin97i5fbv" + "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484", + "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c" }, "stable": { "version": [ @@ -97991,15 +98709,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20210613, - 948 + 20220503, + 1449 ], "deps": [ "apel", "flim" ], - "commit": "509f6f0bc2f5d020c63e47d9ad89410dc20bcb6f", - "sha256": "0lnr5kyc59rs2p3lnhyr6cc126rh17szp68xpsx4brym3blb37yc" + "commit": "b1c245b81715b0430f7593cee2339e6264104f3d", + "sha256": "1s1qvhxklzhmq9h62cn95iaxacvmp7c2hn6jh9bhymx4x9afqagh" } }, { @@ -98052,6 +98770,38 @@ } }, { + "ename": "sensei", + "commit": "a214e3fc18d245f446bc3cad976d9ece66c232b0", + "sha256": "1i47yayyma42afg61fii05wzkqw15mdm0rnpj34rhzy9ckmzl2yz", + "fetcher": "github", + "repo": "abailly/sensei", + "unstable": { + "version": [ + 20220502, + 2012 + ], + "deps": [ + "projectile", + "request" + ], + "commit": "1294a96f544fd1be9ddaea3a85369fcf437403e9", + "sha256": "0cg7rwvfc0yf9pld50f6hnpcyq3g7r7rh62sb9wzdnwiv9n249lk" + }, + "stable": { + "version": [ + 0, + 41, + 1 + ], + "deps": [ + "projectile", + "request" + ], + "commit": "1294a96f544fd1be9ddaea3a85369fcf437403e9", + "sha256": "0cg7rwvfc0yf9pld50f6hnpcyq3g7r7rh62sb9wzdnwiv9n249lk" + } + }, + { "ename": "sensitive", "commit": "5e5468ce136fabe59e1434f8a7f265f41c5e64c1", "sha256": "0v988k0x3mdp7ank2ihghphh8sanvv96s4sg6pnszg5hczak1vr3", @@ -98111,15 +98861,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20220226, - 1344 + 20220501, + 1539 ], "deps": [ "dash", "edit-indirect" ], - "commit": "a33a04479fc1d4fa0ee618833965ce9914b9c1f4", - "sha256": "1llvhm9kwv67rng7zd91j5cfx34aklx64drs3hrm5nlxpjass7sm" + "commit": "454c9a3561acca3d57cce6ddb356f686b3d8cbee", + "sha256": "0i7d4cig64lz27vq8rf6kqnpm5k7shzj34d6pg56pphf0xs26zyk" }, "stable": { "version": [ @@ -98605,6 +99355,21 @@ } }, { + "ename": "shanty-themes", + "commit": "202aaca417d9e7a5a473fe4e448b13fa4ca3a444", + "sha256": "004dgk5nqrv222jvln5mpv85asxr7khif0g1sgx2qbzq859am983", + "fetcher": "github", + "repo": "qhga/shanty-themes", + "unstable": { + "version": [ + 20220509, + 1656 + ], + "commit": "14a0e9de08aa6412931b121ae97b700e10ccaa80", + "sha256": "188h918n55mhw3jss10nsdc2m04ngdy1mbh7kfh6hhc9d36ydj7y" + } + }, + { "ename": "share2computer", "commit": "47647167cc7b9d7ad0a2fc4785849f69dc07d6cb", "sha256": "067xc1awknx9iqwd4lfj1gkni6aszzfr1179avzzfn1ggp7yzkmq", @@ -98627,14 +99392,14 @@ "repo": "sebasmonia/sharper", "unstable": { "version": [ - 20220321, - 422 + 20220510, + 2001 ], "deps": [ "transient" ], - "commit": "96edd4a1dbc267afdff0cb97298d1b05b7c2080c", - "sha256": "0pprbp9n43g1ijap96fjiz6sckplryi198gci0ywpyglx6illllg" + "commit": "8020a5da0327f9a18b4bdab474bf8d81c1b38ea7", + "sha256": "0nby923h8hprxqyx48592q5584p8rmq3zvi12g2fbglabff76bmp" } }, { @@ -98790,20 +99555,20 @@ "repo": "redguardtoo/shellcop", "unstable": { "version": [ - 20211118, - 1229 + 20220414, + 530 ], - "commit": "c97a80b58337f7ac257cace4a3fbed86f7fe8456", - "sha256": "0spivhcsnjjpc1x51nqy7ax57661ssq46sf7x9z1l3v8paxgaqxs" + "commit": "327f5ac43e5d543149a772aef06cdb616477eb43", + "sha256": "1rmv2swyir91c6x94bggkrwankfkipfzhxzmg2c1455ybm48n3lx" }, "stable": { "version": [ 0, 0, - 7 + 9 ], - "commit": "8213452241244b797f84e936e6ccd18b6dec3de5", - "sha256": "01kvxvwq1v87125arv7lpmlcbjf84pqcyyxm3lfhvzka25d5ibga" + "commit": "327f5ac43e5d543149a772aef06cdb616477eb43", + "sha256": "1rmv2swyir91c6x94bggkrwankfkipfzhxzmg2c1455ybm48n3lx" } }, { @@ -98937,8 +99702,8 @@ "deps": [ "reformatter" ], - "commit": "8496b0df2209cf6792c5197b924dd55807f0cffd", - "sha256": "1sb9zdig0ypr3c0dmm26cysc6dsij5vxf3zypqpjdh77si5asx24" + "commit": "ceb1ed4df3d7e198e4c5af0c2fd44c4d9d65832e", + "sha256": "1apaka8w4iwpa2ba652zpl5kl17ixjfnws0pnmx52yyvfj7bjv7n" }, "stable": { "version": [ @@ -99002,11 +99767,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20211029, - 150 + 20220426, + 715 ], - "commit": "6112c6a9e13c00c2c7aecd96820a46b4800d4cda", - "sha256": "18c1rbcpxv289fbzl66lvyd41l1jhkia7296sksaqsgv9n79c2w6" + "commit": "7baf17355289c29d18f993f383c5d6a187f33b35", + "sha256": "1a2m6jkvnv852q07wvi80nbm7437wnvdfdyiq4iffhffmz8c2mrr" } }, { @@ -99081,8 +99846,8 @@ 20210715, 1227 ], - "commit": "ff41a9988523891de92379b611f8c00b44d4127e", - "sha256": "0k29xx6ym2mqcn6rszxl4p05zqfpfvhcwvc3h3cx0bf5b8pnxd3j" + "commit": "09aaba23300b9fa3cfd15ceb0e62da4a3d53e7e5", + "sha256": "160ck71cwlzsi59wazxf3nl5sim6rflbs2dxhiavmv9rz2xjgk46" }, "stable": { "version": [ @@ -99347,11 +100112,11 @@ "repo": "riscy/shx-for-emacs", "unstable": { "version": [ - 20201121, - 1824 + 20220424, + 2124 ], - "commit": "09ae2124369ded4f38459d2456f72536d172227a", - "sha256": "1q07f1ppxx3z01c6zc20pg7kwfmzjzqbsmq3qxgkn3ggchyw0680" + "commit": "15bbc0f89a4927792e2e791378de827ab698ed69", + "sha256": "1llsf65yz2rzj0dyvqjirb5z3cxdr7251iaffbx9sl761nsg2nk9" }, "stable": { "version": [ @@ -99449,17 +100214,17 @@ }, { "ename": "sidecar-locals", - "commit": "223bf20a37b48516b6ec9886c67660151ab37da6", - "sha256": "1lw4s749ril3mfbjdvns2myd5d8jf5dhzyywmk18bp7wb5cnmjbg", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-sidecar-locals", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1vw7xrd0kv50q2sqydw0wwrw5z30lwkfvk70n4v78r9r3y1pfx4m", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-sidecar-locals.git", "unstable": { "version": [ - 20220211, - 548 + 20220510, + 413 ], - "commit": "b69943575bfa7f13ee99c8b8871d3216ad24c85f", - "sha256": "0bfl4py2s3mxpzc60l9qmmdy079li0llzd6gsczwbmvfnrs1189q" + "commit": "7fd5daec1e0a7a091b343948bbb5c77e73724776", + "sha256": "1mbfvq1xbplk33363yqshqq7zmvqra73i0i126dcnzpd95pwqsqm" } }, { @@ -99868,14 +100633,33 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20211016, - 1144 + 20220511, + 1734 ], "deps": [ "terminal-focus-reporting" ], - "commit": "237fb7029fde7c16a24d2231754d95190c1f03cd", - "sha256": "18fnvr7a6zai2nxnv8sq42lgwgfig6ygfkyvcnzn04x7yw7wigxg" + "commit": "0eeb75db3eb031bde3e5820ee39a2b7549dc5d8b", + "sha256": "06ky6358cc00z18srp6wcid9f0pjy1kwlvvmfznhsfqkjr6pshzp" + } + }, + { + "ename": "sisyphus", + "commit": "cbaf88bb3789691a2f733369c271d33b8e959f6b", + "sha256": "03y1xrw1x7prygz46wq8c999l8ra7vcjzqqrpk8qkmmqcg072ag6", + "fetcher": "github", + "repo": "magit/sisyphus", + "unstable": { + "version": [ + 20220506, + 1140 + ], + "deps": [ + "compat", + "magit" + ], + "commit": "9626d9d26dc9f3cc57d41fa119a74e0cb1c4aab9", + "sha256": "0npyysnddfbm1dgidqn63jrgl9clx55in1cp1krz03zrif3injis" } }, { @@ -99942,11 +100726,11 @@ "repo": "dawranliou/sketch-themes", "unstable": { "version": [ - 20211209, - 1708 + 20220404, + 1741 ], - "commit": "f0425fb8d2c78a414c653d7bd1b3bf4d282afa1a", - "sha256": "0vfq8yhskprhj80wag7r82vzlgf8avj1v612yxi510c2wjrnygzq" + "commit": "8a609ec8fbf12231ba67aab9fcbb6b3ad0420359", + "sha256": "1mfy1vzdsli5qrdbbpm0bkhmvq8qp0692za5ykp7fbq9sxmqd65c" }, "stable": { "version": [ @@ -100161,15 +100945,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20220302, - 1215 + 20220510, + 2050 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "6ef28864d4a6b4d9390dbd0cac64f2a56582682d", - "sha256": "0pscgg31slqggdzrjfmkg721lwvqph9qrp833p1j4b7wcc1j8xvv" + "commit": "c5342a3086367c371e8d88b3140e6db070365d43", + "sha256": "008qav1p8angqczv8l1yd2ics0pyp69x93s8xvapcrxvhv8ishgn" }, "stable": { "version": [ @@ -100899,15 +101683,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20220204, - 1134 + 20220510, + 934 ], "deps": [ "cl-lib", "dash" ], - "commit": "37f77bf2e2199be9fe27e981317b02cfd0e8c70e", - "sha256": "095aqr4mz6yx8xa2gr7k5nf6a82qxdrjh8qv47hfhbc3832gy8jk" + "commit": "ec15aaa748b21c9b8453dd95604ccc95fc1138cf", + "sha256": "0cza0wnk3fyyh13srczf2976xwhyfmq2v9m7q6k2lyn7jyfvfxiq" }, "stable": { "version": [ @@ -101174,14 +101958,14 @@ "repo": "zzkt/smog", "unstable": { "version": [ - 20200211, - 528 + 20220405, + 251 ], "deps": [ "org" ], - "commit": "531957d7356f623b026aa45923e536421f682c1a", - "sha256": "0rb8vjnkn9pp0lrmmvsfslmw7xya4n18s82vs98545phwc4bjga5" + "commit": "28b053198ff9c1b142789614d85d7d762d9b0fa3", + "sha256": "0hqmpgvggsrq2dj0zxy3675dvf6wbw7kyhv72wjqb2ldx35j52pq" } }, { @@ -101409,15 +102193,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20220210, - 1654 + 20220404, + 307 ], "deps": [ "dash", "s" ], - "commit": "5824a3c33ee51acc1d3cba36ef6892ebb3a8df1c", - "sha256": "0svjaid3x3l7c59g7ckpgsnmgh7j118rakmfs0qhjh5xla60bglm" + "commit": "afe4286dec79ef45a42a343033f69d90dd308535", + "sha256": "1nq1w4vxcb1sv0gbdfrmjxjk07vailjrigk6yhjms65ansy7qfsq" } }, { @@ -101762,16 +102546,16 @@ "repo": "artenator/somafm.el", "unstable": { "version": [ - 20200224, - 48 + 20220402, + 2131 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "918e7c876f26f74ab21b585de2607819e9e74c08", - "sha256": "1a2bsz5b9mz5wxj5bf4k79ddjln987k8s2d12q8fifq5pnj1gp26" + "commit": "90b661fb1abc652feb6508eb61735919d02e9687", + "sha256": "0n8y8aj42j646vfjarl6w1dxn7wxqx3w6vjwbm8wj4i8nm17a77z" } }, { @@ -101940,8 +102724,8 @@ "cl-lib", "deferred" ], - "commit": "323a364d2c220873f935ad46142c05c4fd1dea1d", - "sha256": "1dsb6j2kli0a0y06yn7gj5c72f6qz9fpwqhnvh9glcbqf6vv068r" + "commit": "112450888f3f90f0f2a0e43e49eb5a7e49b1b6db", + "sha256": "1dmchr5mg84xsyny0xnwwvvqcn09kca4r85amy1h7b0qv7p60vv4" }, "stable": { "version": [ @@ -102199,11 +102983,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20220128, - 1519 + 20220430, + 2248 ], - "commit": "a09347a354a14f5407e99fa730e01345d03e03fd", - "sha256": "0nnc6pk5jjx4yhadcph9q9aqb0ks8gs9ybhd32wm32653518hmv4" + "commit": "bd376f705d6eb7afd9a1dfa0c1bd407e869d1e9f", + "sha256": "1kxnnmnj7pbli7lybxvhhd63q376i65il8zxnjig0p13pyh5j1mv" }, "stable": { "version": [ @@ -102306,17 +103090,17 @@ }, { "ename": "spatial-navigate", - "commit": "143e50e99f84cc7f0c9d0597b30c40609ac86dbb", - "sha256": "01w8sjygng0bkkwnfqbyhpd1aa6yls95293mnpdfipwa0zy3rivl", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-spatial-navigate", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0xv9jdnszx900wm15ifimv0dsyzvcj9sq289qy5hz6778k52ya9z", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-spatial-navigate.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "0365544483f957db79b8e617fb0bd8160134a655", - "sha256": "0c52dfy1jqmbkl8ml06xif166kxbyy9q8z33cpvkljh36ia23y1z" + "commit": "09ebd2ba7779998c31296bf8b6ffebf854f3eb73", + "sha256": "1zwynrnsbkvac8xi4y81s6z4h9p8vknxd7ii0lqw5cmphx0fdbqb" } }, { @@ -102327,11 +103111,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20220325, - 106 + 20220511, + 143 ], - "commit": "914df7fa483825d813e7aaeb9dffce629aae2a52", - "sha256": "0ccw0wmc5kx9x31x0ycw74ngh6zdkjqm10my9ypfc97rfv2q6bh1" + "commit": "701e7c49c38babaa2b2071febd2b112fef600683", + "sha256": "1wkqrlwh9n827x49m71j5ilkgk9xn6smxi11cfbd35hbdkdf5gyn" } }, { @@ -102452,17 +103236,17 @@ }, { "ename": "spell-fu", - "commit": "abaa6522f18ca1f47788ebb3281fbfcdade2b7c7", - "sha256": "0c2yi5lz2ww7mm9ih3m374w65n73z4knhnbrvdyzd7ja3xb3l17n", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-spell-fu", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "04qb0yldnqh4bl2jq1qfr529bnx9hfz74pdlsiv30avm8ly01d8s", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-spell-fu.git", "unstable": { "version": [ - 20220213, - 1215 + 20220507, + 1118 ], - "commit": "8185467b24f05bceb428a0e9909651ec083cc54e", - "sha256": "0ka7i2jl9vbr5071pbb3n8ckc9nqgpxrbfgij7wn33g01dpn2zjn" + "commit": "2f2fd6de0003edb1038b7c639cf23264d1406993", + "sha256": "1p23c2y124xmd3zwfns4zmk460vxd459dds0w0k9mnjnm9p8dkq2" } }, { @@ -102521,15 +103305,15 @@ "repo": "Fuco1/sphinx-mode", "unstable": { "version": [ - 20211021, - 1444 + 20220417, + 1552 ], "deps": [ "dash", "f" ], - "commit": "9d4075c106fc837006394c4c803281383f2ec6f3", - "sha256": "0ngc0b4z0s25l85wk3b4f3ipxnzxl4caiava9kb6jsci0ylap98a" + "commit": "77ca51adf9ee877f3a8f43e744f59e650772f121", + "sha256": "0imv3baiy0cq4aj220l8rx4d1drsmiak7vrhbshsg9987026b8ig" }, "stable": { "version": [ @@ -102895,8 +103679,8 @@ "deps": [ "reformatter" ], - "commit": "0351dad6bec06a381484c0c95309d46a7a8acdb4", - "sha256": "0hra8lrg4fkqr6x6cq9mbqx8y7fkbccgzxmqfngy8cj2dbcvp9k9" + "commit": "5d3f776c7eaac0c353ad184b54ef17b2ebc58015", + "sha256": "1k7rfdm9vd21lfa2h967423swq6w9yp2h4al481yl774cbssdc1y" }, "stable": { "version": [ @@ -102941,11 +103725,19 @@ "repo": "pekingduck/emacs-sqlite3-api", "unstable": { "version": [ - 20220202, - 728 + 20220501, + 1217 ], - "commit": "88dfeae8f9612cb3564a7393aa8a5c867aacbaf8", - "sha256": "0sj1fsgcgfzz6dfpmp8r5gmdwpbdzpk5g5lm8j7c3nqj6wqgg7g6" + "commit": "68eda59d5f3d29d0a64d6256d58b8c1f93ba3583", + "sha256": "0yrfwb3yvhp1ib4izxh1ds68b3zw8gjkjhlk1kivarxnfjnjnly2" + }, + "stable": { + "version": [ + 0, + 16 + ], + "commit": "68eda59d5f3d29d0a64d6256d58b8c1f93ba3583", + "sha256": "0yrfwb3yvhp1ib4izxh1ds68b3zw8gjkjhlk1kivarxnfjnjnly2" } }, { @@ -103041,11 +103833,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20220321, - 2152 + 20220406, + 1831 ], - "commit": "5efe17755c04dedb62033c1c53eda3c28c3a5f65", - "sha256": "0yxjzp1wxyggjk15d84b0399z5d5xspphdsy4m8r52aqcfxaqnd6" + "commit": "dbcdc58d3ea9e0767b24bb0f05fc8de8849889fe", + "sha256": "1a7s7p3lq5gvgkw9ldzgg8nvjap4j6szdk0gw5njq02jccfzc7ll" }, "stable": { "version": [ @@ -103196,14 +103988,14 @@ "repo": "death/ssh-tunnels", "unstable": { "version": [ - 20190622, - 931 + 20220410, + 1424 ], "deps": [ "cl-lib" ], - "commit": "d32e2072f50bcbde787196abb5862735837dc8be", - "sha256": "1i0wmdv0pglsz1pbhfjrpr1q6sxh1q74s41vnjxk5r2q8p1fh69n" + "commit": "a74488a71c2827dcaf42d9381d0d974aca96e27f", + "sha256": "0lrfrzxwjrhj90ampkg92pcpblb4i7744kwx2sl6ivkp7ldklyfn" } }, { @@ -103337,11 +104129,11 @@ "repo": "SFTtech/starlit-emacs", "unstable": { "version": [ - 20220325, - 1418 + 20220507, + 1833 ], - "commit": "9a76710497482110f5cba6e86aea66d94f5dbb50", - "sha256": "16nswflx3ccqkc64ijy4wvq0qqikijqh5dvj0j2ylf8bydnv4xqb" + "commit": "f788903244778508891eba0da70ea9f287efc9ae", + "sha256": "12dn7sz4xkici1k3jizijh0lzwf8fd0k62dy6v8kcvmwpnqxmrkb" } }, { @@ -103474,6 +104266,21 @@ } }, { + "ename": "stem-reading-mode", + "commit": "2c33a541dbe07e85be3b2d8f693485a0674898c1", + "sha256": "1mp1msz3b9w0bszkg0z6jh355vxd7pgjrn3bk6xqg6ancqya8hkv", + "fetcher": "gitlab", + "repo": "wavexx/stem-reading-mode.el", + "unstable": { + "version": [ + 20220418, + 1136 + ], + "commit": "a8bacd80fab6013c09e4e8d337fd88267cbe2ff8", + "sha256": "0ib2rqybwjxclgqy6bp0gmgr6mvyp434mf9ix6m8by3jrkpppvgq" + } + }, + { "ename": "stgit", "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", "sha256": "0iv2fiv8i2h4pqbsvy10avijvlk2waprmn0z4jq4hcyvarwzxvp1", @@ -103484,8 +104291,8 @@ 20200606, 1308 ], - "commit": "03fc757c4255bfd445cdbc2a62ca3b02a65beba5", - "sha256": "1p6lcc2xnslkcm2d3pg5zd6nvbdy1y9m3ymrcv1kz0xj33cnphjf" + "commit": "9ce680a52bd90ce9bac568a6a182b1b3c00577e5", + "sha256": "0ab9ri7bdhq0w0hn7ady3xf5rvsvni3j1l9lr6y3nqf6kfrbhzhf" }, "stable": { "version": [ @@ -103534,11 +104341,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20220326, - 1241 + 20220511, + 1245 ], - "commit": "659d5814c5f9b21b159778ffab30aa9d8fb2cb96", - "sha256": "0skvns8x15cffwmv904sfgqz5rh4kv84aflwk547p7j1fcz8pja2" + "commit": "d34e83d6a00c248c7ce9ab34425773c30910f634", + "sha256": "0vfwa5iw6ac7yijqzridn07ybl295s2kxfc45ld9sp62gj4qxs95" } }, { @@ -103568,14 +104375,28 @@ "repo": "beacoder/stock-tracker", "unstable": { "version": [ - 20200228, - 542 + 20220430, + 1144 + ], + "deps": [ + "async", + "dash" + ], + "commit": "58018a1747273df23dec08ec5d318da1960428c1", + "sha256": "0jbj24pbc07gjb6zk29yzjrd80c4aaqfp2mffc4qqisws0f8gfvb" + }, + "stable": { + "version": [ + 0, + 1, + 4 ], "deps": [ + "async", "dash" ], - "commit": "32ae436a4cad49fea5038cc3e8eb638a3a83dd6c", - "sha256": "0dmjvgkhd445azs6vrj8lzcfmnm3h4prajr0c416s2ircrzpgnd9" + "commit": "34632dd99903d4ffbb78a2deb5b658291a6cf040", + "sha256": "0rq8qimc3xfh1x9g691x2bmmy9a1bglv6180hdc5z6irv5gfszvn" } }, { @@ -103995,14 +104816,14 @@ "url": "https://git.sr.ht/~amk/subsonic.el", "unstable": { "version": [ - 20211231, - 1449 + 20220403, + 1208 ], "deps": [ "transient" ], - "commit": "992bce5fe3c2322101610d53d08a89ec3bb8fc43", - "sha256": "0vd003r0f7n5pp1xw6lvg2cvyz1mr5w42v35y67028cyjdlv1mxd" + "commit": "e9acece0f840bc6ea096ae56e77573939a2c510c", + "sha256": "0pynzc34bzppdfl1bxkhb0r7z4c0kd1bil5vblnyn4gnjx00jb94" }, "stable": { "version": [ @@ -104234,11 +105055,11 @@ "repo": "bbatsov/super-save", "unstable": { "version": [ - 20200930, - 1634 + 20220426, + 1056 ], - "commit": "886b5518c8a8b4e1f5e59c332d5d80d95b61201d", - "sha256": "1w62sd1vcn164y70rgwgys6a8q8mwzplkiwqiib8vjzqn87w0lqv" + "commit": "71c26cbd47d993fff37e572523ea79c9c49f5caf", + "sha256": "1r56g3h7cn2p64lk5d9zw2hmr7f5xzim1ccydzi8i1g7m7rzlgjp" }, "stable": { "version": [ @@ -104354,8 +105175,8 @@ "deps": [ "svg-lib" ], - "commit": "fee61c6a0b0570bd24fd335efef17c7385297aa0", - "sha256": "1lyizbmh5f6dq5jaymri219k8i5ww7yi1pzncha03qskg8r0qncl" + "commit": "07640c97a1dcc305010a384fffdaa7788c342da7", + "sha256": "0f5p07li2nr65jil57b52qiryp8b5blzcnymx05cc4pm4m539aff" } }, { @@ -104525,16 +105346,16 @@ "repo": "danielmartin/swift-helpful", "unstable": { "version": [ - 20210801, - 2036 + 20220402, + 1433 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "75f2fc6bd4530a230946ae7cc9eaf67a36fa3ee4", - "sha256": "0z6prh1xrc8ddq57kas6kvp6n4pia25aps5pg3aq78cwfchzzrk0" + "commit": "fe5c4a97fabbc89bd4761cfe4f8f8ce6f6d89703", + "sha256": "1wjb0cdxz9wkbz1xj062z67i8vjkyfl86206px8xvfx6dgbnikd0" }, "stable": { "version": [ @@ -104642,14 +105463,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210919, - 1221 + 20220430, + 2247 ], "deps": [ "ivy" ], - "commit": "c97ea72285f2428ed61b519269274d27f2b695f9", - "sha256": "05ivdsq6l6ixdn5p0rjh7mcgw19fm38m137xb8yi2c9gii6yk6g2" + "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", + "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" }, "stable": { "version": [ @@ -105276,11 +106097,11 @@ "repo": "jabranham/system-packages", "unstable": { "version": [ - 20210103, - 8 + 20220409, + 1023 ], - "commit": "05add2fe051846e2ecb3c23ef22c41ecc59a1f36", - "sha256": "0n4qr5qqy6hbc1hg4wi1d2ckdl870v5mf9xhv5m9vrlwaphvnnjr" + "commit": "c087d2c6e598f85fc2760324dce20104ea442fa3", + "sha256": "00idwy8jzvkgs8qzafiy6s344rgms452n8mxbjg6yszwp3y3hmq1" }, "stable": { "version": [ @@ -105542,6 +106363,24 @@ } }, { + "ename": "tabspaces", + "commit": "d0adcadc4cf81da6e1a7ec7c65ba510ff2f8f45c", + "sha256": "0aq9vqs5ixp78ppagzgw1jcjbvfafj6gz4a8jd438l7cd6ngsq6a", + "fetcher": "github", + "repo": "mclear-tools/tabspaces", + "unstable": { + "version": [ + 20220507, + 607 + ], + "deps": [ + "project" + ], + "commit": "24266c6c9a766261a8c8620692dfa4000f3e1d5d", + "sha256": "1fyfpi31qy03qpxw8hpjgykn67pvflgah3agwf053iqpj1krh1gz" + } + }, + { "ename": "tabula-rasa", "commit": "e79d0cf9ea9ce714e784373385132c15ae1ca2f1", "sha256": "0ggmb328hkq415az085zxzk68s6dh2lzrm2cdn7k61yj7889cj6m", @@ -105607,6 +106446,30 @@ } }, { + "ename": "talonscript-mode", + "commit": "067b0778eb46049949be0c64595cf48f088560be", + "sha256": "0zlbh8az2rxbbqhrfhiaqhnb4dx3bxin0papj1plzj57j37pmis2", + "fetcher": "github", + "repo": "jcaw/talonscript-mode", + "unstable": { + "version": [ + 20220204, + 1441 + ], + "commit": "b6eb61f56349e0d47276270163ec611c2d5b188e", + "sha256": "1a2x0972psaaz4d89adcr37440a71jm0vbdwca3ixj7rs7l4myp9" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "b6eb61f56349e0d47276270163ec611c2d5b188e", + "sha256": "1a2x0972psaaz4d89adcr37440a71jm0vbdwca3ixj7rs7l4myp9" + } + }, + { "ename": "tango-2-theme", "commit": "ab432b0eac0bcf0d40c5b3c8a78475bc0fea47d2", "sha256": "1a9qmz99h99gpd0sxqb71c08wr8pm3bzsg3p4cvf3vcirvav9lq6", @@ -105659,11 +106522,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20211221, - 1443 + 20220414, + 354 ], - "commit": "891338eba148d8f0e80102323d18ce8e9eda30d4", - "sha256": "1sdj6n2ma004m6b88nrd3mri4vyciyac4zbd1ivqc6mgwj5b7vhy" + "commit": "d6fe980783e22df310df1ae51ac249c28c83ac53", + "sha256": "0pi1rbz6fdqy7l39ymqa509n8f16lfgwv9b9995g29xp0sil35hm" }, "stable": { "version": [ @@ -105683,11 +106546,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20220117, - 2118 + 20220410, + 1953 ], - "commit": "f4fd155f48c24393a42bb7e04f71161e6da6b284", - "sha256": "1bxlaz84fc5yw2ca2m2va8cjspfa142r1ba9wwsnnlnw7ma8fs3l" + "commit": "12c2f7e01a0e5cc9a57c9d8a8f3fecc8f8ddecb2", + "sha256": "1amkmlndha14pyf780mlsipnsh7i66jk7snvylbjs6nx8znhwlrw" }, "stable": { "version": [ @@ -105874,15 +106737,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20220319, - 955 + 20220503, + 349 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "500b7b42d81b77920f40a2f461dff7b6367e8326", - "sha256": "1j7gdc5ib1f63lw1cmbv937yx46mzmvh8r8h47z3m2pdx3drfsc0" + "commit": "29010616931f52e3a5aa9d155c14873c09c7306b", + "sha256": "17cshy0ba7jiq36rj66k6m8swijzvpnwpfrgy0xvhgxsz115bhp6" }, "stable": { "version": [ @@ -105929,16 +106792,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20220313, - 2218 + 20220424, + 400 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "7a0ba06db860dfe9a9ca012c2750b13deec385c6", - "sha256": "1w7b5qhg4nd92hl9whvbzz6nx2cb09m84ixkqqzygmjnrxknqsdl" + "commit": "6f3455a365912e8f0c45a2240ea79507dee45ade", + "sha256": "1hnd6wnc52sc0ckriqnhaz64pyjk027y0dpcmh2zhpd27i8d4hmq" }, "stable": { "version": [ @@ -105995,11 +106858,11 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20220310, - 2211 + 20220509, + 2139 ], - "commit": "56ee3bf1462efeb40caf7008ac93a3ea25866453", - "sha256": "1rd2w6j8yrv1d7fcxj39lgqdms2r6wsm4szqcd3fya216cmblyqd" + "commit": "b88c58a89390cf3834de898109c5e69a5cf434cd", + "sha256": "0mk2ghqvg4raja1hg5hwg6774blba56sg2bmfh8xma4slg5n8js5" }, "stable": { "version": [ @@ -106354,11 +107217,11 @@ "repo": "davidshepherd7/terminal-here", "unstable": { "version": [ - 20210605, - 1453 + 20220510, + 806 ], - "commit": "e0e89344624fadf080f6770132ebdd7991355fdd", - "sha256": "11hvyvnbr6skw6czwk8gjw9v08azf8s2kafqh5jb1nlznfghcr11" + "commit": "24cb30dea30195108f85aceea28f086a84d47e5e", + "sha256": "0cqj8g1pbq24d6zgsd0dq85sam2sl7w2y29ksnv4a93krjw1i2hr" }, "stable": { "version": [ @@ -106659,14 +107522,14 @@ "repo": "TobiasZawada/texfrag", "unstable": { "version": [ - 20200716, - 1331 + 20220508, + 642 ], "deps": [ "auctex" ], - "commit": "a5f59e0c5f43578f139a2943bd08e5b3140f4c2b", - "sha256": "11xissn0xpfx2xxcm5qj2smkxa5frcswvhpfv6m34j12z0nww7pw" + "commit": "bcceb82971c10b8c0b058b77b3764669900392aa", + "sha256": "1awlh7z18wzp2mppn21chbylqf3fmjlq8v4105kwg9mmw57xjyb7" }, "stable": { "version": [ @@ -106689,11 +107552,11 @@ "repo": "Dspil/text-categories", "unstable": { "version": [ - 20220310, - 1053 + 20220411, + 2150 ], - "commit": "f046a0e3da5283fdf3046b2f4cf3689a520ae552", - "sha256": "0amx3wa5vr913vvvz7vlyajvg8d5nagjfnc9gmi842nzqcm2699j" + "commit": "44cf654a4da7907fb53c8783f1eefa69fce00b43", + "sha256": "1y66cibv191qvqj89jnb63iygwk0az1cgqws5d3vnfnj5lh63lz7" } }, { @@ -106757,6 +107620,29 @@ } }, { + "ename": "textsize", + "commit": "103d9c9206ee686dbee5fdf55f28a697d114609d", + "sha256": "1871cidjp98ihq5nnjzda45igz4ykiqhzi45zsmsmih9hlnxv1wv", + "fetcher": "github", + "repo": "WJCFerguson/textsize", + "unstable": { + "version": [ + 20220427, + 1445 + ], + "commit": "df91392c3c928d7841631f5809716b9cf0f7309e", + "sha256": "0pmd5hb6ysfp8yyghghxvqdj1lvrqwqdlk5jfwsviiqwdqi23q5r" + }, + "stable": { + "version": [ + 3, + 0 + ], + "commit": "df91392c3c928d7841631f5809716b9cf0f7309e", + "sha256": "0pmd5hb6ysfp8yyghghxvqdj1lvrqwqdlk5jfwsviiqwdqi23q5r" + } + }, + { "ename": "textx-mode", "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", "sha256": "0004z2ym3rmbqr42ysziqja7y5fl2fnmhbsqclk0mvr247gmb4vf", @@ -106821,11 +107707,11 @@ "repo": "monkeyjunglejuice/matrix-emacs-theme", "unstable": { "version": [ - 20220115, - 632 + 20220503, + 1325 ], - "commit": "70edeba78da844bfbcbcaa24abd5c8983a9df0d7", - "sha256": "17w40rz4wd7c6w893ksasrsw203jna4n9jsnpymssdmjdf7sbwxk" + "commit": "f2f69c3aa9c76dc3c27e9bf3c965e66f8b7f61cc", + "sha256": "00jylvw3h1r8lvpw50ca9gwiq4g8frxh7rhibdm9zisvjzw27p5w" } }, { @@ -107018,18 +107904,18 @@ 20200212, 1903 ], - "commit": "9cdad0dbf6fdc6078b3c04c3941fd4e87fe40d2c", - "sha256": "1irfw968wsryry9sf9bs3n1854wa6m2xprb2pkk7wgj0z1701mx8" + "commit": "200776bcf1296360707c5b8a3f18d2b8817da888", + "sha256": "0s1pzpcx6g12hnn48gfyfp9wai5yk6rnsjzn82661rdmhjwm2z64" }, "stable": { "version": [ 2022, - 3, - 21, + 5, + 9, 0 ], - "commit": "5e4ce0994de546bc7e17a0ba588518cabd01f303", - "sha256": "1fj5zgpwvw6ybs72f09r3zf72glwjg4930mggwpl3ki1fql81g6w" + "commit": "321b08352d043708869d5c15f961610392afca16", + "sha256": "0pynyavfwwylqibj4az58a3q45di540d0j6dwdwywihn470cinvz" } }, { @@ -107085,20 +107971,20 @@ "deps": [ "haskell-mode" ], - "commit": "9dbd4c9b4dd4adb550323376a25a50917c971b00", - "sha256": "1pb93a7c29xz9ni4q71hclhpsh36bap3rb502lw4a8acsfim7jxq" + "commit": "39389e4080144c6734dbe3020cc35185f025ebf0", + "sha256": "14gb1az5gmlq6j7lx4d2cdkb9kr0jad6whd4b0l9h608s86057v7" }, "stable": { "version": [ 1, - 7, - 10 + 8, + 0 ], "deps": [ "haskell-mode" ], - "commit": "3882d1b5f7e395300200a2ce647858fa762e4805", - "sha256": "0qpv6pb71qxx7djhlxah9v8nn5whvhw468b5dl91zmhv55m3y5mr" + "commit": "39389e4080144c6734dbe3020cc35185f025ebf0", + "sha256": "14gb1az5gmlq6j7lx4d2cdkb9kr0jad6whd4b0l9h608s86057v7" } }, { @@ -107109,8 +107995,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20220314, - 930 + 20220429, + 1501 ], "deps": [ "cl-lib", @@ -107119,8 +108005,8 @@ "s", "typescript-mode" ], - "commit": "b93e555858edc331ba33d1d8bd4582d578c7ca31", - "sha256": "0il0rdg6qk4bdpq86hxzwbv1rgwn028v72i3xh2kg6xsmpil4f0z" + "commit": "83c34c636f47cb0c10c7d1a728fa308bfec40890", + "sha256": "19yg6zij9jx39d8b6c41ipa0z99q0af4l59pmnpxv8pfadxvi9qg" }, "stable": { "version": [ @@ -107327,6 +108213,29 @@ } }, { + "ename": "timu-rouge-theme", + "commit": "5062b3e2d0d1b3bdbde2d0f58ca42952e90a9acf", + "sha256": "148k7anayfvvff5nw5jyjnwcwjag5q57kp4knfxfpb2v1nszpp1n", + "fetcher": "gitlab", + "repo": "aimebertrand/timu-rouge-theme", + "unstable": { + "version": [ + 20220501, + 1753 + ], + "commit": "935e4907f01fba2c7c2ecaab88eb7c4163955c3b", + "sha256": "0651q30pvxqdfv31mn87jxxkhds3f7bqh8bl1dsn7k9l1j6l3xfz" + }, + "stable": { + "version": [ + 1, + 2 + ], + "commit": "fe86f7d9864d986c7c8c430b6100070ab86dbbf1", + "sha256": "0651q30pvxqdfv31mn87jxxkhds3f7bqh8bl1dsn7k9l1j6l3xfz" + } + }, + { "ename": "timu-spacegrey-theme", "commit": "1bebe80350df731711bc526ca9fe942410211220", "sha256": "1hl91gdj52zp8w4c6zp4bzkizj3x7ssr6wl465qq3fw1k5wp8l7n", @@ -107334,19 +108243,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20220316, - 2014 + 20220501, + 1509 ], - "commit": "3be10cb5c3e17d9babb67190f63500ee68df267c", - "sha256": "04n31pgzn53cnlcs6qagdbspjy85w4dxm3iz6gynwnp50g4y16cv" + "commit": "1318c58a118c6c5a95a82e71da5eda6bfcf8f143", + "sha256": "1vav4f6g86fh71ddprql0m8b05f4h8l04n7jfskfmvpfwgw2w87r" }, "stable": { "version": [ - 1, - 9 + 2, + 0 ], - "commit": "d623d3fba1a3a50bd677b4b4a22b1e13bdf86e68", - "sha256": "1rhr7j0gfcxvcgl5dfr4fidyx9m9lxwqyi8vcnvwcz0vnfxbr8x1" + "commit": "9e1a12a494537472fb1f9f9f23dc38b8bca1f9af", + "sha256": "0bndwcpz2alzimlmkcpcdxsl5xvckks22xmqn78rkg9pscl10gjq" } }, { @@ -107438,20 +108347,20 @@ "repo": "duckwork/titlecase.el", "unstable": { "version": [ - 20220227, - 1900 + 20220510, + 331 ], - "commit": "157b2943f4aa5745d64c77c1ac4b76ce6e60c47b", - "sha256": "1bcj3k5gb28dkk8mcyqvm7scdszzf7ydp23piwsmavw0rdfqfhsd" + "commit": "8f609e46d4d0c06cd442352ca7d296e2ccb1b62a", + "sha256": "12ghq6zcv3ldcfr9c0zhlrq8kscf7fz2irpil7zq926alcqiqxkl" }, "stable": { "version": [ 0, 4, - 0 + 1 ], - "commit": "cc3b6b2d7d83b06fe88c0bc0af20cc9e4fe2b8e9", - "sha256": "0k4fw14pjg3hn0m8vqazrnq4bfgdkn59rd3pkcaf10nk0s6z2wjw" + "commit": "dafaa6ca09fdf1ae8413159cae2b5d74e9713440", + "sha256": "0kpg1l0rbbwqcmlj9i8xs2dv9h6yik9wgngik5z6wdgxbkaxjln7" } }, { @@ -107565,16 +108474,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20220318, - 2120 + 20220412, + 2337 ], "deps": [ "dash", "org", "transient" ], - "commit": "383d139a4627f4199cdda99f08551ed3237595a2", - "sha256": "1wvf1mq0j7bnjswssvnn2b4vqfxd19hw15v2ch6c7zai0jrqylzh" + "commit": "f6906be346073f082a6d1f9ae14932ec2bfd99f5", + "sha256": "0iwsic69cffwiy63dhxmypy89zvadrr82pjcn228ipdnimkgd11p" } }, { @@ -107696,11 +108605,40 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20220222, - 1140 + 20220509, + 1324 ], - "commit": "b21fe53b70fa2936b052b9db8e2d4704ac40d9f6", - "sha256": "08si1qbdcy36h08256a9fgybifbx3bghx3z9l6j6j1kyz6s1w6gy" + "commit": "a1a224d96665ee14c059eed63dc4b458f6b7a8d8", + "sha256": "0amcvd7x1llfjk2a78rkgia6n7vmrpqnh4xq28aczsi1z6khnkvz" + } + }, + { + "ename": "tokei", + "commit": "6d4fb56833636a71c6fedc352c4fd1bf84600637", + "sha256": "1qhwblza7w2yd0y2wll4m5hfy08xmgpg4pqi35k2l9fkzz9mj5dg", + "fetcher": "github", + "repo": "nagy/tokei.el", + "unstable": { + "version": [ + 20220422, + 2234 + ], + "deps": [ + "magit-section" + ], + "commit": "181021cd881eecd604a546d4a717866a81c7a511", + "sha256": "0gcjlcfxd4bg123gjf7d0vfvfd6zpd0da8svynglca1qhp77jkx1" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "magit-section" + ], + "commit": "181021cd881eecd604a546d4a717866a81c7a511", + "sha256": "0gcjlcfxd4bg123gjf7d0vfvfd6zpd0da8svynglca1qhp77jkx1" } }, { @@ -107801,20 +108739,20 @@ "repo": "trevorpogue/topspace", "unstable": { "version": [ - 20220323, - 2050 + 20220512, + 2008 ], - "commit": "1daae45343622c65fdfc9abe456020fd17e9168d", - "sha256": "1gwv7r6xaxkpnd7nyyj1v6xh4pd8lrnh3crlbf2d1sz49c5rf1zd" + "commit": "86127bf20f241a3c421b13523f0de6590fe42055", + "sha256": "1ahi1kgfis3khbgr3ps9ms71nc4b10aydd97q9mpm6h5rxvl2iv8" }, "stable": { "version": [ 0, - 1, - 2 + 2, + 1 ], - "commit": "270b4ace5151f38ee5145689437d2b7a2d52cd96", - "sha256": "1mj5fd7kqmaz7qdx8rdqlri4999np8fd492hgpwli98zr6ha8spc" + "commit": "9760a3ab5ebcde43ab93246fd9cb93732c5d8647", + "sha256": "1xk4nyivzhlxigsxbxfhvf7zp8bwbmp5hkzcqnz8xg9b6zdn7lz8" } }, { @@ -108077,16 +109015,16 @@ 20210713, 1609 ], - "commit": "e4c5bb69e6f1338239bdbf66baf57bb610828b2e", - "sha256": "05ddgcgqribdwbph7qkz5r24h1xsbrnhlg4yqgnyyw5kfxayapzj" + "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", + "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" }, "stable": { "version": [ 2, - 11 + 12 ], - "commit": "6ccd4b494cbae9d28091217654f052eaea321007", - "sha256": "0cr9flk310yn2jgvj4hbqw9nj5wlfi0fazdkqafzidgz6iq150wd" + "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", + "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" } }, { @@ -108142,17 +109080,17 @@ }, { "ename": "tramp-term", - "commit": "5c84660c641f0bdf3cca8ad2a0f8f6e5d18b59c3", - "sha256": "1vbdwj8q66j6h5ijqzxhyaqf8wf9rbs03x8ppfijxl5qd2bhc1dy", + "commit": "2a828684033d39d34639aeecac83a50f8d0a3385", + "sha256": "1lns8krf78nix805n2as9bqzw6ks4l0i0ws7i3p24y4lzk57sqhp", "fetcher": "github", - "repo": "randymorris/tramp-term.el", + "repo": "cuspymd/tramp-term.el", "unstable": { "version": [ - 20190628, - 1207 + 20220412, + 1546 ], - "commit": "fdc3d5a29ca9549db462cd66d8f5d97026a1200f", - "sha256": "1xznm3q2d4xffynqb1bkpcif8jr6mpkrir4hc7gmi4q987j2lpdr" + "commit": "e2e5375a444d4eb5d144bef12e066c02befd1352", + "sha256": "1jdjf2m4kdq13ipx1mn57bj28n2wfnjd89xvxbw3cn4im61j7iyw" } }, { @@ -108181,11 +109119,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20220325, - 1619 + 20220509, + 1943 + ], + "deps": [ + "compat" ], - "commit": "270eff1c7cc910dfe9882e97df608627028eaa40", - "sha256": "197j1jih73vjd3awycbiyfkj1fxmizaqs8h3id0kd1gyyjq4anck" + "commit": "6fc09a663e408ade0d1b88f47701c96a9b051e34", + "sha256": "0xihkzz94s84xkl60hi388lhcdiwnlyq2mpnnqn0vf54amjfdh7x" }, "stable": { "version": [ @@ -108205,14 +109146,14 @@ "repo": "conao3/transient-dwim.el", "unstable": { "version": [ - 20200812, - 1033 + 20220425, + 1331 ], "deps": [ "transient" ], - "commit": "de03d875dd89b1d838be67b0c44d9786adf96717", - "sha256": "0gb4k3758bv25vdw30rq0vbs94vdyss0xsiyaxnmvpfnj0v9k2cq" + "commit": "7b6e70fb49b9d18106748202011863ebc39b864a", + "sha256": "1qph3ffpvrx02a423hpmdfp15g9yqdd38bnmsa735cnnhqm3yshd" } }, { @@ -108235,6 +109176,30 @@ } }, { + "ename": "translate-mode", + "commit": "4fe526726c4ba96b75971b3b1f97cf0f17e488f0", + "sha256": "08zd2xw72bjx7jkcrdw4ha87d0hzf5kzs01wm8hns3g9lar30xza", + "fetcher": "github", + "repo": "rayw000/translate-mode", + "unstable": { + "version": [ + 20220511, + 1357 + ], + "commit": "e1940b333241a4d0c224b7b875962736ca2b693b", + "sha256": "18s400rrpqji5dmn453f6cnk69cyskbmzsnkbxmss2wrqazp3l3c" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "commit": "fb73b3d928a8011a21402e2c14aa4aab56bd05ae", + "sha256": "1a01kvkpr0d2c7llj5hawwampz45ysv55gzvdvdldc0yc9qhvhyl" + } + }, + { "ename": "transmission", "commit": "9ed7e414687c0bd82b140a1bd8044084d094d18f", "sha256": "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9", @@ -108314,8 +109279,8 @@ 20200910, 1636 ], - "commit": "8cf1c0d52509fa789870b300f2a7b3564e021104", - "sha256": "0kq5piwrby9xdx4xmqm63nsbg597xa46lzh4v59irkf89irsay49" + "commit": "1e151e5fc841688f1c4d68e9acc0f7b410cd754c", + "sha256": "1x3xdv789b3j8zm1zpd8v1m0712p1z9xi553yspp714w30dzxrs5" }, "stable": { "version": [ @@ -108395,14 +109360,15 @@ "url": "https://git.sr.ht/~tarsius/tray", "unstable": { "version": [ - 20210214, - 1119 + 20220422, + 1628 ], "deps": [ + "compat", "transient" ], - "commit": "e2b169daae9d1d6f7e9fc32365247027fb4e87ba", - "sha256": "1wrip00q6lbpllhaz0c7llnm774dq2mizr39ynfssvsdci38z1lm" + "commit": "1292530acd05956a2f1bd19c94ef6ab59f05ad8a", + "sha256": "1vnv7npzwx3bbkd1c3dql98ggrkwr3dfvcx6jrnm15s041y9sjfz" }, "stable": { "version": [ @@ -108425,8 +109391,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20220319, - 1652 + 20220407, + 1629 ], "deps": [ "dash", @@ -108436,8 +109402,8 @@ "tree-sitter-langs", "tsc" ], - "commit": "63816d614e6e2112c2f26e65afd7440f022ba2ad", - "sha256": "1c0s9hsm5wisikgxzskmnkin0r2vs9yc5yhgkjrsrvaiiv05g9ip" + "commit": "eafee31ca4f532a9dbee326d3ec3bdd1e997223b", + "sha256": "1p8ghpj83smh1bh38ydhlpyaxfdx0f83wp4sdgzv3zxdfydmb4n9" } }, { @@ -108469,8 +109435,8 @@ "deps": [ "tsc" ], - "commit": "5e1091658d625984c6c5756e3550c4d2eebd73a1", - "sha256": "08favjzk53cgz96k3xfcvi7g7y8gbssw03pbjk0fxfmcqqpps1j1" + "commit": "3cfab8a0e945db9b3df84437f27945746a43cc71", + "sha256": "0flqsf3nly7s261vss56havss13psgbw98612yj2xkfk9sydia28" }, "stable": { "version": [ @@ -108493,15 +109459,15 @@ "url": "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git", "unstable": { "version": [ - 20220305, - 1919 + 20220411, + 1439 ], "deps": [ "seq", "tree-sitter" ], - "commit": "785b8cb8ab17bffec958e421260746e16b438727", - "sha256": "03c7lbig8rflny20v85w7bpla2x9653dk4azjifcs0m0vpjjghma" + "commit": "4ef246db3e4ff99f672fe5e4b416c890f885c09e", + "sha256": "0hs8fiwa5idhfxiskdp9k37ciqy32ll08fmf50y3bvrh6512dd66" }, "stable": { "version": [ @@ -108524,26 +109490,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20220319, - 356 + 20220508, + 636 ], "deps": [ "tree-sitter" ], - "commit": "f4effc81fcac3592bce7072619a0e17043412cf4", - "sha256": "01bzlhnz7n781gp9d48973gxkcc95rscjs0c24am73505srl38jz" + "commit": "deb2d8674be8f777ace50e15c7c041aeddb1d0b2", + "sha256": "1p2zbb6ac7wi6x6zpbczcmpkb2p45md2csd2bj43d8s56ckzw5mp" }, "stable": { "version": [ 0, - 11, - 4 + 12, + 0 ], "deps": [ "tree-sitter" ], - "commit": "f4effc81fcac3592bce7072619a0e17043412cf4", - "sha256": "01bzlhnz7n781gp9d48973gxkcc95rscjs0c24am73505srl38jz" + "commit": "deb2d8674be8f777ace50e15c7c041aeddb1d0b2", + "sha256": "1p2zbb6ac7wi6x6zpbczcmpkb2p45md2csd2bj43d8s56ckzw5mp" } }, { @@ -108590,8 +109556,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220216, - 1950 + 20220511, + 1852 ], "deps": [ "ace-window", @@ -108603,14 +109569,13 @@ "pfuture", "s" ], - "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", - "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", + "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "ace-window", @@ -108622,8 +109587,8 @@ "pfuture", "s" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -108634,28 +109599,27 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220124, - 1914 + 20220425, + 1124 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", - "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", + "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -108666,28 +109630,27 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211019, - 1654 + 20220511, + 1852 ], "deps": [ "evil", "treemacs" ], - "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", - "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", + "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "evil", "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -108704,20 +109667,19 @@ "deps": [ "treemacs" ], - "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", - "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", + "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -108728,30 +109690,29 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211010, - 1005 + 20220502, + 1310 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", - "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", + "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -108770,22 +109731,21 @@ "persp-mode", "treemacs" ], - "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", - "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", + "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -108804,22 +109764,21 @@ "perspective", "treemacs" ], - "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", - "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", + "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -108837,21 +109796,20 @@ "projectile", "treemacs" ], - "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", - "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", + "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "projectile", "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -108869,8 +109827,20 @@ "dash", "treemacs" ], - "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", - "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + "commit": "dca83bd42918b510173759df4cc8b3663d5d480d", + "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq" + }, + "stable": { + "version": [ + 2, + 10 + ], + "deps": [ + "dash", + "treemacs" + ], + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -109116,8 +110086,8 @@ 20220212, 1632 ], - "commit": "5e1091658d625984c6c5756e3550c4d2eebd73a1", - "sha256": "08favjzk53cgz96k3xfcvi7g7y8gbssw03pbjk0fxfmcqqpps1j1" + "commit": "3cfab8a0e945db9b3df84437f27945746a43cc71", + "sha256": "0flqsf3nly7s261vss56havss13psgbw98612yj2xkfk9sydia28" }, "stable": { "version": [ @@ -109418,14 +110388,14 @@ "repo": "BenediktBroich/twitch-api", "unstable": { "version": [ - 20220207, - 813 + 20220420, + 1547 ], "deps": [ "dash" ], - "commit": "e48b0b350516e20eaf85514e8855c2fbfbf09c11", - "sha256": "1pfrqa7lc85b9ww54w15liwi0swj3h9vx41fcmv7w0b31fijmzjd" + "commit": "181681097d1fc8d7b78928f8a5b38c61d0e20ef5", + "sha256": "14b8a22jbrnj42iva3mjb66j5w6zj0kd6dyk8pjkk22915w0jwcj" } }, { @@ -109460,11 +110430,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20220223, - 1506 + 20220506, + 827 ], - "commit": "88f317f0b6aef8f8d232e912fdbc679799580c56", - "sha256": "0qkqxvam3r21philap71dy4980sbadx32176rz20wwrs10szqnck" + "commit": "4f056f6db77839dc8653afff68dfecf62d83ec70", + "sha256": "0viyrfxnpmj164kiaai8j0wlrylss8mvpp3q57ldk2r6ijm85klb" }, "stable": { "version": [ @@ -109882,8 +110852,8 @@ 20200719, 618 ], - "commit": "b9069b8af1bfa360d3b7197a7101fe0233c92750", - "sha256": "05873v76z7f7jrhkc78bmkgmqjvbidyaf1dymcccc8cgsc7bixp1" + "commit": "b7b5bffe242fd15b9eb8fe5cb7c9b45e474babbc", + "sha256": "0rbm3gq1b1w1f3gg7h9sncjp088dg7rd5vn3vakh140p289rwirx" }, "stable": { "version": [ @@ -109920,32 +110890,32 @@ }, { "ename": "undo-fu", - "commit": "0ca16994315f7d5dee9fff76db036e084162dc52", - "sha256": "1b0616zlblsd5405sfh02lxjyq6gl3s9m8vsxbqi6fryr4y750s9", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-undo-fu", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "00zbjr5dwpaqjky6sr4affj1nhv8q97psrfs55x6xd5smdkbxx60", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-undo-fu.git", "unstable": { "version": [ - 20220211, - 548 + 20220509, + 1045 ], - "commit": "e81c8da4416b15cac9d5ac7574e11471417a65ca", - "sha256": "1f25h3rx09ci56gkpypsscp8bkqmj7fr2yfniki0y92czix9x70s" + "commit": "97e7f4f6e0754fd1b01db9638b3f534b5b4941c2", + "sha256": "0gx4cm6qdl06y9vrwy5wj3zn618zf3w0b8qpdnns3q4xc7qz3b6g" } }, { "ename": "undo-fu-session", - "commit": "f39d9dc5e57554b42eca54ad5399a53947c2c25f", - "sha256": "0k9qxs3igzf7zcg1vd4v9npfiah512w9j2scnm333brmx4jfgvb7", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-undo-fu-session", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "16p51y2b0c2mbba7r1wrwbb15nv9wlgdd51yyr1gmbp90m81x9ky", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-undo-fu-session.git", "unstable": { "version": [ - 20220326, - 622 + 20220509, + 1044 ], - "commit": "7bbc89a42f6bb4abcd4513488bd45784cf4041e4", - "sha256": "1is1ywsr78k9fil44psb8hqhm8b2a8hmv1pf6a8h04hwv3svpf3q" + "commit": "52c71b1cee2fe944e0013a2823e6fde10b26bc65", + "sha256": "0ijw245wg9rxhz419hjw62jsgpwjy9r26z9jbd018r7f4qa5gh3s" } }, { @@ -109977,8 +110947,8 @@ "deps": [ "cl-lib" ], - "commit": "efb8ac3935635ad0fd731de0ef64b14a23f50b42", - "sha256": "0mvj2jhj2dl4pr4gh7rh3042lawxik9myvvnvqc25zjqa5n4jp8c" + "commit": "ec95d5038425bca375865803701c971a9c748114", + "sha256": "0k6mrsbfhacz4ipcggb4x3gln8bqz2nxk8zapidz6vb11fgay8my" }, "stable": { "version": [ @@ -110004,8 +110974,8 @@ 20210106, 220 ], - "commit": "3bd4c8d3df15fb54a79f97e26177819fc0ebf877", - "sha256": "1dwy1pcvsqdxi7zrfgh3k9g2h9dnc3yyaqabmin5h3abs6mivb7v" + "commit": "cd354ea1a74338760ac6f5872d573e3ecb6b4bd2", + "sha256": "1yi0lhsg84dvy2jp8dq2g09419fw6h6dipbxapfvzdklr4svgm3c" }, "stable": { "version": [ @@ -110799,8 +111769,8 @@ "deps": [ "exec-path-from-shell" ], - "commit": "31d8bbec16eff342bd4c02b0cb12ea31dd31bf19", - "sha256": "0388kwc65hpbimd53br2x9z9dvxw20wnny09kldw5nnlvzvzrba1" + "commit": "b2995563f41c162a082cd4823a499887f807176e", + "sha256": "087cjh7qlq0sglqj58g5jkywzn9sc26lv9f706g6ffirq7x6xizv" }, "stable": { "version": [ @@ -110826,8 +111796,8 @@ 20220220, 150 ], - "commit": "fb82a02b6c86e6224482b27caa08662b023b40a1", - "sha256": "1lncgprxmir4czq8iiww9cmpd4si77vipkgksjrv37r9xz5hgyr4" + "commit": "0cb20745e3889f4eb8ea49c4a748f34f9ddf1fa6", + "sha256": "1840m49s0wnk376va05n2vq9877x3siri15da8z6mqrh02sj1fa9" }, "stable": { "version": [ @@ -110841,17 +111811,17 @@ }, { "ename": "utimeclock", - "commit": "f712b882b6961f3a83a9807e973fa6edc592c223", - "sha256": "1818i1b04mzx5015d5h5r1j9hbpg2x8xgszdq831c1sjhvnajh7z", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-utimeclock", + "commit": "1a9ce8cad627f30ce907650593ada1cc0e4653b8", + "sha256": "0k3awhp9ab3h6hqmkrr0rs67rp7yr0zg0kzy6qa84gixc8s3naby", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-utimeclock.git", "unstable": { "version": [ - 20220211, - 548 + 20220425, + 939 ], - "commit": "0e36664ffe9f278bb008107d1b743edfcfba60f1", - "sha256": "1ninhp8z9lr705k8a5pd8cvm3nwrml9wp2hvrv3lilmdr9879h0y" + "commit": "cfd5109e004d3e2522f5e758b3ff7238fcf385d6", + "sha256": "0ii3rvxq0408snj8rmclrk1b1kkx46lkak16q8xlxz1gx01kn64d" } }, { @@ -110868,20 +111838,20 @@ "deps": [ "tuareg" ], - "commit": "d5dbad6b807f09731d87344ea778b29c432b76e2", - "sha256": "0lndsas27h9mmrjv1g2r5jhwjip1si6xrinp58w04kvzcvgypp2w" + "commit": "42614160c20764b443d082083740e8dcc6cf2f78", + "sha256": "0ahxx8l0n7ki256rm2ka62rvil9292ijzm7w5i466gbvp6pa4mdf" }, "stable": { "version": [ 2, 9, - 0 + 1 ], "deps": [ "tuareg" ], - "commit": "676e2cd6545fd327e02330d1ccb20c02d6b26eab", - "sha256": "1mdpqc1b67p5rm2jsbwy0gjjgdlfqcakjyh1cwdj959ykz4zy9ld" + "commit": "d273db2a3561e5c760bafd0075f1f82af000e6c7", + "sha256": "1pmsmi0j4gb1vsd69j0bppkv79wbwz5xcffq78n1i2ibhff6r4j0" } }, { @@ -110907,11 +111877,11 @@ "repo": "kanru/uuidgen-el", "unstable": { "version": [ - 20200816, - 1308 + 20220405, + 1345 ], - "commit": "b50e6fef2de4199a8f207b46588c2cb3890ddd85", - "sha256": "08m74kj7h70kna3pifk3sgsy7mck11p32vi48h9wzqnafyq3n55d" + "commit": "7b728c1d92e196c3acf87a004949335cfc18eab3", + "sha256": "1z7x4p1qgyginn74xapd1iq0k53m9qbfk57dzc8srg7fcn5ip1js" }, "stable": { "version": [ @@ -110930,11 +111900,34 @@ "repo": "kborling/uwu-theme", "unstable": { "version": [ - 20220324, - 1828 + 20220411, + 1904 + ], + "commit": "feef3e73dbcb3fbba431c62a99a3333959f6158e", + "sha256": "0b16d5fkrqbj5v83cbkzchzgp4fhj7qqj67lsd5ix8pgqfgbhi4y" + } + }, + { + "ename": "uxntal-mode", + "commit": "ea376b1b019ebd4b38773547adcd25132f9e3018", + "sha256": "1kj59xybn5zbj1ggsnf3qwpl365ili96xck6q48y2g597k2ryh04", + "fetcher": "github", + "repo": "non/uxntal-mode", + "unstable": { + "version": [ + 20220502, + 154 ], - "commit": "a40f96f35cd6dafe0fc98bd19c9783f6b265173c", - "sha256": "1ppar0fz98xsbdl9yvh3rk09i1zk9170n4j7rlnvj3a9gnp9bdvq" + "commit": "39cde87b15a98e0612e30b80e0676211236ac3e7", + "sha256": "1i5rkxnb4bib30qx602b426m0ydcmwlwgs9hl92540kx7d9j8416" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "a6e15c3ff1cfb05598db20ab494f783ba96f52ab", + "sha256": "0jxsn07w5iplc4xcdlljq8cpr0vf68p7wdqi9msv5hbcjrwk6as3" } }, { @@ -111021,14 +112014,14 @@ "repo": "dougm/vagrant-tramp", "unstable": { "version": [ - 20210217, - 704 + 20220508, + 52 ], "deps": [ "dash" ], - "commit": "5f00b42a0c023c461cef7af4de7652d90c788b4d", - "sha256": "1mshxcbwdjs2fs7lzqhs3pqbmdmy2fyzkf9b6r8rsxqlisa4x6sn" + "commit": "2b7a4fabd328961384da06e0e302250cd97edc47", + "sha256": "03jbjsyf3lrqxk6455892hkz9iwfxahghjbp0kj34h46fprms78s" } }, { @@ -111095,6 +112088,21 @@ } }, { + "ename": "vampyricdark-theme", + "commit": "37f00aa9b7158a5f00a19eb2bdcf5342d8037268", + "sha256": "1rdi1bh3q1v2bq4w9wd2z858kqn0psxh159mahr46xr9kilvn1mm", + "fetcher": "github", + "repo": "VampyricDark/emacs", + "unstable": { + "version": [ + 20220405, + 2235 + ], + "commit": "7b9ac67efd38466765b85b1dd131d6b64d8f71f9", + "sha256": "1qr69mi3lqkb9j4wgc8sb6d1rxbdvaqqcg5pp2z35vsxw44x8ck1" + } + }, + { "ename": "vbasense", "commit": "8e7dd1e985d55149f48e4f93a31fb28ec01a4add", "sha256": "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n", @@ -111166,11 +112174,11 @@ "repo": "velkyel/vc-darcs", "unstable": { "version": [ - 20170905, - 320 + 20220406, + 659 ], - "commit": "390fb1ebdda1ffac45b9be02626dde3b6d95ac11", - "sha256": "1fcqkavc7hlbhswx5nnaqhash42cjsbr72ijznx5cplr582g3mfq" + "commit": "56426a235b742618b48fad8538777a9b3ffb7240", + "sha256": "16q9kp9fvm6vpdr9b5p16lyjqbs8zplj4klz93s96n3jwxv50kim" } }, { @@ -111414,16 +112422,16 @@ "repo": "DamienCassou/vdirel", "unstable": { "version": [ - 20210813, - 754 + 20220412, + 646 ], "deps": [ "helm", "org-vcard", "seq" ], - "commit": "dccc51bf68ad3f0066a462b354ec395229bd6a7f", - "sha256": "0mlfmigqsqmvn3rzyxnpq5zy6k0xf4vd2ww2qrr7kd2dqyv55hhw" + "commit": "4eebcf91bdb9ee10fbbba198c4995ae070442f26", + "sha256": "055qn11in0wz3mcvhi8kf187m7z55w4gs8pxq017bpx094xmqvhz" }, "stable": { "version": [ @@ -111971,11 +112979,11 @@ "repo": "thanhvg/emacs-virtual-comment", "unstable": { "version": [ - 20220301, - 430 + 20220405, + 229 ], - "commit": "5205379bcfa1774a745e3dcbaa4ea861ff6a9ad2", - "sha256": "1blgy286id63mqr2gan7xkg88rn2nwj36vqdsyyxq8w2p3f5qh54" + "commit": "d1f08e8bec3b52818d44ff06f719950b89204126", + "sha256": "0fsjly3c9b29z8b113h7jzizlvb45xpp3jc7ay0dq3x5mfgpmnxb" } }, { @@ -112063,11 +113071,11 @@ "url": "https://codeberg.org/joostkremers/visual-fill-column.git", "unstable": { "version": [ - 20211118, - 33 + 20220426, + 2045 ], - "commit": "cf3e2bc632b68d54145c79beede85d3458a337de", - "sha256": "0wj6c6q1sn7q1ywkm3fyl7z967jsl5g2xp3niwqv4kz9bs60aw6v" + "commit": "cdfe574a51c4fc3519536fa3b169b01d5482d5df", + "sha256": "1gimqhpnagv675wsb1yr50wxf8fwxlviks515yhyxn65hgl2x4wn" }, "stable": { "version": [ @@ -112291,11 +113299,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20220319, - 1730 + 20220414, + 930 ], - "commit": "94021437d4dded5039e75c236b4a230d9fbdf7d6", - "sha256": "09q43zpx010jmwiz3wbsfwy4kmfz23z1xy7ka7a9nymd97kjnq9p" + "commit": "2801a2354d93920dcd12da3d1090954aec9f7402", + "sha256": "1w4fkb7yp8cmpyxqyghiz4rqkzajjh1nqf5wjnxhvjv0av1lddhn" }, "stable": { "version": [ @@ -112314,11 +113322,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20220319, - 1729 + 20220414, + 931 ], - "commit": "a1a6708419944c95fd36bdc8f8771fb8746a698b", - "sha256": "04jccdrsx5r7q067sfyx5qcamlb3df1lx2v04zc436v7cxmj9s9z" + "commit": "73e8431576e5b65c227dcf37c7d1a5c609221ac9", + "sha256": "0fxwcxdr7ssj7v5bsx42zinas6fp3iigdh98j1mqm54xm61a58jc" }, "stable": { "version": [ @@ -112391,11 +113399,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20211226, - 817 + 20220429, + 21 ], - "commit": "a940dd2ee8a82684860e320c0f6d5e15d31d916f", - "sha256": "0r1iz92sn2ddi11arr9s8z7cdpjli7pn55yhaswvp4sdch7chb5r" + "commit": "b44723552f86407d528c4a6c8057382c061b008e", + "sha256": "0rq2skwylvc7s4vfpbbsdykws4akyp9sc6xgrh2ql5yydhhnv2h3" } }, { @@ -112406,14 +113414,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20220202, - 1722 + 20220416, + 1034 ], "deps": [ "vterm" ], - "commit": "2a6861ef6af91dad4be082139214a30116b50acf", - "sha256": "19rr03fqicykw73wbpw2nzz0b0dc62qpqh7gddmgz8lv39d6xmfb" + "commit": "644e9df9f741c3338c248291799375a1778eb98b", + "sha256": "19c8z0nfhavimxr8nc5m67k8yxfzr7vaanjrxs3c6zip35nqrn8w" } }, { @@ -112647,11 +113655,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20211122, - 335 + 20220508, + 2259 ], - "commit": "6112c6a9e13c00c2c7aecd96820a46b4800d4cda", - "sha256": "18c1rbcpxv289fbzl66lvyd41l1jhkia7296sksaqsgv9n79c2w6" + "commit": "7baf17355289c29d18f993f383c5d6a187f33b35", + "sha256": "1a2m6jkvnv852q07wvi80nbm7437wnvdfdyiq4iffhffmz8c2mrr" } }, { @@ -112727,8 +113735,8 @@ 20211104, 1455 ], - "commit": "0f94ac2dd4fa125fc5f152700779edce75a6b03b", - "sha256": "1iqmd763gik32blrc8ki9rikm3k5iksm0xg12rffmilawc2vn480" + "commit": "a53c0e819258ea9dbea3ad64b16e4c6c6201f5a5", + "sha256": "0iig6sqngd51cmsmcp31dawfjl7vd0rr7r1q82vv1jwk6xa7wsqg" } }, { @@ -112747,6 +113755,21 @@ } }, { + "ename": "wal-mode", + "commit": "6e345508060284bb98d9b5ba604f4ddda80c32fb", + "sha256": "07v4hgf7n8jb5z44v4j8lb3wjmh3paijf6fmq61n7mwgqrys39wi", + "fetcher": "github", + "repo": "LucasKl/wal-major-mode", + "unstable": { + "version": [ + 20220409, + 1214 + ], + "commit": "1daaf882824e8483419dc999c2d5507ad30cc929", + "sha256": "080lb9qk7ra931sqcz6j65yd7f8jvkwgly9gv12qq0h9sid8i5k4" + } + }, + { "ename": "walkclj", "commit": "44472b35938fe70d4cb3d15397495fe321fcd464", "sha256": "0m971dlazildhgj8jqg4x679i6s6p80mbpri7l24ynxk45wix22m", @@ -112754,15 +113777,28 @@ "repo": "plexus/walkclj", "unstable": { "version": [ - 20201116, - 735 + 20220422, + 854 ], "deps": [ "parseclj", "treepy" ], - "commit": "2077475eb3c8d1a170c3a3b0e836420469024f0f", - "sha256": "1ml1jz2dcva98kgzvrbad4myvyx2g1xzl584vj0mj41x0h6m47b3" + "commit": "ce4e7713d801b03f94f5da9898fce09718380ed4", + "sha256": "1r66fxbm39i1p75aizicravy2n8yjnj3m5nckzdqd86nw2v5d5c6" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "parseclj", + "treepy" + ], + "commit": "4b4e9fcef2361bdf88ab3c7f905a76672cfd43e4", + "sha256": "19an6ny0r41wl567z0z8zlyrcq9c4jck1nf5rqnp3z07zswlp5sw" } }, { @@ -112887,16 +113923,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20220103, - 800 + 20220508, + 1540 ], "deps": [ "apel", "flim", "semi" ], - "commit": "638d089bba25ce8184c981d0721eba6417b3d7e2", - "sha256": "1rz9ydhhx38xvyggfdw8aqb2dgvv36g1db13ggkcyxcwp3x22y4s" + "commit": "e3cd5e39454737c0b641e114ddcc550122288a2a", + "sha256": "0qm5gyss1mxwcxgc4s201c0bvh7kfkfg8fii766nfnddfywccj43" } }, { @@ -113670,11 +114706,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20220214, - 1818 + 20220419, + 227 ], - "commit": "1217db8c6356659e67b35dedd9f5f260c06f6e99", - "sha256": "0ph5mrzz3r7x4dmy93v6affl4jznvic97a30mrs3kvhwyr2v4mby" + "commit": "129f4ebfc74f207ac82978f6d90d8b4bb1a55cf9", + "sha256": "065jfwnz9ymv5xiiyhnhsi5sm03ah5985hnm5psay6z9msskcnx8" }, "stable": { "version": [ @@ -113719,6 +114755,30 @@ } }, { + "ename": "whiley-mode", + "commit": "d011f665fc7780714d8180c72b2be1235f1f3435", + "sha256": "16ar0z3iqa7150fbqqzq43mi9f81z181b2fdip6ys4mpwk1iz25a", + "fetcher": "github", + "repo": "Whiley/WhileyEmacsMode", + "unstable": { + "version": [ + 20220501, + 2219 + ], + "commit": "69eb67cf41dad029f1456079aea62a4b61ca9b46", + "sha256": "19j12h9v7agw340zb0cwlga2a0agl8c4bv19hxma5wd6sj0srp3v" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "commit": "e7cc4759d46be589d421a2235af6771bcde9ae33", + "sha256": "0g96zxli3jcl8f5fwk4kishgjdlvcaq1rsvj7gyfycnmq08aiszy" + } + }, + { "ename": "whitaker", "commit": "4b5d717e2eaf35ce33b26be049a39f2f75a7de72", "sha256": "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj", @@ -113785,8 +114845,8 @@ 20210510, 533 ], - "commit": "b108b73ddf8f7e747d5a20a681560171e02ad037", - "sha256": "13il7yi6j0cd995xzadbilhg50zcvzbpcqvivh9r1qbqq3q5aw1y" + "commit": "b2e35321f03914cae90be4f942d911b7e7175899", + "sha256": "14ralz7jn98ckcmwshq1yg35bpybjlfw04cxy9qcnk67sfnp3ggv" }, "stable": { "version": [ @@ -113858,8 +114918,8 @@ "deps": [ "cl-lib" ], - "commit": "3c1a55103e52c7a3010ee0043af22484d23a441e", - "sha256": "0bkfx18jpy8b91yq917va5x2mkrzqlyi6a38bi90zfqhxz5h69g4" + "commit": "500ad90695e8a5a0cefabb7500158eab0835a0ce", + "sha256": "1v6i32fmnbqri86k6wrp0b3dj8ij2941wc1hbyzwnd5g3jyy3yqj" }, "stable": { "version": [ @@ -113881,11 +114941,11 @@ "url": "https://codeberg.org/akib/emacs-why-this.git", "unstable": { "version": [ - 20220314, - 1329 + 20220510, + 1146 ], - "commit": "ca4cf46d6e7b961a0c0fa39ac084fdca3c8c93b2", - "sha256": "14zb4abakpy2s05lfry097i0gg2d3njj0847a62dnwv8hgypsk6c" + "commit": "71baf80f9ae7c1117f3b1bf531e23e43bf567424", + "sha256": "1cwasg2dyy86c3hh71xqqsl7wy5c6mf9mnaf251l5fa5895xhbff" } }, { @@ -114417,11 +115477,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20220318, - 1640 + 20220506, + 420 ], - "commit": "e8569e027ff5c9bef8d9ff0734e3293e1c0574a2", - "sha256": "1q5c46kinh0s3pyms64nbzzbzgfq5a29qjzw4khsh0b73p8245gf" + "deps": [ + "compat" + ], + "commit": "4ab8c6148bb2698ff793d4a8acdbd8d0d642e133", + "sha256": "1mc0ayfhxl8jpdgw2p6prdi4m3ab3hh7hv0p0kyxmlc9m6f3ablc" }, "stable": { "version": [ @@ -114668,11 +115731,11 @@ "repo": "progfolio/wordel", "unstable": { "version": [ - 20220225, - 1907 + 20220508, + 1745 ], - "commit": "5a1f9a45c3d1fa58c3de5183c4456572ae861d49", - "sha256": "0jd7lbb7mbjfk66mkzxnhffh3dlj28xma5a8km5hc4lclqlm74sx" + "commit": "d37187bb5abb2fe4a8ba120fad9e52dd74cc220e", + "sha256": "0527j2ldfiaqlblk00abdl0s0l0wmxac74i4qa899mlqq5sp7kyy" } }, { @@ -114721,6 +115784,24 @@ } }, { + "ename": "wordreference", + "commit": "676db2393007648805f96e65fa65d80800f89d6b", + "sha256": "0ws1hiv2vp6bl86k8ddqry6lilmwqsb0b60lslhld7hiw80r7d37", + "fetcher": "git", + "url": "https://codeberg.org/martianh/wordreference.el", + "unstable": { + "version": [ + 20220504, + 2021 + ], + "deps": [ + "s" + ], + "commit": "785a5d3245efdc3f32ce61fad1c7596230682f3a", + "sha256": "0g23d58lm6fvk2v5z8zvn09c9q3nffdq6w4mdhygj2xc2l3c6rcp" + } + }, + { "ename": "wordsmith-mode", "commit": "3b5fda506e5b388cd6824d433b89032ed46858dc", "sha256": "0s6b6dfqn31jdcgs2mlmvwgpr5a4zs4xi8m002ly11c6sn035xb1", @@ -114802,11 +115883,11 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20220308, - 1314 + 20220423, + 1150 ], - "commit": "b2c457a720e98dd1c560860e44a6a80372ef07ef", - "sha256": "198bm8l8jf6xvc7djy3d9z7xm437pkabmi9i30pd79g5l2dikj8f" + "commit": "ccd6948c92ea21d0dec56dff029b3f46df408de5", + "sha256": "1k4z9yi92mj2c82xww9bzpbgl2fcbi3fv79hlyalv20pqlky0zjy" }, "stable": { "version": [ @@ -114822,6 +115903,21 @@ } }, { + "ename": "workroom", + "commit": "f44154886249141ec1cb712f29790a9fa1a0402c", + "sha256": "08jw74rcfajgl1cwiar96fk2hynl1n63a2zd2zs934gbag82b96a", + "fetcher": "git", + "url": "https://codeberg.org/akib/emacs-workroom.git", + "unstable": { + "version": [ + 20220501, + 1500 + ], + "commit": "001fe2777f49ac73b6ab24401094a1c3c5efc887", + "sha256": "0haj4w8xcpm1yb3anla4ql2zi339hs6bcznxzl7qla575ff5sivp" + } + }, + { "ename": "world-time-mode", "commit": "f1429650400baf2b1523b5556eaf6a2178d515d4", "sha256": "10gdlz4l9iqw1zdlk5i3knysn36iqxdh3xabjq8kq04jkl7i36dl", @@ -114912,20 +116008,20 @@ "repo": "bnbeckwith/writegood-mode", "unstable": { "version": [ - 20210418, - 110 + 20220511, + 2109 ], - "commit": "ed42d918d98826ad88928b7af9f2597502afc6b0", - "sha256": "1nwngnddlkcvix7qx39fadab7hqzg8snb0k63kwpr8v57lyrm48z" + "commit": "d54eadeedb8bf3aa0e0a584c0a7373c69644f4b8", + "sha256": "1a3gmaaa344kigr209b6wnjiw9ikkmw1j5jda04h3g8f9817njyv" }, "stable": { "version": [ 2, - 0, - 4 + 2, + 0 ], - "commit": "ed42d918d98826ad88928b7af9f2597502afc6b0", - "sha256": "1nwngnddlkcvix7qx39fadab7hqzg8snb0k63kwpr8v57lyrm48z" + "commit": "d54eadeedb8bf3aa0e0a584c0a7373c69644f4b8", + "sha256": "1a3gmaaa344kigr209b6wnjiw9ikkmw1j5jda04h3g8f9817njyv" } }, { @@ -114936,14 +116032,14 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20210927, - 1301 + 20220426, + 2046 ], "deps": [ "visual-fill-column" ], - "commit": "eac1da790f316f357ed76ed67fbb790d6a4d126a", - "sha256": "01yrz25aymzwkcj5yzs8pmswsg0jgzbynbp9hmjnf3sqlgmang62" + "commit": "a736205c194d7525feb1e1f10f4186c7b2b62bef", + "sha256": "1mhakk78gxhv2cahvg3ynzrfwj09l5aknvncmd3r09csrc0cwkfg" }, "stable": { "version": [ @@ -115069,8 +116165,8 @@ 20210614, 1527 ], - "commit": "46c8a7c71275ced2c662c1222d4b85319f80dd83", - "sha256": "15qxs91inbpr9qk2xlaijargkvj9c6rmw0m4b05qrqni0cgb75dk" + "commit": "cf29c6ae6f8d92f012feecec1dccb23b7e93c86f", + "sha256": "1nhmndzy936jkgdp30lvnv45y7ixv0hsmxdbibn0lwy8xpd51q7s" } }, { @@ -115263,8 +116359,8 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20211121, - 1953 + 20220421, + 1320 ], "deps": [ "aio", @@ -115274,8 +116370,8 @@ "f", "s" ], - "commit": "c5fafbc41ae5c4d20a1eb2de3b3226f8a55eb65e", - "sha256": "1lzd053b27jikgb10bpbihynx08c9c33fcswrykl0r5548qjwm4j" + "commit": "a2c685b3bb2257da49af771caa02325aa41fa699", + "sha256": "12iy5fk3vz4rfyw848nb9dnnc4l338s9wm981w17k73wf37gnv89" } }, { @@ -115304,14 +116400,14 @@ "repo": "vibhavp/emacs-xkcd", "unstable": { "version": [ - 20220106, - 952 + 20220503, + 1109 ], "deps": [ "json" ], - "commit": "688d0b4ea234adda0c05784e6bb22ab9d71f0884", - "sha256": "15swryph0sks7lrcwnxsf436vq99b7psydnv0b2662nlbb0a4fdb" + "commit": "80011da2e7def8f65233d4e0d790ca60d287081d", + "sha256": "1l7bz979kjk1qngfa1zifyfdzn3vjvmbxy6qa188rxyz1zn6lm12" }, "stable": { "version": [ @@ -115586,11 +116682,11 @@ "repo": "ideasman42/emacs-xref-rst", "unstable": { "version": [ - 20220211, - 548 + 20220406, + 2311 ], - "commit": "f07722ac9c2952e86d9e84546c3c5eb1a768247e", - "sha256": "1wq815c2bs1fqjkl7kjpzmhdlw95dsayvcgclnkk1bb70xgzsivg" + "commit": "7964709276ff033cd138efabfafb4f2179e75c22", + "sha256": "15sdarz7iqifk9jazgp8l4v8ni48jb6rrixzmf1h60d5r3rf0z68" } }, { @@ -115924,14 +117020,14 @@ "repo": "knu/yaml-imenu.el", "unstable": { "version": [ - 20210530, - 251 + 20220406, + 1703 ], "deps": [ "yaml-mode" ], - "commit": "01741205fb33d2ed511502d1cd65a711e07a3117", - "sha256": "1z8yzi322y8wnvci77xp7fb7x5l3z8zy1ng4zaa1z856va8x2971" + "commit": "c1fbba8b03a7bef4fc2b87404914fa9c6eb67b55", + "sha256": "1p5zyjj9hvqjfhyp68c04w6cxj5qh4psd4y8kafyrz3n05wimzl5" }, "stable": { "version": [ @@ -116146,8 +117242,8 @@ 20220212, 1742 ], - "commit": "82772ac2508a4549c75f2aa31d901caea468a0fb", - "sha256": "1ccyf0y9886vq4007xr4g8w05jnw3v8pfzlqxdk7j4babj8kyjw9" + "commit": "25f6bf7415f6821a4097037a8decd03813d08722", + "sha256": "1dvrm7paaiy3f8mchhk2wxaaba3qzvl0hcld40k3miyjpdn2lfgs" }, "stable": { "version": [ @@ -116215,14 +117311,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20220221, - 1234 + 20220401, + 1534 ], "deps": [ "yasnippet" ], - "commit": "b7c09f1ad7e1a62da6f6042bfaa2b26d111c7e81", - "sha256": "0r4rjsgd13n8k0ijypwh3ky0dzzmz0p08lfaalpbqk3w555mkzyf" + "commit": "c5bf4c4085aa61b9c07563de89f7aacc2a357db5", + "sha256": "12kvg1nl93893pwhhx49a78camb8m8yzrgn6wg7kh9y50bqmh9ma" }, "stable": { "version": [ @@ -116730,11 +117826,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20220221, - 2005 + 20220412, + 2023 ], - "commit": "cef1e26146c1b8b32fc5ce346f2cfa9861eb67d4", - "sha256": "198n2pikpvk65bqivw7f8bvy9j9mpc2149zxzqc16m2868l9ngsx" + "commit": "89c0e39317850d5ccf14dcbbaff06b0a193454a6", + "sha256": "06f7jaglgrckfw36l2pb63y1qxn64svc7wa3c6np3hjpjs5y13f5" }, "stable": { "version": [ @@ -116914,15 +118010,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20211214, - 2221 + 20220429, + 2057 ], "deps": [ "ace-window", "deft" ], - "commit": "7fd18ba9eb3552befcb564ddd5e2201d7aa39ee5", - "sha256": "0w252rsfzy3vm08bqxi8f0mb9mpx532c7bkyminal8x7ssn1bdn6" + "commit": "86dd346be4bdddd6ac8d47503355fea350098271", + "sha256": "1s9gnsd3gj6wpv1vc3l2hhz4ccmfq6wvxcn3qj011pgz7y557iz9" }, "stable": { "version": [ @@ -116950,8 +118046,8 @@ "deps": [ "s" ], - "commit": "4048bf9e1be7ab759696a9541eec8f435359bcf3", - "sha256": "1rnir9mc9cp12wg5p19f0m6g6mvfyv1ahr7zq7azl8hvwmnb6gx7" + "commit": "603a5b692a08340c1865a6f73cacf57c4fd64cb2", + "sha256": "1hwibhqmm7a4zz0fw6qhbgyyw7rx73zd6gn7mg2g4m0c4kwwfifa" }, "stable": { "version": [ @@ -117061,11 +118157,19 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220321, - 2050 + 20220509, + 2156 ], - "commit": "4c6426e5e26e6a4d375442660d4f78aaea1691f7", - "sha256": "056xx1xlq9hwfjbympkl517544n1gfs605q0c7jkixh2vs6ipydr" + "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d", + "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6" + }, + "stable": { + "version": [ + 0, + 4 + ], + "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d", + "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6" } }, { @@ -117076,14 +118180,25 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220312, - 2211 + 20220509, + 802 ], "deps": [ "zk" ], - "commit": "4c6426e5e26e6a4d375442660d4f78aaea1691f7", - "sha256": "056xx1xlq9hwfjbympkl517544n1gfs605q0c7jkixh2vs6ipydr" + "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d", + "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6" + }, + "stable": { + "version": [ + 0, + 4 + ], + "deps": [ + "zk" + ], + "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d", + "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6" } }, { @@ -117109,14 +118224,14 @@ "repo": "nnicandro/emacs-zmq", "unstable": { "version": [ - 20210613, - 343 + 20220510, + 1820 ], "deps": [ "cl-lib" ], - "commit": "38dc6c4119aee57666caf8f97c8a3d7f678823e0", - "sha256": "0j7szww8fi2pyvln1bppyq8nly0vkbncz63kzqhi1zx7dfz127ry" + "commit": "af5299d80715b1083a18145e9c84ef9563020676", + "sha256": "1jn1jkkl0pg2psncrf0rx9csp95pg9wm1pcmy1cb3kbqla9x27p4" }, "stable": { "version": [ @@ -117281,20 +118396,20 @@ "repo": "cyrus-and/zoom", "unstable": { "version": [ - 20201215, - 1913 + 20220411, + 1126 ], - "commit": "c7beef180bc4037404e2d56b9ab9b7c76d1713a0", - "sha256": "0vzrg5vfb4rnripdxlnl2gs6mm85ysiwnn8rclsaljrmk5xrp5ls" + "commit": "2104abb074682db79b9ff3a748e8e2e760a4d8cf", + "sha256": "0wp7a1ibyqll8rpirsiazpf51lnd0q3yrya9pqvlx9ik5r41jp2m" }, "stable": { "version": [ 0, 2, - 3 + 4 ], - "commit": "85694c9baa99bcf247528a6743383a3a1e5323fe", - "sha256": "1xckqfkrx95b2bfdczz90y0b23bghlqkp2k5ml59ai2drb96l17h" + "commit": "2104abb074682db79b9ff3a748e8e2e760a4d8cf", + "sha256": "0wp7a1ibyqll8rpirsiazpf51lnd0q3yrya9pqvlx9ik5r41jp2m" } }, { @@ -117308,8 +118423,8 @@ 20201205, 1038 ], - "commit": "1823f8431b36beae112a67f5b102e06afaaa52bf", - "sha256": "0mqz10ngfn2kyhm918gwx185zmmvzj47vha5dvwwkqxx28xcsfq6" + "commit": "402f85f5d7d18e26289adcd452d42c73dc1df580", + "sha256": "1x7awisyb1vizpykmflvxw17x58xd2hj6dxq92xkpbswjj6fk238" }, "stable": { "version": [ @@ -117417,15 +118532,15 @@ "repo": "egh/zotxt-emacs", "unstable": { "version": [ - 20210222, - 347 + 20210908, + 402 ], "deps": [ "deferred", "request" ], - "commit": "45961801f9e0350d7457d0d84c5004f63aed9070", - "sha256": "18hi6m2ngl9yz599q5bhifafi4vz1adc06bjl0bhb3rs62vbkwk2" + "commit": "96a132d6b39f6bc19a58913b761d42efc198f8a4", + "sha256": "1qwn5ym2ljzbliy1qbafm3wzh8ayl177m3z2fvj2fy3cg9smi3bv" }, "stable": { "version": [ @@ -117476,8 +118591,8 @@ 20220302, 522 ], - "commit": "ecdcb62847b5e54ccd477d740e4974f28c8f5809", - "sha256": "1f4j53a1bm4kpgmlpfxnqb9zm8q0qxl7frxd8a0nqwfrxrzkqp8p" + "commit": "2133eb000b5239b08a1c2532629a19a19f8e6309", + "sha256": "15r4v3m9plygnkajaaf2y76a09am7r29d8h4yxh5fk7vb7cfyrw3" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json new file mode 100644 index 0000000000000..6a5608cbf8d56 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json @@ -0,0 +1,32 @@ +[ + "tree-sitter-agda", + "tree-sitter-bash", + "tree-sitter-c", + "tree-sitter-c-sharp", + "tree-sitter-cpp", + "tree-sitter-css", + "tree-sitter-elixir", + "tree-sitter-elm", + "tree-sitter-fluent", + "tree-sitter-go", + "tree-sitter-haskell", + "tree-sitter-hcl", + "tree-sitter-html", + "tree-sitter-java", + "tree-sitter-javascript", + "tree-sitter-jsdoc", + "tree-sitter-json", + "tree-sitter-julia", + "tree-sitter-nix", + "tree-sitter-ocaml", + "tree-sitter-php", + "tree-sitter-prisma", + "tree-sitter-python", + "tree-sitter-ruby", + "tree-sitter-rust", + "tree-sitter-scala", + "tree-sitter-swift", + "tree-sitter-typescript", + "tree-sitter-verilog", + "tree-sitter-zig" +] diff --git a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix new file mode 100644 index 0000000000000..e62a37565c83c --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix @@ -0,0 +1,44 @@ +{ lib +, pkgs +, symlinkJoin +, fetchzip +, melpaBuild +, stdenv +, fetchFromGitHub +, writeText +, melpaStablePackages +, runCommand +, tree-sitter-grammars +, plugins ? map (g: tree-sitter-grammars.${g}) (lib.importJSON ./default-grammars.json) +, final +}: + +let + inherit (melpaStablePackages) tree-sitter-langs; + + libSuffix = if stdenv.isDarwin then "dylib" else "so"; + soName = g: lib.removeSuffix "-grammar" (lib.removePrefix "tree-sitter-" g.pname) + "." + libSuffix; + + grammarDir = runCommand "emacs-tree-sitter-grammars" { + # Fake same version number as upstream language bundle to prevent triggering runtime downloads + inherit (tree-sitter-langs) version; + } ('' + install -d $out/langs/bin + echo -n $version > $out/langs/bin/BUNDLE-VERSION + '' + lib.concatStringsSep "\n" (map ( + g: "ln -s ${g}/parser $out/langs/bin/${soName g}") plugins + )); + +in +melpaStablePackages.tree-sitter-langs.overrideAttrs(old: { + postPatch = old.postPatch or "" + '' + substituteInPlace ./tree-sitter-langs-build.el \ + --replace "tree-sitter-langs-grammar-dir tree-sitter-langs--dir" "tree-sitter-langs-grammar-dir \"${grammarDir}/langs\"" + ''; + + passthru = old.passthru or {} // { + inherit plugins; + withPlugins = fn: final.tree-sitter-langs.override { plugins = fn tree-sitter-grammars; }; + }; + +}) diff --git a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/update-defaults.py b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/update-defaults.py new file mode 100755 index 0000000000000..19bcb8989c30d --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/update-defaults.py @@ -0,0 +1,74 @@ +#!/usr/bin/env nix-shell +#! nix-shell ../../../../../../. -i python3 -p python3 -p nix +from os.path import ( + dirname, + abspath, + join, +) +from typing import ( + List, + Any, +) +import subprocess +import json +import sys +import os + + +def fmt_grammar(grammar: str) -> str: + return "tree-sitter-" + grammar + + +def eval_expr(nixpkgs: str, expr: str) -> Any: + p = subprocess.run( + [ + "nix-instantiate", + "--json", + "--eval", + "--expr", + ("with import %s {}; %s" % (nixpkgs, expr)), + ], + check=True, + stdout=subprocess.PIPE, + ) + return json.loads(p.stdout) + + +def check_grammar_exists(nixpkgs: str, grammar: str) -> bool: + return eval_expr( + nixpkgs, f'lib.hasAttr "{fmt_grammar(grammar)}" tree-sitter-grammars' + ) + + +def build_attr(nixpkgs, attr: str) -> str: + return ( + subprocess.run( + ["nix-build", "--no-out-link", nixpkgs, "-A", attr], + check=True, + stdout=subprocess.PIPE, + ) + .stdout.decode() + .strip() + ) + + +if __name__ == "__main__": + cwd = dirname(abspath(__file__)) + nixpkgs = abspath(join(cwd, "../../../../../..")) + + src_dir = build_attr(nixpkgs, "emacs.pkgs.tree-sitter-langs.src") + + existing: List[str] = [] + + grammars = os.listdir(join(src_dir, "repos")) + for g in grammars: + exists = check_grammar_exists(nixpkgs, g) + if exists: + existing.append(fmt_grammar(g)) + else: + sys.stderr.write("Missing grammar: " + fmt_grammar(g) + "\n") + sys.stderr.flush() + + with open(join(cwd, "default-grammars.json"), mode="w") as f: + json.dump(sorted(existing), f, indent=2) + f.write("\n") diff --git a/pkgs/applications/editors/emacs/elisp-packages/tsc/default.nix b/pkgs/applications/editors/emacs/elisp-packages/tsc/default.nix new file mode 100644 index 0000000000000..a9462298979d0 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/tsc/default.nix @@ -0,0 +1,89 @@ +{ lib +, symlinkJoin +, melpaBuild +, fetchFromGitHub +, rustPlatform +, writeText +, clang +, llvmPackages + +, runtimeShell +, writeScript +, python3 +, nix-prefetch-github +, nix +}: + +let + + srcMeta = lib.importJSON ./src.json; + inherit (srcMeta) version; + + src = fetchFromGitHub srcMeta.src; + + tsc = melpaBuild { + inherit src; + inherit version; + + pname = "tsc"; + commit = version; + + sourceRoot = "source/core"; + + recipe = writeText "recipe" '' + (tsc + :repo "emacs-tree-sitter/elisp-tree-sitter" + :fetcher github) + ''; + }; + + tsc-dyn = rustPlatform.buildRustPackage { + inherit version; + inherit src; + + pname = "tsc-dyn"; + + nativeBuildInputs = [ clang ]; + sourceRoot = "source/core"; + + configurePhase = '' + export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" + ''; + + postInstall = '' + LIB=($out/lib/libtsc_dyn.*) + TSC_PATH=$out/share/emacs/site-lisp/elpa/tsc-${version} + install -d $TSC_PATH + install -m444 $out/lib/libtsc_dyn.* $TSC_PATH/''${LIB/*libtsc_/tsc-} + echo -n $version > $TSC_PATH/DYN-VERSION + rm -r $out/lib + ''; + + inherit (srcMeta) cargoSha256; + }; + +in symlinkJoin { + name = "tsc-${version}"; + paths = [ tsc tsc-dyn ]; + + passthru = { + updateScript = let + pythonEnv = python3.withPackages(ps: [ ps.requests ]); + in writeScript "tsc-update" '' + #!${runtimeShell} + set -euo pipefail + export PATH=${lib.makeBinPath [ + nix-prefetch-github + nix + pythonEnv + ]}:$PATH + exec python3 ${builtins.toString ./update.py} ${builtins.toString ./.} + ''; + }; + + meta = { + description = "The core APIs of the Emacs binding for tree-sitter."; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pimeys ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/tsc/src.json b/pkgs/applications/editors/emacs/elisp-packages/tsc/src.json new file mode 100644 index 0000000000000..6aa6fee1830ab --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/tsc/src.json @@ -0,0 +1,10 @@ +{ + "src": { + "owner": "emacs-tree-sitter", + "repo": "elisp-tree-sitter", + "rev": "909717c685ff5a2327fa2ca8fb8a25216129361c", + "sha256": "LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k=" + }, + "version": "0.18.0", + "cargoSha256": "sha256-IRCZqszBkGF8anF/kpcPOzHdOP4lAtJBAp6FS5tAOx8=" +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/tsc/update.py b/pkgs/applications/editors/emacs/elisp-packages/tsc/update.py new file mode 100644 index 0000000000000..ce2054f909ef3 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/tsc/update.py @@ -0,0 +1,122 @@ +#!/usr/bin/env python3 +from textwrap import dedent +from os.path import ( + abspath, + dirname, + join, +) +from typing import ( + Dict, + Any, +) +import subprocess +import tempfile +import json +import sys +import re + +import requests + + +def eval_drv(nixpkgs: str, expr: str) -> Any: + expr = "\n".join( + ( + "with (import %s {});" % nixpkgs, + expr, + ) + ) + + with tempfile.NamedTemporaryFile(mode="w") as f: + f.write(dedent(expr)) + f.flush() + p = subprocess.run( + ["nix-instantiate", "--json", f.name], stdout=subprocess.PIPE, check=True + ) + + return p.stdout.decode().strip() + + +def get_src(tag_name: str) -> Dict[str, str]: + p = subprocess.run( + [ + "nix-prefetch-github", + "--rev", + tag_name, + "--json", + "emacs-tree-sitter", + "elisp-tree-sitter", + ], + stdout=subprocess.PIPE, + check=True, + ) + src = json.loads(p.stdout) + + fields = ["owner", "repo", "rev", "sha256"] + + return {f: src[f] for f in fields} + + +def get_cargo_sha256(drv_path: str): + # Note: No check=True since we expect this command to fail + p = subprocess.run(["nix-store", "-r", drv_path], stderr=subprocess.PIPE) + + stderr = p.stderr.decode() + lines = iter(stderr.split("\n")) + + for l in lines: + if l.startswith("error: hash mismatch in fixed-output derivation"): + break + else: + raise ValueError("Did not find expected hash mismatch message") + + for l in lines: + m = re.match(r"\s+got:\s+(.+)$", l) + if m: + return m.group(1) + + raise ValueError("Could not extract actual sha256 hash: ", stderr) + + +if __name__ == "__main__": + cwd = sys.argv[1] + + nixpkgs = abspath(join(cwd, "../../../../../..")) + + tag_name = requests.get( + "https://api.github.com/repos/emacs-tree-sitter/elisp-tree-sitter/releases/latest" + ).json()["tag_name"] + + src = get_src(tag_name) + + with tempfile.NamedTemporaryFile(mode="w") as f: + json.dump(src, f) + f.flush() + + drv_path = eval_drv( + nixpkgs, + """ + rustPlatform.buildRustPackage { + pname = "tsc-dyn"; + version = "%s"; + nativeBuildInputs = [ clang ]; + src = fetchFromGitHub (lib.importJSON %s); + sourceRoot = "source/core"; + cargoSha256 = lib.fakeSha256; + } + """ + % (tag_name, f.name), + ) + + cargo_sha256 = get_cargo_sha256(drv_path) + + with open(join(cwd, "src.json"), mode="w") as f: + json.dump( + { + "src": src, + "version": tag_name, + "cargoSha256": cargo_sha256, + }, + f, + indent=2, + ) + f.write("\n") diff --git a/pkgs/applications/editors/emacs/elisp-packages/update b/pkgs/applications/editors/emacs/elisp-packages/update new file mode 100755 index 0000000000000..02701fb546d95 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/update @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +set -euo pipefail + +SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" +cd "$SCRIPT_DIR" + +./update-from-overlay + +./update-manual +git commit -m "emacs.pkgs.manualPackages: $(date --iso)" -- . diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-manual b/pkgs/applications/editors/emacs/elisp-packages/update-manual new file mode 100755 index 0000000000000..3b199eecc3d2b --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/update-manual @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +set -euo pipefail + +SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" +cd "$SCRIPT_DIR" + +nix-build --no-out-link update-manual.nix | xargs -n 1 -P $(nproc) bash -c diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-manual.nix b/pkgs/applications/editors/emacs/elisp-packages/update-manual.nix new file mode 100644 index 0000000000000..788d096e6ec69 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/update-manual.nix @@ -0,0 +1,11 @@ +let + pkgs = import ../../../../../. { + config.allowBroken = true; + }; + inherit (pkgs) lib emacs; + inherit (lib) isDerivation hasAttr filterAttrs mapAttrs attrValues; + + # Extract updateScript's from manually package emacs packages + hasScript = filterAttrs (_: v: isDerivation v && hasAttr "updateScript" v) emacs.pkgs.manualPackages; + +in attrValues (mapAttrs (_: v: v.updateScript) hasScript) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 82a1d6af83295..b1c8a8d6cc9bf 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -8,11 +8,12 @@ }: { stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm , Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib -, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux +, libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux , alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , sigtool, jansson, harfbuzz, sqlite, nixosTests -, dontRecurseIntoAttrs ,emacsPackagesFor +, dontRecurseIntoAttrs, emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params +, fetchFromSavannah , systemd ? null , withX ? !stdenv.isDarwin , withNS ? stdenv.isDarwin @@ -22,7 +23,8 @@ , withMotif ? false, motif ? null , withSQLite3 ? false , withCsrc ? true -, srcRepo ? false, autoreconfHook ? null, texinfo ? null +, withWebP ? false +, srcRepo ? true, autoreconfHook ? null, texinfo ? null , siteStart ? ./site-start.el , nativeComp ? false , withAthena ? false @@ -58,8 +60,9 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { patches = patches fetchpatch; - src = fetchurl { - url = "mirror://gnu/emacs/${name}.tar.xz"; + src = fetchFromSavannah { + repo = "emacs"; + rev = version; inherit sha256; }; @@ -134,6 +137,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] ++ lib.optional (withX && withMotif) motif ++ lib.optional withSQLite3 sqlite + ++ lib.optional withWebP libwebp ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ] ++ lib.optionals withNS [ AppKit GSS ImageIO ] ++ lib.optionals stdenv.isDarwin [ sigtool ] diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 8fd9f56a9d221..7cfde3a91f399 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -5,7 +5,6 @@ , appstream-glib , desktop-file-utils , fetchurl -, fetchpatch , flatpak , gnome , libgit2-glib @@ -41,23 +40,15 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "42.0"; + version = "42.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Uu/SltaLL/GCNBwEgdz9cGVMQIvbZ5/Ot225cDwiQo8="; + sha256 = "XU1RtwKGW0gBcgHwxgfiSifXIDGo9ciNT86HW1VFZwo="; }; - patches = [ - # Fix appstream validation - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/d7151679e0c925d27216256dc32fe67fb298d059.patch"; - sha256 = "vdNJawkqSBaFGRZvxzvjOryQpBL4jcN7tr1t3ihD7LA="; - }) - ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -115,8 +106,6 @@ stdenv.mkDerivation rec { "-Dnetwork_tests=false" ]; - # Some tests fail due to being unable to find the Vte typelib, and I don't - # understand why. Somebody should look into fixing this. doCheck = true; postPatch = '' diff --git a/pkgs/applications/editors/gnome-inform7/default.nix b/pkgs/applications/editors/gnome-inform7/default.nix index 534466db8d789..509eee06e2be4 100644 --- a/pkgs/applications/editors/gnome-inform7/default.nix +++ b/pkgs/applications/editors/gnome-inform7/default.nix @@ -22,12 +22,12 @@ let pkg-config docbook2x docbook-xsl-nons + wrapGAppsHook ]; buildInputs = [ gtk3 gobject-introspection vala gtk-doc - wrapGAppsHook ]; }); diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 8fc6feecd57c9..fe8666fd741bd 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,7 +1,6 @@ -{ lib -, stdenv +{ stdenv +, lib , fetchurl -, fetchpatch , autoreconfHook , gtk-doc , vala @@ -22,22 +21,14 @@ }: stdenv.mkDerivation rec { - version = "3.38.0"; + version = "3.40.0"; pname = "gnome-latex"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8"; + sha256 = "xad/55vUDjeOooyPRaZjJ/vIzFw7W48PCcAhfufMCpA="; }; - patches = [ - # Fix build with latest tepl. - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/gnome-latex/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9.patch"; - sha256 = "H8cbp5hDZoXytEdKE2D/oYHNKIbEFwxQoEaC4JMfGHY="; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index fb1abcd6cffe3..cb948b99065d3 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -17,6 +17,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' + # not needed at runtime + rm -r runtime/grammars/sources + mkdir -p $out/lib cp -r runtime $out/lib ''; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 86eb399dd44a0..86b4a790d0372 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, fetchurl -, jdk, cmake, zlib, python3 -, dotnet-sdk_5 +, jdk, cmake, gdb, zlib, python3 +, dotnet-sdk_6 , maven , autoPatchelfHook , libdbusmenu @@ -53,6 +53,9 @@ let # bundled cmake does not find libc rm -rf bin/cmake/linux ln -s ${cmake} bin/cmake/linux + # bundled gdb does not find libcrypto 10 + rm -rf bin/gdb/linux + ln -s ${gdb} bin/gdb/linux autoPatchelf $PWD/bin @@ -124,7 +127,7 @@ let with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ. ''; - maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot ]; + maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot AnatolyPopov ]; platforms = ideaPlatforms; }; }); @@ -207,7 +210,7 @@ let postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' rm -rf lib/ReSharperHost/linux-x64/dotnet mkdir -p lib/ReSharperHost/linux-x64/dotnet/ - ln -s ${dotnet-sdk_5}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet + ln -s ${dotnet-sdk_6}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet ''); }); @@ -260,7 +263,7 @@ in sha256 = products.clion.sha256; }; wmClass = "jetbrains-clion"; - update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml + update-channel = products.clion.update-channel; }; datagrip = buildDataGrip rec { @@ -273,7 +276,7 @@ in sha256 = products.datagrip.sha256; }; wmClass = "jetbrains-datagrip"; - update-channel = "DataGrip RELEASE"; + update-channel = products.datagrip.update-channel; }; goland = buildGoland rec { @@ -286,7 +289,7 @@ in sha256 = products.goland.sha256; }; wmClass = "jetbrains-goland"; - update-channel = "GoLand RELEASE"; + update-channel = products.goland.update-channel; }; idea-community = buildIdea rec { @@ -300,7 +303,7 @@ in sha256 = products.idea-community.sha256; }; wmClass = "jetbrains-idea-ce"; - update-channel = "IntelliJ IDEA RELEASE"; + update-channel = products.idea-community.update-channel; }; idea-ultimate = buildIdea rec { @@ -314,12 +317,12 @@ in sha256 = products.idea-ultimate.sha256; }; wmClass = "jetbrains-idea"; - update-channel = "IntelliJ IDEA RELEASE"; + update-channel = products.idea-ultimate.update-channel; }; mps = buildMps rec { pname = "mps"; - product = "MPS ${products.mps.version-major-minor}"; + product = "MPS ${products.mps.version}"; version = products.mps.version; description = "Create your own domain-specific language"; license = lib.licenses.asl20; @@ -328,7 +331,7 @@ in sha256 = products.mps.sha256; }; wmClass = "jetbrains-mps"; - update-channel = "MPS RELEASE"; + update-channel = products.mps.update-channel; }; phpstorm = buildPhpStorm rec { @@ -341,7 +344,7 @@ in sha256 = products.phpstorm.sha256; }; wmClass = "jetbrains-phpstorm"; - update-channel = "PhpStorm RELEASE"; + update-channel = products.phpstorm.update-channel; }; pycharm-community = buildPycharm rec { @@ -355,7 +358,7 @@ in sha256 = products.pycharm-community.sha256; }; wmClass = "jetbrains-pycharm-ce"; - update-channel = "PyCharm RELEASE"; + update-channel = products.pycharm-community.update-channel; }; pycharm-professional = buildPycharm rec { @@ -369,7 +372,7 @@ in sha256 = products.pycharm-professional.sha256; }; wmClass = "jetbrains-pycharm"; - update-channel = "PyCharm RELEASE"; + update-channel = products.pycharm-professional.update-channel; }; rider = buildRider rec { @@ -382,7 +385,7 @@ in sha256 = products.rider.sha256; }; wmClass = "jetbrains-rider"; - update-channel = "Rider RELEASE"; + update-channel = products.rider.update-channel; }; ruby-mine = buildRubyMine rec { @@ -395,7 +398,7 @@ in sha256 = products.ruby-mine.sha256; }; wmClass = "jetbrains-rubymine"; - update-channel = "RubyMine RELEASE"; + update-channel = products.ruby-mine.update-channel; }; webstorm = buildWebStorm rec { @@ -408,7 +411,7 @@ in sha256 = products.webstorm.sha256; }; wmClass = "jetbrains-webstorm"; - update-channel = "WebStorm RELEASE"; + update-channel = products.webstorm.update-channel; }; } diff --git a/pkgs/applications/editors/jetbrains/update.py b/pkgs/applications/editors/jetbrains/update.py index 5301a85ba9a29..fe57f75c72e13 100755 --- a/pkgs/applications/editors/jetbrains/update.py +++ b/pkgs/applications/editors/jetbrains/update.py @@ -1,6 +1,5 @@ #! /usr/bin/env nix-shell #! nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.requests python3.pkgs.xmltodict -import hashlib import json import pathlib import logging @@ -33,7 +32,8 @@ def download_channels(): def build_version(build): - return version.parse(build["@version"]) + build_number = build["@fullNumber"] if "@fullNumber" in build else build["@number"] + return version.parse(build_number) def latest_build(channel): @@ -43,11 +43,10 @@ def latest_build(channel): def download_sha256(url): + url = f"{url}.sha256" download_response = requests.get(url) download_response.raise_for_status() - h = hashlib.sha256() - h.update(download_response.content) - return h.hexdigest() + return download_response.content.decode('UTF-8').split(' ')[0] channels = download_channels() @@ -63,18 +62,22 @@ def update_product(name, product): else: try: build = latest_build(channel) - version = build["@version"] - parsed_version = build_version(build) - version_major_minor = f"{parsed_version.major}.{parsed_version.minor}" - download_url = product["url-template"].format(version = version, versionMajorMinor = version_major_minor) + new_version = build["@version"] + new_build_number = build["@fullNumber"] + if "EAP" not in channel["@name"]: + version_or_build_number = new_version + else: + version_or_build_number = new_build_number + version_number = new_version.split(' ')[0] + download_url = product["url-template"].format(version=version_or_build_number, versionMajorMinor=version_number) product["url"] = download_url - product["version-major-minor"] = version_major_minor - if "sha256" not in product or product.get("version") != version: - logging.info("Found a newer version %s.", version) - product["version"] = version + if "sha256" not in product or product.get("build_number") != new_build_number: + logging.info("Found a newer version %s with build number %s.", new_version, new_build_number) + product["version"] = new_version + product["build_number"] = new_build_number product["sha256"] = download_sha256(download_url) else: - logging.info("Already at the latest version %s.", version) + logging.info("Already at the latest version %s with build number %s.", new_version, new_build_number) except Exception as e: logging.exception("Update failed:", exc_info=e) logging.warning("Skipping %s due to the above error.", name) diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 83f486edfcf9a..7e48ace5161b1 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,42 +3,42 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2021.3.3", - "sha256": "35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d", - "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "a8ad8db6362d60a5ce60a7552110887dbd12e8420c839c368b55808b68dea38b", + "url": "https://download.jetbrains.com/cpp/CLion-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2021.3.4", - "sha256": "a34670f1a6c77e00237302a70f22fb5bf089dfe128341fd89b2f25bb8becb325", - "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1.1", + "sha256": "d4ffcb4371ee6e9f03704fa6282630349fd4ff4759846c02d43bb37e3caeae67", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.tar.gz", + "version-major-minor": "2022.1.1" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2021.3.3", - "sha256": "9d2b709703516eddeb7f4d6568a7de2e268de4258c7bc7787baee806fbaee4a3", - "url": "https://download.jetbrains.com/go/goland-2021.3.3.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "7803f432b62b7b9a9f340fd48375f50d60b0e5412b052b70e175de8edf82a947", + "url": "https://download.jetbrains.com/go/goland-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2021.3.2", - "sha256": "99e2225846d118e3190023abc65c8b2c62a1d1463f601c79a20b9494c54a08c9", - "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "0400e6152fa0173e4e9a514c6398eef8f19150893298658c0b3eb1427e5bcbe5", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz", - "version": "2021.3.2", - "sha256": "face5d154a2c9244b278bfc6dca37218ae3344090526a0679086eff9b0c56670", - "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2-no-jbr.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "f786bbd4a7c82273f6871996584fb7b37aa2b32fb07c7f554076f203284c77b6", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.1-no-jbr.tar.gz", + "version-major-minor": "2022.1" }, "mps": { "update-channel": "MPS RELEASE", @@ -51,92 +51,92 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2021.3.2", - "sha256": "761b347142035e8b74cc5a9939100af9d45f1f6ee29de1e78cd6b1ff06fe20e2", - "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "e30d6991c98addcc02ab05c623d0c42797d605db73c01b7c153bf2246c877395", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2021.3.2", - "sha256": "f1ae01f471d01c6f09aab0a761c6dea9834ef584f2aaf6d6ebecdce6b55a66e8", - "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "35d857df0ac4bd76caba60ac329c9183594be142094d0592f2afa40534be85eb", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2021.3.2", - "sha256": "6bd9573a84c1f2ae6b9b6612f0859aee21133f479ace43602dc0af879f9d9e67", - "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "9b160ed74f384be31ff376af73f91924a212e6440ce142a581b22f261e6cf605", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2021.3.3", - "sha256": "1dc57d5d7932d4a8dea51fc5cbdaa52f9626490092978f02fa15bb41cb84068f", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "e5d2018bf352f4ff17299d2ee4f286d654946fe4dac2ff47d3dc853820364673", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2021.3.2", - "sha256": "697510ee2401bb7cbe75193f015d8c2dd1677117defbc2a6f5f3c1443f20dea2", - "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "495c0d86eb7f3bed0ed692a7ae37e8b3b333c58ae891ca3891a311db6b951401", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.tar.gz", + "version-major-minor": "2022.1" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2021.3.2", - "sha256": "18a53c1b1b92e9b7e516b425a390f23f46b880a704d1cb223d1ba64410b15060", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.tar.gz", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "d9dd5815cc456d74f7dc47533ade3990d0f2f9ce0c4dab3d5ae9b04e01d1746c", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.tar.gz", + "version-major-minor": "2022.1" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2021.3.3", - "sha256": "342a4d8549ae4623a5edfa7f9737887cf0a25c1a61bb414b54b742b1c5a1a84d", - "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "4972403e5ed7587ad76dcfb08b975879a2a955e9be9f88344e369cd4006b2d52", + "url": "https://download.jetbrains.com/cpp/CLion-2022.1.dmg", + "version-major-minor": "2022.1" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2021.3.4", - "sha256": "27e709d2ced66d37a615d8c56885828e49a08962708e28df1a20f324c626bf52", - "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.dmg", - "version-major-minor": "2021.3" + "version": "2022.1.1", + "sha256": "6ea0c0c972bad06fd0378a2c1e9a1cb1b3ec50d52cc98d0f9c98327cc7af2a1e", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.dmg", + "version-major-minor": "2022.1.1" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2021.3.3", - "sha256": "4b245b6fe0cf588adbf36e68f12397d5fd311b0b6d49f17ba374ebaa10d207c9", - "url": "https://download.jetbrains.com/go/goland-2021.3.3.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "ec44455e83b8c8d85614b63815245a0dff984796a432e05801787c7f8474900b", + "url": "https://download.jetbrains.com/go/goland-2022.1.dmg", + "version-major-minor": "2022.1" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2021.3.2", - "sha256": "20d8cee2bbedaeb0ea388f795e13d08eca5b59e59d4e980ac2d8bc07c9fed3e9", - "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "6f9dddab5c280bb2ad6bb8d46bcc85c1b167974ce4b412a68faf31f7f7d1c194", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.dmg", + "version-major-minor": "2022.1" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2021.3.2", - "sha256": "9f574562b866e6ccc3d2f9b4c245c45844d1d0fd54be3dbdcc893d40ba1cf54a", - "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "2f1e51db514b39b54cb4029815b7f92764b378f2cf2eb16e69e2ee3c0b35f416", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.1.dmg", + "version-major-minor": "2022.1" }, "mps": { "update-channel": "MPS RELEASE", @@ -149,92 +149,92 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2021.3.2", - "sha256": "596a9d5fdc30d5fba65ddd482da90f9d555fed748b930587562022bfe7df4e14", - "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "daa3c749b3a41e106384ac8e003957a46f38dfc844cebfce8c802c4a223535b8", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.dmg", + "version-major-minor": "2022.1" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2021.3.2", - "sha256": "b8f41f5dddeda0ed5f5c81ba57d2560ccc6e227987882fb6bf305b5d1d8c6909", - "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "99ba20a8b0752ca58e1fc814fb19766fd19c376b42e3cbfa4102c67bc21942ec", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.dmg", + "version-major-minor": "2022.1" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2021.3.2", - "sha256": "188b998660e7cfb7ac1364c818c008a5608ab2aeb17c6cc19d1d9dda547d3775", - "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "ab5496370a6145073dbd423e47d6112d9c726a4a286d2528e66711f865d92d56", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.dmg", + "version-major-minor": "2022.1" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2021.3.3", - "sha256": "41a0939cb6258a0fb303268c5a466a663cf3588af14bcbb351be4c3a1d158094", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "38867fb7ca4b5af013f33b4db3b15994b6e732b121176f98480b5ff1b49ef17e", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.dmg", + "version-major-minor": "2022.1" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2021.3.2", - "sha256": "ba27c14b21d66ca96a64ceb7dc5d9f0952254a5f405b3201f51d2ad3cc749a96", - "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "b33f34b889fde6ebe6348499e2ad15bb85937aba1e2a8a9543c411b2476ec4ff", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.dmg", + "version-major-minor": "2022.1" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2021.3.2", - "sha256": "932d4920f831d1ceae68a474444c37d986277d8d3288d3aab93dd43d99336a36", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "0bd2be5ea0ccabfb7a806ca4c46d33f1e9106c2256243c48091ff61d5ac29a08", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.dmg", + "version-major-minor": "2022.1" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2021.3.3", - "sha256": "fbf651fa4a5925fe729be30ca8a6fa3be84dc4d7827dbcf74f4d28c52b903cc2", - "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "333d4ac5757f537ad67863dd6fb03644722ab8fce1596976fa99e5ae9de7991c", + "url": "https://download.jetbrains.com/cpp/CLion-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2021.3.4", - "sha256": "7a77ba9fce56c781ae6a4fc65eaab4bcc10780b6bd679b04d74146719e42890a", - "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1.1", + "sha256": "2ba92ed34366b111a39ba0632d91dbaf232633f5f5557a208dd8ab7696179b6f", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1-aarch64.dmg", + "version-major-minor": "2022.1.1" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2021.3.3", - "sha256": "54397d48e20fb534206e13f84b35868b1eaea13175176487b1239b23db4e13db", - "url": "https://download.jetbrains.com/go/goland-2021.3.3-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "0506a817e35a80d3d776484a88bf4136628b589a8f5754833387a8dec99798d3", + "url": "https://download.jetbrains.com/go/goland-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2021.3.2", - "sha256": "79e540fb0cd480837b3a954e4802f4f252073955393e8927c9c1b28c37112d51", - "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "f61bdf70e373a948a71331e68a7303bf90cf47ea4e2f97338aaf96d19e8862c4", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2021.3.2", - "sha256": "511c6aed9c5cd4c7665a9bac9ba94582977013244cbe88b820eb5464fce91a1c", - "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "af9c0e8d47fcded5f567293b7991fd0ac8df838b83884149109fd91ec2dec769", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "mps": { "update-channel": "MPS RELEASE", @@ -247,50 +247,50 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2021.3.2", - "sha256": "ba15c3f843c85141a9adaec1c4611224a853bd98649148751e34ac304591a314", - "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "d13744e7a70a9716f1b99cb9b77c77e17cb4710466a29db490ef6e707a54ae21", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2021.3.2", - "sha256": "407bf395cfb6d61f1c0861c7679b197238780e82a019e10162b8cd7130edb15a", - "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "1873565756716cb0eee23c60068dd5d394413b2b2e54b4b75cbe8b882540a0b7", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2021.3.2", - "sha256": "12fa34d1e60a555bac230acea9cd46c7adfe9ca42ff3e458c79d33e5b88eb8db", - "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "ba0ea4ff52703a53a9c7e14d42c9ae12688b94364ced77a28d4ed0c417c9642f", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2021.3.3", - "sha256": "65603860d1fd3134c5659f5a06de7cac17f3183a01056b79cfe72242b99adb37", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "273f40eda119a034ada821db2257e3b5c2bfb835c287365398237f5d9a9daad3", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2021.3.2", - "sha256": "33773222b2fa14300de5ed12ca96c3442b933f66cef67cebc9610e5cef51c75e", - "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "06d932a587adcd25b4e70d0b27c2c229381144deaef90cbcdc345edd822e04ed", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2021.3.2", - "sha256": "f4788ec0c55123b1f4e14934792f65bf8040e2a2ee673e985b50b8feded60408", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2-aarch64.dmg", - "version-major-minor": "2021.3" + "version": "2022.1", + "sha256": "96ec148af1b20ea9d2cb6f8b1f268f96607269e8dd3caf521b48464fe21a7177", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1-aarch64.dmg", + "version-major-minor": "2022.1" } } } diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix index c71b14f174228..ffecd65d50f96 100644 --- a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix @@ -20,7 +20,7 @@ let ''; pname = "clojupyter"; - version = "0.3.2"; + version = "0.3.3"; meta = with lib; { description = "A Jupyter kernel for Clojure"; @@ -36,8 +36,8 @@ let src = fetchFromGitHub { owner = "clojupyter"; repo = "clojupyter"; - rev = "0.3.2"; - sha256 = "1wphc7h74qlm9bcv5f95qhq1rq9gmcm5hvjblb01vffx996vr6jz"; + rev = version; + sha256 = "sha256-BCzcPnLSonm+ELFU4JIIzLPlVnP0VzlrRSGxOd/LFow="; }; buildInputs = [ imagemagick ]; diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn b/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn index 86f489c7300ea..be5a54fb06c17 100644 --- a/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn +++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.edn @@ -1 +1 @@ -{:deps {clojupyter/clojupyter {:mvn/version "0.3.2"}}} +{:deps {clojupyter/clojupyter {:mvn/version "0.3.3"}}} diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix index 729db05b6cc7a..2be3bf7a33e39 100644 --- a/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix +++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix @@ -31,8 +31,8 @@ inherit repos; artifactId = "data.json"; groupId = "org.clojure"; - sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6"; - version = "0.2.6"; + sha512 = "b767973db8b5b36aeb5c55f082e020a5c3f657bee1eede018e68ccaa2c535005759bc8a162fce7bb63eee1c14c6f29ec1c6080978a08817189864cbd40f154fa"; + version = "2.3.1"; }; } @@ -64,8 +64,8 @@ inherit repos; artifactId = "clojupyter"; groupId = "clojupyter"; - sha512 = "3ff95101e9031f0678c1ebd67b0f0d1b50495aa81a69c8f08deb9c2931818bbdd6bcd6f1ef25c407c6714a975c1ef853b4287725641a3fed7b93e1c27ba78709"; - version = "0.3.2"; + sha512 = "d030ae69cdadecbcec9a052e4ad91ba4f47cdc4bb3fb780317f337af62d8c34d12ef05d132d6c9a4ce790008c979919c22162432c1b9bcf4e0a470020d585dbe"; + version = "0.3.3"; }; } @@ -86,8 +86,8 @@ inherit repos; artifactId = "tools.analyzer"; groupId = "org.clojure"; - sha512 = "9cce94540a6fd0ae0bad915efe9a30c8fb282fbd1e225c4a5a583273e84789b3b5fc605b06f11e19d7dcc212d08bc6138477accfcde5d48839bec97daa874ce6"; - version = "0.6.9"; + sha512 = "e02d7baec926e0e0a7d9c71f09fee627fbde59ae7f3cbd4abcdf0533c8a87fba8c7cf4503df34bf33777063f4b6353a022552fd003fdbea9fad5752d53609bb8"; + version = "1.0.0"; }; } @@ -196,8 +196,8 @@ inherit repos; artifactId = "encore"; groupId = "com.taoensso"; - sha512 = "c4928c76378415ac504071ae4812e82efdce3b432c961b0bb9d906a468bb9c51a778f0109ac86641419b1a852ef13ca3d5c54ddde457e5aaec36a2f54f9caf8f"; - version = "2.91.0"; + sha512 = "bb9510a88bca86f9cfc4a2e5c8a85782bc71d961a0a639735edafb61df130422488ee40d1db4cb6ad961e40acdb07259052937391c32f1e54c71f09dd63d33e5"; + version = "3.12.1"; }; } @@ -229,8 +229,8 @@ inherit repos; artifactId = "tools.analyzer.jvm"; groupId = "org.clojure"; - sha512 = "ec1cb7638e38dfdca49c88e0b71ecf9c6ea858dccd46a2044bb37d01912ab4709b838cd2f0d1c2f201927ba4eea8f68d4d82e9fdd6da2f9943f7239bf86549f2"; - version = "0.7.2"; + sha512 = "ce9c7b51fa61c12c539f3c5c1c7fa1caf123497553d4e566c13895312faad2d2657fe6e54fe88110a6c87accb10c4c3b6ccfa87a035a7321da6c859da1d192d0"; + version = "1.1.0"; }; } @@ -273,8 +273,8 @@ inherit repos; artifactId = "jackson-dataformat-cbor"; groupId = "com.fasterxml.jackson.dataformat"; - sha512 = "dd49d4a154b8284620704a364ec54fb94638d68424b4f3eaa1d61cccc70959d399e539162f6ac8dcdd6efb0d3817a2edd2bba12fd2630cabd4722cd2ce9b782a"; - version = "2.9.6"; + sha512 = "575a00fec1760571403aaadbe0aa6c74f8bb01f40feae00741df6604e7c2bf199ac739a789bbd5d83af75ec6d9fcc55f5a1515b05aef33e0d3cc3046acad9e89"; + version = "2.10.2"; }; } @@ -339,8 +339,8 @@ inherit repos; artifactId = "pretty"; groupId = "io.aviso"; - sha512 = "2c4df86bb572cf028992a1a321178df65d0e681cbbc699db3a149fd0bcf8ad803643bf4e621a9b7793067f128934819371796468288cf5822924b2218711ccac"; - version = "0.1.33"; + sha512 = "512454e5296c54e2d2f3ddb3122e99edae3286b7e7f9a63dd453c96225b6aa5d0fb0972d58d7dac434b297f47a1f27d1b2021c126064af020f0c3040097226d6"; + version = "0.1.37"; }; } @@ -427,8 +427,8 @@ inherit repos; artifactId = "jackson-core"; groupId = "com.fasterxml.jackson.core"; - sha512 = "a1b9b68b67d442a47e36b46b37b6b0ad7a10c547a1cf7adb4705baec77356e1080049d310b3b530f66bbd3c0ed05cfe43c041d6ef4ffbbc6731149624df4e699"; - version = "2.9.6"; + sha512 = "5055943790cea2c3abbacbe91e63634e6d2e977cd59b08ce102c0ee7d859995eb5d150d530da3848235b2b1b751a8df55cff2c33d43da695659248187ddf1bff"; + version = "2.10.2"; }; } @@ -444,6 +444,17 @@ } { + name = "org.ow2.asm/asm"; + path = pkgs.fetchMavenArtifact { + inherit repos; + artifactId = "asm"; + groupId = "org.ow2.asm"; + sha512 = "40614e658138f2eb95bc26999545f996794c622c4d68efb9e10093743504c4b58bf22590767bc6bd93b77cdfb202c507144ba867bbc8b54d74fe7621cbc55e3a"; + version = "5.2"; + }; + } + + { name = "org.slf4j/jul-to-slf4j"; path = pkgs.fetchMavenArtifact { inherit repos; @@ -537,8 +548,8 @@ inherit repos; artifactId = "truss"; groupId = "com.taoensso"; - sha512 = "601bdac92eb0432de228717d3feb7f8a24f484eaf8b93a98c95ee42a0d57bd3dd7d2929c21dadb3a9b43d5e449821d30bbcf4e5ae198dcb8c62ec9597ff57524"; - version = "1.5.0"; + sha512 = "79a515306228e8e8f1c1cf5bb65ac8c979954f3a6e8461c059a7b9402967163a1eb7a70de3ad41e8195d9dbfac2d17af8cc03e09bf72f8e9f6704b842656c0b9"; + version = "1.6.0"; }; } @@ -559,8 +570,8 @@ inherit repos; artifactId = "hiccup"; groupId = "hiccup"; - sha512 = "034f15be46c35029f41869c912f82cb2929fbbb0524ea64bd98dcdb9cf09875b28c75e926fa5fff53942b0f9e543e85a73a2d03c3f2112eecae30fcef8b148f4"; - version = "1.0.5"; + sha512 = "419dd67281135feb31f74528907b785679066e22cf397f14a6d9439cb9c463d0db66436c214b2b1b5944be6b9d28e3fc7d9e4042de52f9633bf0825548c0f524"; + version = "2.0.0-alpha2"; }; } @@ -658,8 +669,8 @@ inherit repos; artifactId = "timbre"; groupId = "com.taoensso"; - sha512 = "cbb47d1ba312ca5f8ffdb2953401e0b37b308529c49622d4eb57e1d128ae56768051a2e01264c3a3fe8ef1c8a8785fcc29bc9336ccc70e629f2ab432280e6d7f"; - version = "4.10.0"; + sha512 = "2570f1d59d98034d8425598ab676f4c1e17f9da9926def2e142296377ddccf0fe3a894ba023114d614ca728c77c11d50927a709bfa896e9c5cce0854be31e32d"; + version = "5.1.2"; }; } @@ -713,8 +724,8 @@ inherit repos; artifactId = "cider-nrepl"; groupId = "cider"; - sha512 = "2c665aeb6c31eb2d11f257966f19e6127d602546a8fea2ab19eed3352469f93bd870c210250cc3f8b89d68d61f6076a614b87d1792a1ab3a3fd8f3b974842f75"; - version = "0.21.1"; + sha512 = "e201944e32ce9b8fa328327c84f31d11cf5507a97b4fd3189a0304f4ebfd3bd557a1886335f295831941ac30d2b2394ad79a2897cb9bce506c0cbd8e04bbc40f"; + version = "0.26.0"; }; } @@ -757,8 +768,8 @@ inherit repos; artifactId = "cheshire"; groupId = "cheshire"; - sha512 = "46d638d3e261e2debcaae9bdf912abaad4e77218ee0ba25ad0ff71dc040f579e630e593d55cd84dc9815bf84df33650295243cbeb8ff868976854544dd77de2c"; - version = "5.8.1"; + sha512 = "5b2a339f8d90951a80105729a080b841e0de671f576bfa164a78bccc08691d548cff6a7124224444f7b3a267c9aca69c18e347657f1d66e407167c9b5b8b52cb"; + version = "5.10.0"; }; } @@ -768,8 +779,8 @@ inherit repos; artifactId = "tigris"; groupId = "tigris"; - sha512 = "5393fe3f656521a6760d289d9549ffb9e9c1a8a72b69878205d53763802afa8778f1cb8bed6899e0b9721de231a79b8b1254cc601c84f5374467f1cc4780a987"; - version = "0.1.1"; + sha512 = "fdff4ef5e7175a973aaef98de4f37dee8e125fc711c495382e280aaf3e11341fe8925d52567ca60f3f1795511ade11bc23461c88959632dfae3cf50374d02bf6"; + version = "0.1.2"; }; } @@ -790,8 +801,8 @@ inherit repos; artifactId = "tools.reader"; groupId = "org.clojure"; - sha512 = "3d6d184a30cead093a158a69feaff8685a24a8089b0245f2b262d26ff46c7fd0be6940bdaccb0b5b06f87cba7ac59e677f74afff1cfbd67dc2b32e2a1ff19541"; - version = "1.2.2"; + sha512 = "03677c7eb85d294f878f13066bbd841e788ec1267285690e65c2eb342b02aecd028679509b7f1d192cf5631b0839a92abfe36e93237bf5e2544c14e6cebe7452"; + version = "1.3.3"; }; } @@ -834,8 +845,8 @@ inherit repos; artifactId = "nrepl"; groupId = "nrepl"; - sha512 = "f9ffc647820e772428781cb4ccd4f84a7d903afffe64418af55c95bd7bc21e1722591ac425d1be366d8f4f4596debf0c1b006957848473d3c515f4187cd5cb86"; - version = "0.6.0"; + sha512 = "663906ff1c8768c4a73fa9f32619da4c244cc86c93d86e8439eb8de81c79486be5a04140c1df6199ba475b3a3e7fd36304faef8b330672dd644945820cc6eb67"; + version = "0.8.3"; }; } @@ -955,8 +966,8 @@ inherit repos; artifactId = "core.memoize"; groupId = "org.clojure"; - sha512 = "e1c5104ac20a22e670ccb80c085ce225c168802829668e91c316cbea4f8982431a9e2ac7bfa5e8477ef515088e9443763f44496633c8ee1e416f7eb8ddfefb88"; - version = "0.5.9"; + sha512 = "37308fcbbe64d0a2802917ef5a589075f81086d63e08c71a9a1b648b73dd362e5bdc8f756084fde1f4b1964ba82a6dc06b2119460281b7949a271d82e6a47a7e"; + version = "1.0.236"; }; } @@ -999,8 +1010,8 @@ inherit repos; artifactId = "data.priority-map"; groupId = "org.clojure"; - sha512 = "450e18bddb3962aee3a110398dc3e9c25280202eb15df2f25de6c26e99982e8de5cf535fe609948d190e312a00fad3ffc0b3a78b514ef66369577a4185df0a77"; - version = "0.0.7"; + sha512 = "fb2d703468fb6d5f28c38f25e8e7acdaf02d2fa1ac23c14a9ff065873e88c9b74e155e73e5069436d674d7ef8547f01bc9777b7ae3b9dcde67cbd327d4a20c06"; + version = "1.0.0"; }; } @@ -1032,8 +1043,8 @@ inherit repos; artifactId = "core.cache"; groupId = "org.clojure"; - sha512 = "464c8503229dfcb5aa3c09cd74fa273ae82aff7a8f8daadb5c59a4224c7d675da4552ee9cb28d44627d5413c6f580e64df4dbfdde20d237599a46bb8f9a4bf6e"; - version = "0.6.5"; + sha512 = "6e4e126f23b20120c50a4dbefbe1b3b9bd98f0a7b8fa83affa267ff7f0de09542d2727243859a1ea346bda5b782d4ae0110f6c2b169c298261707a1fdadaedb0"; + version = "1.0.207"; }; } @@ -1049,24 +1060,13 @@ } { - name = "org.ow2.asm/asm-all"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "asm-all"; - groupId = "org.ow2.asm"; - sha512 = "462f31f8889c5ff07f1ce7bb1d5e9e73b7ec3c31741dc2b3da8d0b1a50df171e8e72289ff13d725e80ecbd9efa7e873b09870f5e8efb547f51f680d2339f290d"; - version = "4.2"; - }; - } - - { name = "org.clojure/core.async"; path = pkgs.fetchMavenArtifact { inherit repos; artifactId = "core.async"; groupId = "org.clojure"; - sha512 = "f80d61b51b5278c6c8b2b81ed45fa24ebaa42ade10e495fe34c5e1d827713eab33701a86dcc226a76e334365b0bd69d0c9da1e8b337f8752cd490145d3fc98b8"; - version = "0.4.500"; + sha512 = "7c8640769a68256f5cf131ed2436713c3c63bba2c4167f3593a1671ef65931d67b9b43eccfa6e5a20467ca7c6f5efd9cbf58d6c14e035757714f71220a754d0b"; + version = "1.3.618"; }; } @@ -1076,8 +1076,8 @@ inherit repos; artifactId = "jackson-dataformat-smile"; groupId = "com.fasterxml.jackson.dataformat"; - sha512 = "bc0b293687b9aa6641a6983d4c09d901294010fd0710c8163b0b283f06d044cfd2d7cebdb2590b170fefdde4751406b704955f59312af27d0e1f12f0d6c81ed8"; - version = "2.9.6"; + sha512 = "8998346f7039df868f3387d219efa0c04fc022a948d098296f3d7ac3f7a9a82bde6ec4a8f83b11994ad50318b5aca37781faacb1f20a65ba2ecc6d6d6eb9468e"; + version = "2.10.2"; }; } diff --git a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix index 9ebb4257784b2..7ede04427b5bd 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix @@ -4,20 +4,18 @@ with python3Packages; buildPythonPackage rec { pname = "octave-kernel"; - version = "0.32.0"; + version = "0.34.2"; src = fetchPypi { pname = "octave_kernel"; inherit version; - sha256 = "0dfbxfcf3bz4jswnpkibnjwlkgy0y4j563nrhaqxv3nfa65bksif"; + sha256 = "sha256-5ki2lekfK7frPsmPBIzYQOfANCUY9x+F2ZRAQSdPTxo="; }; propagatedBuildInputs = [ metakernel ipykernel ]; - # Tests require jupyter_kernel_test to run, but it hasn't seen a - # release since 2017 and seems slightly abandoned. - # Doing fetchPypi on it doesn't work, even though it exists here: - # https://pypi.org/project/jupyter_kernel_test/. + # Tests fail because the kernel appears to be halting or failing to launch + # There appears to be a similar problem with metakernel's tests doCheck = false; meta = with lib; { diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix new file mode 100644 index 0000000000000..2d00d6e1fc2e7 --- /dev/null +++ b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix @@ -0,0 +1,22 @@ +{ callPackage +, wolfram-engine +}: + +# To test: +# $(nix-build -E 'with import ./. {}; jupyter.override { definitions = { wolfram = wolfram-for-jupyter-kernel.definition; }; }')/bin/jupyter-notebook +let kernel = callPackage ./kernel.nix {}; +in { + definition = { + displayName = "Wolfram Language ${wolfram-engine.version}"; + argv = [ + "${wolfram-engine}/bin/wolfram" + "-script" + "${kernel}/share/Wolfram/WolframLanguageForJupyter/Resources/KernelForWolframLanguageForJupyter.wl" + "{connection_file}" + "ScriptInstall" # suppresses prompt + ]; + language = "Wolfram Language"; + logo32 = "${wolfram-engine}/share/icons/hicolor/32x32/apps/wolfram-wolframlanguage.png"; + logo64 = "${wolfram-engine}/share/icons/hicolor/64x64/apps/wolfram-wolframlanguage.png"; + }; +} diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix b/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix new file mode 100644 index 0000000000000..65b02bac59b8d --- /dev/null +++ b/pkgs/applications/editors/jupyter-kernels/wolfram/kernel.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "wolfram-for-jupyter-kernel"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "WolframResearch"; + repo = "WolframLanguageForJupyter"; + rev = "v${version}"; + sha256 = "19d9dvr0bv7iy0x8mk4f576ha7z7h7id39nyrggwf9cp7gymxf47"; + }; + + dontConfigure = true; + + installPhase = '' + patchShebangs ./configure-jupyter.wls + mkdir -p $out/share/Wolfram + cp -r {WolframLanguageForJupyter,images,extras,LICENSE} $out/share/Wolfram + ''; + + # no tests + doCheck = false; + + meta = with lib; { + description = "A Jupyter kernel for Wolfram Language."; + homepage = "https://github.com/WolframResearch/WolframLanguageForJupyter"; + license = licenses.mit; + maintainers = with maintainers; [ fbeffa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index 2653806a14f34..49c3d5559aa4a 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -17,22 +17,27 @@ , vulkan-loader , copyDesktopItems , makeDesktopItem +, openssl +, libobjc +, Security +, CoreServices +, ApplicationServices +, Carbon +, AppKit }: rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "0.0.10"; + version = "0.1.0"; src = fetchFromGitHub { owner = "lapce"; repo = pname; rev = "v${version}"; - sha256 = "tOVFm4DFQurFU4DtpPwxXQLbTGCZnrV1FfYKtvkRxRE="; + sha256 = "sha256-KSumy7M7VNUib4CZ0ikBboEFMzDQt4xW+aUFHOi+0pA="; }; - cargoPatches = [ ./fix-version.patch ]; - - cargoSha256 = "BwB3KgmI5XnZ5uHv6f+kGKBzpyxPWcoKvF7qw90eorI="; + cargoSha256 = "sha256-7SVTcH9/Ilq8HcpJJI0KFiQA076lR2CAIBwmTVgmnjE="; nativeBuildInputs = [ cmake @@ -42,7 +47,12 @@ rustPlatform.buildRustPackage rec { copyDesktopItems ]; + # Get openssl-sys to use pkg-config + OPENSSL_NO_VENDOR = 1; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isLinux [ freetype fontconfig libxkbcommon @@ -52,10 +62,17 @@ rustPlatform.buildRustPackage rec { libXrandr libXi vulkan-loader + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + Security + CoreServices + ApplicationServices + Carbon + AppKit ]; # Add missing vulkan dependency to rpath - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' patchelf --add-needed ${vulkan-loader}/lib/libvulkan.so.1 $out/bin/lapce ''; @@ -78,6 +95,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/lapce/lapce"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ elliot ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/editors/lapce/fix-version.patch b/pkgs/applications/editors/lapce/fix-version.patch deleted file mode 100644 index 2a8d96be1696f..0000000000000 --- a/pkgs/applications/editors/lapce/fix-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index bc9a0f8..45a74ad 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2165,7 +2165,7 @@ dependencies = [ - - [[package]] - name = "lapce" --version = "0.0.9" -+version = "0.0.10" - dependencies = [ - "lapce-core", - "lapce-proxy", -@@ -2173,7 +2173,7 @@ dependencies = [ - - [[package]] - name = "lapce-core" --version = "0.0.9" -+version = "0.0.10" - dependencies = [ - "Inflector", - "alacritty_terminal 0.15.0", -@@ -2233,7 +2233,7 @@ dependencies = [ - - [[package]] - name = "lapce-proxy" --version = "0.0.9" -+version = "0.0.10" - dependencies = [ - "alacritty_terminal 0.16.0-rc2", - "anyhow", diff --git a/pkgs/applications/editors/lifeograph/default.nix b/pkgs/applications/editors/lifeograph/default.nix index b998b02f50da8..0a999bf993f6f 100644 --- a/pkgs/applications/editors/lifeograph/default.nix +++ b/pkgs/applications/editors/lifeograph/default.nix @@ -1,21 +1,21 @@ { stdenv, lib, fetchgit, pkg-config, meson, ninja -, enchant, gtkmm3, libchamplain, libgcrypt }: +, enchant, gtkmm3, libchamplain, libgcrypt, shared-mime-info }: stdenv.mkDerivation rec { pname = "lifeograph"; - version = "2.0.2"; + version = "2.0.3"; src = fetchgit { url = "https://git.launchpad.net/lifeograph"; - # Specific commit hash related to version - rev = "d635bbb30011c0d33c33643e6fa5c006f98ed7d6"; - sha256 = "0j9wn5bj7cbfnmyyx7ikx961sksv50agnb53prymldbsq43rfgnq"; + rev = "v${version}"; + sha256 = "sha256-RotbTdTtpwXmo+UKOyp93IAC6CCstv++KtnX2doN+nM="; }; nativeBuildInputs = [ meson ninja pkg-config + shared-mime-info # for update-mime-database ]; buildInputs = [ diff --git a/pkgs/applications/editors/maui-nota/default.nix b/pkgs/applications/editors/maui-nota/default.nix new file mode 100644 index 0000000000000..9664aab2b2c7e --- /dev/null +++ b/pkgs/applications/editors/maui-nota/default.nix @@ -0,0 +1,56 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, applet-window-buttons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, mauikit-filebrowsing +, mauikit-texteditor +, qtmultimedia +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "nota"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "nota"; + rev = "v${version}"; + sha256 = "sha256-Sgpm5njhQDe9ohAVFcN5iPNC6v9+QZnGRPYxuLvUno8="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + applet-window-buttons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + mauikit-filebrowsing + mauikit-texteditor + qtmultimedia + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Multi-platform text editor"; + homepage = "https://invent.kde.org/maui/nota"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index c6f014238ea71..8545be13e3b91 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-qnb0yB/NNJV257dsLmP84brajoRG03U+Ja1ACYbBvbE="; }; + postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace configure --replace "./conftest" "echo" + ''; + enableParallelBuilding = true; makeFlags = [ "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ]; diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/applications/editors/mle/default.nix index d57e4d36b4e38..55249dde579b6 100644 --- a/pkgs/applications/editors/mle/default.nix +++ b/pkgs/applications/editors/mle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, termbox, pcre, uthash, lua5_3 }: +{ lib, stdenv, fetchFromGitHub, termbox, pcre, uthash, lua5_3, makeWrapper, installShellFiles }: stdenv.mkDerivation rec { pname = "mle"; @@ -18,12 +18,22 @@ stdenv.mkDerivation rec { patchShebangs tests/* ''; + nativeBuildInputs = [ makeWrapper installShellFiles ]; + buildInputs = [ termbox pcre uthash lua5_3 ]; doCheck = true; installFlags = [ "prefix=${placeholder "out"}" ]; + postInstall = '' + installManPage mle.1 + ''; + + postFixup = lib.optionalString stdenv.isDarwin '' + wrapProgram $out/bin/mle --prefix DYLD_LIBRARY_PATH : ${termbox}/lib + ''; + meta = with lib; { description = "Small, flexible terminal-based text editor"; homepage = "https://github.com/adsr/mle"; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 658c18e5cb5c4..20b18814cb755 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "6.2"; + version = "6.3"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "K8oYBL6taq9K15H3VuR0m7Ve2GDuwQWpf7qGS8anfLM="; + sha256 = "61MtpJhWcnMLUA9oXbqriFpGbQj7v3QVgyuVgF5vhoc="; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; @@ -41,9 +41,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - tests = { - expect = callPackage ./test-with-expect.nix {}; - }; + tests = { expect = callPackage ./test-with-expect.nix { }; }; updateScript = writeScript "update.sh" '' #!${stdenv.shell} diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index e06096933c975..b4858b21eeedb 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-0XCW047WopPr3pRTy9rF3Ff6MvNRHT4FletzOERD41A="; + sha256 = "sha256-eYYaHpfSaYYrLkcD81Y4rsAMYDP1IJ7fLJJepkACkA8="; }; patches = [ diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 2c0a50bfed6b9..9cb786989efb8 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -25,16 +25,16 @@ }: rustPlatform.buildRustPackage rec { pname = "neovide"; - version = "unstable-2022-02-04"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Kethku"; repo = "neovide"; - rev = "92bc1725f1733547eb0ae25b740425f03f358c2a"; - sha256 = "sha256-bKTteaj6gddp0NuV5Y0pfHotezU9Hmb136xOC9zkJ/M="; + rev = version; + sha256 = "sha256-pbniOWjEw1Z+PoXqbbFOUkW5Ii1UDOMoZpAvVF1uNEg="; }; - cargoSha256 = "sha256-TaZN49ou6bf1vW0mEsmaItp1c73d0M826MMrSGXpnGE="; + cargoSha256 = "sha256-7o7uJXH68pvfuiG1eSNmbPx8OO8QJjCe+oEFl38bFm4="; SKIA_SOURCE_DIR = let @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-F1DWLm7bdKnuCu5tMMekxSyaGq8gPRNtZwcRVXJxjZQ="; }; # The externals for skia are taken from skia/DEPS - externals = lib.mapAttrs (n: v: fetchgit v) (lib.importJSON ./skia-externals.json); + externals = lib.mapAttrs (n: fetchgit) (lib.importJSON ./skia-externals.json); in runCommand "source" {} ( '' @@ -128,7 +128,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Kethku/neovide"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ck3d ]; - platforms = platforms.unix; + platforms = platforms.linux; mainProgram = "neovide"; }; } diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index 7a1975c37c6b5..9a8aaeeb56c42 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.4.2) + msgpack (1.5.1) multi_json (1.15.0) - neovim (0.8.1) + neovim (0.9.0) msgpack (~> 1.1) multi_json (~> 1.0) diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index 60dcc8ba38323..1a4f517412fe4 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -4,17 +4,17 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; + sha256 = "sha256-fPWiGi0w4OFlMZOIf3gd21jyeYhg5t/VdLz7kK9fD8Q="; type = "gem"; }; - version = "1.4.2"; + version = "1.5.1"; }; multi_json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + sha256 = "sha256-H9BBOLbkqQAX6NG4BMA5AxOZhm/z+6u3girqNnx4YV0="; type = "gem"; }; version = "1.15.0"; @@ -25,9 +25,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lfrbi4r6lagn2q92lyivk2w22i2spw0jbdzxxlcfj2zhv2wnvvi"; + sha256 = "sha256-hRI43XGHGeqxMvpFjp0o79GGReiLXTkhwh5LYq6AQL4="; type = "gem"; }; - version = "0.8.1"; + version = "0.9.0"; }; } diff --git a/pkgs/applications/editors/oed/default.nix b/pkgs/applications/editors/oed/default.nix index 2281ca8c08b3d..a17199c2ff6aa 100644 --- a/pkgs/applications/editors/oed/default.nix +++ b/pkgs/applications/editors/oed/default.nix @@ -14,10 +14,20 @@ stdenv.mkDerivation rec { hash = "sha256-Z8B1RIFve3UPj+9G/WJX0BNc2ynG/qtoGfoesarYGz8="; }; + postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace configure --replace "./conftest" "echo" + ''; + + installPhase = '' + install -m755 -Dt $out/bin ed + install -m644 -Dt $out/share/man/man1 ed.1 + ''; + meta = with lib; { - homepage = "https://github.com/ibara/oed"; description = "Portable ed editor from OpenBSD"; + homepage = "https://github.com/ibara/oed"; license = with licenses; [ bsd2 ]; + mainProgram = "ed"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index c775a493f167b..aee98d9a612d9 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -26,6 +26,8 @@ mkDerivation rec { kcrash ]; + outputs = [ "out" "dev" ]; + meta = with lib; { license = licenses.gpl2; description = "A hex editor"; diff --git a/pkgs/applications/editors/oni2/common.nix b/pkgs/applications/editors/oni2/common.nix index e049c3ae64167..6cd4ddca4a184 100644 --- a/pkgs/applications/editors/oni2/common.nix +++ b/pkgs/applications/editors/oni2/common.nix @@ -95,7 +95,6 @@ in stdenv.mkDerivation (rec { clang makeWrapper nodePackages.esy - bash perl which nasm diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index dfcf8e4f787c2..65604926b8fda 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://pinegrow.com"; description = "UI Web Editor"; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; license = with licenses; [ unfreeRedistributable ]; maintainers = with maintainers; [ gador ]; }; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index eada77eea8433..8d4aa112cdb66 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -154,7 +154,7 @@ in hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); # These dicts contain identically-named dict files, so we only keep the # -large versions in case of clashes - largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries; + largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d.name) hunspellDictionaries; otherDicts = with lib; filter (d: !(hasAttr "dictFileName" d && elem d.dictFileName (map (d: d.dictFileName) largeDicts))) diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index ab0fef9be268e..4118aee8a2dd1 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "scite"; - version = "5.0.2"; + version = "5.2.2"; src = fetchurl { - url = "https://www.scintilla.org/scite502.tgz"; - sha256 = "00n2gr915f7kvp2250dzn6n0p6lhr6qdlm1m7y2xi6qrrky0bpan"; + url = "https://www.scintilla.org/scite522.tgz"; + sha256 = "1q46clclx8r0b8zbq2zi89sygszgqf9ra5l83r2fs0ghvjgh2cxd"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 3cfc37b36a032..cc1d08cc3f9b6 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.4.4"; + version = "0.4.7"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - hash = "sha256-y39u1eSX7vzcIJzoykU7Y7FTmeZnBW/IlvJLzKHfz8Y="; + hash = "sha256-IP56jOiiIK9EW4D5yEdLc49rUzcvegAX3Yyk2ERK/pE="; }; format = "other"; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 6e478693d4095..fa81414a7e72d 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -49,6 +49,7 @@ in appimageTools.wrapType2 rec { # fixup and install desktop file ${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \ --set-key Exec --set-value ${pname} standard-notes.desktop + mv usr/share/icons share rm usr/lib/* AppRun standard-notes.desktop .so* ''; diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 4c176bab057da..693362f95f688 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "texmaker"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2"; - sha256 = "sha256-UmiW8sGuVhEw7seq6BW53Nqejut3K2VB0NyUzpGnEEQ="; + sha256 = "0qczc2r01vhap11xmqizwbq21ggn4yjrxim8iqjxaq9w1rg2x9dz"; }; buildInputs = [ qtbase qtscript poppler zlib qtwebengine ]; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 4e7bfc2cff7d5..89896b9dd85ef 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "sha256-MZz8DQT1f6RU+euEED1bbg2MsaqC6+W3RoMk2qfIjr4="; + sha256 = "19z9dx8258qbjyzgskkg0xdn88mvx191y1sz4nk15yxsdyf2z3p8"; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/editors/thiefmd/default.nix b/pkgs/applications/editors/thiefmd/default.nix index 81222ff82f101..7f265aefcd02c 100644 --- a/pkgs/applications/editors/thiefmd/default.nix +++ b/pkgs/applications/editors/thiefmd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "thiefmd"; - version = "0.2.4"; + version = "0.2.5-stability"; src = fetchFromGitHub { owner = "kmwallio"; repo = "ThiefMD"; - rev = "v${version}-easypdf"; - sha256 = "sha256-YN17o6GtpulxhXs+XYZLY36g9S8ggR6URNLrjs5PEoI="; + rev = "v${version}"; + sha256 = "sha256-cUZ7NVGe4e9ZISo9gjWFuDNCyF3rsQtrDX+ureyqtwM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 13c5c49db482b..8c50586584955 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4350"; + version = "8.2.4816"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-+fCyLZi9+9r7tYoRQsVESkcoHHtM7vrVuOGdJi/9iF0="; + sha256 = "1lgqr3ki50hwkz4vhdyaryirrs99qq4kgkhmpx7ygvn6aj2wapg5"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index bc317b91597e4..d5dd00b4aa603 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -3,7 +3,7 @@ , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins -, makeWrapper, makeBinaryWrapper +, makeWrapper , wrapGAppsHook , runtimeShell @@ -133,9 +133,7 @@ in stdenv.mkDerivation rec { ++ lib.optional wrapPythonDrv makeWrapper ++ lib.optional nlsSupport gettext ++ lib.optional perlSupport perl - # Make the inner wrapper binary to avoid double wrapping issues with wrapPythonDrv - # (https://github.com/NixOS/nixpkgs/pull/164163) - ++ lib.optional (guiSupport == "gtk3") (wrapGAppsHook.override { makeWrapper = makeBinaryWrapper; }) + ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook ; buildInputs = [ diff --git a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index 3d36edb32325c..4773cfb9e43e4 100644 --- a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix @@ -1,15 +1,12 @@ { lib, stdenv , rtpPath , vim +, vimCommandCheckHook , vimGenDocHook +, neovimRequireCheckHook }: rec { - addRtp = path: attrs: derivation: - derivation // { rtp = "${derivation}"; } // { - overrideAttrs = f: buildVimPlugin (attrs // f attrs); - }; - buildVimPlugin = attrs@{ name ? "${attrs.pname}-${attrs.version}", namePrefix ? "vimplugin-", @@ -23,13 +20,14 @@ rec { addonInfo ? null, ... }: - addRtp "${rtpPath}/${path}" attrs (stdenv.mkDerivation (attrs // { + let drv = stdenv.mkDerivation (attrs // { name = namePrefix + name; # dont move the doc folder since vim expects it forceShare= [ "man" "info" ]; nativeBuildInputs = attrs.nativeBuildInputs or [] + ++ [ vimCommandCheckHook ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) vimGenDocHook; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; @@ -42,7 +40,10 @@ rec { runHook postInstall ''; - })); + }); + in drv.overrideAttrs(oa: { + rtp = "${drv}"; + }); buildVimPluginFrom2Nix = attrs: buildVimPlugin ({ # vim plugins may override this diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index 1e847e695403f..c6ef409d637b8 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -3,7 +3,8 @@ let - inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix vimGenDocHook; + inherit (vimUtils.override {inherit vim;}) + buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook; inherit (lib) extends; @@ -12,7 +13,10 @@ let toVimPlugin = drv: drv.overrideAttrs(oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ vimGenDocHook ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ + vimGenDocHook + vimCommandCheckHook + ]; passthru = (oldAttrs.passthru or {}) // { vimPlugin = true; }; @@ -21,6 +25,7 @@ let plugins = callPackage ./generated.nix { inherit buildVimPluginFrom2Nix; + inherit (vimUtils) buildNeovimPluginFrom2Nix; }; # TL;DR diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 59fe030b24121..4e35fd632b1f2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1,5 +1,5 @@ # This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit! -{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }: +{ lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }: final: prev: { @@ -53,12 +53,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-03-28"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "cb8f43b2f09f3d41e2821e458901666a82a61298"; - sha256 = "0h5r0r7hh4g7p874l7fajq30k4z3a88vm3db6583q611h9bwcfrf"; + rev = "ba1659dc1e3e38cd59d5bef19a51bdcf704abce5"; + sha256 = "1zqj4j3y970kpr29kp2lx6ggd49d03dv6hxffg58v8kc1v3ibf14"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -77,12 +77,12 @@ final: prev: FTerm-nvim = buildVimPluginFrom2Nix { pname = "FTerm.nvim"; - version = "2022-03-13"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "numToStr"; repo = "FTerm.nvim"; - rev = "233633a5f6fe8398187a4eba93eba0828ef3d5f3"; - sha256 = "0sxnii921xia4mrf67qz7ichi9xqr9zf193hb9dx199l7hl6k1p8"; + rev = "11ec9290389d22215df93e1c9c35f782c5ceec4a"; + sha256 = "16nli4nwsqn3zrc05m6w2h05ab423w8jjk81lys5kd609521wi0y"; }; meta.homepage = "https://github.com/numToStr/FTerm.nvim/"; }; @@ -149,12 +149,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-04-05"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "7292967624ba89e2c3ab2f374959d5a25d5c9d9f"; - sha256 = "0l2vnickmgcvnlqv13bcqgvpsygkbwzgc70bx253cfbnddqssbpj"; + rev = "f1da1ca2a4a71e79f4a625f62d8973de5cd2fab9"; + sha256 = "1jny8r8fs0z1gdcb75r3in7jp9gl9mwc4wvjslb8qp8yh1ja0ddv"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -173,12 +173,12 @@ final: prev: Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2022-03-28"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "6c50f278482dc5388743cb5c6eddb146059252f9"; - sha256 = "1qr2blrr6ihr1adld1cyc98b64s2s4y2876bmlbxg4q17y1zv3l6"; + rev = "0c57f67a34eff7fd20785861926b7fe6bd76e2c2"; + sha256 = "1f1fh5w2hsf16dcd0zz5x4d5ig089bgr7dial3ir82445g7whwsc"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -269,12 +269,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-04-03"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "6598caa4ca4f6fa28f975025bec411611abbcb4d"; - sha256 = "1p0w9i471gqknb8w89ifggsa4hdgdx5zm09mzypqq9344w68fsds"; + rev = "dc964c3caecd8f8fc477fc308187d47147b33d81"; + sha256 = "1z8g04d7hd4qxag2b9rqyzvxvg8xya98zsxyd2rll51n2hw22bk1"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -305,12 +305,12 @@ final: prev: SimpylFold = buildVimPluginFrom2Nix { pname = "SimpylFold"; - version = "2021-11-04"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "tmhedberg"; repo = "SimpylFold"; - rev = "b4a87e509c3d873238a39d1c85d0b97d6819f283"; - sha256 = "0ff5x7ay67wn9c0mi8sb6110i93zrf97c4whg0bd7pr2nmadpvk0"; + rev = "ff4c85197c5555715093c08a8d4f9d493c4d80cd"; + sha256 = "1ny3dicin979irwp8gv993005yxgzx1h5snihpa0na2p38mkdp25"; }; meta.homepage = "https://github.com/tmhedberg/SimpylFold/"; }; @@ -329,12 +329,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-04-05"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "77378e06df9c7ac4345fee932b9c1923a15e8ef9"; - sha256 = "1274xhabkhkla2qljsdby4klyr05hf5vpbrra6i08pm5jhzp5h90"; + rev = "48c57041f9b7ceeff3e3d476f4ddf2cfc8a9f321"; + sha256 = "0qfh948fykmbhvhlqs5zq1qglfl09wrnnrzssqfi8j8h64yqajnh"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-04-05"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "85c9bbb69f0cdf7949ace27030e4d130cb9ffca3"; - sha256 = "1lpl9f96m9vkz8lzpq68rvycapy29dbzfm0sdmpx6mccygdb6ds1"; + rev = "19e739139283c8ac5e2c147f870d2a038496688e"; + sha256 = "16h1kkyczqifw0d4lwfaq3smx5scsap1d2pv00kcmwvs56ws5sx9"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-04-05"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "cae550f07b608ab591f7fd37ffcab78a07caad8f"; - sha256 = "0dfhqbfarynnw6p3fq81k2wadinm1fz3z6c3as5kv1bn34y528rn"; + rev = "044a6c956bfb557ec6c6d37921db6ee11de879f9"; + sha256 = "1sz58bn0h65bkh29047ps8wm9fni0k9q2gmf69w7q5njlynk4ah9"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -546,12 +546,12 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2022-03-26"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "68ad878e7d7546b291ebff43fd53544b2f6de401"; - sha256 = "16jsvpfacks2nw4s7qk8qh1xf9jkg6hnvnryp4p2gi0s3x5rfsws"; + rev = "618c2115d5046cc04c8a4af7727ee4d90fc2061c"; + sha256 = "1pz021rk2y0ngprhhhavs7xxnzf5sa9002rgs2wxlf36czqlf75q"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -654,12 +654,12 @@ final: prev: asynctasks-vim = buildVimPluginFrom2Nix { pname = "asynctasks.vim"; - version = "2022-01-12"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "dfecf57c79ded5ead2911e32caff46d8cede8c5c"; - sha256 = "1w58y2ccgry47nhidqv4vg1wag7saphs2xad9wfpq65sj8vva3kk"; + rev = "9cdb34314d5066b40627c83829b9d04943c9c66d"; + sha256 = "1cjlnwgqyy95xq9nkzx7mp2iqwwd47yyp6y0mng8hrnhn4ixdfkw"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -678,12 +678,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2022-02-02"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "d11266046077968bbc3d6ac37d81e069618cdedd"; - sha256 = "1hdycb9rc7kpcppwv332hmrnzx5g2jy5r0ckaynahwwbwbjiyjqh"; + rev = "315831585d8de6c7787eb05c5bea56f430c851e1"; + sha256 = "19w3qmk6q1dj4jnwmvmd1af2bjwrfjmfnsrmjim9qmv6w0c2pbav"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -714,12 +714,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-03-15"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "ba1606202588a1d4cc68360d6ef9549f0fc464a1"; - sha256 = "029pwryrsc1hzxsc6jvin7vxx21rj2270kw2hqj0dj74qn8b8dg5"; + rev = "7c9477614fb95b103c277a98bf3f588e337cd7ac"; + sha256 = "1d502bfkr6qxrqr0jxwngj22cz4bh7v36kakpb9g4qbxdd3h1r30"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -738,12 +738,12 @@ final: prev: awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2022-01-17"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "9a28614941beec4539f82937d50df1a03bb70e0d"; - sha256 = "0fvb3r8176r030wnf1rvpd4dba8cz5506a3plp5j5h5gxpsyd27y"; + rev = "9f96bbdef5cb19daf58449f0fbb597af6fc4c2eb"; + sha256 = "1yqc0j2aq3aqyn924dn8d2pqxapn1w5wylgr1pc5mf0f7nl6qc94"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -762,12 +762,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-02-22"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "be65945626fb6bf6058cae61d5176d156f923c11"; - sha256 = "165ffjrwhhjdyssj96z4qn3fjys0dxwckpvjyzrpca2b2fag0cx2"; + rev = "9d024d646c3fa0281a5ddcf189e2a620010f43ff"; + sha256 = "05fh6992q7npnar82ijf67nf1c3rj6sxg2wk3ckb22qks2hxq8nd"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -870,36 +870,36 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2022-03-24"; + version = "2022-05-07"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "05f9b2831abc693996b335494337b88e616e9eed"; - sha256 = "09a5r51k8926v51ma45jfqqwwjnk52yy5ql9swmrxnvnrdsjah3p"; + rev = "93e71aabbc3d534d70bb5d1913778eb42afb96f9"; + sha256 = "0qzf6mmws0f1nmlk8m4pwfsbkkpq5nr024n9l2jvmchax63w1bds"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2022-03-21"; + version = "2022-05-03"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "a81eb31192e3033eccedb61c842e274252038a04"; - sha256 = "06b0mfmys2ah1hkyfipv0chv138mmdlixc2l0377zhq8409i3k3c"; + rev = "1be66e253730fd186a5a789a67a337420f431a71"; + sha256 = "1k3x04xvsmqbvmmcg7hlv3jnwpv9qgmdvwjz0620xmspfk43m09x"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-04-01"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "004cd5734fb21e39d48c1fb1469fa63e2797880b"; - sha256 = "1rr69n4mpkr6ky093fxabf3dcnngam3a01zl71ylvz27lv7gphqh"; + rev = "29d5789aa407e7105968c43dba566defd3ca96bd"; + sha256 = "0skrqpxszp2z2zv21vh2prxdyizps43qjyyy56rxs25cl6hrzb1j"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1038,36 +1038,36 @@ final: prev: cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2022-02-21"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "d66c4c2d376e5be99db68d2362cd94d250987525"; - sha256 = "0n9mqrf4rzj784zhshxr2wqyhm99d9mzalxqnik7srkghjvc9l4a"; + rev = "12463cfcd9b14052f9effccbf1d84caa7a2d57f0"; + sha256 = "11fbxw8rrhypazd256qwjvf8gg0laqb9b4h9yqdgvwj810y6n6wg"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; cmp-calc = buildVimPluginFrom2Nix { pname = "cmp-calc"; - version = "2021-10-11"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-calc"; - rev = "eb7bd1d7382ac26d8eb7346e36405c0ae94333a2"; - sha256 = "0b88fn4zb2sp4c9fnn9m8qb41djv17mmydhx6bryqnrc8mqycajy"; + rev = "f7efc20768603bd9f9ae0ed073b1c129f63eb312"; + sha256 = "0q5p5s46bh0h1w9p3yzwxd04hlbxg3s4liq42r697gqvna6sq0yg"; }; meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; - version = "2022-02-13"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "f4beb74e8e036f9532bedbcac0b93c7a55a0f8b0"; - sha256 = "0spc5vhrcz2ld1cxf9n27mhhfdwm0v89xbbyzbi9hshzfssndagh"; + rev = "c36ca4bc1dedb12b4ba6546b96c43896fd6e7252"; + sha256 = "04h6np207781l3wa36l6nqd56lx39s1kycf4jvclgfrr6ddnbv68"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -1110,12 +1110,12 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2022-01-15"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba"; - sha256 = "0kmaxxdxlp1s5w36khnw0sdrbv1lr3p5n9r90h6h7wv842n4mnca"; + rev = "e6b5feb2e6560b61f31c756fb9231a0d7b10c73d"; + sha256 = "0jzgd9g874w507y40fzggbm40n467g8br5xcmgf2mscdb9kcsgvc"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -1146,12 +1146,12 @@ final: prev: cmp-nvim-ultisnips = buildVimPluginFrom2Nix { pname = "cmp-nvim-ultisnips"; - version = "2022-03-19"; + version = "2022-04-22"; src = fetchFromGitHub { owner = "quangnguyen30192"; repo = "cmp-nvim-ultisnips"; - rev = "f90ebb220306e39766ad0ec1f094e4e12bb2fdd4"; - sha256 = "1pfa3fpjna1969a9ij40b4rmss413mzr5m27i2lhq21xw2f0fi6a"; + rev = "21f02b62deb409ce69928a23406076bd0043ddbc"; + sha256 = "0jil0i9g33i0h3ynng58qaam5k18sdlqdzrbyqgn4gjzchcxpfqv"; }; meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; }; @@ -1170,12 +1170,12 @@ final: prev: cmp-pandoc-references = buildVimPluginFrom2Nix { pname = "cmp-pandoc-references"; - version = "2022-02-16"; + version = "2022-04-20"; src = fetchFromGitHub { owner = "jc-doyle"; repo = "cmp-pandoc-references"; - rev = "13e6c080fb16836f52c7fc498eecaae51adb4d54"; - sha256 = "10pyzv4pdis05ap9jrz6wszxjha0m3bdjv6pd7xqm1hqahsyf4qs"; + rev = "2c808dff631a783ddd2c554c4c6033907589baf6"; + sha256 = "0knwxs6bg6r5hw2g668j34xr5yvqmcvcqyjfpnmpf5y5m82vahxw"; }; meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; }; @@ -1206,12 +1206,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-04-04"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "1c6e5c55f3a879354891c59cf27da733890bfc88"; - sha256 = "1hmif83kl2h4zz4xqkxb0xc003wzlirr26znx0r1f8z54f1j1hik"; + rev = "30629b30791b42dcaadc7680cc5cb078a7a3075f"; + sha256 = "1zs6dmaxx0af62v32c5l7cpywq2sd8fiw8j102mc4pn3s0vdcbgm"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1230,12 +1230,12 @@ final: prev: cmp-treesitter = buildVimPluginFrom2Nix { pname = "cmp-treesitter"; - version = "2021-12-02"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "a6b4c95ee922cace635b5a46c7fcc691d2559fbb"; - sha256 = "068x8n63iavycf5fsc5jf2p8i3cs697r60k54j7rm076bpbmnisa"; + rev = "c5187c31abd081ecef8b41e5eb476b7340442310"; + sha256 = "1jhzw7myrwqgybvkm53mk8zgfz56pzr7cnsrzcr4fl6wnm59a3b5"; }; meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; @@ -1266,12 +1266,12 @@ final: prev: cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2022-04-01"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "b10829736542e7cc9291e60bab134df1273165c9"; - sha256 = "1qygdas99m7py98rqxyza88lmk2as8yi9khjac603x6anxmq766l"; + rev = "a9de941bcbda508d0a45d28ae366bb3f08db2e36"; + sha256 = "0mh7gimav9p6cgv4j43l034dknz8szsnmrz49b2ra04yk9ihk1zj"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -1314,12 +1314,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-03-08"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "5581530535bc10c42f84c16665d79fbaf7d49806"; - sha256 = "1qf8gihw8bdn6253qly2d9d60ng95r20fy8v8l2vv5lfmzdaaz27"; + rev = "3601c8ddde380349764fc0bc016b915703c9ad86"; + sha256 = "1w9b4kicsa0r0fxcgcxq3wn0scyyyzfh3akp3zznli9g1fgbiqnx"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1374,24 +1374,36 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-04-05"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "1d85f511f9966b445b5200f35f8db8d4cc0af805"; - sha256 = "0yk9wghix3mh63p7w6hqk7crv4z6c2hi7ywdg6cnnkhnxviih7lp"; + rev = "a1edaee28938ce266c2543e2552bc6ee1ad29ffa"; + sha256 = "132jvk2wf53qbn2qgnr0zjh7nw05lr91p2jhykam77gxkmgzazpq"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; + coconut-vim = buildVimPluginFrom2Nix { + pname = "coconut.vim"; + version = "2017-10-10"; + src = fetchFromGitHub { + owner = "manicmaniac"; + repo = "coconut.vim"; + rev = "cea47739aab9f163d240d1609e7eea326fd55072"; + sha256 = "03rq3lpplgywvm620jzx085l74180163q8gls4gjrad2fgm9n96n"; + }; + meta.homepage = "https://github.com/manicmaniac/coconut.vim/"; + }; + codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2022-03-20"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "7d2604c8ef8bf2154e191746692477da39aed399"; - sha256 = "0na5nlzi9rz1gx1p98wksy6axmxkq4mmhxq3dzg0pv0m0137vi1g"; + rev = "4da94d813cfcd83434098a24a277d6be43f5bf50"; + sha256 = "0rr5i704bqw2w600jvgvxl35sx2gak2bbxz59wk7k7jyxrzbjam6"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -1435,12 +1447,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-04-03"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "0aaea32f27315e2a99ba4c12ab9def5cbb4842e4"; - sha256 = "17vs6k71x6j6gzs1xhsvsmwh2lvpvwgshi2axg9b6ad20wv2v4dr"; + rev = "40f5587789681b3453e4a27831b7d293e1c3da7b"; + sha256 = "1lbjqq3h6434gwzc0bmnz64xlkrkjc11nlya6kp4amb6ajj3bg9i"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1579,12 +1591,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-03-28"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "0c85b2ecce542ce8ee336bf01f433950cf51f31e"; - sha256 = "15nqxzf2q8iwkc3b09crd66cb38cnh2sv4q49vv9x6nkxar69hgc"; + rev = "842c81892648de759e639ad2d395757b98be06d5"; + sha256 = "1g67miifvysa4lbbvpa5bpxyw2fvjkq7anj6bqx65m81d4krlwr8"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1603,12 +1615,12 @@ final: prev: copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2022-02-15"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "47eb231463d3654de1a205c4e30567fbd006965d"; - sha256 = "06znz1869h7cdh9xc0b54mysslgpf3qdwsj5zvnzrzk6fnfin03q"; + rev = "df203c1356b72032df32d7b0b5facb4895139b6e"; + sha256 = "18v21b314p4firiz0xhqnfl45g5wbcigiqq4ypnhf1lgwd6ngpqd"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -1627,12 +1639,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-04-05"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "60df9082402acb1d9d258fb9f9763a085ca04952"; - sha256 = "0gv4h0imxbfgw0g3z6xwqk7iczcs1zq5jdvpbn20gwsizrfgk6ap"; + rev = "ca1c0df28b235bdce65ac87c0bed31da8f9e8be4"; + sha256 = "17g7qd44jx5l8903m2hk8ja4hl4n2x43b0wmzvlpgjmpvgvhskzm"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -1663,12 +1675,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-02-27"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "6f0837b598d9bf0a30bc30dff39114b2e0cb79f3"; - sha256 = "1vr3p2yqdhf9515y4203h5vjgrc8gnjk1yl9lb4d83ywbbpgcxi0"; + rev = "ce6da0ec93d8160e2bf1f0850bc3d0eec1a2e383"; + sha256 = "1yl0b3fx71axpn1n6dwpdijdq8zjdb028a1gfzzwa6b62ry1qc0q"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1735,36 +1747,36 @@ final: prev: ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp.vim"; - version = "2022-03-23"; + version = "2022-04-14"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "40ee62ef9b415da647618b08d1b28d19180a22eb"; - sha256 = "1f73gfbc59lx36xfdh2y6fcan2ia59m9vx1bjq32hj987iw2wxhy"; + rev = "3ce448c9687ae96dea0caf4da388ecd8d9072f72"; + sha256 = "1fgmj63844nydfqcxyxwmn528451dbh1s0y2fi38r10svwvddiil"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2022-01-25"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "42e6f57f2404b882cb7e491d50e525f8a8eb7f1f"; - sha256 = "1lla0ldgayryib0868zl10dz6yy9dxa0k86fxl5sr6y0csfpi23z"; + rev = "ceecea7895e469fc998d383818b2107d97cec06a"; + sha256 = "1h2glyi5zyskc9ld6gz8p3k84npfg2b1in5rjv3hhwg6d14d6xd8"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2021-04-17"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "ba98ab86487b8eda3b0934b5423759944b5f7ebd"; - sha256 = "1gyk0n8ks7xyjqab0gb7yx4ypl9k7csfjgmha84hy7mz4h08fkxq"; + rev = "3b31a80513969752a8c53ff8b16a8e060404cf50"; + sha256 = "0gcjyywjdsigq7a4jmcg8zgj6na5zagncdgp2a5qs81sa962k798"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -1795,12 +1807,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2022-03-01"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "6d97ad7fae49f7c00644dd96da64e14c3e23c835"; - sha256 = "0vyahlli5jg1a8m3dnln16n93jlzyimj0jx76dlbg7x906hkjd91"; + rev = "fd5f9416d6acc908660ccca0799109a9a4f0a2d2"; + sha256 = "0dwznzxpsj2xd0hvybg67h6j5kxbk8qsy60axbqx65da7a54yd3j"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1855,12 +1867,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2022-03-16"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "4ecffa4502a65f90397c2194ae308dac49194a65"; - sha256 = "1h23nmqpf5782r3fj945ck0dn0sa6vb0m03sbb4fzd707k6xwnl9"; + rev = "cb48ec3f1c119d68cf633757a236228e3d887bf1"; + sha256 = "0ckhcx6z1dqlvsaldy3961p3h4qvxgdqdp4i8xkqy4scjvaanvz0"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2133,48 +2145,48 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-04-05"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "71e972ecec34cc9b4917ccdacbbd29062ef9657c"; - sha256 = "0ksq9d0glhn4d4s0png3pbvf7a5rbv1xgna49fz81d5qy5ih0rsl"; + rev = "91e99ae14e9e6e360540007e6785146458a138da"; + sha256 = "1sghkg75y62rcc0jy7ra6rsmx05gxz4nv944i4lywn952vc49nd7"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; direnv-vim = buildVimPluginFrom2Nix { pname = "direnv.vim"; - version = "2022-03-04"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv.vim"; - rev = "451e3637a15af7d4a206ac761af7a2247f139e0e"; - sha256 = "0bynm225is7xkzkllx7d95cjarpxaj2yq1p0g2svgwxgqjhb6yhx"; + rev = "4c858b8cd8cbfac998534096e6ffb710d7a07358"; + sha256 = "1yjrjdwgsv6vi7mlabinxwfaizrd09jkg4w57gkch4xxw7sk6y23"; }; meta.homepage = "https://github.com/direnv/direnv.vim/"; }; doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2022-03-31"; + version = "2022-04-05"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "047caeccfe2052d5be42f0e26986c31bd2e0d5f0"; - sha256 = "0zbq3c25q03frav7scch5sghwa27swbamlrdnvkmiqw1qfk27r72"; + rev = "5aa443597811208f5d3afbdbe9d4ead79339de58"; + sha256 = "0jwm03fhwi9q57fgis31kgdf7l8jdb8glbh1is6rl9g0vb0a40ba"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-03-31"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "cad08fac5ed6d5e8384d8c0759268e2f6b89b217"; - sha256 = "0lc04cvq6iasg724zhpzp1j3bhwj4gphvqbzfh41ikzsy8d2jrpy"; + rev = "55e4ceae81d9169f46ea4452ce6e8c58cca00651"; + sha256 = "1i34pk9l76n8ianz9hww8kn7dnnzivv8sbyf0vf7w21r2bh1p1k4"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2193,12 +2205,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-04-04"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "ee4c9b797bce2d5fdcdb3904d2f3916d4ef3e615"; - sha256 = "123xp6hqjz3ys34dii8rbl6l9i5s2sbnjh80sax7d9l22jqcv1qf"; + rev = "93e92e161edfca2cef1534efb88e2aa2138834d9"; + sha256 = "0y24hdaqq9dsfy4di0pql1zj7a7jj48m44nm2a1g1dsra8k94jm2"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2279,12 +2291,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-04-04"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "1a2c447fc014e55b5347b85df090b67af6ed28a6"; - sha256 = "1cx5gm629r23prrn3j9awcmqi7zslzgk6aikws38x0mm9jlr3bxg"; + rev = "f748681a3fac2496aedf694f5bd09a30f80cd3c0"; + sha256 = "0w9gv52y806bn7az9yl2anx7yiv2ildslw4rvj82v5ni0b6mq4j5"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2339,12 +2351,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-03-24"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "290bea8e8a782586de32bb8d0bfb056ff8acdb9c"; - sha256 = "0sjg8hb6z9c7kscx26jkdxl31qy244w76iywy8xp7143kb9p0qx1"; + rev = "f63f17bc9b845dd4cca4112f243b551aea141ced"; + sha256 = "1l088yjqkjs8vfgc738qgbd8w72a4rni1bzk5wc9q2z8m1rzf7kr"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2363,36 +2375,36 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-03-28"; + version = "2022-04-14"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "53d8cf7cd96fcde4138ba1ad67971a594b4abbd4"; - sha256 = "1dicpzqmpxclrv3v48ipk79yfblhlva42kzrl8hxly95isq2kznp"; + rev = "ab237a1e9e9ff2ea28f2d5d0c945beefd1c07d5b"; + sha256 = "1ij2s7pb0lk532zdqg1j9anqagqhb9c8lmn17mabhrmi65a9dg6c"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2021-08-06"; + version = "2022-04-17"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "a513036f28d9ef1092d95ba7f183b3966a070194"; - sha256 = "117ifszvd2f6h86ialqnm10j14bhhcyn4pjl0289zsyf2fk4kksn"; + rev = "35757c7c9364d940efd8a46877acde04193819c2"; + sha256 = "0b8y7qailjg2366dw03pbfsr7lq9js8jzfcpw8ljyfim94fcj650"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-03-20"; + version = "2022-05-08"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "d47f2bbf7d984f69dc53bf2d37f9292e3e99ae8a"; - sha256 = "0nw05yzy1a9yq8jvjgzq1y2wbq1x8rski6brmz3pn4rdmpkzqvsd"; + rev = "99b306167d1d305ca084e3bb475d6eadf32a365b"; + sha256 = "0pxxsz0g2qklnl16pfbv0178fd34ff2vvx4qwndwkfgx4qmlkj8q"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2460,12 +2472,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-03-29"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "bec8a57d6e990a503e87eb71ae530cd2c1402e31"; - sha256 = "14llli9s5x58m7z4ay5b9d2pypq378h3i4062rasdqi5c5and07n"; + rev = "fb814e0e18a2ced247c40736d395d15a2517486e"; + sha256 = "19dav8ajydd4b9ziw6l4k9pn3dpc2z6zh1sb8a1hxcv02xfc71xg"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2484,12 +2496,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-03-27"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "e302658e765cf20e6af5a1be8cc07a996d6ee2cc"; - sha256 = "15s2k776wf4qs3w101q6dwip8abqhsxb1f7xnx41zq7j1r09i20r"; + rev = "4ef45d099453a26d23084a04ae7dced19e6d5ae5"; + sha256 = "0l3hkg97w26k01f4arifnnaws4m50b2phig2pq8kqr80rz5i0gk7"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2556,24 +2568,36 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-02-06"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "b02056f3c4b9d64d876bbf0a58d20791345a9364"; - sha256 = "16n78ylicrd7lh41g5hvd9vnnhkwbvj28c190k5zvrblyyhipn93"; + rev = "13fec018f619a14f0fcc90d1ff32f235d3344315"; + sha256 = "1wmmahy62dk04dplf96qh9aqfamjr3nm1fn3ky5lbw6ij8kgk5y8"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; + fzf-lua = buildVimPluginFrom2Nix { + pname = "fzf-lua"; + version = "2022-05-12"; + src = fetchFromGitHub { + owner = "ibhagwan"; + repo = "fzf-lua"; + rev = "de7ac64e742c21afae5dae93e8207408fde5042c"; + sha256 = "14hqkwsg4sgah0nyxd08iqzl8aycy6hgxn7wnyk0xdpr0nkhlm24"; + }; + meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; + }; + fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-03-07"; + version = "2022-04-07"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "b23e4bb8f853cb9641a609c5c8545751276958b0"; - sha256 = "02gz5j1pa8d7sgksjfikv8vf3gz41r6z33qwhiy9nvgnrwwmckwf"; + rev = "d5f1f8641b24c0fd5b10a299824362a2a1b20ae0"; + sha256 = "19yidjybsp41yj1yvdq5b01yph7sbd976bfq476hh7920ij6zqh2"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -2604,12 +2628,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2022-02-23"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "cf5f268f8b19262515105739bdcc112cd2a6cdbc"; - sha256 = "1pbvr1yirn17fxw8zlzp8j5brj0n2sdm3ampjryirdxknli93685"; + rev = "2b77af2d85b1bdc8d78f65f41d6673c240bbc7a1"; + sha256 = "1spdpyxlh53mwdazzaskwk3y2lb4im2by0l9qq1cz78nwmwm2m4h"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -2652,24 +2676,24 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-03-03"; + version = "2022-05-08"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "e60bfbc314476777a5ce200e533699691a5cdfa5"; - sha256 = "1nh54hfc0cvz3a9znrp32ialpbqqwlgbyw45m9b489g9kndf3y2k"; + rev = "8ab29dd555de8f1791a4d34f47f21c8a2fdae8be"; + sha256 = "1bknqk0xc85n9qc1mhg9w95yniyk0j9jq7pxc2wwdn5zrfig1vjw"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger.vim"; - version = "2021-11-13"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "2e67899355f3f631aad6845925e4c2c13546444d"; - sha256 = "0a6c04far9ji7h7k0b195zxn62sj6drn56cacmz86zmzksqgm8wp"; + rev = "6c0b55fb38d0e0633127823aab89b0676d13e509"; + sha256 = "1ghqc5kmwsh1f7sbc5xyssffgh5lxcf35686mg6zm9ly3k2z8azk"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -2710,14 +2734,14 @@ final: prev: meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; - gitsigns-nvim = buildVimPluginFrom2Nix { + gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-04-02"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "83ab3ca26ff5038f823060dfddda7a053e579b67"; - sha256 = "1hrzk6nr1w9747h0fn9h5cm1pgx1sw6njyf3pyr7p220gnh87vzp"; + rev = "ffd06e36f6067935d8cb9793905dd2e84e291310"; + sha256 = "00lm0685mwrm4c4r4vprb0ksmylnrlz8silghaqdg80zlhbn729v"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2748,24 +2772,24 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-03-10"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "64052ad16286281861de9281dc0695c80cc9ccc4"; - sha256 = "0ykd5ps6i7256w6yxvpjp6yia85ds9ln8icd29lzddf1qpza4rnr"; + rev = "da265c328f5e4f102dbdbb1a0fd8627afdaf0320"; + sha256 = "1pmj8rjhf80jrgxp8iim9i36qqc6jwx8c73z6nqs6nkmnccychih"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; golden-ratio = buildVimPluginFrom2Nix { pname = "golden-ratio"; - version = "2020-04-03"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "roman"; repo = "golden-ratio"; - rev = "8313b6d6723c9e77ef1d3760af2cdd244e8db043"; - sha256 = "03nm1wr0qsrirg4z4171f4nygnqgb6w06ldr6rbbz4a1f7j8j654"; + rev = "7df80253680e4755b82955425da31d8c1f8e23b6"; + sha256 = "0ds2slbg03b8dcgvi1svyn391mr2zaabb4x80wrmyxkrnfzr1rsq"; }; meta.homepage = "https://github.com/roman/golden-ratio/"; }; @@ -2844,24 +2868,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-04-04"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "5b98f2121ff3ece1e0b2ea037b86dd9ce0a346ad"; - sha256 = "0gp4dmrf33m6hpsnqqqv8ab8hflqgwdinr8c8w1k4qkipvg6xkpf"; + rev = "f943521890297076cdcd629182a0405f6b9a83f0"; + sha256 = "06x45ygxmqsgxrghvc4l6zdf1waxrwg3lk7m0lq4sh6nygdzhw1h"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-02-12"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "dc6bae93ded04ac542d429ff5cc87189dde44294"; - sha256 = "06mvdxi1pf9mw0zrk0cib3bi9p82ymdc3acm4r2rr4rqww8mrq4x"; + rev = "72930977a442a2de2592ed39168c018bef90e086"; + sha256 = "1k6rbn4ksmgi36f3zqlz52c99x3ilpjmv6q3y93j5kp2lxp1yz6r"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2892,12 +2916,12 @@ final: prev: harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2022-03-31"; + version = "2022-05-08"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "b6a363c037505c30a41042580729dc09e9bd00ed"; - sha256 = "0v917h34fha7ww2shrnwaqajp5f0s6qb9rbcmf4f504rpkfbnavl"; + rev = "d3d3d22b6207f46f8ca64946f4d781e975aec0fc"; + sha256 = "0vc14gg4ll4ghmvyqvzij9pkvm30sml61nhs7pbpw3qq5mfizb7z"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; @@ -2976,24 +3000,24 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-03-22"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "e2f978b50c2bd9ae2c6a4ebdf2222c0f299c85c3"; - sha256 = "1si2ibxidjn0l565vhr77949s16yjv46alq145b19h15amwgq3g2"; + rev = "b93ed4cea9c7df625d04e41cb15370b5c43cb578"; + sha256 = "12mc8fa3k5x9l84qw930bbjqi5hgc4y61s5p3kqx9nma2db2686v"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-03-23"; + version = "2022-04-24"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "72704e1914648774a4fb42f57ca411d689e08ae6"; - sha256 = "1dh6i2asqrhxc1irnhr46drn8ksj7xq81m6ankvy1gj8bkc74dmp"; + rev = "f481b30f1d93df6016092623199ddc8bfe1624d0"; + sha256 = "0zqz1m46bpj74l5vckvhaynbdq7vvi8vx1r1lrsjapb0blmfh0fj"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -3012,12 +3036,12 @@ final: prev: iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg.vim"; - version = "2021-12-28"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "105aceb0ccb45deb05bc3b1e5da956cd3e29869c"; - sha256 = "0vywngmgm818nca313viriz9csvm6fbi46ik1m037yzi8znfarxa"; + rev = "5ac9da61e8626d1218498a35e515f36387efe454"; + sha256 = "12vqa244zsg8gxc7rar5sfjcajrhprxpxazjmpmi4db25wvbmpsq"; }; meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; @@ -3084,24 +3108,24 @@ final: prev: incsearch-vim = buildVimPluginFrom2Nix { pname = "incsearch.vim"; - version = "2017-11-24"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "haya14busa"; repo = "incsearch.vim"; - rev = "25e2547fb0566460f5999024f7a0de7b3775201f"; - sha256 = "05v0d9b5sm4d1bvhb01jk6s7brlli2xc16hvzr6gik1nm1ks6ai1"; + rev = "c83de6d1ac31d173d7c3ffee0ad61dc643ee4f08"; + sha256 = "0vlj9hdy4d1p06mnxjpdz4mjqvbsgy5rp4l8k87wbs2b5x8008yj"; }; meta.homepage = "https://github.com/haya14busa/incsearch.vim/"; }; indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-03-28"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "9920ceb79bffd0e6b7064be63439e38da0741d03"; - sha256 = "15wqnd72j98w15i7dhzjdxbyxk766vcb844xdrvany3zwqn5p58x"; + rev = "8567ac8ccd19ee41a6ec55bf044884799fa3f56b"; + sha256 = "0gbdgn8031i4wgl5w2halaxjir39710n5cs8997cf3fhjj8zk5ss"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -3204,12 +3228,12 @@ final: prev: jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2022-01-30"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "32d05f7742dfb0ef84bee99e059ac3b7cb9526eb"; - sha256 = "19z9i07w3wgf939fiy6kh7mq5pvlay3w37sm0sv4bmrdi42p8b4z"; + rev = "e82d07faa17c3b3fe04b4fa6ab074e8e8601a596"; + sha256 = "1h5zdwfi584kgjh1mws240mgirf9ai0nrc0rx0zylvcdfk19l9v1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -3265,24 +3289,24 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2022-03-23"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "a2c96eda9d5b0dde03d2e22d0888e40426cd38dd"; - sha256 = "1x9f3gd4bgj3f1c75bp58mvaxll4rw55vznqckc0w0p1bcwq9faw"; + rev = "d743b99ff8321f4a80d21692bf536442d841bd55"; + sha256 = "07x3zayahbp2dm7lc5kvrpd0c4i8qivs1brbdv9b1rv9b45qx5nf"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-03-21"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "f5881a688b951cb35a7f36628b23ee4393d96daf"; - sha256 = "1h4m0mcgvpdxh6pzkg2k5am9g31w8xpq84rcpqchvql7yhyjv4g7"; + rev = "50e7b43552072696d26757aff5f6307e2ab5e3ea"; + sha256 = "051asspplaw9m1iqv78gfv8dzg3c96c1mhhv5swih4r3zcbylhhi"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -3349,24 +3373,24 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2022-03-06"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "ca8ea75e5a1d838635fd2fcc5c3467a5bb33c4ec"; - sha256 = "1h09yp9kmzbcraw88gdkzlv834p0yi5xacpmx4ksmp4yh4an6h5d"; + rev = "1f9f372b9fc137b8123d12a78c22a26c0fa78f0a"; + sha256 = "1s4bpi7i86246p28pjk99rv1qj1gp7l7zwfch0f23nwnggm8s6pm"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-04-04"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "ca6a46c5ecba9f8957948e26b71c226d738f1efa"; - sha256 = "0mxd9xgnfgal9dd56vchqhkg0hhw4jn6mrqm0b885j9krl78hbvq"; + rev = "725ff1f12e908001d2d42e9b06725cd8117e16f8"; + sha256 = "0i93k3izl9b8lsax7s1bz53jwkjsjh9iv2wgwk7bf9a6c34g9mq5"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3469,12 +3493,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2022-03-27"; + version = "2022-04-28"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "59b2c6b0ab5ad41ce42db89f05c8ea67020099ff"; - sha256 = "0laz118k20sm3bn6r81f8pg9n77k5038c0vhgpbj349k3zraygjq"; + rev = "fda87ff20e3b9c6a058cfbb6ca3c1f25877f4cab"; + sha256 = "0apd1fm59plqhnc65zs5ayx2sijlhbcsrci2s674nr4w4w5rhvsj"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -3505,24 +3529,24 @@ final: prev: lightline-vim = buildVimPluginFrom2Nix { pname = "lightline.vim"; - version = "2022-03-15"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "11931e2de42cb1a14887a002a874f0b2daf12bc2"; - sha256 = "1iyns1bm3wjr6z2hmc0p9j61vhprhax4f9qdqaf3w7vvgkhx1xj6"; + rev = "b02ef0d9f253dfc1cbb3f340b74998d7a4db0bf6"; + sha256 = "1rr5n23vvybfi3gbqljalqn0pnkwzzb4zqcz74jlz1dfyddsngah"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-04-04"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "cfde2b2fe0dafc5684780399961595357998f611"; - sha256 = "0zcippcfv87vcsbld0kka4mn2lixg0r6m2c82g9bssf304skfhfr"; + rev = "c5b93fc1d76a708cb698417326e04f4786a38d90"; + sha256 = "0lgk9i240mgzf7f3j3z93dkj00fi3rypn79zc60wqdyzhpg4r4lm"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3553,12 +3577,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-03-27"; + version = "2022-05-07"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "00c30733467be30a72311e08030bba34ceb4f6df"; - sha256 = "1psyvz4qb28mlkbxjs5xy6l4vhw9jyzc0j460xx2phiiz7raq852"; + rev = "4fc9dcaccb31301cb6ad938e1f40c211ab1115e2"; + sha256 = "08bn39smzdsh4whqk8icmf39fixnivw0bmvh9c90260mqj7329xr"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3589,12 +3613,12 @@ final: prev: litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-03-26"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "59259b0d0716b628a3e4f44098bd87ff54cf9cba"; - sha256 = "02awfwdzgcqsvs8p8a4m29c648phy6h5x1l49gklrmp8ymg2xgq3"; + rev = "91d403620dafeb30410aa0ed0cc416c9b67d3233"; + sha256 = "1v70qlnwc59agxasvshr5691k00lvahks469pxh0kb0m072ainri"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; @@ -3613,12 +3637,12 @@ final: prev: litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-02-28"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "c9fd775aebf702c81e2077693336584a0027d496"; - sha256 = "1zbxn3hzss41zwp0b1cwhh31zj0443xfpxjkchml9sq4f0hklkvd"; + rev = "273bc3389434ff041e65f6c10edbf470763f6a8f"; + sha256 = "1gy6an081phxkzaz0r548lq1idlxwmpgcgxj41jc7cliplfm8h4m"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -3684,48 +3708,48 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-03-05"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "e4f7dad45a1a3bb390977b4e69a528993bcefeac"; - sha256 = "0smxcvgyc575kmz9aw20k47awh5j11ywnc1lpq1hdgkppxm7lnm2"; + rev = "db324e2ada5bb795d0016ec0ef2b4ae7f11d8904"; + sha256 = "1swvj79h7bgdm0wmb3a2a730y4gic1aivj371q7k8acc1s824j7d"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; - version = "2022-02-05"; + version = "2022-04-18"; src = fetchFromGitHub { owner = "onsails"; - repo = "lspkind-nvim"; - rev = "93e98a0c900327ce7e9be1cbf24aebbe7170e375"; + repo = "lspkind.nvim"; + rev = "57e5b5dfbe991151b07d272a06e365a77cc3d0e7"; sha256 = "1c13ll09v16prhzgmv8pappck4x3ahhc5sizp6r61kb7k4mkfpfk"; }; - meta.homepage = "https://github.com/onsails/lspkind-nvim/"; + meta.homepage = "https://github.com/onsails/lspkind.nvim/"; }; lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2022-03-14"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "tami5"; repo = "lspsaga.nvim"; - rev = "5309d75bd90ce5b1708331df3af1e971fa83a2b9"; - sha256 = "0xvlpjv69wf18nw5hbmmgbhs8ws4gfq5ny2vrncqaxcikr3gdmms"; + rev = "8dde091a61ab07f639baaa82b456d3508d0aa7e8"; + sha256 = "15cimji9x53ki1rrxw2y7vj5g4lp4b91hxljcp9jn9qhkjb7kj47"; }; meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; lua-dev-nvim = buildVimPluginFrom2Nix { pname = "lua-dev.nvim"; - version = "2022-01-18"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "folke"; repo = "lua-dev.nvim"; - rev = "a0ee77789d9948adce64d98700cc90cecaef88d5"; - sha256 = "10hc5iyqicbwjchwfyk7dz2wph0hz7ikjanvga9ncjk62qm2154f"; + rev = "f5c31936fe06fcbeb59b98f69f74f9c2f91abaec"; + sha256 = "0vwpi3cg0gv17w3bm2vlzspsms1rn2yjrzkq2zvf2f4slqq3rfpw"; }; meta.homepage = "https://github.com/folke/lua-dev.nvim/"; }; @@ -3744,24 +3768,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-04-01"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "c8e5a69085e89c2bac6bd01c74fcb98f9ffa5cdc"; - sha256 = "0b2fwz1kxg0j8pgb1bzr82k916ii4k2vnbyz69w657v5mqmlpcbm"; + rev = "a4e4517ac32441dd92ba869944741f0b5f468531"; + sha256 = "18q935aicddai7j99ln61wz1di6lhwzs11x8fxgq704kfap1l2fj"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-04-05"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "69cb81cf7490666890545fef905d31a414edc15b"; - sha256 = "1dj86wljkhxri6k536ihds9v27wvs672rgmaj5i4migwxjlh6jb8"; + rev = "cc0086390c6cd2eaebae1834b115c891649ec95f"; + sha256 = "1kid880y097jl9ys2zs94fj66fq2dhbgjmd97blpdyhsa9m0mgnc"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3780,12 +3804,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2022-03-24"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "fa7694fe221ca595d6f8c4f1aab531b4c1d48d7b"; - sha256 = "14cs574nk0hr6mbf80gcjdarwbngbgj73s1grn6yczr2gqqqmhwk"; + rev = "0c4acf666eb23acb5ffbd7f29526d801560b696a"; + sha256 = "1khpmlf90yhlqaapk2vkqkwzdjwsrrl3hfb209k3wl25588m9fm8"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3816,12 +3840,12 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2022-04-03"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "chentau"; repo = "marks.nvim"; - rev = "8e80a20a170434bc77decc97bc4364c3ba848925"; - sha256 = "0bah5xjrwq43ihw37gw8nxsj3qdh9fjqs9n7fkfhsg6hyp1qy4fc"; + rev = "56cfa45f9c20373ed90bc4271eae17ee0d452bae"; + sha256 = "0qc452ikyrrx28by0awm9jggv05zcph95kygjya1085g9win87l4"; }; meta.homepage = "https://github.com/chentau/marks.nvim/"; }; @@ -3840,12 +3864,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-04-01"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "fc3e3d04f9646404dcbf3692e83ad0eecee8bfe8"; - sha256 = "0zqs3hn946gzcsm4qggakd45qnw5mvas1j6i71l8i55xabkgiffj"; + rev = "255033d6db241cec11d81ee46d81b56122e2000a"; + sha256 = "1zn32xkbn37mqi41rh6d0186rxkq7ry5m1j7f8iliyhvd5gj1a1s"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -3864,24 +3888,24 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-04-05"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "10b1fb8ead63309be01f48da78d7d83d0f2b041f"; - sha256 = "015ls360cwifh1jdzf6zxbqlc0dd0mgl029vs3brsn8h7b78rbv0"; + rev = "1764bcfb1450ddef4eb7118a3c16464caad44439"; + sha256 = "0bayg5y0i23pz6x798qyx90l1w6wmf83kgdz9akxn6s5m82v8z4y"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2022-01-31"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "c8ea2a5550b95b007631bc83908c48a3368eb57c"; - sha256 = "08amdbn4xcdl7d09w3iqgrlyfmqnxlwmnild9q5mpqh5z372y6i0"; + rev = "5d44fe7a3a5f7041c4220a71e8fe83d8c8498042"; + sha256 = "04rqv8c5g1fs8pymlf2fcbm09k64bvpiqmjilf59m843vkvgk1xf"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3912,12 +3936,12 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2022-03-22"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "e3f0718d53347e884f9f2282c35df0063ec6f9b1"; - sha256 = "13j611r2hzz2ldbvir89bxab4cicy5nrg9s780dsriz2g4slj5hg"; + rev = "d8e29b48f959aef96df2cb2ff5875ee02970f2a7"; + sha256 = "0rv2x96l5gcbj969ki6y1c0l468sibjcph5rqzavv6naizmwi8ql"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -4176,12 +4200,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2022-02-02"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "4b537fa01c28f2f7cf249722530561d2e477b49f"; - sha256 = "09lkbwijvl34ff2pagra383n517k1b1nw2lpjv2jlik0970sbcbv"; + rev = "3a913173dcbf7bac303cb5ede8b3a732b6a0a692"; + sha256 = "0wbp4f0gjc3vchyh8xyjcqyd3xlc4wf276r9lalmjd034792a77k"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -4212,24 +4236,24 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-03-23"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "bccf41d62e874fd614d83c8b0e942cdda6b98012"; - sha256 = "163pfqa33n1hzz3wb02ymisvl070lz1apcgyn349xbq4fz7ry3b9"; + rev = "409ebbba9f4b568ea87ab4f2de90a645cf5d000a"; + sha256 = "13vfy252wv88rbw61ap1vg1x5br28d7rwbf19r28ajvg2xkvw816"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-03-21"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "9987421e0724ce704d0035f50a7080c677a85d71"; - sha256 = "14sbbih38494ybhs5khsd07rq0136gdacjchfz8bx3sq05l0blmf"; + rev = "84d1eefe9d5af41cc3e5de02f2c9a263d5302781"; + sha256 = "03zrwgk0z534qzbzrf2s3bdk3kcjyrxjhr3xp0qsx7nlpx5ackby"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4284,12 +4308,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-04-02"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "aec45ca94975c0072516523fec32d69044db36b6"; - sha256 = "1g1kyhwqdxbshbfqzrwzav9afkl7psys8w5i2h4gkn8dda1h59g6"; + rev = "509947a6587a83aa755914eb95be605864bb108d"; + sha256 = "0qhq61kl3y282dm06z7kyzda5qpj9nk3mpvz5asc46vfvw98ijyh"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4332,24 +4356,24 @@ final: prev: neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2022-01-20"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "533d311a2a9187294ea52acab32d8565d6517059"; - sha256 = "04k62g72bf2i7jndngp68ci9i4bldk8q3h6yk8lpyqsqkgn9q4k6"; + rev = "05ea81b6424c1576f304bc88c33d5a1f8867b8e9"; + sha256 = "0v6jwrfmlr3hnczgiygxx99289w9g8jf3nzr0qg2qsc19239glqq"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-02-05"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "88bee216a0b1429d6301faa733712da84cf0e650"; - sha256 = "069y6ji6xnanzy3ad70lcgn5g3p2nxr62qn08fdhdrq6a75iz3ys"; + rev = "bb0793b661acec468c472f20eb28dbe855428793"; + sha256 = "0nrky5mlh79xzgdbwibrs43yw317gaavhq0p7pfpxsxdxhfjw416"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -4464,12 +4488,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-04-05"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "0670b85c5322da682498be9f355e050507fa6622"; - sha256 = "11gzi6kx1f57a6b5w7rqjwh0qah757g9814fw7qv76wc9cwbki1v"; + rev = "63a8eb64e8559e4c910e91025a2959c4b50b8c54"; + sha256 = "1kiryppcg1ng8n5m3b5qyzzw5vnisgpb1n6yw961yddxdzc8hcr4"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4524,60 +4548,60 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-02-17"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "1fdad275596f85bdc36c525b14697ff3a4f08bdf"; - sha256 = "1pq32gnpmkyqaxq0j5bqf6ik9vkrf2zkayvcvb6fv4vxaiv7w7hr"; + rev = "fb2c13625c711d3ab9303c0d9881437b5b280ba5"; + sha256 = "1pd8wsjp6jg2a8bvwn593sd9wf2czaxaq05xlgjzfwgc9k30mjig"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-03-13"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "612f7db0b904d11eeddd41474e71e4bf67acc453"; - sha256 = "000s48f80gpwsqfgxcsafifd10ii99w8kw237i9afa2msrk9w1fs"; + rev = "fd9bfa20eb7513ac95fc49952949ae1ee3e0956a"; + sha256 = "0isxr0a8v7rfcv7cgyz1g9q9m7z9a2ng3bsw4cfq8x3xzhhgka7l"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; nterm-nvim = buildVimPluginFrom2Nix { pname = "nterm.nvim"; - version = "2021-11-10"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "jlesquembre"; repo = "nterm.nvim"; - rev = "14d16c83aa1d165724f7780f470c4dcde5addcb6"; - sha256 = "0y883fpjfk7lki8nfscxhfw0wr7xm1d22zgf52zqmc9pjznjz9my"; + rev = "cd7b7035d09144ee4ea49244bf5cb8ed68e499f8"; + sha256 = "0cvg03d1z7jkamg062ng731pdmckrdm611q24brr9ha1qc5q26gm"; }; meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-03-08"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "513ff9bbdde7da53e209232d4328e734ea2bd96a"; - sha256 = "08r2ifkj9zj8c771ahl2i0b8crp3cw2cdshkpq26ci14ypdq0304"; + rev = "abdbfab89f307151db83b1a5147cd390ef27ff99"; + sha256 = "0z49sfnsr7hmfr4vrd82f1m6kvswfqq31n4fsdmjy9h4qmjb0w5f"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-04-05"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "f3107c3b211d62f53d34cbf0ca100fc948bc42d4"; - sha256 = "07x55chr28f9azqgjjwv0dnn9l0gm0n4z1wdf6libikbnh9jm522"; + rev = "dcad76eb1abb80cf3a27208823becbf62547abf8"; + sha256 = "1xsgmz1gzrz313whjm2ivc7px7xkcdqqi9gn466d5yyshzqvx3jq"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4620,36 +4644,36 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-04-02"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "06535b1f1aefc98df464d180efa693bb696736c4"; - sha256 = "12ii6vap3s2c58fmr01r900cidifr50pdpbl2ssx78w26qvc7qz4"; + rev = "aea913109d30c87df329ec9b8fea9aed6ef9f52a"; + sha256 = "0jhw4m552vfxilmn5cp67a9xz1w8jd6ixijyl2bsvp1j56qklfi6"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2022-03-28"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "f3c8eaa6c8c0dcd752aa28042f9435c464349776"; - sha256 = "18xlhyyg9yq54p6jnq4dri47zfw62xfnx4ci9j9iiiii1dyzwr2z"; + rev = "70fe3102158b2765d5bba46f398bd4213997936f"; + sha256 = "0p53l747hnjrz7wzcyh08vnx3pfdk5gbqmb9vpf4hq2x3lyx1a57"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-04-03"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "d67a9b5173806e3f2297ee42b298d1345acb9c24"; - sha256 = "1g6jvlx78s4a56p0nxg5z3s2g06snnsyq3bllvqf48qy2s43g286"; + rev = "3d174ca8198bafb3eb341001aafcf74ed4290d70"; + sha256 = "0i5pmk13rkk74bx1a19fz32gsg1f47s8550pqz51ma8h0yyc9cpk"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4680,12 +4704,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-04-01"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "7dbe34e36d9de4912a5f3aa5279540445765814c"; - sha256 = "0v5z1m7n6q183l9a6pajfqbg6n2cxdkcpx7xmalyh99x9ax0pazf"; + rev = "9a0c639ac2324e6e9ecc54dc22b1d32bb6c42ab9"; + sha256 = "06pza2xc5fzmsdz945mascmjd43k48agfq15ds91km8scpvpsx77"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4752,48 +4776,48 @@ final: prev: nvim-cursorline = buildVimPluginFrom2Nix { pname = "nvim-cursorline"; - version = "2022-01-22"; + version = "2022-04-15"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-cursorline"; - rev = "88232dd52f186e3bff9aa594aa9c3a062f400642"; - sha256 = "1lgcfwkc3kq9jyh7r19v6rpmbflq2nplg46kvb79l07212pz64s0"; + rev = "804f0023692653b2b2368462d67d2a87056947f9"; + sha256 = "1zqbykfi4mjp07y8c1kir4lxgvcaxqy9jkn558y3n1jakpk3l72j"; }; meta.homepage = "https://github.com/yamatsum/nvim-cursorline/"; }; nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-04-02"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c20c78d7c6c82f16a2d1abec31f4273194e3987b"; - sha256 = "16vlsydx950s6v1nzpw0h38vmykcp9f3wsaxg09sjvc2isgd4f8b"; + rev = "2249fcfd09cdc27c08e9d2f3be5268ba81db3378"; + sha256 = "0v0gz77dqyd485f9d43q101zcxnsyc13n9bl572xcrshdn6czncs"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-03-29"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "33f33dfced1d7d98e2b934bd663175a062d8db39"; - sha256 = "00achlynnv1qhs0vqp0q40pzx95bxf9cgsgrpwg6p3fwb2f4ssdi"; + rev = "e5c32746aa72e39267803fdf6934d79541d39f42"; + sha256 = "06igsddmjd27wj880vq9l9qq38x438ybrjvizn8dz98paypa6b1d"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2022-02-19"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "7f82fec9a1c7fce292c9a9a7310e7d121607db93"; - sha256 = "1x9y74nvcvbwakvlzz4k7h1azkldphmdygwgs5cz7qf9pxbx67lq"; + rev = "9b731b9748d243b60e61eecbe2d114c39554486e"; + sha256 = "14a66zdys50ifhfz4vls7b6grg69iwndailxdcamal7xafvy1dw9"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -4836,36 +4860,36 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-12-09"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "c2a0d076383b8a0991681c33efe80bcba6dd3608"; - sha256 = "19yc51bhfaw53rc9awdr145i8k2i2gnnl3faw85afsqs9dr4hi7i"; + rev = "9c630705829fbe8c21a9379ae2be948560189d80"; + sha256 = "1cdc2r12k1nma37vicshy4kbk79ap8qj040rscxzl41z96ff8v0b"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-03-29"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "9f2adbce23a383243458f41654c07e57dc1b7635"; - sha256 = "1gwq7qrbcmh4nqdgl4pv83b8x5wxaks4vxgq3yryjj6n4x5b56fw"; + rev = "9552418fcbb9587025f4bd38364259b3888f582b"; + sha256 = "0n2393lb5aad2g7lkgihhg4x9sm35500fb8hds2s23nj0cv0jcj4"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-03-07"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "925167117f5de9702781af9e43a9d86318a20329"; - sha256 = "1a87ry1rl86xbqhd76bgqxxavq7qmsh9ds2crmlgd9f3wgsk4bxn"; + rev = "1838e0a8418dfc87bc35ecb4a2bc594f032fda06"; + sha256 = "10ipn3xw4vlfkms0vg28gvwycs3hxpssc1gmp6hfj9z9ips976x1"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -4896,12 +4920,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-03-25"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "dd1e8dc1daac110cd86dccc159007deac856a89b"; - sha256 = "1hzbn9v42z0m8s6fnf2r5navcshclsfpc88sasack5c1nvsvv43s"; + rev = "f582b5be2ae1fee2e5dc974cd9b979a1ab08cca6"; + sha256 = "0bfdp6xbq7qr7185m06ccfmln2gc24vc1215cxczm1bpyrh98ncq"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -4920,12 +4944,12 @@ final: prev: nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2022-02-24"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "29ca81408119ba809d1f922edc941868af97ee86"; - sha256 = "04c5wqh42648wzrnwcgwdmwwwqvwk5qn3ncrfjl0827xnpc8049g"; + rev = "407f05c71f757f09f775229d5709a3592f1a6910"; + sha256 = "1j3ksmq91fzmvnmvgkkrs6lp55wry2q7x6ixspm197jd0np8w9k9"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; @@ -4944,36 +4968,36 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-04-01"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "4040e71c86022cf7937bef5d483156c163df8ca1"; - sha256 = "0492x97bl0p9kn2fsb6p587m6lsbn4qgdg7k7sr7vrfi73xw4s3k"; + rev = "0407c340a77380e4122dc349efa10fc846c928b4"; + sha256 = "1cagndfqdk505q18iq4wgmwav3hh04vmgxj7h8924v9ffj8wr0wx"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2022-04-04"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "1826275ee0fc7fded65e8716b231db86a17080e3"; - sha256 = "129zjds8c69hahv307wnpdsjzfh29flsr99lkjma8dymsan96lb0"; + rev = "441385952278a1df5c91ba0d33e72c148d4654d3"; + sha256 = "199nf01hjxdalc76xhr306xyisvydjwqhhw40nx1krq9k3xy4z39"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-03-28"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "3d1baa811b351078e5711be1a1158e33b074be9e"; - sha256 = "0470h3vaw6zmmayfd9rzlh5myzmdc2wa5qlfmax21k0jna62zzr1"; + rev = "9ff2a06cebd4c8c3af5259d713959ab310125bec"; + sha256 = "1jsrbimif11jvkdbb7kz6c9iykbql5kzx4q4p0njfdqmvkn4ybdb"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4992,24 +5016,24 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-04-04"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "6da18b24f1215f05c7c7edbf460c93cefb9b5688"; - sha256 = "1mv41ryxsx6wm909yby6z84xmhw3ibigw8zk34prhyvszz3psmvl"; + rev = "7c74065823e073749652749a7a89c78c81749acf"; + sha256 = "1rbmksw2ia8rvfjncvyy77bcx1zwpragw1k9fv7n50xhpjsgahvc"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-02-22"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "d859891e4bff9729ad6e63bd4aebc51946de8786"; - sha256 = "17dbvr1y7hzrv04c89b4nmgmgg0qccrkz6qsh7vsava0lvjs4zm5"; + rev = "5520ad7b24b0c4bc0b5371eef2492e787aa59a3a"; + sha256 = "050p667xqi15fddvyr2p11xpsr9sl2mapfi5x6g9ca4x1738jgsv"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -5028,12 +5052,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-03-20"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "da1030208347ad8937fdad1d4f8092b578e3ea2f"; - sha256 = "0myrcm6170ncff7ymdlaiahh9230yff794f4dc2lzwv5igkxxiha"; + rev = "d4a01eedeb2e6c3d453f3aa0f1b303dd8611dc71"; + sha256 = "0i0nikpin6fab7x72mzjsxsfgpyjnk4fhmw7il51i2igllxm5krs"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5052,36 +5076,36 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2022-04-04"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "0e463065dd2b213d9c6adb00c88000c1bdb5c633"; - sha256 = "1k47r446a850bxwb70n00w5wz835jgj7sg175nldp6brq4lrd1x5"; + rev = "696b56fec29bad6daadafdc067955cd6010933bc"; + sha256 = "1j9i36ww0krq3k01l2rzd6qc29kc6w5cnl2lvb4m24n3k5rakjd4"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; nvim-solarized-lua = buildVimPluginFrom2Nix { pname = "nvim-solarized-lua"; - version = "2022-01-22"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "ishan9299"; repo = "nvim-solarized-lua"; - rev = "995ae7e0baa4b5d42c094ffa7d6b3fe9459397c3"; - sha256 = "01dsbdlizckvw34hwzq7jkdhsv5008jzj9p140c177zv4qps2kll"; + rev = "a6af3a33cfe78c97f3adb2d86d3165bb25fb0ec3"; + sha256 = "1z7wi72dqrw0fgsnm0s7zmxb72cq564dqvvpl1cqgizf4ab2a42a"; }; meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2022-03-28"; + version = "2022-04-07"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "fbb03990539d5d484fe10de805772b4b86792c1a"; - sha256 = "1iw4gnsc72r5rj7z5g3jbxqcnfzzhi9r84zpik8pfjnx8r79ncnj"; + rev = "345e5dd57773e2b4b425a2515c831108b9808a0f"; + sha256 = "1lyqzzl1722hdx0cwry8659dbd679nilx5lb1w52ym3sixz4a9hy"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -5100,38 +5124,38 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-04-04"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "924aa290921426682f86495cf64f48fcdab3c2fd"; - sha256 = "01wn4vfk23ciyd69drh49jz67x254dn0q6k55akqc9pxlllds4pg"; + rev = "82ec79aac5557c05728d88195fb0d008cacbf565"; + sha256 = "1xxxapb093mljrw8yr7qm2nij7j0639pfpyc3pv9zgz6ivd4d6xc"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-04-05"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f083b7bbfe9480df00a45ab5a0978cb2586dddf2"; - sha256 = "0zhgkbzr2hnwy94zfg2mk9l364rcmw7z2bvhbbriywg5k7drpla8"; + rev = "f1373051e554cc4642cda719c8023e4e8508eb2d"; + sha256 = "1jfcjwyp57scwj164pxzh376mh2i4nx2sxx0gpihl3r4m067gb84"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-01-12"; + version = "2022-05-12"; src = fetchFromGitHub { - owner = "romgrk"; + owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "b7d7aba81683c1cd76141e090ff335bb55332cba"; - sha256 = "113vvcisnypfbbnw9l9jq0avsh95p286gay3vb60ykfxjfbxsw1q"; + rev = "a7916523e8107a57021cabae51917b7dae844aa6"; + sha256 = "0pqc31yp8prq5gkblasyyhf4cxi4gkqglp0jmvqmsax46r82ffz1"; }; - meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; + meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; nvim-treesitter-pyfold = buildVimPluginFrom2Nix { @@ -5160,60 +5184,60 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-03-29"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "c4b41e42dad700b23c6ea86ecb69c9deb55a8fbb"; - sha256 = "1l8fbn1rvyifvaplmyp38sf73payy1wlglnrb5xl4dxpcfd6yvzc"; + rev = "094e8ad3cc839e825f8dcc91352837653e365a8f"; + sha256 = "1i7d8yxqffv6rp6n66wqyb0bsrq916qlp88rn8bb92ykyxmjn8bz"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-autotag = buildVimPluginFrom2Nix { pname = "nvim-ts-autotag"; - version = "2022-03-04"; + version = "2022-04-22"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "57035b5814f343bc6110676c9ae2eacfcd5340c2"; - sha256 = "06fj3bpfakbzbb4saqa2dss0wz6z98farljv3xmih162qbybr2c1"; + rev = "044a05c4c51051326900a53ba98fddacd15fea22"; + sha256 = "0c94vnhl216p36x19cplhypr1b3z0f7l5jdr19hl79qvdfp9djk2"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2022-03-18"; + version = "2022-04-07"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "7810f1fe706092290dd338f40e5e857bac4a03cf"; - sha256 = "0hl3fivd0yn9g1di2545inz92szsqxq0svwhr8ymyg5sgx465rfc"; + rev = "88343753dbe81c227a1c1fd2c8d764afb8d36269"; + sha256 = "1qfgg9lzva7m3kbrxhhccf766by5n2sf456cdvadypr83sniq6ay"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-04-02"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "dee11b86ae2419e3f7484197c597a0e634a37a56"; - sha256 = "1rmv8lmxx4ji4lacgws3vfaaj8df2zbc3vs6sbj9mmzmfg3q38py"; + rev = "190f8c83abb29504877b91c84ed3ceb6009ad3bd"; + sha256 = "1kq54zd1yx6q1ch886jcvhhydbxz9frky9wl60q00q62zgds8vmz"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-03-22"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "09e62319974d7d7ec7e53b974724f7942470ef78"; - sha256 = "0f64alh5mf6zjnbxqsx21m3dcldqshx7a7z46qg0pfbnn9fx7swq"; + rev = "bdd43421437f2ef037e0dafeaaaa62b31d35ef2f"; + sha256 = "0sknns28ww7xwjyqylk4mxvs4sy8lsk52w5q81ldnwfcyiwl70c5"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -5244,24 +5268,24 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-03-01"; + version = "2022-04-19"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "3fa6223a21528f0f5528469f33f7f0e237ca9e8b"; - sha256 = "0j7m976iyw0rw7hry0sb86jc2vyrsmnpiyj7nn353hbkwazxi2lh"; + rev = "2407c8c304138e18c0ef42e4dbebb56a3813bbd5"; + sha256 = "1yk3qb3rblnqdif9cm5j3ndj3s7wn63z6av6m9pl5h6gvhwhcrk4"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-03-28"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "ebe8f689a9867c6ce57d748a80a2157b49764f13"; - sha256 = "0r07x8i7w9rk8n1zrdyvqr9pfjv3dihb2hy1100jl4xxc11g43an"; + rev = "ef38441a7149087366bfc05654e7cc21a83df60e"; + sha256 = "0chdbsixjw3l6bvqdhf2na2hdwm94lzb66mssafbhgpq328y97wk"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -5292,12 +5316,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-04-03"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "50d58b195ea1f1ac620d775f39c95fe524f051d1"; - sha256 = "0cmzb6cp8n8jwzjmv3h0ikv5gn3dn3aq8kgsnmrkqlafh19692rr"; + rev = "f5bd0c0336d6585a18b3ea95b4a40be068c74bbb"; + sha256 = "1cgkdrnk0yfrls5s4vjvkz0851c5877lmpnkh17nw1zn9rlds165"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5316,12 +5340,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-03-23"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "e520a0c81a5a1997ecffd846ccd9c6e63b7859c6"; - sha256 = "1xvh5mmjc4w4rkp8h1qwxfqz3kcrqvhxnl66x19j098d1h7aqsb6"; + rev = "08cde8acf181b3278dafb9c8284726104a11cc0f"; + sha256 = "01dxnf4pcycp70pzxyv5xd9y9289z14c110w926kwhy1skgwz7f4"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -5340,12 +5364,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-04-04"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "86d633963bfbd6ff5448589a20a41deb8c19f90e"; - sha256 = "0nrq65gd2arxg4r0sqh4y4ikaadlrsbgcz1zq7yfpfbb76cia26w"; + rev = "1f6e3bbb20f45648f5680606e5e5d5e881133f1f"; + sha256 = "05vhgrsn8fbmrzc5hn9k34qscvdvrq30rl61lgsw0wsn49685ck9"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5388,12 +5412,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-04-03"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "8e52714a1851bb3c781a744489c31bf8fb2c4e28"; - sha256 = "1h3rzab981y0yp7kfkjpgjlj03kf6lyxxg2wikbdbkyz1c2bbkvk"; + rev = "675e58f6c7a889871911a5dc3e08491fe7b6b8a8"; + sha256 = "02czyx7gpd85ns2rndx52f5a07iq2qqm2zvhvfnmmmfpz11s26w6"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -5436,12 +5460,12 @@ final: prev: papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2022-03-24"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "afde171829b1416125bf07a81fc28e4490aa91b2"; - sha256 = "1iz8aqmwbnfha2agcxy7cd2v0znz8vzpz7iyvd15hxx7zbqlwz1d"; + rev = "beb86c7630e19314f5990acef81f9823bbb5bf3c"; + sha256 = "14jf8fm1bjcmbw3mbr1a5731bac4i4mb8fv9ahdxd8i9349nyj3c"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -5520,24 +5544,24 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2022-03-30"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "7dbcd4d647010a80d135804b3fc1da3fb77083d6"; - sha256 = "0g7rqw2vm00rrbbnhc8b9hyljc7q8qc0lywg63lkj63ks9j4m8y7"; + rev = "71b00a3c665298e5155ad64a9020135808d4e3e8"; + sha256 = "0cn6q7885ffn0yxv6frjsa8yx6mnil8lmdvml8inj3lvakyprzc8"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; - plenary-nvim = buildVimPluginFrom2Nix { + plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-04-03"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "f9c65cd76ffa76a0818923c6bce5771687dfe64c"; - sha256 = "1kgi4q7n8m0hv6hn82bs8xhm8n34qmzcq4l8prki1127gfa2gpqj"; + rev = "0a907364b5cd6e3438e230df7add8b9bb5ef6fd3"; + sha256 = "07k4vlpa1cxg4sxhwg0412ws13djspga16d67lqs545j5pfkgzr0"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5556,12 +5580,12 @@ final: prev: popfix = buildVimPluginFrom2Nix { pname = "popfix"; - version = "2021-03-11"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "popfix"; - rev = "f3571e676739208871bd38f9fa0fddf554b6a7a8"; - sha256 = "19hvwxcqca8l6dvlaccfvqc8755bpr0z0hi7l9qiw6rm458bhchi"; + rev = "ea262861ce3905b90c2c203b74a7be2539f1aba4"; + sha256 = "082dppmfppzam9y2x7drmrdd704hh2j2lw84rrkh8033gpnrn341"; fetchSubmodules = true; }; meta.homepage = "https://github.com/RishabhRD/popfix/"; @@ -5617,12 +5641,12 @@ final: prev: project-nvim = buildVimPluginFrom2Nix { pname = "project.nvim"; - version = "2022-01-19"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "ahmedkhalf"; repo = "project.nvim"; - rev = "cef52b8da07648b750d7f1e8fb93f12cb9482988"; - sha256 = "1qwpp0a8llx437jms3ghx8wrc5rwnrkh52xp24ysymqr4lc1xfq6"; + rev = "612443b27f5feda45ea478bd6ddc8f95d4ec7b77"; + sha256 = "1iq16ikd057bg72l39yq3d645wylbdv5i5siqlhfbgdrwiqxqv3w"; }; meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; @@ -5678,12 +5702,12 @@ final: prev: pywal-nvim = buildVimPluginFrom2Nix { pname = "pywal.nvim"; - version = "2022-02-20"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "AlphaTechnolog"; repo = "pywal.nvim"; - rev = "bd58195939d31dd0f15a720fba2956e91598cefe"; - sha256 = "10fs5assp96rvlcxckd8cwnkfwfckjmf0j8cqq91vb2wx8knxc8g"; + rev = "475a9f0be1d111cfad2049245fd81448a51c124d"; + sha256 = "0by27995bkn21qiiyvw1danydagi4issfrah2zi5480qnwir6s7r"; }; meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/"; }; @@ -5810,24 +5834,24 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-03-23"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "93967110eb45d7234802c0c0e2ef909968e8461e"; - sha256 = "1mphqq650d3x0g2nl4pkgflp3hsi68agzj807r64x82p3266abzs"; + rev = "33ac6f3bcfe97447037ded20291d40de34d8912c"; + sha256 = "1m0bd72pjay9mlmf0lhii7yi4mch77dlqwadlsiyv9qw07w1b1s4"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-03-07"; + version = "2022-04-17"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "c66458fe5f83b57d40b678058a8eeb6340f9275c"; - sha256 = "0zf4w1ahg9dfvrw6b394asy8pyc0yjjffs73nf1mwp0bkk3hdvzh"; + rev = "dfcf0962ce88b52e00dd96dfaabc9997a18f4efe"; + sha256 = "19gjsap19mbrdp1ds4wk4w5hkd6g302afc0m3h3fsg7dxyw1r84j"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -5846,12 +5870,12 @@ final: prev: rest-nvim = buildVimPluginFrom2Nix { pname = "rest.nvim"; - version = "2022-01-26"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "NTBBloodbath"; repo = "rest.nvim"; - rev = "2826f6960fbd9adb1da9ff0d008aa2819d2d06b3"; - sha256 = "0lb3rcc41rb9yhylmkpsj141yfk1kki1xkd4q2i9y0ld0mlwjjv8"; + rev = "d902996de965d5d491f122e69ba9d03f9c673eb0"; + sha256 = "05vibdiig6lmiiixnnzc99adi6x4chkx02hqy51llahsdkg7369s"; }; meta.homepage = "https://github.com/NTBBloodbath/rest.nvim/"; }; @@ -5870,12 +5894,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-03-16"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "26dc0949680b77216ab4de7ae909b324944a493c"; - sha256 = "1ci10s7kcpvg1g9k33ydn4zp8bnm69271mbhys5k9lc50qky2cp2"; + rev = "9c1e490e5ff882e2f930ec015946a0b5b300037e"; + sha256 = "1msynng52mn47iqfwwi0n6wl37psj67pvyyz9kdb4l9r89ahqxax"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -5930,12 +5954,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-03-26"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "9f89fe6d9762ef89973bbb698c750dd21b94ec44"; - sha256 = "0r1k71rjlcly5pyi1vdzr22xdssikzsm5q4g2xzjp9v497fycg1h"; + rev = "fbfcd9c4b7e40202ccf3db5035ac3c2b15a4413f"; + sha256 = "1plxhdr7j088nsq361zq35p4wmv9xd9xbgvi3mxr66mmmcm8k0pd"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -6099,12 +6123,12 @@ final: prev: slimv = buildVimPluginFrom2Nix { pname = "slimv"; - version = "2022-04-03"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "eb5856c616466b0f463e27a30965ea142003a552"; - sha256 = "1c4hprzqzxkf0yqkqc8261qr7xk817nm28cp38dw4z1rmjcg1l04"; + rev = "cba9910aaad90dd5f1cd508ad98adebe2271069c"; + sha256 = "16zxvwrgiv5fafwm0b75ici35c630466mxdk4dww978152bxahzn"; }; meta.homepage = "https://github.com/kovisoft/slimv/"; }; @@ -6147,12 +6171,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-04-04"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "444e40de8dac0afb3654b860d4d005cb34547840"; - sha256 = "10jnvax4fmvmgham3s632j7v7f3cbz96yxciscx9rrsfgcrlm9d4"; + rev = "06b51526ad1db6359ec65ef5326a020bcae46ab9"; + sha256 = "0yhn3hgqgdp56qcdy18zzhbx8z54g6i39prrbckpxi7mfh0i2lmm"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6171,12 +6195,12 @@ final: prev: space-vim = buildVimPluginFrom2Nix { pname = "space-vim"; - version = "2022-02-15"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "space-vim"; - rev = "637390b17a8cd7d154a0d90a5c07612f1538a28e"; - sha256 = "0f43mspfnch1ifqa9rgvc64dmk0hz3cirz8iicpszmdr0fphq3xs"; + rev = "36f61f8e7157750f0e93d496d68b46d606d313b7"; + sha256 = "0pm630rq3ihjr4ikfzh08cpi2ps0qasp6dm8rdrm3zdf5b58i1bz"; }; meta.homepage = "https://github.com/liuchengxu/space-vim/"; }; @@ -6243,12 +6267,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2022-04-03"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "dbcd3069fb2b4ecfdd964c1e93aa59fcf7f850b6"; - sha256 = "1rgc9cbfpjnk8pf7wh9pyyljckbn1i88z5bggyn15q3lfhskvidc"; + rev = "37f5e795767ff14d2c8bf9cfb4998b9a0317feed"; + sha256 = "0klfadkqhv8a76qk074h9yll68wbabgsxbbhd4ba58sbv19qz35n"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -6292,12 +6316,12 @@ final: prev: stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; - version = "2022-03-11"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "stabilize.nvim"; - rev = "786c818d7258b783afc192ac287b4365c5596dcf"; - sha256 = "07fd72p0qch0gfg92vcw3mlh7f8f1dii681qzpngnlk73ghq4ffw"; + rev = "174dfcd0197ebc7397c854ae8607f9c9e691eef5"; + sha256 = "1vi1gjkflrkm5fr432r23rbq474h26j9jyagdrkw6mkq3wgh4fcr"; }; meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; @@ -6326,6 +6350,18 @@ final: prev: meta.homepage = "https://github.com/darfink/starsearch.vim/"; }; + stylish-nvim = buildVimPluginFrom2Nix { + pname = "stylish.nvim"; + version = "2022-02-01"; + src = fetchFromGitHub { + owner = "teto"; + repo = "stylish.nvim"; + rev = "279c18b7c35d1f6c650790b88e873e8a8a714f5e"; + sha256 = "09byh62f4ymkfpspk4sn5y0p9nsn3dphny94qcggfay1vddc3v93"; + }; + meta.homepage = "https://github.com/teto/stylish.nvim/"; + }; + suda-vim = buildVimPluginFrom2Nix { pname = "suda.vim"; version = "2022-02-10"; @@ -6401,12 +6437,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2022-03-05"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "1361738c47892c3cee0d0b7a3b3bc7a8b48139c2"; - sha256 = "00a1x5dlns2n1wpf8hnh8brf6bwhbifsg4dlzjq51v4kj35hzjmd"; + rev = "15ae99c27360ab42e931be127d130611375307d5"; + sha256 = "170lxb2hw814wjxkpl0g4sic7wg3krp7pfkf3wp5j4dwk8czm2wi"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -6425,12 +6461,12 @@ final: prev: tabline-nvim = buildVimPluginFrom2Nix { pname = "tabline.nvim"; - version = "2022-01-16"; + version = "2022-04-19"; src = fetchFromGitHub { owner = "kdheepak"; repo = "tabline.nvim"; - rev = "c3dfa81da0a4eab7817207fa01fdcbeed783d586"; - sha256 = "1ihblfr8bb300vfcdvsk74inw17s4c2s9xvsxgphnh85alaxbks4"; + rev = "2eb56826bf7b85b9090aff73a696e0e803bf89ae"; + sha256 = "10fqssr8la7y54q7iz2kgx1axv2rwmv0mjvnz0yvadcfz80q2ksv"; }; meta.homepage = "https://github.com/kdheepak/tabline.nvim/"; }; @@ -6510,12 +6546,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2022-03-28"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "2137c1437012afc82b5d50404b1404aec8699f7b"; - sha256 = "099000mv3d2l7aidvrwgfrks48xa5xv38fvqrs6svabqg20k2wwk"; + rev = "a577ee4d650476243d91698f2d1228819c5fa0a5"; + sha256 = "0d26c4qg7d25nzjvzds9p4z544h3zy0iwa51301pxh8s5kqr4s85"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -6558,24 +6594,24 @@ final: prev: tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2022-01-24"; + version = "2022-04-24"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "3729ae43318faca94b0a1e878f9c6717b171d55e"; - sha256 = "07dhmfqrk6806648a0n9y98ngzk59b55j9nnsvvka0hl27q1mkl9"; + rev = "7fb091aad8d824bef1d7bc9365921c65e26d82ad"; + sha256 = "1lcaa5184gaifscdqzqv7fs35lmcwhlv0s5n8606xbm4qy1sr7mn"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; telescope-asynctasks-nvim = buildVimPluginFrom2Nix { pname = "telescope-asynctasks.nvim"; - version = "2021-10-22"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "GustavoKatel"; repo = "telescope-asynctasks.nvim"; - rev = "80bd6570e5423d14ad1e6fd56a199955ac1b895f"; - sha256 = "1vhjdj0jqxlyj6lmysjalnsbh5365fm2irs733hwycicd95f43iv"; + rev = "065300fb0a8ba6a1c81991da1873c73e136dcdc0"; + sha256 = "077jj9zmd7ybgpdbc06mjkwdvjvbsa93dc45jbsiqs0yl8vf4hg7"; }; meta.homepage = "https://github.com/GustavoKatel/telescope-asynctasks.nvim/"; }; @@ -6594,12 +6630,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-04-03"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "9748123aafbe915f34ddcfe583fc868f301f51ba"; - sha256 = "0kvwp5bpqw5vygacrq9cdr3237w7fmj3sqx1vk12sxbx85cdcvz9"; + rev = "e5c3c4855a0bb6859975209a480dc830ea802540"; + sha256 = "02lap2sx1502kwva457z0gdisb28iwf38n7dpw6kdhnxl63yad0n"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -6618,12 +6654,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-03-25"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "c6f5104ff309649ebbaec283bbd1ab54511dd109"; - sha256 = "1b3z4i5jlxjk44x245b5sqnzcn5k1jww8viy0394hj6zqf7ink2w"; + rev = "28e75f6cdb63b4903035c8db2845aaddb89f1610"; + sha256 = "1imyjajrx4irxn3m2plpz9g0crkfyiq5amivhn2mqvawk1l05zy5"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -6642,12 +6678,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2022-02-19"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "8ec164b541327202e5e74f99bcc5fe5845720e18"; - sha256 = "0n2f5zdpxasswdkmci56n0avwcrwsdyp8csq3mzhzf7696vppli1"; + rev = "281b07a5cba2dc255e2a35d3fa6e49af0c8cb37f"; + sha256 = "0hlrjc69k7gaxx8y6q7l80jpdp1v9kpvlzcv5ncmpfkl80vh2ld8"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -6679,12 +6715,12 @@ final: prev: telescope-github-nvim = buildVimPluginFrom2Nix { pname = "telescope-github.nvim"; - version = "2022-01-25"; + version = "2022-04-22"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-github.nvim"; - rev = "b46686fd5a928aaf5d433dc9e2aae7d26453f530"; - sha256 = "1dv4m8xycqq1npc99m5mdv4vh6dwcgf6p7nh1lk82kwyhz1rcw8l"; + rev = "ee95c509901c3357679e9f2f9eaac3561c811736"; + sha256 = "1943bhi2y3kyxhdrbqysxpwmd9f2rj9pbl4r449kyj1rbh6mzqk2"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/"; }; @@ -6703,36 +6739,36 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2022-01-23"; + version = "2022-04-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "d317c3cef6917d650d9a638c627b54d3e1173031"; - sha256 = "0kg2jh23cgbwjmvrc1cxvjka4y2j0qpi4r8dzzw0gs2nmdjmmic7"; + rev = "4658d78523a5a005af80243f1d0b4e7e2a118dae"; + sha256 = "0fpq6jfycl5hmz7ch5ris72qjabvhvbaj6wm9gwgl7ids99982p7"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; telescope-symbols-nvim = buildVimPluginFrom2Nix { pname = "telescope-symbols.nvim"; - version = "2021-08-07"; + version = "2022-04-17"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-symbols.nvim"; - rev = "d2d7d6b4298a1f733649526661d872c5e7a75521"; - sha256 = "0jxnalhfgmnllwb38a9dgzrnrhdnxgcbi2p7m4jk5p87260a9gvk"; + rev = "f7d7c84873c95c7bd5682783dd66f84170231704"; + sha256 = "1yw09d2snma0vy36nfdswm1snf21w183aji7f6y8jnkx47g6gc37"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/"; }; telescope-ui-select-nvim = buildVimPluginFrom2Nix { pname = "telescope-ui-select.nvim"; - version = "2022-03-20"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-ui-select.nvim"; - rev = "186a124a01d7f19e6fcf608d4e1cc61d61ebe939"; - sha256 = "1lx11d4m0gcbvbb3bvxaciihnlsj1gi30ja1p0i9w7dm748d57zb"; + rev = "62ea5e58c7bbe191297b983a9e7e89420f581369"; + sha256 = "09mbi1x2r2xsbgfmmpb7113jppjmfwym4sr7nfvpc9glgqlkd4zw"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/"; }; @@ -6787,12 +6823,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-04-03"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "6e7ee3829225d5c97c1ebfff686050142ffe5867"; - sha256 = "0qlv63jll4ja4x2njxvz1h9mlh92akzif06qy8gr7f61gfvfaaca"; + rev = "39b12d84e86f5054e2ed98829b367598ae53ab41"; + sha256 = "12krg8l13j4rqxqn9jx5nkpfpa3ffh2avv9z687ag7k1axvcak9h"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6968,12 +7004,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-04-02"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "5733b24c684d202f978ccedca4a8c7571889bf28"; - sha256 = "00z21wvgjks5mqrqja1kc1wnwxpjyy2fl3sn8f16692hz2wcavrd"; + rev = "ea21c3ef51868a564eeace357f4a3d429f93efb1"; + sha256 = "1y8nb5cdlghf37sl872gx1rd28r437vxz94w90ydijin8hswcdqi"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -6992,12 +7028,12 @@ final: prev: traces-vim = buildVimPluginFrom2Nix { pname = "traces.vim"; - version = "2021-11-17"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "803d97786d0fbe95d33fe3c69e213518ea296839"; - sha256 = "1hqma8pjl1ladw8iraa6cnsp9jasx4w08zxq5q63ff5mzdb1avn1"; + rev = "9663fcf84de5776bee71b6c816c25ccb6ea11d1a"; + sha256 = "0gwn1kclcqp1yvaja6wqf27ng8d4wrd2j7795syxdk3d8vmpn55d"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -7028,12 +7064,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2022-03-18"; + version = "2022-05-09"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "691d490cc4eadc430d226fa7d77aaa84e2e0a125"; - sha256 = "1d218xxz936q53aknazhnfxhy9ncjyq76dna6y5n87kxn9hzqix1"; + rev = "da61737d860ddc12f78e638152834487eabf0ee5"; + sha256 = "1aa45r9z8mghak8f5gymhm875rssi1afs92h0mpnn43y0j76xy31"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -7052,12 +7088,12 @@ final: prev: tsuquyomi = buildVimPluginFrom2Nix { pname = "tsuquyomi"; - version = "2020-10-16"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "Quramy"; repo = "tsuquyomi"; - rev = "144526df5340d3bd0b413e6127c0393de171889a"; - sha256 = "1amizvbpv4mwpi39x9xn5aj1kjkgl4sgh54irnhs4ga76zn0s09d"; + rev = "8f6e2464171c5367867959093aa4b9c99b636a57"; + sha256 = "1h8gw0nlwd31yx6xd67c0bw4bw71rxpldlvmnfp8cxnpjiav3zkj"; }; meta.homepage = "https://github.com/Quramy/tsuquyomi/"; }; @@ -7088,12 +7124,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-02-17"; + version = "2022-04-23"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "ca21d30c7a72e0e18ad95f25ded5a5f820052685"; - sha256 = "1zn97bjlhz3izs7dh97w528zlfi91k0pl95lrmr5cz2px65icsry"; + rev = "f5ccf0977c611ffd774ca180774959301baaffad"; + sha256 = "0b4gb031ylm290ciyq72zlrykp4ypn82akjdac886r9zn50r2lpb"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -7112,12 +7148,12 @@ final: prev: unicode-vim = buildVimPluginFrom2Nix { pname = "unicode.vim"; - version = "2021-09-02"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "664d7b2e5cedf36ea3a85ad7e8e28e43c16f025b"; - sha256 = "1033x76ixh2k454y23swqhn8bf9nibl8jzijva53c0xk7018kzh4"; + rev = "176963d8e43dd54ff1582cb2374e731b51a7f5d5"; + sha256 = "030izymxcvs5hw8pqsmlqwxgzdbysh96q7qxk7mb2v15dh8qnv9d"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -7136,12 +7172,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-04-03"; + version = "2022-05-07"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "8815c06145f36dce7734ba4b95eb50c3e24074c4"; - sha256 = "1n46x1v2rw70ad6b6z04ik9rjvpkl8bbw62l8wfn7lkzdjgwi50d"; + rev = "92a6ae6f33839222ce4ea58f5cdaf0a3f235caca"; + sha256 = "0y3l0py0cnvj876xi5kgc7mmbycj7s61mj29ipsmn9bnjvk008yb"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -7184,12 +7220,12 @@ final: prev: venn-nvim = buildVimPluginFrom2Nix { pname = "venn.nvim"; - version = "2021-10-19"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "jbyuki"; repo = "venn.nvim"; - rev = "d5a9c73fe7772c11414fc52acbb1d1bdb1ebc70f"; - sha256 = "1mzxvx1vqnm89yzzy6n3s30y9w7s38lbjhnwdf4diy0kdzyq8x06"; + rev = "71856b548e3206e33bad10acea294ca8b44327ee"; + sha256 = "0gjrcj196cwd0j6jjjplycc2gvw77n9jsmq6q4l7by13d2agn7kc"; }; meta.homepage = "https://github.com/jbyuki/venn.nvim/"; }; @@ -7208,12 +7244,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-03-28"; + version = "2022-05-03"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "069349e5dbba9fbb24b88ebedb89f728387fae79"; - sha256 = "1rrzhg8qpvgvcm9fkr05hmkw95gn37pys0h0d6rii6qhbx9z95vs"; + rev = "d6ae9ca80284bd7df38b102ba280f0d132129c0f"; + sha256 = "087ila6rskhd7vi1yqlqmq781gqajh69y4dk7n9f4sza75hb210x"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -7544,12 +7580,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-03-30"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "dc65eea5d9225758d4556278b3d808baa6ab4d0e"; - sha256 = "1mkfssssgsaqx770rarpgryp4zimfq7ljv14jzmb2bqx9iyqz5xb"; + rev = "c4655701431a9c79704c827fd88a4783ec946879"; + sha256 = "1qsr3kkfx5vbhmnym0id2h9mph8bw6g75vwpqfi9vfmbg4fddh3l"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7688,12 +7724,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-11-07"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "bb11f30377985e45e2eecef570856d42dbabb8b0"; - sha256 = "1lx5lrb0hjijvwngvgsgchww70c1bgqf5qxj8lhvk11dvxn3k087"; + rev = "c833f1dd0398901f5ad3f5f0ec2e07975e246294"; + sha256 = "1vafpp3m75dd8c453zq6w8qnapw7h5kpbzdx2s5fpjdn9qrg2g87"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -7724,12 +7760,12 @@ final: prev: vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; - version = "2021-01-31"; + version = "2022-04-09"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "vim-bazel"; - rev = "58c750d13ec2337ba3e5992f96891bbb843a9dbf"; - sha256 = "0xsgj1j8xamkri75cjnih5xzwp8y7g1i7hgbbbmknz5d8jm3p204"; + rev = "31b0d5e4f51da1aeb56d65bf505a744e6de405de"; + sha256 = "1cx4axwcm7mm2c2xi4ghv1nlgfzl29g820znbpm77r8hpaqkj7ki"; }; meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; }; @@ -7844,12 +7880,12 @@ final: prev: vim-bufkill = buildVimPluginFrom2Nix { pname = "vim-bufkill"; - version = "2022-04-05"; + version = "2022-04-19"; src = fetchFromGitHub { owner = "qpkorr"; repo = "vim-bufkill"; - rev = "ba6253de82f982722ef7eaee6751d788aefd568a"; - sha256 = "187pj4dw78xd3wlpf24nll89kggk4q38gi51dnq95qywfk4w2k5h"; + rev = "3113181d0c1bfb8719f3ddcd2e2f35a8d763d1e5"; + sha256 = "1jfwzizkfljkz6cqjzx3sn5wnn3kl2kvwinl5bbp9vjc6ssnz2df"; }; meta.homepage = "https://github.com/qpkorr/vim-bufkill/"; }; @@ -7880,12 +7916,12 @@ final: prev: vim-ccls = buildVimPluginFrom2Nix { pname = "vim-ccls"; - version = "2022-01-29"; + version = "2022-04-23"; src = fetchFromGitHub { owner = "m-pilia"; repo = "vim-ccls"; - rev = "93ac5dbdeaaaed8fdfd6d850f1e57fb28d204886"; - sha256 = "15dr487baghlhl559a4zqpm8vnpm77aci4gw9x95v4kds9g4g51k"; + rev = "b8e3afaca0578ce96f8d7eefd2093e7594a19424"; + sha256 = "1zsp5lsdrrrlgbpb68hksb3lm8289h9rjz991clbvam61ssi4w08"; }; meta.homepage = "https://github.com/m-pilia/vim-ccls/"; }; @@ -7916,12 +7952,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-03-25"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "6fd4fecaf8b1da31c625e5f02822778d4a2a08b5"; - sha256 = "0h9z49r20wyqwvj4dr5grq0zdaz2d728jxc29l5q3rb1nh9nqbfi"; + rev = "5d0662d8d7e640a1ffb64b1b4dbbc41995391218"; + sha256 = "0bz6nrjsz1m2ibhbg4zc2z9slqfwnx5q6mc6favf9nw7j821s95g"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8204,12 +8240,12 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-03-06"; + version = "2022-05-02"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "d9db8d8ae99500e4df6b22a73e30a411936dca37"; - sha256 = "1gpsnx2s6wk473547h7fjf21cgzkfx2b2d3hwk1q2m7gjpsg0j3q"; + rev = "7bd114b88da4bf8115bd85d70fb531e4b6d72eb7"; + sha256 = "0mb74z2kr85wd17kbhf8qx02iciq31aqg7y12k1isvmxkv4i0hhw"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -8276,12 +8312,12 @@ final: prev: vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2022-03-27"; + version = "2022-04-26"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "9dde0c97cc39ca1cf49cbe7ecd350d153a0426c3"; - sha256 = "0ba2lsc2jwgplgqsnq69dngiybcs4ad0il19xlk250msxpr5l8xq"; + rev = "7e41cd7628d9844b4e66b45104f3abc326aa1a00"; + sha256 = "16q979l3zjh4ly0rr74y3g3q0csabs8v5k6dxkyymvg3bycrpg4y"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -8492,24 +8528,24 @@ final: prev: vim-erlang-tags = buildVimPluginFrom2Nix { pname = "vim-erlang-tags"; - version = "2021-02-19"; + version = "2022-04-02"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-tags"; - rev = "d7eaa8f6986de0f266dac48b7dcfbf41d67ce611"; - sha256 = "03wxy29z0rjnf3hilap7c86di7dkjwb8sdlfh74ch8vhan8h6rv0"; + rev = "cf6e9319818a6737dc9b79b7fa53fe4cdfc65139"; + sha256 = "1sk3z35svv2dznmvw9cgjm1731lgq34gai92c5vy6sxdbn6h1sbw"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; }; vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2022-03-31"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "c70b0ed50b5c0d806df012526104fc5342753749"; - sha256 = "1pj6rzdwalnv3x8xdgfsqh79pc21b0lhlp6ry5yzjcprghw1547d"; + rev = "39e0232f490322c5a2d9e24275872f28da496a93"; + sha256 = "1wp5x5vximysab4c97d7x7y0hnnmycfm9h8mxxzz291ra5yrbbr2"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -8540,12 +8576,12 @@ final: prev: vim-extradite = buildVimPluginFrom2Nix { pname = "vim-extradite"; - version = "2019-05-08"; + version = "2022-04-15"; src = fetchFromGitHub { owner = "int3"; repo = "vim-extradite"; - rev = "58c77fffbb5d61eb0b87c8b4ef0ad78e9659d621"; - sha256 = "1mm2icx50q5iyhaz1dypnbqh14s1wsnw8skpxcm1klhqn02zk46f"; + rev = "73dab6a94d9dd3cb6189b458bfdf38493280b332"; + sha256 = "0qlf69bdfmgf5j47q6vx02rjrngil93rq3im9ag3601zq55rxq8a"; }; meta.homepage = "https://github.com/int3/vim-extradite/"; }; @@ -8564,12 +8600,12 @@ final: prev: vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2022-04-02"; + version = "2022-04-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "2e4540d62fd49523a3aefeab896a33ed6bbcb43b"; - sha256 = "0h6ij4r5i6i72hkn8w7gw69asga7ka5addl74n2i1jhaznn7q1kb"; + rev = "b6bef833b56632df917bcf33bc50b8a5d1e26139"; + sha256 = "1b0qw5l8gyq3bf8ii1f2xb7kfdgyi0c4yivcmmziq8nqvrzwwzwp"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -8588,12 +8624,12 @@ final: prev: vim-flagship = buildVimPluginFrom2Nix { pname = "vim-flagship"; - version = "2021-12-07"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-flagship"; - rev = "7f3aab5e3f1b48df9f9465b8cd55f9d2a1564087"; - sha256 = "0vfihdwabl41wdavzppsim6sza8mjynpnb3my85di5xn5mgcmixp"; + rev = "6726cac1374c5a32e0b63f7f66007d33fdf3e21b"; + sha256 = "036w6b1wn6kamdjmakgchzwpzm0mwjpp1fpmc3bm79mc4q63cd06"; }; meta.homepage = "https://github.com/tpope/vim-flagship/"; }; @@ -8624,12 +8660,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-02-15"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "6244d1739aad6682c6c1d5db18c846c342af6e3e"; - sha256 = "1w0d93wm0xwg8wyvyzdibjmnd1py343mvvzj911byvnm1b52zp7h"; + rev = "ab7876f86c05c1935eb23a193f4f276132902ac1"; + sha256 = "10i6akvr1ib2lwh6xwjchmpjzdabj2qs05h8h1ww9mdycj4q1pli"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -8696,12 +8732,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-04-05"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "cba863444c9e970bc7282f76df0f559b5fc830bd"; - sha256 = "09g9cgs89c02qsjyp3n343dkqkwzr9jwrhn6l51c8c3dclp07870"; + rev = "a8139d37b242c5bc5ceeddc4fcd7dddf2b2c2650"; + sha256 = "1n22hjg374rs1412v4yvn3jc5nzd2jfsk3vzhaf8i3zv4b6w2vf1"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -8792,12 +8828,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2022-02-23"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "18d12985ea6cb7ede59755ff4fd0a9fa1e6bf835"; - sha256 = "1gs7vaf9pyd8ji0vc9iafd46g4iqy8rpa2jif0k56wxzcrjw4r22"; + rev = "719d4ec06a0fb0aa9f1dfaebcf4f9691e8dc3f73"; + sha256 = "1mdpds4xpjcwfsm6r9w65hxwjsxm7pcr3dnkfh6v8xx0kyflmijp"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -8816,12 +8852,12 @@ final: prev: vim-glsl = buildVimPluginFrom2Nix { pname = "vim-glsl"; - version = "2022-02-06"; + version = "2022-05-10"; src = fetchFromGitHub { owner = "tikhomirov"; repo = "vim-glsl"; - rev = "28a6dfbcd96095226bee90985b7f12c5679dbbb6"; - sha256 = "051f0q5bkgp77pz0izh5mvqsmxy0rzlvriwq4j7qzslqk7i850p2"; + rev = "bfd330a271933c3372fcfa8ce052970746c8e9dd"; + sha256 = "0nqpg95mh5z0wmiqvc8cfzq1gb99ximc1gbz9bv3x7239f66z5vn"; }; meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; @@ -8840,12 +8876,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-04-03"; + version = "2022-04-23"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "119797938eeb875e91182d6bd86eb001d0ef9029"; - sha256 = "1rclpd2nf26slz38imq8g5h1pknkwdbgnv4iz04vhq7k3gvls6vk"; + rev = "e9d7ff3eb4a369f0cb2069c8f77ae68796bca308"; + sha256 = "1gplykwbn8iclliv0ssd728bm3rxfvanppa2svn50h2c3zn7dph7"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -8912,24 +8948,24 @@ final: prev: vim-gutentags = buildVimPluginFrom2Nix { pname = "vim-gutentags"; - version = "2020-05-22"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-gutentags"; - rev = "50705e8ebb7038b31314f416d1bddd9cb9154049"; - sha256 = "0vm3bp94kbc28azsmm8505hyd9v1a9isrn5dp47njmj8w17l7725"; + rev = "b77b8fabcb0b052c32fe17efcc0d44f020975244"; + sha256 = "0wiqy5m7wvrmr3d2vy5j5lz6wh3z2c2v7amy9ji7prq1gxv3n095"; }; meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; vim-hardtime = buildVimPluginFrom2Nix { pname = "vim-hardtime"; - version = "2022-03-13"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "takac"; repo = "vim-hardtime"; - rev = "5603072377d1f1f26a1561eda9e1884bb5f028ef"; - sha256 = "13279v9vd083xg6820gh15qxsyhbr7gjf7lzgy8w52xya852xsks"; + rev = "91177392e9372a1cf09a4b9b79532d2490bd405f"; + sha256 = "1f8vvm37yk125c0h28jbry9hshd3amrbfxcrg7j9qj9kdkad1zjq"; }; meta.homepage = "https://github.com/takac/vim-hardtime/"; }; @@ -9033,12 +9069,12 @@ final: prev: vim-highlightedyank = buildVimPluginFrom2Nix { pname = "vim-highlightedyank"; - version = "2022-01-25"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-highlightedyank"; - rev = "ff16bf3bac23fb4e17c976f4e1ff7941cd686c8d"; - sha256 = "0slnykqkbqnncz0vjwhf9p9x8wi5p8xfv485wbip1njd6vqhd965"; + rev = "f9db473137ca96c6a989ec3e2b7edf8a3189c448"; + sha256 = "0lj2w9nzqrmw33gcf8k1hf50mpwymhdyyv09mp9phanywg06l1ay"; }; meta.homepage = "https://github.com/machakann/vim-highlightedyank/"; }; @@ -9141,12 +9177,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2022-04-02"; + version = "2022-04-10"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "3b9b6481a659bdc37a55f488c92839e3804ca098"; - sha256 = "1vki4g6gvmr6l9yb1xhv92yix2595b17j7m75ak15k25w1dnig7h"; + rev = "c82e6d04f27a41d7fdcad9be0bce5bb59fcb78e5"; + sha256 = "192a6il56r4cfkqq67vh5kbdfa7vzwmh33sb8zy6zlri0a0h7dw8"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -9344,6 +9380,18 @@ final: prev: meta.homepage = "https://github.com/google/vim-jsonnet/"; }; + vim-jsonpath = buildVimPluginFrom2Nix { + pname = "vim-jsonpath"; + version = "2020-06-16"; + src = fetchFromGitHub { + owner = "mogelbrod"; + repo = "vim-jsonpath"; + rev = "af9c07b87765fc5aee176a894bc91fb04a5e3c47"; + sha256 = "0l59c6xl4rly7xbfgsqam1rwcyvqhr7lzi3g2jpwirarm823rla9"; + }; + meta.homepage = "https://github.com/mogelbrod/vim-jsonpath/"; + }; + vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; version = "2021-01-12"; @@ -9502,12 +9550,12 @@ final: prev: vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2022-03-10"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "4c768d215a0654d61ea72eeec423716bd971948e"; - sha256 = "0q2c8n1kbqsx005cn0p1f5334qgslkla2zag03q0vy57g3yhydv4"; + rev = "244a92ceae63b8c23a74022eaf205b431745fcb6"; + sha256 = "1y56xh4k7zqagsnw86lkm747l1x4i5l95r0jks4j35d1fcmpq81i"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -9538,24 +9586,24 @@ final: prev: vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2021-04-28"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "4b0fc48037c628f14209f30616a19287d9e54823"; - sha256 = "1jwfc193wbh2rmyi6mdwgr3lcq82qhlclq4hjwg1hcw94442r5xv"; + rev = "39ec72353c2170db2caf797072800c513647e9c5"; + sha256 = "18ljb8j8rs77643v8gprpqzfac492ljc49mn4g8b1bdkbji4cnqx"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-04-05"; + version = "2022-04-21"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "edd6629f0940e37ca988620e404e79e600962a6f"; - sha256 = "0qc2x0la72xhbbwdrm6iyjlip3pcfj0wk4msi6zfz9zmyrzcfnhb"; + rev = "c075e157fcce4511e537b1f7f3385444d9c80e0d"; + sha256 = "0q7mg3qk0ryh46m6p4pliysrndmz3g6g6m5rqpz86lj6z2ivzzhy"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -9586,12 +9634,12 @@ final: prev: vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2021-08-09"; + version = "2022-04-22"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "f5127b339a9d776f220cc0393783c55def9d8ce0"; - sha256 = "0svkpk46fvas5346af2cw2ga03mlwd3rn8pya41f9whybqxdrysg"; + rev = "fe631a85b0a1e1a709a55ef0947c9c0813f41edb"; + sha256 = "166fgfxh6k4v2ypzjmn6hicr92xgcsi5bi930f74xv5fzm0gw9l8"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -9610,36 +9658,36 @@ final: prev: vim-markbar = buildVimPluginFrom2Nix { pname = "vim-markbar"; - version = "2020-08-31"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "df13c3abe88c01a716b1099de953dcfa1679e663"; - sha256 = "1y5w182d57z1nl8c7ng25m88by88pnxqdsxmcnnygdfjmvbv8jl9"; + rev = "b9b87339bca7572ffc506165069242b6c06c210b"; + sha256 = "1kgpq8q7rcskwc8y8fcbvpq61qx9ysb846qhlk2s7fqjkwpmgz59"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2022-02-22"; + version = "2022-05-07"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "95e90840c45911b62261bae02e3ba2777877eaf5"; - sha256 = "1jrj3419ar7lnj6mriq3pvffsg6g3kxg36jrixi96a0cl2aqrs8b"; + rev = "3a9643961233c2812816078af8bd1eaabc530dce"; + sha256 = "1yw8d1c5mjkjs93nby9xfx4jwxnb8zq36p1p7ciq808xzks42994"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; vim-markdown-composer = buildVimPluginFrom2Nix { pname = "vim-markdown-composer"; - version = "2022-01-04"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "euclio"; repo = "vim-markdown-composer"; - rev = "010ae3667fb0cb4c63c99439d1a8f81ebdcc849e"; - sha256 = "1hz0xjq0srv3llb4i6n2sw0pi2s0k3qcwyk6az5icrvkfhbnc0kf"; + rev = "5b79f425ebd28216d9aa472be3ba07cda41d9b24"; + sha256 = "0i4m2x2cw604aczp1ijnrv0wvh1b9bxg9zh0zmf8kk7b00zc1k5c"; fetchSubmodules = true; }; meta.homepage = "https://github.com/euclio/vim-markdown-composer/"; @@ -9659,12 +9707,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-02-18"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "7fd8806138f404498db7a3e848d8fa55ad61e7cf"; - sha256 = "061jvw0rdwz7s4yaiq7s32cx0y1vkknsc80gh2gj53jsbcpk30zp"; + rev = "485e71120fea7be22f0ba051a05a00675276ced0"; + sha256 = "0zzn5gspi5811w1drbk362a75q4d697l0ngxgps00bcgvj9l8r6d"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -9863,12 +9911,12 @@ final: prev: vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; - version = "2021-05-28"; + version = "2022-04-25"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "63b47b39c8d481ebca3092822ca8972e08df769b"; - sha256 = "08n9cgphv2m96kk5w996lwlqak011x5xm410hajmc91vy5fws361"; + rev = "7d23e97d13c40fcc6d603b291fe9b6e5f92516ee"; + sha256 = "1vaprm79j0nfl37r6lw0zwd048ajd5sc9cvny59qwdl3x0zk38av"; }; meta.homepage = "https://github.com/LnL7/vim-nix/"; }; @@ -10127,12 +10175,12 @@ final: prev: vim-parinfer = buildVimPluginFrom2Nix { pname = "vim-parinfer"; - version = "2020-02-04"; + version = "2022-04-19"; src = fetchFromGitHub { owner = "bhurlow"; repo = "vim-parinfer"; - rev = "a8c075ce5256bffbf1f62e08aba37dca88d0cf1a"; - sha256 = "1v2pyjyxvqw2kl9j4pdpdlbl2q3jnndcb8iqgyygs7jn91c4s073"; + rev = "e8ae788a91f41d627cec905c61a2dec9c9183341"; + sha256 = "0dkxfdakgcs6743dzja7l5vdc2pczv3ahr79g93mzjj0wbn6gd1i"; }; meta.homepage = "https://github.com/bhurlow/vim-parinfer/"; }; @@ -10211,12 +10259,12 @@ final: prev: vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2022-04-04"; + version = "2022-05-03"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "93ab5909784e09134e90f15cafa8a5edcc9a00fe"; - sha256 = "0cq2ilqqq90bpp8pzylqi759hqb9ni6l1rqkvj6aj7a4b29a59nv"; + rev = "8fdabfba0b5a1b0616977a32d9e04b4b98a6016a"; + sha256 = "046j2cq4s14ys7n5b1lil5sgdis66mydd8bpsidcyq004k3zy2lc"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -10235,12 +10283,12 @@ final: prev: vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2022-02-20"; + version = "2022-04-30"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "83422e0a1fcfc88f3475104b0e0674e8dbe3130e"; - sha256 = "1fj2avq18qx6rkghqiyp14qg166889kfpj7hzy5a1n71n5c8lh2j"; + rev = "38282d58387cff48ac203f6912c05e4c8686141b"; + sha256 = "15szf3fjlnws0g5l3d2p3w74d5m9299l5k5gx91p0n9431xjb569"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -10307,12 +10355,12 @@ final: prev: vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2022-03-29"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "37f6867fb186191bbc99bfc9d7c465dce4b7f94e"; - sha256 = "0siigy1p5iwn5nms94w22kzgajyscdzn8mcnwkmhxdzbs2c4nv9w"; + rev = "d4aee3035699b82b3789cee0e88dad0e38c423ab"; + sha256 = "0gmpqp9wplq8pqrqfpardrj7g5mr16w4q9485wzy9nk86nsqavj9"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -10427,12 +10475,12 @@ final: prev: vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2021-11-07"; + version = "2022-05-08"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "4f2f5628098efba5db2ae152dc3ac0d9b310659a"; - sha256 = "03db4xyzhsjdfa940bhkh7s8bka7rrpw6l1sscjk9s1mqs5ypjcl"; + rev = "276f39ab6507659ea8664c51b616a89ca9445875"; + sha256 = "1gxp1rqc0vxlpmqqwxbdz0mh2pkh3hdcvsxrh1f73ya3vzlgyqfy"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -10475,12 +10523,12 @@ final: prev: vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2022-01-16"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "de73f6d1b0bf1b2af2d576f3420fc861af14769f"; - sha256 = "18lqsvnacgj5pb35qvw0bk9dpsddj63k4bmyzp8syikpqq3dzn26"; + rev = "9c92dafe6894aed3fa81df7ac52cdd8e7a8ea9a6"; + sha256 = "050vkbj1y80f1kcmb0hfd2mha1bb4v3f2bvnazcymxn08z8frww7"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -10511,12 +10559,12 @@ final: prev: vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2021-09-13"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "977b3ccbad1f7e5370354ae409fb2ea4a7ce2058"; - sha256 = "1vvjj3ql2dm3dniscxjmr5h9kfx005bgdxc1ppz6yi2q9spmchqg"; + rev = "ab0d42bb31b3317aa66dd1c0b506837cc6ca2835"; + sha256 = "0qv2ppmxpy72gb8ivz5cx19b4y8si4v428d9mmlx9q7mv9q4wmhq"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -10547,24 +10595,24 @@ final: prev: vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2022-03-22"; + version = "2022-04-27"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "f3236767d2e74d736d98efd8da44013d1e95bfc1"; - sha256 = "0mlllnykdmcxf4yx2nkp74rm4wx2qwcly3m711a6pq7w87fgh6jz"; + rev = "811d8060f390837c49e8625e29c69672cdc56ec3"; + sha256 = "0cx2xl1qn57fxhc7rwdfcf359yknr0qw3yh7mbpygrm45jlgwnva"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; vim-salve = buildVimPluginFrom2Nix { pname = "vim-salve"; - version = "2022-01-14"; + version = "2022-04-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-salve"; - rev = "7f66b7a6446fc259798c5525ba15d4e65e2fd142"; - sha256 = "12xcql1sl23jbni6xh2cvhjxr4byaz3d987frsp41gdxkaig12cq"; + rev = "81f131b494cd7baa8e4e1f9242721e7107ea2f2b"; + sha256 = "0kl2nq1lqj2kgimz477xafnyh7z9fa44mwl2qajw5qchvx4f9h0a"; }; meta.homepage = "https://github.com/tpope/vim-salve/"; }; @@ -10629,14 +10677,26 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; + vim-search-pulse = buildVimPluginFrom2Nix { + pname = "vim-search-pulse"; + version = "2022-04-26"; + src = fetchFromGitHub { + owner = "inside"; + repo = "vim-search-pulse"; + rev = "3ae2681332c52ed54c443e09d2ef09ae05eaa445"; + sha256 = "0si6mqrassa7jpdhpiya3f507a74k46h07sbfks7hvxkhk51q7yx"; + }; + meta.homepage = "https://github.com/inside/vim-search-pulse/"; + }; + vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2019-11-24"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "2d9f34c09f548ed4df213389caa2882bfe56db58"; - sha256 = "153i3kh44ri046va3qdrbvvsv7gy25fsd9pc2yhrg23lvj169zfp"; + rev = "226203be173bf0b95ee2a5cb6575ae604b3f9f7a"; + sha256 = "0hi64zsg2acrmzshmvrmgjqd7wjgghpggw0rmjx8kd7vwcmwvfcl"; }; meta.homepage = "https://github.com/tpope/vim-sensible/"; }; @@ -10727,24 +10787,24 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-04-02"; + version = "2022-04-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "aade27e2b1a47ae2261d95a4dd622ca2c3d34227"; - sha256 = "1xwav2657qhqaxsql50dh20n7r5n97xb2xb990wikf34mi9j4pn4"; + rev = "1d25e8e5dc4062e38cab1a461934ee5e9d59e5a8"; + sha256 = "1nb90zm9jc2mq5fxbxifrmhkpjs3a5y68amr3f99rxfd0197jxcs"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2022-01-13"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "0ea9b35882155996171fd15a5227e673ce2d2c60"; - sha256 = "1palz3375v400fjlxwpc4drm36rnffz86mdkyqdqssvm41fv0wkx"; + rev = "6e4b81303968f37346925d6907b96ef07788cc82"; + sha256 = "1z0nmfmn7ijj3hih4dbi1iq3dc6gpprck3fmidhmkv6vms041nx4"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -10775,12 +10835,12 @@ final: prev: vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2021-02-07"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "10fd0aa57d176718bc2c570f121ab523c4429a25"; - sha256 = "18zn29mkgdiddn3il393xzg7hpa0x25yvais1l29jq2711sg4rdc"; + rev = "b440f139a55cb5161cde3478729f6603d9d20d81"; + sha256 = "1hvv440zb3bwx1v8nyy3bk9vnhlbjy2a1hdfcmc37rghbni1kp0k"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -10823,12 +10883,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-04-02"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "c6d4b1cfa7a349ca561b86227cb46c4147b9c23c"; - sha256 = "0idmrcb4xigmds1iwz5rixvdcanqvv0qx7v3yg4d4p1xd4yjsiw1"; + rev = "6f270bb2d26c38765ff2243e9337c65f8a96a28b"; + sha256 = "0jzafsk1ri2jfn26k962x2g6ygqrkrf3kwvd1ikx0hql0nhcvrrq"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -10967,12 +11027,12 @@ final: prev: vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2022-03-25"; + version = "2022-04-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "9857a874632d1b983a7f4b1c85e3d15990c8b101"; - sha256 = "0ihcqrgvrllnrll9vgg1ywmhsvf43dwdpqv89r8mi70wsnzbgk3v"; + rev = "bf3480dc9ae7bea34c78fbba4c65b4548b5b1fea"; + sha256 = "07wk87xiri44h5k3higiw9wfp516fflhq2xyrgm5hkxs3nnnx6la"; }; meta.homepage = "https://github.com/tpope/vim-surround/"; }; @@ -11003,12 +11063,12 @@ final: prev: vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2022-03-01"; + version = "2022-04-05"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "698ff3074c45d4292ed6a2f629e6114fdaf4420b"; - sha256 = "0a8lzjp0mj2ml82sql44qbq1dwxmrxjp5h3snzclw4y64919yf21"; + rev = "816072c0f50ba753458ea466eb2349799a4467f9"; + sha256 = "1ndj4f1rlyq7kpbmv7y79c2vnh0brz2m8nh13jw1y7sv7gbkxyxf"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -11064,12 +11124,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-04-04"; + version = "2022-04-06"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "d340f840725e6ee1b8abc63e852d80ded496ffc9"; - sha256 = "08y4x97l0749i6d7qc512irql5zpxdwyzrbsw6h507jq7cvaw8hb"; + rev = "2240d7a4b868cb594b7d83544e1b6db4df806e5e"; + sha256 = "12qn395bnmxxsq64c60s46gdz4ad2hbhn3g2kbnw9d56dyb47vag"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -11244,12 +11304,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-03-21"; + version = "2022-05-11"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "1da5d790a7b5c073453bcddf34da8145df04b32f"; - sha256 = "1x2hlfy3r4qsgshhlz73qdjrjrnzj88z5h9vhnvml4sljf5y9r2d"; + rev = "2c4417db1d549f96a6a944bf4d85d8c797ab4a31"; + sha256 = "1rzhzl4w9k11maa1iy0a8sss3319jvp1viqqh0l7kgg13595acnk"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -11304,12 +11364,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-03-19"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "2a35653111b023660b519f6dbd95c97996ce8b02"; - sha256 = "1b840fnfqh19p2gzhc1xxisn0gyw756miian4znk0zzj2wlja151"; + rev = "6978fd32e3ca2c1c5591884eea0d57a7ee43d212"; + sha256 = "19dphm7xgfc0xvxrlys21zkp7ixbx62p11x6ms6xmwm8cjjh64pc"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -11328,12 +11388,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2022-02-02"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "f992923d336e93c7f50fe9b35a07d5a92660ecaf"; - sha256 = "04l0v2jgkvhkfjj7j5r7x81gq2zwbjh5vh4p860p38razq6aixpl"; + rev = "98427183e2b35acee15c7628b1cd587b98025719"; + sha256 = "0w5065ywkr7ygpqjmi1r9s3icm6v0x2w1gfa9flwqhx6y02jfrmk"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -11376,12 +11436,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2022-03-25"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "4fcd3797e380f2e4c8ea8be31ec6469e6f86f971"; - sha256 = "135jggj34pdczjby1p2vpr1b30whcabsfxjgvyrra45hlg45kzgn"; + rev = "046d0d5ac5fb2888447d1dd8b7e52fd0314f9766"; + sha256 = "17masfjxrhjcfqmlgf1jpmmz18j8vb4n88dl34rry6c3abiraprj"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -11398,26 +11458,38 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-visualstar/"; }; + vim-vp4 = buildVimPluginFrom2Nix { + pname = "vim-vp4"; + version = "2021-01-06"; + src = fetchFromGitHub { + owner = "ngemily"; + repo = "vim-vp4"; + rev = "511ec1cd651a25b30d75ec6df29e61b9ca75d1b9"; + sha256 = "1vr8j4w6s26hjbil2kx57nnslrjczp4jvmc7s8lhl41z0r6nj4fb"; + }; + meta.homepage = "https://github.com/ngemily/vim-vp4/"; + }; + vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-02-26"; + version = "2022-04-22"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "70a1131d64d75150ece513b983b0f42939bcb03c"; - sha256 = "042cnznm1p5x3ky7m81q62n3nlgab9fq734hlfwsbwrcdqa849l2"; + rev = "8f199ef690ed26dcbb8973d9a6760d1332449ac9"; + sha256 = "1d9wr97a02j717sbh55xk7xam6d97l5ggi0ymc67q64hrq8nsaai"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2022-01-12"; + version = "2022-04-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "5541e4ac18c732700c4310c86384bea19644d4a7"; - sha256 = "0ilx1vmn76vnqf8v699jad0jshpg63v0m1f8ck1mh3zp53430d4q"; + rev = "64c2ed66406c58163cf81fb5e13ac2f9fcdfb52b"; + sha256 = "0r4kxw112rxc7sz5dzcginbv5ak1as4ky40db2r5wdg5nm08c4z8"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -11436,12 +11508,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-02-22"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "f922f82954cb68fccfd20ad3eacc78fb2559a937"; - sha256 = "1inb0vh1mfg6ihasd317ykw0dsnx8z16jvm6f6i8ldy3fw79y9wg"; + rev = "b8e6cc7dc28e2e6198d8c9c30e5c8a2414a7b996"; + sha256 = "1hy0y5v3r5w7y8phkgbi1ff7p8yyhyndxr3yyr1wfvssdilz6xqj"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -11496,12 +11568,12 @@ final: prev: vim-wordmotion = buildVimPluginFrom2Nix { pname = "vim-wordmotion"; - version = "2021-12-28"; + version = "2022-04-23"; src = fetchFromGitHub { owner = "chaoren"; repo = "vim-wordmotion"; - rev = "0d810cc943a858a570a482055188b5e69c4c8724"; - sha256 = "0d0sf7dzzawssfn1dq61485vbykwmzc1g4qk91qnl68w9h4xlpgl"; + rev = "1f7eaf5d5733e39fb37f8e0de2f7f15e242dd39c"; + sha256 = "1j68jvswd7gdva90ar3ldqrspg7r5m4wwv593g98l8yn6dkz9mrz"; }; meta.homepage = "https://github.com/chaoren/vim-wordmotion/"; }; @@ -11532,12 +11604,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2022-03-23"; + version = "2022-04-11"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "d6c9b8e06c1e7b3f14abc772ad61d73e687eede6"; - sha256 = "015jr832zwa7gcakbllifh3r45iyfywraswsm70vvbam165wwxph"; + rev = "a0a7dd335189c5ba0c6afee875c6713d70e6e3fc"; + sha256 = "09lpivh5a6n61ypw0n31ncy5bj4cpzvvn4s6666yjnpsmi2phsix"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -11724,12 +11796,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-04-03"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "da851334c72c44de95d00a152f98ee8e628be68f"; - sha256 = "16390g548y5bp6c08d481jafav83rbg4zd69r6fbfcnhzxmv7vhs"; + rev = "960f0444d21ebb20303e1796e4b478df042c3bd3"; + sha256 = "0sx2awi2b22j9wdyi8m1k261qlfj19i2xs93g5lb24lfb53rarmi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -11737,12 +11809,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-04-01"; + version = "2022-05-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "3c14f6912318ac3d92d32eca7d66c7c1c4f3e92c"; - sha256 = "1wnj1j38gs6xcdyhia6cmd010rv2g85s816hxd1qc1zlimfvi5gr"; + rev = "dfaca59bbbf0079ab1b4f159337ae7f17d1b5289"; + sha256 = "1sbsirrl822dp9z1vynkhzbd2yhid9vcr9yzp540qrp6flcvf10q"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11797,12 +11869,12 @@ final: prev: vista-vim = buildVimPluginFrom2Nix { pname = "vista.vim"; - version = "2021-11-15"; + version = "2022-04-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "a0469c645dcbe4033b857da27d35491f39e2f776"; - sha256 = "1i0j11lbqdych2914chb9rlmr902q52v400y3ifzi38g5md9zv3w"; + rev = "f9c8c8ad4135346a945e1ebfb00b723976d92dfc"; + sha256 = "0p7axng18xjkjz0m00lwhf59wa7gvn158l3c3g4sx7g6f6zh57n9"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -11833,36 +11905,36 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2022-03-18"; + version = "2022-05-04"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "a3c19ec5754debb7bf38a8404e36a9287b282430"; - sha256 = "00kkl785ifx5sg49q65d4yzdgf08gyriqrils5n4zhz4pksd5z1a"; + rev = "bd4411a2ed4dd8bb69c125e339d837028a6eea71"; + sha256 = "0vf685xgdb967wmvffk1pfrvbhg1jkvzp1kb7r0vs90mg8gpv1aj"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder.nvim"; - version = "2022-04-03"; + version = "2022-04-23"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "9c33d9423a3ba205ecdb90ce8a677c2b26f04908"; - sha256 = "19dv7ai4hs04m00w37d7bmb4c5zakfpj3mhgl15ddc6bpk3sbd7h"; + rev = "777b163e394ba658ef288292efb533b25610ef9d"; + sha256 = "1y7kii77jia3j9jlisjg2x1yfk8r048aas5zja0ag8nlyqldj8xh"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; wildfire-vim = buildVimPluginFrom2Nix { pname = "wildfire.vim"; - version = "2021-05-10"; + version = "2022-05-05"; src = fetchFromGitHub { owner = "gcmt"; repo = "wildfire.vim"; - rev = "fa91b732fd1c5acd23b7b32d5fbbc884eedafc8d"; - sha256 = "15gikqmpaf5c6687kgc5ib57pw7gyvxaihdv5549s7p2xkkbcl24"; + rev = "b371e2b1d938ae0e164146136051de164ecb9aa5"; + sha256 = "0lpv10330818aza0fv8adzswnq8jq47z043p6gqfn7b7h2visy5p"; }; meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; @@ -12014,12 +12086,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-03-15"; + version = "2022-05-01"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "dd5e2c2384d42eaffadd5a8fd749b0499a90a7ac"; - sha256 = "0qbjnmjf057phxkzhsyys9x0620szbgr3awqzgxr3cflyd1zhrf4"; + rev = "1cb9cd521cab91e39cf162b50b7a095fd12361d3"; + sha256 = "10flq5dm6aa5ay3rb2rn5y9ih8z66iq6lw2rl2489qxi605bxqs7"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; @@ -12038,36 +12110,36 @@ final: prev: zoxide-vim = buildVimPluginFrom2Nix { pname = "zoxide.vim"; - version = "2021-12-10"; + version = "2022-05-07"; src = fetchFromGitHub { owner = "nanotee"; repo = "zoxide.vim"; - rev = "c4e96f34b1b3160d6b6a6519588024412df27cd7"; - sha256 = "0zisr1r1z9ys0jkab1lvwy4klwkay07p0095f03r9qydnig8jgsm"; + rev = "5062d4c17ff873eeed88cabe317d7ee1a43c5731"; + sha256 = "1chq7fnygvb1wm7v0rg8cf0czn1q1i59kggg0jdvrnwf0f6m7nb4"; }; meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-03-20"; + version = "2022-04-18"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "f079dda3dc23450d69b4bad11bfbd9af2c77f6f3"; - sha256 = "1w0n96fbrkm3vdl64v1yzkly8wpcn5g9qflmpb8r1ww9hhig7a38"; + rev = "8a67df6da476cba68ecf26a519a5279686edbd2e"; + sha256 = "1w96rvpbm7lk9lcc5i13d6dyb5b10vkjh1902xmklqvpzy1wya19"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-04-05"; + version = "2022-05-13"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "e03f7c8cbaeb85272d2d3d2c24af5065be4f5e71"; - sha256 = "08971zkma4zwz5511vzhgi99000xin5psy1hkancxr4v2bw68dh3"; + rev = "b6ac01c187359e305a2df8caea540f4527b91ab2"; + sha256 = "14rp8h59bnwpi86nnkmhxsgyszhhd26fzra7wjni2agdhf2410zp"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -12086,24 +12158,24 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2022-03-28"; + version = "2022-04-08"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "a57dbdbd2790c52563e1194c17e6de38a0c941cf"; - sha256 = "07yzy4yjxaf59b6pyf05jrawvc4y37v2x07n1vfc2dbsxkxdygq1"; + rev = "d231d6f6ddb9c405ccf9ec2331deaf1d0b2c8d2a"; + sha256 = "0pbzjmywkxsfr3dw1gvaisnq87ryzk9565s4gj77yr8qrbjh1k1j"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2022-03-06"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "b6f47ae7031f6746a1f1918c17574aa12c474ef0"; - sha256 = "0m8rrm5v542a2c30sg7hlgm7r6gs4ah1n6nr5dc101l2064kg97g"; + rev = "34ad436b234c5095d46bb065c5b32780618df83f"; + sha256 = "11zp3w4n2iq97rx7fp7rlvykmx4k7swbbqpjphrx0il0fmghv6q8"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -12134,12 +12206,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-04-01"; + version = "2022-05-06"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "40c4fd7f5551710e388e0df85bb43d6e1627ca80"; - sha256 = "0ihzf18146q9bkqa22jq6xa2i394y6bn3fnjjgjz3zf8g8pcr6bl"; + rev = "aa69b6a3d77068542c613d96419c3241a9fcbf46"; + sha256 = "0x9pn109my5rw627qmf5xawy3n40l9n3l6hp6np77y2rqlpn8m3y"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -12156,4 +12228,5 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; + } diff --git a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh new file mode 100644 index 0000000000000..5b454e0ff01b9 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh @@ -0,0 +1,21 @@ +# Setup hook for checking whether Python imports succeed +echo "Sourcing neovim-require-check-hook.sh" + +neovimRequireCheckHook () { + echo "Executing neovimRequireCheckHook" + + if [ -n "$nvimRequireCheck" ]; then + echo "Check whether the following module can be imported: $nvimRequireCheck" + + # editorconfig-checker-disable + export HOME="$TMPDIR" + @nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \ + --cmd "set rtp+=$out" \ + --cmd "lua require('$nvimRequireCheck')" + fi +} + +echo "Using neovimRequireCheckHook" +preDistPhases+=" neovimRequireCheckHook" + + diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 8b55c1706939f..494d42a4c46ff 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -41,6 +41,8 @@ , ycmd , zoxide , nodejs +, xdotool +, xorg # test dependencies , neovim-unwrapped @@ -291,6 +293,10 @@ self: super: { ''; }); + fzf-lua = super.fzf-lua.overrideAttrs (old: { + propagatedBuildInputs = [ fzf ]; + }); + fzf-vim = super.fzf-vim.overrideAttrs (old: { dependencies = with self; [ fzfWrapper ]; }); @@ -321,6 +327,9 @@ self: super: { sed -Ei lua/plenary/curl.lua \ -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' ''; + + doInstallCheck = true; + nvimRequireCheck = "plenary"; }); gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { @@ -450,11 +459,8 @@ self: super: { --replace "code-minimap" "${code-minimap}/bin/code-minimap" ''; - doCheck = true; - checkPhase = '' - ${neovim-unwrapped}/bin/nvim -n -u NONE -i NONE -V1 --cmd "set rtp+=$out" --cmd "runtime! plugin/*.vim" -c "MinimapToggle" +quit! - ''; - + doInstallCheck = true; + vimCommandCheck = "MinimapToggle"; }); ncm2 = super.ncm2.overrideAttrs (old: { @@ -609,6 +615,14 @@ self: super: { ''; }; + stylish-nvim = super.stylish-nvim.overrideAttrs (old: { + postPatch = '' + substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace xdotool ${xdotool}/bin/xdotool + substituteInPlace lua/stylish/components/menu.lua --replace xdotool ${xdotool}/bin/xdotool + substituteInPlace lua/stylish/components/menu.lua --replace xwininfo ${xorg.xwininfo}/bin/xwininfo + ''; + }); + sved = let # we put the script in its own derivation to benefit the magic of wrapGAppsHook @@ -831,7 +845,7 @@ self: super: { libiconv ]; - cargoSha256 = "035v8mm8v7aj8qwhvxsp6k0afn05gi2xb1achzsvm0m4a8a9xs65"; + cargoSha256 = "0l1x7kprnxa95pbf8ml9ixmj0cmbnnv6nd0v6qry8j67rx8plpmp"; }; in '' @@ -960,7 +974,7 @@ self: super: { vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { pname = "vim-markdown-composer-bin"; inherit (super.vim-markdown-composer) src version; - cargoSha256 = "03d7kap6vha1jmyfrjqaja5439x6mhnvjjbz3rmxb3x4dpppbpj1"; + cargoSha256 = "0q0i6kyihswrjrfdj4p3z54b779sdg2wz38z943ypj6dqphhcklx"; }; in super.vim-markdown-composer.overrideAttrs (oldAttrs: rec { @@ -1116,8 +1130,10 @@ self: super: { "coc-emmet" "coc-eslint" "coc-explorer" + "coc-flutter" "coc-git" "coc-go" + "coc-haxe" "coc-highlight" "coc-html" "coc-imselect" diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index ad1c38cb375fa..1214e36372a62 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -26,19 +26,24 @@ from typing import List, Tuple from pathlib import Path log = logging.getLogger() -log.addHandler(logging.StreamHandler()) + +sh = logging.StreamHandler() +formatter = logging.Formatter('%(name)s:%(levelname)s: %(message)s') +sh.setFormatter(formatter) +log.addHandler(sh) # Import plugin update library from maintainers/scripts/pluginupdate.py ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")) import pluginupdate +from pluginupdate import run_nix_expr, PluginDesc GET_PLUGINS = f"""(with import <localpkgs> {{}}; let - inherit (vimUtils.override {{inherit vim;}}) buildVimPluginFrom2Nix; + inherit (vimUtils.override {{inherit vim;}}) buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix; generated = callPackage {ROOT}/generated.nix {{ - inherit buildVimPluginFrom2Nix; + inherit buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix; }}; hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value; getChecksum = name: value: @@ -50,43 +55,69 @@ let checksums = lib.mapAttrs getChecksum generated; in lib.filterAttrs (n: v: v != null) checksums)""" +GET_PLUGINS_LUA = """ +with import <localpkgs> {}; +lib.attrNames lua51Packages""" + HEADER = ( "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!" ) +def isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: + ''' + Whether it's a neovim-only plugin + We can check if it's available in lua packages + ''' + global luaPlugins + if plug.normalized_name in luaPlugins: + log.debug("%s is a neovim plugin", plug) + return True + return False + class VimEditor(pluginupdate.Editor): - def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str): + def generate_nix(self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str): sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower()) with open(outfile, "w+") as f: f.write(HEADER) f.write(textwrap.dedent(""" - { lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }: + { lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }: final: prev: - {""" + { + """ )) for pdesc, plugin in sorted_plugins: + content = self.plugin2nix(pdesc, plugin) + f.write(content) + f.write("\n}\n") + print(f"updated {outfile}") + + def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin) -> str: - repo = pdesc.repo - src_nix = repo.as_nix(plugin) - f.write( - f""" - {plugin.normalized_name} = buildVimPluginFrom2Nix {{ + repo = pdesc.repo + isNeovim = isNeovimPlugin(plugin) + + content = f" {plugin.normalized_name} = " + src_nix = repo.as_nix(plugin) + content += """{buildFn} {{ pname = "{plugin.name}"; version = "{plugin.version}"; src = {src_nix}; meta.homepage = "{repo.uri}"; }}; -""" - ) - f.write("\n}\n") - print(f"updated {outfile}") - +""".format( + buildFn="buildNeovimPluginFrom2Nix" if isNeovim else "buildVimPluginFrom2Nix", plugin=plugin, src_nix=src_nix, repo=repo) + print(content) + return content def main(): + + global luaPlugins + luaPlugins = run_nix_expr(GET_PLUGINS_LUA) + editor = VimEditor("vim", ROOT, GET_PLUGINS) parser = editor.create_parser() args = parser.parse_args() diff --git a/pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh b/pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh new file mode 100644 index 0000000000000..c4ddd8e0c5af7 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh @@ -0,0 +1,25 @@ +# Setup hook for checking whether a vim command exists +echo "Sourcing vim-command-check-hook.sh" + +vimCommandCheckHook () { + echo "Executing vimCommandCheckHook" + + if [ -n "$vimCommandCheck" ]; then + echo "Check whether the following modules can be imported: $vimCommandCheck" + + # editorconfig-checker-disable + export HOME="$TMPDIR" + @vimBinary@ -es -n -u NONE -i NONE --clean -V1 --cmd "set rtp+=$out" \ + --cmd "runtime! plugin/*.vim" <<-EOF + if exists(":$vimCommandCheck") == 2 + cquit 0 + else + cquit 1 + fi + EOF + fi +} + +echo "Using vimCommandCheckHook" +preDistPhases+=" vimCommandCheckHook" + diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 065063091a5c1..e3806c71a2f65 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -116,6 +116,7 @@ https://github.com/iamcco/coc-spell-checker/,, https://github.com/coc-extensions/coc-svelte/,, https://github.com/iamcco/coc-tailwindcss/,, https://github.com/neoclide/coc.nvim/,release, +https://github.com/manicmaniac/coconut.vim/,HEAD, https://github.com/metakirby5/codi.vim/,, https://github.com/tjdevries/colorbuddy.nvim/,, https://github.com/lilydjwg/colorizer/,, @@ -214,6 +215,7 @@ https://github.com/BeneCollyridam/futhark-vim/,, https://github.com/rktjmp/fwatch.nvim/,, https://github.com/stsewd/fzf-checkout.vim/,, https://github.com/gfanto/fzf-lsp.nvim/,, +https://github.com/ibhagwan/fzf-lua/,HEAD, https://github.com/junegunn/fzf.vim/,, https://github.com/NTBBloodbath/galaxyline.nvim/,, https://github.com/jsfaint/gen_tags.vim/,, @@ -531,6 +533,7 @@ https://github.com/chr4/sslsecure.vim/,, https://github.com/luukvbaal/stabilize.nvim/,, https://github.com/eigenfoo/stan-vim/,, https://github.com/darfink/starsearch.vim/,, +https://github.com/teto/stylish.nvim/,HEAD, https://github.com/lambdalisue/suda.vim/,, https://github.com/ervandew/supertab/,, https://github.com/ur4ltz/surround.nvim/,, @@ -784,6 +787,7 @@ https://github.com/maksimr/vim-jsbeautify/,, https://github.com/heavenshell/vim-jsdoc/,, https://github.com/elzr/vim-json/,, https://github.com/google/vim-jsonnet/,, +https://github.com/mogelbrod/vim-jsonpath/,HEAD, https://github.com/MaxMEllon/vim-jsx-pretty/,, https://github.com/peitalin/vim-jsx-typescript/,, https://github.com/knubie/vim-kitty-navigator/,, @@ -891,6 +895,7 @@ https://github.com/mhinz/vim-sayonara/,7e774f58c5865d9c10d40396850b35ab95af17c5, https://github.com/derekwyatt/vim-scala/,, https://github.com/thinca/vim-scouter/,, https://github.com/tpope/vim-scriptease/,, +https://github.com/inside/vim-search-pulse/,, https://github.com/tpope/vim-sensible/,, https://github.com/guns/vim-sexp/,, https://github.com/tpope/vim-sexp-mappings-for-regular-people/,, @@ -956,6 +961,7 @@ https://github.com/tpope/vim-vinegar/,, https://github.com/triglav/vim-visual-increment/,, https://github.com/mg979/vim-visual-multi/,, https://github.com/thinca/vim-visualstar/,, +https://github.com/ngemily/vim-vp4/,HEAD, https://github.com/hrsh7th/vim-vsnip/,, https://github.com/hrsh7th/vim-vsnip-integ/,, https://github.com/posva/vim-vue/,, diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index b291928f25aaf..9511e4da19520 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -521,8 +521,36 @@ rec { }; } ./vim-gen-doc-hook.sh) {}; - inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath vim vimGenDocHook; }) - buildVimPlugin buildVimPluginFrom2Nix; + vimCommandCheckHook = callPackage ({ neovim-unwrapped }: + makeSetupHook { + name = "vim-command-check-hook"; + deps = [ neovim-unwrapped ]; + substitutions = { + vimBinary = "${neovim-unwrapped}/bin/nvim"; + inherit rtpPath; + }; + } ./vim-command-check-hook.sh) {}; + + neovimRequireCheckHook = callPackage ({ neovim-unwrapped }: + makeSetupHook { + name = "neovim-require-check-hook"; + deps = [ neovim-unwrapped ]; + substitutions = { + nvimBinary = "${neovim-unwrapped}/bin/nvim"; + inherit rtpPath; + }; + } ./neovim-require-check-hook.sh) {}; + + inherit (import ./build-vim-plugin.nix { + inherit lib stdenv rtpPath vim vimGenDocHook vimCommandCheckHook neovimRequireCheckHook; + }) buildVimPlugin buildVimPluginFrom2Nix; + + + # TODO placeholder to ease working on automatic plugin detection + # this should be a luarocks "flat" install with appropriate vim hooks + buildNeovimPluginFrom2Nix = attrs: let drv = (buildVimPluginFrom2Nix attrs); in drv.overrideAttrs(oa: { + nativeBuildInputs = oa.nativeBuildInputs ++ [ neovimRequireCheckHook ]; + }); # used to figure out which python dependencies etc. neovim needs requiredPlugins = { diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index b9fcfe10221ed..a05b0e48e0be7 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, makeDesktopItem -, ncurses, libtermkey, lua -, acl ? null, libselinux ? null +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper +, copyDesktopItems, makeDesktopItem +, ncurses, libtermkey, lua, tre +, acl, libselinux }: let @@ -17,12 +18,13 @@ stdenv.mkDerivation rec { owner = "martanne"; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; buildInputs = [ ncurses libtermkey luaEnv + tre ] ++ lib.optionals stdenv.isLinux [ acl libselinux @@ -33,28 +35,27 @@ stdenv.mkDerivation rec { ''; postInstall = '' - mkdir -p "$out/share/applications" - cp $desktopItem/share/applications/* $out/share/applications - echo wrapping $out/bin/vis with runtime environment wrapProgram $out/bin/vis \ --prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ --prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \ --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" ''; - desktopItem = makeDesktopItem { - name = "vis"; - exec = "vis %U"; - type = "Application"; - icon = "accessories-text-editor"; - comment = meta.description; - desktopName = "vis"; - genericName = "Text editor"; - categories = [ "Application" "Development" "IDE" ]; - mimeTypes = [ "text/plain" "application/octet-stream" ]; - startupNotify = false; - terminal = true; - }; + desktopItems = [ + (makeDesktopItem { + name = "vis"; + exec = "vis %U"; + type = "Application"; + icon = "accessories-text-editor"; + comment = meta.description; + desktopName = "vis"; + genericName = "Text editor"; + categories = [ "Application" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "application/octet-stream" ]; + startupNotify = false; + terminal = true; + }) + ]; meta = with lib; { description = "A vim like editor"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ab5250a48e686..db018bfb67ef8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -67,6 +67,30 @@ let }; }; + adpyke.codesnap = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "codesnap"; + publisher = "adpyke"; + version = "1.3.4"; + sha256 = "sha256-dR6qODSTK377OJpmUqG9R85l1sf9fvJJACjrYhSRWgQ="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + alefragnani.bookmarks = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "bookmarks"; + publisher = "alefragnani"; + version = "13.0.1"; + sha256 = "sha256-4IZCPNk7uBqPw/FKT5ypU2QxadQzYfwbGxxT/bUnKdE="; + }; + meta = { + license = lib.licenses.gpl3; + }; + }; + alefragnani.project-manager = buildVscodeMarketplaceExtension { mktplcRef = { name = "project-manager"; @@ -554,8 +578,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.46.0"; - sha256 = "sha256-2FvE+6fnZPtR0At4NjLKSMCbPu8T7o8xtpvYiEjh7ck="; + version = "0.47.0"; + sha256 = "sha256-KtDJo8rhQXkZtJz93E+J7eNiAIcLk4e5qKDLoR3DoGw="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -698,8 +722,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "12.0.3"; - sha256 = "sha256-PHQXfk0JggkEBRflHp+OAUOCVuymCubaszfDCYbpfG0="; + version = "12.0.6"; + sha256 = "sha256-Q8l/GryB9iMhFnu5npUcDjWuImfrmVZF3xvm7nX/77Q="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -790,8 +814,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.3.0"; - sha256 = "sha256-hJgPjWf7a8+ltjmXTK8U/MwqgIZqBjmcCfHsAk2G3PA="; + version = "9.5.0"; + sha256 = "sha256-L/jW6xAnJ8v9Qq+iyQI8usGr8BoICR+2ENAMGQ05r0A="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -1123,8 +1147,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "5.10.1"; - sha256 = "sha256-LkWWgyh4khPyUgekVeO8ZzPK+1gTrS8d9Yz6/kHomr8="; + version = "6.0.1"; + sha256 = "sha256-1W1qKnjmyK80np+J6S/nku3QJGypxYnuE0BPw8Onzas="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; @@ -1242,8 +1266,8 @@ let mktplcRef = { name = "vscode-peacock"; publisher = "johnpapa"; - version = "4.0.0"; - sha256 = "1i65w70f0kikah1cx7m0bji6qd800jabfci0xisdqxyzaksg7ysz"; + version = "4.0.1"; + sha256 = "sha256-oYXYOamwacgRqv3+ZREJ1vqRlwMz8LpO+wa6CVEEdbI="; }; meta = with lib; { license = licenses.mit; @@ -1466,8 +1490,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.20.0"; - sha256 = "sha256-i3gYTP76YEDItG2oXR9pEXuGv0qmyf1Xv6HQvDBEOyg="; + version = "1.22.0"; + sha256 = "sha256-+cY9uLQ4oIk7V/4uCNc6BdIAQCXvPPGeqd0apbDjDos="; }; meta = { license = lib.licenses.mit; @@ -1699,8 +1723,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.14.1"; - sha256 = "sha256-OHXi0EfeyKMeFiMU5yg0aDoWds4ED0lb+l6T12XZ3LQ="; + version = "4.16.0"; + sha256 = "sha256-AOHvWoVB26caNgEEnKBhw5Z/tRtaTSeVLkO6Rlc/kqo="; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix index d4200c335524c..8aa121cbe2032 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix @@ -43,7 +43,6 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens }; }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ - bash jq autoPatchelfHook makeWrapper diff --git a/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix index 3bfc94bb6ea4c..ae9cbb7fb095d 100644 --- a/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix +++ b/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix @@ -37,8 +37,8 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "remote-ssh"; publisher = "ms-vscode-remote"; - version = "0.66.1"; - sha256 = "sha256-+v4UnGRG5xOc8k0IzvHUBHa128fhgd3jcmEuciiMQmI="; + version = "0.78.0"; + sha256 = "sha256-vd+9d86Z8429QpQVCZm8gtiJDcMpD++aiFVwvCrPg5w="; }; postPatch = '' diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json b/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json index f12db30a6a3d1..5ccc6f2fa4141 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json @@ -1,19 +1,19 @@ { "name": "rust-analyzer", - "version": "0.2.975", + "version": "0.2.1048", "dependencies": { - "vscode-languageclient": "8.0.0-next.8", + "vscode-languageclient": "8.0.0-next.14", "d3": "^7.3.0", - "d3-graphviz": "^4.0.0", + "d3-graphviz": "^4.1.0", "@types/node": "~14.17.5", - "@types/vscode": "~1.63.0", - "@typescript-eslint/eslint-plugin": "^5.10.0", - "@typescript-eslint/parser": "^5.10.0", - "@vscode/test-electron": "^2.1.1", - "eslint": "^8.7.0", + "@types/vscode": "~1.66.0", + "@typescript-eslint/eslint-plugin": "^5.16.0", + "@typescript-eslint/parser": "^5.16.0", + "@vscode/test-electron": "^2.1.3", + "eslint": "^8.11.0", "tslib": "^2.3.0", - "typescript": "^4.5.5", + "typescript": "^4.6.3", "typescript-formatter": "^7.2.2", - "vsce": "^2.6.7" + "vsce": "^2.7.0" } } diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh b/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh index 0c06f903dfb4b..69e6e5cd0f859 100755 --- a/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh +++ b/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh @@ -5,7 +5,7 @@ set -euo pipefail cd "$(dirname "$0")" nixpkgs=../../../../../../ node_packages="$nixpkgs/pkgs/development/node-packages" -owner=rust-analyzer +owner=rust-lang repo=rust-analyzer ver=$( curl -s "https://api.github.com/repos/$owner/$repo/releases" | @@ -22,7 +22,7 @@ if [[ "$(nix-instantiate --eval --strict -E "(builtins.compareVersions \"$req_vs exit 1 fi -extension_ver=$(curl "https://github.com/rust-analyzer/rust-analyzer/releases/download/$ver/rust-analyzer-linux-x64.vsix" -L | +extension_ver=$(curl "https://github.com/$owner/$repo/releases/download/$ver/rust-analyzer-linux-x64.vsix" -L | bsdtar -xf - --to-stdout extension/package.json | # Use bsdtar to extract vsix(zip). jq --raw-output '.version') echo "Extension version: $extension_ver" diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index d704497b4f0c7..e100318005021 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem -, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook +, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper , atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap , writeShellScriptBin @@ -66,9 +66,14 @@ let buildInputs = [ libsecret libXScrnSaver libxshmfence ] ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages); - runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; + runtimeDependencies = lib.optional stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; - nativeBuildInputs = [unzip] ++ lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook wrapGAppsHook ]; + nativeBuildInputs = [ unzip ] + ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + nodePackages.asar + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + ]; dontBuild = true; dontConfigure = true; @@ -114,12 +119,18 @@ let # this is a fix for "save as root" functionality packed="resources/app/node_modules.asar" unpacked="resources/app/node_modules" - ${nodePackages.asar}/bin/asar extract "$packed" "$unpacked" + asar extract "$packed" "$unpacked" substituteInPlace $unpacked/@vscode/sudo-prompt/index.js \ --replace "/usr/bin/pkexec" "/run/wrappers/bin/pkexec" \ --replace "/bin/bash" "${bash}/bin/bash" rm -rf "$packed" + # without this symlink loading JsChardet, the library that is used for auto encoding detection when files.autoGuessEncoding is true, + # fails to load with: electron/js2c/renderer_init: Error: Cannot find module 'jschardet' + # and the window immediately closes which renders VSCode unusable + # see https://github.com/NixOS/nixpkgs/issues/152939 for full log + ln -rs "$unpacked" "$packed" + # this fixes bundled ripgrep chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg ''; diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index 377068c08214e..c7d9c1068b14a 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -14,23 +14,27 @@ if [ ! -f "$ROOT/vscodium.nix" ]; then exit 1 fi +update_vscodium () { + VSCODIUM_VER=$1 + ARCH=$2 + ARCH_LONG=$3 + ARCHIVE_FMT=$4 + VSCODIUM_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-${ARCH}-${VSCODIUM_VER}.${ARCHIVE_FMT}" + VSCODIUM_SHA256=$(nix-prefetch-url ${VSCODIUM_URL}) + sed -i "s/${ARCH_LONG} = \".\{52\}\"/${ARCH_LONG} = \"${VSCODIUM_SHA256}\"/" "$ROOT/vscodium.nix" +} + # VSCodium VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}') sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix" -VSCODIUM_LINUX_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz" -VSCODIUM_LINUX_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_X64_URL}) -sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_X64_SHA256}\"/" "$ROOT/vscodium.nix" +update_vscodium $VSCODIUM_VER linux-x64 x86_64-linux tar.gz + +update_vscodium $VSCODIUM_VER darwin-x64 x86_64-darwin zip -VSCODIUM_DARWIN_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-x64-${VSCODIUM_VER}.zip" -VSCODIUM_DARWIN_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_X64_URL}) -sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_X64_SHA256}\"/" "$ROOT/vscodium.nix" +update_vscodium $VSCODIUM_VER linux-arm64 aarch64-linux tar.gz -VSCODIUM_LINUX_AARCH64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-arm64-${VSCODIUM_VER}.tar.gz" -VSCODIUM_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_AARCH64_URL}) -sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODIUM_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscodium.nix" +update_vscodium $VSCODIUM_VER darwin-arm64 aarch64-darwin zip -VSCODIUM_LINUX_ARMV7L_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-armhf-${VSCODIUM_VER}.tar.gz" -VSCODIUM_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_ARMV7L_URL}) -sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODIUM_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscodium.nix" +update_vscodium $VSCODIUM_VER linux-armhf armv7l-linux tar.gz diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 46864a05570d9..1604cc901e41b 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1j75ivy7lwxjpfhwsikk517a9bxhrbwfy8f8liql392839qryblj"; - x86_64-darwin = "0sjsrm31rbgq9j6hnry8f69mhhwlsd7drzz5jr31ljk75vgx3j8f"; - aarch64-linux = "1ll28djzf5xvc0yin1irxzn3nkizpgfz0azknaycjar261q3akdp"; - aarch64-darwin = "0mfhbdmz0db851mab83dmq654gwgdz9p20igwm9g5h4y6zrvdhg6"; - armv7l-linux = "1vicvzdj83vcj64rla9v5n9bmi0wgz507xxch3anjszah3n7ld89"; + x86_64-linux = "1db5vwcwi3w11zm2b72cvddn5k9yav65rg7ii9wq4a0dym39f8ql"; + x86_64-darwin = "1q5vjisdc0q5vigb1lwq8fkxbaar73jnk4ac0fqlhc4gqacz3cs3"; + aarch64-linux = "01lcvjw9nfgp93ydl16bp91gbkivd23jn8pan220fjvdsgvcbg48"; + aarch64-darwin = "06p6p2c9a3rav9c23pvfn8mmd77wc9z7pavpmkgm1f3wplx48q8q"; + armv7l-linux = "0pzim9r2zzwyim3g6f8ixgqllgz4cijaiw76czi0wmz4dxxdljrw"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.66.1"; + version = "1.67.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 50bfcc48f2f59..9fde99f3f58a1 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -7,31 +7,28 @@ let x86_64-linux = "linux-x64"; x86_64-darwin = "darwin-x64"; aarch64-linux = "linux-arm64"; + aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-armhf"; }.${system}; - archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; + archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0r5bzy1r9f0rp2wvcb703vpcfclqn8d4n9g8p9021hz0llslfha7"; - x86_64-darwin = "15aawk2b7a5dack2bgnp4axki8y3n0ilncww15sjnvwbgk94d4pg"; - aarch64-linux = "0kq39jx9nrfikcfcylz2gcg2d89yw6gf9sc8blyg1yfimfr9jcjv"; - armv7l-linux = "0581ksdb1j9xsin7s505gk9kxhf3i5dw8yvyfkxck84wrrvfh6pq"; + x86_64-linux = "0hsq3b8j58xjl8pkrd5x3qh0lsl9gwbd9wgvhzlnx2h94iasr1v5"; + x86_64-darwin = "04fbl8kp3af7xcicx17ay2piwy4y3yiyn9723hlmmf7s359rr1wn"; + aarch64-linux = "0jljsa61zr3symfdsjx9jj4s3y1kqslxh8gc1gqx45zlm5rzr7k8"; + aarch64-darwin = "1swkc0qb1xif8hj6cjp3jq1iqdfqsa681hhp7mxvrpqg0i2zppk3"; + armv7l-linux = "1ssbdc4b11xmd45m7bzhdh6szx331pzah2mjpqjg7cz3ray3xvwy"; }.${system}; - sourceRoot = { - x86_64-linux = "."; - x86_64-darwin = ""; - aarch64-linux = "."; - armv7l-linux = "."; - }.${system}; + sourceRoot = if stdenv.isDarwin then "" else "."; in callPackage ./generic.nix rec { inherit sourceRoot; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.66.1"; + version = "1.67.1"; pname = "vscodium"; executableName = "codium"; @@ -63,6 +60,7 @@ in downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; maintainers = with maintainers; [ synthetica turion bobby285271 ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ]; + mainProgram = "codium"; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/editors/xedit/default.nix b/pkgs/applications/editors/xedit/default.nix index 5de0aed340493..5971c3a6e5d9d 100644 --- a/pkgs/applications/editors/xedit/default.nix +++ b/pkgs/applications/editors/xedit/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "xedit"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "xorg/app"; repo = "xedit"; rev = "${pname}-${version}"; - sha256 = "0b5ic13aasv6zh20v2k7zyxsqbnsxfq5rs3w8nwzl1gklmgrjxa3"; + sha256 = "sha256-WF+4avzRRL0+OA3KxzK7JwmArkPu9fEl+728R6ouXmg="; }; nativeBuildInputs = [ autoreconfHook pkg-config utilmacros ]; diff --git a/pkgs/applications/emulators/ares/default.nix b/pkgs/applications/emulators/ares/default.nix deleted file mode 100644 index 33a7858455d67..0000000000000 --- a/pkgs/applications/emulators/ares/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, alsa-lib -, gtksourceview3 -, libXv -, openal -, libpulseaudio -, libao -, udev -, SDL2 -}: - -stdenv.mkDerivation rec { - pname = "ares"; - version = "126"; - - src = fetchFromGitHub { - owner = "ares-emulator"; - repo = "ares"; - rev = "v${version}"; - sha256 = "1rj4vmz8lvpmfc6wni7222kagnw9f6jda9rcb6qky2kpizlp2d24"; - }; - - parallel-rdp = fetchFromGitHub { - owner = "Themaister"; - repo = "parallel-rdp-standalone"; - rev = "0dcebe11ee79288441e40e145c8f340d81f52316"; - sha256 = "1avp4wyfkhk5yfjqx5w3jbqghn2mq5la7k9248kjmnp9n9lip6w9"; - }; - - patches = [ - ./fix-ruby.patch - ]; - - enableParallelBuilding = true; - dontConfigure = true; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - alsa-lib - gtksourceview3 - libXv - openal - libpulseaudio - libao - udev - SDL2 - ]; - - buildPhase = '' - runHook preBuild - - rm -rf ares/n64/vulkan/parallel-rdp - ln -sf ${parallel-rdp} ares/n64/vulkan/parallel-rdp - make -C desktop-ui -j $NIX_BUILD_CORES openmp=true vulkan=true local=false hiro=gtk3 - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,share/{applications,ares,pixmaps}} - cp desktop-ui/out/ares $out/bin - cp desktop-ui/resource/ares.desktop $out/share/applications - cp desktop-ui/resource/{ares{.ico,.png},font.png} $out/share/pixmaps - cp -r ares/{Shaders,System} $out/share/ares - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://ares.dev"; - description = "Open-source multi-system emulator with a focus on accuracy and preservation"; - license = licenses.isc; - maintainers = with maintainers; [ Madouura ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/emulators/basiliskii/default.nix b/pkgs/applications/emulators/basiliskii/default.nix new file mode 100644 index 0000000000000..ec7076db46787 --- /dev/null +++ b/pkgs/applications/emulators/basiliskii/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2 }: +stdenv.mkDerivation { + pname = "basiliskii"; + version = "unstable-2022-04-05"; + + src = fetchFromGitHub { + owner = "kanjitalk755"; + repo = "macemu"; + rev = "d4baa318e49a29d7ea5fc71a637191d6c470546f"; + sha256 = "jBKTC2fIPJ6mSkMABNxcd2ujXJ+duCXw291iz5ZmiVg="; + }; + sourceRoot = "source/BasiliskII/src/Unix"; + patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; + buildInputs = [ SDL2 gtk2 ]; + preConfigure = '' + NO_CONFIGURE=1 ./autogen.sh + ''; + configureFlags = [ "--enable-sdl-video" "--enable-sdl-audio" "--with-bincue" ]; + + meta = with lib; { + description = "68k Macintosh emulator"; + homepage = "https://basilisk.cebix.net/"; + license = licenses.gpl2; + maintainers = with maintainers; [ quag ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch b/pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch new file mode 100644 index 0000000000000..8535d6227c298 --- /dev/null +++ b/pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch @@ -0,0 +1,10 @@ +diff --git a/Linux/scsi_linux.cpp b/Linux/scsi_linux.cpp +--- a/Linux/scsi_linux.cpp ++++ b/Linux/scsi_linux.cpp +@@ -22,5 +22,5 @@ + #include <sys/ioctl.h> + #include <linux/param.h> +-#include <linux/../scsi/sg.h> // workaround for broken RedHat 6.0 /usr/include/scsi ++#include <scsi/sg.h> + #include <unistd.h> + #include <errno.h> diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix new file mode 100644 index 0000000000000..c1597fe2c6eeb --- /dev/null +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, SDL2 +, alsa-lib +, gtk3 +, gtksourceview3 +, libGL +, libGLU +, libX11 +, libXv +, libao +, libpulseaudio +, openal +, udev +}: + +stdenv.mkDerivation rec { + pname = "ares"; + version = "127"; + + src = fetchFromGitHub { + owner = "ares-emulator"; + repo = "ares"; + rev = "v${version}"; + sha256 = "0rhq39w41j9yr1fkyfmf4n6fjxnq1cglj98rp4wys12kwqv7smvx"; + }; + + patches = [ + ./dont-rebuild-on-install.patch + ./fix-ruby.patch + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + SDL2 + alsa-lib + gtk3 + gtksourceview3 + libGL + libGLU + libX11 + libXv + libao + libpulseaudio + openal + udev + ]; + + enableParallelBuilding = true; + + makeFlags = [ + "-C desktop-ui" + "local=false" + "openmp=true" + "hiro=gtk3" + "prefix=$(out)" + ]; + + meta = with lib; { + homepage = "https://ares.dev"; + description = "Open-source multi-system emulator with a focus on accuracy and preservation"; + license = licenses.isc; + maintainers = with maintainers; [ Madouura ]; + platforms = platforms.linux; + }; +} +# TODO: select between Qt, GTK2 and GTK3 +# TODO: support Darwin diff --git a/pkgs/applications/emulators/bsnes/ares/dont-rebuild-on-install.patch b/pkgs/applications/emulators/bsnes/ares/dont-rebuild-on-install.patch new file mode 100644 index 0000000000000..7b6bbfc21bdc2 --- /dev/null +++ b/pkgs/applications/emulators/bsnes/ares/dont-rebuild-on-install.patch @@ -0,0 +1,22 @@ +From 65cc7647110edd768e7baa7991143014316e655a Mon Sep 17 00:00:00 2001 +From: Madoura <93990818+Madouura@users.noreply.github.com> +Date: Mon, 9 May 2022 10:17:06 -0500 +Subject: [PATCH] Update GNUmakefile + +--- + desktop-ui/GNUmakefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile +index 8e27b11d3..0bee561fb 100644 +--- a/desktop-ui/GNUmakefile ++++ b/desktop-ui/GNUmakefile +@@ -106,7 +106,7 @@ endif + $(call rdelete,$(object.path)) + $(call rdelete,$(output.path)) + +-install: all ++install: + ifeq ($(platform),windows) + $(call mkdir,$(prefix)/$(name)/) + else ifeq ($(shell id -un),root) diff --git a/pkgs/applications/emulators/ares/fix-ruby.patch b/pkgs/applications/emulators/bsnes/ares/fix-ruby.patch index 01bd57ebaaddf..01bd57ebaaddf 100644 --- a/pkgs/applications/emulators/ares/fix-ruby.patch +++ b/pkgs/applications/emulators/bsnes/ares/fix-ruby.patch diff --git a/pkgs/applications/emulators/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix index 6494185958c29..6494185958c29 100644 --- a/pkgs/applications/emulators/bsnes-hd/default.nix +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix diff --git a/pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch b/pkgs/applications/emulators/bsnes/bsnes-hd/macos-copy-app-to-prefix.patch index d38efbc99bce1..d38efbc99bce1 100644 --- a/pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/macos-copy-app-to-prefix.patch diff --git a/pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch b/pkgs/applications/emulators/bsnes/bsnes-hd/macos-replace-sips-with-png2icns.patch index 85adb33e3ab4f..85adb33e3ab4f 100644 --- a/pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/macos-replace-sips-with-png2icns.patch diff --git a/pkgs/applications/emulators/higan/001-include-cmath.patch b/pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch index 67644e656aa79..67644e656aa79 100644 --- a/pkgs/applications/emulators/higan/001-include-cmath.patch +++ b/pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch diff --git a/pkgs/applications/emulators/higan/002-sips-to-png2icns.patch b/pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch index 0585c8a38c725..0585c8a38c725 100644 --- a/pkgs/applications/emulators/higan/002-sips-to-png2icns.patch +++ b/pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch diff --git a/pkgs/applications/emulators/higan/default.nix b/pkgs/applications/emulators/bsnes/higan/default.nix index c5f38a040c1fc..c5f38a040c1fc 100644 --- a/pkgs/applications/emulators/higan/default.nix +++ b/pkgs/applications/emulators/bsnes/higan/default.nix diff --git a/pkgs/applications/emulators/citra/default.nix b/pkgs/applications/emulators/citra/default.nix index 92d0f5b1d3648..31f5ebc3038ca 100644 --- a/pkgs/applications/emulators/citra/default.nix +++ b/pkgs/applications/emulators/citra/default.nix @@ -77,9 +77,11 @@ stdenv.mkDerivation { chmod -R a+w externals/zstd ''; - # Todo: cubeb audio backend (the default one) doesn't work on the SDL interface. - # This seems to be a problem with libpulseaudio, other applications have similar problems (e.g Duckstation). - # Note that the two interfaces have two separate configuration files. + # Fixes https://github.com/NixOS/nixpkgs/issues/171173 + postInstall = lib.optionalString (enableCubeb && enableSdl2) '' + wrapProgram "$out/bin/citra" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio ]} + ''; meta = with lib; { homepage = "https://citra-emu.org"; diff --git a/pkgs/applications/emulators/commanderx16/emulator.nix b/pkgs/applications/emulators/commanderx16/emulator.nix index 73442215ff1ea..d070c86eef8ce 100644 --- a/pkgs/applications/emulators/commanderx16/emulator.nix +++ b/pkgs/applications/emulators/commanderx16/emulator.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "x16-emulator"; - version = "38"; + version = "40"; src = fetchFromGitHub { owner = "commanderx16"; repo = pname; rev = "r${version}"; - sha256 = "WNRq/m97NpOBWIk6mtxBAKmkxCGWacWjXeOvIhBrkYE="; + hash = "sha256-7ZzVd2NJCFNAFrS2cj6bxcq/AzO5VakoFX9o1Ac9egg="; }; dontConfigure = true; @@ -21,17 +21,20 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -D --mode 755 --target-directory $out/bin/ x16emu - install -D --mode 444 --target-directory $out/share/doc/${pname} README.md + + install -Dm 755 -t $out/bin/ x16emu + install -Dm 444 -t $out/share/doc/${pname} README.md + runHook postInstall ''; meta = with lib; { - homepage = "https://www.commanderx16.com/forum/index.php?/home/"; description = "The official emulator of CommanderX16 8-bit computer"; + homepage = "https://www.commanderx16.com/forum/index.php?/home/"; license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; - platforms = SDL2.meta.platforms; + mainProgram = "x16emu"; + inherit (SDL2.meta) platforms; }; passthru = { diff --git a/pkgs/applications/emulators/commanderx16/rom.nix b/pkgs/applications/emulators/commanderx16/rom.nix index 5da77ebceefe2..617c0a16b83c5 100644 --- a/pkgs/applications/emulators/commanderx16/rom.nix +++ b/pkgs/applications/emulators/commanderx16/rom.nix @@ -2,20 +2,24 @@ , lib , fetchFromGitHub , cc65 +, python3 }: stdenv.mkDerivation rec { pname = "x16-rom"; - version = "38"; + version = "40"; src = fetchFromGitHub { owner = "commanderx16"; repo = pname; rev = "r${version}"; - sha256 = "xaqF0ppB7I7ST8Uh3jPbC14uRAb/WH21tHlNeTvYpoI="; + hash = "sha256-5oqttuTJiJOUENncOJipAar22OsI1uG3G69m+eYoSh0="; }; - nativeBuildInputs = [ cc65 ]; + nativeBuildInputs = [ + cc65 + python3 + ]; postPatch = '' patchShebangs scripts/ @@ -25,8 +29,10 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -D --mode 444 --target-directory $out/share/${pname} build/x16/rom.bin - install -D --mode 444 --target-directory $out/share/doc/${pname} README.md + + install -Dm 444 -t $out/share/${pname} build/x16/rom.bin + install -Dm 444 -t $out/share/doc/${pname} README.md + runHook postInstall ''; @@ -35,7 +41,7 @@ stdenv.mkDerivation rec { description = "ROM file for CommanderX16 8-bit computer"; license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; - platforms = cc65.meta.platforms; + inherit (cc65.meta) platforms; }; passthru = { diff --git a/pkgs/applications/emulators/dgen-sdl/default.nix b/pkgs/applications/emulators/dgen-sdl/default.nix index e56ca12a4e96e..cbcdad4a3c2bb 100644 --- a/pkgs/applications/emulators/dgen-sdl/default.nix +++ b/pkgs/applications/emulators/dgen-sdl/default.nix @@ -1,39 +1,41 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , libarchive , SDL }: -let +stdenv.mkDerivation rec { pname = "dgen-sdl"; version = "1.33"; -in stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "https://sourceforge.net/projects/dgen/files/dgen/${version}/${pname}-${version}.tar.gz"; hash = "sha256-meLAYBfCKHPHf4gYbrzAmGckTrbgQsdjuwlLArje9h4="; }; - buildInputs = [ SDL libarchive ]; + buildInputs = [ + SDL + libarchive + ]; configureFlags = [ - "--enable-joystick" - "--enable-debugger" "--enable-debug-vdp" + "--enable-debugger" + "--enable-joystick" "--enable-pico" # experimental "--enable-vgmdump" - "--with-star=no" # Needs ASM support - "--with-musa" "--with-cyclone=no" # Needs ASM support - "--with-mz80" "--with-cz80" "--with-drz80=no" # Needs ASM support "--with-dz80" + "--with-musa" + "--with-mz80" + "--with-star=no" # Needs ASM support ]; meta = with lib; { - homepage = "https://dgen.sourceforge.net/"; + homepage = "http://dgen.sourceforge.net/"; description = "Sega Genesis/Mega Drive emulator"; longDescription = '' DGen/SDL is a free, open source emulator for Sega Genesis/Mega Drive diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index be3e7f555f8f4..8780975a84ad5 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake , wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext -, libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama +, libXrandr, libusb1, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsa-lib -, miniupnpc, enet, mbedtls, soundtouch, sfml, writeScript +, miniupnpc, enet, mbedtls, soundtouch, sfml, xz, writeScript , vulkan-loader ? null, libpulseaudio ? null # - Inputs used for Darwin @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { buildInputs = [ curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio - libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo - portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml + libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp + portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml xz qtbase ] ++ lib.optionals stdenv.isLinux [ bluez udev libevdev alsa-lib vulkan-loader diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index 90510d645226f..fdfc6d44ecade 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -14,7 +14,6 @@ , gettext , libXrandr , libusb1 -, lzo , libpthreadstubs , libXext , libXxf86vm @@ -34,6 +33,7 @@ , soundtouch , sfml , fmt +, xz , vulkan-loader , libpulseaudio @@ -81,7 +81,6 @@ stdenv.mkDerivation rec { readline openal libXdmcp - lzo portaudio libusb1 libpng @@ -92,6 +91,7 @@ stdenv.mkDerivation rec { soundtouch sfml fmt + xz qtbase ] ++ lib.optionals stdenv.isLinux [ bluez diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 8e4d909a724ac..45bb9ed74f9f6 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -90,8 +90,9 @@ mkDerivation rec { runHook postCheck ''; + # Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173 qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}" ]; meta = with lib; { @@ -102,5 +103,3 @@ mkDerivation rec { platforms = platforms.linux; }; } -# TODO: default sound backend (cubeb) does not work, but SDL does. Strangely, -# switching to cubeb while a game is running makes it work. diff --git a/pkgs/applications/emulators/emulationstation/default.nix b/pkgs/applications/emulators/emulationstation/default.nix index 4cb5ca9ec2e68..2acb81cf032f3 100644 --- a/pkgs/applications/emulators/emulationstation/default.nix +++ b/pkgs/applications/emulators/emulationstation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost, eigen +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost169, eigen , freeimage, freetype, libGLU, libGL, SDL2, alsa-lib, libarchive , fetchpatch }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ alsa-lib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; + buildInputs = [ alsa-lib boost169 curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; installPhase = '' install -D ../emulationstation $out/bin/emulationstation diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/applications/emulators/flycast/default.nix index 67ba4590db62e..fd5123d05fa2b 100644 --- a/pkgs/applications/emulators/flycast/default.nix +++ b/pkgs/applications/emulators/flycast/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "flycast"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; rev = "v${version}"; - sha256 = "sha256-MzHAGK++oukIs84OR/l6gBwCJssdi8Iyte5Rtro2+Q0="; + sha256 = "sha256-FAHm8Fu/yv2rJvWCY+g50TYH4zOT6rO7F+jTL2T6EOU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index a024433e3edff..bf6426f3121f4 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.242"; + version = "0.243"; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}"; - sha256 = "sha256-06iKM9cpjXuNvChQTPjhb9oQptC4KTZEoxzZk8+x3/k="; + sha256 = "sha256-dUgYLNvgvolz9M0ySkGJIZjVMBQwejkxsZ6npg8rIqk="; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix index 2e22e7d9053a9..a5ff1106fd688 100644 --- a/pkgs/applications/emulators/pcsx2/default.nix +++ b/pkgs/applications/emulators/pcsx2/default.nix @@ -12,7 +12,9 @@ , libpng , libpulseaudio , libsamplerate -, libxml2 +, libXdmcp +, openssl +, pcre , perl , pkg-config , portaudio @@ -20,6 +22,8 @@ , soundtouch , stdenv , udev +, vulkan-headers +, vulkan-loader , wrapGAppsHook , wxGTK , zlib @@ -28,14 +32,14 @@ stdenv.mkDerivation rec { pname = "pcsx2"; - version = "1.7.2105"; + version = "1.7.2731"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; fetchSubmodules = true; rev = "v${version}"; - hash = "sha256-/A8u7oDIVs0Zmne0ebaXxOeIQbM9pr62KEH6FJR2umk="; + hash = "sha256-b3cK3ly9J44YMy/cNprlDCSsu8+DrlhRSLXv5xMouWo="; }; cmakeFlags = [ @@ -44,9 +48,10 @@ stdenv.mkDerivation rec { "-DPACKAGE_MODE=TRUE" "-DWAYLAND_API=TRUE" "-DXDG_STD=TRUE" + "-DUSE_VULKAN=TRUE" ]; - nativeBuildInputs = [ cmake perl pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ cmake perl pkg-config vulkan-headers wrapGAppsHook ]; buildInputs = [ alsa-lib @@ -60,16 +65,29 @@ stdenv.mkDerivation rec { libpng libpulseaudio libsamplerate - libxml2 + libXdmcp + openssl + pcre portaudio SDL2 soundtouch udev + vulkan-loader wayland wxGTK zlib ]; + # Wayland doesn't seem to work right now (crashes when booting a game). + # Try removing `--prefix GDK_BACKEND : x11` on the next update. + # (This may be solved when the project finshes migrating to Qt) + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} + --prefix GDK_BACKEND : x11 + ) + ''; + meta = with lib; { description = "Playstation 2 emulator"; longDescription = '' @@ -81,13 +99,12 @@ stdenv.mkDerivation rec { ''; homepage = "https://pcsx2.net"; maintainers = with maintainers; [ hrdinka govanify ]; - mainProgram = "PCSX2"; # PCSX2's source code is released under LGPLv3+. It However ships # additional data files and code that are licensed differently. # This might be solved in future, for now we should stick with # license.free license = licenses.free; - platforms = platforms.x86; + platforms = platforms.x86_64; }; } diff --git a/pkgs/applications/emulators/proton-caller/default.nix b/pkgs/applications/emulators/proton-caller/default.nix index 14c5b7be73181..22bc7054da388 100644 --- a/pkgs/applications/emulators/proton-caller/default.nix +++ b/pkgs/applications/emulators/proton-caller/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/caverym/proton-caller"; license = licenses.mit; maintainers = with maintainers; [ kho-dialga ]; + mainProgram = "proton-call"; }; } diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 64de314c760f0..b553640d144e8 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -56,7 +56,7 @@ let , stdenvOverride ? stdenv , src ? (getCoreSrc core) , broken ? false - , version ? "unstable-2022-04-08" + , version ? "unstable-2022-04-21" , platforms ? retroarch.meta.platforms # The resulting core file is based on core name # Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename @@ -359,6 +359,7 @@ in core = "dosbox"; description = "Port of DOSBox to libretro"; license = lib.licenses.gpl2Only; + stdenvOverride = gcc10Stdenv; }; eightyone = mkLibRetroCore { diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index c32f46cf26653..e9aa7d80d57fc 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -35,11 +35,11 @@ }: let - version = "1.10.2"; + version = "1.10.3"; libretroCoreInfo = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; - sha256 = "sha256-XOSIVH3BSwAFKUeRvyYc2OXDa+TLjoKVGl+b8fgnvtY="; + sha256 = "sha256-wIIMEWrria8bZe/rcoJwDA9aCMWwbkDQFyEU80TZXFQ="; rev = "v${version}"; }; runtimeLibs = lib.optional withVulkan vulkan-loader @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "sha256-fMsHMQiEoXeFKITxeEyRH829z5SCf8p0Hxq6ww1p3z4="; + sha256 = "sha256-nAv1yv0laqlOmB8UUkK5wSYy/ySqXloEErm+yV30bbA="; rev = "v${version}"; }; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 78969df95d30f..80e4e278c9451 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -20,8 +20,8 @@ "beetle-ngp": { "owner": "libretro", "repo": "beetle-ngp-libretro", - "rev": "6abc74d9dc6a86460ab71c93c153fe1cb8ef4dbb", - "sha256": "+p3MwlzwwTghIKTDMzkqGlxhZiy/Px7xaDK3a0JagUE=" + "rev": "facf8e1f5440c5d289258ee3c483710f3bf916fb", + "sha256": "vDKDt7MvCB9XQYP291cwcEPDxfNIVgNSWtBYz9PVgcw=" }, "beetle-pce-fast": { "owner": "libretro", @@ -32,20 +32,20 @@ "beetle-pcfx": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "00abc26cafb15cc33dcd73f4bd6b93cbaab6e1ea", - "sha256": "4a1wV3WKZmg1ed3BD0PN0Ap9E9XahQtilRWTGV5Ns3g=" + "rev": "bfc0954e14b261a04dcf8dbe0df8798f16ae3f3c", + "sha256": "XzCb1lZFYgsg+3eQ1OqyycNxCgLtZFA30rno3ytdnoM=" }, "beetle-psx": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "88929ae90b4807a41b1b240377ab440e39ecf2cc", - "sha256": "5AX5FPsmsqGWCNzLgJ7lsekZaIdano2j5sb4qUkD4cQ=" + "rev": "5a24d54d30dd00d817d267cf92fd5b3f4640928f", + "sha256": "uG1BhElNW75PnfM+rEYfbl97iwRT89hnl84yvlgx6fg=" }, "beetle-saturn": { "owner": "libretro", "repo": "beetle-saturn-libretro", - "rev": "ae30f29e340a00b33e38df85ceaa599151a47cd7", - "sha256": "nc239PRM/TfkZMWm4Zl5kSoZBQcrMcMudupvCJtTBlc=" + "rev": "dd18f9c477106263b3b7b050f4970d331ff7b23a", + "sha256": "RN5dmORtNOjIklSz/n11lz37bZ4IcPD7cyRcBGS4Oi8=" }, "beetle-snes": { "owner": "libretro", @@ -62,14 +62,14 @@ "beetle-vb": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "a91437af0879124aa00b6cb30ca1189f2c84b7cb", - "sha256": "ryahr/g6PDvUKCPkF1D8xozNGNCa4bLw63b5Ra9Vsfo=" + "rev": "246555f8ed7e0b9e5748b2ee2ed6743187c61393", + "sha256": "96lQlDqx2bvFeovqGGkemxqS2zlHw92O6YeTEGlgf34=" }, "beetle-wswan": { "owner": "libretro", "repo": "beetle-wswan-libretro", - "rev": "089a62477c5f51ac746a5fc8eacf3599e9feb649", - "sha256": "yaaEJ+XgrBgtTEkffgnxvt2mrp5dsDYJ+TTxCZZU5OE=" + "rev": "d1fb3f399a2bc16b9ad0f2e8c8ba9f7051cd26bd", + "sha256": "p9mJv7zBFjNh1sh5iAjBZzxP6k8ydUNDXLQIjHl9doQ=" }, "blastem": { "owner": "libretro", @@ -135,8 +135,8 @@ "eightyone": { "owner": "libretro", "repo": "81-libretro", - "rev": "6aba19246c1ec08f3de5659b2dbc3277ec6bfb97", - "sha256": "2G6NkNlvqvP5RM35ydppnr2/RRbeiIpM2HKOpt8PkgU=" + "rev": "2e34567a320cba27b9162b1776db4de3cdb7cf03", + "sha256": "vjrHRLzc9Fy0MwV9d+LlcJTGJfVsRauEig8R+erBtfw=" }, "fbalpha2012": { "owner": "libretro", @@ -147,8 +147,8 @@ "fbneo": { "owner": "libretro", "repo": "fbneo", - "rev": "01bf2e189dcd96f978c3a4ae7bbbb00f2d90aabf", - "sha256": "naCfGSrwA9vO3Cu2rHLplCMcTbpx6S/sapwisFCcL5c=" + "rev": "e4625a196b9232ba93a156e3a5164aa11193f20a", + "sha256": "/5JmwuLWWBQWXnqCMjKzOC2XG6wo5a6xgQOYX1P1zcw=" }, "fceumm": { "owner": "libretro", @@ -165,8 +165,8 @@ "fmsx": { "owner": "libretro", "repo": "fmsx-libretro", - "rev": "f9ea9eacd49297783c216d147dcc1a22465b2749", - "sha256": "nDsaaUeZUm4zTj07+2nPDefoDpw18vXdhQr1BH6/4eY=" + "rev": "11fa9f3c08cde567394c41320ca76798c2c64670", + "sha256": "1u5c5oDIjjXEquh6UBv2H1F/Ln7h44DTF1ohDG0Qnww=" }, "freeintv": { "owner": "libretro", @@ -183,26 +183,26 @@ "genesis-plus-gx": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "144045b30a18ab4b27c3ae46490274988f302748", - "sha256": "ydnyPdkJmM+xhuJqIOxZISFcTN8RFgOLbnRvOBJORek=" + "rev": "7520ac8aae7b08262c0472e724e6ef0bfe41d285", + "sha256": "wKcO/dulgZKgXTuHdcQvfSrfxSI5UA0az6qMLtP4K6g=" }, "gpsp": { "owner": "libretro", "repo": "gpsp", - "rev": "d4547baf26dd70a18eeb38d231ce3f998004ec30", - "sha256": "9XU9TmBpuZeAOzqxuKVQZvdHRgX8fm4HcEfleM3jB7E=" + "rev": "f0f0b31f9ab95946965b75fed8d31e19290f3d43", + "sha256": "aiegBSpQDyXzVkyWuUpI66QvA1tqS8PQ8+75U89K10A=" }, "gw": { "owner": "libretro", "repo": "gw-libretro", - "rev": "85bf5c936044db0bf4138e7eb8ab20d3a7330035", - "sha256": "yCAnveQw+VyZFQ/GsUBuyoMRQ4yfhA0f3tYghZ2HecU=" + "rev": "d08a08154ce8ed8e9de80582c108f157e4c6b226", + "sha256": "PWd/r4BBmhiNqJdV6OaXHr4XCdR1GyVipq3zvyBcqEs=" }, "handy": { "owner": "libretro", "repo": "libretro-handy", - "rev": "5145f79bb746f6d9c0b340c2f9cc4bf059848924", - "sha256": "madTjJWKM8elM35LRAwm0RwnA44skLtIK2/7RXPSNl0=" + "rev": "517bb2d02909271836604c01c8f09a79ad605297", + "sha256": "Igf/OvmnCzoWjCZBoep7T0pXsoBKq3NJpXlYhE7nr3s=" }, "hatari": { "owner": "libretro", @@ -213,14 +213,14 @@ "mame": { "owner": "libretro", "repo": "mame", - "rev": "2a0e4ea0e2362bb7dcf77216c9fcb48426cea1e8", - "sha256": "imuHEwzDpI8jbdOeOhBBfzl4k74mDq/3SrKD8upzZmo=" + "rev": "b7dd999590717638ceade2e24d16d63147aa12ad", + "sha256": "QgENNjykhO+WSxAb//J+R7QP3/rZnxqv7sarO4eBYuc=" }, "mame2000": { "owner": "libretro", "repo": "mame2000-libretro", - "rev": "f35db3877f8a79a174dd3b2e37f4ebf39d71d5a4", - "sha256": "JmtvxKWAYNk1SyV1YpFeLX49zzGqpUv6nqM82xU70OM=" + "rev": "dd9d6612c29bf5b29bc2f94cab2d43fe3dcd69ee", + "sha256": "X0fP0bNBk2hqXVdRspylLIjZO563aMXkyX4qgx/3Vr8=" }, "mame2003": { "owner": "libretro", @@ -267,8 +267,8 @@ "mesen-s": { "owner": "libretro", "repo": "mesen-s", - "rev": "3694c7f9692a0be32d86979c347884ae9def0a3b", - "sha256": "VBNl4682e2X12WNjtXZ3P4/Kw4OeRLSRWyZqYDpfmCo=" + "rev": "b0b53409eecb696fb13f411ffde72e8f576feb09", + "sha256": "lDHyeIsVsI5+ZK8EJI50alrFuu0uJmxscda5bR1UmQQ=" }, "meteor": { "owner": "libretro", @@ -297,8 +297,8 @@ "nestopia": { "owner": "libretro", "repo": "nestopia", - "rev": "7dbd5c6384c4c6326004c97fd8e6fa07cb4edcef", - "sha256": "OBkWP36BzwsEW+ORF2opHlXwXHgGN0l2ZxBuyDO/sKY=" + "rev": "a9e197f2583ef4f36e9e77d930a677e63a2c2f62", + "sha256": "QqmWSk8Ejf7QMJk0cVBgpnyqcK6oLjCnnXMXInuWfYc=" }, "np2kai": { "owner": "AZO234", @@ -310,8 +310,8 @@ "o2em": { "owner": "libretro", "repo": "libretro-o2em", - "rev": "efd749cec2dd1ce42a8aa3048a89f817d271d804", - "sha256": "aw0bJyQzYFOlQQOfNsRgqdeUJP1qF4llJxLq5t9oc5g=" + "rev": "641f06d67d192a0677ec861fcb731d3ce8da0f87", + "sha256": "s3FreOziXeGhUyQdSoOywZldD21m3+OXK0EJ2Z8rXiY=" }, "opera": { "owner": "libretro", @@ -334,28 +334,28 @@ "pcsx_rearmed": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "37d9bf8315be570a350cd44876ae14f9b0eff20b", - "sha256": "ieuEWs+NIQFCgMl/yTnaFdClxEv5NurrLuUvkjSUar0=" + "rev": "e24732050e902bd5402b2b7da7c391d2ca8fa799", + "sha256": "tPz5E3QO6FucjYOzdjbY2FHLPz1Fmms10tdt7rZIW8U=" }, "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "bb6a52fe60e6f3bdcd17effe75e68fd0f8c44ba7", - "sha256": "wztctLbK7VE4OPJS7ixKwnN4VkQv96Te3FmJlZ5m4A0=", + "rev": "7ff457f2f833570013f2a7e2608ac40632e0735d", + "sha256": "xEG5swvvWFhvosC1XpFaZphESNaf4AtX+6UE02B57j8=", "fetchSubmodules": true }, "play": { "owner": "jpd002", "repo": "Play-", - "rev": "ec2a9460ea2beeb69d30534ee8affbda4fc4b156", - "sha256": "8maLaSJiF9soJdIlYoFHSG+2XXYTdLmWH6cq9vZRd/4=", + "rev": "39eb5c2eb6da65dc76b1c4d1319175a68120a77a", + "sha256": "EF3p0lvHjKGt4pxtTAkDM+uHsnW72lN+Ki8BaZIk/BQ=", "fetchSubmodules": true }, "ppsspp": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "0eea0acf13022ff8d910adb55cec14ebad825afc", - "sha256": "f1Tscndz0TcW0bUhixEvsrbFKefLfsCFjqWA7ANnfB4=", + "rev": "83b8211abf7fb705835eb1ccf8feae04816ae96c", + "sha256": "8K4bz/GUnE8GrlAVFULMXLC+i3ZYvR28EpehEg6up4s=", "fetchSubmodules": true }, "prboom": { @@ -391,20 +391,20 @@ "smsplus-gx": { "owner": "libretro", "repo": "smsplus-gx", - "rev": "8e8378896bc15c8a9f756339b596171ba266cc14", - "sha256": "zvG2SF4zx3Yaaf54NZ2DgsGPN59msW8TvQFCS4OMcHQ=" + "rev": "9de9847dc8ba458e9522d5ae8b87bf71ad437257", + "sha256": "XzqQ/3XH5L79UQep+DZ+mDHnUJKZQXzjNCZNZw2mGvY=" }, "snes9x": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "78d006ffdbb5cb6944177db52c3640152948d928", - "sha256": "Qh+nLtwdLfjwYxXCv49pPPf0mqdxKRv/JLRm82knJu0=" + "rev": "3c729a9763263bc3a69f48370e43ae05e672970a", + "sha256": "01M6Wvbu1omMwh3Xg4RGh028jirGs7mLpxwKJgMRQxA=" }, "snes9x2002": { "owner": "libretro", "repo": "snes9x2002", - "rev": "25d9d4fea4c7d7fcc8608c65c2bec9bcbc41f26e", - "sha256": "EYcaWckvTfi2ajx6C1olE5pW51diLSjMdqZdyH8U2Ck=" + "rev": "c4397de75a5f11403d154abd935e39fe969bca94", + "sha256": "yL4SIRR1Er+7Iq3YPfoe5ES47nvyA3UmGK+upLzKiFA=" }, "snes9x2005": { "owner": "libretro", @@ -415,26 +415,26 @@ "snes9x2010": { "owner": "libretro", "repo": "snes9x2010", - "rev": "b12f3ba46f09dd5d0254676ed4b9e289d16b9ea8", - "sha256": "i4GEqZkgwlehuUQGcjLdMkO9xNWRs8k+3y2OGivwXCw=" + "rev": "c98224bc74aa0bbf355d128b22e4a2a4e94215b0", + "sha256": "mf5msdwdcRRfFWHwmWLS/qKd7gNlLwexGEB6wB6TfhE=" }, "stella": { "owner": "stella-emu", "repo": "stella", - "rev": "071e8f7eb1096dfe95d9eb2e5b7b27b30f28fbf9", - "sha256": "8WzBL8ojsHYxOqItHeeG4djALhqBBOV7nHE078UzqAY=" + "rev": "efb2a9f299cad241e12d811580f28d75b6c3438d", + "sha256": "QYwDTd8EZUMXJiuSJtoW8XQXgl+Wx0lPkNLOwzM5bzA=" }, "stella2014": { "owner": "libretro", "repo": "stella2014-libretro", - "rev": "1a2e96bc6ccf91de6fb4322048da05f67a9d21d4", - "sha256": "yINO6EU2kCldfxKcqym5ha3uIEQg7I6t4Wmu+8b6Hmw=" + "rev": "1351a4fe2ca6b1f3a66c7db0df2ec268ab002d41", + "sha256": "/sVDOfP5CE8k808lhmH3tT47oZ1ka3pgDG5LglfPmHc=" }, "swanstation": { "owner": "libretro", "repo": "swanstation", - "rev": "0932243b0e5f1a5a237b0521b30b39473b61fa31", - "sha256": "krA7X9CIOg53giWSMXgzgazeyWFXEpMobPSnOB7g994=" + "rev": "0e53a5ac09a30d73d78b628f7e4954ebe5615801", + "sha256": "vOu99fsm2oeSi96tWR+vV5suZSYCyXJVgOdvjnKbNhg=" }, "tgbdual": { "owner": "libretro", @@ -464,8 +464,8 @@ "vba-next": { "owner": "libretro", "repo": "vba-next", - "rev": "ebd175d57ebb2065726099d32034cb25934787ce", - "sha256": "hTUlhLzvsemNz6wSmlnQNoNtzaVhipA+hmVmhzZVN+w=" + "rev": "4191e09e2b0fcf175a15348c1fa8a12bbc6320dd", + "sha256": "IG2oH4F17tlSv1cXYZobggb37tFNE53JOHzan/X0+ws=" }, "vecx": { "owner": "libretro", diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index 0facf4e2656ee..c6c44926fc829 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -107,10 +107,16 @@ def get_repo_hash_fetchFromGitHub( extra_args = [] if deep_clone: extra_args.append("--deep-clone") + else: + extra_args.append("--no-deep-clone") if fetch_submodules: extra_args.append("--fetch-submodules") + else: + extra_args.append("--no-fetch-submodules") if leave_dot_git: extra_args.append("--leave-dot-git") + else: + extra_args.append("--no-leave-dot-git") if rev: extra_args.append("--rev") extra_args.append(rev) diff --git a/pkgs/applications/emulators/retrofe/default.nix b/pkgs/applications/emulators/retrofe/default.nix index dc1a23f33b398..2a0b41ba2b6c2 100644 --- a/pkgs/applications/emulators/retrofe/default.nix +++ b/pkgs/applications/emulators/retrofe/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, glib, gst_all_1, makeWrapper, pkg-config , python2, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: stdenv.mkDerivation { pname = "retrofe"; - version = "0.6.169"; + version = "0.10.31"; - src = fetchhg { - url = "https://bitbucket.org/teamretro/retrofe"; - rev = "8793e03"; - sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm"; + src = fetchFromGitHub { + owner = "phulshof"; + repo = "RetroFE"; + rev = "2ddd65a76210d241031c4ac9268255f311df25d1"; + sha256 = "sha256-uBfECbU2Df/pPpEXXq62S7Ec0YU4lPIsZ8k5UmKD7xQ="; }; nativeBuildInputs = [ cmake makeWrapper pkg-config python2 ]; @@ -18,12 +19,9 @@ stdenv.mkDerivation { glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib ] ++ (with gst_all_1; [ gst-libav gst-plugins-base gst-plugins-good ]); - patches = [ ./include-paths.patch ]; - configurePhase = '' cmake RetroFE/Source -BRetroFE/Build -DCMAKE_BUILD_TYPE=Release \ -DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0 \ - -DGSTREAMER_BASE_INCLUDE_DIRS='${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0' ''; buildPhase = '' @@ -70,7 +68,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A frontend for arcade cabinets and media PCs"; - homepage = "http://retrofe.com"; + homepage = "http://retrofe.nl/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hrdinka ]; platforms = with platforms; linux; diff --git a/pkgs/applications/emulators/retrofe/include-paths.patch b/pkgs/applications/emulators/retrofe/include-paths.patch deleted file mode 100644 index 02eef2594ea63..0000000000000 --- a/pkgs/applications/emulators/retrofe/include-paths.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur RetroFE.1/RetroFE/Source/CMakeLists.txt RetroFE.2/RetroFE/Source/CMakeLists.txt ---- RetroFE.1/RetroFE/Source/CMakeLists.txt 2016-02-21 14:52:36.726070602 +0100 -+++ RetroFE.2/RetroFE/Source/CMakeLists.txt 2016-02-21 14:38:43.036249029 +0100 -@@ -59,6 +59,7 @@ - set(RETROFE_INCLUDE_DIRS - "${GLIB2_INCLUDE_DIRS}" - "${GSTREAMER_INCLUDE_DIRS}" -+ "${GSTREAMER_BASE_INCLUDE_DIRS}" - "${SDL2_INCLUDE_DIRS}" - "${SDL2_IMAGE_INCLUDE_DIRS}" - "${SDL2_MIXER_INCLUDE_DIRS}" diff --git a/pkgs/applications/emulators/ripes/default.nix b/pkgs/applications/emulators/ripes/default.nix new file mode 100644 index 0000000000000..8167c785013bf --- /dev/null +++ b/pkgs/applications/emulators/ripes/default.nix @@ -0,0 +1,50 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, pkg-config +, qtbase +, qtsvg +, qtcharts +, wrapQtAppsHook +, cmake +, python3 +}: + +mkDerivation rec { + pname = "ripes"; + version = "2.2.4"; + + src = fetchFromGitHub { + owner = "mortbopet"; + repo = "Ripes"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-Aal2A4xypzaY7Oa+boIrXk7ITNKnh5OZIP7DkJjcGu4="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtsvg + qtcharts + ]; + + installPhase = '' + install -D Ripes $out/bin/Ripes + cp -r ${src}/appdir/usr/share $out/share + ''; + + meta = with lib; { + description = "A graphical processor simulator and assembly editor for the RISC-V ISA"; + homepage = "https://github.com/mortbopet/Ripes"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index e235b2c80fb47..60aa9debfb001 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -58,6 +58,10 @@ buildDotnetModule rec { pulseaudio ]; + makeWrapperArgs = [ + "--suffix PATH : ${lib.getBin ffmpeg}" + ]; + patches = [ ./appdir.patch # Ryujinx attempts to write to the nix store. This patch redirects it to "~/.config/Ryujinx" on Linux. ]; @@ -66,11 +70,6 @@ buildDotnetModule rec { # workaround for https://github.com/Ryujinx/Ryujinx/issues/2349 mkdir -p $out/lib/sndio-6 ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6 - - # Ryujinx tries to use ffmpeg from PATH - makeWrapperArgs+=( - --suffix PATH : ${lib.makeBinPath [ ffmpeg ]} - ) ''; preFixup = '' diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index c8127b0f3e51e..fbafa4eaa2ecf 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -12,9 +12,9 @@ (fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) (fetchNuGet { pname = "LibHac"; version = "0.16.1"; sha256 = "131qnqa1asdmymwdvpjza6w646b05jzn1cxjdxgwh7qdcdb77xyx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1fvv5ri32pbl43628zqnim6fbv6hjxf66p0v793xdh57dzkdyh0j"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.4"; sha256 = "1m8iaq78kii0z4lxwq1igm8f4yv010blrifab4zp491b0j0qg1d4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.4"; sha256 = "1sqv7vhkm4j11rl7mfvs4mmmclcdps2n4pf31ck2mcx54nr4d2kj"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.8.0"; sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) @@ -23,11 +23,11 @@ (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.0"; sha256 = "0jn9a20a2zixnkm3bmpmvmiv7mk0hqdlnpi0qgjkg1nir87czm19"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.0"; sha256 = "1nbgydr45f7lp980xyrkzpyaw2mkkishjwp3slgxk7f0mz6q8i1v"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.8.0"; sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.3"; sha256 = "0k9gc94cvn36p0v3pj296asg2sq9a8ah6lfw0xvvmd4hq2k72s79"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.3"; sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.4"; sha256 = "0vgjwpy55mf6x22a634cdidckyq5hi941i9p10jqyrbnc637frv2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.4"; sha256 = "1qasm6j25lmcc4xn7f7s3jli1pypz1kfnj7j9dkjlx9mc8r356zp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1gibwhplbanv6bz3l71w8vhzlgqsh21bms30dbf1n60v7p02fl3h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.4"; sha256 = "0gkzqsmj12wwdh548rb9drjgmyzvqalmwwq0fzvgj9c7zm1gdndi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.4"; sha256 = "1x4ysack9n57h8w1ybfyczkf3w6jsgz7ila0czm2011w4sjnyqj0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) diff --git a/pkgs/applications/emulators/simh/default.nix b/pkgs/applications/emulators/simh/default.nix index 1e939538cda34..6f3409ec0637d 100644 --- a/pkgs/applications/emulators/simh/default.nix +++ b/pkgs/applications/emulators/simh/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { dontConfigure = true; + # Workaround to build against upstream gcc-10 and clang-11. + # Can be removed when next release contains + # https://github.com/simh/simh/issues/794 + NIX_CFLAGS_COMPILE = [ "-fcommon" ]; + makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; preInstall = '' diff --git a/pkgs/applications/emulators/snes9x-gtk/default.nix b/pkgs/applications/emulators/snes9x-gtk/default.nix deleted file mode 100644 index ff7df4b094407..0000000000000 --- a/pkgs/applications/emulators/snes9x-gtk/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook, alsa-lib -, SDL2, zlib, gtkmm3, libXv, libepoxy, minizip, pulseaudio, portaudio }: - -stdenv.mkDerivation rec { - pname = "snes9x-gtk"; - version = "1.61"; - - src = fetchFromGitHub { - owner = "snes9xgit"; - repo = "snes9x"; - rev = version; - fetchSubmodules = true; - sha256 = "1kay7aj30x0vn8rkylspdycydrzsc0aidjbs0dd238hr5hid723b"; - }; - - nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ alsa-lib SDL2 zlib gtkmm3 libXv libepoxy minizip pulseaudio portaudio ]; - - preConfigure = "cd gtk"; - - meta = with lib; { - homepage = "https://www.snes9x.com"; - description = "Super Nintendo Entertainment System (SNES) emulator"; - - longDescription = '' - Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) - emulator. It basically allows you to play most games designed for the SNES - and Super Famicom Nintendo game systems on your PC or Workstation; which - includes some real gems that were only ever released in Japan. - ''; - - # see https://github.com/snes9xgit/snes9x/blob/master/LICENSE for exact details - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ qknight xfix ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/emulators/snes9x/default.nix b/pkgs/applications/emulators/snes9x/default.nix new file mode 100644 index 0000000000000..779e4dab3b3d0 --- /dev/null +++ b/pkgs/applications/emulators/snes9x/default.nix @@ -0,0 +1,130 @@ +{ lib +, stdenv +, alsa-lib +, autoreconfHook +, fetchFromGitHub +, fetchpatch +, gtkmm3 +, libepoxy +, libpng +, libX11 +, libXv +, libXext +, libXinerama +, meson +, minizip +, ninja +, pkg-config +, portaudio +, pulseaudio +, SDL2 +, wrapGAppsHook +, zlib +, withGtk ? false +}: + +stdenv.mkDerivation rec { + pname = + if withGtk then + "snes9x-gtk" + else + "snes9x"; + version = "1.61"; + + src = fetchFromGitHub { + owner = "snes9xgit"; + repo = "snes9x"; + rev = version; + fetchSubmodules = true; + sha256 = "1kay7aj30x0vn8rkylspdycydrzsc0aidjbs0dd238hr5hid723b"; + }; + + patches = [ + # Fix cross-compilation, otherwise it fails to detect host compiler features + # Doesn't affect non CC builds + (fetchpatch { + url = "https://mirror.its.dal.ca/gentoo-portage/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch"; + sha256 = "sha256-ZCmnprimz8PtDIXkB1dYD0oura9icW81yKvJ4coKaDg="; + }) + ]; + + nativeBuildInputs = [ + pkg-config + ] + ++ lib.optionals (!withGtk) [ + autoreconfHook + ] + ++ lib.optionals withGtk [ + meson + ninja + wrapGAppsHook + ]; + + buildInputs = [ + libX11 + libXext + libXv + minizip + zlib + ] + # on non-Linux platforms this will build without sound support on X11 build + ++ lib.optionals stdenv.isLinux [ + alsa-lib + pulseaudio + ] + ++ lib.optionals (!withGtk) [ + libpng + libXinerama + ] + ++ lib.optionals withGtk [ + gtkmm3 + libepoxy + portaudio + SDL2 + ]; + + configureFlags = + lib.optional stdenv.hostPlatform.sse4_1Support "--enable-sse41" + ++ lib.optional stdenv.hostPlatform.avx2Support "--enable-avx2"; + + installPhase = lib.optionalString (!withGtk) '' + runHook preInstall + + install -Dm755 snes9x -t "$out/bin/" + install -Dm644 snes9x.conf.default -t "$out/share/doc/${pname}/" + install -Dm644 ../docs/{control-inputs,controls,snapshots}.txt -t \ + "$out/share/doc/${pname}/" + + runHook postInstall + ''; + + preAutoreconf = lib.optionalString (!withGtk) "cd unix"; + preConfigure = lib.optionalString withGtk "cd gtk"; + + enableParallelBuilding = true; + + meta = with lib; + let + interface = if withGtk then "GTK" else "X11"; + in + { + homepage = "https://www.snes9x.com"; + description = "Super Nintendo Entertainment System (SNES) emulator, ${interface} version"; + + longDescription = '' + Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) + emulator. It basically allows you to play most games designed for the SNES + and Super Famicom Nintendo game systems on your PC or Workstation; which + includes some real gems that were only ever released in Japan. + + Version build with ${interface} interface. + ''; + + license = licenses.unfreeRedistributable // { + url = "https://github.com/snes9xgit/snes9x/blob/${version}/LICENSE"; + }; + maintainers = with maintainers; [ qknight xfix thiagokokada ]; + platforms = platforms.unix; + broken = (withGtk && stdenv.isDarwin); + }; +} diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 7788b13b4ecb5..47852d69e3baa 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -175,7 +175,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { done ''; - enableParallelBuilding = true; + # Until https://github.com/NixOS/nixpkgs/pull/172617 is applied, + # parallel builds do not always work because of a bug in dlltool. + enableParallelBuilding = false; # https://bugs.winehq.org/show_bug.cgi?id=43530 # https://github.com/NixOS/nixpkgs/issues/31989 diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 23538a237e4a1..febbece46f579 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -46,22 +46,22 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.4"; + version = "7.8"; url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-co6GbW5JzpKioMUUMz6f8Ivb9shvXvTmGAFDuNK31BY="; + sha256 = "sha256-j3bpyWtQ8qyOJOXe7fo+DZWWpXBnCSJvZalMahYAGbg="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { - version = "7.1.1"; + version = "7.2.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - sha256 = "sha256-ncjlYDt7xkNU65SuTqD2ghQkdno/9E/w0Z40akkMEeo="; + sha256 = "sha256-Xwbq+646SezDHfzqd3B1vUTwzBJuT7Tijs76ButDYyM="; }; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "0vlj3b8bnidyhlgkjrnlbah3878zjy3s557vbp16qka42zjaa51q"; + sha256 = "sha256-payP+lx/aGZErGbkpogNMgsE393e7F2VGrllDKu/Lws="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -84,8 +84,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20210825"; - sha256 = "sha256-exMhj3dS8uXCEgOaWbftaq94mBOmtZIXsXb9xNX5ha8="; + version = "20220411"; + sha256 = "sha256-FjH10nZDYbqXI6/vKpZJKfv2maXSVkahNDf5UTU3eyU="; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/applications/emulators/yuzu/base.nix b/pkgs/applications/emulators/yuzu/base.nix deleted file mode 100644 index aff09134fae9f..0000000000000 --- a/pkgs/applications/emulators/yuzu/base.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ pname, version, src, branchName -, stdenv, lib, wrapQtAppsHook -, cmake, pkg-config -, libpulseaudio, libjack2, alsa-lib, sndio -, vulkan-loader, vulkan-headers -, qtbase, qtwebengine, qttools -, nlohmann_json, rapidjson -, zlib, zstd, libzip, lz4 -, glslang -, boost173 -, catch2 -, fmt_8 -, SDL2 -, udev -, libusb1 -, ffmpeg -}: - -stdenv.mkDerivation rec { - inherit pname version src; - - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ - libpulseaudio libjack2 alsa-lib sndio - vulkan-loader vulkan-headers - qtbase qtwebengine qttools - nlohmann_json rapidjson - zlib zstd libzip lz4 - glslang - boost173 - catch2 - fmt_8 - SDL2 - udev - libusb1 - ffmpeg - ]; - - cmakeFlags = [ - "-DYUZU_USE_BUNDLED_QT=OFF" - "-DYUZU_USE_BUNDLED_SDL2=OFF" - "-DYUZU_USE_BUNDLED_FFMPEG=OFF" - "-DENABLE_QT_TRANSLATION=ON" - "-DYUZU_USE_QT_WEB_ENGINE=ON" - "-DUSE_DISCORD_PRESENCE=ON" - ]; - - # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt` - # making the build fail, as that path does not exist - dontFixCmake = true; - - preConfigure = '' - # Trick the configure system. This prevents a check for submodule directories. - rm -f .gitmodules - - # see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work. - cmakeFlagsArray+=( - "-DTITLE_BAR_FORMAT_IDLE=yuzu ${branchName} ${version}" - "-DTITLE_BAR_FORMAT_RUNNING=yuzu ${branchName} ${version} | {3}" - ) - ''; - - # Fix vulkan detection - postFixup = '' - wrapProgram $out/bin/yuzu --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - ''; - - meta = with lib; { - homepage = "https://yuzu-emu.org"; - description = "The ${branchName} branch of an experimental Nintendo Switch emulator written in C++"; - longDescription = '' - An experimental Nintendo Switch emulator written in C++. - Using the mainline branch is recommanded for general usage. - Using the early-access branch is recommanded if you would like to try out experimental features, with a cost of stability. - ''; - license = with licenses; [ - gpl2Plus - # Icons - cc-by-nd-30 cc0 - ]; - maintainers = with maintainers; [ ivar joshuafern sbruder ]; - platforms = platforms.linux; - broken = stdenv.isAarch64; # Currently aarch64 is not supported. - }; -} diff --git a/pkgs/applications/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix index f212abb448a6e..11af5487726c3 100644 --- a/pkgs/applications/emulators/yuzu/default.nix +++ b/pkgs/applications/emulators/yuzu/default.nix @@ -1,28 +1,45 @@ -{ branch ? "mainline", libsForQt5, fetchFromGitHub }: +{ branch ? "mainline" +, libsForQt5 +, fetchFromGitHub +, fetchurl +}: + let - inherit libsForQt5 fetchFromGitHub; + # Fetched from https://api.yuzu-emu.org/gamedb, last updated 2022-05-12 + # Please make sure to update this when updating yuzu! + compat-list = fetchurl { + name = "yuzu-compat-list"; + url = "https://web.archive.org/web/20220512184801/https://api.yuzu-emu.org/gamedb"; + sha256 = "sha256-anOmO7NscHDsQxT03+YbJEyBkXjhcSVGgKpDwt//GHw="; + }; in { - mainline = libsForQt5.callPackage ./base.nix rec { + mainline = libsForQt5.callPackage ./generic.nix rec { pname = "yuzu-mainline"; - version = "953"; - branchName = branch; + version = "1014"; + src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "0p07gybyhr6flzmhz92qlrwcq7l37c2wmcxw8sbrvhj2pgaaw9ic"; + sha256 = "1x3d1fjssadv4kybc6mk153jlvncsfgm5aipkq5n5i8sr7mmr3nw"; fetchSubmodules = true; }; + + inherit branch compat-list; }; - early-access = libsForQt5.callPackage ./base.nix rec { + + early-access = libsForQt5.callPackage ./generic.nix rec { pname = "yuzu-ea"; - version = "2557"; - branchName = branch; + version = "2725"; + src = fetchFromGitHub { owner = "pineappleEA"; repo = "pineapple-src"; rev = "EA-${version}"; - sha256 = "013xxgyn8y5fv0xbrm0zfl9xmi0gx4hpflrbjskg1hcvb2bjqyvj"; + sha256 = "1nmcl9y9chr7cdvnra5zs1v42d3i801hmsjdlz3fmp15n04bcjmp"; + fetchSubmodules = true; }; + + inherit branch compat-list; }; }.${branch} diff --git a/pkgs/applications/emulators/yuzu/generic.nix b/pkgs/applications/emulators/yuzu/generic.nix new file mode 100644 index 0000000000000..f1ef9259031ad --- /dev/null +++ b/pkgs/applications/emulators/yuzu/generic.nix @@ -0,0 +1,164 @@ +{ pname +, version +, src +, branch +, compat-list + +, lib +, stdenv +, runCommandLocal +, substituteAll +, wrapQtAppsHook +, alsa-lib +, boost +, catch2 +, cmake +, doxygen +, ffmpeg +, fmt_8 +, glslang +, libjack2 +, libopus +, libpulseaudio +, libusb1 +, libva +, libzip +, lz4 +, nlohmann_json +, perl +, pkg-config +, python3 +, qtbase +, qttools +, qtwebengine +, rapidjson +, SDL2 +, sndio +, speexdsp +, udev +, vulkan-headers +, vulkan-loader +, zlib +, zstd +}: + +stdenv.mkDerivation rec { + inherit pname version src; + + # Replace icons licensed under CC BY-ND 3.0 with free ones to allow + # for binary redistribution: https://github.com/yuzu-emu/yuzu/pull/8104 + # The patch hosted on GitHub has the binary information stripped, so + # it has been regenerated with "git format-patch --text --full-index --binary" + patches = [ ./yuzu-free-icons.patch ]; + + nativeBuildInputs = [ + cmake + doxygen + perl + pkg-config + python3 + wrapQtAppsHook + ]; + + buildInputs = [ + alsa-lib + boost + catch2 + ffmpeg + fmt_8 + glslang + libjack2 + libopus + libpulseaudio + libusb1 + libva + libzip + lz4 + nlohmann_json + qtbase + qttools + qtwebengine + rapidjson + SDL2 + sndio + speexdsp + udev + zlib + zstd + ]; + + doCheck = true; + + # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt` + # making the build fail, as that path does not exist + dontFixCmake = true; + + cmakeFlags = [ + "-DYUZU_USE_BUNDLED_QT=OFF" + "-DYUZU_USE_BUNDLED_FFMPEG=OFF" + "-DYUZU_USE_BUNDLED_OPUS=OFF" + "-DYUZU_USE_EXTERNAL_SDL2=OFF" + + "-DENABLE_QT_TRANSLATION=ON" + "-DYUZU_USE_QT_WEB_ENGINE=ON" + "-DUSE_DISCORD_PRESENCE=ON" + + # We dont want to bother upstream with potentially outdated compat reports + "-DYUZU_ENABLE_COMPATIBILITY_REPORTING=OFF" + "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically + ]; + + preConfigure = '' + # This prevents a check for submodule directories. + rm -f .gitmodules + + # see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work. + cmakeFlagsArray+=( + "-DTITLE_BAR_FORMAT_IDLE=yuzu ${branch} ${version}" + "-DTITLE_BAR_FORMAT_RUNNING=yuzu ${branch} ${version} | {3}" + ) + ''; + + # This must be done after cmake finishes as it overwrites the file + postConfigure = '' + ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json + ''; + + # Fix vulkan detection + postFixup = '' + for bin in $out/bin/yuzu $out/bin/yuzu-cmd; do + wrapProgram $bin --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + done + ''; + + passthru.updateScript = runCommandLocal "yuzu-${branch}-updateScript" { + script = substituteAll { + src = ./update.sh; + inherit branch; + }; + } "install -Dm755 $script $out"; + + meta = with lib; { + homepage = "https://yuzu-emu.org"; + changelog = "https://yuzu-emu.org/entry"; + description = "The ${branch} branch of an experimental Nintendo Switch emulator written in C++"; + longDescription = '' + An experimental Nintendo Switch emulator written in C++. + Using the mainline branch is recommanded for general usage. + Using the early-access branch is recommanded if you would like to try out experimental features, with a cost of stability. + ''; + mainProgram = "yuzu"; + platforms = [ "x86_64-linux" ]; + license = with licenses; [ + gpl3Plus + # Icons. Note that this would be cc0 and cc-by-nd-30 without the "yuzu-free-icons" patch + asl20 mit cc0 + ]; + maintainers = with maintainers; [ + ashley + ivar + joshuafern + sbruder + ]; + }; +} diff --git a/pkgs/applications/emulators/yuzu/update.sh b/pkgs/applications/emulators/yuzu/update.sh new file mode 100755 index 0000000000000..e128db066f35b --- /dev/null +++ b/pkgs/applications/emulators/yuzu/update.sh @@ -0,0 +1,84 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p nix nix-prefetch-git coreutils curl jq gnused + +set -e + +# Will be replaced with the actual branch when running this from passthru.updateScript +BRANCH="@branch@" + +if [[ ! "$(basename $PWD)" = "yuzu" ]]; then + echo "error: Script must be ran from yuzu's directory!" + exit 1 +fi + +getLocalVersion() { + pushd ../../../.. >/dev/null + nix eval --raw -f default.nix "$1".version + popd >/dev/null +} + +getLocalHash() { + pushd ../../../.. >/dev/null + nix eval --raw -f default.nix "$1".src.drvAttrs.outputHash + popd >/dev/null +} + +updateMainline() { + OLD_MAINLINE_VERSION="$(getLocalVersion "yuzu-mainline")" + OLD_MAINLINE_HASH="$(getLocalHash "yuzu-mainline")" + + NEW_MAINLINE_VERSION="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + "https://api.github.com/repos/yuzu-emu/yuzu-mainline/releases?per_page=1" | jq -r '.[0].name' | cut -d" " -f2)" + + if [[ "${OLD_MAINLINE_VERSION}" = "${NEW_MAINLINE_VERSION}" ]]; then + echo "yuzu-mainline is already up to date!" + + [ "$KEEP_GOING" ] && return || exit + else + echo "yuzu-mainline: ${OLD_MAINLINE_VERSION} -> ${NEW_MAINLINE_VERSION}" + fi + + echo " Fetching source code..." + + NEW_MAINLINE_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "mainline-0-${NEW_MAINLINE_VERSION}" "https://github.com/yuzu-emu/yuzu-mainline" | jq -r '.sha256')" + + echo " Succesfully fetched. hash: ${NEW_MAINLINE_HASH}" + + sed -i "s/${OLD_MAINLINE_VERSION}/${NEW_MAINLINE_VERSION}/" ./default.nix + sed -i "s/${OLD_MAINLINE_HASH}/${NEW_MAINLINE_HASH}/" ./default.nix +} + +updateEarlyAccess() { + OLD_EA_VERSION="$(getLocalVersion "yuzu-ea")" + OLD_EA_HASH="$(getLocalHash "yuzu-ea")" + + NEW_EA_VERSION="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=1" | jq -r '.[0].name' | cut -d"-" -f2 | cut -d" " -f1)" + + if [[ "${OLD_EA_VERSION}" = "${NEW_EA_VERSION}" ]]; then + echo "yuzu-ea is already up to date!" + + [ "$KEEP_GOING" ] && return || exit + else + echo "yuzu-ea: ${OLD_EA_VERSION} -> ${NEW_EA_VERSION}" + fi + + echo " Fetching source code..." + + NEW_EA_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "EA-${NEW_EA_VERSION}" "https://github.com/pineappleEA/pineapple-src" | jq -r '.sha256')" + + echo " Succesfully fetched. hash: ${NEW_EA_HASH}" + + sed -i "s/${OLD_EA_VERSION}/${NEW_EA_VERSION}/" ./default.nix + sed -i "s/${OLD_EA_HASH}/${NEW_EA_HASH}/" ./default.nix +} + +if [[ "$BRANCH" = "mainline" ]]; then + updateMainline +elif [[ "$BRANCH" = "early-access" ]]; then + updateEarlyAccess +else + KEEP_GOING=1 + updateMainline + updateEarlyAccess +fi diff --git a/pkgs/applications/emulators/yuzu/yuzu-free-icons.patch b/pkgs/applications/emulators/yuzu/yuzu-free-icons.patch new file mode 100644 index 0000000000000..e150a54ee8aa2 --- /dev/null +++ b/pkgs/applications/emulators/yuzu/yuzu-free-icons.patch @@ -0,0 +1,1183 @@ +From 23e02aec6ff6b0823c2e66f5cff737e0cd430a22 Mon Sep 17 00:00:00 2001 +From: Kyle K <190571+Docteh@users.noreply.github.com> +Date: Mon, 28 Mar 2022 14:44:12 -0700 +Subject: [PATCH 1/2] Moving Icons away from CC BY-ND 3.0 for FOSS packaging + purposes + +I've seen some comments stating that sharing pre-compiled packages +of yuzu is problematic for linux distributions due to some contents +having license of CC BY-ND 3.0 + +Sources for the icons have been updated in the dist/license.md document + +Also a note has been added to call attention to the two copies of a QT theme +called QDarkStyleSheet +--- + dist/license.md | 63 ++++++++++-------- + dist/qt_themes/colorful/icons/48x48/plus.png | Bin 496 -> 232 bytes + .../colorful/icons/48x48/sd_card.png | Bin 680 -> 760 bytes + dist/qt_themes/colorful/icons/48x48/star.png | Bin 1248 -> 1330 bytes + .../qt_themes/default/icons/16x16/checked.png | Bin 657 -> 414 bytes + dist/qt_themes/default/icons/16x16/failed.png | Bin 524 -> 361 bytes + dist/qt_themes/default/icons/16x16/lock.png | Bin 279 -> 318 bytes + .../default/icons/256x256/plus_folder.png | Bin 3135 -> 3521 bytes + .../default/icons/48x48/bad_folder.png | Bin 1088 -> 1007 bytes + dist/qt_themes/default/icons/48x48/chip.png | Bin 15070 -> 511 bytes + dist/qt_themes/default/icons/48x48/folder.png | Bin 410 -> 535 bytes + dist/qt_themes/default/icons/48x48/plus.png | Bin 316 -> 274 bytes + .../qt_themes/default/icons/48x48/sd_card.png | Bin 614 -> 638 bytes + dist/qt_themes/default/icons/48x48/star.png | Bin 686 -> 1029 bytes + .../qt_themes/qdarkstyle/icons/16x16/lock.png | Bin 304 -> 343 bytes + .../qdarkstyle/icons/256x256/plus_folder.png | Bin 3438 -> 3931 bytes + .../qdarkstyle/icons/48x48/bad_folder.png | Bin 1098 -> 1061 bytes + .../qt_themes/qdarkstyle/icons/48x48/chip.png | Bin 15120 -> 551 bytes + .../qdarkstyle/icons/48x48/folder.png | Bin 542 -> 594 bytes + .../qt_themes/qdarkstyle/icons/48x48/plus.png | Bin 339 -> 297 bytes + .../qdarkstyle/icons/48x48/sd_card.png | Bin 676 -> 679 bytes + .../qt_themes/qdarkstyle/icons/48x48/star.png | Bin 725 -> 1055 bytes + .../icons/16x16/lock.png | Bin 304 -> 343 bytes + .../icons/256x256/plus_folder.png | Bin 3438 -> 3931 bytes + .../icons/48x48/bad_folder.png | Bin 1098 -> 1061 bytes + .../icons/48x48/chip.png | Bin 15120 -> 551 bytes + .../icons/48x48/folder.png | Bin 542 -> 594 bytes + .../icons/48x48/plus.png | Bin 339 -> 297 bytes + .../icons/48x48/sd_card.png | Bin 676 -> 679 bytes + .../icons/48x48/star.png | Bin 725 -> 1055 bytes + 30 files changed, 37 insertions(+), 26 deletions(-) + +diff --git a/dist/license.md b/dist/license.md +index 7bdebfec1fccdf97a4cf24a1eddd94638d510d8b..745256c32947aeb5d77bae10bc3cce666542967e 100644 +--- a/dist/license.md ++++ b/dist/license.md +@@ -2,34 +2,45 @@ The icons in this folder and its subfolders have the following licenses: + + Icon Name | License | Origin/Author + --- | --- | --- +-qt_themes/default/icons/16x16/checked.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/default/icons/16x16/failed.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/default/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com ++qt_themes/default/icons/16x16/checked.png |Apache 2.0 | https://github.com/google/material-design-icons/ (modified) ++qt_themes/default/icons/16x16/failed.png | Apache 2.0 | https://github.com/google/material-design-icons/ (modified) ++qt_themes/default/icons/16x16/lock.png | Apache 2.0 | https://github.com/google/material-design-icons/ + qt_themes/default/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io +-qt_themes/default/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/default/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/default/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/default/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/default/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team +-qt_themes/default/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/default/icons/48x48/star.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/qdarkstyle/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com ++qt_themes/default/icons/256x256/plus_folder.png | MIT | https://github.com/tailwindlabs/heroicons ++qt_themes/default/icons/48x48/bad_folder.png | MIT | https://github.com/tailwindlabs/heroicons ++qt_themes/default/icons/48x48/chip.png | MIT | https://github.com/tailwindlabs/heroicons ++qt_themes/default/icons/48x48/folder.png | MIT | https://github.com/tailwindlabs/heroicons ++qt_themes/default/icons/48x48/plus.png | MIT | https://github.com/tailwindlabs/heroicons ++qt_themes/default/icons/48x48/sd_card.png | CC0 1.0 | SVG Repo https://www.svgrepo.com/svg/70351/sd-card ++qt_themes/default/icons/48x48/star.png | MIT | https://github.com/tailwindlabs/heroicons ++qt_themes/qdarkstyle/icons/16x16/lock.png | Apache 2.0 | https://github.com/google/material-design-icons/ + qt_themes/qdarkstyle/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io +-qt_themes/qdarkstyle/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/qdarkstyle/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/qdarkstyle/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/qdarkstyle/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com ++qt_themes/qdarkstyle/icons/256x256/plus_folder.png | MIT | https://github.com/tailwindlabs/heroicons ++qt_themes/qdarkstyle/icons/48x48/bad_folder.png | MIT | https://github.com/tailwindlabs/heroicons ++qt_themes/qdarkstyle/icons/48x48/chip.png | MIT | https://github.com/tailwindlabs/heroicons ++qt_themes/qdarkstyle/icons/48x48/folder.png | MIT | https://github.com/tailwindlabs/heroicons + qt_themes/qdarkstyle/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team +-qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/qdarkstyle/icons/48x48/star.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/colorful/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com ++qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC0 1.0 | SVG Repo https://www.svgrepo.com/svg/70351/sd-card ++qt_themes/qdarkstyle/icons/48x48/star.png | MIT | https://github.com/tailwindlabs/heroicons ++qt_themes/qdarkstyle/ | MIT/CC BY 4.0 | Upstream https://github.com/ColinDuquesnoy/QDarkStyleSheet ++ ++qt_themes/qdarkstyle_midnight_blue/icons | See above | See the above qt_themes/qdarkstyle/icons entries ++qt_themes/qdarkstyle_midnight_blue/ | MIT/CC BY 4.0 | Upstream https://github.com/ColinDuquesnoy/QDarkStyleSheet ++ ++qt_themes/colorful/icons/16x16/lock.png | MIT | https://github.com/icons8/flat-color-icons + qt_themes/colorful/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io +-qt_themes/colorful/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/colorful/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/colorful/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/colorful/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/colorful/icons/48x48/plus.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/colorful/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com +-qt_themes/colorful/icons/48x48/star.png | CC BY-ND 3.0 | https://icons8.com ++qt_themes/colorful/icons/256x256/plus_folder.png | MIT | https://github.com/icons8/flat-color-icons (modified) ++qt_themes/colorful/icons/48x48/bad_folder.png | MIT | https://github.com/icons8/flat-color-icons (modified) ++qt_themes/colorful/icons/48x48/chip.png | MIT | https://github.com/icons8/flat-color-icons (modified) ++qt_themes/colorful/icons/48x48/folder.png | MIT | https://github.com/icons8/flat-color-icons ++qt_themes/colorful/icons/48x48/plus.png | Apache 2.0 | https://remixicon.com/ (modified) ++qt_themes/colorful/icons/48x48/sd_card.png | CC0 1.0 | https://www.svgrepo.com/svg/276818/sd-card ++qt_themes/colorful/icons/48x48/star.png | CC0 1.0 | https://www.svgrepo.com/svg/13674/star ++ ++qt_themes/colorful_dark/icons/16x16/lock.png | MIT | https://github.com/icons8/flat-color-icons (modified) ++qt_themes/colorful_dark/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io ++ ++qt_themes/colorful_midnight_blue/icons/16x16/lock.png | MIT | https://github.com/icons8/flat-color-icons (modified) ++qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io + +-<!-- TODO: Add the license of the yuzu icon --> +\ No newline at end of file ++<!-- TODO: Add the license of the yuzu icon --> +diff --git a/dist/qt_themes/colorful/icons/48x48/plus.png b/dist/qt_themes/colorful/icons/48x48/plus.png +index bc2c47c91a761228dc4ebdc8df8713119d5fec3a..ff3cf889e467cfa18e1af577ceff6b3931c5290c 100644 +--- a/dist/qt_themes/colorful/icons/48x48/plus.png ++++ b/dist/qt_themes/colorful/icons/48x48/plus.png +@@ -1,3 +1,3 @@ + ‰PNG + +- +\ No newline at end of file ++ +\ No newline at end of file +diff --git a/dist/qt_themes/colorful/icons/48x48/sd_card.png b/dist/qt_themes/colorful/icons/48x48/sd_card.png +index 29be71a0d4307c9653e22a31e77e43e87a907beb..5a81693cb0d95c36b65793a91628867742e27374 100644 +--- a/dist/qt_themes/colorful/icons/48x48/sd_card.png ++++ b/dist/qt_themes/colorful/icons/48x48/sd_card.png +@@ -1,6 +1,5 @@ + ‰PNG + +- +-yð+J£ ÓO©€;W 7ºìŸáŸÃ üߤ‹€T€\ÊØÎ@ó¸Þd ˆ1 ˆ5ÈDz)ŽAä9ðàÍy˜ì§Ä÷à÷~üöÜ‘”t=1Ïžù×zsb¦U#ö»P§¡T£T£T£T£T£T£T£T£T£T£T£T£Tóÿ +-Š-ÁåßÔyÀ¹`bS¶. ^7¼½ítbE'¨ïnsA_ÉÖ¥ïò¯¿ð÷kU%ÿ6àïתÜ?x¾ž¿¶%k Ý,à–^Þw!Зlª¼,¬®·ÜìqâùŒÌ +-( +\ No newline at end of file ++ ++ñ¬ís»ðþáuqÑœló¢.Ä×ÑØ@ ÅCC} T‰zë%O^97ÁÛV<ÀÍô«Óq*3°)~›rMe6Ùf…\Óêí#ƒ®iU›|™ßÀZwã&\Øc ++˜N3V«œ ðÇqf ŒB‹%?§RJ‚À'ŠB„œw¹¤”ÄS’²lW/Î ŒF!~à±Î Öë‚Õ*'Ïsö®Mœƒ…š»ÂqRƲl.5q 1™ŒIÒk¡X—ç>£µAkƒ§ÚIr’!$eYP”B¤””űpuF`©5«eŽ±–<ÏK…b92 +\ No newline at end of file +diff --git a/dist/qt_themes/colorful/icons/48x48/star.png b/dist/qt_themes/colorful/icons/48x48/star.png +index 43b5d52ed7cca57aec41d75670cf29cfa98e849d..5798992ed990bb95cb354bb5108cec972693e220 100644 +--- a/dist/qt_themes/colorful/icons/48x48/star.png ++++ b/dist/qt_themes/colorful/icons/48x48/star.png +@@ -1,8 +1,7 @@ + ‰PNG + +- +-*üÙ *,‚ ‰ +‚ÆÍ]AsÝÖRXKÍíEÒ´ÝٹϿëº3³3wæŽ÷Ú‡öÀ0œ;ÏsÎÿÿœÿsžç20a6a±™º7%Õ½!g‹+°zÛ§áì4<æÚÂ÷/Ä‘Ç‹#( +-WO#¦‡ò¾ûƒÆ9¶|Ïàõ残€zÛ§‘Ë6c´ +-žI»1u⬟„;ÃÐäó–þ$ô}i Ø0ßfaÞlœšÁµ€f€fƒÍDnÖ5Ci—©¶xL‰¯18úUŽ³˜ßïáÁüó8;‹ï³ô—} ¨gã« Ë®` $*ùÕc¨ZŒÂB;ÉÌöQÌ Å˯ã˜|¤DàŠw™*U£:bxÒ™BÈã%ÔÓ¾ +-܇H7•²/ë_ŸdÂÄðÍ´Å’ûw +-Rý•²2Gh…Þ2RãP›_¥3¹:öA ›X©:»L±_&†ž@( éðCÍȵÔ(™~C›Íô4ÒïUô?úl¾·ÞkŸZ –ô¦ùCwZ[ç;–üæm›š¸CâePvdŽ«Dƶ¶Ø8S[ð{Í ©ý[mÙÁ¿GçÙâÌ•DúÀKæü% ½A1 . S¨=`(]á`ê5Ï:¬5óEàüeO««m¥|Û ZT†â©€„!µ–¬Øsn›õݶÄZ¿_D¤ë+kð—lCºTR‰´BüPó@ y`|ÿ§«K•“Øéù¯J¥ Ó¡¶Î ~Í°§<–Ð|K ë«>;Œ„½ LÎ 2c»—ÌœªuYª« ؤo—îz 4‡Ä¤ËQÄž° û?Ø¿Š•Ië Mu» +\ No newline at end of file ++ ++Ý›½mKÔÈ O7׈YVݲ8L¾Ð PcvðìîæXµÛÃæ Õ|_ûbà,¨RÇiL¦»~ ‹3TTe'•ÅÄ-w„ÉšcÇ7.2±Ø ++N—A‡UÍ°ˆ=&×s›–9¢GÓ, FUí¸ÕÿN£ëš£ü÷ý‡¸¦Ž¬¯MwŸ6 ++-qôx{]<ÆQ`ù”HóÆYëèº9鞧¶xÅž~çÔæù¥bùBs´Ú&†À`‰Øºyûþ¨ð}eÜîßøRÙý¬ŒDΔ¬»n^æЕJ1s/¦JLVÇÃç 儱ÎÛ‰ Óhrew IdŽ…§Î9§\µav¦ëºW ï¹ft`õ¬øƒ] «'%Í¿Ø¢¶ÍYÕsËOp ÁìΩÍóK¥òÕçÓåñx¬nÖŠ}×üƺиåâ+Á%C¹T^$>PÖšÈ[ªlÛÁ®”"‘>ëP«8 ØÈ 0"Ñ9 LˆÃwºÑ»¾ZL" dÍsC55-?ÞôÀØ ++¦æ>ŒòÀ· þ 0Ñw GTÖÿ9ð]@ðý/"²E }AVªøïDÞRÚfŸ;肨ìª>7ó;ÙÒ騒)œÜôžª~ ,õÌ 8€·—Dek²p7•|½{ïCñ +\ No newline at end of file +diff --git a/dist/qt_themes/default/icons/16x16/checked.png b/dist/qt_themes/default/icons/16x16/checked.png +index 3e017b715802d120d3c93343e374ef3566c954d3..b9e64e9e083479d3ee98f767e7db0afa918733a4 100644 +--- a/dist/qt_themes/default/icons/16x16/checked.png ++++ b/dist/qt_themes/default/icons/16x16/checked.png +@@ -1,3 +1,4 @@ + ‰PNG + +- +\ No newline at end of file ++ ++¿1{„>¬‚žÔa÷%Ƙ>ó´4ï‚Ž7_ñ§5/€žž âªÞa nól¢&s¨5}ÂhRmæ,Ø$Ê—.r±&{¡ÕŒF&€M¢ª$\‘Gi3ëD \2ìù\ÊzœÃ!4™Õ›ìG ŽÁæi:)Ç&¹VO®A*{Û©'™¥håü=T·@ÀÞ.à¢&uó-œ¿õÏÏ9¥/¼ÂVõ´â§ +\ No newline at end of file +diff --git a/dist/qt_themes/default/icons/16x16/failed.png b/dist/qt_themes/default/icons/16x16/failed.png +index 7c4047dd0842e321cb89bd20038772bafc6300cd..1fea7d8f1591573cfac8f772d030a6fdb43fe2a8 100644 +--- a/dist/qt_themes/default/icons/16x16/failed.png ++++ b/dist/qt_themes/default/icons/16x16/failed.png +@@ -1,8 +1,4 @@ + ‰PNG + +- +-¾§õ’>tÊÞkQÝîç'¸xk×[ïÿ•Ý}U^Œ0f ʾí·V @§äÖîjPa%*¹ë +-aÅ+<úøù+Fž%¤C\õ8Gî 3÷´IO›ÃNÝŒmH¸äM`é90žð?A6ÿóŒ; [ žQ¸RÆf *¹ë +-ïnë"s»Êší þ~åçîž +-+w´ï9õà%$_Àö[«¯€ëÑ>®Dem`îS9„KÞ„š¸*b@§Ù… XÆ üHëÿ +-2-ø +\ No newline at end of file ++ ++ J¿û<W( +\ No newline at end of file +diff --git a/dist/qt_themes/default/icons/16x16/lock.png b/dist/qt_themes/default/icons/16x16/lock.png +index 496b58078983bc3c4f7dc2808fd02b8deb8b7b67..69d399050804cfa45e00850d4330a5b7cfaa3a43 100644 +--- a/dist/qt_themes/default/icons/16x16/lock.png ++++ b/dist/qt_themes/default/icons/16x16/lock.png +@@ -1,7 +1,6 @@ + ‰PNG + +- +- +-Àà +-[ŒÄ_㡽ïpÐþ·8+Èà È÷¯-ø 7xB\àeßqOiä Wì`‰;ÜbÓ)3jÎq„혂¨ˆsÉ/N¤Ÿà1}è$c2L±Uq½O‰l>¿Tó&3º +-ú +\ No newline at end of file ++ ++1E£ˆx[Ak±¶ÒS ÀsXÙyÁÞSØÙÛªØÛÚ¨þ—Œ…$« û3f!ŒË0‘Wù6ÉÔ~¢/ïò(ç&™wµ¬%Í] ++©qW¡iߘ¡ä7 ++©qW!5 -_!V Æ]–•|ÊïÃ备^Oþð¹÷§<S9– Š`ú2Ä"ôÐëI½ALÏÌRÀâœÍì•ŒdË$') ØÊINRÀæ-Lr’ºGü‹“Œ¦$½žx‘r&‹ë*Xé¼8çÜ`Þ9e¢‹Ô +\ No newline at end of file +diff --git a/dist/qt_themes/default/icons/256x256/plus_folder.png b/dist/qt_themes/default/icons/256x256/plus_folder.png +index ae4afccc768e0a2163b23d5c457a821ef536dd73..3a49669a3ae3f0ea46ebd5ddd0e51f2b31b37d47 100644 +--- a/dist/qt_themes/default/icons/256x256/plus_folder.png ++++ b/dist/qt_themes/default/icons/256x256/plus_folder.png +@@ -1,12 +1,18 @@ + ‰PNG + +- +-Á±Çç[Àl +-èxXÌ+àÍrt°øãtYQ‡æ§B@Òî{8£€~? ñSeE…J +-« +-aÉçõÄ¿Í»YÛNØ÷Gÿ#f¯Ÿ¸ûÎ +-Þ=D? ¸«à j;aº§)÷óìªl˜ðþ><FX h +-Þ¨¤ôÖó!L†ð×ùêtõHê¢kG‹;]¥ŸA8|œ•¢"I]ñ?ÂJÑ[`çóŒÍÀoRT$©k®`Çà‡]?§ŸNXçý.$©;ÖîÕyçÉMc¯4 +-<Ðê…íÞpp/p"á~Iåµ–ps_ËÁÝqôð!à“(JRñ~OX8tU»ßÐé-‡[ žO8Ì”ÞFà«Àt¸Ìÿd/ì=D¸£¨8½“ìGÒä Ö +-<•6ùÇŠ±fß<àRà<Â"IÅÚJ¸}ÿ'„åü&-æ¢}À—€³€ã="ö-åîMà¯Àïën‹ÑiQ«ööŸ‡V ™OX2\Rs„«ùkKwß ÜG¤A?Z·—íž +-ÌÆ Æ3HX°ÃÙ·’$I’$I’$I’$I’Ú÷ñ?t¸EZ +\ No newline at end of file ++ ++Љݕï+(¡/(i'(*@tk*Ë”•Ð—‘t“»”7(@Þg?D¹] }I÷ù·²µ4jGå*%ô¥#ý ++E ++µ ++ ++ ++ ++ ++@zÜlÿH9Û(¿æ(»è! ++@zfôýÞ¿æ—ÊY¤‚–…Jp ¸†¸ûªMÊY¤€o 1?S¿ṽ–Q ++@Z¶¬¦1ù´ AHK×ðϯ¦H ++]ª,*–Ð&¯s¯{Z# ++@=7USôŸI €z~[MÑ WS PÏÏŽô‡?‹óÊY ƒPœU΢üYp\¦ ++@}Ç*•³èÐã ++÷eÔD¨Ïq+gѡÕ{ËY ‹0šsþútÇëžþ ++@3&º¾¹XBL^ÇÝ®cD€æ\ì¤,S®P^PÐ ¯K¯S¯[¯c¯k4À=Ûx\€ã‹¥¸rÔÁUî¬,V|£Ê|%¶ƒ•-ÊÙhîV~ZÎFõ„²R¹Cù‹ò°’÷Û ›{Rb`„\¦„Ö}“ñ{ ¾Ðºo: äŒ +\ No newline at end of file +diff --git a/dist/qt_themes/default/icons/48x48/bad_folder.png b/dist/qt_themes/default/icons/48x48/bad_folder.png +index 2527c1318575236c92c8111413bcdf1caeacbd27..364ec646f6f1c6b5b632fb68efd2602aa2c87f25 100644 +--- a/dist/qt_themes/default/icons/48x48/bad_folder.png ++++ b/dist/qt_themes/default/icons/48x48/bad_folder.png +@@ -1,8 +1,7 @@ + ‰PNG + +- +-V)éC¥5"*>´îf+”VÛMÒìÎéÃììN¦»ÉÌlœQØ? vÎ=÷ þÿù¸÷rïBM4qùqà~ h[ ·\ +-ˆMQ£) j4DxÔ +-bšº`Ë—e-ÅâNWÛgÀ‘ÐäÓÉÇÞ ù[òéÔWóÖPsÙ¡µíªâžq+ˆÇsƒ©€`®¬³×3Ñw°Î3lL„³Õ¶íÀŠºq‘Êx?ÿF¬Ë¦“O&¾8v Ò”¨~ Ý +-ëÉøÅ(ÖI' +-œ×ê÷®÷’§"Ã6á ±¶—cAæ‡À·`MZïZqhñ˜ÛŠõÏ€6 9Üë F– èôZÄ¿ …5gmÕß Ž \¨5€ßl2X*™»Dä¶FkÕ‚ÀiQ^¾¥,}“»Ë-Ô +\ No newline at end of file ++ ++\§±Úwêƒ2¨."¡/Á” ¶Ú7삲dªò*4OºÐm$ uÃvxßÌԲªØ ++¯QbŽÀõx(M<WšYúЉ´Î7³)^Á%PöCDë² šh^C{;«ºO6òž‡)d¦€J#íîp‡ÿ0Åbµ,_ÄÒJ±òFZëçy¼ž'œqübìÅ´N¼ åLx¼½èžÕ"¼z<Ï{L$ÊQZ@xs°C«G¤I0Õ ¶6V‰T)j@,ÖW ü©1^Ë }b: äyy'°TŽ²"!ÿj,èú‰*¿ùøeÙí/¿‰¯â]юƆx¬%`BfšÁÎ LÜáÑ 3ƒégÍm¢¤€h¨i;gš_¤3õúh{ q”” ]Àû`ÐÇ ~R¤ ¬¿rÊ/Î5£Ÿö©4ÒøŠb=c•"MPik®‹n ++Ð ®‰¯`ÛÂâ])Aª€È–ÆEø§9¾ˆëÆsÃàÏ(Ž¯š‚s÷s[°L¤RÈ ½}¢DdéP<©O ±® ‡üK1p÷‹t˜mèRâ¢H àè3Dâ÷G€ë§ñê‰'© ñÃzÊ v£ˆ·bµ ìËN‰Ø5]ˆ·Š`˜v‡C½áŽ¦}ØÎ>À§àZ›ˆ\ã¾ ++Ý+k à hì7¤g/ôHä_CmØi¼YÛHmNÞo@ë›sÁ0 ]tA§ ³Qjk-La7´w¥l”Úh>Vt¢A§ ³Az:·&qš¿éÑõ:HV@·ò©‚þ øïÂ;þËÈ‘#Çÿ¦ý[&<!ä\( +\ No newline at end of file +diff --git a/dist/qt_themes/default/icons/48x48/chip.png b/dist/qt_themes/default/icons/48x48/chip.png +index 3efdf301eb52a587f18b7d2f94d6ea64773a0231..1b573d51af66864f03a7e20179d3ea4d5f36a012 100644 +--- a/dist/qt_themes/default/icons/48x48/chip.png ++++ b/dist/qt_themes/default/icons/48x48/chip.png +@@ -1,163 +1,6 @@ + ‰PNG + +- +-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c138 79.159824, 2016/09/14-01:09:01 "> +- <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +- <rdf:Description rdf:about="" +- xmlns:xmp="http://ns.adobe.com/xap/1.0/" +- xmlns:dc="http://purl.org/dc/elements/1.1/" +- xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/" +- xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" +- xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#" +- xmlns:tiff="http://ns.adobe.com/tiff/1.0/" +- xmlns:exif="http://ns.adobe.com/exif/1.0/"> +- <xmp:CreatorTool>Adobe Photoshop CC 2017 (Windows)</xmp:CreatorTool> +- <xmp:CreateDate>2018-07-25T20:26:27+08:00</xmp:CreateDate> +- <xmp:ModifyDate>2018-07-25T20:30:37+08:00</xmp:ModifyDate> +- <xmp:MetadataDate>2018-07-25T20:30:37+08:00</xmp:MetadataDate> +- <dc:format>image/png</dc:format> +- <photoshop:ColorMode>3</photoshop:ColorMode> +- <xmpMM:InstanceID>xmp.iid:a03a1ab2-4145-5444-bda5-17fcd23a669a</xmpMM:InstanceID> +- <xmpMM:DocumentID>xmp.did:a03a1ab2-4145-5444-bda5-17fcd23a669a</xmpMM:DocumentID> +- <xmpMM:OriginalDocumentID>xmp.did:a03a1ab2-4145-5444-bda5-17fcd23a669a</xmpMM:OriginalDocumentID> +- <xmpMM:History> +- <rdf:Seq> +- <rdf:li rdf:parseType="Resource"> +- <stEvt:action>created</stEvt:action> +- <stEvt:instanceID>xmp.iid:a03a1ab2-4145-5444-bda5-17fcd23a669a</stEvt:instanceID> +- <stEvt:when>2018-07-25T20:26:27+08:00</stEvt:when> +- <stEvt:softwareAgent>Adobe Photoshop CC 2017 (Windows)</stEvt:softwareAgent> +- </rdf:li> +- </rdf:Seq> +- </xmpMM:History> +- <tiff:Orientation>1</tiff:Orientation> +- <tiff:XResolution>960000/10000</tiff:XResolution> +- <tiff:YResolution>960000/10000</tiff:YResolution> +- <tiff:ResolutionUnit>2</tiff:ResolutionUnit> +- <exif:ColorSpace>65535</exif:ColorSpace> +- <exif:PixelXDimension>48</exif:PixelXDimension> +- <exif:PixelYDimension>48</exif:PixelYDimension> +- </rdf:Description> +- </rdf:RDF> +-</x:xmpmeta> +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-<?xpacket end="w"?>ÊÒô6 +\ No newline at end of file ++ ++Ñ^€f_M†©¨ck"Ç$ã7£EgdYjù«™L¦+s`[Û<‚t6À¾¶MÿVŠ®êD41µþLº,þh ++(€;` Tü¶dï1—¬€p¦È+ˆ+à= 9+û¬÷4aÒsò½aóŒrŸ ùÆn- ++X‹ ÏÀ¥E`Áð(öZYÞ‰ S‹ J±×·oAH™ÎmëýFy4ZÅ5·}þ¡ª…´þGZ%ä òù·Ù)-¤ò·h¡Y¢µN|-!é:ëCãl!‹)¤R¦ñF9…E. 5¹€ÔŒ² +\ No newline at end of file +diff --git a/dist/qt_themes/default/icons/48x48/folder.png b/dist/qt_themes/default/icons/48x48/folder.png +index 2e67d8b38fe9219a9bee674472f6a1356cae3698..507337fae59964244795a3b0bc528e07de52df3e 100644 +--- a/dist/qt_themes/default/icons/48x48/folder.png ++++ b/dist/qt_themes/default/icons/48x48/folder.png +@@ -1,4 +1,6 @@ + ‰PNG + +- +--¢‹Uë`‚i@°š6 |/|CNþð<眄p"‘e®°`KhýâüÎñT™mÜ`4a½ ‡…*á÷þ +\ No newline at end of file ++ ++â%>ƒÏà¨u ++:¡$|-¡R¨Pz—ãùí³;FávïfWæIžìÌÝìÝÿw7w›)x<ž|S £4à4Žb'6b%œá>½1…Wø‘’'ØŒ5aßÑVHkb_ÐV@V=Ä!ÚÞ8M«¢Í©ó€ ¨ ô_Q‘*6úzI|ÅkÜÆaüÁš'cÒñe·0öÁ΢9p “RrƒK@}¨‰%EÓpOƒ^º,â’J1‡»êDÐ7°Wj&¦ ×p(èý ]HG°5è}sŽ=j(€ùé±,¡?š 4ëì¶MŸ,r‡›¥fŒÜ·á1JKžXñ\ã¸Æpà À5>€k| ++…O{pƒ.Óó +\ No newline at end of file +diff --git a/dist/qt_themes/default/icons/48x48/plus.png b/dist/qt_themes/default/icons/48x48/plus.png +index dbc74687b177ea85ffa48be3864db8a49bed76cb..ba7b62aaf7e681348c0780f96f929425bb75f4c0 100644 +--- a/dist/qt_themes/default/icons/48x48/plus.png ++++ b/dist/qt_themes/default/icons/48x48/plus.png +@@ -1,3 +1,3 @@ + ‰PNG + +- +\ No newline at end of file ++ +\ No newline at end of file +diff --git a/dist/qt_themes/default/icons/48x48/sd_card.png b/dist/qt_themes/default/icons/48x48/sd_card.png +index edacaeeb5629c5cf4a86d24eb35a4d37c45bfa77..8a8682133a1da5bcffa2612334db7badf4c5a6a4 100644 +--- a/dist/qt_themes/default/icons/48x48/sd_card.png ++++ b/dist/qt_themes/default/icons/48x48/sd_card.png +@@ -1,6 +1,5 @@ + ‰PNG + +- +-¯ý\1>\ÆšžûÌ?UþGÎF= ¼Œ®½Zè#½?¬½+‘¾Œù06·g„ùî´9=¢oR Š…aZ¸«Ú¤¦4凸†óÍyÙ ªœ±óÀL=U®èÝ®UœêÞ|Õ¦U¡/Ç_ñ"8ÿ؜ݣ·t=Š~»Uèß°QÔg½í#¨Ÿ…þ=Ò·±iÝ1Û‘¾x‰—éÊ;P‡ý´Y ï+*d¦¢wNoãɨ}`êÉRSç8ŠKÁùBC^v•pš¦*BÿüÊR“¤&HMš 59@jr€Ôä +-°Þ°‘q)½\© +-ð¤a#ãRÛ×q½·+ÓRï øÔ`¦(Ä:Nþ‰ù.ó¸c'ý¤¿PÙÄÜÄá*ƒ¿¾3íiS +\ No newline at end of file ++ ++ÑKT*!Qqß·JDN¡ñ$áP¨t$3’±vìÎÞíÎJæ—LvîÙ™Íÿ¿;Ïs“òÈËÀ ð|&Ð €ù2uR '$Úß>€þ Õ1Å×ÀxÌù¦T#A7jb<¬Ø&”ØP’ýV`Mö À2n hö€3%¾´Eùìo€nÙoŒ¡õ9àˆßŸx@Ó©Ä}ó_d|Ñ¿’ñ‚/~¢<k=HÉò€m`Ò`NâD5à»Àt‚ZbÅÀ÷›ÏœxOâÄ›Ÿ’¿Ùofe¿ h–ý¼2_ƒ¨& ++¥Ò<Fqi‹(Êú;O]4 ö%]Àpzr*‡®ŒþË È4Y7º|³n`QKÀRЀ8§iÓ!¯-A7³þBqlã ØÆ°3`gÀ6΀mœÛ8¶ql£3𖪊hjÒ("–²Â'pj:i ¸ÇþéÜ=0§ù¹ ÌŒ€ +\ No newline at end of file +diff --git a/dist/qt_themes/default/icons/48x48/star.png b/dist/qt_themes/default/icons/48x48/star.png +index 740f7f3e75da9160a8db6a1941b159509a7ab8ee..c2b78f0c3e543913b18d4f95956109c7d2646ba8 100644 +--- a/dist/qt_themes/default/icons/48x48/star.png ++++ b/dist/qt_themes/default/icons/48x48/star.png +@@ -1,8 +1,4 @@ + ‰PNG + +- +-¢Pj5"QÑI<¢×4:• +-ñ¨$’]Ö# »–âܳ™¹÷š³wVæŸ|ÅdæûÎÿ»÷ÌœsîЦM›˜ %1/éÁ·$zb ²0VaœF%‰SljBFñ;‰è.Õ('Çý•OãX©F9yjfϱ L©¬ 0S>ý%zeæÚ Ü/Ñ+›0©v“Ø\š]®«-ŸÆµÒì° +-?4n` ½Í´™ ÙÙ~ë»´àÂÖ-,V®~Ÿ°¸wÌëÁzlà áêïΑ¿k°}Âø%LÁ\̶° $Åû“âk…9ÛÕÉ{±¶cx'lCÞ +-wuï“×ïð¦^ ²Oƒ²âbµðô/ñ áV¶2#>pß•¥§ÇOa‹ž‰]øÜÒÕkÇѬò)1Üò_°7¯|Êj<+Q~[ŠÊ§,Ç£ä_aݿʧtáö Ê?ÆÊfɧtàê ÈßÁ’fËWs.¢ü-,Š)Ÿr9‚ü ÎÌE·Ó•‚yõÉEÑvÌ«ÇŽ5g¥",ëÍžB +-œŠÜ!ÅÏõèÄÖ¼IEˆy«sמ÷ !æïulù¾ 2ïq'ñ1cΤ[ˆjŽd˜À,«Ê«à¼°¯o”(fÎÌw…§µL>S¯ÆùHîàaA_á`Ž:ûð²F{MôÂátT=ØgœUl]èLr¿ÎR3ÊÿƒUƒŒã’©ó¼(½¸)< Ië4¡î Và‰p°Ù¡þváä7,ò/Q›6ÿ +\ No newline at end of file ++ ++_¸‘Éö‹z”%4ãGMÓt¯‹€ØP/û|b‹ºûÄõ Îz#N=Ð%ÄZ]b²P)¯õÛ1œÒ}‚³Ë¸kù8;òšp)*ýöÊå_ +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle/icons/16x16/lock.png b/dist/qt_themes/qdarkstyle/icons/16x16/lock.png +index c750a39e855800fe4cde217a1bf28f841030e501..7e63927b2c047718f80ec29512472f1a2d9d357e 100644 +--- a/dist/qt_themes/qdarkstyle/icons/16x16/lock.png ++++ b/dist/qt_themes/qdarkstyle/icons/16x16/lock.png +@@ -1,3 +1,5 @@ + ‰PNG + +- +\ No newline at end of file ++ ++Â0†ñ®BÅÙ©žBð ++7÷®UÜ]»¨Küÿæ·XLª~ð‘÷^^ mˆ áœKá¾`œj»4&°‚\IƬ%j‹ƒ¦\Í#•X©–«ÔÐÓúÎÖÚ«OQ\@îµ À‡[°Æ½0ø¼ Þá7ؓ阱Z9à†åu!ÎÎñ[CŸŠz¶s¥QØÃF¥Á;h@ߘ* €ƒ|8'ª8H×Ì`_2Ò5`·’qè +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle/icons/256x256/plus_folder.png b/dist/qt_themes/qdarkstyle/icons/256x256/plus_folder.png +index 303f9a321890fc4c2054e2cff498adf23f654b70..002101114d150e304765a3466be9bf267ae96382 100644 +--- a/dist/qt_themes/qdarkstyle/icons/256x256/plus_folder.png ++++ b/dist/qt_themes/qdarkstyle/icons/256x256/plus_folder.png +@@ -1,17 +1,47 @@ + ‰PNG + +- +-,–ŒbîýØ +-lv +- 3. |¼©©q'Üà_€k»"" ç‘^a¯ 3WWg41^‡= +-üðn¨´y@f üð;@¯ñDõ¸ ø`D¬+ DõšWdæ)ÀuÀÑíÄ©Î ÀG"âªÒAT§¡ 3 ø,“ÿöÝ8ºøpD¼\:ˆê2Tdæ•À_ûz-ÈÀoFÄöÒAT9tf~„þâWûþxgDì, Du˜µ +-3@fžÜ +- cMfî_:„º¥78ñç´ÒA4§ex÷%5¬ü4p`é ÊêÒÔ-=ü2IüY©Q=àøÒ!4´JP·ô€•¥Chh¯¼e+5¢‡7øœ$?/5¨ T:„æåàÒÔ =|`ÒøóRc"3}:ÍdÙ +-xý;É Þà/ +-Y +-\Ÿ™gΡ!Y +-Ì?1,€ÈÌ·—g +-ÀcX +-E:„þóîÇÑÊœHõýó7î§_Ö×GÄ–9Æž°@qpOé ™ùãû¤Û?Œˆ—¡™¹ UÌ*fH³ +-EHàïÕ±£PÍ“Ð!±Xü p/ýEÙ¶gNŠˆDÄÎÌ©†,* @Í,À«€«2óàà ¦z‘þâ¿?"<ãoBY +-©ó2óà̼¾¥µù@/"øZKÿï6dæ%™ùš–æ:%3—gæ‡ À¹-Ms;@ &< øzKí¶‹þ}ê f¼Ÿg7É’þ÷÷` ý»mˆZ™,ó`úû¥oŽV¶1W%ÞüíŸU»:"îÜ] +\ No newline at end of file ++ ++…Ο/Ž $n¸ƒ€G(Ÿ“ÈE aƒîèÉö >+› ++ Ca$•F ++ #ÁH ËG ++@fâî€Gô «QÀ!qzP€ qL +—«ø¸À ( ++ð%ÿ ++ ++Xé¼ ++ ++@âÔ™ýjÿ]M>¥\ªì§ v;8/ó×ü=Oùgü³þÒEH˜:°¯‡rR|øc„ü½þ™;âc Q€D©ãn®æ.ebA9þÙÅz¬ a©¡ ++@Z¶ˆm•ü¶ AHK çð‹-@HK Ï'ÛLBx2ŒQ ++^·ó½®½ÎÃ"´ƒÐ&mˆ¾#ï}ŠïÍzx]ß×=Ú@hC|Z¨L( N^ç ´‡Ðž_(tþîñº÷s€’( ++@9ëŽƒç¤ ++@9oŽãÍØ¢€rþ[ôŽçb‹P ++@‡hƒ¼GÍöÊ e‘ò®‚Îðºô:õºÝ>®kt€ob1Gí™a¶:zÒ²º©ƒÖ«/V¹£2QñUÆ)Uûª²y˜¬ÌSÊÕa²R¯)Ë”G•´ù¼è…¹Ðöã½Tí, ++@Bô\úæUß è=•ûÄiT¤®À. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++@ZÞŒm•Þˆ-@HËK±Ò˱E( ++@ZîUž “•ðcûw €„4 ßGn˜«ÄÜø; ++@z.Qž“ åWÿ*‹ º€½B¿¦æëÊ{Å‚Îðc}Mýj˜E*( ++@ââÐ}²r†2’·ý=þÞÉñg‘°F³Ù<Síœ0[ mL8‰.Ñs=FÍîÊžÊTeCÅ^PþªøD¢{õTñV_—é¹jÆÉ*Íq8Eç†ùJ}@ $VC}r 5¯‡¹Jì]€ºÞÚÙ$¶ ++ÞV¶VøG˜ ¼í¦oð.Àea@".^µóÛ€€iPç‡ ++@ï;U}vD'ô { `UÍfó"5Ç…9 +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png b/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png +index 4a9709623476fcf4070c4e3da2bb17375222082e..245f96c7ba65c9a792abc01a1b76c39accd3ee5e 100644 +--- a/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png ++++ b/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png +@@ -1,8 +1,7 @@ + ‰PNG + +- +-˜¦%ͽ0³GÍ,n¥³df‡Í¬1Hó£e÷ó™5a¾· +-æ=àXœ³ÿ• ³ŠzMÀíUÔ+ˆÌÌÅ·Uȯdv§j³ +-ÀÌvïáÝ\•ÇÛ’r©ø@ç^¤Å4 +-ÎÚòù./¦Ï¤!@Ò‡@0Næ |9ü’!u"þ×l®Ì~Š2 ³ƒ¹mTÒ$0™}MÚR¬H æ´Àâ™GõW”¡S +-sÿ»Hš~¯TÙq4N»$]W©ÖJNÉxþ_1î{^G +\ No newline at end of file ++ ++Q³ ºøR$Foù%EÝ^“^ëQëÉ¢ëC=™Qi±»¥A‘Ùnë|ýÏÌY÷¢Â:óm®°?ø{Îùö›ùΙù曋Jš4i–6*Û„™0» 7TeAfx]VUuÊÿH~'4Éâ”Ç»O.è ¢Q%“ü"0ÀF(@£%‰äßчI.É);] ÅOI¨ ¢ zA`›<ˆ’•EúõC[x˜hÜÅÓË?›ÛË."Œ]‡f¬ rn #lM¥s¦z¨7ȃ–ýãÐM¡ß¨ ++– ++ðí^…=̵Æç ›6¬iâ%ùFS!”ž¯ îB-aí m½˜ -„üiÛôö-aº ++¥*ôun;§«3kýFút½¢ŽÅÙòÉ"}îC÷pä—Â,I“&Mb(Ê?µR{"! +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/chip.png b/dist/qt_themes/qdarkstyle/icons/48x48/chip.png +index 973fabd052e389c28ef36c482cf44d764795a3b4..db0cadac1338a971b7b890c33f5920580c1013a5 100644 +--- a/dist/qt_themes/qdarkstyle/icons/48x48/chip.png ++++ b/dist/qt_themes/qdarkstyle/icons/48x48/chip.png +@@ -1,165 +1,5 @@ + ‰PNG + +- +-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c138 79.159824, 2016/09/14-01:09:01 "> +- <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +- <rdf:Description rdf:about="" +- xmlns:xmp="http://ns.adobe.com/xap/1.0/" +- xmlns:dc="http://purl.org/dc/elements/1.1/" +- xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/" +- xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" +- xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#" +- xmlns:tiff="http://ns.adobe.com/tiff/1.0/" +- xmlns:exif="http://ns.adobe.com/exif/1.0/"> +- <xmp:CreatorTool>Adobe Photoshop CC 2017 (Windows)</xmp:CreatorTool> +- <xmp:CreateDate>2018-07-25T21:37:27+08:00</xmp:CreateDate> +- <xmp:ModifyDate>2018-07-25T21:38:09+08:00</xmp:ModifyDate> +- <xmp:MetadataDate>2018-07-25T21:38:09+08:00</xmp:MetadataDate> +- <dc:format>image/png</dc:format> +- <photoshop:ColorMode>3</photoshop:ColorMode> +- <xmpMM:InstanceID>xmp.iid:d24b6914-04d7-6e40-94e6-a3f5f4d24f35</xmpMM:InstanceID> +- <xmpMM:DocumentID>xmp.did:d24b6914-04d7-6e40-94e6-a3f5f4d24f35</xmpMM:DocumentID> +- <xmpMM:OriginalDocumentID>xmp.did:d24b6914-04d7-6e40-94e6-a3f5f4d24f35</xmpMM:OriginalDocumentID> +- <xmpMM:History> +- <rdf:Seq> +- <rdf:li rdf:parseType="Resource"> +- <stEvt:action>created</stEvt:action> +- <stEvt:instanceID>xmp.iid:d24b6914-04d7-6e40-94e6-a3f5f4d24f35</stEvt:instanceID> +- <stEvt:when>2018-07-25T21:37:27+08:00</stEvt:when> +- <stEvt:softwareAgent>Adobe Photoshop CC 2017 (Windows)</stEvt:softwareAgent> +- </rdf:li> +- </rdf:Seq> +- </xmpMM:History> +- <tiff:Orientation>1</tiff:Orientation> +- <tiff:XResolution>960000/10000</tiff:XResolution> +- <tiff:YResolution>960000/10000</tiff:YResolution> +- <tiff:ResolutionUnit>2</tiff:ResolutionUnit> +- <exif:ColorSpace>65535</exif:ColorSpace> +- <exif:PixelXDimension>48</exif:PixelXDimension> +- <exif:PixelYDimension>48</exif:PixelYDimension> +- </rdf:Description> +- </rdf:RDF> +-</x:xmpmeta> +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-<?xpacket end="w"?>Ú( +-4€pÓæ$õù‹ç’v'! © hÉÀ¼´¸wËâZÀ>‹;% ÀB(cÎ@+ŽÈ†Å5 nEÿbÌâÎ9ý.EÛÕ@ ÀèŽ#òŽqÚ.[ ’jV»ÓŽ I( +-PFRøqIã)æG€º¤J‡v{Y` ‰èüf§Uà{ñ¸´Y$Õ¬èw¦ÿrð[Òp&}À³ `ìNóÌWå `BÒ¯>O'õ" +\ No newline at end of file ++ ++¹ÔäRsy àé…jÆ7 Wë…*›Dá7nñ®ÇO½…1æ¾ü…ÆZ$+":^èXïTëm|ãóYjÚ4°._áD¢¤m f9 êÛ40³®ÇD8™ ++/º„°M+ö +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/folder.png b/dist/qt_themes/qdarkstyle/icons/48x48/folder.png +index 0f1e987d6aa24b1d2f26d40181ec05b62c5862da..11a76b5c1256ade016d4e22cf048656cb0788ad3 100644 +--- a/dist/qt_themes/qdarkstyle/icons/48x48/folder.png ++++ b/dist/qt_themes/qdarkstyle/icons/48x48/folder.png +@@ -1,3 +1,5 @@ + ‰PNG + +- +\ No newline at end of file ++ ++îô ù|Æ°¸Â´Þ}´°ÐþȪ!}ÃOY-"¢ ÁÎÏÕ2ÑMvÚ‡µ§N WQ>Ð-ÁkÒ(͆žà!Nêeª°qkÙՂׇ ¢L°r`Û°Ç ú¸×5\:ó”%¼VÂC.ûÛxDõ ÄZJº&ÂB×dà$C=–‰‡8Ñã?Áþ;);8®6´Ž|‘Na·šUy Ç!Y ƒµH¨Ø@?r¡yTùltúÄŽtŽ²ïÎ|$#€æMW/]I ++ÐÀ46€il +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/plus.png b/dist/qt_themes/qdarkstyle/icons/48x48/plus.png +index 16cc8b4f44d52009d4a3f4c9d46f5bb0e20babcf..6af929bf66b9d82cd43aa2db19fb0db05c89b8af 100644 +--- a/dist/qt_themes/qdarkstyle/icons/48x48/plus.png ++++ b/dist/qt_themes/qdarkstyle/icons/48x48/plus.png +@@ -1,4 +1,4 @@ + ‰PNG + +- +-×¾V+ÀµpmŸ8úoV³y +\ No newline at end of file ++ ++ƒ0EÑ™n£]’ éÂÛxý¨Ð¢Ta|(÷€ I®ø‘` +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png b/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png +index 0291c6542d05a40a350bb5bdbd99a15c01467161..42b9f27738d95d742b4e8380c6450e639630e049 100644 +--- a/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png ++++ b/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png +@@ -1,7 +1,5 @@ + ‰PNG + +- +-‚x…AM¡Á þˆ¾·á&³»¹quw™vßÛÛ}Þ¹]¸=¨€¤®¤ç’6T ›’ÞJº'éXÏ"ñ–¤[’~Õ(^Äš¤³+ß–´Ð°¸Ëª¤IßËå;ÀÐuâgÀûly˜>‹Î63À4°ô|ø<r²À,° ¼vò‹@'[ž7³Û!ÎÛä%=-8#¼m$é¥÷ÙY~ÅË’ú^Ö˶íyyß9æcßoßù6Ã3.¼r ñƒÒ’ZÀ¶O›Øä¦üN#p¸TŸË¿¡°€¤óÀ|Ã.•(댆k 8ã¼ 6àL«$Ÿu–×ÍìÅÖŠ¤õ*ý…÷IF×ÞE3ë:ïÝzÀà‡³Ÿ)à'°îìê +-ðÙÉÚÙ17Þ#¶˜d4S–Íì´ëZ6! *È&€ÃùÁìåb%Ûv¼±ìx Ø ¤± ù —tÍYŸ©K¦ +-!W¡ÝDî*´ç§P*›T 6©@lRؤ±Ib“ +-Ä&ˆM*›T 6©@lþÛjÔ"œœWY5‹T%÷p¥¬À“šEª’ó*ûmô$°ÂðéÊna8efîSâ0³WÀUàkb!¬—}ù±Hš–t_Ò;5ÿ•MIo$Ý‘t´Ìñ7'÷žþªu +\ No newline at end of file ++ ++8\hUQ$¡Xö÷À\ §üoÛqtÝ@áãÛuë’ö$íJºíkˆþ+‘€cözÔWìú ++ÒHMo 5½ÔôRÓHMo 5½ÔôRÓHMÈÀ¯VU”ë)d`›ìïtWðÖWð0Æ|n +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/star.png b/dist/qt_themes/qdarkstyle/icons/48x48/star.png +index 90d423a1d4c1e05ccec0a01fa34abca9fe99676d..546779e2a810e73169f65a79850aa07dffd70267 100644 +--- a/dist/qt_themes/qdarkstyle/icons/48x48/star.png ++++ b/dist/qt_themes/qdarkstyle/icons/48x48/star.png +@@ -1,4 +1,8 @@ + ‰PNG + +- +-pÐK¼ebð*ñãÀÎe‰·L€G+(þ5°)ˆxËDpoÄ?ÖßdäFDñ¯ã«‰ÛÄßÇ£gö=N=ãÒ˜7Æàäkà¨g\G|‚œ§ (Jš•ÔãS0…_’Öcæ\‚|f ¬ðâ%©WÒ!× ^S +w×@`â +\ No newline at end of file ++ ++œ‹Ñlæ—KXœ!lx4?‡èV<À…Ll ++âßÀæ·à~ï ++À¦¬üHðÐ!Ò,Igˆå]Ft•Áj5¤3”'V vê½~9œ· r˜<—m¢GÄ7¸ôž«´U&„J¶ÓTùC Þ§p§¢’Ö¨rÅSÈÑ7ߣ&žèÄ\øô¬[”à«„Øz`©}êâ^)Ζ|ÜÅÎ+±CŽ˜`; ++Àn ÆHqžÏËü@¢‡F3–â™ €ñªÏ\S ++½[ôN`'yþô&Ã<r³É8ïjûЇ>üÇø€üÀ¸Š6Õ +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/lock.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/lock.png +index c750a39e855800fe4cde217a1bf28f841030e501..7e63927b2c047718f80ec29512472f1a2d9d357e 100644 +--- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/lock.png ++++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/lock.png +@@ -1,3 +1,5 @@ + ‰PNG + +- +\ No newline at end of file ++ ++Â0†ñ®BÅÙ©žBð ++7÷®UÜ]»¨Küÿæ·XLª~ð‘÷^^ mˆ áœKá¾`œj»4&°‚\IƬ%j‹ƒ¦\Í#•X©–«ÔÐÓúÎÖÚ«OQ\@îµ À‡[°Æ½0ø¼ Þá7ؓ阱Z9à†åu!ÎÎñ[CŸŠz¶s¥QØÃF¥Á;h@ߘ* €ƒ|8'ª8H×Ì`_2Ò5`·’qè +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/256x256/plus_folder.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/256x256/plus_folder.png +index 303f9a321890fc4c2054e2cff498adf23f654b70..002101114d150e304765a3466be9bf267ae96382 100644 +--- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/256x256/plus_folder.png ++++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/256x256/plus_folder.png +@@ -1,17 +1,47 @@ + ‰PNG + +- +-,–ŒbîýØ +-lv +- 3. |¼©©q'Üà_€k»"" ç‘^a¯ 3WWg41^‡= +-üðn¨´y@f üð;@¯ñDõ¸ ø`D¬+ DõšWdæ)ÀuÀÑíÄ©Î ÀG"âªÒAT§¡ 3 ø,“ÿöÝ8ºøpD¼\:ˆê2Tdæ•À_ûz-ÈÀoFÄöÒAT9tf~„þâWûþxgDì, Du˜µ +-3@fžÜ +- cMfî_:„º¥78ñç´ÒA4§ex÷%5¬ü4p`é ÊêÒÔ-=ü2IüY©Q=àøÒ!4´JP·ô€•¥Chh¯¼e+5¢‡7øœ$?/5¨ T:„æåàÒÔ =|`ÒøóRc"3}:ÍdÙ +-xý;É Þà/ +-Y +-\Ÿ™gΡ!Y +-Ì?1,€ÈÌ·—g +-ÀcX +-E:„þóîÇÑÊœHõýó7î§_Ö×GÄ–9Æž°@qpOé ™ùãû¤Û?Œˆ—¡™¹ UÌ*fH³ +-EHàïÕ±£PÍ“Ð!±Xü p/ýEÙ¶gNŠˆDÄÎÌ©†,* @Í,À«€«2óàà ¦z‘þâ¿?"<ãoBY +-©ó2óà̼¾¥µù@/"øZKÿï6dæ%™ùš–æ:%3—gæ‡ À¹-Ms;@ &< øzKí¶‹þ}ê f¼Ÿg7É’þ÷÷` ý»mˆZ™,ó`úû¥oŽV¶1W%ÞüíŸU»:"îÜ] +\ No newline at end of file ++ ++…Ο/Ž $n¸ƒ€G(Ÿ“ÈE aƒîèÉö >+› ++ Ca$•F ++ #ÁH ËG ++@fâî€Gô «QÀ!qzP€ qL +—«ø¸À ( ++ð%ÿ ++ ++Xé¼ ++ ++@âÔ™ýjÿ]M>¥\ªì§ v;8/ó×ü=Oùgü³þÒEH˜:°¯‡rR|øc„ü½þ™;âc Q€D©ãn®æ.ebA9þÙÅz¬ a©¡ ++@Z¶ˆm•ü¶ AHK çð‹-@HK Ï'ÛLBx2ŒQ ++^·ó½®½ÎÃ"´ƒÐ&mˆ¾#ï}ŠïÍzx]ß×=Ú@hC|Z¨L( N^ç ´‡Ðž_(tþîñº÷s€’( ++@9ëŽƒç¤ ++@9oŽãÍØ¢€rþ[ôŽçb‹P ++@‡hƒ¼GÍöÊ e‘ò®‚Îðºô:õºÝ>®kt€ob1Gí™a¶:zÒ²º©ƒÖ«/V¹£2QñUÆ)Uûª²y˜¬ÌSÊÕa²R¯)Ë”G•´ù¼è…¹Ðöã½Tí, ++@Bô\úæUß è=•ûÄiT¤®À. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++@ZÞŒm•Þˆ-@HËK±Ò˱E( ++@ZîUž “•ðcûw €„4 ßGn˜«ÄÜø; ++@z.Qž“ åWÿ*‹ º€½B¿¦æëÊ{Å‚Îðc}Mýj˜E*( ++@ââÐ}²r†2’·ý=þÞÉñg‘°F³Ù<Síœ0[ mL8‰.Ñs=FÍîÊžÊTeCÅ^PþªøD¢{õTñV_—é¹jÆÉ*Íq8Eç†ùJ}@ $VC}r 5¯‡¹Jì]€ºÞÚÙ$¶ ++ÞV¶VøG˜ ¼í¦oð.Àea@".^µóÛ€€iPç‡ ++@ï;U}vD'ô { `UÍfó"5Ç…9 +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/bad_folder.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/bad_folder.png +index 4a9709623476fcf4070c4e3da2bb17375222082e..245f96c7ba65c9a792abc01a1b76c39accd3ee5e 100644 +--- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/bad_folder.png ++++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/bad_folder.png +@@ -1,8 +1,7 @@ + ‰PNG + +- +-˜¦%ͽ0³GÍ,n¥³df‡Í¬1Hó£e÷ó™5a¾· +-æ=àXœ³ÿ• ³ŠzMÀíUÔ+ˆÌÌÅ·Uȯdv§j³ +-ÀÌvïáÝ\•ÇÛ’r©ø@ç^¤Å4 +-ÎÚòù./¦Ï¤!@Ò‡@0Næ |9ü’!u"þ×l®Ì~Š2 ³ƒ¹mTÒ$0™}MÚR¬H æ´Àâ™GõW”¡S +-sÿ»Hš~¯TÙq4N»$]W©ÖJNÉxþ_1î{^G +\ No newline at end of file ++ ++Q³ ºøR$Foù%EÝ^“^ëQëÉ¢ëC=™Qi±»¥A‘Ùnë|ýÏÌY÷¢Â:óm®°?ø{Îùö›ùΙù曋Jš4i–6*Û„™0» 7TeAfx]VUuÊÿH~'4Éâ”Ç»O.è ¢Q%“ü"0ÀF(@£%‰äßчI.É);] ÅOI¨ ¢ zA`›<ˆ’•EúõC[x˜hÜÅÓË?›ÛË."Œ]‡f¬ rn #lM¥s¦z¨7ȃ–ýãÐM¡ß¨ ++– ++ðí^…=̵Æç ›6¬iâ%ùFS!”ž¯ îB-aí m½˜ -„üiÛôö-aº ++¥*ôun;§«3kýFút½¢ŽÅÙòÉ"}îC÷pä—Â,I“&Mb(Ê?µR{"! +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/chip.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/chip.png +index 973fabd052e389c28ef36c482cf44d764795a3b4..db0cadac1338a971b7b890c33f5920580c1013a5 100644 +--- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/chip.png ++++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/chip.png +@@ -1,165 +1,5 @@ + ‰PNG + +- +-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c138 79.159824, 2016/09/14-01:09:01 "> +- <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +- <rdf:Description rdf:about="" +- xmlns:xmp="http://ns.adobe.com/xap/1.0/" +- xmlns:dc="http://purl.org/dc/elements/1.1/" +- xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/" +- xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" +- xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#" +- xmlns:tiff="http://ns.adobe.com/tiff/1.0/" +- xmlns:exif="http://ns.adobe.com/exif/1.0/"> +- <xmp:CreatorTool>Adobe Photoshop CC 2017 (Windows)</xmp:CreatorTool> +- <xmp:CreateDate>2018-07-25T21:37:27+08:00</xmp:CreateDate> +- <xmp:ModifyDate>2018-07-25T21:38:09+08:00</xmp:ModifyDate> +- <xmp:MetadataDate>2018-07-25T21:38:09+08:00</xmp:MetadataDate> +- <dc:format>image/png</dc:format> +- <photoshop:ColorMode>3</photoshop:ColorMode> +- <xmpMM:InstanceID>xmp.iid:d24b6914-04d7-6e40-94e6-a3f5f4d24f35</xmpMM:InstanceID> +- <xmpMM:DocumentID>xmp.did:d24b6914-04d7-6e40-94e6-a3f5f4d24f35</xmpMM:DocumentID> +- <xmpMM:OriginalDocumentID>xmp.did:d24b6914-04d7-6e40-94e6-a3f5f4d24f35</xmpMM:OriginalDocumentID> +- <xmpMM:History> +- <rdf:Seq> +- <rdf:li rdf:parseType="Resource"> +- <stEvt:action>created</stEvt:action> +- <stEvt:instanceID>xmp.iid:d24b6914-04d7-6e40-94e6-a3f5f4d24f35</stEvt:instanceID> +- <stEvt:when>2018-07-25T21:37:27+08:00</stEvt:when> +- <stEvt:softwareAgent>Adobe Photoshop CC 2017 (Windows)</stEvt:softwareAgent> +- </rdf:li> +- </rdf:Seq> +- </xmpMM:History> +- <tiff:Orientation>1</tiff:Orientation> +- <tiff:XResolution>960000/10000</tiff:XResolution> +- <tiff:YResolution>960000/10000</tiff:YResolution> +- <tiff:ResolutionUnit>2</tiff:ResolutionUnit> +- <exif:ColorSpace>65535</exif:ColorSpace> +- <exif:PixelXDimension>48</exif:PixelXDimension> +- <exif:PixelYDimension>48</exif:PixelYDimension> +- </rdf:Description> +- </rdf:RDF> +-</x:xmpmeta> +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-<?xpacket end="w"?>Ú( +-4€pÓæ$õù‹ç’v'! © hÉÀ¼´¸wËâZÀ>‹;% ÀB(cÎ@+ŽÈ†Å5 nEÿbÌâÎ9ý.EÛÕ@ ÀèŽ#òŽqÚ.[ ’jV»ÓŽ I( +-PFRøqIã)æG€º¤J‡v{Y` ‰èüf§Uà{ñ¸´Y$Õ¬èw¦ÿrð[Òp&}À³ `ìNóÌWå `BÒ¯>O'õ" +\ No newline at end of file ++ ++¹ÔäRsy àé…jÆ7 Wë…*›Dá7nñ®ÇO½…1æ¾ü…ÆZ$+":^èXïTëm|ãóYjÚ4°._áD¢¤m f9 êÛ40³®ÇD8™ ++/º„°M+ö +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/folder.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/folder.png +index 0f1e987d6aa24b1d2f26d40181ec05b62c5862da..11a76b5c1256ade016d4e22cf048656cb0788ad3 100644 +--- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/folder.png ++++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/folder.png +@@ -1,3 +1,5 @@ + ‰PNG + +- +\ No newline at end of file ++ ++îô ù|Æ°¸Â´Þ}´°ÐþȪ!}ÃOY-"¢ ÁÎÏÕ2ÑMvÚ‡µ§N WQ>Ð-ÁkÒ(͆žà!Nêeª°qkÙՂׇ ¢L°r`Û°Ç ú¸×5\:ó”%¼VÂC.ûÛxDõ ÄZJº&ÂB×dà$C=–‰‡8Ñã?Áþ;);8®6´Ž|‘Na·šUy Ç!Y ƒµH¨Ø@?r¡yTùltúÄŽtŽ²ïÎ|$#€æMW/]I ++ÐÀ46€il +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/plus.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/plus.png +index 16cc8b4f44d52009d4a3f4c9d46f5bb0e20babcf..6af929bf66b9d82cd43aa2db19fb0db05c89b8af 100644 +--- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/plus.png ++++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/plus.png +@@ -1,4 +1,4 @@ + ‰PNG + +- +-×¾V+ÀµpmŸ8úoV³y +\ No newline at end of file ++ ++ƒ0EÑ™n£]’ éÂÛxý¨Ð¢Ta|(÷€ I®ø‘` +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/sd_card.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/sd_card.png +index 0291c6542d05a40a350bb5bdbd99a15c01467161..42b9f27738d95d742b4e8380c6450e639630e049 100644 +--- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/sd_card.png ++++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/sd_card.png +@@ -1,7 +1,5 @@ + ‰PNG + +- +-‚x…AM¡Á þˆ¾·á&³»¹quw™vßÛÛ}Þ¹]¸=¨€¤®¤ç’6T ›’ÞJº'éXÏ"ñ–¤[’~Õ(^Äš¤³+ß–´Ð°¸Ëª¤IßËå;ÀÐuâgÀûly˜>‹Î63À4°ô|ø<r²À,° ¼vò‹@'[ž7³Û!ÎÛä%=-8#¼m$é¥÷ÙY~ÅË’ú^Ö˶íyyß9æcßoßù6Ã3.¼r ñƒÒ’ZÀ¶O›Øä¦üN#p¸TŸË¿¡°€¤óÀ|Ã.•(댆k 8ã¼ 6àL«$Ÿu–×ÍìÅÖŠ¤õ*ý…÷IF×ÞE3ë:ïÝzÀà‡³Ÿ)à'°îìê +-ðÙÉÚÙ17Þ#¶˜d4S–Íì´ëZ6! *È&€ÃùÁìåb%Ûv¼±ìx Ø ¤± ù —tÍYŸ©K¦ +-!W¡ÝDî*´ç§P*›T 6©@lRؤ±Ib“ +-Ä&ˆM*›T 6©@lþÛjÔ"œœWY5‹T%÷p¥¬À“šEª’ó*ûmô$°ÂðéÊna8efîSâ0³WÀUàkb!¬—}ù±Hš–t_Ò;5ÿ•MIo$Ý‘t´Ìñ7'÷žþªu +\ No newline at end of file ++ ++8\hUQ$¡Xö÷À\ §üoÛqtÝ@áãÛuë’ö$íJºíkˆþ+‘€cözÔWìú ++ÒHMo 5½ÔôRÓHMo 5½ÔôRÓHMÈÀ¯VU”ë)d`›ìïtWðÖWð0Æ|n +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/star.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/star.png +index 90d423a1d4c1e05ccec0a01fa34abca9fe99676d..546779e2a810e73169f65a79850aa07dffd70267 100644 +--- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/star.png ++++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/star.png +@@ -1,4 +1,8 @@ + ‰PNG + +- +-pÐK¼ebð*ñãÀÎe‰·L€G+(þ5°)ˆxËDpoÄ?ÖßdäFDñ¯ã«‰ÛÄßÇ£gö=N=ãÒ˜7Æàäkà¨g\G|‚œ§ (Jš•ÔãS0…_’Öcæ\‚|f ¬ðâ%©WÒ!× ^S +w×@`â +\ No newline at end of file ++ ++œ‹Ñlæ—KXœ!lx4?‡èV<À…Ll ++âßÀæ·à~ï ++À¦¬üHðÐ!Ò,Igˆå]Ft•Áj5¤3”'V vê½~9œ· r˜<—m¢GÄ7¸ôž«´U&„J¶ÓTùC Þ§p§¢’Ö¨rÅSÈÑ7ߣ&žèÄ\øô¬[”à«„Øz`©}êâ^)Ζ|ÜÅÎ+±CŽ˜`; ++Àn ÆHqžÏËü@¢‡F3–â™ €ñªÏ\S ++½[ôN`'yþô&Ã<r³É8ïjûЇ>üÇø€üÀ¸Š6Õ +\ No newline at end of file +-- +2.36.0 + diff --git a/pkgs/applications/emulators/zesarux/default.nix b/pkgs/applications/emulators/zesarux/default.nix index 4df6cfafbc013..4a00f9b03496e 100644 --- a/pkgs/applications/emulators/zesarux/default.nix +++ b/pkgs/applications/emulators/zesarux/default.nix @@ -50,6 +50,14 @@ stdenv.mkDerivation rec { url = "https://github.com/chernandezba/zesarux/commit/4493439b38f565c5be7c36239ecaf0cf80045627.diff"; sha256 = "sha256-f+21naPcPXdcVvqU8ymlGfl1WkYGOeOBe9B/WFUauTI="; }) + + # Patch pending upstream release for libcaca-0.99.beta20 support: + # https://github.com/chernandezba/zesarux/pull/1 + (fetchpatch { + name = "libcaca-0.99.beta20.patch"; + url = "https://github.com/chernandezba/zesarux/commit/542786338d00ab6fcdf712bbd6f5e891e8b26c34.diff"; + sha256 = "sha256-UvXvBb9Nzw5HNz0uiv2SV1Oeiw7aVCa0jhEbThDRVec="; + }) ]; postPatch = '' diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix index e7ac78da18ef4..0cca2ea6cd35f 100644 --- a/pkgs/applications/finance/irpf/default.nix +++ b/pkgs/applications/finance/irpf/default.nix @@ -6,17 +6,18 @@ , makeDesktopItem , makeWrapper , unzip +, xdg-utils }: stdenvNoCC.mkDerivation rec { pname = "irpf"; - version = "2022-1.0"; + version = "2022-1.4"; src = let year = lib.head (lib.splitVersion version); in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip"; - sha256 = "0h8f51ilvg7m6hlx0y5mpxhac90p32ksbrffw0hxdqbilgjz1s68"; + sha256 = "sha256-AKBcBkoPDBknUOyndf9hNigzDHjjgi2v0n1Rs+//j/8="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; @@ -47,6 +48,7 @@ stdenvNoCC.mkDerivation rec { --add-flags "-Dawt.useSystemAAFontSettings=on" \ --add-flags "-Dswing.aatext=true" \ --add-flags "-jar $BASEDIR/${pname}.jar" \ + --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} \ --set _JAVA_AWT_WM_NONREPARENTING 1 \ --set AWT_TOOLKIT MToolkit @@ -57,7 +59,12 @@ stdenvNoCC.mkDerivation rec { ''; meta = with lib; { - description = "Programa Oficial da Receita para elaboração do IRPF"; + description = "Brazillian government application for reporting income tax"; + longDescription = '' + Brazillian government application for reporting income tax. + + IRFP - Imposto de Renda Pessoa FÃsica - Receita Federal do Brasil. + ''; homepage = "https://www.gov.br/receitafederal/pt-br"; license = licenses.unfree; platforms = platforms.all; diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index 66b1bb0f97fe2..38719de371aa0 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -2,19 +2,74 @@ , lib , fetchurl , python3 -, python3Packages , nodePackages , wkhtmltopdf -, callPackage }: -with python3Packages; - let - werkzeug = python3Packages.callPackage ../../../development/python-modules/werkzeug/1.nix {}; -in - -buildPythonApplication rec { + python = python3.override { + packageOverrides = self: super: { + click = super.click.overridePythonAttrs (old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); + flask = super.flask.overridePythonAttrs (old: rec { + version = "1.1.4"; + src = old.src.override { + inherit version; + sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196"; + }; + }); + itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec { + version = "1.1.0"; + src = old.src.override { + inherit version; + sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; + }; + }); + jinja2 = super.jinja2.overridePythonAttrs (old: rec { + version = "2.11.3"; + src = old.src.override { + inherit version; + sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"; + }; + }); + markupsafe = super.markupsafe.overridePythonAttrs (old: rec { + version = "2.0.1"; + src = old.src.override { + inherit version; + sha256 = "594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"; + }; + }); + werkzeug = super.werkzeug.overridePythonAttrs (old: rec { + version = "1.0.1"; + src = old.src.override { + inherit version; + sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; + }; + checkInputs = old.checkInputs ++ (with self; [ + requests + ]); + disabledTests = old.disabledTests ++ [ + # ResourceWarning: unclosed file + "test_basic" + "test_date_to_unix" + "test_easteregg" + "test_file_rfc2231_filename_continuations" + "test_find_terminator" + "test_save_to_pathlib_dst" + ]; + disabledTestPaths = old.disabledTestPaths ++ [ + # ResourceWarning: unclosed file + "tests/test_http.py" + ]; + }); + }; + }; +in python.pkgs.buildPythonApplication rec { pname = "odoo"; major = "15"; @@ -23,6 +78,8 @@ buildPythonApplication rec { version = "${major}.${minor}.${patch}"; + format = "setuptools"; + # latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile src = fetchurl { url = "https://nightly.odoo.com/${major}.${minor}/nightly/src/odoo_${version}.tar.gz"; @@ -30,23 +87,12 @@ buildPythonApplication rec { hash = "sha256-mofV0mNCdyzJecp0XegZBR/5NzHjis9kbpsUA/KJbZg="; }; - nativeBuildInputs = [ - setuptools - wheel - mock - ]; - - buildInputs = [ - wkhtmltopdf - nodePackages.rtlcss - ]; - # needs some investigation doCheck = false; makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python.pkgs; [ Babel chardet decorator diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 36664a2d49cd3..23cee79b5e226 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,25 +1,25 @@ { lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw -, cairo, readline, ffmpeg, makeWrapper, wxGTK30, wxmac, netcdf, blas +, cairo, readline, ffmpeg, makeWrapper, wxGTK31, wxmac, netcdf, blas , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, libLAS, proj-datumgrid , zstd, pdal, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "grass"; - version = "7.8.6"; + version = "8.0.1"; src = with lib; fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = version; - sha256 = "sha256-zvZqFWuxNyA+hu+NMiRbQVdzzrQPsZrdGdfVB17+SbM="; + sha256 = "sha256-rcOT21HRJDR+DEYsZn6BjOOhy28DWapz9PN7cRAdWGc="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite readline ffmpeg makeWrapper netcdf geos postgresql libmysqlclient blas libLAS proj-datumgrid zstd wrapGAppsHook ] - ++ lib.optionals stdenv.isLinux [ cairo pdal wxGTK30 ] + ++ lib.optionals stdenv.isLinux [ cairo pdal wxGTK31 ] ++ lib.optional stdenv.isDarwin wxmac ++ (with python3Packages; [ python python-dateutil numpy ] ++ lib.optional stdenv.isDarwin wxPython_4_0 @@ -68,41 +68,15 @@ stdenv.mkDerivation rec { /* Ensures that the python script run at build time are actually executable; * otherwise, patchShebangs ignores them. */ postConfigure = '' - chmod +x scripts/d.out.file/d.out.file.py \ - scripts/d.to.rast/d.to.rast.py \ - scripts/d.what.rast/d.what.rast.py \ - scripts/d.what.vect/d.what.vect.py \ - scripts/g.extension/g.extension.py \ - scripts/g.extension.all/g.extension.all.py \ - scripts/r.drain/r.drain.py \ - scripts/r.pack/r.pack.py \ - scripts/r.import/r.import.py \ - scripts/r.tileset/r.tileset.py \ - scripts/r.unpack/r.unpack.py \ - scripts/v.clip/v.clip.py \ - scripts/v.rast.stats/v.rast.stats.py \ - scripts/v.to.lines/v.to.lines.py \ - scripts/v.what.strds/v.what.strds.py \ - scripts/v.unpack/v.unpack.py \ - scripts/wxpyimgview/*.py \ - gui/wxpython/animation/g.gui.animation.py \ - gui/wxpython/datacatalog/g.gui.datacatalog.py \ - gui/wxpython/rlisetup/g.gui.rlisetup.py \ - gui/wxpython/vdigit/g.gui.vdigit.py \ - temporal/t.rast.accumulate/t.rast.accumulate.py \ - temporal/t.rast.accdetect/t.rast.accdetect.py \ - temporal/t.rast.algebra/t.rast.algebra.py \ - temporal/t.rast3d.algebra/t.rast3d.algebra.py \ - temporal/t.vect.algebra/t.vect.algebra.py \ - temporal/t.downgrade/t.downgrade.py \ - temporal/t.select/t.select.py - for d in gui lib scripts temporal tools; do - patchShebangs $d + for f in $(find . -name '*.py'); do + chmod +x $f done + + patchShebangs */ ''; postInstall = '' - wrapProgram $out/bin/grass78 \ + wrapProgram $out/bin/grass \ --set PYTHONPATH $PYTHONPATH \ --set GRASS_PYTHON ${python3Packages.python.interpreter} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' @@ -117,6 +91,6 @@ stdenv.mkDerivation rec { description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [mpickering]; + maintainers = with lib.maintainers; [ mpickering willcohen ]; }; } diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 5a4f059e91ef0..e6bf2250b64a3 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -69,14 +69,14 @@ let six ]; in mkDerivation rec { - version = "3.22.5"; + version = "3.22.6"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-G7ckAj0vb6030L2gL11+e5pp0OK1NxwECQ295B9sI4o="; + sha256 = "sha256-ACNEIU+kYmOa+/1nbFPTSDgyvviXqKP9kvL6aRykueY="; }; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index ca73dcdbfaafe..32ee893cbaa17 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -69,14 +69,14 @@ let six ]; in mkDerivation rec { - version = "3.24.1"; + version = "3.24.2"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-3dAwFR7L6NNDkDqNg9MzOJOGh1CDEJfckwo72dQECDg="; + sha256 = "sha256-skoepsX9xREqN5SoA4eUN7LKa6KGvixPd5k0KKXzKJo="; }; passthru = { diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 7a8cae9bf81aa..44d540149768d 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -29,7 +29,7 @@ , curl , ApplicationServices , Foundation -, testVersion +, testers , imagemagick }: @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-26"; + version = "7.1.0-33"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-q1CL64cfyb5fN9aVYJfls+v0XRFd4jH+B8n+UJqPE1I="; + hash = "sha256-qiXTSQcc48IIzz7RUcyOH2w8JUOTdU1zg43gJhoELXo="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -64,9 +64,7 @@ stdenv.mkDerivation rec { ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" ++ lib.optional (liblqr1 != null) "--with-lqr" - # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, - # let's disable it for now to unbreak the imagemagick build. - ++ lib.optional (libjxl != null && !stdenv.isAarch64) "--with-jxl" + ++ lib.optional (libjxl != null ) "--with-jxl" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" @@ -92,11 +90,8 @@ stdenv.mkDerivation rec { libxml2 libheif djvulibre + libjxl ] - # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, - # let's disable it for now to unbreak the imagemagick build. - ++ lib.optionals (!stdenv.isAarch64) - [ libjxl ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] ++ lib.optionals stdenv.isDarwin [ @@ -125,7 +120,7 @@ stdenv.mkDerivation rec { ''; passthru.tests.version = - testVersion { package = imagemagick; }; + testers.testVersion { package = imagemagick; }; meta = with lib; { homepage = "http://www.imagemagick.org/"; diff --git a/pkgs/applications/graphics/apngasm/default.nix b/pkgs/applications/graphics/apngasm/default.nix index 1f58ee83e03af..085683b5b6434 100644 --- a/pkgs/applications/graphics/apngasm/default.nix +++ b/pkgs/applications/graphics/apngasm/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, libpng, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, libpng, zlib }: stdenv.mkDerivation rec { pname = "apngasm"; - version = "3.1.9"; + version = "3.1.10"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "d50bfb0cf14c376f4cfb94eb91c61d795a76b715"; # not tagged, but in debian/changelog - sha256 = "0pk0r8x1950pm6j3d5wgryvy3ldm7a9gl59jmnwnjmg1sf9mzf97"; + rev = "f105b2d6024ef3113bb407d68e27e476a17fa998"; + sha256 = "sha256-lTk2sTllKHRUaWPPEkC4qU5K10oRaLrdWBgN4MUGKeo="; }; + patches = [ + # Fix parallel build and avoid static linking of binary. + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/apngasm/files/apngasm-3.1.10-static.patch?id=45fd0cde71ca2ae0e7e38ab67400d84b86b593d7"; + sha256 = "sha256-eKthgInWxXEqN5PupvVf9wVQDElxsPYRFXT7pMc6vIU="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost libpng zlib ]; diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index 4d79f10a9e10f..e7bc474e17d34 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -46,7 +46,7 @@ in mkDerivation { # AwesomeBump expects to find Core and Configs in its current directory. makeQtWrapper $d/AwesomeBump $out/bin/AwesomeBump \ - --run "cd $d" + --chdir "$d" ''; # $ cd Sources; qmake; make ../workdir/linux-g++-dgb-gl4/obj/glwidget.o diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index cd3f026dfa098..1d5556b6a8b50 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -1,13 +1,17 @@ { lib +, stdenv , mkDerivation , fetchFromGitHub +, fetchpatch , cmake -, dxflib +, boost +, cgal_5 , eigen , flann , gdal +, gmp , LASzip -, libLAS +, mpfr , pdal , pcl , qtbase @@ -15,36 +19,43 @@ , qttools , tbb , xercesc +, wrapGAppsHook }: mkDerivation rec { pname = "cloudcompare"; - # Released version(v2.11.3) doesn't work with packaged PCL. - version = "unstable-2021-10-14"; + version = "2.12.0"; src = fetchFromGitHub { owner = "CloudCompare"; repo = "CloudCompare"; - rev = "1f65ba63756e23291ae91ff52d04da468ade8249"; - sha256 = "x1bDjFjXIl3r+yo1soWvRB+4KGP50/WBoGlrH013JQo="; - # As of writing includes (https://github.com/CloudCompare/CloudCompare/blob/a1c589c006fc325e8b560c77340809b9c7e7247a/.gitmodules): - # * libE57Format - # * PoissonRecon - # * CCCoreLib + rev = "v${version}"; + sha256 = "sha256-hu3ckVocExi9lvxelHAwKb/MZacH4CcCE+vIzElgP/A="; fetchSubmodules = true; }; + patches = [ + # fix issues compiling on aarch64. remove once upgraded past 2.12.0 + (fetchpatch { + url = "https://github.com/CloudCompare/CloudCompare/commit/7e71861fdbd6ea704add5ba69343f47d8fc3d5ae.patch"; + sha256 = "sha256-CRUPjxtKUbsqOyYsjKF+dRZ+E3rqrv5mS3ZaOay2wk8="; + }) + ]; + nativeBuildInputs = [ cmake eigen # header-only + wrapGAppsHook ]; buildInputs = [ - dxflib + boost + cgal_5 flann gdal + gmp LASzip - libLAS + mpfr pdal pcl qtbase @@ -72,14 +83,38 @@ mkDerivation rec { "-DPLUGIN_IO_QPHOTOSCAN=ON" "-DPLUGIN_IO_QRDB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs + "-DCCCORELIB_USE_CGAL=ON" # enables Delauney triangulation support "-DPLUGIN_STANDARD_QPCL=ON" # Adds PCD import and export support + "-DPLUGIN_STANDARD_QANIMATION=ON" + "-DPLUGIN_STANDARD_QBROOM=ON" + "-DPLUGIN_STANDARD_QCANUPO=ON" + "-DPLUGIN_STANDARD_QCOMPASS=ON" + "-DPLUGIN_STANDARD_QCSF=ON" + "-DPLUGIN_STANDARD_QFACETS=ON" + "-DPLUGIN_STANDARD_QHOUGH_NORMALS=ON" + "-DEIGEN_ROOT_DIR=${eigen}/include/eigen3" # needed for hough normals + "-DPLUGIN_STANDARD_QHPR=ON" + "-DPLUGIN_STANDARD_QM3C2=ON" + "-DPLUGIN_STANDARD_QMPLANE=ON" + "-DPLUGIN_STANDARD_QPOISSON_RECON=ON" + "-DPLUGIN_STANDARD_QRANSAC_SD=ON" + "-DPLUGIN_STANDARD_QSRA=ON" + "-DPLUGIN_STANDARD_QCLOUDLAYERS=ON" ]; + dontWrapGApps = true; + + # fix file dialogs crashing on non-NixOS (and avoid double wrapping) + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "3D point cloud and mesh processing software"; homepage = "https://cloudcompare.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ nh2 ]; platforms = with platforms; linux; # only tested here; might work on others + broken = stdenv.isLinux; # plugins/core/IO/qPDALIO/CMakeFiles/QPDAL_IO_PLUGIN.dir/src/LASFilter.cpp.o] Error 1 }; } diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index 33bae268c8a62..bb157ad18db03 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -27,7 +27,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pyparsing pyqtgraph spyder - pathpy + path qtconsole requests ]; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index e950d5e36f5ca..0fe5a0b183e8c 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -14,6 +14,7 @@ , desktop-file-utils , exiv2 , glib +, glib-networking , ilmbase , gtk3 , intltool @@ -71,6 +72,7 @@ stdenv.mkDerivation rec { curl exiv2 glib + glib-networking gtk3 ilmbase lcms2 diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index f528d587a4176..088b0de158fb3 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, lib, fetchurl, fetchpatch, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -43,6 +43,7 @@ , pcre , threadweaver , x265 +, jasper # For panorama and focus stacking , enblend-enfuse @@ -55,13 +56,21 @@ mkDerivation rec { pname = "digikam"; - version = "7.4.0"; + version = "7.6.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz"; - sha256 = "sha256-0Iq2bacyu0SbwQEG7BHdne+ls1Yt7TdBsEHbuqcVUEo="; + sha256 = "sha256-2OHucyHT/DE5FvUVdW4wKaxBh9xFO2kzhI1N5TFLZkE="; }; + patches = [ + (fetchpatch { + name = "akonadi-22.04.patch"; + url = "https://github.com/archlinux/svntogit-packages/raw/1b3c76a4482055524120f598325d90545ff9c020/trunk/akonadi-22.04.patch"; + sha256 = "sha256-ittgkl2t/nAD0ci2fNYoAd4E2M6Gg0vqqjxqZugBuko="; + }) + ]; + nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ @@ -86,6 +95,7 @@ mkDerivation rec { opencv pcre x265 + jasper qtbase qtxmlpatterns @@ -115,6 +125,7 @@ mkDerivation rec { "-DENABLE_MEDIAPLAYER=1" "-DENABLE_QWEBENGINE=on" "-DENABLE_APPSTYLES=on" + "-DCMAKE_CXX_FLAGS=-I${libksane}/include/KF5" # fix `#include <ksane_version.h>` ]; dontWrapGApps = true; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index e53030428e61d..bb5019474152c 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "17.2.4"; + version = "18.0.1"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "sha256-dKl7DxNneoQEL+QhZmpfQCd15RoeDRnkZt3sv8t2KM4="; + sha256 = "4f3893f53e47a3937320676e02337a61c358c684d5cd0b378809b3d7deab0139"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index 39fb78b317f18..f60ea4ea90c8c 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { cp -R ${lib.optionalString stdenv.hostPlatform.isDarwin "Foxotron.app/Contents/MacOS/"}Foxotron \ ../{config.json,Shaders,Skyboxes} $out/lib/foxotron/ wrapProgram $out/lib/foxotron/Foxotron \ - --run "cd $out/lib/foxotron" + --chdir "$out/lib/foxotron" ln -s $out/{lib/foxotron,bin}/Foxotron runHook postInstall diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 037cf7c8ed624..ba5237f21f340 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida -, wrapGAppsHook, fetchpatch, bash, doxygen +, wrapGAppsHook, fetchpatch, doxygen , nix-update-script }: stdenv.mkDerivation rec { pname = "geeqie"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - sha256 = "sha256-Abr7trlms6bxOAqE6xNKRv51TBGNilNdBhUZUg7OTKY="; + sha256 = "sha256-O+yz/uNxueR+naEJG8EZ+k/JutRjJ5wwbB9DYb8YNLw="; }; patches = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoconf automake gettext intltool - wrapGAppsHook bash doxygen + wrapGAppsHook doxygen ]; buildInputs = [ diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index fe1afe5b07b64..79760bb31a650 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -5,7 +5,7 @@ { config, lib, pkgs }: let - inherit (pkgs) stdenv fetchurl pkg-config intltool glib fetchFromGitHub; + inherit (pkgs) stdenv fetchurl fetchpatch pkg-config intltool glib fetchFromGitHub; in lib.makeScope pkgs.newScope (self: @@ -66,6 +66,45 @@ in # Allow overriding GIMP package in the scope. inherit (pkgs) gimp; + bimp = pluginDerivation rec { + /* menu: + File/Batch Image Manipulation... + */ + pname = "bimp"; + version = "2.6"; + + src = fetchFromGitHub { + owner = "alessandrofrancesconi"; + repo = "gimp-plugin-bimp"; + rev = "v${version}"; + hash = "sha256-IJ3+/9UwxJTRo0hUdzlOndOHwso1wGv7Q4UuhbsFkco="; + }; + + patches = [ + # Allow overriding installation path + # https://github.com/alessandrofrancesconi/gimp-plugin-bimp/pull/311 + (fetchpatch { + url = "https://github.com/alessandrofrancesconi/gimp-plugin-bimp/commit/098edb5f70a151a3f377478fd6e0d08ed56b8ef7.patch"; + sha256 = "2Afx9fmdn6ztbsll2f2j7mfffMWYWyr4BuBy9ySV6vM="; + }) + ]; + + nativeBuildInputs = with pkgs; [ which ]; + + installFlags = [ + "SYSTEM_INSTALL_DIR=${placeholder "out"}/${gimp.targetPluginDir}/bimp" + ]; + + installTargets = [ "install-admin" ]; + + meta = with lib; { + description = "Batch Image Manipulation Plugin for GIMP"; + homepage = "https://github.com/alessandrofrancesconi/gimp-plugin-bimp"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; + }; + }; + gap = pluginDerivation { /* menu: Video diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 427429404a09e..3dbd1e0d77bf2 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS = "-lm"; meta = with lib; { diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index f92f3686611fa..d9b6db8d653da 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "graphicsmagick"; - version = "1.3.37"; + version = "1.3.38"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "sha256-kNwi8ae9JA5MkGWpQJYr8T2kPJm8w2yxEcw8Gg10d9Q="; + sha256 = "sha256-1gzZ21k1HSucsZvrRDFwrKoo8HPRPSWPZ7NidjXjJnU="; }; patches = [ diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 9d8ae0c8d35f9..214688b56f899 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.12.5"; + version = "2.12.6"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; - sha256 = "sha256-MFWW9DTJ/svtgN3fbw+zeGpgg3pgIoC9jZ1HkG5p6sc="; + sha256 = "sha256-9ntpUEM3buT3EhneXz9G8bibvzOnEK6Xt0jJcTvLKT0="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -111,8 +111,6 @@ perlPackages.buildPerlPackage rec { # # Looks like you failed 1 test of 1. # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) rm t/169_import_scan.t - # t/1604_import_multipage_DjVu.t ................ Dubious, test returned 255 (wstat 65280, 0xff00) - rm t/1604_import_multipage_DjVu.t # Disable a test which passes but reports an incorrect status # t/0601_Dialog_Scan.t .......................... All 14 subtests passed diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 63174ecba98d5..39eefb0034520 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 = "479"; + version = "483"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; - rev = "v${version}"; - sha256 = "sha256-hP+tOrtYfxAKmNCJSYWQzmd0hjxktNEjJqb42lPG9IM="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-UU3XQ0NC/apJ0S/uDDNG+8DOD+sRyX98yMcjtL2Htig="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix index ba437eab4122e..fd7ff02162420 100644 --- a/pkgs/applications/graphics/image_optim/default.nix +++ b/pkgs/applications/graphics/image_optim/default.nix @@ -1,29 +1,17 @@ { lib, bundlerApp, bundlerUpdateScript, makeWrapper, - withPngcrush ? true, pngcrush ? null, - withPngout ? true, pngout ? null, - withAdvpng ? true, advancecomp ? null, - withOptipng ? true, optipng ? null, - withPngquant ? true, pngquant ? null, - withJhead ? true, jhead ? null, - withJpegoptim ? true, jpegoptim ? null, - withJpegrecompress ? true, jpeg-archive ? null, - withJpegtran ? true, libjpeg ? null, - withGifsicle ? true, gifsicle ? null, - withSvgo ? true, svgo ? null + withPngcrush ? true, pngcrush, + withPngout ? true, pngout, + withAdvpng ? true, advancecomp, + withOptipng ? true, optipng, + withPngquant ? true, pngquant, + withJhead ? true, jhead, + withJpegoptim ? true, jpegoptim, + withJpegrecompress ? true, jpeg-archive, + withJpegtran ? true, libjpeg, + withGifsicle ? true, gifsicle, + withSvgo ? true, svgo }: -assert withPngcrush -> pngcrush != null; -assert withPngout -> pngout != null; -assert withAdvpng -> advancecomp != null; -assert withOptipng -> optipng != null; -assert withPngquant -> pngquant != null; -assert withJhead -> jhead != null; -assert withJpegoptim -> jpegoptim != null; -assert withJpegrecompress -> jpeg-archive != null; -assert withJpegtran -> libjpeg != null; -assert withGifsicle -> gifsicle != null; -assert withSvgo -> svgo != null; - with lib; let @@ -51,7 +39,7 @@ bundlerApp { postBuild = '' wrapProgram $out/bin/image_optim \ - --prefix PATH : ${makeBinPath optionalDepsPath} + --prefix PATH : ${lib.escapeShellArg (makeBinPath optionalDepsPath)} ''; passthru.updateScript = bundlerUpdateScript "image_optim"; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 0958676cc99bd..75bfe5cff93d2 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -48,6 +48,7 @@ let lxml pillow scour + pyserial ]); in stdenv.mkDerivation rec { @@ -79,6 +80,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch"; sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg="; }) + + # Fix build with poppler 22.04 + # https://gitlab.com/inkscape/inkscape/-/merge_requests/4266 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b.patch"; + sha256 = "2cJZdunbRgPIwhJgz1dQoQRw3ZYZ2Fp6c3hpVBV2PbE="; + }) ]; postPatch = '' diff --git a/pkgs/applications/graphics/jpegrescan/default.nix b/pkgs/applications/graphics/jpegrescan/default.nix index f96742e6c067b..7ec0e478a9b95 100644 --- a/pkgs/applications/graphics/jpegrescan/default.nix +++ b/pkgs/applications/graphics/jpegrescan/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, libjpeg_turbo, perl, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages, libjpeg_original }: stdenv.mkDerivation rec { pname = "jpegrescan"; - date = "2016-06-01"; - name = "${pname}-${date}"; + version = "unstable-2019-03-27"; + + dontBuild = true; + dontConfigure = true; src = fetchFromGitHub { owner = "kud"; repo = pname; - rev = "e5e39cd972b48ccfb2cba4da6855c511385c05f9"; - sha256 = "0jbx1vzkzif6yjx1fnsm7fjsmq166sh7mn22lf01ll7s245nmpdp"; + rev = "3a7de06feabeb3c3235c3decbe2557893c1abe51"; + sha256 = "0cnl46z28lkqc5x27b8rpghvagahivrqcfvhzcsv9w1qs8qbd6dm"; }; patchPhase = '' @@ -23,24 +25,23 @@ stdenv.mkDerivation rec { mv jpegrescan $out/bin chmod +x $out/bin/jpegrescan - wrapProgram $out/bin/jpegrescan --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/jpegrescan \ + --prefix PATH : "${libjpeg_original}/bin:" \ + --prefix PERL5LIB : $PERL5LIB ''; propagatedBuildInputs = [ perlPackages.FileSlurp ]; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - perl libjpeg_turbo - ]; + buildInputs = [ perl ]; meta = with lib; { - description = "losslessly shrink any JPEG file"; + description = "Losslessly shrink any JPEG file"; homepage = "https://github.com/kud/jpegrescan"; license = licenses.publicDomain; - maintainers = [ maintainers.ramkromberg ]; + maintainers = with maintainers; [ ramkromberg ]; platforms = platforms.all; + mainProgram = "jpegrescan"; }; } diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index 64782cc7fcce8..9ce07df34370c 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { preFixup = optionalString (tiffSupport || jpgSupport) '' gappsWrapperArgs+=( - --prefix PATH : ${runtimePath} + --prefix PATH : ${lib.escapeShellArg runtimePath} ) ''; diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 084787d6315be..0725acd2379d8 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -33,11 +33,10 @@ in mkDerivation rec { }; patches = [ - # Poppler requires at least C++17 + # Fix build with poppler >= 22.01 (fetchpatch { - name = "use-c-17-for-pdf-on-linux-builds"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/use-c-17-for-pdf-on-linux-builds.patch?h=openboard"; - sha256 = "sha256-M6HigpOo8ul7qaub4cd7/ATUc85HezEyKyDuzsrZvC8="; + url = "https://github.com/OpenBoard-org/OpenBoard/commit/3a9b043e0fafec08e4123f362dcb7750f7476b59.patch"; + sha256 = "sha256-yD163FK79HBU1W7m6sLxhfsRo4r/38zYTFWgeyqwU1o="; }) ]; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 413e16718216e..2379962bb55f7 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -59,6 +59,10 @@ mkDerivation rec { enableParallelBuilding = true; + preBuild = '' + make objects/parser.cxx + ''; + postInstall = lib.optionalString stdenv.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix index 45457ad8ebb11..2a8c9afbd26ba 100644 --- a/pkgs/applications/graphics/ovito/default.nix +++ b/pkgs/applications/graphics/ovito/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "ovito"; - version = "3.6.0"; + version = "3.7.1"; src = fetchFromGitLab { owner = "stuko"; repo = "ovito"; rev = "v${version}"; - sha256 = "sha256-yQ8gSe/QM1RRNxk4bDJ+K5QX0eYjZ+iG3QOHj01tJhY="; + sha256 = "sha256-6b/yqfrpeZ6i6DoPe3lcftvuzwvK7rfZhgyHc9GtyBs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/pixeluvo/default.nix b/pkgs/applications/graphics/pixeluvo/default.nix index d88be43698446..0c90b786baca9 100644 --- a/pkgs/applications/graphics/pixeluvo/default.nix +++ b/pkgs/applications/graphics/pixeluvo/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { description = "A Beautifully Designed Image and Photo Editor for Windows and Linux"; homepage = "http://www.pixeluvo.com/"; license = licenses.unfree; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ wolfangaukang ]; }; } diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix deleted file mode 100644 index 904c9f8f40257..0000000000000 --- a/pkgs/applications/graphics/rapcad/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline -, qtbase, qmake, libGLU -}: - -stdenv.mkDerivation rec { - version = "0.9.8"; - pname = "rapcad"; - - src = fetchFromGitHub { - owner = "gilesbathgate"; - repo = "rapcad"; - rev = "v${version}"; - sha256 = "0a0sqf6h227zalh0jrz6jpm8iwji7q3i31plqk76i4qm9vsgrhir"; - }; - - patches = [ - (fetchurl { - url = "https://github.com/GilesBathgate/RapCAD/commit/278a8d6c7b8fe08f867002528bbab4a6319a7bb6.patch"; - sha256 = "1vvkyf0wg79zdzs5zlggfrr1lrp1x75dglzl0mspnycwldsdwznj"; - name = "disable-QVector-qHash.patch"; - }) - ]; - - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline libGLU ]; - - meta = with lib; { - license = licenses.gpl3; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - description = "Constructive solid geometry package"; - broken = true; # 2018-04-11 - }; -} diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 7d1acc1dcd69a..494180fdb598d 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + # This patch is upstream; remove it in 5.9. + patches = [ ./fix-6324.patch ]; + buildInputs = [ pixman libpthreadstubs gtkmm3 libXau libXdmcp lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun librsvg diff --git a/pkgs/applications/graphics/rawtherapee/fix-6324.patch b/pkgs/applications/graphics/rawtherapee/fix-6324.patch new file mode 100644 index 0000000000000..fa324c2c9389b --- /dev/null +++ b/pkgs/applications/graphics/rawtherapee/fix-6324.patch @@ -0,0 +1,356 @@ +See: + https://github.com/Beep6581/RawTherapee/issues/6324 + https://github.com/Beep6581/RawTherapee/commit/2e0137d54243eb729d4a5f939c4320ec8f8f415d + +diff --git a/rtengine/canon_cr3_decoder.cc b/rtengine/canon_cr3_decoder.cc +index 6274154cb..98c743dad 100644 +--- a/rtengine/canon_cr3_decoder.cc ++++ b/rtengine/canon_cr3_decoder.cc +@@ -662,7 +662,7 @@ std::uint32_t _byteswap_ulong(std::uint32_t x) + #endif + + struct LibRaw_abstract_datastream { +- IMFILE* ifp; ++ rtengine::IMFILE* ifp; + + void lock() + { +diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc +index 812f122b3..5da696af2 100644 +--- a/rtengine/dcraw.cc ++++ b/rtengine/dcraw.cc +@@ -2025,7 +2025,7 @@ void CLASS phase_one_load_raw_c() + #endif + { + int len[2], pred[2]; +- IMFILE ifpthr = *ifp; ++ rtengine::IMFILE ifpthr = *ifp; + ifpthr.plistener = nullptr; + + #ifdef _OPENMP +@@ -3380,7 +3380,7 @@ void CLASS sony_arw2_load_raw() + { + uchar *data = new (std::nothrow) uchar[raw_width + 1]; + merror(data, "sony_arw2_load_raw()"); +- IMFILE ifpthr = *ifp; ++ rtengine::IMFILE ifpthr = *ifp; + int pos = ifpthr.pos; + ushort pix[16]; + +@@ -6394,7 +6394,7 @@ int CLASS parse_tiff_ifd (int base) + unsigned sony_curve[] = { 0,0,0,0,0,4095 }; + unsigned *buf, sony_offset=0, sony_length=0, sony_key=0; + struct jhead jh; +-/*RT*/ IMFILE *sfp; ++/*RT*/ rtengine::IMFILE *sfp; + /*RT*/ int pana_raw = 0; + + if (tiff_nifds >= sizeof tiff_ifd / sizeof tiff_ifd[0]) +@@ -6958,7 +6958,7 @@ it under the terms of the one of two licenses as you choose: + fread (buf, sony_length, 1, ifp); + sony_decrypt (buf, sony_length/4, 1, sony_key); + sfp = ifp; +-/*RT*/ ifp = fopen (buf, sony_length); ++/*RT*/ ifp = rtengine::fopen (buf, sony_length); + // if ((ifp = tmpfile())) { + // fwrite (buf, sony_length, 1, ifp); + // fseek (ifp, 0, SEEK_SET); +@@ -7264,7 +7264,7 @@ void CLASS parse_external_jpeg() + { + const char *file, *ext; + char *jname, *jfile, *jext; +-/*RT*/ IMFILE *save=ifp; ++/*RT*/ rtengine::IMFILE *save=ifp; + + ext = strrchr (ifname, '.'); + file = strrchr (ifname, '/'); +@@ -7292,7 +7292,7 @@ void CLASS parse_external_jpeg() + *jext = '0'; + } + if (strcmp (jname, ifname)) { +-/*RT*/ if ((ifp = fopen (jname))) { ++/*RT*/ if ((ifp = rtengine::fopen (jname))) { + // if ((ifp = fopen (jname, "rb"))) { + if (verbose) + fprintf (stderr,_("Reading metadata from %s ...\n"), jname); +diff --git a/rtengine/dcraw.h b/rtengine/dcraw.h +index 89c1fcaff..f25157088 100644 +--- a/rtengine/dcraw.h ++++ b/rtengine/dcraw.h +@@ -73,7 +73,7 @@ public: + + protected: + int exif_base, ciff_base, ciff_len; +- IMFILE *ifp; ++ rtengine::IMFILE *ifp; + FILE *ofp; + short order; + const char *ifname; +@@ -125,7 +125,7 @@ protected: + int cur_buf_size; // buffer size + uchar *cur_buf; // currently read block + int fillbytes; // Counter to add extra byte for block size N*16 +- IMFILE *input; ++ rtengine::IMFILE *input; + struct int_pair grad_even[3][41]; // tables of gradients + struct int_pair grad_odd[3][41]; + ushort *linealloc; +@@ -278,7 +278,7 @@ void parse_redcine(); + class getbithuff_t + { + public: +- getbithuff_t(DCraw *p,IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} ++ getbithuff_t(DCraw *p,rtengine::IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} + unsigned operator()(int nbits, ushort *huff); + + private: +@@ -288,7 +288,7 @@ private: + DCraw *parent; + unsigned bitbuf; + int vbits, reset; +- IMFILE *&ifp; ++ rtengine::IMFILE *&ifp; + unsigned &zero_after_ff; + }; + getbithuff_t getbithuff; +@@ -296,7 +296,7 @@ getbithuff_t getbithuff; + class nikbithuff_t + { + public: +- explicit nikbithuff_t(IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} ++ explicit nikbithuff_t(rtengine::IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} + void operator()() {bitbuf = vbits = 0;}; + unsigned operator()(int nbits, ushort *huff); + unsigned errorCount() { return errors; } +@@ -309,7 +309,7 @@ private: + } + unsigned bitbuf, errors; + int vbits; +- IMFILE *&ifp; ++ rtengine::IMFILE *&ifp; + }; + nikbithuff_t nikbithuff; + +@@ -378,7 +378,7 @@ void parse_qt (int end); + // ph1_bithuff(int nbits, ushort *huff); + class ph1_bithuff_t { + public: +- ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} ++ ph1_bithuff_t(DCraw *p, rtengine::IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} + unsigned operator()(int nbits, ushort *huff); + unsigned operator()(int nbits); + unsigned operator()(); +@@ -412,7 +412,7 @@ private: + } + + short ℴ +- IMFILE* const ifp; ++ rtengine::IMFILE* const ifp; + UINT64 bitbuf; + int vbits; + }; +@@ -430,11 +430,11 @@ void nokia_load_raw(); + + class pana_bits_t{ + public: +- pana_bits_t(IMFILE *i, unsigned &u, unsigned enc): ++ pana_bits_t(rtengine::IMFILE *i, unsigned &u, unsigned enc): + ifp(i), load_flags(u), vbits(0), encoding(enc) {} + unsigned operator()(int nbits, unsigned *bytes=nullptr); + private: +- IMFILE *ifp; ++ rtengine::IMFILE *ifp; + unsigned &load_flags; + uchar buf[0x4000]; + int vbits; +diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc +index 1fb1d2e1b..951df2248 100644 +--- a/rtengine/dfmanager.cc ++++ b/rtengine/dfmanager.cc +@@ -540,7 +540,7 @@ std::vector<badPix> *DFManager::getHotPixels ( const std::string &mak, const std + + int DFManager::scanBadPixelsFile( Glib::ustring filename ) + { +- FILE *file = fopen( filename.c_str(), "r" ); ++ FILE *file = ::fopen( filename.c_str(), "r" ); + + if( !file ) { + return false; +diff --git a/rtengine/myfile.cc b/rtengine/myfile.cc +index 842766dcf..2321d18bb 100644 +--- a/rtengine/myfile.cc ++++ b/rtengine/myfile.cc +@@ -70,7 +70,7 @@ int munmap(void *start, size_t length) + + #ifdef MYFILE_MMAP + +-IMFILE* fopen (const char* fname) ++rtengine::IMFILE* rtengine::fopen (const char* fname) + { + int fd; + +@@ -123,13 +123,13 @@ IMFILE* fopen (const char* fname) + return mf; + } + +-IMFILE* gfopen (const char* fname) ++rtengine::IMFILE* rtengine::gfopen (const char* fname) + { + return fopen(fname); + } + #else + +-IMFILE* fopen (const char* fname) ++rtengine::IMFILE* rtengine::fopen (const char* fname) + { + + FILE* f = g_fopen (fname, "rb"); +@@ -152,7 +152,7 @@ IMFILE* fopen (const char* fname) + return mf; + } + +-IMFILE* gfopen (const char* fname) ++rtengine::IMFILE* rtengine::gfopen (const char* fname) + { + + FILE* f = g_fopen (fname, "rb"); +@@ -176,7 +176,7 @@ IMFILE* gfopen (const char* fname) + } + #endif //MYFILE_MMAP + +-IMFILE* fopen (unsigned* buf, int size) ++rtengine::IMFILE* rtengine::fopen (unsigned* buf, int size) + { + + IMFILE* mf = new IMFILE; +@@ -190,7 +190,7 @@ IMFILE* fopen (unsigned* buf, int size) + return mf; + } + +-void fclose (IMFILE* f) ++void rtengine::fclose (IMFILE* f) + { + #ifdef MYFILE_MMAP + +@@ -207,7 +207,7 @@ void fclose (IMFILE* f) + delete f; + } + +-int fscanf (IMFILE* f, const char* s ...) ++int rtengine::fscanf (IMFILE* f, const char* s ...) + { + // fscanf not easily wrapped since we have no terminating \0 at end + // of file data and vsscanf() won't tell us how many characters that +@@ -253,7 +253,7 @@ int fscanf (IMFILE* f, const char* s ...) + } + + +-char* fgets (char* s, int n, IMFILE* f) ++char* rtengine::fgets (char* s, int n, IMFILE* f) + { + + if (f->pos >= f->size) { +@@ -270,7 +270,7 @@ char* fgets (char* s, int n, IMFILE* f) + return s; + } + +-void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) ++void rtengine::imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) + { + f->plistener = plistener; + f->progress_range = progress_range; +@@ -278,7 +278,7 @@ void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, doub + f->progress_current = 0; + } + +-void imfile_update_progress(IMFILE *f) ++void rtengine::imfile_update_progress(IMFILE *f) + { + if (!f->plistener || f->progress_current < f->progress_next) { + return; +diff --git a/rtengine/myfile.h b/rtengine/myfile.h +index 423edea9a..c655696e6 100644 +--- a/rtengine/myfile.h ++++ b/rtengine/myfile.h +@@ -30,8 +30,6 @@ namespace rtengine + + class ProgressListener; + +-} +- + struct IMFILE { + int fd; + ssize_t pos; +@@ -141,3 +139,5 @@ inline unsigned char* fdata(int offset, IMFILE* f) + + int fscanf (IMFILE* f, const char* s ...); + char* fgets (char* s, int n, IMFILE* f); ++ ++} +diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc +index 9da601e2a..097b9e711 100644 +--- a/rtengine/rtthumbnail.cc ++++ b/rtengine/rtthumbnail.cc +@@ -1922,7 +1922,7 @@ bool Thumbnail::writeImage (const Glib::ustring& fname) + + Glib::ustring fullFName = fname + ".rtti"; + +- FILE* f = g_fopen (fullFName.c_str (), "wb"); ++ FILE* f = ::g_fopen (fullFName.c_str (), "wb"); + + if (!f) { + return false; +@@ -1965,7 +1965,7 @@ bool Thumbnail::readImage (const Glib::ustring& fname) + return false; + } + +- FILE* f = g_fopen(fullFName.c_str (), "rb"); ++ FILE* f = ::g_fopen(fullFName.c_str (), "rb"); + + if (!f) { + return false; +@@ -2191,7 +2191,7 @@ bool Thumbnail::writeData (const Glib::ustring& fname) + return false; + } + +- FILE *f = g_fopen (fname.c_str (), "wt"); ++ FILE *f = ::g_fopen (fname.c_str (), "wt"); + + if (!f) { + if (settings->verbose) { +@@ -2214,7 +2214,7 @@ bool Thumbnail::readEmbProfile (const Glib::ustring& fname) + embProfile = nullptr; + embProfileLength = 0; + +- FILE* f = g_fopen (fname.c_str (), "rb"); ++ FILE* f = ::g_fopen (fname.c_str (), "rb"); + + if (f) { + if (!fseek (f, 0, SEEK_END)) { +@@ -2242,7 +2242,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname) + { + + if (embProfileData) { +- FILE* f = g_fopen (fname.c_str (), "wb"); ++ FILE* f = ::g_fopen (fname.c_str (), "wb"); + + if (f) { + fwrite (embProfileData, 1, embProfileLength, f); +@@ -2257,7 +2257,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname) + bool Thumbnail::readAEHistogram (const Glib::ustring& fname) + { + +- FILE* f = g_fopen(fname.c_str(), "rb"); ++ FILE* f = ::g_fopen(fname.c_str(), "rb"); + + if (!f) { + aeHistogram.reset(); +@@ -2280,7 +2280,7 @@ bool Thumbnail::writeAEHistogram (const Glib::ustring& fname) + { + + if (aeHistogram) { +- FILE* f = g_fopen (fname.c_str (), "wb"); ++ FILE* f = ::g_fopen (fname.c_str (), "wb"); + + if (f) { + fwrite (&aeHistogram[0], 1, (65536 >> aeHistCompression)*sizeof (aeHistogram[0]), f); diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index ccccca8d65c23..98726de0604aa 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, alsa-lib , appstream-glib , desktop-file-utils , gio-sharp @@ -21,19 +22,20 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.4.0"; + version = "0.5.3"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - sha256 = "sha256-J7IW329rWFEoB+44762DAkWA8Hq4IVmXgc+QoDQaxV0="; + fetchSubmodules = true; + hash = "sha256-v4cca4tSv//VFUvOfemkueELxlez2TdtynqbzjCTlB4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-elXaikB/RemMxA4OXyZNQOgP1alImQMJHng5oX2j480="; + hash = "sha256-sK8GOLxNG4mu45oQSaFi467DHYt00Pxu3vMM6Po/YqI="; }; nativeBuildInputs = [ @@ -51,6 +53,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + alsa-lib gio-sharp glib gstreamer diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 6fcb58305565f..93d40374607e4 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: +{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb-compat-0_1 }: let myPatchElf = file: with lib; '' patchelf --set-interpreter \ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { tar xfvz data.tar.gz ''; - nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ]; + nativeBuildInputs = [ makeWrapper patchelf udevRules ]; buildInputs = [ libusb-compat-0_1 ]; dontBuild = true; diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index 9f76a0dd0b7d7..219d435a81a0d 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb1, avahi-compat, glib, libredirect, nixosTests }: +{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }: let myPatchElf = file: with lib; '' patchelf --set-interpreter \ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { tar xfv data.tar.xz ''; - nativeBuildInputs = [ makeWrapper patchelf coreutils ]; + nativeBuildInputs = [ makeWrapper patchelf ]; buildInputs = [ libusb1 avahi-compat stdenv.cc.cc glib ]; dontBuild = true; diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 93a7d75ce45a5..d3c5b1c0b75f2 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -40,18 +40,19 @@ stdenv.mkDerivation { buildInputs = [ avahi libgphoto2 - libieee1284 libjpeg libpng libtiff libusb1 - libv4l - net-snmp curl - systemd libxml2 poppler gawk + ] ++ lib.optionals stdenv.isLinux [ + libieee1284 + libv4l + net-snmp + systemd ]; enableParallelBuilding = true; @@ -113,6 +114,6 @@ stdenv.mkDerivation { ''; homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 840c87de216b7..dc5f97318708d 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -3,6 +3,7 @@ let base3 = callPackage ./tesseract3.nix {}; base4 = callPackage ./tesseract4.nix {}; + base5 = callPackage ./tesseract5.nix {}; languages = callPackage ./languages.nix {}; in { @@ -15,4 +16,9 @@ in tesseractBase = base4; languages = languages.v4; }); + + tesseract5 = lowPrio (callPackage ./wrapper.nix { + tesseractBase = base5; + languages = languages.v4; + }); } diff --git a/pkgs/applications/graphics/tesseract/fetch-language-hashes b/pkgs/applications/graphics/tesseract/fetch-language-hashes index c431f1d97c260..b8aedcfbd9c05 100755 --- a/pkgs/applications/graphics/tesseract/fetch-language-hashes +++ b/pkgs/applications/graphics/tesseract/fetch-language-hashes @@ -25,11 +25,11 @@ else >&2 echo "Invalid tessdataRev: $tessdataRev" exit 1 }) - langCodes=$(echo $(echo "$repoPage" | grep -ohP "(?<=/)[^/]+?(?=\.traineddata)" | sort)) + langCodes=$(echo $(echo "$repoPage" | grep -ohP "(?<=/)[^/ ]+?(?=\.traineddata)" | sort -u)) fi for lang in $langCodes; do url=https://github.com/tesseract-ocr/tessdata/raw/$tessdataRev/$lang.traineddata - hash=$(nix-prefetch-url $url 2>/dev/null) + hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url $url 2>/dev/null)) echo "$lang = \"$hash\";" done diff --git a/pkgs/applications/graphics/tesseract/languages.nix b/pkgs/applications/graphics/tesseract/languages.nix index 08512a5cdd9d4..11270f70b5da0 100644 --- a/pkgs/applications/graphics/tesseract/languages.nix +++ b/pkgs/applications/graphics/tesseract/languages.nix @@ -7,12 +7,12 @@ rec { owner = "tesseract-ocr"; repo = "tessdata"; rev = tessdataRev; - sha256 = tessdata; + hash = tessdata; }; - languageFile = lang: sha256: fetchurl { + languageFile = lang: hash: fetchurl { url = "https://github.com/tesseract-ocr/tessdata/raw/${tessdataRev}/${lang}.traineddata"; - inherit sha256; + inherit hash; }; in { @@ -32,258 +32,258 @@ rec { v3 = makeLanguages { tessdataRev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d"; - tessdata = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7"; - all = "0yj6h9n6h0kzzcqsn3z87vsi8pa60szp0yiayb0znd0v9my0dqhn"; + tessdata = "sha256-591NFrPdZ9orB9PtxKqsukh6aAq5DDO8yJ19W/Ywi+w="; + all = "sha256-FuIGfE0bNPvB8ip6cL8GRl0U9T7oD6sx+38CaGyCRno="; # Run `./fetch-language-hashes <tessdataRev>` to generate these hashes languages = { - afr = "15dsnzy4i9ai26ilm73gkfj4ck039raa88i6w443c4b1fnay2akf"; - amh = "1wbcsdq3svxga3j1alk61xs72a9fhsfsyjxhp3cwxfaqfhrzg7h4"; - ara = "0nk495gki6jbbnwcl2ybsx4nd02d6qykcjncq0d2g8pbgapqmj91"; - asm = "0c3wq15yphq7x74s2sn3f90k6z1cf5j7ic62z0dynidrv99bddfh"; - aze = "0pz073hxqkx1a1cshlgg5k11lj73s52sdxa7k3020drc314lhaxw"; - aze_cyrl = "0djbfgx28ykcjsn2p0766qrmj256g7vhc7valc3ivsva8b906lxq"; - bel = "04zqy8vik0fcakq6apfp8wjhkkhlg0yn9kmag1lk7s8fy9ax3ws2"; - ben = "0q7812kn5xjm47hcgdcg911lhbgqr7hbvqckfxxm8qw0yjx2cy0m"; - bod = "0rwq7539zzfs8xs0bf1535z1cwkm0yk1ni25f5gjav7nm6qpiaan"; - bos = "1qr04dj7lx347gxpin5nfprbggmxq2mwx8kf3pcc3vb5x3pa57g4"; - bul = "0cyyqgi3i4y9bfzwls0lwljzgd0r8ayfqb4bbvdh4qmbni9x42ya"; - cat = "0kgw8f5pdw9lfbn6cfp5n1s0j8pj3418yx6rsbagzcf1gr36gbr9"; - ceb = "1g1n4np4vhar7wfwx2km5k6kldb600rrl7npfbf75229rar068f1"; - ces = "0zxkkyhpd74i6321nv86pkjb0k7p9cp6m174rbn42nl7jz6qxib0"; - chi_sim = "0k250xr0gk9yh22yqxd0zpxdsrqfzs164kdv5n9rxx1g996yffij"; - chi_tra = "03nxqpd546p0gwfj6pqzbdbv5zjpdddzlpa10xn4nvmks1mmckbp"; - chr = "1k1sg3hap0kd5aa36ysvmhp7r3fynxf0f7lzz814h6p3g250zclb"; - cym = "0d6wbf9cmrrzf66mhcckwdfy3xh2i38r0by9nk6isw9rl7bf7j07"; - dan = "1s1yj56rpzmif3ir3qs4iab744cgpflk7y8812z2665bh61illpr"; - dan_frak = "1bxi53ymib5g0139vfd2pflh7nl5925vqznq3sfgaqx7gdx630vi"; - deu = "0fna7fqk1a8ivd7q2k38vx37qm3vbn183zh4z5zfqb4pgqmb8znb"; - deu_frak = "1y4krkvarg7jxhcq49fgybg4phbn58y9c0z2bm8mnp28jkih1cnb"; - dzo = "1fcz0imi7zxi99762pxfcm5iz2jcbqj3s742magka4ihrxnz07xm"; - ell = "0r0f71jy4y29bg055qvvy93wchi3lh08zz0k9c8l7466b03yvq5v"; - eng = "0vghah8kqcv0n5fnjb88w6siz156ysrc41fckw3f2y8c3sgmqlf0"; - enm = "10y61xv3w1ypgqz5rgb22y5hh1i4zx03cwiqw21ifqvg4xdrln46"; - epo = "1y5lh55mbcx33cm7qlf1dcah8ffycxmlcpzjzx9r6ij14fdd4964"; - equ = "1nqrd0a9jqqh6byy8snfhad1hisrc92dcx44wsy7v4nf40j3mx1s"; - est = "12ll8lq1hjcsq9hh93020w78r7f1rcxcwlvrjqw8j5p3k9jg5a4g"; - eus = "034s9mp7lw1a4yvf2cmbbj2fbqbaq6xnjqh30yn0wq0c0jck96nw"; - fas = "0m61p4byc0kzf75cdn6g18s8hcg9r8ifs34wr85lbsb65kil4ijx"; - fin = "1wac333k0lcd5jwprzg99b10bq8sdc96b9d6275kg9imyqjwcc7q"; - fra = "1ax7i0nw1lwkz4sbrvn4z0lcrcai77ymdpla7qk7yij6s4xb5bw6"; - frk = "16nmr71p93724vk1x5mq4r8vxpwnm448p6dwqv8scg8asch1cidp"; - frm = "00yz3hz7wcralq8wbx1ap4c6b37ac6vnz5bgmxmgdx0kqzibiddn"; - gle = "1n8z8kmn5m628rlzgz5v0iw6h46aalflq5asa1wj5rygx1y2azpa"; - glg = "0fdniayplc3iwmlmvhblarh1gm97dp8rqhhkb8b0clwfd9cj342z"; - grc = "04r2193qcxqyab5998xn8bf7197wiccmjm7iakij8d0c7l61dnxb"; - guj = "0dp8mlxmf0x9wb8dg0c508sdwz03icq94z8ji8jhwgdqgv8hw1al"; - hat = "0793mmlxbb09c8103jhdvlczz647nyn4ykkgd3gwgavncmjh72v8"; - heb = "16za9ff1i3ya6hz75l9v3v7j4039kscxxw21g3i2w5p9zn52hyag"; - hin = "1vnn5wpc724kgib8jbx0kpnnp4al60ivqir72gnbyh6cpnflb6bf"; - hrv = "15rqd6xiv2bdmalb5s6rxvw0yk6w9agn9fli3bvi703q6vpj2yn3"; - hun = "19zzwdxwi3h3vdsgr271i1m87gfpdirk6b1ljw2j8qmfilp4sw56"; - iku = "1v1yvc1194qycjgb4ihh5hpj6472nlbp66dii183514g2dh9x0db"; - ind = "120d4b41wvsgcd1sgy2mp78i9hvi7w03a63078dz1yds0yqdwf1p"; - isl = "003ngk8dfv6dglkq8pmi6jsglrfkc65js5ywh3vvkg7qfqf6qsxz"; - ita = "1lxklk3zc3x3k8yfpp6ygyv7fndgs57dfasc97rh8782ds16wkjs"; - ita_old = "188gby1y51pa1ycyc8y17d16hs5w27yl5ch7xzni98bdjkwbkl1z"; - jav = "1fjyjznjchls5ifbnx2b9xagisgxvgj9lsf39rr9d87sbzdbbwbp"; - jpn = "1wmayj8wh3pfwznjhalad2qzv38mhrzw2sxl71mycvzvpdy9ag1w"; - kan = "0hak4953whw9vd9dzl0hq076kzb19kk45kmfxk03af4k6gb206vg"; - kat = "16k0057cvvdc6snm5svhdv3cr7cw71g74yy8215njjbsi838imi3"; - kat_old = "02gl755d38plyvzwfjqxvjgfqkbjs9rvzx33qfhm2zvmgbwrfrfh"; - kaz = "0hc36w7zz5waycsk220v0r83sg991gd5f5r937mvz44viql80sgm"; - khm = "1gb2nv5qdq5fz9w9xq4fj68p46b62sd1m986ra5qbnskxqizr12s"; - kir = "1b1ing6qqi8qqfh4xpk76rp4gxp69wdjdl5m777ayx3v02d7nhh3"; - kor = "1rldj6f8h1nn5wpx57b0ci7p0fnivnwzgaf0d3576xls26z2wcgv"; - kur = "1cp2pfd6g662gvxi7ywkxfbfq1lwbis888bf1gg8ynzy342mx1ic"; - lao = "03bdaxakmxpbbr9vsnbzzfksvm6js0l5i0ijwl71piqyxqjj1gxf"; - lat = "1q7v7drnwpna9k2l79jbdlxiv1j617rqzjc9d48h3lfrma5z97sj"; - lav = "0fxzyvw7n67rmw2irvlghkf1bii4w47200zv26p0v3a9dwvhc7sg"; - lit = "0f00ggjjqrl94kwwjmjqwajyfprsml0br8vhn2gvn11gaxvm52hm"; - mal = "1i83plhin3m6sq8p92vzlyng5z59gvvqypyh7rnmvdmm9rranx8a"; - mar = "0ay7q53yl3709crvn5l9c9jx7hw6m5d3x2crmvnvczsh83ayfdik"; - mkd = "1q1wadcr4j1dzssyyqz43qmizc6vfqkbivr6xi2p7p4h9rl11x73"; - mlt = "1qp4v6habak1l7xrw322wglvjjndrfp4j7bj8d4npwbzk1sh4s0h"; - msa = "048p6mkx9zr40s9s5vbi0gnizhvqwn0g8i1hf1l8db7igbax5xyj"; - mya = "17nyr5bd42kzvid3421n3mwckd49vzrjhjahd8rnfsmbsy1x382l"; - nep = "154375r32sdmvcnp1ckvgbp3wxvb2xiiypb8bxbsvrabrz4wzjqc"; - nld = "1clwbky71zkz55zd3f8r9hj8fhpnbkply80p1js4fvs7x12r715x"; - nor = "1ynvrz6s0vmlq1xkjd8k2w6bx8770x6v29qgx83d4nl17ngjd459"; - ori = "0dsakc8gnwhs6z5kxc2wdkbn31gkkiqk5vriw0swghychp164aac"; - osd = "1zq0dfliavglmix7zzrqdxz1w01rm1f1x1352bqn8xf4zivdbxcw"; - pan = "1fwdpwkydfmr6drwgkqzn89z12r2rdm02a75vvdxhxg2a9yiwmbv"; - pol = "155z870ygzws476kp7qpzi8jcjcv3jb5px8rbzhnag1fklqr48hx"; - por = "1814cff2rffpzlg4hyyrjzpf5ps2i95rmpa4c8ikblbvrlcv97q8"; - pus = "1iz5nn1zfvn1l9gb1jriwx991d2hwwc7x4k1nvzjlwpzscplx25b"; - ron = "11lr80zhvnnngvwwk01z1d3prfpbh3qbwpl1nl5fp7h09d6n3wzl"; - rus = "1d6a8lg4bmd3np16jds1py3qpkaq4ahnhwghd5r0159y0jpxq00q"; - san = "169f4ajgwn99yfdfrlwfvdgvv1abal7fpdp31sknvq8l7w2sak3g"; - sin = "1411g18r6f6j6f4n0sn7ajgs4gkplb892s6ak0hi9nyyxwv3r1gm"; - slk = "0bxfbrg1nf6px0xzkh6ihdi71fmr1rxxs99qb191k7pm16x2lpds"; - slk_frak = "0zyqnn1y5cyx1y7wzgw743k4584ljl0rhvk2q1ni6jnjx9ciwzqy"; - slv = "1kjn9m9hbwp0m0p2v8c3skpzr6f8x42hz8x48zl22550a7hq8n1h"; - spa = "1npgl8ylvfm60hd4214z8a3lriy1hckhijschrbjpzmwdfcqafgj"; - spa_old = "0w4ivkv8flyn7bjlyjcrcrdnslkvrrfs7l33mvird1jhhkyqd8sx"; - sqi = "15wzvh6qm3yx7yf0k5j7g1imsaqxvq7r2xh6a0xgmkqbyypbbkdf"; - srp = "05blqriv30x02c80ds3x7zhw0y21nc6lkqlv5jwgwnjgw4yfpgrm"; - srp_latn = "0ss8s3q60aq8sd2a3sbnzvp13qqarxnjw4hij8hd9ab5gsjw0nwr"; - swa = "1pwwhx7ldq21cv06cchws8gvwsmkwn5sjcy9z3nk3nbp9qjsf44f"; - swe = "0l10iyn2cr7ibgk0akmpg8725mpwpydawgv3s77izsw7y6xhfr1a"; - syr = "08bxil13wyp5h4hvbxjcys7ypgqgg46rrp653m7gyv5q94ycjgb0"; - tam = "1g155kyba2wjfgzgy48g6yd2csinwbfjdi5r7vw0wm3dh1z39dvz"; - tel = "0fydrcb54b6mmqazb337x4s36i2a64sb4xm7y7g3nqqmk9afsipv"; - tgk = "0f6j37friywj7y132fv0jm6aj4sx8f0b7brspj3pbjqqpi4v5ws0"; - tgl = "0f1r0gicif57qhyw8xaa1sqgny720q3z5cpd5srrn9i6fihaz577"; - tha = "1y2hw55jfpidk95y8qbsiczgg2r2khabac97s1y3gl0v93a44jna"; - tir = "1y7iryhjr83ca4yh5jjz7qlnrx4kbrp0a0p650whjvk2gnv8m98h"; - tur = "0xqnq99b2jb4v74bj95py6wmg14dm31zp5s3l48dmcv6zdgcxg2w"; - uig = "1sdddr15zlb33kd1d7hzi5lfd15bfhqn105d7x6snfpqp7vq4bxv"; - ukr = "0cdwjnfnnmzz7jdn49l96vqgaimclfxcxaw09cm63f5my382r2rg"; - urd = "10xcn1zs2lfswp5yai0ckyg7js587qhr5cf7qib3i35qjbw7nc18"; - uzb = "1jkkd5j6vsx5jv5gwprbfwg1vwh714prm8j446wzvp74brmk949l"; - uzb_cyrl = "1kdia38rgm2qd3ly80a412jyagxxryr09h1nz2d0iw71bmfn4855"; - vie = "1ja18jxxaw282y4jljxpjf1gj15il61vc2ykpfy22vn88wvydxff"; - yid = "1jddd0g8mm5v00z5kb8rbpfs7ppzgq9kzm1xlhhvv960yfdbi6fd"; + afr = "sha256-birhlXVhETYI4SYipFROA0xGpJtvnEqjEVGlSPy3upU="; + amh = "sha256-BJ73M3RYuc7ZuLBLr52GLilxdA9mUhXkUK9vPXDTbPE="; + ara = "sha256-IcmKr3rroicawMxKNj02TYBmSdfLC8q4XUuaOF9JZFo="; + asm = "sha256-0LW2Utq5Resb+MKweGRxLHwzQXLDaqHJ6QfD60vAfDA="; + aze = "sha256-vCtISRgsNyDAmEf1pkXR40gawizvUahZUKFP3OE44F8="; + aze_cyrl = "sha256-uFMD0kJq6x0Ho2ofBvd5pghZMzbmgCuslmx6JPpzSzY="; + bel = "sha256-QvPRVfIO6TNpeKrOZD14FM4JJUfXXWXwVMyBGTfy+BM="; + ben = "sha256-FXgmuvSAY1R7d5PhveDJ+C1IQ0iPtcfgIVX2YqcI6GA="; + bod = "sha256-Vql4san2bCVfcUVEG6YHdXIWfhkluAV0R9r9n0Y5mGc="; + bos = "sha256-5J2i7uhl7cHYHW6izqvAvb638nW22Hj7O2R0emQjIOM="; + bul = "sha256-ygvSU7SrYgLbXoss7LxCGbT3JeUUaMq/W8mTOOLD3jM="; + cat = "sha256-Ka9nRn7Bsf/U0tl0jwIZ8iIJdLDlOmbscjTxdotD/E0="; + ceb = "sha256-wSEDsspJiHLcctcemjMAZjU6zSx1is4dP1nBTa4lNrw="; + ces = "sha256-YMWOzZeHWkHsyuSEai5L90yw5LwGbRvEMJGcdqGfs38="; + chi_sim = "sha256-MjrnTUov9J6TLbtNYoL+Dmfd+v2gdeyFgD7NB3IHRUw="; + chi_tra = "sha256-d01Wa9CzbktsB0Fd+ltrV/6yV1sfXyMdf+AaUtrF3Q4="; + chr = "sha256-i7IPinjjGkgC+p8eB1y33o18LqxbezOUKm2Cq+B4Osw="; + cym = "sha256-B8jj1qE5cR3NtMkvkNGIAvbhXeOTMViNcT/nypJb3DQ="; + dan = "sha256-+VIag4GrGCO+CAj5M6m7jxFylopE45HjcLH+m02RPug="; + dan_frak = "sha256-cYNhenunY/WcHth+vItIhdoDqbuiuZ1GAK+sWP0osa8="; + deu = "sha256-y360Kn6XLOx++QT+gYJde1R8Rt9oTIFP2xGpMLE7yjo="; + deu_frak = "sha256-y7IA45RIXFtRXeIDljwqdsFL3vLPJYIZ7PK8rPbMk/g="; + dzo = "sha256-tR/wbc8wEjWfqoIcPSReTIofS2WuX2FOSrH/E2sEn7k="; + ell = "sha256-u+DtB1jGkEMRSxP8jwCkI0LGR/J741LAW0l44mU4DmQ="; + eng = "sha256-wFFcnx4MeeEGn8wFwrL2poQfteEILWldsWAzPBFU8G0="; + enm = "sha256-hliaWydvYxeD4DhyNkD/JAYIixdivVw+ftcHPnYPxoM="; + epo = "sha256-xCTSmiNBRpNT//JfRmtn3jkEFWvBUXwqG6OzVUuBtPg="; + equ = "sha256-OvQ6JCDOkn285oR01kRiWUcYmoLOauT9MhBjmRRoGds="; + est = "sha256-j6jyZJrjFok4lnlTzjrLwZ2MDgcCjARhwppJGDBFlIo="; + eus = "sha256-3Jo0mQQMYA6sBwNiabvBauHlhFyrMuG2Jypwem5Nmgw="; + fas = "sha256-XUZC4yxm6UULypwM7SLK6TGINArP2MbKcX8C5he5wVQ="; + fin = "sha256-+DDGJfY1pjfLEaalZRJrGuEFwkrp/Xy5LI1RMMcYTPE="; + fra = "sha256-hq+yOtFGRn8mPoreVv05UbHMKPjE7rw0+ZPTwC2Ip6s="; + frk = "sha256-t0UWINMKPabRxryZiwiplt++USa4lh7mJuKMdMPJ1Zo="; + frm = "sha256-trW44scT9PZqr2+Vb7dh6oxlGLkq9MURpiozfj4c3wM="; + gle = "sha256-6n4lfOjP5yJ5UFoVTB1VyhBoeAS7/PdpRsLUYutEH9k="; + glg = "sha256-X5AhWWqOUwYWWhNCnNFtJ9UXYFZ0wV1p5XEwer2Ktjk="; + grc = "sha256-q9sWDD0MNCTjVPFUWRmL/KRw3EK2o5TKUh53hkcKIhM="; + guj = "sha256-VAUO0X64PQ4lihJ9kjCLA3zeNAKFgdfQ4qkDVzut6DY="; + hat = "sha256-aIsDZWV2q8ffaG9OT6y3h5j/Gd0NygECYgms1WmtIx0="; + heb = "sha256-T3koiv3pFi7ieEHw3pmeaQAizx470XI+NMqPGJxL6ps="; + hin = "sha256-bplFnb3MQL/sEydHvCMwVJFr7Z2gL4lWfJOIwy4v1u4="; + hrv = "sha256-w3oh7zZ4gBP3GpG6ZJ9K3EwP+O7Z6LKoqm2JHbtpOJc="; + hun = "sha256-pnBNLo2uYiQFlzQsM3Ns172DaojhiPx02wOOyHvj/6c="; + iku = "sha256-q4GeYBOPhDJQiLEZcxe14hAjLywQRrKeZB6TFALbPuw="; + ind = "sha256-NzjesAe6+fAbOmAYNQA/ccMU0blV+KdDY09vHsgiDYg="; + isl = "sha256-v2tsHHb4vLn3gNwXLYth02X6tDSxXoQnfc1s19B8dgA="; + ita = "sha256-Wk5ugm4CHQTzSUwr107Rr1l3tn/e3Os8mqMP9seks9M="; + ita_old = "sha256-P9C5+JRtoRTt7weyQv0RvGhoQjvBI+aZD+qG4oNfD6E="; + jav = "sha256-d/G12l/6oJZyTsNpmuTb/en4VE9LdLtcLJpCJu2XXro="; + jpn = "sha256-PDyVfLv7b+ZrOLRrwX+GFY39sWiKKijt5+4OyJH0qvI="; + kan = "sha256-bxsg1jOTODXA7K7OQuZMYf1pDsAQ0N9S24lDPkoiU0E="; + kat = "sha256-I9aIBop6SWlLEMh7cl44nJ3Mxm5w61KtNqztzU4BYJo="; + kat_old = "sha256-0GWX+Xp1f1Ghw2P0v3PSck3sntwdS8f/9vSi0Uo59Ak="; + kaz = "sha256-9WmAKI6bkL/rGSkXV9oLKT09UAYbCDE184qX/w83g0E="; + khm = "sha256-WoT8I+5T24WLygalGpoWZhlykZGO4J54+q7ghsu2Yr0="; + kir = "sha256-A0J7mgB7dK/OObXQJhtP5vZHbjZn3k6gwxhFjM2zMaw="; + kor = "sha256-+zEuvhGadnPKaMCp97nd0TpwT2RgndIvL9YGiJyRjeY="; + kur = "sha256-LIZeBRn+W4/eC24hhHRcnAbsluuT+xP7fsKYZ5q74rI="; + lao = "sha256-rr8gJe4exxsO5TKCWCjQ0tStp/t/Wb1TXuv2OlVXbQ0="; + lat = "sha256-Up/0i6rZ0QERaYnJj/MJRoYdO21LpkPFTMpebnM7++A="; + lav = "sha256-Tx8GN29JjQ2uEfsDIA7hJMYV3ISP7hwFr/kYe/j2vzs="; + lit = "sha256-FYpSd1cvBLufsHCjvACtOl/npeJYVsn5JIlmLOV7ADg="; + mal = "sha256-CnWrck61tl1tPtBfj/d+qfzyrKd/i3QR1qYOGyG9A8U="; + mar = "sha256-Mzbn1UBQf7btrpmJPlqphsPTZWKJFrszS+AM6kfBxys="; + mkd = "sha256-4/QQaE6Q3HNF7CbvuCZ227AfKx7kY++1/i1IkllTPOA="; + mlt = "sha256-EGgCdZh/8WtJQ3IdSa7LzUq56eNCDJ77oWGqpaDZ5OI="; + msa = "sha256-0vfS1XrxrIZocDBE9IDleMMf7QNx7aKTBiT/1Gc1FxE="; + mya = "sha256-VKDRg9eramczalBJKPPfibTJeB02CDJa3H8K0lbJ3p4="; + nep = "sha256-DMvPyc9L5a1XX2hdH2MXa3c+7np7snAt27VpMXI5g5Q="; + nld = "sha256-vYSTRehHb0e0DBcgT+9c9kKHJEwZudF+KX/+cPxcnLI="; + nor = "sha256-qZAmnz2BWtIG6g8nsU0H56C+DBcTNTl7wLRuoM3P2/o="; + ori = "sha256-TCliwoXMw8c14DHvMnGc84Vh12xcsD7LNxpy+xCbSjc="; + osd = "sha256-nPXVdvzEdWTxEmWEHlyoOQAefm84/396rPRtFalrAP8="; + pan = "sha256-e1UefVLiddjb3uUoAWrLIovwE7Ifz8dzM7m65ie/jbs="; + pol = "sha256-HSKSMZ0uPGXhXxn1W5Ycm0kmUfwXnzvNIZr/58FBv5Q="; + por = "sha256-CJ+0Gc170TUjYkTdmkuKQt/i7pfZe0ge/de5LJxjJKA="; + pus = "sha256-q4hOL9P/cir/tmGSfhjnULSQUucxy7BeosFu94O15cc="; + ron = "sha256-9PNhTUsAnusKtYFevvCA67p8Rws/gMn5ftbaDT9AmYY="; + rus = "sha256-GADcrwQ+lQByafBxaKEiWM2Lh79BN2nCtaPVRR5FyrQ="; + san = "sha256-b0ylBT8U4W2nDuO26w5VS4W9X9uO0+ya8ylZ/qQiLpk="; + sin = "sha256-9YU8Nu/e2xQhmMpokdCidz6in1THamCJM9I4k1F4IZA="; + slk = "sha256-ul0qugn1nhlSWDgl3XsOubpwYoPRwPk76Nc4G15eri8="; + slk_frak = "sha256-Hn8eWerSShNtwGJumAGVlKBC5iCHv8+PD92z4oO12H8="; + slv = "sha256-MFiE4VGgFCHoR6SjDwXpyJn879SDoS0uqODyBVNNVs4="; + spa = "sha256-8jmFmWu8/itXhkzLCCeDwcdMh0KfBEEaBKa6TT2i79o="; + spa_old = "sha256-XaOG/YRQhpbjrmPQo13Oe1JtW2aZSU/lOtZTh/bckXA="; + sqi = "sha256-rs21rvcLz/o6UAZ2kQ/eHStdY3hHlgmcP92Pig3cn5c="; + srp = "sha256-Nb/rPOFPWv64LJviSQ2zQXjA4T996AYQE6CDsWPGdBU="; + srp_latn = "sha256-mVvApX5lqdQgkhESLm3PCuMR7v526aFE0wgrYPDQSGs="; + swa = "sha256-jhCnJU532THt+MkzqYvls2q+H9IcMmbAZkHgRk+HnN8="; + swe = "sha256-KmQHu/GH6x/P0WM/rpq//NYiDnq3TgXmW/FkJqyPIFA="; + syr = "sha256-YD3JPEm4bP9OHcXcnA15D7/rj/ZM9rUhgeV6PgKNfSE="; + tam = "sha256-f7c0foBtVA74PrnEJt3iNmommjcPEf/+c5ILtfwsJbw="; + tel = "sha256-+0btVJoVYzve8ad2sjQxSkQzNOlnjPUVrtUsUhbLzTs="; + tgk = "sha256-QPOySbwYy3WHvDqvs4BDXROpTJVgOzGCP5L7mN0Z0jg="; + tgl = "sha256-55SvYHQmJpuzLu2y8gcG4nj7sA5KdcQ9xKe4yOIDOTg="; + tha = "sha256-ykpC1Egb0Dd80CcxtRScIov3Pot6YeRLmi1eJ0vhUPg="; + tir = "sha256-EKWKtn1ibgk5KOYCBW5ek/RsKT5fygI9UWygLKHP8fg="; + tur = "sha256-XLzOXvtms9oQoUOX+8OojYRXufG3JLnI2WRJsVLCFnc="; + uig = "sha256-uy+C97n4OqtNP62AYDF0q4TmaIkfnhbaHGPRX0Jurek="; + ukr = "sha256-L4ss0PC1uGEqS4CrzrqjrEb18DaJJmKbPP9Xa52VvDE="; + urd = "sha256-KDB7+JK4jDhWxMexkiE+qGh5np8MROXL5dpRoX+wrIM="; + uzb = "sha256-NJE0a17k3P25IUSimi8JB/IdHncrX/7KlqXrbWRpc8o="; + uzb_cyrl = "sha256-pSBiXV3h8Aia+DbABLLPvT/lpQhEAeTpaFjUl9FQsc0="; + vie = "sha256-zvXmN0fIbiG8u9MLtoOhsQT5gpO3SyqJF0hw1btEQck="; + yid = "sha256-zZm4mvPApL0hpD3UPxN+/96j3V0ZrVk+ALvUih5orck="; + }; }; v4 = makeLanguages { - tessdataRev = "4.0.0"; - tessdata = "1chw1ya5zf8aaj2ixr9x013x7vwwwjjmx6f2ag0d6i14lypygy28"; - all = "0dqgkp369rcvq72yhgnzj1pj8yrv7kqzc7y6sqs7nzcq7l5qazlg"; + tessdataRev = "4.1.0"; + tessdata = "sha256-70bp4prs1zUbSzQmcqd7v736cyYWv8oNNbmZXypik5I="; + all = "sha256-hk+DjoVWf7RW9S+Gu9XUX8aWYYsL5dU5c6jLSKJp+MY="; # Run `./fetch-language-hashes <tessdataRev>` to generate these hashes languages = { - afr = "1a9f8pnrspfmcq9gpjnxn2kkhjlsmh912bnpx671fjizxpmiri2y"; - amh = "0m1vdyxjx57kmf2qra0p31k509y1cqn4pyckzw00i5n3wx11d2j0"; - ara = "0nswl6n0s94g900j5k1gwzp7m140c0yd9a2fdb2lzhdvg1krf190"; - asm = "025d9vrjcrwyd6cc6hrw1x8xqhicgrb9wpvhhmlw71ql04dadslf"; - aze = "01shcs78a6xn3my8p3y42x1c9f5hzfn83w2n2nwpffbgz4y2nsgf"; - aze_cyrl = "1sbd89i5r7rnkjh2in8j0plrxnfiill9jl8pr68iw77ghih6q1vg"; - bel = "0dhyymsxcyzwal8474q7ag3m2akv0b92hkdz7rka5z1cxry1cn8c"; - ben = "0a7q9414k3frn37x2qcglz722ysg2iivj6kqaaa0ik7z14ibc8v0"; - bod = "0rh7x54nlh6ir6ldccj8hi7g8hwlp13r3fkljw8gndvhwmgfkkar"; - bos = "1szym4n605hlx12a9vpz4jjs76jscajh22rgkqwbv4qdsl0gi3nd"; - bre = "070f4c84iznblsw4jkwpzh9dss8nfb678160szm5r8dlv2yinrrk"; - bul = "03bg2yw79lg8rl43y9288313jrfh0h69vl4s4cmlgbmnbx8pvxwj"; - cat = "19xs691aj8yy2ff07c3gzm07zicd5ha0gmcjxjh9pknqf2gfy7qv"; - ceb = "1896vn41hqc4anm6hjvrnn022i0p8pmhwsp5rv9w2cvr6738l79r"; - ces = "0fh2g47msfr91285rnccxcmcshihm126sqy496s4vrr0vk8ix1nf"; - chi_sim = "0qxkvbpm5l7gzsshnn72wfx473pprf5nmw8hd4i4x2qxnfddh1gw"; - chi_sim_vert = "1f75pzvxbda82vxa2zb1z9b9f13sh81kzaw45vg5118ncsklj8w7"; - chi_tra = "056vjws1fir1v5iv44pzykkxs5q1dbb2j8blhj47i53w1zf6g42m"; - chi_tra_vert = "10c9cdycg1a5kwlgg60sh8yp07w2fl4whinpxfhlzrzs56allql4"; - chr = "19qq8a6c27973djsc4xpcklis92r58x21fg4mz5azdyka5i1n46l"; - cos = "0z9kx1hw8h5n00pcahxla808wya50wrkk8cz7x676pd93ibyrlyx"; - cym = "13pk9cpf43xxqbz3blfz2av2yd1ma6ds6jbdiqw8anhhj7l9ch2d"; - dan = "1jirmahxvyyswhhyzhinvcqaycz7m3ixchqrj3lgfcdi3anvabr2"; - dan_frak = "17wcgdqxmbzn7qchnx5gsa05aj4wmhbwk43w173bl3wr6h5ylmh0"; - deu = "194rqsg4nlycca9bg2fqf15xgcl110rxp182l7dbjfjhar4knsw9"; - deu_frak = "12hhhp32f15c7fw2jp05mwim9ps14kmamhh6vmalvm7r2033vbm7"; - div = "09mm9r5hxhsc4qpyg10ym9mc2kdpawx8zk0aiv1xpgd35rzpyz41"; - dzo = "1zk7crgcazgqy5zmslp6iw4jws07nja31qdxx0rpzhn3c0bjgw1b"; - ell = "1hhym18a9411953j47xjk47jx9ij9xi2qwlx05c93zl41528nsqg"; - eng = "0iy07z182lwhqfa0q288ha691scpsry330aynaizn68wcmywk86s"; - enm = "1dhr1qvil38bil43wk5ci645sbm3my2y9y7qlcbnwz2p4pflayvm"; - epo = "1jig4db7050vww32vxsqyig3j1b0vgz9ipxbsw0jpkjia84k44n9"; - equ = "02qwg6s1z7pynwm0p6dvpwi04ivfkr1s7qgssbla1dx7v0ih6rlg"; - est = "1jxygahy6by7fbirbmjmd68k6560q1a3h5mvpzdx15h5fw0q58gl"; - eus = "0cai7nm7si8680avrrls8bf9ski980rvsj560fh9y6n9rz7mh9mp"; - fao = "1n3434jf18bzakbylzyg3jaw2ad4h376g56dsql32bgh2yvyww8a"; - fas = "17wjkfka9725rz32clgqgk9msmbz4axs59vz30jmhhxyrkliafqb"; - fil = "0p713k8g27df9z384ns111xqxii5kq20m8brflsmd3yckw1mibhz"; - fin = "1wc3y9nnm7rb2c2c5fkj7cv7jb27jlkb2bh0g8kaz57h6imfmb2g"; - fra = "04qrfvi6irlaahh1pgn5azyfhbhavm12yyybza8603alf8firh7a"; - frk = "05cqmxxxjqdl5hjyzi6dpmixnjpd6f3jr6741yapdmnxvkzxkiyp"; - frm = "0a86yy6hd0lvlbzvnzjmyapzc0rn7mnkdadqycd65bw1b714cvy2"; - fry = "0i84r8g9hlkr9nlhypl4lq6ncrhbcpskqkdcijgk88c2fdknh57h"; - gla = "17idyhb505waz9dnb8dsk54faw7y0xvvb12yw71k0skq3i90akar"; - gle = "1q87h5zzcva54pg364d3hl6q9hdlydlyj1qmq8n5k7hqk11msxmk"; - glg = "01xssz1rhpy3a0sm4i43nba61wc2srz6wv327vdw1kg8ijm0s0g4"; - grc = "00x0s3smx4wg5h12y2b9al0j2jk1y3f0yy2x6f2qf7ps831drgyl"; - guj = "028v4fgn0zi2044vk6j2rlqklc9i0kj22s52vhifmx1g02kz9154"; - hat = "1bca516pr2cnyjlwycc7pr6gfmdjb8565hp06pw9nwpr20ry0hss"; - heb = "1qfkffjh29b21frs0mv6llsrchixl5kjkpj1if7fq816g9mym9kx"; - hin = "1rkfam5c6qil2590lfffzndhq3bncdgf4ij0cyjcglgyljgx0xnc"; - hrv = "0da7b6mk0rwc9zlbqkycwjpddp3qpy07l643i00ia5a1zq35fmgp"; - hun = "0w2s4mn9p74zqzmp9hh2017zgsh5v43k4lid4pv29f4b0y5gj9xi"; - hye = "0ifzm875wlbjh4vkpmj1n6f14m8i174413l6pc6i44y4p5fpgxrf"; - iku = "19arnv82xbxhbcy8pf9fv1sl5zc5707mk34nh7w46dlz86qkidmn"; - ind = "1d421hizwni4m6sr4f3nqqpr1g744hzn0krk130m7x8mhzgamba5"; - isl = "1hjjw8k2r9qa990ziq5wxr36kyf16mnmrqfmq5vbcjprka9h08pq"; - ita = "1qyrvlf7pjxzyb29sc7aq3gq61bww14sijka44scxggfw7134l3r"; - ita_old = "1pf8461jbj0vpyry0b54crmkf2bk9mh4klxvmj09jvf0aq2vm9s6"; - jav = "18vvbyimj0y462amjmwvqa6h9n8l122j9v0w3hfp63hlxpfprm0m"; - jpn = "16hma9w32vdh41ihymp894jza72b0d235hwriv18r78j5n86nhbg"; - jpn_vert = "0yca09l9sbpfjgb2slnpb9q7qd7vz3a1wb6bkln30d3nl0d9r1rn"; - kan = "0lcmx37rjfxkbhhbrld1ndmkwkm9w9b3pzxhas0cv5dqsx2f84jd"; - kat = "1b164bgwa7bbvw4177h8fxfh0fbh4bycfl9pkaa184dpjpaiqpia"; - kat_old = "1mgff7sh93hdp3wh0ckikdggrdgf0syp75s39pickpbkp9ic41ai"; - kaz = "0h37y0kb5lwsp5zpl7bvxg3ryqldl5hxfnardliwgyqgnag951vi"; - khm = "0m7x1fynr18sid2kjjw8xa9ika0a0fc6a6hvc7ihizi47893hdfb"; - kir = "09kxwqpqf6kxjii07qlqsiii83zk12rszp88xnzzjp8rjsnk78s3"; - kor = "0nsr43fwrp9876ia1fc0zcviv2n8hw16n0wfh158vhygwglvy84m"; - kor_vert = "1wmvdznmikk9fq7wdffvn22scxmcl26vjh26jhicqwxpc7kg4bh8"; - kur = "0gbsf3ny3n5mgb30v54bz3crgnimdpg19jn633pbpzryzg3xhd25"; - kur_ara = "1sbj0cczhi9q119fbzpi0m6zr9kjp3k76bv9w8szkv1wc5y4fng6"; - lao = "1gvxlg8bw3a4c9izg3c2a2yl7q6rsy7z9y64axdw9a04pz2ndbl5"; - lat = "0b7an3q3xrf9c55bhiqqh7l45ga88l0kwvkp1akmlr98piach3vr"; - lav = "0fqsmy47cygamddxyjfrdgkfa9bvmrvf4csvppnkdvfzy6iiv0c2"; - lit = "0wjgbkwc3bf5khdqali7ylnhhs4xvpx19m3zx2y9s27v2wjbb6kv"; - ltz = "02zdxbniiqfl87fzsiaaqgldqfsv15z5hja1xhxnqpl0nds7shfc"; - mal = "0a41ifz8i6lj2ywxjkwvymxzxahkz2cjv4apbrawdj1h42bn7frd"; - mar = "00swhlh9bckvmlxanfmlw5j4n9qqhggl84bsq0827bmijsqwnl44"; - mkd = "1bqfiwxlzfpz4fs4z5ci2wbv01qhrcayk1inmk3dxq7dsywx1ajg"; - mlt = "1rmmga2aw88hr7q7cfr5cvhnsgnf1mi069d5k7z66zp4vzbl4zyz"; - mon = "1jksvcavn9plsmjdmhg40mwq5rlvrd1b9gvghdjg7zkf6qqqynlh"; - mri = "0jlfawx20s5clsnk82ndy3v2zidh4cfh4acrh8nindk21xmiwh5i"; - msa = "0m7zs8anaa3l4z5f3xvbhs4syp41dp4all2yfpi1plyr0hy784an"; - mya = "0hljm5haadlr4k5rhw4mvhkygcnrr709rvl7amz7av3nskmi8mb1"; - nep = "1dhy0m2h6xfgwibf92iwxsn926dmrhfvkg9rafkdaqcr4pq6w563"; - nld = "0bspf5bv1s7qzm6k4aqbpq91zvk4kxxhx5zv08w91xfsa1zpdxmi"; - nor = "08majhc9m0fjvac50yq52ia2af9kscclimwkv403klnj4kgf8ndq"; - oci = "1mzrw9gsdjrd1xj3zv7l5gzgjq5jrygxf8cfkz20d9lls0wj1xdv"; - ori = "1sh42mjzb1hv6l6lljp3wifjmz7wrv818f9f16m8qjikwqxm0s78"; - osd = "03mvfk1q1xp1klpf4bwna903rnp51bkqr3gl5hvxybvrc3l2m7z1"; - pan = "0165kr94p6x5yxzs4p8sfppvg9cywp65ps0xaym5rqz9iashz32h"; - pol = "0g0b71ms6ddgykmkna4mlavgzgmh9vj6s62fi8l4ja93nfpr37hp"; - por = "132jbhzmcsq8skanm15bw2niyx9xpbrqr411wn7w9r5i3cvnlv01"; - pus = "0iiglnkn478al11avigsav625pn7ifscycnxpj6fg8835vjww3xr"; - que = "01vkmfi9idjwskv5pllmrxpil0v5h7f7rzv5viclxrzkmbvrz9b5"; - ron = "0ag6vs0cn3sryavs1mfrallgdgi4h28114g7m61rhlhq0z484g0m"; - rus = "1hippm3w5d73sh50r136x0xff2p6x128ry2x4fywf6xdpv1f46v8"; - san = "1qlpqkr5c5wqcf1bvlipy72advqnvd4wm61vghmrj2sda8mx87sx"; - sin = "097d2s4ma0zsq0ab5qs1ylgl9l5phw91fnpsvb7vjmz2mw3ic964"; - slk = "0c97pp5iffhdzyma605x8q3rx1qq9pq2h6cai1kppaj92rz3ji9k"; - slk_frak = "16ivsam1g18zlpw6pgidvzwb7h8rvw1s10nigs6yfwir8hjxsgki"; - slv = "0644jlm55p0dg4zchgrashmbv36zb4x649ckmf2jkbss8bzx7wsf"; - snd = "1i2mfi4414l3v9nznjy7959y2jcr8ymvf6w8zpyrw6nad4d1aak7"; - spa = "15kwvr7cpcnlxm1ja1yyc022dmsd04gmk7h1p0df12aicsscn3qb"; - spa_old = "1jq80c4mi3rmwnfhb3mbaaq0ci101mgbibkji9ala4l5dkcwjra3"; - sqi = "19cvvixhz9906p4c9i2grpr386rbp5alp4fp14xm9nd81bmq4701"; - srp = "1jd25n13h6vxsa3gzbj6q6mdh02rjl4qrd1bffr5psp33asqvw0l"; - srp_latn = "1k7577mn3z0bm5ma9d8l14sn5wpvw50hq1nxwbc36yn3a5b3mhiz"; - sun = "0lvlaw3jfvr7b5v09669kq8mm19jdsk9g5h09jsa2gr6fvsq11pa"; - swa = "0qy9qc5pa1dzzqrh1z40gk845z1r4d2smywnzydknbb3n240lhz0"; - swe = "1y56r7bgzw0pqkdylbah07r1f0v03sblkggiql8x5200rhaxvqi4"; - syr = "1vfj5fsiv170jghryrxwyz0i9mdsaki1kglxrklkb2caal9kwy38"; - tam = "0rhhdbnp0a2hpg00vpc0xyxcl2w36i1kn63mrvwx1f9q7m3y1fmf"; - tat = "0a74rp8pyp4yivv2xcy2m8xgwch8scr3wmk1fzniwzf43fsrqp76"; - tel = "0gcq8hxhxvilyh7x7kiikq07hllqysc8sfyr88gvpj4xi092h2bx"; - tgk = "1458gk0k6gk49n8lr6fj7l7cwkhxn0lrhybzq10zl1ly7yzjhf67"; - tgl = "12yscwckdy3l21mvsrj1021gxw2isjrg369r08rsf7lh96wn4wkn"; - tha = "01f0j7gsc5slxaaql1gqbhk4wlwaxc29dlmfxwjzikxc46gjl0w8"; - tir = "1q6w48b1jchv55713pq20inzjjdymh32fw8wxfaj1qi7bjqfb9fk"; - ton = "06g60ga8rys8jaimqrvd4svh40qs1nz4bszdnf2hdv05ibryibdq"; - tur = "0g9g1wvibp61qbriy8ys948yfkl88xk9g8f93bnq8w8dx029b6s8"; - uig = "09sajx21lw3a3ph62dyqr10pjaq2mij10sdhkhvvjiydk34dn548"; - ukr = "14q8ls8gkrg7c9pc6qzm6yf5ady3i3303vs1hz4d2idcl6yry334"; - urd = "15vszhqraxqdcng1069p6i4xq3ck3904q207nkbap6dfpcpjig40"; - uzb = "03hyw0vavmjirqs4wkd5r85g91w2avsyl14z624fhm3gc66pqg7n"; - uzb_cyrl = "1433lrrp2lfgb1k0a4sc20b35b2jcl8f1z92vm2936y7w04xpaq7"; - vie = "02k40d3wji74d1jgvkr3zrn9gpzlmp0lqhrrdmc48r2sgvnrnk8n"; - yid = "0xnbvi04xv1qapqg72wa3bjwbw51pkdnyncjpjp37vn6dzh04l0z"; - yor = "07w3aci52ng6i6nyp97q5zb2dqlj08w6im90y1h691qah1x44zlv"; + afr = "sha256-XsQc6+0/SheO6dcuERKsmko4p7DdyvsSZtVdne1FLqk="; + amh = "sha256-QIoWQufDlggA/5P5SyxmwSdQZhgXqIyFq/OULrtvO1Q="; + ara = "sha256-IAWXZ3i7wU/Fak6o1DxggIR67ucvzCIBSI8kDayhXFs="; + asm = "sha256-juqmGgEUh8NphXBfnlZ+LELcUQ88Q8OYaZ5nJvNOrQg="; + aze = "sha256-7mkrPPlvOXe5FVbwgaz7sLjEQhfEj4t8HbYbhY5mUAc="; + aze_cyrl = "sha256-bwdsYITvHB6RyRdRmSiN0dme6QUS2SignDafXGJCbek="; + bel = "sha256-DFkWfO4s/KJmPr9NKNICeypRx1MHk0MQVfx71nX1HjY="; + ben = "sha256-YCO2Ign/zAiUUngauWMUT3shzqePYdHPsNmNSQJJ+Cg="; + bod = "sha256-Wc3pXuVwN/sQl3S6kUe4lEP0ToRIMtaoydFAaknpB2Y="; + bos = "sha256-zY74ANUNk704ni8LAaViWpqjpST/7qRE6BQWYCyp/us="; + bre = "sha256-M2cbvdi0oVzq18AEdMxyFmndEvyXT0m4psv+SBAjDhw="; + bul = "sha256-kvd9UV+2rkcrI5rQnQwE0GU5wkBIJD8IzejRdLgXbw0="; + cat = "sha256-Gx/vnnDYzpug7JLVBxQsjcV/QP1vsAOcE94jqUIyuqc="; + ceb = "sha256-OR2KxjF5M8HTzuVqDutFF0QhgLV5S2iqVYRhGIjdJqE="; + ces = "sha256-zoYe0dwg5020ScRjbUSoMELNKuuM2VyQCCk7XQ95Ajo="; + chi_sim = "sha256-/AXYmrMdi04iaRDxaovL945DuuPiWAu1/u/QUu/as2M="; + chi_sim_vert = "sha256-hyNJp2YWhVDeLoSrPwOCegSXVvphfaH6Fki11fe/5bg="; + chi_tra = "sha256-VZBn3A98lHiIhHQhKdZqARfd5/T/ErJj2SFHFzSX2xQ="; + chi_tra_vert = "sha256-hGJKlSn650+h69dGyAl1gh9wPYIamPcon0WFx3xjiYE="; + chr = "sha256-1BAbYlHTt6/Kr+S5IDoqWSQd6WS3E6ZlGycdwYxCGKc="; + cos = "sha256-3dPsVxypXXNMP5+hOTMHRXmOAFK0Q8UuALZAxGHoM30="; + cym = "sha256-TUCW6JEQWoU4jm1Jo5tRNTQvthLf0TX+wr0P4i5L844="; + dan = "sha256-Ii+1rRqxMffokBlD1uOo5zOvMNs2wu8h5Nr73aGqOco="; + dan_frak = "sha256-AFbqCzSZD7rGCXyQyResnEhVgNKvdAsZPvav2nF7jJ8="; + deu = "sha256-iWs7SVZQOrnaoQKF2zMIgbLXS3DYibeSYsxTS57GmaQ="; + deu_frak = "sha256-p649BhD51E1V3QbCquokQd9UI68FXCm4O6wEJ8aFEIo="; + div = "sha256-gXx/fy6jvdvDjgrMjzpXt03BaqoehOcvJkzDDktOtSY="; + dzo = "sha256-K/AnF2DDwn8z6L3hMJS0B2guCY/mUl1/8fh9xV5mZ/4="; + ell = "sha256-D2uLRAmE/pFYAZ1yLGJPMqYuD5myHyJHSSGQpFCoHsI="; + eng = "sha256-2qDJfWUcGfujsl6BMXzWl+mQjIIICQyUw5BTgcI/wEc="; + enm = "sha256-dXtF3SVXfG4Xo/j45IWvoy5diImsTD4IjQsNGjcOGbY="; + epo = "sha256-yRIyCVJRzisB16vfmP7bYAU5XvRY9y0G5xsUcFYjL8o="; + equ = "sha256-j2YDI9int6Do0vrho0OebkcCIr+7mQsqt/6eH7R5HAs="; + est = "sha256-9KGCAXcFltDbv7sWOFTAwBQzkWlV1pXjcscv46F6vss="; + eus = "sha256-tyZYz8/JGp+gA6ZIvTNAKU6d3EKa5rwVQAZFfao9UTE="; + fao = "sha256-CnHutxfwLTEo1s2UZ86ApCnBlRzPf+rXVH+h4CQZZNg="; + fas = "sha256-CzsV6cy+Q1glGH+norsif1Vd03z4USbGz0WcpKabkp8="; + fil = "sha256-H65YA5/Mj1Y1dXmhCgSeJcaOewhBW4LGT64d8dAc4Vw="; + fin = "sha256-T6zqajTwlK8megAusSaVRyx5NjtyusIEEyufam3yg/E="; + fra = "sha256-6sAcHXJUDWCQ+st7L0LdCi7o/FfFvhsgVIrmaOJ2GRM="; + frk = "sha256-18fZ/9zd1naVD+SYLIcz7UrbY73NxO8lLLRh2XuvmBU="; + frm = "sha256-wm9GwlmBr2Ia87ipNm09NgP2r/JVfrv/opuCBo33Bik="; + fry = "sha256-8BRoZ3OCITSfjKxNPPVlC2ZmDaaEXg+pTXlSmB7KBEU="; + gla = "sha256-WU0FUhx4ajDD4V6EtXcH/nDlSJm6oWVb+ooXUBb0LZ4="; + gle = "sha256-s3ZdQ5gYnlkswhUH6WnztMGEDYWjETPeJUVt9n+BB+E="; + glg = "sha256-5AENqozozcDbPmJsbn7WgvFg1LKDRFI1UMNfmMPXugc="; + grc = "sha256-1L/cwkD6HoeFM114D9zwYUohAVVpCS8CLI+TXvXQoAM="; + guj = "sha256-pIT0pwAv9Ooi3KJoIeQEMTE6Mc1CmrkJASJ+YJ8jGwk="; + hat = "sha256-WkPgMxD5cpv4NeDCYgpaslX3TL6HMc+p9JaJfE0oiq0="; + heb = "sha256-fabqa3omIOyOi0HeKWehPUKWNaVmV6CzC2IlAaVz0+E="; + hin = "sha256-zHbQn6T+0cekZ0BG4l5jdg0Mm/3OOQpSETRiw0pVbuY="; + hrv = "sha256-91VXBv5BFRUBiIMYeoC/eNzWruTMT7zoT4xnMKtZRzU="; + hun = "sha256-sSf5igeLuCT2JS1SMgfZBer3TwACwnTrx5+cm2wlWnA="; + hye = "sha256-Lvd3XbnEExINu4aOQMgJEVUSnLFB1js3gXJRXg6q30U="; + iku = "sha256-trY4sUGfNkP4gZaMWQ84hf1CddguuYs8W7CvLtC2WaU="; + ind = "sha256-Ra2q3ocV9VPBCDNPYD8k5LyQL8Z2OJK1qSRa/iMMgrQ="; + isl = "sha256-+CIAk5r5SrZ2wdXhXG01wflpRu684PhBSgqnLCbiUsI="; + ita = "sha256-T3R2xhExK+uPjhgoiNoI6mQtmCSuRALMYjX2GrFAZAY="; + ita_old = "sha256-Rqe6BVbAbZmArLvTSWBNcwk3a2akLOCzvxvIJYMhyN0="; + jav = "sha256-FdR83e0UDnMdHBzsJIUIFNkEjcKbV1mVMMQDWaNfe6M="; + jpn = "sha256-b0FrkC0SnYzCjpnDMkQDSxz1JUnoVg9jILBtMXhSFZo="; + jpn_vert = "sha256-NoecGqB2NDAsncssHtT4+zR8cFrXUi3Wk+4unWgCink="; + kan = "sha256-TRLkRNe4lc2AVrD/O1biqU4+a7Oh0bwgXLM7mc/olVE="; + kat = "sha256-Kl4c1ZW3ERSUmjdRx/wicDkAXXcInhMI32sdxd8iJqw="; + kat_old = "sha256-UQXCYrpz3cniTUOXc70G7rX8XptxMgD5uA2OBPVx7tU="; + kaz = "sha256-cYeSnrIP+8cjbVlZ12GhjWKfx+t7HXp/uZrTsibwZ0A="; + khm = "sha256-yzU4Ejok/gjjYRsaZZgDCqgZk+qISzlFixqFbL0L/VQ="; + kir = "sha256-Q6MzrZYZXfm/7Qjdr7MI8w8UY9SY4gNilH0ahy/mfSY="; + kmr = "sha256-5llHfGE87Pk14mkvc+a4cqb8TQXx/uVSCDhF+BkDcuk="; + kor = "sha256-lSC/6ePPw41KgI4DawKHyIodN/uAuaCiOSjdzN0gWVs="; + kor_vert = "sha256-CC7y5mG3c8wilEZAuY2grHamhbDbucYPdmnOWO1vu/I="; + lao = "sha256-ha5mxb8EqMRbV8T49I/X2eBDvVCCjfdjYkQNvtCjfb8="; + lat = "sha256-eQ/IVLwoZVqnCnduPgFFSL1C6IEYR7hKYcnlPvCw6iw="; + lav = "sha256-goEdo/Hf7TbtvVsz4naueyXl5mvZSd9bq+p5doivGjs="; + lit = "sha256-e5q1JBf7CJ286H/UFPrdnWgILfUnUoUbnMWtwfhcT3I="; + ltz = "sha256-zEF9dLOAXmw77EFJWH4JWzvc6MNKRf3dQdThGO3q7Qs="; + mal = "sha256-LbtjlyAwyMZVXleRLZn4E6r+e/WbT9m5F5KaiL6LgSg="; + mar = "sha256-hFDLsZaxriMQwHoRRN+DGCdLZOG0Oqs6rXuylSCFXAM="; + mkd = "sha256-T6rQudft4N7GrDaG6RXLEAewFxeRlU+0I/+6TzuPDq8="; + mlt = "sha256-339C19/kfmP+maUlA2INzj5t4WYlO3bwyRAhroR6teY="; + mon = "sha256-kFqPMTZu/vNkg2+/tELLm+aCeQXkwdpk1fQmuxXbeso="; + mri = "sha256-sUAeaw9iNhstgpkpAh0jsMUv9vDNCjStpqxoIDpXjko="; + msa = "sha256-VhF0PATZ0xvidV5QqshtgVyviYZr9+HKJ3QoZRXS/1Q="; + mya = "sha256-YVUU69R2bHV+VYfunMDJ2bLnJ9yVcJjLJJk2pWCpkkI="; + nep = "sha256-wxRu8CWZYdWmUzm9uR3MtRmRrO48iuRW5M91A0UFHrY="; + nld = "sha256-sfZ2f1Da9ZA4AvuXDnufZO4fEr4LKzJN/fjosFdxVy8="; + nor = "sha256-uFnk3iTS0jkA2ZPXSBnTMzklVBQFe1CY2tKBmhiUqiI="; + oci = "sha256-u/UgOdCUpgbEn44h15/PsmD5/iv07D9kDy3Lpl/i+dc="; + ori = "sha256-6GhQO+YzSoyqCS45FNDO/PwqXeTjSkoNNRuG9WUVBOo="; + osd = "sha256-4Z8q6GB5L983LPSNjOcK5do8QFKWL+IuneH2gMN0uw4="; + pan = "sha256-UIwPtYrp41yqVx3oW8zlnqW373UaXaJ/96WbS1KexQQ="; + pol = "sha256-F56Rr7MjKUkoik4YbeROsL7/tqKVKDvr9K81o2s4Czw="; + por = "sha256-AWxqNxux5MSP5SGQjPO6PXUfreCrhGrV1AhrVj9cUow="; + pus = "sha256-uQ/O5S4DoeeMvN0yz7SLx94izFb6xa1CoAodYqelL0Y="; + que = "sha256-ZaWf96rz505Z3GX/fNyBZQMab8+V0lv21Fy2mKKrcwc="; + ron = "sha256-FTyCyAcYUpiDqeeREJCAJL72KFXZ1aC38lkPy4De5ik="; + rus = "sha256-aBviwr6tG8e9I134jETo5grnOuhmhAwK1OO0wke9N8I="; + san = "sha256-XR/UK1JNC5krfDuYyknbFu+mxPE30r2CY5gXVvLEl+I="; + sin = "sha256-xCQWB6/iV7nP2vpaFxKHt9BEH/VB47IUwPoDVYkW7SQ="; + slk = "sha256-M0U5fhZJqntniIoZKPBNGIeeB0a9AKOq/w06F8u9JzE="; + slk_frak = "sha256-cT7dJUQ5cueNftGCoAPfGcGz+N8tvmv4pR+FF6rSO5o="; + slv = "sha256-TvPT/0JarymFq5MlYjpZ34y9KtQqP8g+eQ3cUiqVhBg="; + snd = "sha256-ZyoVGmnKGp79/Ygbt6tHmUnhU0nHS/tt2oOSQEh0VcQ="; + spa = "sha256-Cw/LtGZRieAauAGeWR8BTdcmBGDeByVD7dSyy07efJY="; + spa_old = "sha256-Q2XJ2WyFEkVVinKuuF4NIEQGsFKrjgWd5TWPWAkDCMs="; + sqi = "sha256-ARyC6wqo2VQ7CdeRS1W5Kxs08s1PxMTINSClD3vcm6U="; + srp = "sha256-FPCNtRrj6luycyu0jAmVWQDYqsFGrv+G0n0bOIItosk="; + srp_latn = "sha256-P8I6VlHDejPY4t0GDEHh+/JiNQkUtaRqqQv8Yes55cw="; + sun = "sha256-6oaA9XYmP6G0TACWl6ZuMoVaEZ7JmAR2WSdvJwdXdFM="; + swa = "sha256-4EMKiLBjLTub/5b7qkUjOfxC0HyA/AAz/r8FdQvDyWM="; + swe = "sha256-JOLdFcwAiNIRxfG9SZceYAMX8gFQLerbxBfw/9bJpvg="; + syr = "sha256-aHg+E1WKiTXpzJ2+GeJUutUUwfe8Z5/hk+CEHbUr0u0="; + tam = "sha256-rrrgRz04udD5znUYO0M0gwvKuu+A3Q3Au1AocO1qEGY="; + tat = "sha256-5lyctRvEfR7td2FWPjLTCDL+OqrCsy72jp5cf9HN5Cg="; + tel = "sha256-fQkoEoidyLsfQtk7jZj2mFJ4AJ4xztMP9DTuDjtEmD0="; + tgk = "sha256-xzgovz+eBvpBwH95mCmwHU7ODj3SmUyRTWQ+M8F8qJA="; + tgl = "sha256-dnJiuUmQHqczAjmZ8bLUUfD+ggBBZr1rEHT4Nhln2os="; + tha = "sha256-iAMqnyGsz/gl767SlgTrilNOJlz4BYqV6lQXpt+RwAU="; + tir = "sha256-06XlsFwn4iCV6xxxJwasvkn5bQQC3xFOKRsyGRYi3OA="; + ton = "sha256-uK3o84oF7AaFs+3rRb4NGgMCtyZtZ1yjkkj7jNQD5hk="; + tur = "sha256-SJuVBOgNcYTtGsmhl2ZHiE7nEUnaIx/zwsHcFTcPLz0="; + uig = "sha256-iBTbyJjNR7k3nLBpEGSsAit5QcjYN2HgHWpwGkSXSic="; + ukr = "sha256-ZAyfvaGsRdHIh0HvAcaIwzdVnDf1Y8NuYufl+ZCmCJM="; + urd = "sha256-gLwoL7uumavWtAcITEAakw3cSTQ3GRCeZQ13lTH8epc="; + uzb = "sha256-9jx8jWFvVOiIMJ8E6vVWgof0CsqlTU40zlHWrTbgHg4="; + uzb_cyrl = "sha256-B6vbCeDHm5FE3SL94BBlUqwyFhBMEwVmWM9RcXOmY5A="; + vie = "sha256-Fk2b7X5aZERYbTlDTMGt9N+XbP4jz/1kaOREyUcDZAo="; + yid = "sha256-H1AC4G/G7jOuvJJZb9u8ofDF5RqKi/PwVTjsTkDcy3Y="; + yor = "sha256-m35CeoAKh2Rg8CDVaDgCkuIm1i/4pOutieZZUSJTgx8="; }; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 7b9669bc465e4..0e5f38ae7918b 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -9,13 +9,24 @@ stdenv.mkDerivation rec { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30"; + hash = "sha256-YHj00gG/3SW0ILTiQwphiCxuP9OCDya27hyFQB27mYc="; }; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = [ + leptonica + libpng + libtiff + icu + pango + opencl-headers + ]; LIBLEPT_HEADERSDIR = "${leptonica}/include"; diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index f78220d2f401c..d1f936fab079f 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - sha256 = "1ca27zbjpx35nxh9fha410z3jskwyj06i5hqiqdc08s2d7kdivwn"; + hash = "sha256-lu/Y5mlCI8AajhiWaID0fGo5PghEQZdgt2X0K9c/QrE="; }; patches = [ @@ -26,8 +26,20 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ]; - buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + autoconf-archive + ]; + + buildInputs = [ + leptonica + libpng + libtiff + icu + pango + opencl-headers + ]; meta = { description = "OCR engine"; diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix new file mode 100644 index 0000000000000..dd4d6cb2791df --- /dev/null +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config +, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "tesseract"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "tesseract-ocr"; + repo = "tesseract"; + rev = version; + sha256 = "sha256-B1x3wxr9Sn2rsG8AHncPTEErhDo7YtpDRxfW9ZOPWoU="; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + autoconf-archive + ]; + + buildInputs = [ + leptonica + libpng + libtiff + icu + pango + opencl-headers + ]; + + meta = { + description = "OCR engine"; + homepage = "https://github.com/tesseract-ocr/tesseract"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anselmschueler ]; + platforms = with lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix index 1dfc4393c46bd..59686e3251f26 100644 --- a/pkgs/applications/graphics/tesseract/wrapper.nix +++ b/pkgs/applications/graphics/tesseract/wrapper.nix @@ -1,4 +1,5 @@ { lib, makeWrapper, tesseractBase, languages +, runCommand, imagemagick # A list of languages like [ "eng" "spa" … ] or `null` for all available languages , enableLanguages ? null @@ -12,8 +13,6 @@ }: let - passthru = { inherit tesseractBase languages tessdata; }; - tesseractWithData = tesseractBase.overrideAttrs (_: { inherit tesseractBase tessdata; @@ -47,9 +46,36 @@ let exit 1 fi ''; + }); - tesseract = (if enableLanguages == [] then tesseractBase else tesseractWithData) // passthru; + passthru = { inherit tesseractBase languages tessdata; }; + + # Only run test when all languages are available + test = lib.optionalAttrs (enableLanguages == null) { + tests.default = runCommand "tesseract-test-ocr" { + buildInputs = [ + tesseractWithData + imagemagick + ]; + } '' + text="hello nix" + + convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 \ + -fill black -annotate +5+20 "$text" /tmp/test-img.png 2>/dev/null + ocrResult=$(tesseract /tmp/test-img.png - | tr -d "\f") + + if [[ $ocrResult != $text ]]; then + echo "OCR test failed" + echo "expected: '$text'" + echo "actual: '$ocrResult'" + exit 1 + fi + touch $out + ''; + }; + + tesseract = (if enableLanguages == [] then tesseractBase else tesseractWithData) // passthru // test; in if enableLanguagesHash == null then tesseract diff --git a/pkgs/applications/graphics/unigine-sanctuary/default.nix b/pkgs/applications/graphics/unigine-sanctuary/default.nix new file mode 100644 index 0000000000000..25d10d6166783 --- /dev/null +++ b/pkgs/applications/graphics/unigine-sanctuary/default.nix @@ -0,0 +1,97 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, autoPatchelfHook +, libX11 +, libXext +, libXrandr +, libXinerama +, libglvnd +, openal +, glibc +, makeDesktopItem +, copyDesktopItems +, imagemagick +, liberation_ttf +}: +stdenv.mkDerivation rec{ + pname = "unigine-sanctuary"; + version = "2.3"; + + src = fetchurl { + url = "https://m12-assets.unigine.com/d/Unigine_Sanctuary-${version}.run"; + sha256 = "1m9r79q33hx213zg3c2kknnc7hi8jp2h88s9qynny4k4rg8vpa18"; + }; + + libPath = lib.makeLibraryPath [ + libglvnd + openal + glibc + ]; + + installPhase = '' + bash $src --target ${pname}-${version} + + install -D -m 0755 ${pname}-${version}/bin/libUnigine_x86.so $out/lib/unigine/sanctuary/bin/libUnigine_x86.so + install -D -m 0755 ${pname}-${version}/bin/Sanctuary $out/lib/unigine/sanctuary/bin/Sanctuary + install -D -m 0755 ${pname}-${version}/1024x768_windowed.sh $out/bin/Sanctuary + + cp -R ${pname}-${version}/data $out/lib/unigine/sanctuary + + wrapProgram $out/bin/Sanctuary \ + --prefix LD_LIBRARY_PATH : ${libPath}:$out/lib/unigine/sanctuary/bin \ + --run "cd $out/lib/unigine/sanctuary" + + convert -size 256x256 xc:Transparent -define gradient:center="128,128" -define gradient:vector="128,128 128,128" \ + -define gradient:radii="128,128" -fill radial-gradient:'rgb(164,0,0)-rgb(67,1,3)' \ + -draw "roundRectangle 0,0 256,256 50,50" ${pname}-${version}/icon.png + convert ${pname}-${version}/icon.png -size 181.991x181.991 -font ${liberation_ttf}/share/fonts/truetype/LiberationSans-Regular.ttf \ + -pointsize 181.991 -define gradient:center="128,128" -define gradient:vector="128,128 128,128" \ + -define gradient:radii="46.6974,46.6974" -fill radial-gradient:'rgb(249,197,46)-rgb(218,144,31)' \ + -stroke none -strokewidth 4.54977 -draw 'text 69.3061,194.247 "S"' ${pname}-${version}/icon.png + + for RES in 16 24 32 48 64 128 256; do + mkdir -p $out/share/icons/hicolor/"$RES"x"$RES"/apps + convert ${pname}-${version}/icon.png -resize "$RES"x"$RES" $out/share/icons/hicolor/"$RES"x"$RES"/apps/Sanctuary.png + done + convert ${pname}-${version}/icon.png -resize 128x128 $out/share/icons/Sanctuary.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Sanctuary"; + exec = "Sanctuary"; + genericName = "A GPU Stress test tool from the UNIGINE"; + icon = "Sanctuary"; + desktopName = "Sanctuary Benchmark"; + }) + ]; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + imagemagick + copyDesktopItems + ]; + + buildInputs = [ + stdenv.cc.cc + libX11 + libXext + libXrandr + libXinerama + ]; + + dontUnpack = true; + + meta = { + description = "The Unigine Heaven GPU benchmarking tool"; + homepage = "https://benchmark.unigine.com/sanctuary"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.BarinovMaxim ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/graphics/unigine-tropics/default.nix b/pkgs/applications/graphics/unigine-tropics/default.nix new file mode 100644 index 0000000000000..1057c2fa6cad7 --- /dev/null +++ b/pkgs/applications/graphics/unigine-tropics/default.nix @@ -0,0 +1,95 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, autoPatchelfHook +, libX11 +, libXext +, libXrandr +, libXinerama +, libglvnd +, openal +, glibc +, makeDesktopItem +, copyDesktopItems +, imagemagick +}: +let + version = "1.3"; +in +stdenv.mkDerivation { + pname = "unigine-tropics"; + inherit version; + + src = fetchurl { + url = "http://m12-assets.unigine.com/d/Unigine_Tropics-${version}.run"; + sha256 = "0icasdp46fjnic7gk83pknjx0gpap9j202dm0llcfg5zin5kbq7x"; + }; + + libPath = lib.makeLibraryPath [ + libglvnd + openal + glibc + ]; + + installPhase = '' + bash $src --target $name + + install -D -m 0755 $name/bin/libUnigine_x86.so $out/lib/unigine/tropics/bin/libUnigine_x86.so + install -D -m 0755 $name/bin/Tropics $out/lib/unigine/tropics/bin/Tropics + install -D -m 0755 $name/1024x768_windowed.sh $out/bin/Tropics + + cp -R $name/data $out/lib/unigine/tropics + + wrapProgram $out/bin/Tropics \ + --prefix LD_LIBRARY_PATH : $libPath:$out/lib/unigine/tropics/bin \ + --run "cd $out/lib/unigine/tropics" + + convert -size 256x256 xc:Transparent -fill gradient:'dodgerblue-white' -stroke Transparent -draw "roundrectangle 0,0 256,256 50,50" $name/icon.png + convert $name/icon.png -fill white -stroke white -draw "polygon 69.2564,84.1261 117.9,84.1261 117.9,206.56 138.1,206.56 138.1,84.1261 186.744,84.1261 186.744,65.9877 69.2564,65.9877 69.2564,84.1261" $name/icon.png + + for RES in 16 24 32 48 64 128 256 + do + mkdir -p $out/share/icons/hicolor/"$RES"x"$RES"/apps + convert $name/icon.png -resize "$RES"x"$RES" $out/share/icons/hicolor/"$RES"x"$RES"/apps/Tropics.png + done + convert $name/icon.png -resize 128x128 $out/share/icons/Tropics.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Tropics"; + exec = "Tropics"; + genericName = "A GPU Stress test tool from the UNIGINE"; + icon = "Tropics"; + desktopName = "Tropics Benchmark"; + }) + ]; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + imagemagick + copyDesktopItems + ]; + + buildInputs = [ + stdenv.cc.cc + libX11 + libXext + libXrandr + libXinerama + ]; + + dontUnpack = true; + + meta = { + description = "The Unigine Heaven GPU benchmarking tool"; + homepage = "https://benchmark.unigine.com/tropics"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.BarinovMaxim ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 3187f573de704..9b51373178e44 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -1,10 +1,15 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl -# Build-time dependencies + # Build-time dependencies , makeWrapper , file +, makeDesktopItem +, imagemagick +, copyDesktopItems -# Runtime dependencies + # Runtime dependencies , fontconfig , freetype , libX11 @@ -12,104 +17,120 @@ , libXinerama , libXrandr , libXrender -, libGL -, openal}: +, libglvnd +, openal +}: let version = "1.0"; - arch = if stdenv.hostPlatform.system == "x86_64-linux" then - "x64" - else if stdenv.hostPlatform.system == "i686-linux" then - "x86" - else - throw "Unsupported platform ${stdenv.hostPlatform.system}"; - + arch = + if stdenv.hostPlatform.system == "x86_64-linux" then + "x64" + else if stdenv.hostPlatform.system == "i686-linux" then + "x86" + else + throw "Unsupported platform ${stdenv.hostPlatform.system}"; in - stdenv.mkDerivation rec { - pname = "unigine-valley"; - inherit version; - - src = fetchurl { - url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run"; - sha256 = "5f0c8bd2431118551182babbf5f1c20fb14e7a40789697240dcaf546443660f4"; - }; - - sourceRoot = "Unigine_Valley-${version}"; - instPath = "lib/unigine/valley"; - - nativeBuildInputs = [file makeWrapper]; - - libPath = lib.makeLibraryPath [ - stdenv.cc.cc # libstdc++.so.6 - fontconfig - freetype - libX11 - libXext - libXinerama - libXrandr - libXrender - libGL - openal - ]; - - unpackPhase = '' - runHook preUnpack - - cp $src extractor.run - chmod +x extractor.run - ./extractor.run --target $sourceRoot - - runHook postUnpack - ''; - - patchPhase = '' - runHook prePatch - - # Patch ELF files. - elfs=$(find bin -type f | xargs file | grep ELF | cut -d ':' -f 1) - for elf in $elfs; do - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $elf || true - done - - runHook postPatch - ''; - - installPhase = '' - runHook preInstall - - instdir=$out/${instPath} - - # Install executables and libraries - mkdir -p $instdir/bin - install -m 0755 bin/browser_${arch} $instdir/bin - install -m 0755 bin/libApp{Stereo,Surround,Wall}_${arch}.so $instdir/bin - install -m 0755 bin/libGPUMonitor_${arch}.so $instdir/bin - install -m 0755 bin/libQt{Core,Gui,Network,WebKit,Xml}Unigine_${arch}.so.4 $instdir/bin - install -m 0755 bin/libUnigine_${arch}.so $instdir/bin - install -m 0755 bin/valley_${arch} $instdir/bin - install -m 0755 valley $instdir - - # Install other files - cp -R data documentation $instdir - - # Install and wrap executable - mkdir -p $out/bin - install -m 0755 valley $out/bin/valley - wrapProgram $out/bin/valley \ - --run "cd $instdir" \ - --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$instdir/bin:$libPath - - runHook postInstall - ''; - - stripDebugList = ["${instPath}/bin"]; - - meta = { - description = "The Unigine Valley GPU benchmarking tool"; - homepage = "https://unigine.com/products/benchmarks/valley/"; - license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf - maintainers = [ lib.maintainers.kierdavis ]; - platforms = ["x86_64-linux" "i686-linux"]; - }; - } + +stdenv.mkDerivation rec { + pname = "unigine-valley"; + inherit version; + + src = fetchurl { + url = "https://m11-assets.unigine.com/d/Unigine_Valley-${version}.run"; + sha256 = "5f0c8bd2431118551182babbf5f1c20fb14e7a40789697240dcaf546443660f4"; + }; + + sourceRoot = "Unigine_Valley-${version}"; + instPath = "lib/unigine/valley"; + + nativeBuildInputs = [ file makeWrapper imagemagick copyDesktopItems ]; + + libPath = lib.makeLibraryPath [ + stdenv.cc.cc # libstdc++.so.6 + fontconfig + freetype + libX11 + libXext + libXinerama + libXrandr + libXrender + libglvnd + openal + ]; + + unpackPhase = '' + runHook preUnpack + + cp $src extractor.run + chmod +x extractor.run + ./extractor.run --target $sourceRoot + + runHook postUnpack + ''; + + postPatch = '' + # Patch ELF files. + elfs=$(find bin -type f | xargs file | grep ELF | cut -d ':' -f 1) + for elf in $elfs; do + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $elf || true + done + ''; + + installPhase = '' + runHook preInstall + + instdir=$out/${instPath} + mkdir -p $out/share/icons/hicolor $out/share/applications $out/bin $instdir/bin + + # Install executables and libraries + install -m 0755 bin/browser_${arch} $instdir/bin + install -m 0755 bin/libApp{Stereo,Surround,Wall}_${arch}.so $instdir/bin + install -m 0755 bin/libGPUMonitor_${arch}.so $instdir/bin + install -m 0755 bin/libQt{Core,Gui,Network,WebKit,Xml}Unigine_${arch}.so.4 $instdir/bin + install -m 0755 bin/libUnigine_${arch}.so $instdir/bin + install -m 0755 bin/valley_${arch} $instdir/bin + install -m 0755 valley $instdir + install -m 0755 valley $out/bin/valley + + # Install other files + cp -R data documentation $instdir + + # Install and wrap executable + wrapProgram $out/bin/valley \ + --chdir "$instdir" \ + --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$instdir/bin:$libPath + + # Make desktop Icon + convert $out/lib/unigine/valley/data/launcher/icon.png -resize 128x128 $out/share/icons/Valley.png + for RES in 16 24 32 48 64 128 256 + do + mkdir -p $out/share/icons/hicolor/"$RES"x"$RES"/apps + convert $out/lib/unigine/valley/data/launcher/icon.png -resize "$RES"x"$RES" $out/share/icons/hicolor/"$RES"x"$RES"/apps/Valley.png + done + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Valley"; + exec = "valley"; + genericName = "A GPU Stress test tool from the UNIGINE"; + icon = "Valley"; + desktopName = "Valley Benchmark"; + }) + ]; + + stripDebugList = [ "${instPath}/bin" ]; + + meta = { + description = "The Unigine Valley GPU benchmarking tool"; + homepage = "https://unigine.com/products/benchmarks/valley/"; + license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf + maintainers = [ lib.maintainers.kierdavis ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} + diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index d2873f6414288..0385c5db9d86b 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.21.1"; + version = "3.22"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "1jw28hkd7p0n660gid8yh5y0kdcz6ycn4hsgjlf0pq48x9kv6w0c"; + sha256 = "sha256-GHYdvWie2k9YarS9DaA4bExswV3UQ26O8+7K/6yvtac="; }; nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index d8838587d7666..c390e004c8cce 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -86,6 +86,7 @@ let dragon = callPackage ./dragon.nix {}; elisa = callPackage ./elisa.nix {}; eventviews = callPackage ./eventviews.nix {}; + falkon = callPackage ./falkon.nix {}; ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; filelight = callPackage ./filelight.nix {}; granatier = callPackage ./granatier.nix {}; @@ -97,7 +98,7 @@ let kaccounts-providers = callPackage ./kaccounts-providers.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; - kalarmcal = callPackage ./kalarmcal.nix {}; + kalendar = callPackage ./kalendar.nix {}; kalzium = callPackage ./kalzium.nix {}; kamoso = callPackage ./kamoso.nix {}; kapman = callPackage ./kapman.nix {}; @@ -153,6 +154,7 @@ let kmime = callPackage ./kmime.nix {}; kmines = callPackage ./kmines.nix {}; kmix = callPackage ./kmix.nix {}; + kmousetool = callPackage ./kmousetool.nix {}; kmplot = callPackage ./kmplot.nix {}; knavalbattle = callPackage ./knavalbattle.nix {}; knetwalk = callPackage ./knetwalk.nix {}; @@ -219,6 +221,7 @@ let print-manager = callPackage ./print-manager.nix {}; rocs = callPackage ./rocs.nix {}; skanlite = callPackage ./skanlite.nix {}; + skanpage = callPackage ./skanpage.nix {}; spectacle = callPackage ./spectacle.nix {}; yakuake = callPackage ./yakuake.nix {}; zanshin = callPackage ./zanshin.nix {}; diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix index cdcca2cc9bb23..63639800d5f6a 100644 --- a/pkgs/applications/kde/elisa.nix +++ b/pkgs/applications/kde/elisa.nix @@ -21,6 +21,8 @@ mkDerivation rec { pname = "elisa"; + outputs = [ "out" "dev" ]; + buildInputs = [ libvlc ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/kde/falkon.nix index 6b525fbca9f79..94cf6f5cfd255 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/kde/falkon.nix @@ -1,21 +1,13 @@ { stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch -, cmake, extra-cmake-modules, pkg-config, qmake +, cmake, extra-cmake-modules, pkg-config , libpthreadstubs, libxcb, libXdmcp , qtsvg, qttools, qtwebengine, qtx11extras , qtwayland, wrapQtAppsHook -, kwallet +, kwallet, kpurpose, karchive, kio }: mkDerivation rec { pname = "falkon"; - version = "3.2.0"; - - src = fetchFromGitHub { - owner = "KDE"; - repo = "falkon"; - rev = "v${version}"; - sha256 = "sha256-esi9YWd1PtQpDBhI1NtWEjZIoMoNUpAF+kQad67mLzE="; - }; preConfigure = '' export NONBLOCK_JS_DIALOGS=true @@ -27,21 +19,20 @@ mkDerivation rec { buildInputs = [ libpthreadstubs libxcb libXdmcp qtsvg qttools qtwebengine qtx11extras - kwallet + kwallet kpurpose karchive kio ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config - qmake qttools wrapQtAppsHook ]; meta = with lib; { description = "QtWebEngine based cross-platform web browser"; - homepage = "https://community.kde.org/Incubator/Projects/Falkon"; + homepage = "https://www.falkon.org"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index a24ef563f3e9b..28d0371cd8c10 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.3/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.0/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix index 7a2a319c655a8..6080ad5db34bf 100644 --- a/pkgs/applications/kde/kaddressbook.nix +++ b/pkgs/applications/kde/kaddressbook.nix @@ -21,4 +21,8 @@ mkDerivation { kdbusaddons ki18n kontactinterface kparts kpimtextedit kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$out/include/KF5" + ''; } diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix index 87bc95a249413..b99098c56f936 100644 --- a/pkgs/applications/kde/kalarm.nix +++ b/pkgs/applications/kde/kalarm.nix @@ -7,7 +7,7 @@ kio, knotifications, knotifyconfig, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon, - kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils, + kimap, akonadi, akonadi-contacts, akonadi-mime, kcalendarcore, kcalutils, kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime, pimcommon, kpimtextedit, messagelib, @@ -31,7 +31,7 @@ mkDerivation { kio knotifications knotifyconfig kservice kwidgetsaddons kwindowsystem kxmlgui phonon - kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore + kimap akonadi akonadi-contacts akonadi-mime kcalendarcore kcalutils kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime pimcommon kpimtextedit messagelib diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix deleted file mode 100644 index 9296fe024e956..0000000000000 --- a/pkgs/applications/kde/kalarmcal.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - mkDerivation, lib, kdepimTeam, - extra-cmake-modules, kdoctools, - akonadi, kcalendarcore, kholidays, kidentitymanagement, - kpimtextedit, kcalutils -}: - -mkDerivation { - pname = "kalarmcal"; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - akonadi kcalendarcore kholidays kidentitymanagement kpimtextedit kcalutils - ]; - outputs = [ "out" "dev" ]; -} diff --git a/pkgs/applications/office/kalendar/default.nix b/pkgs/applications/kde/kalendar.nix index 32cc2f5de57c7..a762d605a32b7 100644 --- a/pkgs/applications/office/kalendar/default.nix +++ b/pkgs/applications/kde/kalendar.nix @@ -39,15 +39,6 @@ mkDerivation rec { pname = "kalendar"; - version = "1.0.0"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "pim"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-kjtLVU+8wbIa7R6J1XOjuvS3AnJNngxNBCx24Dy1QzM="; - }; nativeBuildInputs = [ cmake @@ -95,7 +86,7 @@ mkDerivation rec { meta = with lib; { description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)"; - homepage = "https://invent.kde.org/pim/kalendar/"; + homepage = "https://apps.kde.org/kalendar/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ chuangzhu ]; platforms = platforms.linux; diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 10280be3c30ef..f0d9fea5d0e68 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchpatch, - extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw + extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw, kdegraphics-mobipocket }: mkDerivation { @@ -10,5 +10,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive kio libkexiv2 libkdcraw ]; + buildInputs = [ karchive kio libkexiv2 libkdcraw kdegraphics-mobipocket ]; } diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index 42532644a1a6b..2baf991f2fb60 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -5,7 +5,7 @@ incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass, - kitinerary, kontactinterface + kitinerary, kontactinterface, kaddressbook, discount }: mkDerivation { @@ -20,6 +20,6 @@ mkDerivation { incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative kholidays ki18n kmime ktexteditor ktnef libgravatar libksieve mailcommon mailimporter messagelib poppler prison kpkpass - kitinerary kontactinterface + kitinerary kontactinterface kaddressbook discount ]; } diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 16ec7ccd213a3..5c64d8826f688 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, - kalarmcal, kcalutils, kcontacts, kdav, kidentitymanagement, + kholidays, kcalutils, kcontacts, kdav, kidentitymanagement, kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, pimcommon, libkgapi, libsecret, qca-qt5, qtkeychain, qtnetworkauth, qtspeech, qtwebengine, qtxmlpatterns, @@ -18,7 +18,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes - kalarmcal kcalutils kcontacts kdav kidentitymanagement kimap + kholidays kcalutils kcontacts kdav kidentitymanagement kimap kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine pimcommon libkgapi libsecret qca-qt5 qtkeychain qtnetworkauth qtspeech qtxmlpatterns diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix index 1590887575b71..3db757b497dd8 100644 --- a/pkgs/applications/kde/kgpg.nix +++ b/pkgs/applications/kde/kgpg.nix @@ -19,7 +19,7 @@ mkDerivation { ''; meta = { homepage = "https://apps.kde.org/kgpg/"; - description = "Encryption tool"; + description = "A KDE based interface for GnuPG, a powerful encryption utility"; license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/applications/kde/kmousetool.nix b/pkgs/applications/kde/kmousetool.nix new file mode 100644 index 0000000000000..fb4323455b795 --- /dev/null +++ b/pkgs/applications/kde/kmousetool.nix @@ -0,0 +1,35 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, ki18n +, kiconthemes +, knotifications +, kxmlgui +, kwindowsystem +, phonon +, libXtst +, libXt +}: + +mkDerivation { + pname = "kmousetool"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + ki18n + kiconthemes + knotifications + kxmlgui + kwindowsystem + phonon + libXtst + libXt + ]; + meta = { + homepage = "https://github.com/KDE/kmousetool"; + description = "Program that clicks the mouse for you"; + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = [ lib.maintainers.jayesh-bhoot ]; + }; +} + diff --git a/pkgs/applications/kde/picmi.nix b/pkgs/applications/kde/picmi.nix index 205f1bd5d12fa..30ee9fa84369d 100644 --- a/pkgs/applications/kde/picmi.nix +++ b/pkgs/applications/kde/picmi.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchpatch +{ mkDerivation, lib , libkdegames, extra-cmake-modules , kdeclarative, knewstuff }: @@ -16,16 +16,6 @@ mkDerivation { platforms = platforms.linux; }; - patches = [ - # fix compile error due to usage of deprecated things - # probably can be removed with the next kde bump - (fetchpatch { - url = "https://invent.kde.org/games/picmi/-/commit/99639fb499fe35eb463621efca1c0e4ff2a52bad.patch"; - revert = true; - sha256 = "sha256-rRhTvUB1Hpc3bLv9b5yIf/G7uJy2/OgBfXToZwV4jrg="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index dff5e883cb5e4..40153af70e830 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -16,11 +16,11 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets - kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit + kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpurpose kwallet kwindowsystem libkdepim qtwebengine ]; propagatedBuildInputs = [ - akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap + akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap kpimtextedit ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/graphics/skanpage/default.nix b/pkgs/applications/kde/skanpage.nix index 17a228808972f..d06ff7746bb9b 100644 --- a/pkgs/applications/graphics/skanpage/default.nix +++ b/pkgs/applications/kde/skanpage.nix @@ -6,16 +6,11 @@ , ktextwidgets , libksane , qtquickcontrols2 +, kpurpose }: mkDerivation rec { pname = "skanpage"; - version = "1.0.0"; - - src = fetchurl { - url = "mirror://kde/stable/skanpage/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-kPVAG64oPkKF3ztHB4V7M2xc1AcvwiHnYpMMLMQNYGA="; - }; nativeBuildInputs = [ extra-cmake-modules ]; @@ -24,13 +19,14 @@ mkDerivation rec { ktextwidgets libksane qtquickcontrols2 + kpurpose ]; meta = with lib; { description = "KDE utility to scan images and multi-page documents"; homepage = "https://apps.kde.org/skanpage"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ samuelgrf ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 3d5948c290dc8..2e5c70fb4c470 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1843 +4,1859 @@ { akonadi = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-21.12.3.tar.xz"; - sha256 = "026srxk7da20vfhbj7jh8aip3sylpm61czwblj3wxxps0vbxxs2g"; - name = "akonadi-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-22.04.0.tar.xz"; + sha256 = "1v4bpnd7335f6rf7sy7xv3pjgay28lf9cbhy6g63v1sv2vicrih7"; + name = "akonadi-22.04.0.tar.xz"; }; }; akonadi-calendar = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-calendar-21.12.3.tar.xz"; - sha256 = "0hzy6y9pxa06k0pp5yr84i0sv15qgzjn7nrlmsylm6iy7fspqqbq"; - name = "akonadi-calendar-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-calendar-22.04.0.tar.xz"; + sha256 = "0pnr2bzw7kl2mj88d75alzrsrwanrc28z7jbkmi2wqbw9jz0icy1"; + name = "akonadi-calendar-22.04.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-calendar-tools-21.12.3.tar.xz"; - sha256 = "1idh6kf8h9158rgw3b5lld7z9mvvif00jrvpz891cziblvr19p4a"; - name = "akonadi-calendar-tools-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-calendar-tools-22.04.0.tar.xz"; + sha256 = "1q727irnq0gi86ynp62wlmmd9zkpywcnfrazlv2zvp1gyfnlhira"; + name = "akonadi-calendar-tools-22.04.0.tar.xz"; }; }; akonadi-contacts = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-contacts-21.12.3.tar.xz"; - sha256 = "04ixj09s27q8pbmfrb1475bc0h84sb5ikfxzpc4i5b3whx40g9dm"; - name = "akonadi-contacts-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-contacts-22.04.0.tar.xz"; + sha256 = "0yl8rj4sbcd8nc2fjk2xgyp5mr6y39d2qdb3ig3aklkl5czbg2ml"; + name = "akonadi-contacts-22.04.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-import-wizard-21.12.3.tar.xz"; - sha256 = "1fbxx53zdcqp98mzdx45ccncppnxqfhc7j9qwwxcik0ygrmg9wcj"; - name = "akonadi-import-wizard-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-import-wizard-22.04.0.tar.xz"; + sha256 = "025sm93dm01msjlxsp8p364nqix9cpwy0zk86774w5lq0m7q3cmr"; + name = "akonadi-import-wizard-22.04.0.tar.xz"; }; }; akonadi-mime = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-mime-21.12.3.tar.xz"; - sha256 = "1bcrbf5z9175p206cvm5s6zq882nb32cf9akdcbnadqiibrpxkxv"; - name = "akonadi-mime-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-mime-22.04.0.tar.xz"; + sha256 = "0rr8zi8xczfbmy83ds7r3gv08s5cck5w3wyz3h42b96vr7wkxbri"; + name = "akonadi-mime-22.04.0.tar.xz"; }; }; akonadi-notes = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-notes-21.12.3.tar.xz"; - sha256 = "0xkcw9izgxfzglciig2i4wiz6iflzjg0d6dp1nq6p1kwxwc899sb"; - name = "akonadi-notes-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-notes-22.04.0.tar.xz"; + sha256 = "0w0d7m5q5n56772yhixdfzmijlvd5l490z59mhidvcxl72iz8ka1"; + name = "akonadi-notes-22.04.0.tar.xz"; }; }; akonadi-search = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadi-search-21.12.3.tar.xz"; - sha256 = "1id6zzjxc9zvpz1ryj2zn1yff5ak04r1mlk9cklbj99frzf0wv6p"; - name = "akonadi-search-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadi-search-22.04.0.tar.xz"; + sha256 = "1ra4vgmxghyi6j6v5nmw579ms4xiw4wcgqcm2gdq29cax7yaw5w2"; + name = "akonadi-search-22.04.0.tar.xz"; }; }; akonadiconsole = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akonadiconsole-21.12.3.tar.xz"; - sha256 = "1chb0ars9w05pq6ij2l8qfj1ac7pmzwg2mq1i4z8syhdklyryir1"; - name = "akonadiconsole-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akonadiconsole-22.04.0.tar.xz"; + sha256 = "10x3dg83fvsjvv652gi4c3zn6cq0c86j1p00aajxr4ailk72f3l0"; + name = "akonadiconsole-22.04.0.tar.xz"; }; }; akregator = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/akregator-21.12.3.tar.xz"; - sha256 = "1yy5c29zxpli4cddknmdvjkgii3j7pvw6lhwqfrqjc8jh83gm8f8"; - name = "akregator-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/akregator-22.04.0.tar.xz"; + sha256 = "12caw8ms5gzkda0ac8yx1swpsb0rqa01igqnfbn5l2z42mb511zi"; + name = "akregator-22.04.0.tar.xz"; }; }; analitza = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/analitza-21.12.3.tar.xz"; - sha256 = "0rgims4c80nficibg3lh764csh0kjsfnf7h303kyfd9yk59xa3in"; - name = "analitza-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/analitza-22.04.0.tar.xz"; + sha256 = "0npi7x9x9s24jdzqjkrycxvjxnn43hbak5mjzrmifx98k1k3caqc"; + name = "analitza-22.04.0.tar.xz"; }; }; ark = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ark-21.12.3.tar.xz"; - sha256 = "1p30bgnb3aw0f2jnaksz7jfqqcz45b2x3bjrri0w5w580204a5s8"; - name = "ark-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ark-22.04.0.tar.xz"; + sha256 = "1pjz0y0863daf4qcn9m1sf6z68a7f8asdald8vcgw0p2c5yln1yb"; + name = "ark-22.04.0.tar.xz"; }; }; artikulate = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/artikulate-21.12.3.tar.xz"; - sha256 = "0fbgmd3yfyv1pzz24874a0v7cl4yk6wlfryn8sn21smi054wqz6z"; - name = "artikulate-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/artikulate-22.04.0.tar.xz"; + sha256 = "0ly407s60q8mi6li3n84hcpcxzdw0a55v6wnvr5ibnw6g6xxd01q"; + name = "artikulate-22.04.0.tar.xz"; }; }; audiocd-kio = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/audiocd-kio-21.12.3.tar.xz"; - sha256 = "1alyn7w0v1by3fkb6xfnwj0hayjrrnmwnajnrnpvn8skbqsbzlgc"; - name = "audiocd-kio-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/audiocd-kio-22.04.0.tar.xz"; + sha256 = "103c1168g83jj6q4azyzc45766alci52r9y43p0068s3p57v94fr"; + name = "audiocd-kio-22.04.0.tar.xz"; }; }; baloo-widgets = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/baloo-widgets-21.12.3.tar.xz"; - sha256 = "0cfcfmsgbaxi53a3r0f013lskm5yll7zaxw98nlj6r8fsq2slrhv"; - name = "baloo-widgets-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/baloo-widgets-22.04.0.tar.xz"; + sha256 = "0ngiwlnjmk2arclf2kbs97vkmz0rn34daxv3s1vvbjc19mb0g9iq"; + name = "baloo-widgets-22.04.0.tar.xz"; }; }; blinken = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/blinken-21.12.3.tar.xz"; - sha256 = "1pbwb7q4p705k31kd62gira0x9qccjsn07d6h1w44wydc3lfdjnc"; - name = "blinken-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/blinken-22.04.0.tar.xz"; + sha256 = "18bbpp6n92i6fx6dk9s9cy3v9rnw8wnaiywamaal4xg2qk4dkj63"; + name = "blinken-22.04.0.tar.xz"; }; }; bomber = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/bomber-21.12.3.tar.xz"; - sha256 = "1mlxs2dbsycq7mw9g1hl2l17gl0z33mrry5r0zmz74i67nfijg8w"; - name = "bomber-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/bomber-22.04.0.tar.xz"; + sha256 = "13rnxc4dmgspcacslgw8ikzzha7la0591nsnfwf0kjnqskh13kyz"; + name = "bomber-22.04.0.tar.xz"; }; }; bovo = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/bovo-21.12.3.tar.xz"; - sha256 = "1jzvazqy5vcwkyhnbzw7sh8ngff5clclq98vbbhzd9dmnacirdbq"; - name = "bovo-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/bovo-22.04.0.tar.xz"; + sha256 = "0lv6zzsaan3wfj7l3gdc7ksh2lbhmkkaksgs20mrh2mhwd8xz0gn"; + name = "bovo-22.04.0.tar.xz"; }; }; calendarsupport = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/calendarsupport-21.12.3.tar.xz"; - sha256 = "0annni037cp1ga2lj2gkjxlkygnaxna4fs095lbaqp5zljz3g8vp"; - name = "calendarsupport-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/calendarsupport-22.04.0.tar.xz"; + sha256 = "0hnsrmwy3422azd13v70gkfaj02gwd7h1q568qhyaipdfbwb3sjl"; + name = "calendarsupport-22.04.0.tar.xz"; }; }; cantor = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/cantor-21.12.3.tar.xz"; - sha256 = "0v0xcgaz3rag044wmpiq8gs7pp6n7wcca0q1hzav7i651pgqjjks"; - name = "cantor-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/cantor-22.04.0.tar.xz"; + sha256 = "1rs7w6vzm8kir348j63jrhld888ivdl2i7vb27yh7lrdgiydlkmp"; + name = "cantor-22.04.0.tar.xz"; }; }; cervisia = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/cervisia-21.12.3.tar.xz"; - sha256 = "106x0xrscc6xvgijmqy892r1hrirjh32nj8lqhc7g7dzjaa7lhsj"; - name = "cervisia-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/cervisia-22.04.0.tar.xz"; + sha256 = "02dgvvqag96fr2dhz50pa6g4v2mn7msviqzg8ih6sr30hv6qa9v9"; + name = "cervisia-22.04.0.tar.xz"; }; }; dolphin = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/dolphin-21.12.3.tar.xz"; - sha256 = "0m5nqa8j0mcsrx9wxfcf8z39kxas51k03lschr721vm4x65j64jq"; - name = "dolphin-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/dolphin-22.04.0.tar.xz"; + sha256 = "007ilkgmg4wzqg1m0q9k8n60qf4jmln358jy1s443b5qsg8cvijq"; + name = "dolphin-22.04.0.tar.xz"; }; }; dolphin-plugins = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/dolphin-plugins-21.12.3.tar.xz"; - sha256 = "0rbz6fw98c71h10ry1xjc0pgzvphajmj18lnjm4hf7bbrizsmdb5"; - name = "dolphin-plugins-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/dolphin-plugins-22.04.0.tar.xz"; + sha256 = "0l41h8f21rnwx5a00mkr2dfkgp0wpgf5si2ygc725ryzr00jkl8w"; + name = "dolphin-plugins-22.04.0.tar.xz"; }; }; dragon = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/dragon-21.12.3.tar.xz"; - sha256 = "09iwwlbv4jmxs92dz20z9fqg1sfnqih54izz8459ibl8vydfgfp1"; - name = "dragon-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/dragon-22.04.0.tar.xz"; + sha256 = "0haavk3igyfw9c4q3jc972q9h6ziwazpzfwjr0658n68qmqyg4lh"; + name = "dragon-22.04.0.tar.xz"; }; }; elisa = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/elisa-21.12.3.tar.xz"; - sha256 = "0cg9v438fclqnv1rgx2k86mzfp5ggfcp7d5kr8xh4kjbmy17rzca"; - name = "elisa-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/elisa-22.04.0.tar.xz"; + sha256 = "0gm3llind6v6g4biy5mn7ks6pcr5vviasg1ksgvh51af5ah7kcxq"; + name = "elisa-22.04.0.tar.xz"; }; }; eventviews = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/eventviews-21.12.3.tar.xz"; - sha256 = "01x9ccwspn1dwkmcxcr8p6pazj6w31pxhx0bzlfr6bgpccicp2w2"; - name = "eventviews-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/eventviews-22.04.0.tar.xz"; + sha256 = "1b9lk3xnjky9k04jcad1w3iynd57c3jfjzlz798qhz8pfvbkwd39"; + name = "eventviews-22.04.0.tar.xz"; + }; + }; + falkon = { + version = "22.04.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/22.04.0/src/falkon-22.04.0.tar.xz"; + sha256 = "1vwgifx0g2ih23l0pvpfg46khyb69sa39mnvdap6hk0ayx6x4094"; + name = "falkon-22.04.0.tar.xz"; }; }; ffmpegthumbs = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ffmpegthumbs-21.12.3.tar.xz"; - sha256 = "0x2gpx30azkz61p3xj1nm7hckyrmyh0qhs29ah30z6a5xw7336ws"; - name = "ffmpegthumbs-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ffmpegthumbs-22.04.0.tar.xz"; + sha256 = "1gp13sn95wq487fxpj3z928ppjcc4mblpwp627s8s1d5d1pmvjmn"; + name = "ffmpegthumbs-22.04.0.tar.xz"; }; }; filelight = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/filelight-21.12.3.tar.xz"; - sha256 = "1w3q0l9p5ry2crwdzcyb1d4ms2y4gp3y0a3j5drpy8clmxn0gz18"; - name = "filelight-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/filelight-22.04.0.tar.xz"; + sha256 = "11z5wjl1f2a02vd6zvkiag65ysp8i4n6sdycam35r41jjx1sfks3"; + name = "filelight-22.04.0.tar.xz"; }; }; granatier = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/granatier-21.12.3.tar.xz"; - sha256 = "16yriharl66frglmdy6750nixczh0l4c19nnr6dav15m8qfb3g6b"; - name = "granatier-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/granatier-22.04.0.tar.xz"; + sha256 = "18bjz42bqg65k9ddyn5170fq1yngw92q1j0fr09q2bn3gxqh5654"; + name = "granatier-22.04.0.tar.xz"; }; }; grantlee-editor = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/grantlee-editor-21.12.3.tar.xz"; - sha256 = "00qy1ncgwylc995g051x5l679s16wjpcj7il62ck7d0j02rah0n2"; - name = "grantlee-editor-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/grantlee-editor-22.04.0.tar.xz"; + sha256 = "00ycnjh4dh4xqbf5nbmlqnmlzyv66shdhq2p5625x85bkdx7fvih"; + name = "grantlee-editor-22.04.0.tar.xz"; }; }; grantleetheme = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/grantleetheme-21.12.3.tar.xz"; - sha256 = "1w83slbkj2y1wk78srq2k95ybs66sb4mbaa0zm7fl9pkwhqxbnb7"; - name = "grantleetheme-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/grantleetheme-22.04.0.tar.xz"; + sha256 = "1ldx62lw20qj8k04vrm1p4sfr2bv9qxv5cp8g225iw8wwhhmzx2q"; + name = "grantleetheme-22.04.0.tar.xz"; }; }; gwenview = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/gwenview-21.12.3.tar.xz"; - sha256 = "0zbsyrwlwbc9zmdxcgk02dvcb0f8izhlcbbzqw8cgr4l2c90xl98"; - name = "gwenview-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/gwenview-22.04.0.tar.xz"; + sha256 = "01dbf8ij7wc2bxnjmd1a5ard0zv7sxqqzk36sn63hncci6b30s3k"; + name = "gwenview-22.04.0.tar.xz"; }; }; incidenceeditor = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/incidenceeditor-21.12.3.tar.xz"; - sha256 = "1sbflfggpqhwhg3iw46462z3p83sjhlx6f1fvgz251m020vqq9xa"; - name = "incidenceeditor-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/incidenceeditor-22.04.0.tar.xz"; + sha256 = "19p9jyp6ygisvzsvcbzcwly22kyhxvmw6wsjnm7jaw3iwbr6276i"; + name = "incidenceeditor-22.04.0.tar.xz"; }; }; itinerary = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/itinerary-21.12.3.tar.xz"; - sha256 = "0gvkhwnxichvpwrsb6wjiv5q80v8k2yqvgpvfdapxnd7sx6qp7fp"; - name = "itinerary-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/itinerary-22.04.0.tar.xz"; + sha256 = "0qa0rzm6anaiilmfiy714zvs6iy2h1mjjrc0f4n6qkfzmbzhls71"; + name = "itinerary-22.04.0.tar.xz"; }; }; juk = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/juk-21.12.3.tar.xz"; - sha256 = "1ipzx031996h83f9w3fzbx5vf5nnskq9kf71a6aypqckk65vcqcs"; - name = "juk-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/juk-22.04.0.tar.xz"; + sha256 = "05sj9pj032havlp68zk8x2mri3i56aw2j14pvk7xk31iipvly5yx"; + name = "juk-22.04.0.tar.xz"; }; }; k3b = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/k3b-21.12.3.tar.xz"; - sha256 = "0igqb6zw76j2hl9xclcwfny2831phdg9s2msa1y87zyc3c7g9nxc"; - name = "k3b-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/k3b-22.04.0.tar.xz"; + sha256 = "0135gck2fd4zghji2d6zk6nb8s8qa9pgf1v1ckmi8zygslgxfmjq"; + name = "k3b-22.04.0.tar.xz"; }; }; kaccounts-integration = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kaccounts-integration-21.12.3.tar.xz"; - sha256 = "13q4d7ln98vdpb6ryk49zakx5bysdnjxifi7cma10fgk9gcqqhpb"; - name = "kaccounts-integration-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kaccounts-integration-22.04.0.tar.xz"; + sha256 = "1f089p9i8wbldqy787iwir33ripkj9ac1p6wbgfr5knxqz0rfl9y"; + name = "kaccounts-integration-22.04.0.tar.xz"; }; }; kaccounts-providers = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kaccounts-providers-21.12.3.tar.xz"; - sha256 = "0kcyvpa0b872q7s4amagqcrzpl8cxlb91nwc9yg91wg56mmfv7m0"; - name = "kaccounts-providers-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kaccounts-providers-22.04.0.tar.xz"; + sha256 = "0d0fr8f3m1aj02mazcq8v4zy4jla4gd1f3xp06arwdr6zay5ayi9"; + name = "kaccounts-providers-22.04.0.tar.xz"; }; }; kaddressbook = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kaddressbook-21.12.3.tar.xz"; - sha256 = "1hzq0fdy99l1kqw14d582l0s56gvrw86abihib6k4az4c6g3c0md"; - name = "kaddressbook-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kaddressbook-22.04.0.tar.xz"; + sha256 = "0va36dsa8yy35zi4rkvwdvm5ga45nwwyyh366nhzymm4ni6fwlf0"; + name = "kaddressbook-22.04.0.tar.xz"; }; }; kajongg = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kajongg-21.12.3.tar.xz"; - sha256 = "1sffssfpzsd83ippkwpmqdx8rfh9cpd7i22nsv8asnaylylvy3zd"; - name = "kajongg-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kajongg-22.04.0.tar.xz"; + sha256 = "1k595k1vqd3fqw985193g7wf5pyl9d3ar4fwi79ai08xwk6rf4nm"; + name = "kajongg-22.04.0.tar.xz"; }; }; kalarm = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kalarm-21.12.3.tar.xz"; - sha256 = "1miwcxim46hiabp2rbs874np544ip4x5nl1dc62h9li9784a9k3i"; - name = "kalarm-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kalarm-22.04.0.tar.xz"; + sha256 = "150zj57bl528xyjs0lvdyr425q8da3l24xz1wn44w1w29i3i3m8q"; + name = "kalarm-22.04.0.tar.xz"; }; }; - kalarmcal = { - version = "21.12.3"; + kalendar = { + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kalarmcal-21.12.3.tar.xz"; - sha256 = "160pmr702b68hys9l02azvrv6pagy1r2whw0zp3jlf6863p9fkqr"; - name = "kalarmcal-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kalendar-22.04.0.tar.xz"; + sha256 = "0bma75va1nkyinmkjhm3bknrp880ngklz0c21rsgykmbb8sa0zvz"; + name = "kalendar-22.04.0.tar.xz"; }; }; kalgebra = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kalgebra-21.12.3.tar.xz"; - sha256 = "0870kdqha0nk2cm8hq8d9l2fqfw6hn0rx2qc9f9w8l4014rcn127"; - name = "kalgebra-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kalgebra-22.04.0.tar.xz"; + sha256 = "17mfjv3xbn02f9jzhpw2xd1rp6rvjqzksa3cqlwjjd06k3l1q414"; + name = "kalgebra-22.04.0.tar.xz"; }; }; kalzium = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kalzium-21.12.3.tar.xz"; - sha256 = "1qha1dh638ms785j1b73j19pj8y3c7v1n4jd1m93026a292m8jll"; - name = "kalzium-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kalzium-22.04.0.tar.xz"; + sha256 = "07glndlclws8kq3jkfsh4a12zh7ly2w4m2ws77mc4a8zsjc33hdv"; + name = "kalzium-22.04.0.tar.xz"; }; }; kamera = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kamera-21.12.3.tar.xz"; - sha256 = "1xwxmlnra9qdhvf1hhy04v72ar02pqxkg0l16a53809ilyss2wrm"; - name = "kamera-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kamera-22.04.0.tar.xz"; + sha256 = "06xfls262p8x7p8j04y6c59ssjcbq4f2aqiw381k5pyam81hhrah"; + name = "kamera-22.04.0.tar.xz"; }; }; kamoso = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kamoso-21.12.3.tar.xz"; - sha256 = "1q98f6ni4p19pk0svbfw4mbfwnc9i5p9csms2aj76mp2dn78xpib"; - name = "kamoso-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kamoso-22.04.0.tar.xz"; + sha256 = "01ghfjrl97x4kn9g7wlgwi9wmplwqgayxqma8ywhbaf2wafqbsgs"; + name = "kamoso-22.04.0.tar.xz"; }; }; kanagram = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kanagram-21.12.3.tar.xz"; - sha256 = "131flw9pjvin4w1m36qkwgzna3llvxp1vq0ynzwfnvhs49i3g5gc"; - name = "kanagram-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kanagram-22.04.0.tar.xz"; + sha256 = "0laa9vnrh7k8f2800gz64zxr8hx0qrgypg8jh3iccmg8v53b38lz"; + name = "kanagram-22.04.0.tar.xz"; }; }; kapman = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kapman-21.12.3.tar.xz"; - sha256 = "1974z7g3ylvf48xh3xhf3gr7iphgmj83ir9hss1a2ba0hpgg463k"; - name = "kapman-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kapman-22.04.0.tar.xz"; + sha256 = "0a5k1jdh9qrm5bdx3z1f97sa92i781d1myp7pjc7s0hvjxprz5wy"; + name = "kapman-22.04.0.tar.xz"; }; }; kapptemplate = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kapptemplate-21.12.3.tar.xz"; - sha256 = "16jgybcq3ixqwi7wli11ns7w4zdlj8rgw4chzsjcqxn6c0sqy8zq"; - name = "kapptemplate-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kapptemplate-22.04.0.tar.xz"; + sha256 = "0qbaa1ndqq7fk2azbj2rwlakg8amg572ji86vijf2f0fd26jbv2p"; + name = "kapptemplate-22.04.0.tar.xz"; }; }; kate = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kate-21.12.3.tar.xz"; - sha256 = "1pp0k00kvih0xkkv1q1gha4na2bwqc7dhyyrla7c2vvln8gi99dg"; - name = "kate-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kate-22.04.0.tar.xz"; + sha256 = "1jy87zliqh9j4r0xy5gd3q1zklphmyvbzdp6brqlda0kf4isv46a"; + name = "kate-22.04.0.tar.xz"; }; }; katomic = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/katomic-21.12.3.tar.xz"; - sha256 = "1y4mnvkd6ajk0m0j2xph5zbw3a14clm2sswc4y8c9r4ipk3hqsgh"; - name = "katomic-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/katomic-22.04.0.tar.xz"; + sha256 = "02s4v4clylf2wq7ifpb786m11vmvfrfj6wr6rszn77h116ckfs3j"; + name = "katomic-22.04.0.tar.xz"; }; }; kbackup = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kbackup-21.12.3.tar.xz"; - sha256 = "0r1cqkfzpdqpwv5pds8l0p7lxlwpv0mr7rjys1icsp8gl4hbpv60"; - name = "kbackup-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kbackup-22.04.0.tar.xz"; + sha256 = "122g4bn2cs4vyj30lf0nd603sibjdycwkiz5b9lh42kcnkjghs8l"; + name = "kbackup-22.04.0.tar.xz"; }; }; kblackbox = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kblackbox-21.12.3.tar.xz"; - sha256 = "10j8rnpr3gjaqspx4mxqj9cncqj6v2jn5rkldr46bv7yxgjb5rw3"; - name = "kblackbox-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kblackbox-22.04.0.tar.xz"; + sha256 = "08gjg0abp1c58m7b6xb99ynz8fkl537bcmz4iryyd3v7ibswdr91"; + name = "kblackbox-22.04.0.tar.xz"; }; }; kblocks = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kblocks-21.12.3.tar.xz"; - sha256 = "1n3jc96ws8078gk1il61dc96p3pzvj3z9brnwi274pk4cif63bli"; - name = "kblocks-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kblocks-22.04.0.tar.xz"; + sha256 = "18n9vy3xv1g4wafwiwnf5ghh3irrxlm1jxn19m322ajs8qk53qcg"; + name = "kblocks-22.04.0.tar.xz"; }; }; kbounce = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kbounce-21.12.3.tar.xz"; - sha256 = "1am4j11cjzlmav2zh5802kasy0kdcx78slycadnf96bmhxs8hvyv"; - name = "kbounce-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kbounce-22.04.0.tar.xz"; + sha256 = "0xk41pja2kxzrmrrza23xnfnxk9k4ag3xcjjp6c8hj6brzd6g9a9"; + name = "kbounce-22.04.0.tar.xz"; }; }; kbreakout = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kbreakout-21.12.3.tar.xz"; - sha256 = "0vqlxaggzvvrb439ybsvd5kr9j2jzpwk4xy3yni83y830h1mmhhc"; - name = "kbreakout-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kbreakout-22.04.0.tar.xz"; + sha256 = "0z8x0i5yh6hcn2b296mx05b0lm6wv4gkwk20g82ypzbwanj269pl"; + name = "kbreakout-22.04.0.tar.xz"; }; }; kbruch = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kbruch-21.12.3.tar.xz"; - sha256 = "1kcwbpa5lawkqqwn40r6d7savwvi7kkdgdxfxqxkviwnif2qkssx"; - name = "kbruch-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kbruch-22.04.0.tar.xz"; + sha256 = "1kpl9zk88sm4l17ndx25anlff6f1l13h4k4m39pryi5ywpsajjk9"; + name = "kbruch-22.04.0.tar.xz"; }; }; kcachegrind = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kcachegrind-21.12.3.tar.xz"; - sha256 = "1cssjywnhfbnsvly4mralpx3af2pqkmhg1jj2q3cjiqx44i3gkyx"; - name = "kcachegrind-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kcachegrind-22.04.0.tar.xz"; + sha256 = "03c9r0zwslsv6sb5i91bk59pzi0ia7pyssgdfr6f5b01vjjrxl5f"; + name = "kcachegrind-22.04.0.tar.xz"; }; }; kcalc = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kcalc-21.12.3.tar.xz"; - sha256 = "15yqzhrlzcix8wvgaah8wf12msylgzyqwk58f58k5agxh97ahv4q"; - name = "kcalc-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kcalc-22.04.0.tar.xz"; + sha256 = "1gg7wqm1vb22pa1a791sdvg1pf4l6pnzq1wsvxa8ih6dkdplcmrg"; + name = "kcalc-22.04.0.tar.xz"; }; }; kcalutils = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kcalutils-21.12.3.tar.xz"; - sha256 = "006sfkjzyid8byl2mmyn1is4nra9wjqh21ksd5g1kv948hf1jdcs"; - name = "kcalutils-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kcalutils-22.04.0.tar.xz"; + sha256 = "0wn9mc4myi8mj9qc3lmswqj9y3lfgfpxg0vdzxsa0ai8i3g3g0j7"; + name = "kcalutils-22.04.0.tar.xz"; }; }; kcharselect = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kcharselect-21.12.3.tar.xz"; - sha256 = "1aaiz9f9y2fmf284617pfnncgxjjjyfvdv08h900sc0bdlfmh4y7"; - name = "kcharselect-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kcharselect-22.04.0.tar.xz"; + sha256 = "1av1w906cy2dcdn0k7xjc1s897bgm9f8b79k97pk6x5f3rfnvy71"; + name = "kcharselect-22.04.0.tar.xz"; }; }; kcolorchooser = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kcolorchooser-21.12.3.tar.xz"; - sha256 = "0jnnbwaj9xb0ifcc95xay8yc4bx9f29wqkj3h4kffzdlwvw3vp7s"; - name = "kcolorchooser-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kcolorchooser-22.04.0.tar.xz"; + sha256 = "0cn5zgrsf3xji7y5ipa9zv5njyx94rg617d6l0qxjh4n94x2d4yj"; + name = "kcolorchooser-22.04.0.tar.xz"; }; }; kcron = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kcron-21.12.3.tar.xz"; - sha256 = "0ffc71inp1kyd4xh39x6vbfggz0kpipd6r6vabfn187lpnpwcmpm"; - name = "kcron-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kcron-22.04.0.tar.xz"; + sha256 = "0j067izv16646hjaw5swnxyf4gbg1gz5wxjcnrvscfv3hryf9b6q"; + name = "kcron-22.04.0.tar.xz"; }; }; kde-dev-scripts = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kde-dev-scripts-21.12.3.tar.xz"; - sha256 = "04w4kk7vpfkjj2fzylmq590kk7xskw3a0id3wndw8066pfafsfg3"; - name = "kde-dev-scripts-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kde-dev-scripts-22.04.0.tar.xz"; + sha256 = "0a7vsdizayl53dadcs3aiki8pl2wmibn9rjink97jl20pj8m22dx"; + name = "kde-dev-scripts-22.04.0.tar.xz"; }; }; kde-dev-utils = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kde-dev-utils-21.12.3.tar.xz"; - sha256 = "1jdqv5zdigwazh3m580rmnylr6h6a6l5g2cpxy54v9sdvh3qb1yr"; - name = "kde-dev-utils-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kde-dev-utils-22.04.0.tar.xz"; + sha256 = "12ci9aw82hb6z651r1jsgrkc5ywq6dcas8j12gbxllcd0033pfkp"; + name = "kde-dev-utils-22.04.0.tar.xz"; }; }; kdebugsettings = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdebugsettings-21.12.3.tar.xz"; - sha256 = "19ng7hvqpyh3kh0pahrknh89c113mqx1kxjq4r26xbww1ypkz8zq"; - name = "kdebugsettings-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdebugsettings-22.04.0.tar.xz"; + sha256 = "1jh3syvy0k611jmk615ba74zl62l5nw9fhb8y8mk6mgw23i16c21"; + name = "kdebugsettings-22.04.0.tar.xz"; }; }; kdeconnect-kde = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdeconnect-kde-21.12.3.tar.xz"; - sha256 = "1n9km7czif19cvrsdfcjbb02i1xgpa1z4ycn20d3g8azmli4zj4g"; - name = "kdeconnect-kde-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdeconnect-kde-22.04.0.tar.xz"; + sha256 = "17zza0s5lnk8rvklv4hpl877jviwv8q6y5zp7an4h12lqni3f8cv"; + name = "kdeconnect-kde-22.04.0.tar.xz"; }; }; kdeedu-data = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdeedu-data-21.12.3.tar.xz"; - sha256 = "11mxxcca6jxz4qcmba12p6xbv845xa16b8ag529409f3276w4915"; - name = "kdeedu-data-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdeedu-data-22.04.0.tar.xz"; + sha256 = "025qmwsm9h957sfa230ah2kgdsj8gs09p0nb7xpvs6wr8fhfwn1l"; + name = "kdeedu-data-22.04.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdegraphics-mobipocket-21.12.3.tar.xz"; - sha256 = "091ix343p9vs4iyj8abq6mw9lbm1fx5167gykhm4g8bjk5vdri2q"; - name = "kdegraphics-mobipocket-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdegraphics-mobipocket-22.04.0.tar.xz"; + sha256 = "0jinblf52nkr4jgr53szqz1l9dx9xgnwrilvzvdz2yfkyv70yr1k"; + name = "kdegraphics-mobipocket-22.04.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdegraphics-thumbnailers-21.12.3.tar.xz"; - sha256 = "0shdrl6n1724i8jrkmy8z6ayhflg93401jia87mcc1apaw9s8y83"; - name = "kdegraphics-thumbnailers-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdegraphics-thumbnailers-22.04.0.tar.xz"; + sha256 = "1ywdd0dfcsssnwp5x450bhwjwjgkbhqdckk0mnf2zmw8rrspkcii"; + name = "kdegraphics-thumbnailers-22.04.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdenetwork-filesharing-21.12.3.tar.xz"; - sha256 = "1y6sa22j2165j3x6ql1cfm30vv9ifb94mczbqbcjzmhqsypp5pw2"; - name = "kdenetwork-filesharing-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdenetwork-filesharing-22.04.0.tar.xz"; + sha256 = "1njjfvc5wlmdl3gsdv3ms4cx0z1dahnabjjn3hkls91ipd0gbgfl"; + name = "kdenetwork-filesharing-22.04.0.tar.xz"; }; }; kdenlive = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdenlive-21.12.3.tar.xz"; - sha256 = "1hamdi2v3rx5zjmvpx1bximdppmzgsk9gbjxwgr691lkybkgx8vs"; - name = "kdenlive-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdenlive-22.04.0.tar.xz"; + sha256 = "0ybd5ixjrsldsz3fr1y1phnns4lvklzcrr0mv9gg1xic38ppn536"; + name = "kdenlive-22.04.0.tar.xz"; }; }; kdepim-addons = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdepim-addons-21.12.3.tar.xz"; - sha256 = "1pv780z29ccx05z12l2w5zdmby9d1q993jr0cyzvpapnmck9146h"; - name = "kdepim-addons-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdepim-addons-22.04.0.tar.xz"; + sha256 = "0x4ja60ywrhp7qjhpb8iakhz39kxpi98iwnsfvd6drrmm1291ql1"; + name = "kdepim-addons-22.04.0.tar.xz"; }; }; kdepim-runtime = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdepim-runtime-21.12.3.tar.xz"; - sha256 = "1ahrnnc9vn0556s4nrsjgc9vbf5rb6yby7fn33p3jjnpgja0mc7m"; - name = "kdepim-runtime-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdepim-runtime-22.04.0.tar.xz"; + sha256 = "1ra39060yr8nplr855sjgwfp874vi8g76k6iyi1wh9fsxvsrnbj2"; + name = "kdepim-runtime-22.04.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdesdk-kioslaves-21.12.3.tar.xz"; - sha256 = "1nhsvx5pznm3adf0scrcqqb2ibl52a241ki2gbwvxk2qpwwwx6jd"; - name = "kdesdk-kioslaves-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdesdk-kioslaves-22.04.0.tar.xz"; + sha256 = "1055gdimlaxklf93670134sf3js220wg4iv074bx3022dbvirws5"; + name = "kdesdk-kioslaves-22.04.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdesdk-thumbnailers-21.12.3.tar.xz"; - sha256 = "0337rhgil42wychi5anq2v61xq8mbcvma4gb50smapcrjfl7fkdy"; - name = "kdesdk-thumbnailers-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdesdk-thumbnailers-22.04.0.tar.xz"; + sha256 = "1nk0asq2ff267jvb44v7j9lpnnzrmq21fmwh2wvbiwb4mibnwh44"; + name = "kdesdk-thumbnailers-22.04.0.tar.xz"; }; }; kdev-php = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdev-php-21.12.3.tar.xz"; - sha256 = "0z5iqgsh7w0hw0pw2522zlh5sd88zlplrxm3vjp3yvmza65471aa"; - name = "kdev-php-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdev-php-22.04.0.tar.xz"; + sha256 = "00jmyrbnzar1afalx7byb3jbjqa0w0fa8aq669j6h3j52vsnr15y"; + name = "kdev-php-22.04.0.tar.xz"; }; }; kdev-python = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdev-python-21.12.3.tar.xz"; - sha256 = "1iyg1cfldf5mk62anw8schiw3ii0gp20qwg6ljk1r9hv583iwrq6"; - name = "kdev-python-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdev-python-22.04.0.tar.xz"; + sha256 = "1p28lld358c1wyqqb50v8bh6y5k3wzbkryhyhbspr40a1ym2gr8i"; + name = "kdev-python-22.04.0.tar.xz"; }; }; kdevelop = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdevelop-21.12.3.tar.xz"; - sha256 = "1shp8zlxr7iyysn1c8d3fp6rg6g2krj2v3zw5apalxcnal16bww6"; - name = "kdevelop-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdevelop-22.04.0.tar.xz"; + sha256 = "05jamqizsbfx5bj3p5d4s4320xps8nr3lq2gv22mqiv7mcl1hymb"; + name = "kdevelop-22.04.0.tar.xz"; }; }; kdf = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdf-21.12.3.tar.xz"; - sha256 = "179ygy4kxkapfyxqj8h5xlvp1160vd72af34vd0a4r5az7wfd1m7"; - name = "kdf-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdf-22.04.0.tar.xz"; + sha256 = "1xy0pm7sggcwf5mf0n9514n7skbaz9w1kwahgd135s7cxw3wd9aw"; + name = "kdf-22.04.0.tar.xz"; }; }; kdialog = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdialog-21.12.3.tar.xz"; - sha256 = "04d1dqc5f02s867lllx1ix0nc55xw9hrpg7jxiy3v4c8vlzg0w53"; - name = "kdialog-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdialog-22.04.0.tar.xz"; + sha256 = "1285jdcv2bbnq3292qx08i5bashvjj2vdx325nlfi1vbaydlfixc"; + name = "kdialog-22.04.0.tar.xz"; }; }; kdiamond = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kdiamond-21.12.3.tar.xz"; - sha256 = "1d3c4pckddnri9i19g2pi2ygpqakllrgy6azgvnh5hn20kgsw7d9"; - name = "kdiamond-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kdiamond-22.04.0.tar.xz"; + sha256 = "1qvjrklq2vdbq26k531ddwgjjfgnj77qc9c84c7x4bjyv3j2jhry"; + name = "kdiamond-22.04.0.tar.xz"; }; }; keditbookmarks = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/keditbookmarks-21.12.3.tar.xz"; - sha256 = "0wfb7j1lhhdfw2x03p692mglmy9i9qys8mn4f3gxlb5imrd2hmnk"; - name = "keditbookmarks-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/keditbookmarks-22.04.0.tar.xz"; + sha256 = "09vkp0ingzf8naa7d5hvsj7nxab5z4ci1nh12jn9ri6f1bvapnnn"; + name = "keditbookmarks-22.04.0.tar.xz"; }; }; kfind = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kfind-21.12.3.tar.xz"; - sha256 = "1v1yxsbmzv4q5m5rbvl9n095d9fq0b1zphnl6vrzff5r8i53pzx0"; - name = "kfind-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kfind-22.04.0.tar.xz"; + sha256 = "0db9iclzq89ykb9lw90wycb1057qrys02sv6z71kzyv4pv8clcsi"; + name = "kfind-22.04.0.tar.xz"; }; }; kfloppy = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kfloppy-21.12.3.tar.xz"; - sha256 = "1phkigxd6bkwlcjrsfhlhn44ra9imfq0flcvp4vmza6c9ylsx6m8"; - name = "kfloppy-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kfloppy-22.04.0.tar.xz"; + sha256 = "07vixy0fdvvvjwchci77a32lz2bam02smnyvl5jx446gxra3kbxd"; + name = "kfloppy-22.04.0.tar.xz"; }; }; kfourinline = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kfourinline-21.12.3.tar.xz"; - sha256 = "0rb5jcmmf19bidwywj56dn0wfrnrfi5kc75c20d7mxnlgygfdnkg"; - name = "kfourinline-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kfourinline-22.04.0.tar.xz"; + sha256 = "1kvpilvsfb4zz59jmz8qk688xf9j4v8xijahxnsfrx3a216nd5wx"; + name = "kfourinline-22.04.0.tar.xz"; }; }; kgeography = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kgeography-21.12.3.tar.xz"; - sha256 = "1s1xyfffqkhmf4n74a4ksjz62rdiyl1fk1v57s9gnr6qw71wqql0"; - name = "kgeography-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kgeography-22.04.0.tar.xz"; + sha256 = "1f75av03iw1glsxar6ipbch2xvb9if59r3h85ndkpd7f8azdmam5"; + name = "kgeography-22.04.0.tar.xz"; }; }; kget = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kget-21.12.3.tar.xz"; - sha256 = "1w249gvzz47ac7n1mnxxf20d9l7jmbh18m5dijy55ck61s4zcq4l"; - name = "kget-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kget-22.04.0.tar.xz"; + sha256 = "01s73qb2658hryq639yiqjl696z6k4c6m7vmm0x9iglacl0qihdd"; + name = "kget-22.04.0.tar.xz"; }; }; kgoldrunner = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kgoldrunner-21.12.3.tar.xz"; - sha256 = "0gzz58407zjmk311kyyj5l2c1ciczcq9i8ckpwbd341dvwaww27q"; - name = "kgoldrunner-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kgoldrunner-22.04.0.tar.xz"; + sha256 = "1d6z2fslxpjdnixh372p78zk1apavnn9pvhdhnz9isq1yyvbwabx"; + name = "kgoldrunner-22.04.0.tar.xz"; }; }; kgpg = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kgpg-21.12.3.tar.xz"; - sha256 = "1mzq3g4xwg459k0mp9xvg8bhilizadbh4gck1764wq69bxlcyav3"; - name = "kgpg-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kgpg-22.04.0.tar.xz"; + sha256 = "0g78r1lya4vv09yiq9jmhcy4d3824n70ps71x1z6dvrpf6fnri49"; + name = "kgpg-22.04.0.tar.xz"; }; }; khangman = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/khangman-21.12.3.tar.xz"; - sha256 = "000vn11pp4hwfh2689rmnwrrssrmrhx5569k02h4ynswkiykvbv6"; - name = "khangman-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/khangman-22.04.0.tar.xz"; + sha256 = "0dl4rdifgxbxcxslnjcgl8ni3fw30zkp90mzdrp4hbg1rql8pav9"; + name = "khangman-22.04.0.tar.xz"; }; }; khelpcenter = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/khelpcenter-21.12.3.tar.xz"; - sha256 = "1fj1c57bqs009rx9db4ifvfmhhl4b35r5sfly3wvbfr4dapjqfqr"; - name = "khelpcenter-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/khelpcenter-22.04.0.tar.xz"; + sha256 = "1nfa9q688l151196mbfdn5i7k2x2a5sz1kn07j8flxhwpkcbyrgm"; + name = "khelpcenter-22.04.0.tar.xz"; }; }; kidentitymanagement = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kidentitymanagement-21.12.3.tar.xz"; - sha256 = "18xwvlmqhih5jmig2mj3a6mc5awlxdv8f81da6cgm123imhrirk4"; - name = "kidentitymanagement-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kidentitymanagement-22.04.0.tar.xz"; + sha256 = "1xw5q12la5p34lg8pwndx4pnr1cf5pv36611209v2qcfwjfk5570"; + name = "kidentitymanagement-22.04.0.tar.xz"; }; }; kig = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kig-21.12.3.tar.xz"; - sha256 = "0rl0z1djsf9ha0q94v0cnj5qm4ij6yjsil2s57r3v666h64yradn"; - name = "kig-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kig-22.04.0.tar.xz"; + sha256 = "0rbrvkflm0199vz4zpqs08dqzsrqw7r8xzgr034s9g7hwf0f5nbd"; + name = "kig-22.04.0.tar.xz"; }; }; kigo = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kigo-21.12.3.tar.xz"; - sha256 = "14pp73b9mbf0ny75b90vs7z9l61m7zp8cll7hl4bplqh1kig1szf"; - name = "kigo-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kigo-22.04.0.tar.xz"; + sha256 = "0whiza2xqzi33ppaz1d72aicg53f1zmwg47drg1s42sx5rj7jmpg"; + name = "kigo-22.04.0.tar.xz"; }; }; killbots = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/killbots-21.12.3.tar.xz"; - sha256 = "1ncr55xq04vrx6bss1ahk86c3l9ckhv4zjbc6gq4krhjw0lkdfiv"; - name = "killbots-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/killbots-22.04.0.tar.xz"; + sha256 = "0aaip213gc6ngan122r2rm7mc794mlir3qx1krhsg6gh8i1qvj91"; + name = "killbots-22.04.0.tar.xz"; }; }; kimagemapeditor = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kimagemapeditor-21.12.3.tar.xz"; - sha256 = "0qdmyrlf0jp3737p7x31wk428676xv77lx0mgyd9h2hdl0ipnbvr"; - name = "kimagemapeditor-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kimagemapeditor-22.04.0.tar.xz"; + sha256 = "0yh7sb5pk31q1pksb74yg94mrf752baj767gq0kgmp6ymmw83i6x"; + name = "kimagemapeditor-22.04.0.tar.xz"; }; }; kimap = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kimap-21.12.3.tar.xz"; - sha256 = "11jd9zkvflfh3gqs36fhj8mla3k44xf7zdb0z4nl9sk5nhhgm5px"; - name = "kimap-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kimap-22.04.0.tar.xz"; + sha256 = "12n0fjqh9mpwdii3gkvfvg33b6lzdrl2n3v94j29hq4nk8k1y8gf"; + name = "kimap-22.04.0.tar.xz"; }; }; kio-extras = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kio-extras-21.12.3.tar.xz"; - sha256 = "11zpnjdri7z4sz6zx26d9iv52aj4vf5lr9c114gg4pvz2l4h4h5i"; - name = "kio-extras-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kio-extras-22.04.0.tar.xz"; + sha256 = "1ikjhimw12c9kvq15zjwxvmrd4mfx66dxl9scfvkh6pvw8l9hy76"; + name = "kio-extras-22.04.0.tar.xz"; }; }; kio-gdrive = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kio-gdrive-21.12.3.tar.xz"; - sha256 = "0bm3c7g6q7z2ydnha2x5c456x9wlgachi9453mlrd2zcsc7c5h87"; - name = "kio-gdrive-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kio-gdrive-22.04.0.tar.xz"; + sha256 = "1v445kclcdnb6ajjrjmkqzvr5f84n7qx79cxikrd21zphym0p4cz"; + name = "kio-gdrive-22.04.0.tar.xz"; }; }; kipi-plugins = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kipi-plugins-21.12.3.tar.xz"; - sha256 = "1h6107d2a6jcyjsd191cg2ykgwm580j7wr0blg328ff6wwk1aizy"; - name = "kipi-plugins-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kipi-plugins-22.04.0.tar.xz"; + sha256 = "0cxn6h5vglip14ydap0wnnwm5y33x9lha4r05kwyjlvi754dx4qs"; + name = "kipi-plugins-22.04.0.tar.xz"; }; }; kirigami-gallery = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kirigami-gallery-21.12.3.tar.xz"; - sha256 = "0pjd9bq965v9x433p8rbhd7w3fj0808qd7x4c11ziyhy4cg9gwml"; - name = "kirigami-gallery-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kirigami-gallery-22.04.0.tar.xz"; + sha256 = "1ggg4ak997ax03zaspx09z0jxh0lf10sm5hh262p1v96xnlc7kz3"; + name = "kirigami-gallery-22.04.0.tar.xz"; }; }; kiriki = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kiriki-21.12.3.tar.xz"; - sha256 = "0qbm0zjjqnbcdm39zi8h240nblpa1pa7g1ls9mghzbqrdrh7n3a0"; - name = "kiriki-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kiriki-22.04.0.tar.xz"; + sha256 = "041xiw7s7r94115wvlnzk1443af9gb06scsvbqj92hdc9a2p6318"; + name = "kiriki-22.04.0.tar.xz"; }; }; kiten = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kiten-21.12.3.tar.xz"; - sha256 = "0z0haqxxkh7m2510b5qfwbx8s45vcahbk503jp1x0bwz03mrwflw"; - name = "kiten-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kiten-22.04.0.tar.xz"; + sha256 = "0n19a4ch2rgzq7s2f6dnhgbcqdi22xqd8vhy5hnbw4mw4xa9f6xm"; + name = "kiten-22.04.0.tar.xz"; }; }; kitinerary = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kitinerary-21.12.3.tar.xz"; - sha256 = "0kccrjiyib2zljr6rnc89y29jgi8cnhwfh1yq8psyzmca2n8lpxi"; - name = "kitinerary-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kitinerary-22.04.0.tar.xz"; + sha256 = "1q2dwdycajab3w7w4898s3s2jcy541qgsandfzi7yapplw238gm7"; + name = "kitinerary-22.04.0.tar.xz"; }; }; kjumpingcube = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kjumpingcube-21.12.3.tar.xz"; - sha256 = "1wlk6my6pawmdv3zgcpnyyzpjwz0wii0h8i1z0gxhbpg9nc8iy1r"; - name = "kjumpingcube-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kjumpingcube-22.04.0.tar.xz"; + sha256 = "1q8wnyympajijzsnddrf21pzwshbvkj4r5diydgavd23zgspfkp3"; + name = "kjumpingcube-22.04.0.tar.xz"; }; }; kldap = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kldap-21.12.3.tar.xz"; - sha256 = "13llsfhx9lfvhf90a3vmpkyh02fjg5sp4fmrwrqyx9hjrbmy1g0a"; - name = "kldap-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kldap-22.04.0.tar.xz"; + sha256 = "1z6kmkryc9sz3g0hf0dh7plmv59w03rzxyrnacrc94bjkbf56y1i"; + name = "kldap-22.04.0.tar.xz"; }; }; kleopatra = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kleopatra-21.12.3.tar.xz"; - sha256 = "10f61m0qrs0qipn94jd32gibyj8pcvprs8j7gmac0mym0b3djjls"; - name = "kleopatra-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kleopatra-22.04.0.tar.xz"; + sha256 = "0aaz3mwyyr2i8lbkrfz9hbz8358bqhf2zzxla1i9p177cfrdv60i"; + name = "kleopatra-22.04.0.tar.xz"; }; }; klettres = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/klettres-21.12.3.tar.xz"; - sha256 = "0l4zgfqd6l2bk67s2a0zldbcy8v7nwbv7yahvnyw4jf4jyv9q9rv"; - name = "klettres-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/klettres-22.04.0.tar.xz"; + sha256 = "1ih7q2rd6ajky719dikyfhy03dyw4x4bm9032l8vd51rv9zcjbp3"; + name = "klettres-22.04.0.tar.xz"; }; }; klickety = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/klickety-21.12.3.tar.xz"; - sha256 = "03liv3fax764ngfkwp3ga96irn8qb509b08ljnhz5aw5v9yrssnk"; - name = "klickety-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/klickety-22.04.0.tar.xz"; + sha256 = "1fl76vj1qrlp8giy6ing3qnm76i4scx0q5sn7dflwix5cjvsjyss"; + name = "klickety-22.04.0.tar.xz"; }; }; klines = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/klines-21.12.3.tar.xz"; - sha256 = "1ypi64wdsw1zsj03wcxj02v27y1by113v89as8dyk9wr0pfmbpqf"; - name = "klines-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/klines-22.04.0.tar.xz"; + sha256 = "0s7vqsg5lh7znxij0fygawww8fhga3rn0dv5k147jbvrzhfn01yn"; + name = "klines-22.04.0.tar.xz"; }; }; kmag = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmag-21.12.3.tar.xz"; - sha256 = "067x65gmip89rdgii2nwnxn7zi96cf7vfbhqzg0499pd2d69p3sl"; - name = "kmag-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmag-22.04.0.tar.xz"; + sha256 = "1bwp7psf2vdl7q0s8ymji9zhmrfp6vxilwmf9cw1bhl0wjislnp6"; + name = "kmag-22.04.0.tar.xz"; }; }; kmahjongg = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmahjongg-21.12.3.tar.xz"; - sha256 = "02yvvpwkk5gbj445zv5xhfragk8220rlx0pkxf32pj0jsv7dnz1x"; - name = "kmahjongg-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmahjongg-22.04.0.tar.xz"; + sha256 = "1hs0pv8bvxbk8c4ag7kbmylddh0wqzzi953xggpi86fzinpgzmq9"; + name = "kmahjongg-22.04.0.tar.xz"; }; }; kmail = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmail-21.12.3.tar.xz"; - sha256 = "1knh6cf72hidc6jyiw250b708b410fla0c5w83zaavmwv37ah8z0"; - name = "kmail-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmail-22.04.0.tar.xz"; + sha256 = "1rp65m1y4rynzxc0497d4kbppqj9gz5r1kd769msq01v72if7xvr"; + name = "kmail-22.04.0.tar.xz"; }; }; kmail-account-wizard = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmail-account-wizard-21.12.3.tar.xz"; - sha256 = "0ar2rm6viissfipbak07fxivrgqgsdfilsprsqmvab44inw2g4pg"; - name = "kmail-account-wizard-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmail-account-wizard-22.04.0.tar.xz"; + sha256 = "0pvbq8x16m08v3fdmd7gjnsh5p7c77fgz1f0d11hkbnpza9x72d7"; + name = "kmail-account-wizard-22.04.0.tar.xz"; }; }; kmailtransport = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmailtransport-21.12.3.tar.xz"; - sha256 = "0l3pgs781a6is937i0bkz9ykr40l36rwlrirsr4g8wh0gkc3ifi6"; - name = "kmailtransport-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmailtransport-22.04.0.tar.xz"; + sha256 = "1bglr299xn5z65zl49kp6ahcf229aga5fwn6ij2bv3cm9xa4f6iv"; + name = "kmailtransport-22.04.0.tar.xz"; }; }; kmbox = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmbox-21.12.3.tar.xz"; - sha256 = "04cl2khj3a7n81nlmxsg8kgszrl22qm6s2kvbrhz39yfzi31cwqr"; - name = "kmbox-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmbox-22.04.0.tar.xz"; + sha256 = "1ysjjz8v338l8n47dxg5jskbilsybwx6vd3lmlajw5iqfwpjk6k1"; + name = "kmbox-22.04.0.tar.xz"; }; }; kmime = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmime-21.12.3.tar.xz"; - sha256 = "03s7l4lywdvp97h4qjgq06qqcclvnhy83qsrfzv0w2wcl631nnpw"; - name = "kmime-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmime-22.04.0.tar.xz"; + sha256 = "0h9dsw3jl2jpfsb19yh4v8rzjd930xbglgzasl87f0f2nawkmdik"; + name = "kmime-22.04.0.tar.xz"; }; }; kmines = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmines-21.12.3.tar.xz"; - sha256 = "1wxy0cyz733wvnxfjhirqf41wnda4f6aqdiqmb5r1ngzzllgbglc"; - name = "kmines-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmines-22.04.0.tar.xz"; + sha256 = "1dzfi9r2zrn0rn96l42g12srqgmz8gkw6glyjadzay1mkhin7zp4"; + name = "kmines-22.04.0.tar.xz"; }; }; kmix = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmix-21.12.3.tar.xz"; - sha256 = "1zk2xljis1pv3m4vs5zr6wza6iv5y6wmh1csx3rn8ylfkrpk7h8k"; - name = "kmix-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmix-22.04.0.tar.xz"; + sha256 = "0yjykslaynf6vcv33s3hwm2s03acp2k97dljmq8dwgq3nwyaah9z"; + name = "kmix-22.04.0.tar.xz"; }; }; kmousetool = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmousetool-21.12.3.tar.xz"; - sha256 = "013qr1md3gbin7hcahnv14y9i2cg35r433s2w81fvgcakd38qvkj"; - name = "kmousetool-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmousetool-22.04.0.tar.xz"; + sha256 = "0a0gcq0295x3ckdhxv77lnvv8yms04xg5pkza5612k3zr386f0b5"; + name = "kmousetool-22.04.0.tar.xz"; }; }; kmouth = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmouth-21.12.3.tar.xz"; - sha256 = "0xvkp2pm2szbgzdsfmwrykma8npmlwmx2pb1iakbx3x1wyyjsbim"; - name = "kmouth-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmouth-22.04.0.tar.xz"; + sha256 = "05v0frgl6im5yv6ah8qsrgqcrjziiycnnnqq2z859psxnysvmsiz"; + name = "kmouth-22.04.0.tar.xz"; }; }; kmplot = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kmplot-21.12.3.tar.xz"; - sha256 = "1vmrzfcdyaxgvyp9la2gvy3h5fhksmn24lsnrpvr6alj880mh8bq"; - name = "kmplot-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kmplot-22.04.0.tar.xz"; + sha256 = "063bxm619jkd63jv70a4g6bj2q4fcg5a7lxjkwas9qm1qhlz2vzy"; + name = "kmplot-22.04.0.tar.xz"; }; }; knavalbattle = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/knavalbattle-21.12.3.tar.xz"; - sha256 = "1mpj1783za6b7a7cjawy4v0z24dvcd34gdb25qch4gi9cx1lc28z"; - name = "knavalbattle-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/knavalbattle-22.04.0.tar.xz"; + sha256 = "1hdgmjvsv7skck64w4j4sxyq7b8c7f5i2vcvkfbqxrrzf3wcq649"; + name = "knavalbattle-22.04.0.tar.xz"; }; }; knetwalk = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/knetwalk-21.12.3.tar.xz"; - sha256 = "0ahms3imvkdknp1z2h6j42k9g1i20ygd2633icjv37d2cbij128m"; - name = "knetwalk-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/knetwalk-22.04.0.tar.xz"; + sha256 = "0ws9sgn3ygl4012irkjk82j7b08cbhpq7ca7sncw9il7lfxbis6l"; + name = "knetwalk-22.04.0.tar.xz"; }; }; knights = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/knights-21.12.3.tar.xz"; - sha256 = "1m2big16rdw3w347m5vi0qhypnb2rgz6804kkxs7ln0yx658y4x4"; - name = "knights-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/knights-22.04.0.tar.xz"; + sha256 = "0dfxk811f9yjklfr01djppms86fqj3112cfh41z2zwsl4wgbyrma"; + name = "knights-22.04.0.tar.xz"; }; }; knotes = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/knotes-21.12.3.tar.xz"; - sha256 = "07pj0aqwsy1xi5mx7x0h3zmxfg0n4afgjax9a9ihc553xs6k48d7"; - name = "knotes-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/knotes-22.04.0.tar.xz"; + sha256 = "023rv1cvy2ykpv9p0862csixxn65fkhis8jjf9vmdq33j7mmflsm"; + name = "knotes-22.04.0.tar.xz"; }; }; kolf = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kolf-21.12.3.tar.xz"; - sha256 = "00dhjy82d9964z94nn4vkkwynql3bfa6djwrgsq93f9d7grgkd7g"; - name = "kolf-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kolf-22.04.0.tar.xz"; + sha256 = "0i3j9wbhjgxd1j58brjnbyb7862h6iz8kvb6vnnqwgzybwy09n88"; + name = "kolf-22.04.0.tar.xz"; }; }; kollision = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kollision-21.12.3.tar.xz"; - sha256 = "0avin6s1lglfps6qlvz19i27nb0x0hgrl4q2brpq4kax7azs1nc3"; - name = "kollision-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kollision-22.04.0.tar.xz"; + sha256 = "18vp7iqkm9pbrcl5cppwb6qngfbw75d2vjqngm5kjz124jn6hxxa"; + name = "kollision-22.04.0.tar.xz"; }; }; kolourpaint = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kolourpaint-21.12.3.tar.xz"; - sha256 = "0kbz8jz33bk4zr7kk6mb1y42mdq6nykdfqm2cs08sxldd3nrs6fj"; - name = "kolourpaint-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kolourpaint-22.04.0.tar.xz"; + sha256 = "0qwibnpr5zgpwdk44xl43xlr02w75j8c01z8arsiv6rdycwy9cmf"; + name = "kolourpaint-22.04.0.tar.xz"; }; }; kompare = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kompare-21.12.3.tar.xz"; - sha256 = "097aawmziplsndj42bdjf3x3smal1fy67c2y7cik9p1qw9wgn24h"; - name = "kompare-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kompare-22.04.0.tar.xz"; + sha256 = "1381kih1ywd5k2wslasp0ap69kmbd05nm8jy67cric1f9d4fxq72"; + name = "kompare-22.04.0.tar.xz"; }; }; konqueror = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/konqueror-21.12.3.tar.xz"; - sha256 = "0z3zq71n0lnpx5ggfg835zbmgf2ly4zsmz01yyyxn9n9d9b6d3px"; - name = "konqueror-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/konqueror-22.04.0.tar.xz"; + sha256 = "0s0cf41p2ciwmgywv5g59cnw9fzy2065grk9g058d522qqadcmfv"; + name = "konqueror-22.04.0.tar.xz"; }; }; konquest = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/konquest-21.12.3.tar.xz"; - sha256 = "0lrahq9s70rx24dw4cgpvchr4s6pcl565vh343ggg24s1rd3ly80"; - name = "konquest-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/konquest-22.04.0.tar.xz"; + sha256 = "0kpjakww8kaqf7b18v5r7xhg9z07c22959gygcq22b0dahqsgy1w"; + name = "konquest-22.04.0.tar.xz"; }; }; konsole = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/konsole-21.12.3.tar.xz"; - sha256 = "06sqm2xmairicrdcxnf7imvyvw0wyknrrym334scx2w7mfhjg5qs"; - name = "konsole-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/konsole-22.04.0.tar.xz"; + sha256 = "1wyvfwky8p5ryc101bfxfbzrbvhw6sl9yaqk057wkqvav2h6k6xz"; + name = "konsole-22.04.0.tar.xz"; }; }; kontact = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kontact-21.12.3.tar.xz"; - sha256 = "16p17b4llral0g48l3s9yg838x6hhc4dprlcpd00b8sy58c27f90"; - name = "kontact-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kontact-22.04.0.tar.xz"; + sha256 = "19jpwazr553bb1qw9lkp89gbxabjbalc1f31sf6j074zxjn7p29v"; + name = "kontact-22.04.0.tar.xz"; }; }; kontactinterface = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kontactinterface-21.12.3.tar.xz"; - sha256 = "1qwx0q4bbk3d720ij37wbd54g9alw6ispjl1mq19hkk3gs5l1c78"; - name = "kontactinterface-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kontactinterface-22.04.0.tar.xz"; + sha256 = "1v0yyb81dq98dgmlzc3ry36nhsl29sh1dj7c9y3y926dkv6s3khp"; + name = "kontactinterface-22.04.0.tar.xz"; }; }; kontrast = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kontrast-21.12.3.tar.xz"; - sha256 = "1rp279mfq18p5kzw3788m8w6kkj8w7zfdv97rnl3n5jir4j94yxl"; - name = "kontrast-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kontrast-22.04.0.tar.xz"; + sha256 = "1nznd3ir87r3rhmpqxdcnvivczfybqdqzabwa0f6zlryixcvqmqb"; + name = "kontrast-22.04.0.tar.xz"; }; }; konversation = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/konversation-21.12.3.tar.xz"; - sha256 = "05dxzkpadz29b5fm6pf225xqq0gaz9w50paz9341kzz4k3rnzq80"; - name = "konversation-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/konversation-22.04.0.tar.xz"; + sha256 = "12lvgxzdchcyg0jy3qcvfssdad5c6asiadkszz7brnnnxma3i77q"; + name = "konversation-22.04.0.tar.xz"; }; }; kopeninghours = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kopeninghours-21.12.3.tar.xz"; - sha256 = "0pfkrns576ll6wc33c8i6pgzd9wf543w2isbvh393zyb1rr3bzgd"; - name = "kopeninghours-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kopeninghours-22.04.0.tar.xz"; + sha256 = "17yxbr86dqyxpgdr35lfvfal1qf38hx8alk2p0j7l8k9yd5zgw5h"; + name = "kopeninghours-22.04.0.tar.xz"; }; }; kopete = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kopete-21.12.3.tar.xz"; - sha256 = "1v519sw2lzlap6xci3j55k8c48755sc9p3mgvj566b6jjq64xi5k"; - name = "kopete-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kopete-22.04.0.tar.xz"; + sha256 = "1hy9z5148c9grh56pr4865hq62x85lnn83kg9f7kx6dnbkwyq408"; + name = "kopete-22.04.0.tar.xz"; }; }; korganizer = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/korganizer-21.12.3.tar.xz"; - sha256 = "072pyzs38dv07mwi4hlfb4rh9jx40dpxac3ywy7kj6nyvbfjmh0r"; - name = "korganizer-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/korganizer-22.04.0.tar.xz"; + sha256 = "12qdp5wwii55prc7wih70r1sw7c3dnrwmczhsm3m6gsf4p2px4si"; + name = "korganizer-22.04.0.tar.xz"; }; }; kosmindoormap = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kosmindoormap-21.12.3.tar.xz"; - sha256 = "06i616c873lkkpy2iwdjcgwnm6adjrr6rcain2rrb1j4pgzmmbvw"; - name = "kosmindoormap-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kosmindoormap-22.04.0.tar.xz"; + sha256 = "1gxw614nydmqc8s83wi6aranw4jd24zvbjky2sdfryph0gr14zg1"; + name = "kosmindoormap-22.04.0.tar.xz"; }; }; kpat = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kpat-21.12.3.tar.xz"; - sha256 = "1jd9457hf15d2l6njkfyj9a7lfyabcm80vz3zjb2cykm16x3sdb8"; - name = "kpat-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kpat-22.04.0.tar.xz"; + sha256 = "0kd4cxgwg7336q27api51g2xa7d20nypm32rpm9vq3cq112jwpi7"; + name = "kpat-22.04.0.tar.xz"; }; }; kpimtextedit = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kpimtextedit-21.12.3.tar.xz"; - sha256 = "19hrqbjcmpi81vmnggrkrv0fcc9inhz5aa5klx0141aylnzfgwsl"; - name = "kpimtextedit-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kpimtextedit-22.04.0.tar.xz"; + sha256 = "0j01yn28j58y05v9cf6fyjal79n0rydddsga00aqkbksf80pd93p"; + name = "kpimtextedit-22.04.0.tar.xz"; }; }; kpkpass = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kpkpass-21.12.3.tar.xz"; - sha256 = "05f88hlqxfak94jy8afiv91dgzxd9qgrkarnqi9rv1f5a3j7k3k7"; - name = "kpkpass-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kpkpass-22.04.0.tar.xz"; + sha256 = "0fk789wgx9ks99cfd7b8w62nw7820s53mb9zv9vkzy9mma4640q3"; + name = "kpkpass-22.04.0.tar.xz"; }; }; kpmcore = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kpmcore-21.12.3.tar.xz"; - sha256 = "19h0ag54xzv4hwh950hshjghd4fb9xkdg8rlx6lvqa0w9b8admva"; - name = "kpmcore-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kpmcore-22.04.0.tar.xz"; + sha256 = "1fwdyr37q8bk7mwr2v7q9704q4ykwgg6ak08ss3vvlzsj981dvxh"; + name = "kpmcore-22.04.0.tar.xz"; }; }; kpublictransport = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kpublictransport-21.12.3.tar.xz"; - sha256 = "1jcba5bq320afzfs5ly3vyyicdix8fprpr02x67v8p7mdzg58cq6"; - name = "kpublictransport-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kpublictransport-22.04.0.tar.xz"; + sha256 = "1nc7z7czr24wbwdpgj9vv8p3kn2hdqpf88q7q2776zh64ghi1mrc"; + name = "kpublictransport-22.04.0.tar.xz"; }; }; kqtquickcharts = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kqtquickcharts-21.12.3.tar.xz"; - sha256 = "0gl9c8zfn440202l82y4nfng0hyhivby8a4hf91rphi8f1xfxxmr"; - name = "kqtquickcharts-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kqtquickcharts-22.04.0.tar.xz"; + sha256 = "1pn0c8wpbd88g26g65yd0pv5xzz27k5bmx7k6as7k3s41y96lpn5"; + name = "kqtquickcharts-22.04.0.tar.xz"; }; }; krdc = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/krdc-21.12.3.tar.xz"; - sha256 = "09np9clvmdll7v2p9aswnlhz4cgsnly82za7k3k9fs66h5c8q20j"; - name = "krdc-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/krdc-22.04.0.tar.xz"; + sha256 = "1rykh19g4fb7kadzg2i3kgf1s1qdm31z5hdq4yx60v009lmsa2r5"; + name = "krdc-22.04.0.tar.xz"; }; }; kreversi = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kreversi-21.12.3.tar.xz"; - sha256 = "0lbypkh6lc5af43c2p19gs2c53icxd26abxf5rhs2c8182gr39b8"; - name = "kreversi-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kreversi-22.04.0.tar.xz"; + sha256 = "0mzwjkgzv3f8y7wkbfy5gvww2gl6kww8wq2s1kwayv8cimvxmlzq"; + name = "kreversi-22.04.0.tar.xz"; }; }; krfb = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/krfb-21.12.3.tar.xz"; - sha256 = "1r8lvvh2z8xi0l3pizlpl12nm4fnbpgiwqmx18w8i51x4j27dv0n"; - name = "krfb-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/krfb-22.04.0.tar.xz"; + sha256 = "145wi252ah38c45p08jjwzd7f07d993mvn7nq30xc6vvs5mwgmia"; + name = "krfb-22.04.0.tar.xz"; }; }; kross-interpreters = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kross-interpreters-21.12.3.tar.xz"; - sha256 = "0wyr3xwdkb2fiadzh5lhjli1g0mbxjw353q7k1vbi2wxg5b9042g"; - name = "kross-interpreters-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kross-interpreters-22.04.0.tar.xz"; + sha256 = "0nff5k9372yj8aqnbgfb4ljcmdg598jkfwrcpkay9vf51krimspp"; + name = "kross-interpreters-22.04.0.tar.xz"; }; }; kruler = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kruler-21.12.3.tar.xz"; - sha256 = "0jmb3a907jx0s80865lmd7in8ggdf30gdbgykpalzfrv7nkjamzr"; - name = "kruler-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kruler-22.04.0.tar.xz"; + sha256 = "0ifd32x0xwrzx6whjja71qhwvzgsv956dxs05vsb4gw10sv8kwgl"; + name = "kruler-22.04.0.tar.xz"; }; }; kshisen = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kshisen-21.12.3.tar.xz"; - sha256 = "1i11gh87gfza58rpdd44pjb423an9a44cls117ba9gznxm67cph5"; - name = "kshisen-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kshisen-22.04.0.tar.xz"; + sha256 = "0p1bxyayl5nlik9ksssqy1sa543zv9chi6cq10sic46gwz6cxbhr"; + name = "kshisen-22.04.0.tar.xz"; }; }; ksirk = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ksirk-21.12.3.tar.xz"; - sha256 = "1ipnkg2mgj37g5s5ihlys176kn2c11f3d57xr9zhqf8fvkvrkfm0"; - name = "ksirk-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ksirk-22.04.0.tar.xz"; + sha256 = "1ys3k3y4gkyd7691yd7r7pr1csm05hmfvm60iwkv6g1a7imsanp7"; + name = "ksirk-22.04.0.tar.xz"; }; }; ksmtp = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ksmtp-21.12.3.tar.xz"; - sha256 = "0kdy5gsg1sgccvdk1fpf866xl9m8v8z034jpgf6s7n2pr5r5mni2"; - name = "ksmtp-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ksmtp-22.04.0.tar.xz"; + sha256 = "15v7bqx6y2cvj71v30zdscddv5xc1vqxq2h6r1f2c1i1ppg0x91d"; + name = "ksmtp-22.04.0.tar.xz"; }; }; ksnakeduel = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ksnakeduel-21.12.3.tar.xz"; - sha256 = "06rill73xhhxra7kmbvwwriv9vbi91641z334ry1m4rr1qm2cdd6"; - name = "ksnakeduel-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ksnakeduel-22.04.0.tar.xz"; + sha256 = "0d03ixx8fid3wagcajasasd1h9j87wxxix7521fmnq5qhdd77nyl"; + name = "ksnakeduel-22.04.0.tar.xz"; }; }; kspaceduel = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kspaceduel-21.12.3.tar.xz"; - sha256 = "0dv539jlpkj8hr4cz0ncqm3scg6ja3s41p37bpqd94zicfvzxw84"; - name = "kspaceduel-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kspaceduel-22.04.0.tar.xz"; + sha256 = "0gyblvlcrbdspdf740mp4587f04lnl8jm5qq0gl5gmfads7l90bh"; + name = "kspaceduel-22.04.0.tar.xz"; }; }; ksquares = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ksquares-21.12.3.tar.xz"; - sha256 = "1wbrakq1wnwp558y140j9vbid3g0k332rwbilky7z11c0giiv76x"; - name = "ksquares-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ksquares-22.04.0.tar.xz"; + sha256 = "122i3wwbvvc66i8mzmql3z4s23nmjc9k9rfbl9v0202hcalgzhv8"; + name = "ksquares-22.04.0.tar.xz"; }; }; ksudoku = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ksudoku-21.12.3.tar.xz"; - sha256 = "1gw0ybwhvg1z8pcs72f73y52jvzvrw367g275axf2rw50iik6jwv"; - name = "ksudoku-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ksudoku-22.04.0.tar.xz"; + sha256 = "088bkzx1n81al774h2n9nvkhsg42alc5n4fffh490lx3ys8ckdgq"; + name = "ksudoku-22.04.0.tar.xz"; }; }; ksystemlog = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ksystemlog-21.12.3.tar.xz"; - sha256 = "0jkd0rx0xlzwsxa3s40sp5x4r19a9rg1x9klpnjfw0b326vgf2m9"; - name = "ksystemlog-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ksystemlog-22.04.0.tar.xz"; + sha256 = "1927515lh64qk041d5qpshx4fy3k5hsnzv6c2jqdsa39fll5wli5"; + name = "ksystemlog-22.04.0.tar.xz"; }; }; kteatime = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kteatime-21.12.3.tar.xz"; - sha256 = "0i3ps1a8y8crmxf1631q4zjfa0zglqhq1rk6id5v2xx8f10rkh54"; - name = "kteatime-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kteatime-22.04.0.tar.xz"; + sha256 = "1xhxz2x1a35vsibgn8myqg976gqdhipsw48c961f0vfzyw9q62gk"; + name = "kteatime-22.04.0.tar.xz"; }; }; ktimer = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktimer-21.12.3.tar.xz"; - sha256 = "0s6zbygxnk69dciyz1iv1d6whfcv637licsd07n7fc8bsygqjl5p"; - name = "ktimer-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktimer-22.04.0.tar.xz"; + sha256 = "0zg5hk69wz395b8faz7s8sxl3ncr6vkybz0zd3m70cm85cxv5jwv"; + name = "ktimer-22.04.0.tar.xz"; }; }; ktnef = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktnef-21.12.3.tar.xz"; - sha256 = "1in991n8alkxf40p0wvkr7gdaaz8w4kdw1rsq6sbjil6cs4cr5nl"; - name = "ktnef-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktnef-22.04.0.tar.xz"; + sha256 = "0kk50qf8k7q9qsdqwr2fy580adw3a4a6x0q4a825smch1m35wih0"; + name = "ktnef-22.04.0.tar.xz"; }; }; ktorrent = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktorrent-21.12.3.tar.xz"; - sha256 = "021x6qcbk4kdh5ay5mqmf92129s42j2rhrs0q350b0wcnpad55zd"; - name = "ktorrent-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktorrent-22.04.0.tar.xz"; + sha256 = "1yclmg4hjvss0l2q0pzc1j9gz2nqwgj37kcvacxa38n6l5clfxb2"; + name = "ktorrent-22.04.0.tar.xz"; }; }; ktouch = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktouch-21.12.3.tar.xz"; - sha256 = "0wi01gr85sxs4qhvnwkkp1230wnvz7gdr74zar03rc3wzwgv22nd"; - name = "ktouch-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktouch-22.04.0.tar.xz"; + sha256 = "03qr1q4nhayklkwyskh3wf5c101l90b9h8lp9v11y63gpzicsxhh"; + name = "ktouch-22.04.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-accounts-kcm-21.12.3.tar.xz"; - sha256 = "1ydsfiw67avgwswvpy85s3siggyi4w610yqz5dyl535i6my1kl5n"; - name = "ktp-accounts-kcm-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-accounts-kcm-22.04.0.tar.xz"; + sha256 = "0crhb1p09varma77awfq0a4dx9cjyqra5h7inlv0d4bb7vm7zd43"; + name = "ktp-accounts-kcm-22.04.0.tar.xz"; }; }; ktp-approver = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-approver-21.12.3.tar.xz"; - sha256 = "0mvczpc0dy2m0dn25r2h2js3hw7s0qr8zl3syvqbyqqs51s59xnl"; - name = "ktp-approver-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-approver-22.04.0.tar.xz"; + sha256 = "1zgii0sclcxi1dhainpcbqyadcwmks84clmchld47kq1wjm5w0xa"; + name = "ktp-approver-22.04.0.tar.xz"; }; }; ktp-auth-handler = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-auth-handler-21.12.3.tar.xz"; - sha256 = "0lgg0ify9mbsd8has8ingkq3m0g91r9gvfq85s2xf90cwc1s429c"; - name = "ktp-auth-handler-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-auth-handler-22.04.0.tar.xz"; + sha256 = "0cf6swv24pp7s5hf5nv3c6ipk2zmr6w6ikg16wzwcyva56h8izq8"; + name = "ktp-auth-handler-22.04.0.tar.xz"; }; }; ktp-call-ui = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-call-ui-21.12.3.tar.xz"; - sha256 = "1npr8qbpxx25pm9mky9sd0qngc5wphmy5blvl6qy7nvs2rqszgam"; - name = "ktp-call-ui-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-call-ui-22.04.0.tar.xz"; + sha256 = "0gy6sw403j129i81nhvcnvahlymvj5k8y8p37w935lzws0vr0r0p"; + name = "ktp-call-ui-22.04.0.tar.xz"; }; }; ktp-common-internals = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-common-internals-21.12.3.tar.xz"; - sha256 = "0spr2gs5d561agvipkipwcxk2zjlhzvp6swdh8rcv23qr6igqjq6"; - name = "ktp-common-internals-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-common-internals-22.04.0.tar.xz"; + sha256 = "1fd5wvmirlaxv43c72d3z7hncf434nb8fvr4g5nxiw69i0il8mvr"; + name = "ktp-common-internals-22.04.0.tar.xz"; }; }; ktp-contact-list = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-contact-list-21.12.3.tar.xz"; - sha256 = "1qn3bmwl4kvm5ikbr0ycy2znm4c2yv4m5863d4vakr8xhhappamp"; - name = "ktp-contact-list-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-contact-list-22.04.0.tar.xz"; + sha256 = "1nqr6qq12rg1vf20v89q7qvp9b7karybk4662ci7qbjyj9s2xgj9"; + name = "ktp-contact-list-22.04.0.tar.xz"; }; }; ktp-contact-runner = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-contact-runner-21.12.3.tar.xz"; - sha256 = "0bwi0j733jnwiqlxv8nik1whdvk4aggfayy2bcwwpj5zdzr3mbga"; - name = "ktp-contact-runner-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-contact-runner-22.04.0.tar.xz"; + sha256 = "1s1dkp5cybia28k07xwa7180h8m2cm8y381kkpkg4pi6izadqfn8"; + name = "ktp-contact-runner-22.04.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-desktop-applets-21.12.3.tar.xz"; - sha256 = "01h26jsdb7mkw8isxpy4sfpdn11q209xqhhpnk7xvchs8fpl5fni"; - name = "ktp-desktop-applets-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-desktop-applets-22.04.0.tar.xz"; + sha256 = "1n5vlhlh1jasc87zdm9k8srpr7y67lzal36vdc4jbl9jlc96gm8n"; + name = "ktp-desktop-applets-22.04.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-filetransfer-handler-21.12.3.tar.xz"; - sha256 = "0aq5ii7b2kk0qan4qph9glapp81sgqm2zzbdknggxz7vkhj5y6lk"; - name = "ktp-filetransfer-handler-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-filetransfer-handler-22.04.0.tar.xz"; + sha256 = "01b1xid6zbvgnyp5fm5sp7gli0hhpa3a538pn469i50d61rhhnrv"; + name = "ktp-filetransfer-handler-22.04.0.tar.xz"; }; }; ktp-kded-module = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-kded-module-21.12.3.tar.xz"; - sha256 = "0921lahpqjx094ngk68pphkv306ajgxbp6yb0hkckmlic4f2hm37"; - name = "ktp-kded-module-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-kded-module-22.04.0.tar.xz"; + sha256 = "0m1rslk778j1kvx3f4cgiz925sd72kg4b3dhg3hjlmm95ypnf8d0"; + name = "ktp-kded-module-22.04.0.tar.xz"; }; }; ktp-send-file = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-send-file-21.12.3.tar.xz"; - sha256 = "0vvg0qz2zxckqqwfibsl88w0mpa7a0lzskwhzbvzir03x14rwjlc"; - name = "ktp-send-file-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-send-file-22.04.0.tar.xz"; + sha256 = "1v7gzq2pivbxf4ypqg8k3ihya7cpyw3bmxda3f7a8x1n60z7pfx7"; + name = "ktp-send-file-22.04.0.tar.xz"; }; }; ktp-text-ui = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktp-text-ui-21.12.3.tar.xz"; - sha256 = "046611abkdn7qqh6n4v8ssdzg10q4g14rji7klypmccfng0px2xg"; - name = "ktp-text-ui-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktp-text-ui-22.04.0.tar.xz"; + sha256 = "1v25qqclqssdq2v9h010jib3cm5an5h7cyyrlmc4f5jx76d82rzj"; + name = "ktp-text-ui-22.04.0.tar.xz"; }; }; ktuberling = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/ktuberling-21.12.3.tar.xz"; - sha256 = "1awsn285j9nggyypkra9ladgi46w2m7m09d8364w5d0sygpzmgsg"; - name = "ktuberling-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/ktuberling-22.04.0.tar.xz"; + sha256 = "19cxpxwyzcy3vif7q5rmzzr1qa1bhql2l309psi66b4yndxs1n8q"; + name = "ktuberling-22.04.0.tar.xz"; }; }; kturtle = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kturtle-21.12.3.tar.xz"; - sha256 = "1689skwk2dwm4mrl2mrakb1cn74nyxd6xa8ipxsip5zhjgkkvg23"; - name = "kturtle-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kturtle-22.04.0.tar.xz"; + sha256 = "09w4wf7w5bck2ca59gsszjdyvyfwir9vwk5wwp0xciky1qwb2hpx"; + name = "kturtle-22.04.0.tar.xz"; }; }; kubrick = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kubrick-21.12.3.tar.xz"; - sha256 = "0hx81cp1lql74c9067dw7mi78c6sp6p1a035j2nzjn9drpxal6p2"; - name = "kubrick-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kubrick-22.04.0.tar.xz"; + sha256 = "0k624kl2cv06r04b7y1dp7zyhcqampqa10cy77df6am20v6n0za3"; + name = "kubrick-22.04.0.tar.xz"; }; }; kwalletmanager = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kwalletmanager-21.12.3.tar.xz"; - sha256 = "01xif44iz1ik32swlrzzjycizy4hjlis1f336qc9p7affjyv2797"; - name = "kwalletmanager-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kwalletmanager-22.04.0.tar.xz"; + sha256 = "05zc9aib2wnzn45mrcg59qkyfrwzxanddnnpv7z74ydw1ap28f6k"; + name = "kwalletmanager-22.04.0.tar.xz"; }; }; kwave = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kwave-21.12.3.tar.xz"; - sha256 = "07xbbii5gpllbpmkxfv5kwxawd390zp0angh94xjk0yq71lvdav2"; - name = "kwave-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kwave-22.04.0.tar.xz"; + sha256 = "17a2gzawp9pg5aqmj3433qrqrh03yj5ldivnzr7alf5qdvj7p1c6"; + name = "kwave-22.04.0.tar.xz"; }; }; kwordquiz = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/kwordquiz-21.12.3.tar.xz"; - sha256 = "1p06ki75zy4il6k9siavqddpr9j02z3lbnd14pxwk42fhfmbx057"; - name = "kwordquiz-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/kwordquiz-22.04.0.tar.xz"; + sha256 = "0pss1vz890hmv03g9gl1v6bmf73ga484qzp2j5x3mp1w3ks93s73"; + name = "kwordquiz-22.04.0.tar.xz"; }; }; libgravatar = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libgravatar-21.12.3.tar.xz"; - sha256 = "1bihy3dfagwc7aday40myqjbn555mkzzaaq7c14ywkmhh99dhvh7"; - name = "libgravatar-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libgravatar-22.04.0.tar.xz"; + sha256 = "0zkbs3zniahfbhzf7qghm7d478vbhm1ifvv44xl4m596rhm18ibs"; + name = "libgravatar-22.04.0.tar.xz"; }; }; libkcddb = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkcddb-21.12.3.tar.xz"; - sha256 = "14f1mzsfm0vyqzsyja0p8ln1105sw5dr6fssj25j0qw4rnf9yw32"; - name = "libkcddb-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkcddb-22.04.0.tar.xz"; + sha256 = "0x87pg6djih6sssd7zjqarnry9v9n6kbk2zirjgp8nic272irjfx"; + name = "libkcddb-22.04.0.tar.xz"; }; }; libkcompactdisc = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkcompactdisc-21.12.3.tar.xz"; - sha256 = "1vmaf3b41sj0sm4k9zdliy5ba4ps5z0cwabggfish152wzw34kgn"; - name = "libkcompactdisc-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkcompactdisc-22.04.0.tar.xz"; + sha256 = "152zq2c23cf13lmc6895pcw36plhb8is4hilf9jvcgx0jmzgs5kz"; + name = "libkcompactdisc-22.04.0.tar.xz"; }; }; libkdcraw = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkdcraw-21.12.3.tar.xz"; - sha256 = "1pyqsaaficwxbg6hk8xg8srq79i6xdxvghkn2rf54zj1435d9kva"; - name = "libkdcraw-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkdcraw-22.04.0.tar.xz"; + sha256 = "0y9yvdfhbn0fy81y6d16r1vjcfxiq8g4wy6y5gqmkvzxhydfwb7r"; + name = "libkdcraw-22.04.0.tar.xz"; }; }; libkdegames = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkdegames-21.12.3.tar.xz"; - sha256 = "0x5mw25c8hmnxhcxc2xm19xmgdxfbx89nrxfl6mzfrh8myr3ybsb"; - name = "libkdegames-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkdegames-22.04.0.tar.xz"; + sha256 = "0xif6jpdm9x0c6f4p8wy7lkyhxd1ckgw5vxn1d16v06jpw6xin2d"; + name = "libkdegames-22.04.0.tar.xz"; }; }; libkdepim = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkdepim-21.12.3.tar.xz"; - sha256 = "0g9jx6z5jf9yqn01xc1k038b4ljr9sil7bwvifc64s38qxl9wmww"; - name = "libkdepim-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkdepim-22.04.0.tar.xz"; + sha256 = "14cq8zm2ldhql91v8cc9g9v81ny0g1x06qfj2jwlqjccmphywncd"; + name = "libkdepim-22.04.0.tar.xz"; }; }; libkeduvocdocument = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkeduvocdocument-21.12.3.tar.xz"; - sha256 = "16kk7ij2qxy5abgv9hgk1ycbx0f2gnpc9lxqbhl5sq9vxd4nblv0"; - name = "libkeduvocdocument-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkeduvocdocument-22.04.0.tar.xz"; + sha256 = "0d4pxjvnnri45q8dn7r7qi9vv7kd8g35mhkc9jh80mqw5817pl5h"; + name = "libkeduvocdocument-22.04.0.tar.xz"; }; }; libkexiv2 = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkexiv2-21.12.3.tar.xz"; - sha256 = "0r2m6d9rw0r6rm6xqpj1i3w0hplhivy8h90zggqynfzvfyr9c529"; - name = "libkexiv2-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkexiv2-22.04.0.tar.xz"; + sha256 = "0h3zjldpjz2jvkwp6scpxwjmxm5l0bcs25ivrl8s3yjjggil53wx"; + name = "libkexiv2-22.04.0.tar.xz"; }; }; libkgapi = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkgapi-21.12.3.tar.xz"; - sha256 = "1vbk8786mk1irm94bsm97270gnd149nz7w0zqnvwz499f72d21jx"; - name = "libkgapi-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkgapi-22.04.0.tar.xz"; + sha256 = "0gvr1ins5sbf8q10waqgjpricvz5v5d8q0i6q4q3r0hncg7i21rw"; + name = "libkgapi-22.04.0.tar.xz"; }; }; libkipi = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkipi-21.12.3.tar.xz"; - sha256 = "0w2kwi6djwp8mhmpfrr16v8fgmwjmsc89rcwpfhgii1p68xia8gc"; - name = "libkipi-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkipi-22.04.0.tar.xz"; + sha256 = "0xcwjx5kidqbf64b2pd4vlf9vzyjwm1jbbm89pyb2myiadkngzkj"; + name = "libkipi-22.04.0.tar.xz"; }; }; libkleo = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkleo-21.12.3.tar.xz"; - sha256 = "19q128ldi0aspy7vc03r54vrf7wz7l1181x9pbmax8340nbnaz7l"; - name = "libkleo-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkleo-22.04.0.tar.xz"; + sha256 = "1vwfa38wh0di2q4999bnw8dfyn8ckph5b88z0v218gl1iwwsxgsf"; + name = "libkleo-22.04.0.tar.xz"; }; }; libkmahjongg = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkmahjongg-21.12.3.tar.xz"; - sha256 = "114viyqq7zlwsdnm96iyyvj8ma4p06m69hs641yv42xlbkspwbal"; - name = "libkmahjongg-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkmahjongg-22.04.0.tar.xz"; + sha256 = "0g50qks245zw9g9inzkk9n9bbzambi3pf5sd0m4qcd4hlkq494q3"; + name = "libkmahjongg-22.04.0.tar.xz"; }; }; libkomparediff2 = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libkomparediff2-21.12.3.tar.xz"; - sha256 = "1j93lf9adyw581a9i8kc1pj6vadscibw49wvwfs750f0kxn5p0d2"; - name = "libkomparediff2-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libkomparediff2-22.04.0.tar.xz"; + sha256 = "0487grz2q8g3cxmirp2mzzk87xljdnakh0lqvjqc0773siwg97ww"; + name = "libkomparediff2-22.04.0.tar.xz"; }; }; libksane = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libksane-21.12.3.tar.xz"; - sha256 = "0ci2284ysh4q8sbhqcg5bis2v02bp5x64h8n0qik14yy24x852zg"; - name = "libksane-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libksane-22.04.0.tar.xz"; + sha256 = "055x396jhkzqzfk54flig4cpn12hfvmsm5x5ini2vhjfdc986fkk"; + name = "libksane-22.04.0.tar.xz"; }; }; libksieve = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libksieve-21.12.3.tar.xz"; - sha256 = "1li9cc5y6xbn4m4qa21qmsjd4xzshp67mxwh2nvr17mfs8ray7vd"; - name = "libksieve-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libksieve-22.04.0.tar.xz"; + sha256 = "0ybmccxrsfvlsxrhbk4f1szj6y2gz520j5a7mdqwarwj2ba2fnvy"; + name = "libksieve-22.04.0.tar.xz"; }; }; libktorrent = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/libktorrent-21.12.3.tar.xz"; - sha256 = "0i976al9bsc3gbplqbxkxr03sdhxv3yzjlfkdaghga8fkihzkkl0"; - name = "libktorrent-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/libktorrent-22.04.0.tar.xz"; + sha256 = "0xgh27yi06sx4jc6bfdayc2jx4fbf66939k9amg7m728sgd3yq1h"; + name = "libktorrent-22.04.0.tar.xz"; }; }; lokalize = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/lokalize-21.12.3.tar.xz"; - sha256 = "1gzfiajy377kx0iar85z72zqxh7y9vhp1hs03zzqymazawm9lqnn"; - name = "lokalize-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/lokalize-22.04.0.tar.xz"; + sha256 = "1r6r3bkcnqaj7r398pl30plzs81bwj83lzbmch8pl25v8vksd0w0"; + name = "lokalize-22.04.0.tar.xz"; }; }; lskat = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/lskat-21.12.3.tar.xz"; - sha256 = "1cfs1lfwgxwpn2g56y7jb2c6ijd81bi8ba8ap0yyx6nhv6na072b"; - name = "lskat-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/lskat-22.04.0.tar.xz"; + sha256 = "0nr78krgf6hy3brn94g0lcwkw6bif5ivhhmmx62b4p3iqy6155c0"; + name = "lskat-22.04.0.tar.xz"; }; }; mailcommon = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/mailcommon-21.12.3.tar.xz"; - sha256 = "1zi8zkhv9g4vsylqzjm2wr9v6b20irfxhf4q467cmpqqrqpcp3af"; - name = "mailcommon-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/mailcommon-22.04.0.tar.xz"; + sha256 = "0yx2j9j3pylgliadbc1j2w4jmqb3ydciy7x9swhgf0zm8a0gj0k6"; + name = "mailcommon-22.04.0.tar.xz"; }; }; mailimporter = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/mailimporter-21.12.3.tar.xz"; - sha256 = "0lcr9zzdf16f82spr9x33jnzr23sx7xk2zvfpzdki3b5jxvapnsk"; - name = "mailimporter-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/mailimporter-22.04.0.tar.xz"; + sha256 = "07rkcnylpalhd774dsvsyv1lg5i8ya2wkn3zmgswvsnlxiymlv2s"; + name = "mailimporter-22.04.0.tar.xz"; }; }; marble = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/marble-21.12.3.tar.xz"; - sha256 = "0v6qd9cl6g8k55mjq2lswsfcxzf88w33nlm1193ps3ac0awjaaa4"; - name = "marble-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/marble-22.04.0.tar.xz"; + sha256 = "0qlrg5vy2rvvgimg1bxlyia5czygqn5gwf1nfkjdm1xk6scj2fgb"; + name = "marble-22.04.0.tar.xz"; }; }; markdownpart = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/markdownpart-21.12.3.tar.xz"; - sha256 = "1drvjrvmd2c36xj3x7kxb7lvk23cmaw8mi976pdfnxn5pdamv6wl"; - name = "markdownpart-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/markdownpart-22.04.0.tar.xz"; + sha256 = "130vm0h07phzg7rdcdijcnr8nlyif7gcf80a7pfxjirxszy3l5zw"; + name = "markdownpart-22.04.0.tar.xz"; }; }; mbox-importer = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/mbox-importer-21.12.3.tar.xz"; - sha256 = "01bh0yzv23vkicc7lj217rp8c36kyyjlxmkwylss3hakr4b3afan"; - name = "mbox-importer-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/mbox-importer-22.04.0.tar.xz"; + sha256 = "1j4l6lziyj1vb7m3m6cxlydk3k66iy2ivmrqarl040r2c2xp36wa"; + name = "mbox-importer-22.04.0.tar.xz"; }; }; messagelib = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/messagelib-21.12.3.tar.xz"; - sha256 = "0xrhnkahqirsz37lbvx505ll7bfhr25lbq89yqq81bxbzkbvamsw"; - name = "messagelib-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/messagelib-22.04.0.tar.xz"; + sha256 = "0ny9qv26a8vi0vg5990bw82jz25balk3j0419ssbgakwybgfgkkb"; + name = "messagelib-22.04.0.tar.xz"; }; }; minuet = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/minuet-21.12.3.tar.xz"; - sha256 = "0r68z3j0j2gbwzj77wvsx1idrfkagj0pjai9j7fbqa0r6q833flr"; - name = "minuet-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/minuet-22.04.0.tar.xz"; + sha256 = "1q74jkkc0yd03xar6bpg62kvwh6kfpvipqvramg91sdi5k77rr56"; + name = "minuet-22.04.0.tar.xz"; }; }; okular = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/okular-21.12.3.tar.xz"; - sha256 = "054rzdqsqkjx2sncyfcnfdvm9bp45sdw3rycmpzicnwpn5j4hcb3"; - name = "okular-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/okular-22.04.0.tar.xz"; + sha256 = "1gz3nal7m0jlcblrzy4d3fszcj03h7z2wmvyj12v459l1k0vmvj7"; + name = "okular-22.04.0.tar.xz"; }; }; palapeli = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/palapeli-21.12.3.tar.xz"; - sha256 = "076igql89sx55hfxjb79248ih4cjbkr1s1jnz46y3dk793rscm8g"; - name = "palapeli-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/palapeli-22.04.0.tar.xz"; + sha256 = "0wixgr17z0mwmb78wn126bvg512z9dbd5gm6k1x9wikhlfi91mkd"; + name = "palapeli-22.04.0.tar.xz"; }; }; parley = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/parley-21.12.3.tar.xz"; - sha256 = "10hv885l0gz5aymf72f42bhkncfarj768nb12q9fxqk4x5rviiw0"; - name = "parley-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/parley-22.04.0.tar.xz"; + sha256 = "0wkjkyddx95rai0p5q6hd47swrykk20g62c5n5hh5picr9yacr98"; + name = "parley-22.04.0.tar.xz"; }; }; partitionmanager = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/partitionmanager-21.12.3.tar.xz"; - sha256 = "0x0k3vsbngcb7kvcgqj2w025fn9xvfd2232lx51xfar5r3jb7h1p"; - name = "partitionmanager-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/partitionmanager-22.04.0.tar.xz"; + sha256 = "06lhxgwal3fjxyb2v4vvd67r6dyd5hf08hz7lnyp0b0xx7f6fa3q"; + name = "partitionmanager-22.04.0.tar.xz"; }; }; picmi = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/picmi-21.12.3.tar.xz"; - sha256 = "0gk1yq5ac55k6lxbxszxpd393fb9k6yphisb71lx2zv9gchl44n6"; - name = "picmi-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/picmi-22.04.0.tar.xz"; + sha256 = "0q2wrn323wwwfnf0w6cvw0fhv3fsxhqj3a2qdki9yzz5rb5mc2y9"; + name = "picmi-22.04.0.tar.xz"; }; }; pim-data-exporter = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/pim-data-exporter-21.12.3.tar.xz"; - sha256 = "0qcwsbb4zsjgc15fhq9pp341wwm35y9v1lq8gnpjdsvfq2pczq5q"; - name = "pim-data-exporter-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/pim-data-exporter-22.04.0.tar.xz"; + sha256 = "02h76ividjadlmfmxnc1x2bif3mmgrc4q7yjxzf2jpjqdha80xyq"; + name = "pim-data-exporter-22.04.0.tar.xz"; }; }; pim-sieve-editor = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/pim-sieve-editor-21.12.3.tar.xz"; - sha256 = "1gp4gpagv6pfiy6gyfh14z1rb16iqm1npmngw6ybjlhh6d424n90"; - name = "pim-sieve-editor-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/pim-sieve-editor-22.04.0.tar.xz"; + sha256 = "1c9w4bnh3a9w79lakqsv780zqdpl8g6wsax994p6lglzs56xs299"; + name = "pim-sieve-editor-22.04.0.tar.xz"; }; }; pimcommon = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/pimcommon-21.12.3.tar.xz"; - sha256 = "1k1d100lr277lgwyzn2ssxsx9x2yd9nfd5657r95vmdnkh2qs517"; - name = "pimcommon-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/pimcommon-22.04.0.tar.xz"; + sha256 = "0iqmyb9xx8h8ay6yzf9xbrg7c67jlsrywwlljynj7lh4n2wjg3sc"; + name = "pimcommon-22.04.0.tar.xz"; }; }; poxml = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/poxml-21.12.3.tar.xz"; - sha256 = "19hrb75fbh102fw8ajflj4777s7hq7vxv6kbwjir6wzsvdfanwdb"; - name = "poxml-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/poxml-22.04.0.tar.xz"; + sha256 = "15m55qb2wn66nxg0j7jwz0r4zg180dbm1ynnx1yj39iprra9j9k7"; + name = "poxml-22.04.0.tar.xz"; }; }; print-manager = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/print-manager-21.12.3.tar.xz"; - sha256 = "1q9vv5v9hivm583hcx8qa7xik9yv4zicrd02abcsn6hvgwmdav8b"; - name = "print-manager-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/print-manager-22.04.0.tar.xz"; + sha256 = "0fq4q57nxiingwmkj6hsgvg3gaix6rkgfskpg442vbhc70s280q9"; + name = "print-manager-22.04.0.tar.xz"; }; }; rocs = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/rocs-21.12.3.tar.xz"; - sha256 = "1fgjap71qnaydar9q155is7vwjlkpa8wi1162dsqxr5ywy464wrg"; - name = "rocs-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/rocs-22.04.0.tar.xz"; + sha256 = "1x80ln8px5fywb1zhc569nrpnpv5iyr73vxl1ckh3s337xn44pd7"; + name = "rocs-22.04.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/signon-kwallet-extension-21.12.3.tar.xz"; - sha256 = "0sv0g50bxxd442ia7wzk2lkqwr8lsjxk5wm3zsskxhql851y0ybm"; - name = "signon-kwallet-extension-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/signon-kwallet-extension-22.04.0.tar.xz"; + sha256 = "1s6jjhqkz2pv2ki87ka8y4b4gqv8wmlc332hrrlfa8cafldrpl9k"; + name = "signon-kwallet-extension-22.04.0.tar.xz"; }; }; skanlite = { - version = "21.12.3"; + version = "22.04.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/22.04.0/src/skanlite-22.04.0.tar.xz"; + sha256 = "155d62q26xfba7ihbj6mz5vyydl6bkcxzwa6fxn62kgnpq8axdxf"; + name = "skanlite-22.04.0.tar.xz"; + }; + }; + skanpage = { + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/skanlite-21.12.3.tar.xz"; - sha256 = "06dwmdjrss7cqqigg4rwsy5dya35577qwdaxj2jbvs2pkzp9rq3p"; - name = "skanlite-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/skanpage-22.04.0.tar.xz"; + sha256 = "1n72796546x9fh0bhnlc43mlcrpdqlkph605f8nb7vznkpdnb8zq"; + name = "skanpage-22.04.0.tar.xz"; }; }; spectacle = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/spectacle-21.12.3.tar.xz"; - sha256 = "155xin26lkjr0swb281afha906nqy2821lf2spmzzxa3xalzq3sv"; - name = "spectacle-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/spectacle-22.04.0.tar.xz"; + sha256 = "07dx9jg9i5s1cg0zsz9s06qipz80dv0bq2q1dfy82p6xrji30pdc"; + name = "spectacle-22.04.0.tar.xz"; }; }; step = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/step-21.12.3.tar.xz"; - sha256 = "0j3w63bxj3b4lrfb0mnchlvsr987v5zwwjw5jrgvqidrhv1rh7dc"; - name = "step-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/step-22.04.0.tar.xz"; + sha256 = "007zbkg8gg56f733wp2dbb0xskja5c6pm3n181lirqq831ai9rnb"; + name = "step-22.04.0.tar.xz"; }; }; svgpart = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/svgpart-21.12.3.tar.xz"; - sha256 = "0yg8sn1z9zfb7a6y61nw7vya516sfaydkgxh7cfwiz7sljl87z8j"; - name = "svgpart-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/svgpart-22.04.0.tar.xz"; + sha256 = "16nz12sc1zgyaa6rilqymfcw0waj0ha8xydlsbgv83v1wqlxlfwj"; + name = "svgpart-22.04.0.tar.xz"; }; }; sweeper = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/sweeper-21.12.3.tar.xz"; - sha256 = "1l4ag2nhy0da9z4nlf7fmjrim7pmwpm3m4v4y50jlpdv73f63246"; - name = "sweeper-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/sweeper-22.04.0.tar.xz"; + sha256 = "1fvjq1pcqnadpvkh5jdlb62l54x7r99zshd59jdxy6h7fji3pkbs"; + name = "sweeper-22.04.0.tar.xz"; }; }; umbrello = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/umbrello-21.12.3.tar.xz"; - sha256 = "1i94l5hnn8hl0dgdq8sj5xm2vk372zfcnch9qvf9gcvhg08gdif6"; - name = "umbrello-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/umbrello-22.04.0.tar.xz"; + sha256 = "1n3jvsrzmfzm7x9f125hsf8i80r0iiqzv80ddc7fpzdyxpd83xpl"; + name = "umbrello-22.04.0.tar.xz"; }; }; yakuake = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/yakuake-21.12.3.tar.xz"; - sha256 = "10mkr8svkjf2s023mf21cil2c5v986s5b2yp1hm0fzdgmawpwrh9"; - name = "yakuake-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/yakuake-22.04.0.tar.xz"; + sha256 = "01i0ddgz81mzqlnj6cvslzv2h1nbz238hg75izfpbajvzm46pydp"; + name = "yakuake-22.04.0.tar.xz"; }; }; zanshin = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/zanshin-21.12.3.tar.xz"; - sha256 = "1cwawpmx5hc60zkdkyh484lp3bwiipn6c3yh164gzw769vz9zr71"; - name = "zanshin-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/zanshin-22.04.0.tar.xz"; + sha256 = "1d0sn9km4xdxs28avhxpc1xpkm5bcmg8i06x97xvls4cxh3nbgm9"; + name = "zanshin-22.04.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "21.12.3"; + version = "22.04.0"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.3/src/zeroconf-ioslave-21.12.3.tar.xz"; - sha256 = "09jmf233njbqam1swzvpzfgdplpjzdx48vjy6kcpmjvg2qlm7i2l"; - name = "zeroconf-ioslave-21.12.3.tar.xz"; + url = "${mirror}/stable/release-service/22.04.0/src/zeroconf-ioslave-22.04.0.tar.xz"; + sha256 = "0nppr0qm5aqail1y370b26ky9snz033j3ij9sykc1yq9il8kkpp4"; + name = "zeroconf-ioslave-22.04.0.tar.xz"; }; }; } diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix index 10bf27038ae9d..7c98275b9173f 100644 --- a/pkgs/applications/kde/yakuake.nix +++ b/pkgs/applications/kde/yakuake.nix @@ -23,6 +23,8 @@ mkDerivation { extra-cmake-modules kdoctools ]; + outputs = [ "out" "dev" ]; + meta = { homepage = "https://yakuake.kde.org"; description = "Quad-style terminal emulator for KDE"; diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/applications/logging/sosreport/default.nix new file mode 100644 index 0000000000000..eb4f812767ad9 --- /dev/null +++ b/pkgs/applications/logging/sosreport/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, gettext +, pexpect +}: + +buildPythonPackage rec { + pname = "sosreport"; + version = "4.3"; + + src = fetchFromGitHub { + owner = "sosreport"; + repo = "sos"; + rev = version; + sha256 = "sha256-fLEYRRQap7xqSyUU9MAV8cxxYKydHjn8J147VTXSf78="; + }; + + patches = [ + (fetchpatch { + # fix sos --help + url = "https://github.com/sosreport/sos/commit/ac4eb48fa35c13b99ada41540831412480babf8d.patch"; + sha256 = "sha256-6ZRoDDZN2KkHTXOKuHTAquB/HTIUppodmx83WxxYFP0="; + }) + ]; + + nativeBuildInputs = [ + gettext + ]; + + propagatedBuildInputs = [ + pexpect + ]; + + # requires avocado-framework 94.0, latest version as of writing is 96.0 + doCheck = false; + + preCheck = '' + export PYTHONPATH=$PWD/tests:$PYTHONPATH + ''; + + pythonImportsCheck = [ "sos" ]; + + meta = with lib; { + description = "Unified tool for collecting system logs and other debug information"; + homepage = "https://github.com/sosreport/sos"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/beta.nix new file mode 100644 index 0000000000000..d9d21f30f3479 --- /dev/null +++ b/pkgs/applications/misc/1password-gui/beta.nix @@ -0,0 +1,132 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, 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 +, mesa +, nspr +, nss +, pango +, systemd +, udev +, xdg-utils + + # 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.8.0-11.BETA"; + + src = fetchurl { + url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; + sha256 = "sha256-HU+nIz3aKXXdBWEBMSRlbi8yZ+JEsE33o6nfbWRgpBo="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontConfigure = true; + dontBuild = true; + dontPatchELF = 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 + 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 + + # 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. + makeWrapper $out/share/1password/1password $out/bin/1password \ + --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} + + runHook postInstall + ''; + + meta = with lib; { + description = "Multi-platform password manager"; + homepage = "https://1password.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 311ef3037bb8e..72b542e24fe43 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -42,11 +42,11 @@ let in stdenv.mkDerivation rec { pname = "1password"; - version = "8.6.0"; + version = "8.7.0"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "AgmLbf2YHZr8McSIL5dxp5HxOC7gLrZWIopuA7aL0JI="; + sha256 = "sha256-Ubn1KEjK8H8d8+4QNEpEOuclWyD8ujUbO5CpzWr+kSg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -128,7 +128,7 @@ in stdenv.mkDerivation rec { description = "Multi-platform password manager"; homepage = "https://1password.com/"; license = licenses.unfree; - maintainers = with maintainers; [ timstott savannidgerinel ]; + maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 9d7a4fcd94ca4..080d7b0c9fb07 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.0.0"; + version = "2.2.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-NhCs68on8LzoeOmM5eP8LwmFaVWz6aghqtHzfUlACiA=" "zip"; - i686-linux = fetch "linux_386" "sha256-vCxgEBq4YVfljq2zUpvBdZUbIiam4z64P1m9OMWq1f4=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-CDwrJ5ksXf9kwHobw4jvRUi1hLQzq4/yRlk+kHPN7UE=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-DC9hdzRjQ9iNjbe6PfRpMXzDeInq4rYSAa2nDHQMTRo=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-fKW2qSQkkC4GcnHcLLszX1pcqK67SaofVX017/cIkD0=" "zip"; + i686-linux = fetch "linux_386" "sha256-TmQ3nWG12DTpAJaxbK+hnJak0RrFhhw6rJWfV7q8wb4=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-66kFScxPmy4WgK9p1W6qBoAeYJwungHgGkTurjEJy+4=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-DD1j093SjnaPtkQ4XuU1zkRi6XPXtwnBxiqC6wZbV+w=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 7587a6ee12413..5b221384d038f 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,6 +11,7 @@ buildDotnetModule rec { pname = "archisteamfarm"; + # nixpkgs-update: no auto update version = "5.2.2.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix index db2f33332806a..51ed1def41dbc 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix @@ -55,12 +55,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.13.14"; sha256 = "07xsdx8j1rhp712kwy8jx9ang6f9zljqrvaggf0ssj5zqbliz93p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0s874cs94p1rxdy6n22ch3vr1ad1w0nkh7cnjxvxcjim2b4lfvln"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "1jpw4s862j4aa7b7wchi03gxcy02j6hhpbsfbcayiyx6ry788i15"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "0s0xpqd0nc9kldfay5j1krbc1nyfasxw4xxjx1mwpnbr7n99wbms"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.4"; sha256 = "195yldf6ws9qbb2aqrrr9bbaq9f8i0dvyb8jgrvg7jhay8j775ay"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.4"; sha256 = "0s1hkanhfv7virdynxxx28kp3w596iiplvi0jqv3dsr63gl0m0m7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1fvv5ri32pbl43628zqnim6fbv6hjxf66p0v793xdh57dzkdyh0j"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.4"; sha256 = "0244kxk61hddbgwkg7d7b3lf3w545w31m7hkmdb09b6jhk0kdf16"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.4"; sha256 = "1m8iaq78kii0z4lxwq1igm8f4yv010blrifab4zp491b0j0qg1d4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.4"; sha256 = "1sqv7vhkm4j11rl7mfvs4mmmclcdps2n4pf31ck2mcx54nr4d2kj"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) @@ -75,18 +75,17 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.3"; sha256 = "14lypnhdby9939l75y6i077x4ccb22yakzjrbapl8an438h09yf8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.3"; sha256 = "1swbrmpsayy99ycwaq68dx9ydd5h3qv9brwig6ryff1xfn1llndq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.3"; sha256 = "1py3nrfvllqlnb9mhs0qwgy7c14n33b2hfb0qc49rx22sqv8ylbp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.3"; sha256 = "0rshhsygm3id8wig8mqs846l8dck65drszpzjh1d00d1fk2bxzs4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.3"; sha256 = "0k9gc94cvn36p0v3pj296asg2sq9a8ah6lfw0xvvmd4hq2k72s79"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.3"; sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0ws9vxias9iynhcajkl9lz4c8f6hc4b5spypxd0ha33lcjaj408a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "0gjj6p2nnxzhyrmmmwiyrll782famhll9lbgj8cji1i93amxq1pb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "003s3x2ffk4g76jy4b60n6vizly03amjbli4lngsy0wzc86c0ij1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.4"; sha256 = "1zm9q9yvglsn5w786c9cjdfj1a8z4sipmvn9rhg3ps23rllxwmcc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.4"; sha256 = "1x1g3jhd57z1w3js7f6qa72vwvvjayvxzc2xxcqyscm9xy1fb3d4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.4"; sha256 = "08mrvb71kldzla2j7v10ifxrc6bwsrd4bms2rqfb7rmx00qs6yj0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.4"; sha256 = "0vgjwpy55mf6x22a634cdidckyq5hi941i9p10jqyrbnc637frv2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.4"; sha256 = "1qasm6j25lmcc4xn7f7s3jli1pypz1kfnj7j9dkjlx9mc8r356zp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.4"; sha256 = "026kl3cdbk35rjcnbj92bv7pvx20jd80hxxrnz1s4kzlm4rsp0bv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.4"; sha256 = "09i8ca56szmvyp1xlddyv3124rrcar8vgsq3pmprcylfdjarck6x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1gibwhplbanv6bz3l71w8vhzlgqsh21bms30dbf1n60v7p02fl3h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.4"; sha256 = "0h7vkcxaqjll65qka6hsz2hi0vmsizg4ys38a0qg76r0blsnk2yr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.4"; sha256 = "0gkzqsmj12wwdh548rb9drjgmyzvqalmwwq0fzvgj9c7zm1gdndi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.4"; sha256 = "1x4ysack9n57h8w1ybfyczkf3w6jsgz7ila0czm2011w4sjnyqj0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix index db2f33332806a..7b0148457faf4 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix @@ -55,12 +55,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.13.14"; sha256 = "07xsdx8j1rhp712kwy8jx9ang6f9zljqrvaggf0ssj5zqbliz93p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0s874cs94p1rxdy6n22ch3vr1ad1w0nkh7cnjxvxcjim2b4lfvln"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "1jpw4s862j4aa7b7wchi03gxcy02j6hhpbsfbcayiyx6ry788i15"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "0s0xpqd0nc9kldfay5j1krbc1nyfasxw4xxjx1mwpnbr7n99wbms"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.4"; sha256 = "195yldf6ws9qbb2aqrrr9bbaq9f8i0dvyb8jgrvg7jhay8j775ay"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.4"; sha256 = "0s1hkanhfv7virdynxxx28kp3w596iiplvi0jqv3dsr63gl0m0m7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1fvv5ri32pbl43628zqnim6fbv6hjxf66p0v793xdh57dzkdyh0j"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.4"; sha256 = "0244kxk61hddbgwkg7d7b3lf3w545w31m7hkmdb09b6jhk0kdf16"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.4"; sha256 = "1m8iaq78kii0z4lxwq1igm8f4yv010blrifab4zp491b0j0qg1d4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.4"; sha256 = "1sqv7vhkm4j11rl7mfvs4mmmclcdps2n4pf31ck2mcx54nr4d2kj"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) @@ -75,18 +75,17 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.3"; sha256 = "14lypnhdby9939l75y6i077x4ccb22yakzjrbapl8an438h09yf8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.3"; sha256 = "1swbrmpsayy99ycwaq68dx9ydd5h3qv9brwig6ryff1xfn1llndq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.3"; sha256 = "1py3nrfvllqlnb9mhs0qwgy7c14n33b2hfb0qc49rx22sqv8ylbp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.3"; sha256 = "0rshhsygm3id8wig8mqs846l8dck65drszpzjh1d00d1fk2bxzs4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.3"; sha256 = "0k9gc94cvn36p0v3pj296asg2sq9a8ah6lfw0xvvmd4hq2k72s79"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.3"; sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0ws9vxias9iynhcajkl9lz4c8f6hc4b5spypxd0ha33lcjaj408a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "0gjj6p2nnxzhyrmmmwiyrll782famhll9lbgj8cji1i93amxq1pb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "003s3x2ffk4g76jy4b60n6vizly03amjbli4lngsy0wzc86c0ij1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.4"; sha256 = "1zm9q9yvglsn5w786c9cjdfj1a8z4sipmvn9rhg3ps23rllxwmcc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.4"; sha256 = "0g1vw0wr88zlfpdg2gz8c0mriasci1kzvjia4nj19j7b0zaga7f0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.4"; sha256 = "08mrvb71kldzla2j7v10ifxrc6bwsrd4bms2rqfb7rmx00qs6yj0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.4"; sha256 = "0vgjwpy55mf6x22a634cdidckyq5hi941i9p10jqyrbnc637frv2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.4"; sha256 = "1qasm6j25lmcc4xn7f7s3jli1pypz1kfnj7j9dkjlx9mc8r356zp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.4"; sha256 = "026kl3cdbk35rjcnbj92bv7pvx20jd80hxxrnz1s4kzlm4rsp0bv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.4"; sha256 = "09i8ca56szmvyp1xlddyv3124rrcar8vgsq3pmprcylfdjarck6x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.4"; sha256 = "1gibwhplbanv6bz3l71w8vhzlgqsh21bms30dbf1n60v7p02fl3h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.4"; sha256 = "0h7vkcxaqjll65qka6hsz2hi0vmsizg4ys38a0qg76r0blsnk2yr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.4"; sha256 = "0gkzqsmj12wwdh548rb9drjgmyzvqalmwwq0fzvgj9c7zm1gdndi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.4"; sha256 = "1x4ysack9n57h8w1ybfyczkf3w6jsgz7ila0czm2011w4sjnyqj0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix index b6a3a1dfdb56e..dfe39a0fa50d5 100644 --- a/pkgs/applications/misc/ablog/default.nix +++ b/pkgs/applications/misc/ablog/default.nix @@ -6,11 +6,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "ablog"; - version = "0.10.23"; + version = "0.10.24"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fqqB17dNzcDZmFw3nj85T5zvMzY6SN/JxbB3IASOas8="; + sha256 = "sha256-bLpINvEH7B/duSRrfzvq25se0mvbbcxaEcAs8xMw6Kc="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 5f09fba4cb7a2..07cbee42694d9 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.24.0"; + version = "0.25.4"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-QyexUZNn7QGHjXYO/+1kUebTmAzdVpwG9Ile8Uh3i8Q="; + sha256 = "sha256-v6Zecv/m1GvPJk/SmLlxHFyeYbNbIB+x17+AKCI45AM="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index 2f07b6dbf9599..c2cf561524fe0 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, python3, fetchPypi }: +{ lib +, stdenv +, python3 +, fetchPypi +}: let defaultOverrides = [ @@ -37,27 +41,17 @@ with py.pkgs; buildPythonApplication rec { pname = "archivy"; - version = "1.7.1"; + version = "1.7.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UNGl5Dl/E3+uQ4HIxzHYliHF4lqD3GYdeoL+DtqUwCo="; + hash = "sha256-o5dVJDbdKgo6hMMU9mKzoouSgVWl7xSAp+Aq61VcfeU="; }; - # Relax some dependencies - postPatch = '' - substituteInPlace requirements.txt \ - --replace 'WTForms ==' 'WTForms >=' \ - --replace 'attrs == 20.2.0' 'attrs' \ - --replace 'elasticsearch ==' 'elasticsearch >=' \ - --replace 'python_dotenv ==' 'python_dotenv >=' \ - --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ - --replace 'requests ==' 'requests >=' \ - --replace 'validators ==' 'validators >=' \ - --replace 'tinydb ==' 'tinydb >=' \ - --replace 'Flask_WTF == 0.14.3' 'Flask_WTF' \ - --replace 'Flask ==' 'Flask >=' - ''; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = true; propagatedBuildInputs = [ appdirs diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix deleted file mode 100644 index 99cdc9ade21b4..0000000000000 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "wavesurfer"; - version = "1.8.5"; - - src = fetchurl { - url = "https://www.speech.kth.se/wavesurfer/wavesurfer-${version}.tar.gz"; - sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ snack tcl tk ]; - - installPhase = '' - mkdir -p $out/{bin,nix-support,share/wavesurfer/} - mv doc $out/share/wavesurfer - mv * $out/nix-support - ln -s $out/{nix-support,bin}/wavesurfer.tcl - wrapProgram "$out/nix-support/wavesurfer.tcl" \ - --set TCLLIBPATH "${snack}/lib" \ - --prefix PATH : "${lib.makeBinPath [ tcl tk ]}" - ''; - - meta = { - description = "Tool for recording, playing, editing, viewing and labeling of audio"; - homepage = "https://www.speech.kth.se/wavesurfer/"; - license = lib.licenses.bsd0; - }; -} diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 9f3c1c82b5e04..6f55e5dd17c9d 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.22.4"; + version = "1.22.5"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-Mms7Vibq1Rlb2XbxiV4o1UsjDRJcwG5ZZdPOWHjnW2A="; + sha256 = "sha256-EuHg8JrI6ZoyTXqD3v4cfk4/NovAj4fF2NY1V2ZF64c="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index ffa34d041e9c2..e100c88073972 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -3,11 +3,11 @@ , fetchFromGitLab , fetchpatch , appstream-glib +, clang , desktop-file-utils , meson , ninja , pkg-config -, python3 , rustPlatform , wrapGAppsHook , gdk-pixbuf @@ -15,7 +15,9 @@ , gst_all_1 , gtk4 , libadwaita +, libclang , openssl +, pipewire , sqlite , wayland , zbar @@ -23,33 +25,29 @@ stdenv.mkDerivation rec { pname = "authenticator"; - version = "4.0.3"; + version = "4.1.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Authenticator"; rev = version; - sha256 = "0fvs76f3fm5pxn7wg6sjbqpgip5w2j7xrh4siasdcl2bx6vsld8b"; + hash = "sha256-wl7wyj0vVDkOB7XKQFOEFzCmffTsrUsaM83fWgZ6tG0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1s97jyszxf24rs3ni11phiyvmp1wm8sicb0rh1jgwz4bn1cnakx4"; + hash = "sha256-3SzemDjLsZUXPPtSlDMBQXQf5P3Sz8caJL73mHRv1js="; }; - postPatch = '' - patchShebangs build-aux - ''; - nativeBuildInputs = [ appstream-glib + clang desktop-file-utils meson ninja pkg-config - python3 wrapGAppsHook ] ++ (with rustPlatform; [ cargoSetupHook @@ -62,39 +60,23 @@ stdenv.mkDerivation rec { glib gst_all_1.gstreamer gst_all_1.gst-plugins-base - - # gst-plugins-good needs gtk4 support: - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/767 - # We copy the way it is built from the Flatpak: - # https://gitlab.gnome.org/World/Authenticator/-/blob/master/build-aux/com.belmoussaoui.Authenticator.Devel.json - (gst_all_1.gst-plugins-good.overrideAttrs (old: { - patches = old.patches or [ ] ++ [ - "${src}/build-aux/767.patch" - ]; - mesonFlags = old.mesonFlags ++ [ - "-Dgtk3=disabled" - "-Dgtk4=enabled" - "-Dgtk4-experiments=true" - ]; - buildInputs = old.buildInputs ++ [ - gtk4 - ]; - })) - (gst_all_1.gst-plugins-bad.override { enableZbar = true; }) gtk4 libadwaita openssl + pipewire sqlite wayland zbar ]; - meta = with lib; { - broken = true; # https://gitlab.gnome.org/World/Authenticator/-/issues/271 + LIBCLANG_PATH = "${lib.getLib libclang}/lib"; + + meta = { description = "Two-factor authentication code generator for GNOME"; homepage = "https://gitlab.gnome.org/World/Authenticator"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index 70a5075ae6b9d..1dfe075fa8408 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -1,7 +1,29 @@ -{ alsa-lib, at-spi2-atk, at-spi2-core, atk, autoPatchelfHook, cairo, cups -, dbus, electron_9, expat, fetchurl, gdk-pixbuf, glib, gtk3, lib -, libappindicator-gtk3, libdbusmenu-gtk3, libuuid, makeWrapper -, nspr, nss, pango, squashfsTools, stdenv, systemd, xorg +{ alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, autoPatchelfHook +, cairo +, cups +, dbus +, electron_9 +, expat +, fetchurl +, gdk-pixbuf +, glib +, gtk3 +, lib +, libappindicator-gtk3 +, libdbusmenu-gtk3 +, libuuid +, makeWrapper +, nspr +, nss +, pango +, squashfsTools +, stdenv +, systemd +, xorg }: let @@ -11,8 +33,9 @@ in stdenv.mkDerivation rec { pname = "authy"; - version = "1.9.0"; - rev = "7"; + # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version' + version = "2.1.0"; + rev = "9"; buildInputs = [ alsa-lib @@ -50,7 +73,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - sha256 = "10az47cc3lgsdi0ixmmna08nqf9xm7gsl1ph00wfwrxzsi05ygx3"; + sha256 = "sha256-RxjxOYrbneVctyTJTMvoN/UdREohaZWb1kTdEeI6mUU="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index ac929bfa5b152..47cf2e6b07ef8 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -22,6 +22,7 @@ buildGoPackage { description = "Automatically convert your existing AutoScaling groups to up to 90% cheaper spot instances with minimal configuration changes"; license = licenses.free; maintainers = [ maintainers.costrouc ]; + mainProgram = "AutoSpotting"; platforms = platforms.unix; }; diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 458b0484af0ba..aa7150bb6b0b5 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -62,14 +62,14 @@ in stdenv.mkDerivation rec { pname = "azuredatastudio"; - version = "1.33.1"; + version = "1.35.1"; desktopItems = [ desktopItem urlHandlerDesktopItem ]; src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable"; - sha256 = "sha256-jgZ8iZkic26JSgFTXpu1u1+MM4G5AqyW6Mj1tx5QwcY="; + sha256 = "sha256-b/ha+81TlffnvSENzaePvfFugcKJffvjRU7y+x60OuQ="; }; nativeBuildInputs = [ @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ]; # this will most likely need to be updated when azuredatastudio's version changes - sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/3.0.0-release.139"; + sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/3.0.0-release.215"; rpath = lib.concatStringsSep ":" [ atomEnv.libPath diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 63a04d1811563..66ad4046d1fbe 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, openssl, wrapGAppsHook, - avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } + avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }, + fetchpatch }: mkDerivation rec { @@ -15,6 +16,16 @@ mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # This patch can be removed when a new version of barrier (greater than 2.4.0) + # is released, which will contain this commit. + (fetchpatch { + name = "add-missing-cstddef-header.patch"; + url = "https://github.com/debauchee/barrier/commit/4b12265ae5d324b942698a3177e1d8b1749414d7.patch"; + sha256 = "sha256-ajMxP7szBFi4h8cMT3qswfa3k/QiJ1FGI3q9fkCFQQk="; + }) + ]; + buildInputs = [ curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; nativeBuildInputs = [ cmake wrapGAppsHook ]; diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 1761722362010..f55b6ef791435 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,29 +1,49 @@ -{ lib, mkDerivation, fetchurl, cmake, pkg-config, sword, boost, clucene_core -, qtbase, qttools, qtsvg, perlPackages, docbook_xml_dtd_45 -, docbook_xsl_ns }: +{ lib, mkDerivation +, fetchFromGitHub +, cmake +, docbook_xml_dtd_45 +, pkg-config +, wrapQtAppsHook +, boost +, clucene_core_2 +, docbook_xsl_ns +, perlPackages +, qtbase +, qtsvg +, qttools +, sword +}: mkDerivation rec { pname = "bibletime"; version = "3.0.2"; - src = fetchurl { - url = "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/JNjnU/DGD4YRtrKzX7t6MgNCZYihdgTJc+Jbr9IYJ4="; + src = fetchFromGitHub { + owner = "bibletime"; + repo = "bibletime"; + rev = "v${version}"; + hash = "sha256-8X5LkquALFnG0yRayZYjeymHDcOzINBv0MXeVBsOnfI="; }; - nativeBuildInputs = [ cmake pkg-config docbook_xml_dtd_45 ]; + nativeBuildInputs = [ + cmake + docbook_xml_dtd_45 + pkg-config + wrapQtAppsHook + ]; + buildInputs = [ - sword boost - clucene_core + clucene_core_2 + perlPackages.Po4a qtbase - qttools qtsvg - perlPackages.Po4a + qttools + sword ]; preConfigure = '' - export CLUCENE_HOME=${clucene_core}; + export CLUCENE_HOME=${clucene_core_2}; export SWORD_HOME=${sword}; ''; @@ -35,7 +55,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A Qt4 Bible study tool"; + description = "A powerful cross platform Bible study tool"; homepage = "http://www.bibletime.info/"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/bicon/default.nix b/pkgs/applications/misc/bicon/default.nix index 0b3ca09c6d041..dfb424ea9da56 100644 --- a/pkgs/applications/misc/bicon/default.nix +++ b/pkgs/applications/misc/bicon/default.nix @@ -1,24 +1,35 @@ { lib, stdenv - , fetchFromGitHub - , autoreconfHook - , pkg-config - , perl - , fribidi - , kbd - , xkbutils +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, pkg-config +, perl +, fribidi +, kbd +, xkbutils }: stdenv.mkDerivation rec { pname = "bicon"; - version = "unstable-2018-09-10"; + version = "unstable-2020-06-04"; src = fetchFromGitHub { owner = "behdad"; repo = pname; - rev = "38725c062a83ab19c4e4b4bc20eb9535561aa76c"; - sha256 = "0hdslrci8pq300f3rrjsvl5psfrxdwyxf9g2m5g789sr049dksnq"; + rev = "64ae10c94b94a573735a2c2b1502334b86d3b1f7"; + sha256 = "0ixsf65j4dbdl2aazjc2j0hiagbp6svvfwfmyivha0i1k5yx12v1"; }; + patches = [ + # Fix build on clang-13. Pull the change pending upstream + # inclusion: https://github.com/behdad/bicon/pull/29 + (fetchpatch { + name = "clang.patch"; + url = "https://github.com/behdad/bicon/commit/20f5a79571f222f96e07d7c0c5e76e2c9ff1c59a.patch"; + sha256 = "0l1dm7w52k57nv3lvz5pkbwp021mlsk3csyalxi90np1lx5sqbd1"; + }) + ]; + buildInputs = [ fribidi kbd xkbutils perl ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/misc/binance/default.nix b/pkgs/applications/misc/binance/default.nix index 86445f25984e0..d5d6f6b5358ea 100644 --- a/pkgs/applications/misc/binance/default.nix +++ b/pkgs/applications/misc/binance/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "binance"; - version = "1.30.1"; + version = "1.35.0"; src = fetchurl { url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb"; - sha256 = "sha256-Su8pVf5GSBK770D778MmrgYr0ov/JBTNcnL8EZzoG3U="; + sha256 = "sha256-6c7nrdViunnvPqqbt5/LQp2iS4EgZOCQ9PLcG+bY1YQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 8ecb1cf1d01da..242fc499b658b 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -20,21 +20,23 @@ let in python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2022.3.28-trento-1"; - sha256 = "1mpvym7b88pb0xxij32arj31q5m6b3z47p8zv9njvkfs0151b2v4"; - # Note: Update via pkgs/applications/misc/bottles/update.py - # mostly copypasted from pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py + version = "2022.5.2-trento"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - inherit sha256; + sha256 = "sha256-9auQm8rmySjPQmhueGMRj4DsQiKhCGtE97byc/h+v84="; }; postPatch = '' chmod +x build-aux/meson/postinstall.py patchShebangs build-aux/meson/postinstall.py + + substituteInPlace src/backend/wine/winecommand.py \ + --replace \ + 'self.__get_runner()' \ + '(lambda r: (f"${steam-run}/bin/steam-run {r}", r)[r == "wine" or r == "wine64"])(self.__get_runner())' ''; nativeBuildInputs = [ @@ -89,22 +91,10 @@ python3Packages.buildPythonApplication rec { strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 dontWrapGApps = true; # prevent double wrapping - preConfigure = '' - patchShebangs build-aux/meson/postinstall.py - substituteInPlace src/backend/wine/winecommand.py \ - --replace \ - 'self.__get_runner()' \ - '(lambda r: (f"${steam-run}/bin/steam-run {r}", r)[r == "wine" or r == "wine64"])(self.__get_runner())' - ''; - preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - passthru = { - updateScript = ./update.py; - }; - meta = with lib; { description = "An easy-to-use wineprefix manager"; homepage = "https://usebottles.com/"; diff --git a/pkgs/applications/misc/bottles/update.py b/pkgs/applications/misc/bottles/update.py deleted file mode 100755 index 6adacd7d0e071..0000000000000 --- a/pkgs/applications/misc/bottles/update.py +++ /dev/null @@ -1,65 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i python3 -p python3 nix nix-prefetch-git - -import fileinput -import json -import os -import re -import subprocess - -from datetime import datetime -from urllib.request import urlopen, Request - - -DIR = os.path.dirname(os.path.abspath(__file__)) -HEADERS = {'Accept': 'application/vnd.github.v3+json'} - - -def github_api_request(endpoint): - base_url = 'https://api.github.com/' - request = Request(base_url + endpoint, headers=HEADERS) - with urlopen(request) as http_response: - return json.loads(http_response.read().decode('utf-8')) - - -def get_commit_date(repo, sha): - url = f'https://api.github.com/repos/{repo}/commits/{sha}' - request = Request(url, headers=HEADERS) - with urlopen(request) as http_response: - commit = json.loads(http_response.read().decode()) - date = commit['commit']['committer']['date'].rstrip('Z') - date = datetime.fromisoformat(date).date().isoformat() - return 'unstable-' + date - - -def nix_prefetch_git(url, rev): - """Prefetches the requested Git revision (incl. submodules) of the given repository URL.""" - print(f'nix-prefetch-git {url} {rev}') - out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev, '--fetch-submodules']) - return json.loads(out)['sha256'] - - -def nix_prefetch_url(url, unpack=False): - """Prefetches the content of the given URL.""" - print(f'nix-prefetch-url {url}') - options = ['--type', 'sha256'] - if unpack: - options += ['--unpack'] - out = subprocess.check_output(['nix-prefetch-url'] + options + [url]) - return out.decode('utf-8').rstrip() - - -def update_file(relpath, version, sha256): - file_path = os.path.join(DIR, relpath) - with fileinput.FileInput(file_path, inplace=True) as f: - for line in f: - result = line - result = re.sub(r'^ version = ".+";', f' version = "{version}";', result) - result = re.sub(r'^ sha256 = ".+";', f' sha256 = "{sha256}";', result) - print(result, end='') - - -if __name__ == "__main__": - bottles_version = github_api_request('repos/bottlesdevs/Bottles/releases/latest')['tag_name'] - bottles_hash = nix_prefetch_git('https://github.com/bottlesdevs/Bottles.git', bottles_version) - update_file('default.nix', bottles_version, bottles_hash) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 5227f0e6f474f..990c4eb73e7bf 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -7,8 +7,9 @@ let version = "1.3.24"; src = oldAttrs.src.override { inherit version; - sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; + hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; }; + doCheck = false; }); sqlalchemy-utils = super.sqlalchemy-utils.overridePythonAttrs (oldAttrs: rec { version = "0.36.6"; diff --git a/pkgs/applications/misc/calcoo/0001-javac-encoding.diff b/pkgs/applications/misc/calcoo/0001-javac-encoding.diff new file mode 100644 index 0000000000000..c16616b3dd044 --- /dev/null +++ b/pkgs/applications/misc/calcoo/0001-javac-encoding.diff @@ -0,0 +1,21 @@ +diff -Naur calcoo-2.1.0-old/build.xml calcoo-2.1.0-new/build.xml +--- calcoo-2.1.0-old/build.xml 1969-12-31 21:00:01.000000000 -0300 ++++ calcoo-2.1.0-new/build.xml 2022-04-16 15:41:59.763861191 -0300 +@@ -16,7 +16,7 @@ + <!-- Create the build directory structure used by compile --> + <mkdir dir="${build}"/> + <!-- Compile the java code from ${src} into ${build} --> +- <javac srcdir="${src}" destdir="${build}" includeantruntime="false"/> ++ <javac srcdir="${src}" destdir="${build}" includeantruntime="false" encoding="iso-8859-1"/> + </target> + + <target name="copyresource" depends="compile"> +@@ -31,7 +31,7 @@ + <target name="testcompile"> + <mkdir dir="${testbuild}"/> + <!-- Compile the java code from ${testsrc} into ${testbuild} --> +- <javac srcdir="${testsrc}" destdir="${testbuild}" includeantruntime="false"> ++ <javac srcdir="${testsrc}" destdir="${testbuild}" includeantruntime="false" encoding="iso-8859-1"> + <classpath> + <pathelement location="${junitpath}\junit.jar"/> + <pathelement location="${junitpath}\hamcrest-core.jar"/> diff --git a/pkgs/applications/misc/calcoo/default.nix b/pkgs/applications/misc/calcoo/default.nix new file mode 100644 index 0000000000000..4af71bae653ea --- /dev/null +++ b/pkgs/applications/misc/calcoo/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchzip +, ant +, jdk +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "calcoo"; + version = "2.1.0"; + + src = fetchzip { + url = "mirror://sourceforge/project/calcoo/calcoo/${version}/${pname}-${version}.zip"; + hash = "sha256-Bdavj7RaI5CkWiOJY+TPRIRfNelfW5qdl/74J1KZPI0="; + }; + + patches = [ + # Sets javac encoding option on build.xml + ./0001-javac-encoding.diff + ]; + + nativeBuildInputs = [ + ant + jdk + makeWrapper + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + ant + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} + mv dist/lib/calcoo.jar $out/share/${pname} + + makeWrapper ${jdk}/bin/java $out/bin/calcoo \ + --add-flags "-jar $out/share/${pname}/calcoo.jar" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://calcoo.sourceforge.net/"; + description = "RPN and algebraic scientific calculator"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (jdk.meta) platforms; + }; +} diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 837fcc5c27d63..740c463038c8d 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "calcurse"; - version = "4.7.1"; + version = "4.8.0"; src = fetchurl { url = "https://calcurse.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-CnxV0HZ0Vp0WbAsOdYeyly09qBYM231gsdvSiVgDr7A="; + sha256 = "sha256-SKc2ZmzEtrUwEtc7OqcBUsGLQebHtIB/qw8WjWRa4yw="; }; buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ]; @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { be used to filter and format appointments, making it suitable for use in scripts. ''; homepage = "https://calcurse.org/"; + changelog = "https://git.calcurse.org/calcurse.git/plain/CHANGES.md?h=v${version}"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b3754fed17963..753be1eb88cff 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -28,11 +28,11 @@ mkDerivation rec { pname = "calibre"; - version = "5.37.0"; + version = "5.42.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-x2u4v0k05WMATSsuo76NnqChIz8BcTuZfPkZa0uLnMY="; + hash = "sha256-pob9GZl3Wiky5aMGGvcNQdDrKh19bo+n5ihdS45X+Vg="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 @@ -104,7 +104,6 @@ mkDerivation rec { pillow pyqt-builder pyqt5 - pyqtwebengine python regex sip @@ -114,6 +113,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) [ + # 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 ] ++ lib.optional (unrarSupport) unrardll ); diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 0adab84830d2d..2c369e64b5d23 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation { sed -i 's|#include <exiv2/exif.hpp>|#include <exiv2/exiv2.hpp>|' src/jpeg-utils.cpp ''; + # Add workaround for -fno-common toolchains like upstream gcc-10 to + # avoid build failures like: + # ld: stats.o:/build/cataract-675e647/src/stats.h:24: multiple definition of + # `stats_images'; cgg.o:/build/cataract-675e647/src/stats.h:24: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + installPhase = '' mkdir $out/{bin,share} -p cp src/cgg{,-dirgen} $out/bin/ diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index 768eb7b308e40..494ed3001e5c1 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, xlibsWrapper, motif }: +{ stdenv, lib, fetchFromGitHub, xlibsWrapper, motif +, withAudioTracking ? false, libpulseaudio, aubio }: stdenv.mkDerivation { pname = "catclock"; - version = "unstable-2015-10-04"; + version = "unstable-2021-11-15"; src = fetchFromGitHub { owner = "BarkyTheDog"; repo = "catclock"; - rev = "d20b8825b38477a144e8a2a4bbd4779adb3620ac"; - sha256 = "0fiv9rj8p8mifv24cxljdrrmh357q70zmzdci9bpbxnhs1gdpr63"; + rev = "b2f277974b5a80667647303cabf8a89d6d6a4290"; + sha256 = "0ls02j9waqg155rj6whisqm7ppsdabgkrln92n4rmkgnwv25hdbi"; }; preInstall = '' @@ -17,16 +18,18 @@ stdenv.mkDerivation { cp xclock.man $out/share/man/man1/xclock.1 ''; - makeFlags = [ - "DESTINATION=$(out)/bin/" - ]; + makeFlags = [ "DESTINATION=$(out)/bin/" ] + ++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1"; - buildInputs = [ xlibsWrapper motif ]; + buildInputs = [ xlibsWrapper motif ] + ++ lib.optionals withAudioTracking [ libpulseaudio aubio ]; meta = with lib; { homepage = "http://codefromabove.com/2014/05/catclock/"; + description = "Analog / Digital / Cat clock for X"; license = with licenses; mit; maintainers = with maintainers; [ ramkromberg ]; + mainProgram = "xclock"; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 907bc7a53e05f..61f0307f7c205 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,24 +2,23 @@ buildGoModule rec { pname = "charm"; - version = "0.10.3"; + version = "0.12.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-7WdSIpmpN8Zz2k5PveYZoCueQo5sLxLLZvZdzxRlkaE="; + sha256 = "sha256-vNy2ai1s7TKCymYznvT0Wo6lg9qEyDzz8l3SYzScz8g="; }; - vendorSha256 = "sha256-5cqZxh2uvmJV7DtAGzQwt//heF3kF9mjyB0KAs8nWZY="; - - doCheck = false; + vendorSha256 = "sha256-6PGdM7aa1BGNZc3M35PJpmrlPUqkykxfTELdgeKcJD4="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; meta = with lib; { description = "Manage your charm account on the CLI"; homepage = "https://github.com/charmbracelet/charm"; + changelog = "https://github.com/charmbracelet/charm/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ penguwin ]; }; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 1050a91e99a12..763b8bd34d118 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "CopyQ"; - version = "6.0.1"; + version = "6.1.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "sha256-edrRgnjbszqJLbGLE4anCJSGApymvK0O+2ks5jWe8aw="; + sha256 = "sha256-2BWyLVxH50G+S/Hp8E5hWG64DcIamtZPGm0nSMwEhY4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 8505c97e1bc11..09a7595765d9c 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -1,5 +1,5 @@ { lib -, mkDerivation +, stdenv , nix-update-script , fetchFromGitHub , substituteAll @@ -11,74 +11,30 @@ , qtmultimedia , qtx11extras , qttranslations +, wrapQtAppsHook }: -let - singleapplication = fetchFromGitHub { - owner = "itay-grudev"; - repo = "SingleApplication"; - rev = "v3.2.0"; - sha256 = "0w3z97dcqcz3bf7w6fja4smkafmx9kvhzb9px4k2nfmmyxh4yfma"; - }; - qtaskbarcontrol = fetchFromGitHub { - owner = "Skycoder42"; - repo = "QTaskbarControl"; - rev = "2.0.2"; - sha256 = "0iymcvq3pv07fs9l4kh6hi1igqr7957iqndhsmg9fqkalf8nqyad"; - }; - qhotkey = fetchFromGitHub { - owner = "Skycoder42"; - repo = "QHotkey"; - rev = "1.4.2"; - sha256 = "0391fkqrxqmzpvms4rk06aq05l308k6sadp6y3czq0gx2kng8mn9"; - }; - qonlinetranslator = fetchFromGitHub { - owner = "crow-translate"; - repo = "QOnlineTranslator"; - rev = "1.5.3"; - sha256 = "sha256-L8y4vazbWD5SC7itxQOjEcX10w0laewxTOGz+Yd+kVM="; - }; - circleflags = fetchFromGitHub { - owner = "HatScripts"; - repo = "circle-flags"; - rev = "v2.3.0"; - sha256 = "sha256-KabmewF1Xf/1JQuzolrlRyLJR8O5j+/iT+29/QtOQVE="; - }; - fluent = fetchFromGitHub { - owner = "vinceliuice"; - repo = "Fluent-icon-theme"; - rev = "2021-08-15"; - sha256 = "sha256-uBu0vbKfhhnPKGwrnSBjPwS9ncH1iAlmeefAcpckOm4="; - }; -in -mkDerivation rec { + +stdenv.mkDerivation rec { pname = "crow-translate"; - version = "2.9.2"; + version = "2.9.5"; src = fetchFromGitHub { owner = "crow-translate"; repo = pname; rev = version; - sha256 = "sha256-cxfBdoqGVmtCaXyw6QzXj2V44wKyVal/uqsddwIdvjw="; + sha256 = "sha256-AzwJJ85vxXsc0+W3QM8citN5f0AD6APQVd9628cfLgI="; + fetchSubmodules = true; }; patches = [ (substituteAll { - src = ./dont-fetch-external-libs.patch; - inherit singleapplication qtaskbarcontrol qhotkey qonlinetranslator circleflags fluent; - }) - (substituteAll { # See https://github.com/NixOS/nixpkgs/issues/86054 src = ./fix-qttranslations-path.patch; inherit qttranslations; }) ]; - postPatch = '' - cp -r ${circleflags}/flags/* data/icons - cp -r ${fluent}/src/* data/icons - ''; - - nativeBuildInputs = [ cmake extra-cmake-modules qttools ]; + nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ]; buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ]; diff --git a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch deleted file mode 100644 index 0bfdc9ef2f744..0000000000000 --- a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git i/CMakeLists.txt w/CMakeLists.txt -index 375b17c..106efa9 100644 ---- i/CMakeLists.txt -+++ w/CMakeLists.txt -@@ -114,13 +114,11 @@ qt5_add_translation(QM_FILES - ) - - configure_file(src/cmake.h.in cmake.h) --configure_file(data/icons/flags.qrc ${CircleFlags_SOURCE_DIR}/flags/flags.qrc COPYONLY) --configure_file(data/icons/fluent-icon-theme.qrc ${FluentIconTheme_SOURCE_DIR}/src/fluent-icon-theme.qrc COPYONLY) - - add_executable(${PROJECT_NAME} -- ${CircleFlags_SOURCE_DIR}/flags/flags.qrc -+ data/icons/flags.qrc - ${QM_FILES} -- ${FluentIconTheme_SOURCE_DIR}/src/fluent-icon-theme.qrc -+ data/icons/fluent-icon-theme.qrc - data/icons/engines/engines.qrc - src/addlanguagedialog.cpp - src/addlanguagedialog.ui -diff --git i/cmake/ExternalLibraries.cmake w/cmake/ExternalLibraries.cmake -index c92e745..f265f03 100644 ---- i/cmake/ExternalLibraries.cmake -+++ w/cmake/ExternalLibraries.cmake -@@ -2,34 +2,28 @@ include(FetchContent) - - set(QAPPLICATION_CLASS QApplication) - FetchContent_Declare(SingleApplication -- GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication -- GIT_TAG v3.2.0 -+ SOURCE_DIR @singleapplication@ - ) - - FetchContent_Declare(QTaskbarControl -- GIT_REPOSITORY https://github.com/Skycoder42/QTaskbarControl -- GIT_TAG 2.0.2 -+ SOURCE_DIR @qtaskbarcontrol@ - ) - - option(QHOTKEY_INSTALL OFF) - FetchContent_Declare(QHotkey -- GIT_REPOSITORY https://github.com/Skycoder42/QHotkey -- GIT_TAG 1.4.2 -+ SOURCE_DIR @qhotkey@ - ) - - FetchContent_Declare(QOnlineTranslator -- GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator -- GIT_TAG 1.5.3 -+ SOURCE_DIR @qonlinetranslator@ - ) - - FetchContent_Declare(CircleFlags -- GIT_REPOSITORY https://github.com/HatScripts/circle-flags -- GIT_TAG v2.3.0 -+ SOURCE_DIR @circleflags@ - ) - - FetchContent_Declare(FluentIconTheme -- GIT_REPOSITORY https://github.com/vinceliuice/Fluent-icon-theme -- GIT_TAG 2021-08-15 -+ SOURCE_DIR @fluent@ - ) - - FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags FluentIconTheme) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 18b61bc8a9bc6..42355054ee881 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-6XPgSreWcRXN8ymP7zS5a7Cfl9wSLMxjmiugJPp6l+g="; + sha256 = "sha256-cIA6W82XEeW0k9WNygZ/KVFZE31QThpkV4OazVEvmtw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 317613ffd533a..7506f57e73fa6 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "1.24.1"; + version = "1.24.3"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-B6MWoGYNjFBUxnSqAXt2DRRjSlmgbqIC7qEoMFGQ+zU="; + sha256 = "sha256-aAP5hyo4t5IX4wLwyNDuXxAYbAkS36S1UewYs9ZFJM4="; }; - vendorSha256 = "sha256-NP+Is7Dxz4LGzx5vpv8pJOJhodAYHia1JXYfhJD54as="; + vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index c5a0bc0fb85a2..439067187c2d2 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -73,6 +73,7 @@ productTargetPath = "product/community/target/products/org.jkiss.dbeaver.core.product"; platformMap = { + aarch64-darwin = "aarch64"; aarch64-linux = "aarch64"; x86_64-darwin = "x86_64"; x86_64-linux = "x86_64"; @@ -127,7 +128,7 @@ Teradata, Firebird, Derby, etc. ''; license = licenses.asl20; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; maintainers = with maintainers; [ jojosch mkg20001 ]; }; } diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/applications/misc/debian-goodies/default.nix new file mode 100644 index 0000000000000..20d47e204f7cc --- /dev/null +++ b/pkgs/applications/misc/debian-goodies/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchFromGitLab +, curl +, dialog +, installShellFiles +, perl +, python3 +}: + +stdenv.mkDerivation rec { + pname = "debian-goodies"; + version = "0.87"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "debian-goodies"; + rev = "debian/${version}"; + sha256 = "sha256-7O2AY7tWYiOIy4ImFBxWu6S+ljc3VmqS/j4KyEzVVIA="; + }; + + postPatch = '' + substituteInPlace debmany/debmany \ + --replace "/usr/bin/dialog" "${dialog}/bin/dialog" \ + --replace "/usr/bin/whiptail" "${python3.pkgs.snack}/bin/whiptail" + + substituteInPlace dman \ + --replace "curl" "${curl}/bin/curl" + ''; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = [ + perl + python3 + ]; + + installPhase = '' + runHook preInstall + + # see https://salsa.debian.org/debian/debian-goodies/-/blob/master/debian/install + for bin in checkrestart dgrep dglob debget dpigs debman dman popbugs which-pkg-broke which-pkg-broke-build dhomepage debmany/debmany check-enhancements find-dbgsym-packages; do + install -Dm755 $bin -t $out/bin + done + + install -Dm644 find-dbgsym-packages-templates/* -t $out/share/debian-goodies/find-dbgsym-packages-templates/ + + installShellCompletion --bash \ + debmany/bash_completion/debmany \ + debian/bash-completion + + installManPage \ + *.1 \ + debmany/man/*.1 \ + *.8 + + runHook postInstall + ''; + + meta = with lib; { + description = "Small toolbox-style utilities for Debian systems"; + homepage = "https://salsa.debian.org/debian/debian-goodies"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 116d5430c2a81..6afd9ee624208 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -3,7 +3,7 @@ , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver , wayland, wayland-protocols , libXinerama, libnotify, pango, xorgproto, librsvg -, testVersion, dunst +, testers, dunst }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - passthru.tests.version = testVersion { package = dunst; }; + passthru.tests.version = testers.testVersion { package = dunst; }; meta = with lib; { description = "Lightweight and customizable notification daemon"; diff --git a/pkgs/applications/misc/electrum-grs/default.nix b/pkgs/applications/misc/electrum-grs/default.nix index c8fb9f84ad190..d35941ccfb1bb 100644 --- a/pkgs/applications/misc/electrum-grs/default.nix +++ b/pkgs/applications/misc/electrum-grs/default.nix @@ -9,7 +9,7 @@ }: let - version = "4.1.5"; + version = "4.2.0"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -20,19 +20,6 @@ let if stdenv.isLinux then "libzbar.so.0" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; - py = python3.override { - packageOverrides = self: super: { - - aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec { - version = "0.18.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0"; - }; - }); - }; - }; - in python3.pkgs.buildPythonApplication { @@ -43,17 +30,12 @@ python3.pkgs.buildPythonApplication { owner = "Groestlcoin"; repo = "electrum-grs"; rev = "refs/tags/v${version}"; - sha256 = "0wvbjj80r1zxpz24adkicxsdjnv3nciga6rl1wfmky463w03rca2"; + sha256 = "15n6snrs1kgdqkhp4wgs0bxxdz6mzl8dvf8h7s0jzc6r4b74vv3n"; }; - postPatch = '' - substituteInPlace contrib/requirements/requirements.txt \ - --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" - ''; - nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiohttp aiohttp-socks aiorpcx diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 84fae703a0c3f..c4b0df2cc0d51 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://anongit.freedesktop.org/${pname}"; rev = "refs/tags/${pname}-${version}"; - sha256 = "168gdhzj11f4nk94a6z696sm8v1njzwww69bn6wr97l17897913g"; + sha256 = "sha256-0UGcoGkNF/19aSTWNEFAmZP7seL/yObXsOLlZLiyG2Q="; }; meta = with lib; { diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index 4486381b8b346..ef82703ac4cfd 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage { pname = "faircamp"; - version = "unstable-2022-01-19"; + version = "unstable-2022-03-20"; # TODO when switching to a stable release, use fetchFromGitea and add a # version test. Meanwhile, fetchgit is used to make unstableGitUpdater work. src = fetchgit { url = "https://codeberg.org/simonrepp/faircamp.git"; - rev = "f8ffc7a35a12251b83966b35c63f72b4912f75a9"; - sha256 = "sha256-9t42+813IPLUChbLkcwzoCr7FXSL1g+ZG6I3d+7pmec="; + rev = "863cecb468a58a774bd2d1d93f99f3c8ecd8205c"; + sha256 = "sha256-JodIo601BYesbiHarnBk4/GuFR/bpCswxQbaysRP+CI="; }; - cargoHash = "sha256-24ALBede3W8rjlBRdtL0aazRyK1RmNLdHF/bt5i4S5Y="; + cargoHash = "sha256-XqsUUc+s01t4KHtktbNhm52r0NeLbcBg5DVw3Xn0oZk="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/applications/misc/ff2mpv/default.nix b/pkgs/applications/misc/ff2mpv/default.nix new file mode 100644 index 0000000000000..b26e09012cf53 --- /dev/null +++ b/pkgs/applications/misc/ff2mpv/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, python3, mpv }: + +stdenv.mkDerivation rec { + pname = "ff2mpv"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "woodruffw"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-sxUp/JlmnYW2sPDpIO2/q40cVJBVDveJvbQMT70yjP4="; + }; + + buildInputs = [ python3 mpv ]; + + postPatch = '' + patchShebangs . + substituteInPlace ff2mpv.json \ + --replace '/home/william/scripts/ff2mpv' "$out/bin/ff2mpv.py" + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib/mozilla/native-messaging-hosts + cp ff2mpv.py $out/bin + cp ff2mpv.json $out/lib/mozilla/native-messaging-hosts + ''; + + meta = { + description = "Native Messaging Host for ff2mpv firefox addon."; + homepage = "https://github.com/woodruffw/ff2mpv"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Enzime ]; + }; +} diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 766b05b2e1458..5d709235741a4 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.17.1"; + version = "1.17.2"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-F4hAFLsZmRg/zeTHo9eYoT0BasorynGaSzNSbKr2/JE="; + sha256 = "sha256-kb7t3H2gpiN6/N/LxyG/Vu5Cp/zytAePsXmacxVyWCk="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/foxitreader/default.nix b/pkgs/applications/misc/foxitreader/default.nix index e69361dbd93e4..b206d14323b1c 100644 --- a/pkgs/applications/misc/foxitreader/default.nix +++ b/pkgs/applications/misc/foxitreader/default.nix @@ -74,6 +74,7 @@ mkDerivation rec { description = "A viewer for PDF documents"; homepage = "https://www.foxitsoftware.com/"; license = licenses.unfree; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ p-h rhoriguchi ]; }; } diff --git a/pkgs/applications/misc/fspy/default.nix b/pkgs/applications/misc/fspy/default.nix index 4baf053d713f1..d2384446ed3c2 100644 --- a/pkgs/applications/misc/fspy/default.nix +++ b/pkgs/applications/misc/fspy/default.nix @@ -2,7 +2,6 @@ let pname = "fspy"; version = "1.0.3"; - name = "${pname}-v${version}"; src = fetchurl { url = "https://github.com/stuffmatic/fSpy/releases/download/v${version}/${pname}-${version}-x86_64.AppImage"; @@ -10,10 +9,10 @@ let }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + mv $out/bin/${pname}-${version} $out/bin/${pname} ''; meta = with lib; { diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 46bd189fcf8a8..0d563da0eddf8 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.21.1"; + version = "1.21.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oLVrYM7F9JFDYgQL/XgJS9LeUexqcSlvmkwyAk1bpoY="; + sha256 = "sha256-xn+Y8WOIH6zkExO3ZNya3ZBwh90oSjSk00xfO0c23To="; }; propagatedBuildInputs = [ requests yt-dlp ]; diff --git a/pkgs/applications/misc/globe-cli/default.nix b/pkgs/applications/misc/globe-cli/default.nix index e7ec63f97844a..9d2a5bbc786f8 100644 --- a/pkgs/applications/misc/globe-cli/default.nix +++ b/pkgs/applications/misc/globe-cli/default.nix @@ -16,5 +16,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/adamsky/globe"; license = licenses.gpl3Only; maintainers = with maintainers; [ devhell ]; + mainProgram = "globe"; }; } diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 1479fe7bc7d85..5f03b8ea7e76e 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; preFixup = '' - gappsWrapperArgs+=(--add-flags "--datapath \"$out/share\""); + gappsWrapperArgs+=(--add-flags "--datapath $out/share"); ''; meta = { diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/pkgs/applications/misc/gnome-firmware-updater/default.nix deleted file mode 100644 index 30d3b57003d1e..0000000000000 --- a/pkgs/applications/misc/gnome-firmware-updater/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib, stdenv -, fetchFromGitLab -, fetchpatch -, appstream-glib -, desktop-file-utils -, fwupd -, gettext -, glib -, gtk3 -, libsoup -, libxmlb -, meson -, ninja -, pkg-config -, systemd -, help2man -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "gnome-firmware-updater"; - version = "3.34.0"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "hughsie"; - repo = "gnome-firmware-updater"; - rev = version; - sha256 = "04pll0fzf4nr276kfw89r0524s6ppmls5rz4vq2j8c8gb50g0b6l"; - }; - - patches = [ - # Fixes manual build - (fetchpatch { - url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch"; - sha256 = "02303ip4ri5pv1bls8c0njb00qhn0jd0d8rmvsrig0fmacwfvc06"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch"; - sha256 = "1yfxd7qsg3gwpamg0m2sbcfrgks59w70r9728arrc4pwx1hia2q1"; - }) - ]; - - nativeBuildInputs = [ - appstream-glib # for ITS rules - desktop-file-utils - gettext - help2man - meson - ninja - pkg-config - wrapGAppsHook - ]; - - buildInputs = [ - fwupd - glib - gtk3 - libsoup - libxmlb - systemd - ]; - - mesonFlags = [ - "-Dconsolekit=false" - ]; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater"; - description = "Tool for installing firmware on devices"; - license = licenses.gpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix new file mode 100644 index 0000000000000..f3e32f195fc04 --- /dev/null +++ b/pkgs/applications/misc/gnome-firmware/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, lib +, fetchFromGitLab +, appstream-glib +, desktop-file-utils +, fwupd +, gettext +, glib +, gtk4 +, libadwaita +, libxmlb +, meson +, ninja +, pkg-config +, systemd +, help2man +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "gnome-firmware"; + version = "42.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "gnome-firmware"; + rev = version; + sha256 = "9QZ98EElENWsME/jXoj9YJl2e+ipyLm0g4grQUwmnuE="; + }; + + nativeBuildInputs = [ + appstream-glib # for ITS rules + desktop-file-utils + gettext + help2man + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + fwupd + glib + gtk4 + libadwaita + libxmlb + systemd + ]; + + mesonFlags = [ + "-Dconsolekit=false" + ]; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/World/gnome-firmware"; + description = "Tool for installing firmware on devices"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix index 00e55b9e7a8b1..f937b12302668 100644 --- a/pkgs/applications/misc/gnome-secrets/default.nix +++ b/pkgs/applications/misc/gnome-secrets/default.nix @@ -5,7 +5,6 @@ , gettext , fetchFromGitLab , python3Packages -, libpwquality , wrapGAppsHook4 , gtk4 , glib @@ -17,7 +16,7 @@ python3Packages.buildPythonApplication rec { pname = "gnome-secrets"; - version = "6.1"; + version = "6.4"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -26,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "secrets"; rev = version; - sha256 = "sha256-TBGNiiR0GW8s/Efi4/Qqvwd87Ir0gCLGPfBmmqqSwQ8="; + sha256 = "sha256-qO2DJ/Eb9+G1R3un2+n9Tf6oxpGrEuH3SBrajQ9tCPU="; }; nativeBuildInputs = [ @@ -45,6 +44,7 @@ python3Packages.buildPythonApplication rec { glib gdk-pixbuf libadwaita + python3Packages.libpwquality.dev # Use python-enabled libpwquality ]; propagatedBuildInputs = with python3Packages; [ @@ -52,14 +52,9 @@ python3Packages.buildPythonApplication rec { construct pykeepass pyotp - ] ++ [ - libpwquality # using the python bindings + libpwquality ]; - postPatch = '' - substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"; - ''; - # Prevent double wrapping, let the Python wrapper use the args in preFixup. dontWrapGApps = true; @@ -76,4 +71,3 @@ python3Packages.buildPythonApplication rec { maintainers = with maintainers; [ mvnetbiz ]; }; } - diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 8c596b06fd0ff..1c8fe38ea8e42 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.5.2"; + version = "3.6.0"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-PCr8lDQzypgozKCzD8FV4X4ls5lYZRMey1vfcFzo+Uc="; + sha256 = "sha256-gYlHZuRKpBpC0will4EoJGyHW41vSjAT8Yg8yK6PCms="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index de6071ef06008..5014031d6c82e 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, kubectl, stdenv }: buildGoModule rec { pname = "gsctl"; @@ -13,10 +13,16 @@ buildGoModule rec { vendorSha256 = "sha256-NeRABlKUpD2ZHRid/vu34Dh9uHZ+7IXWFPX8jkexUog="; - ldflags = - [ "-s" "-w" "-X github.com/giantswarm/gsctl/buildinfo.Version=${version}" ]; + ldflags = [ + "-s" "-w" + "-X github.com/giantswarm/gsctl/buildinfo.Version=${version}" + ]; - doCheck = false; + checkInputs = [ + kubectl + ]; + + doCheck = !stdenv.isDarwin; meta = with lib; { description = "The Giant Swarm command line interface"; diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index ce49cfd69ca88..c82de2ae02770 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -1,33 +1,35 @@ -{ lib +{ callPackage +, lib , stdenv , fetchurl , nixos -, testVersion -, testEqualDerivation +, testers , hello }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hello"; version = "2.12"; src = fetchurl { - url = "mirror://gnu/hello/${pname}-${version}.tar.gz"; + url = "mirror://gnu/hello/hello-${finalAttrs.version}.tar.gz"; sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g"; }; doCheck = true; passthru.tests = { - version = testVersion { package = hello; }; + version = testers.testVersion { package = hello; }; invariant-under-noXlibs = - testEqualDerivation + testers.testEqualDerivation "hello must not be rebuilt when environment.noXlibs is set." hello (nixos { environment.noXlibs = true; }).pkgs.hello; }; + passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; }; + meta = with lib; { description = "A program that produces a familiar, friendly greeting"; longDescription = '' @@ -35,9 +37,9 @@ stdenv.mkDerivation rec { It is fully customizable. ''; homepage = "https://www.gnu.org/software/hello/manual/"; - changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"; + changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}"; license = licenses.gpl3Plus; maintainers = [ maintainers.eelco ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/applications/misc/hello/test.nix b/pkgs/applications/misc/hello/test.nix new file mode 100644 index 0000000000000..7acded2a16f2d --- /dev/null +++ b/pkgs/applications/misc/hello/test.nix @@ -0,0 +1,8 @@ +{ runCommand, hello }: + +runCommand "hello-test-run" { + nativeBuildInputs = [ hello ]; +} '' + diff -U3 --color=auto <(hello) <(echo 'Hello, world!') + touch $out +'' diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 888c7892514b8..bb31be1ad27c9 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,27 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, readline, ncurses +{ lib, stdenv, fetchFromGitHub, readline, ncurses , autoreconfHook, pkg-config, gettext }: stdenv.mkDerivation rec { pname = "hstr"; - version = "2.3"; + version = "2.5"; src = fetchFromGitHub { owner = "dvorka"; repo = "hstr"; rev = version; - sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y"; + sha256 = "sha256-qIMnU+gRR3HPAOrrrduN68R5E8ZJKROfZ0sEHL0E4XU="; }; - patches = [ - # pull pending upstream inclusion fix for ncurses-6.3: - # https://github.com/dvorka/hstr/pull/435 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/dvorka/hstr/commit/7fbd852c464ae3cfcd2f4fed9c62a21fb84c5439.patch"; - sha256 = "15f0ja4bsh4jnchcg0ray8ijpdraag7k07ss87a6ymfs1rg6i0jr"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ readline ncurses gettext ]; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index a164654b1a67e..44169f6a539e2 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { ln -s $opt/data/resources $opt/x86_64/resources ''; - updateScript = writeShellScript "hubstaff-updater" '' + passthru.updateScript = writeShellScript "hubstaff-updater" '' set -eu -o pipefail installation_script_url=$(curl --fail --head --location --silent --output /dev/null --write-out %{url_effective} https://app.hubstaff.com/download/linux) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 81ee786aec6f2..32144870cf131 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.92.2"; + version = "0.98.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kwqN/9H/ZI2eL09K/9bOMBWW9bow8LtKpbfxyfxIucA="; + sha256 = "sha256-oZzjnuu6C522qBs/A83jKIZ3dUrJRmKJ/C8NRX31yvw="; }; - vendorSha256 = "sha256-7dJUl0IxsLj0ds2jqtChNCQEBiK9PahG159IhyFxwdM="; + vendorSha256 = "sha256-HM5IE/rVNWyTfjUtVOlw+69+YoWYlLtU2FOXeH2BAi8="; doCheck = false; @@ -27,9 +27,9 @@ buildGoModule rec { $out/bin/hugo gen man installManPage man/* installShellCompletion --cmd hugo \ - --bash <($out/bin/hugo gen autocomplete --type=bash) \ - --fish <($out/bin/hugo gen autocomplete --type=fish) \ - --zsh <($out/bin/hugo gen autocomplete --type=zsh) + --bash <($out/bin/hugo completion bash) \ + --fish <($out/bin/hugo completion fish) \ + --zsh <($out/bin/hugo completion zsh) ''; meta = with lib; { diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 4c01e52aa5dbe..a25806533ef86 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "IPMIView"; - version = "2.19.0"; - buildVersion = "210401"; + version = "2.20.0"; + buildVersion = "220309"; src = fetchurl { url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; - sha256 = "sha256-6hxOu/Wkcrp9MaMYlxOR2DZW21Wi3BIFZp3Vm8NRBWs="; + hash = "sha256-qtklBMuK0jb9Ye0IkYM2WYFRMAfZg9tk08a1JQ64cjA="; }; nativeBuildInputs = [ patchelf makeWrapper ]; diff --git a/pkgs/applications/misc/join-desktop/default.nix b/pkgs/applications/misc/join-desktop/default.nix new file mode 100644 index 0000000000000..0b09911ddb24b --- /dev/null +++ b/pkgs/applications/misc/join-desktop/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchurl +, alsa-lib +, autoPatchelfHook +, dpkg +, gtk3 +, makeWrapper +, mesa +, nss +, systemd +, xorg +}: + +stdenv.mkDerivation rec { + pname = "join-desktop"; + version = "1.1.2"; + + src = fetchurl { + url = "https://github.com/joaomgcd/JoinDesktop/releases/download/v${version}/com.joaomgcd.join_${version}_amd64.deb"; + sha256 = "sha256-k1LX/HC3tfL4Raipo7wp/LnfrPa38x8NBeKRyHJ72CU="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + ]; + + buildInputs = [ + alsa-lib + gtk3 + mesa + nss + xorg.libXScrnSaver + xorg.libXtst + ]; + + unpackPhase = "dpkg-deb -x $src ."; + + runtimeDependencies = [ + (lib.getLib systemd) + # TODO: check if they are required + # libnotify + # libappindicator + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/join-desktop + + mv usr/share/* $out/share + mv opt/Join\ Desktop/* $out/share/join-desktop + + ln -s $out/share/join-desktop/com.joaomgcd.join $out/bin/ + + substituteInPlace $out/share/applications/com.joaomgcd.join.desktop \ + --replace "/opt/Join Desktop/com.joaomgcd.join" "com.joaomgcd.join" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/joaomgcd/JoinDesktop/"; + description = "Desktop app for Join"; + # on https://joaoapps.com/join/desktop/ "Join Desktop is an open source app" but no license + license = licenses.free; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; + +} diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 42d87b41fc999..c842b7c4b36eb 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.7.13"; + version = "2.7.15"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-ObuBcFV5fq2sryC+ETTAH+S19EW+nVlxdVOtOpiBeDs="; - x86_64-darwin = "sha256-f0+/kUukP+zIzTSSGO1ctUBd/uCSrAKz+uBnrzpPy5k="; + x86_64-linux = "sha256-PtfDH2W8wolqa10BoI9hazcj+1bszlnpt+D+sbzSRts="; + x86_64-darwin = "sha256-CPD/2x5FxHL9CsYz9EZJX5SYiFGz7/fjntOlDMKHYEA="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/joshuto/default.nix b/pkgs/applications/misc/joshuto/default.nix index 32018d7151dbd..024334aca5061 100644 --- a/pkgs/applications/misc/joshuto/default.nix +++ b/pkgs/applications/misc/joshuto/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, SystemConfiguration }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, SystemConfiguration, Foundation }: rustPlatform.buildRustPackage rec { pname = "joshuto"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-vhTfAoAwDJ9BjhgUEkV2H+KAetJR1YqwaZ7suF6yMXA="; - buildInputs = lib.optional stdenv.isDarwin SystemConfiguration; + buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration Foundation ]; meta = with lib; { description = "Ranger-like terminal file manager written in Rust"; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index cc6d4e33fb243..9a7ed898e51f4 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18387"; + version = "18427"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-zkEWZjjSy0ajG5X1/dIgLPZ7zr0BiaJJcHaN8sv/3yc="; + sha256 = "sha256-SsoeKfpWi41sd77LfaQW0OcHnyf8iLolKWF74dhalpY="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-xOVnnQ+eUkboT8Tq5F4QJEou1wAaHwiEdyiEKDR/fUk="; + sha256 = "sha256-cz3OT03StvJy9XYBiPxx+nz36O0cg+XrL/uc52/G/1c="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-GbIWZTJmmUT8r9L63/6mcnRt7dvavqGAVbozxlbF89g="; + sha256 = "sha256-AyfUFE0y8d8FtgfhxSscQGE1IVNwYYNymH6jTnrUBTs="; }; }; in diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index e2e43ae099715..552a63240d513 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -7,7 +7,7 @@ , kjobwidgets , kxmlgui , lib -, testVersion +, testers , k4dirstat }: @@ -26,7 +26,7 @@ mkDerivation rec { buildInputs = [ kiconthemes kio kjobwidgets kxmlgui ]; passthru.tests.version = - testVersion { + testers.testVersion { package = k4dirstat; command = "k4dirstat -platform offscreen --version &>/dev/stdout"; }; diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix new file mode 100644 index 0000000000000..e019e9f1b9865 --- /dev/null +++ b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix @@ -0,0 +1,53 @@ +{ buildGoModule, fetchFromGitHub, lib, libGL, nssmdns, pkg-config, xorg }: + +buildGoModule rec { + pname = "keylight-controller-mschneider82"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "mschneider82"; + repo = "keylight-control"; + rev = "v${version}"; + sha256 = "sha256-UZfbGihCgFBQE1oExuzCexoNgpVGwNoA9orjZ9fh4gA="; + }; + + vendorSha256 = "sha256-nFttVJbEAAGsrAglMphuw0wJ2Kf8sWB4HrpVqfHO76o="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libGL + nssmdns + ] ++ (with xorg; [ + libX11 + libX11.dev + libXcursor + libXext + libXi + libXinerama + libXrandr + libXxf86vm + xinput + ]); + + meta = with lib; { + description = "A desktop application to control Elgato Keylights"; + longDescription = '' + Requires having: + * Elgato's Keylight paired to local wifi network. + * Service avahi with nssmdns enabled. + ''; + license = licenses.mit; + homepage = "https://github.com/mschneider82/keylight-control"; + maintainers = with maintainers; [ superherointj ]; + }; +} + +# Note: Application errors on first executions but works on re-runs. + +# Troubleshooting +# 1. Keylight lists at: `avahi-browse --all --resolve --ignore-local` +# 2. Ping Keylight's IP +# 3. Resolve Keylight's hostname: `getent hosts elgato-key-light-XXXX.local` diff --git a/pkgs/applications/misc/kiln/default.nix b/pkgs/applications/misc/kiln/default.nix index dfa114f446a1e..2eb329dd51119 100644 --- a/pkgs/applications/misc/kiln/default.nix +++ b/pkgs/applications/misc/kiln/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "kiln"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromSourcehut { owner = "~adnano"; repo = pname; rev = version; - hash = "sha256-c6ed62Nn++qw+U/DCiYeGwF77YsBxexWKZ7UQ3LE4fI="; + hash = "sha256-owON9ZNi8BufkeARjC6SwxzM81YJYu+bakhH5quzMrA="; }; nativeBuildInputs = [ scdoc ]; - vendorSha256 = "sha256-bMpzebwbVHAbBtw0uuGyWd4wnM9z6tlsEQN4S/iucgk="; + vendorSha256 = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix index 08a1b5a71af6d..ee599fd3b6ccc 100644 --- a/pkgs/applications/misc/kjv/default.nix +++ b/pkgs/applications/misc/kjv/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, readline }: let - patchPrefix = "https://github.com/samuelgrf/kjv/commit/"; + patchPrefix = "https://web.archive.org/web/20220422205751/https://github.com/samuelgrf/kjv/commit/"; add-apocrypha = fetchpatch { url = patchPrefix + "0856fa0d37b45de0d6b47d163b5ea9a0b7f2c061.patch"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { description = "The Bible, King James Version"; homepage = "https://github.com/bontibon/kjv"; license = licenses.unlicense; - maintainers = with maintainers; [ jtobin samuelgrf ]; + maintainers = with maintainers; [ jtobin ]; mainProgram = "kjv"; }; } diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix index 043f607c010db..a2892e9fa894b 100644 --- a/pkgs/applications/misc/kratos/default.nix +++ b/pkgs/applications/misc/kratos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kratos"; - version = "0.8.3-alpha.1.pre.0"; + version = "0.9.0-alpha.3"; src = fetchFromGitHub { owner = "ory"; repo = "kratos"; rev = "v${version}"; - sha256 = "1225paf0x6lb6cb3q5f4lyz0r426ifx4x8145q7nsc6v64srck2y"; + sha256 = "1x6g5mbbz1nkqi814dcyvdn8dyizpilzsb9cqijw0kpw4y3px757"; }; - vendorSha256 = "10zhxbccjsp6hbmk2lnvbag6c92hz703mcaigaj4wvlf7glpldm6"; + vendorSha256 = "1v29g302zqh7sc5s53dyz1mki0iijnr6nfj4fajayz2n7bfw3kh1"; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 273ca0245a2b8..2b825705b0066 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -1,16 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config -, pcsclite, talloc, python2, gnutls +{ lib, stdenv +, autoreconfHook +, fetchFromGitHub +, gnutls +, libmnl +, libusb1 +, lksctp-tools +, pcsclite +, pkg-config +, python3 +, talloc }: stdenv.mkDerivation rec { pname = "libosmocore"; - version = "1.2.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - sha256 = "1535y6r4csvslrxcki80ya6zhhc5jw2nvy9bymb55ln77pf853vg"; + hash = "sha256-AjOyZiLlXhsetbyMBuUssoNxk22LzGOkZpeLt4vKli4="; }; propagatedBuildInputs = [ @@ -18,11 +27,17 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoreconfHook pkg-config + autoreconfHook + pkg-config + python3 ]; buildInputs = [ - pcsclite python2 gnutls + gnutls + libmnl + libusb1 + lksctp-tools + pcsclite ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix deleted file mode 100644 index 01ffb7a9ffe81..0000000000000 --- a/pkgs/applications/misc/lighthouse/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config -, libX11, libxcb, cairo, gtk2, pango, python27, python3 -}: - -stdenv.mkDerivation rec { - pname = "lighthouse"; - version = "unstable-2016-07-20"; - - src = fetchFromGitHub { - owner = "emgram769"; - repo = "lighthouse"; - rev = "d1813ef8e2aca9f6b3609b1e0c6d1d5ee683281a"; - sha256 = "0v6ylm49f1b44zwq1y1gqxp2csyqblplr24ajllc2q3r0sc9m1ys"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 libxcb cairo gtk2 pango python27 python3 - ]; - - makeFlags = [ "PREFIX=\${out}" ]; - - preFixup = "chmod +x $out/share/lighthouse/.config/lighthouse/google.py"; - - postFixup = "chmod -x $out/share/lighthouse/.config/lighthouse/google.py"; - - meta = with lib; { - description = "A simple flexible popup dialog to run on X"; - homepage = "https://github.com/emgram769/lighthouse"; - license = licenses.mit; - maintainers = with maintainers; [ ramkromberg ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 153e50f9a873d..0d28a38202034 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, autoPatchelfHook, electron, curl, expat, gcc, openssl, zlib }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, autoPatchelfHook, electron, git, curl, expat, gcc, openssl, zlib }: stdenv.mkDerivation rec { pname = "logseq"; - version = "0.6.5"; + version = "0.6.8"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "WKROcCv0IzRnQd74j5Iget5jlfyDbeJ/PXgZmSNrSsQ="; + sha256 = "QPbH7d2RC8DLze44Q3gCQ9IzHOgIq8IB+hZr9+8rTs0="; name = "${pname}-${version}.AppImage"; }; @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --prefix PATH : ${lib.makeBinPath [ git ]} \ --add-flags $out/share/${pname}/resources/app ''; diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 0446c694fe0d1..58946f227ee24 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -31,7 +31,7 @@ , pyyaml , requests , keyring -, python_magic +, python-magic # commands that lutris needs , xrandr @@ -84,13 +84,13 @@ let in buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.10"; + version = "0.5.10.1"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; - rev = "v${version}"; - sha256 = "sha256-PrnULCdQXNZ9OTa00NVyqiTdKRRkAYBcDj7lMwEqkw4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Bf8UEGEM6M4PKoX/qKQNb9XxrxLcjKZD1vR3R2/PykI="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -104,7 +104,7 @@ buildPythonApplication rec { libnotify pango webkitgtk - python_magic + python-magic ] ++ gstDeps; propagatedBuildInputs = [ @@ -117,7 +117,7 @@ buildPythonApplication rec { pillow dbus-python keyring - python_magic + python-magic ]; postPatch = '' @@ -148,7 +148,7 @@ buildPythonApplication rec { homepage = "https://lutris.net"; description = "Open Source gaming platform for GNU/Linux"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix index 1688639083725..fc83e543dcfba 100644 --- a/pkgs/applications/misc/marktext/default.nix +++ b/pkgs/applications/misc/marktext/default.nix @@ -2,20 +2,19 @@ let pname = "marktext"; - version = "v0.17.1"; - name = "${pname}-${version}-binary"; + version = "0.17.1"; src = fetchurl { - url = "https://github.com/marktext/marktext/releases/download/${version}/marktext-x86_64.AppImage"; + url = "https://github.com/marktext/marktext/releases/download/v${version}/marktext-x86_64.AppImage"; sha256 = "2e2555113e37df830ba3958efcccce7020907b12fd4162368cfd906aeda630b7"; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; profile = '' export LC_ALL=C.UTF-8 @@ -35,7 +34,7 @@ appimageTools.wrapType2 rec { extraInstallCommands = '' # Strip version from binary name. - mv $out/bin/${name} $out/bin/${pname} + mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop substituteInPlace $out/share/applications/marktext.desktop \ diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index cab136d55dc98..68453252ba539 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "masterpdfeditor"; - version = "5.8.33"; + version = "5.8.46"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz"; - sha256 = "sha256-sgLF/NpaNlkL5iA1l7QzMiYKwRcMDu2DHdTIaeHOtfI="; + sha256 = "sha256-xms4aqIxYXR6v226RMf+abrFU1xz2aDIL6iQ+Yfff1k="; }; nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 0ce8d8c373db4..fc2c2ad618d5e 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,17 +1,16 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, wxGTK30-gtk3 +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK30-gtk3 , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "21.09"; + version = "22.03"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0mqcqm8y2whnbdi2ry7jd755gfl5ccdqhwjh67hsyr7c0ajxk3vv"; + sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libzen libmediainfo wxGTK30-gtk3 desktop-file-utils libSM - imagemagick ]; + buildInputs = [ libmediainfo wxGTK30-gtk3 desktop-file-utils libSM imagemagick ]; sourceRoot = "./MediaInfo/Project/GNU/GUI/"; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 8ca4ec4189576..afdfc6c905e04 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, autoconf -, automake +, autoreconfHook , c-ares , cryptopp , curl @@ -14,7 +13,6 @@ , libmediainfo , libraw , libsodium -, libtool , libuv , libzen , pcre-cpp @@ -25,17 +23,18 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.5.0"; + version = "1.5.0c"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "Y/FkbN9mTuBpcKCSQg0M+3/IPzJ58X4iZhX2kMVDv7A="; + sha256 = "sha256-JHuGkf6TBOZMvoP7Izm5/T9AWxyjaqrxR99x4bm7tVE="; fetchSubmodules = true; }; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ c-ares @@ -54,10 +53,6 @@ stdenv.mkDerivation rec { sqlite ]; - preConfigure = '' - ./autogen.sh - ''; - configureFlags = [ "--disable-curl-checks" "--disable-examples" diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 15b7060ff2641..98622ae404ce5 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -28,13 +28,13 @@ }: mkDerivation rec { pname = "megasync"; - version = "4.6.3.0"; + version = "4.6.5.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "1j86vr8n2a17my61vkmx83cay1ibllzjprl5bfwaby5ibh4zclz4"; + sha256 = "sha256-2gsJmMnt0+4vknd2HgOtCYCjVWT7eD0WBimmtsFEhvY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/mepo/default.nix b/pkgs/applications/misc/mepo/default.nix index 72e05d19bbda1..1afcd3c3f1a76 100644 --- a/pkgs/applications/misc/mepo/default.nix +++ b/pkgs/applications/misc/mepo/default.nix @@ -3,27 +3,39 @@ , fetchFromSourcehut , pkg-config , zig +, makeWrapper , curl , SDL2 , SDL2_gfx , SDL2_image , SDL2_ttf +, jq +, ncurses +, inconsolata-nerdfont +, dmenu +, xdotool +, bemenu +, withX11 ? false }: -stdenv.mkDerivation rec { +let + menuInputs = if withX11 then [ dmenu xdotool ] else [ bemenu ]; +in stdenv.mkDerivation rec { pname = "mepo"; - version = "0.3"; + version = "0.4.2"; src = fetchFromSourcehut { owner = "~mil"; repo = pname; rev = version; - hash = "sha256-B7BOAFhiOTILUdzh49hTMrNNHZpCNRDLW2uekXyptqQ="; + hash = "sha256-k6YXaqB3EwbDPlTvijZf10q+IYwt4/MiqGXL495KIcY="; }; - nativeBuildInputs = [ pkg-config zig ]; + nativeBuildInputs = [ pkg-config zig makeWrapper ]; - buildInputs = [ curl SDL2 SDL2_gfx SDL2_image SDL2_ttf ]; + buildInputs = [ + curl SDL2 SDL2_gfx SDL2_image SDL2_ttf inconsolata-nerdfont jq ncurses + ] ++ menuInputs; preBuild = '' export HOME=$TMPDIR @@ -46,12 +58,26 @@ stdenv.mkDerivation rec { runHook postInstall ''; + postInstall = '' + wrapProgram $out/bin/mepo_dl.sh\ + --suffix PATH : ${lib.makeBinPath [ jq ncurses ]} + wrapProgram $out/bin/mepo_ui_helper_menu.sh\ + --suffix PATH : ${lib.makeBinPath menuInputs} + for script in $(grep -l jq out/bin/mepo_ui_menu_*.sh); do + wrapProgram $script --suffix PATH : $out/bin:${lib.makeBinPath [ jq ]} + done + for prog in $out/bin/mepo*; do + if [ ! -f $out/bin/.$(basename $prog)-wrapped ]; then + wrapProgram $prog --suffix PATH : $out/bin + fi + done + ''; + meta = with lib; { description = "Fast, simple, and hackable OSM map viewer"; homepage = "https://sr.ht/~mil/mepo/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; # See https://github.com/NixOS/nixpkgs/issues/86299 + maintainers = with maintainers; [ sikmir McSinyx ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index a92f79845134c..ee7703987eaa4 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.2.1"; + version = "2.2.2"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = "metadata-cleaner"; rev = "v${version}"; - hash = "sha256-clCCVOoiInaxg9++GiHMLaD+k0gAvt3oOmqQ/a+WgCE="; + hash = "sha256-V3qcQQwc2ykVTVgUJuNnVQ9iSPD0tv4C2hSILLxuE70="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index 2786492d47a52..2be567f2a149a 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -31,6 +31,10 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; + # Cannot find GSettings schemas when opening settings, + # probably https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + nativeBuildInputs = [ gettext wrapGAppsHook diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 2b9c847bac8ff..e83ed045b0dc5 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoPackage rec { pname = "mob"; - version = "2.6.0"; + version = "3.0.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "sha256-GJ4V4GQRUoXelk0ksHPoFL4iB1W7pe2UydK2AhYjysg="; + sha256 = "sha256-silAgScvhl388Uf6HkWqEkNmr/K6aUt/lj/rxzkk/f0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix index c298135174961..c486b25c44cd1 100644 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ b/pkgs/applications/misc/moonlight-qt/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "moonlight-qt"; - version = "3.2.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nvVBjBcuHKSn66Q7iTzslGOCkH6zMFf62zx5dDXSosI="; + sha256 = "sha256-CfOphr8QILCZg+UrImp5JO/1DTqoan5EwiQeTKR15Fo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix deleted file mode 100644 index 3890246a63d6a..0000000000000 --- a/pkgs/applications/misc/multibootusb/default.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, - coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, - python3Packages, qt5, runtimeShell, lib, util-linux, wrapQtAppsHook }: - -# Note: Multibootusb is tricky to maintain. It relies on the -# $PYTHONPATH variable containing some of their code, so that -# something like: -# -# from scripts import config -# -# works. It also relies on the current directory to find some runtime -# resources thanks to a use of __file__. -# -# https://github.com/mbusb/multibootusb/blob/0d34d70c3868f1d7695cfd141141b17c075de967/scripts/osdriver.py#L59 - -python3Packages.buildPythonApplication rec { - pname = "multibootusb"; - name = "${pname}-${version}"; - version = "9.2.0"; - - nativeBuildInputs = [ - wrapQtAppsHook - autoPatchelfHook - unzip - zip - ]; - - runTimeDeps = [ - coreutils - gnugrep - which - parted - util-linux - qemu - p7zip - gnused - mtools - procps - e2fsprogs - gptfdisk - ]; - - buildInputs = [ - libxcb - python3Packages.python - qt5.full - ]; - - src = fetchFromGitHub { - owner = "mbusb"; - repo = pname; - rev = "v${version}"; - - sha256 = "0wlan0cp6c2i0nahixgpmkm0h4n518gj8rc515d579pqqp91p2h3"; - }; - - # Tests can't run inside the NixOS sandbox - # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory" - doCheck = false; - - pythonPath = with python3Packages; [ - dbus-python - pyqt5 - pytest-shutil - pyudev - six - ]; - - # multibootusb ships zips with various versions of syslinux, we need to patchelf them - postPatch = '' - for zip in $(find . -name "*.zip"); do - zip=$(readlink -f $zip) - target="$(mktemp -d)" - pushd $target - unzip $zip - rm $zip - autoPatchelf . - zip -r $zip * - popd - done - ''; - - postInstall = '' - # This script doesn't work and it doesn't add much anyway - rm $out/bin/multibootusb-pkexec - - # The installed data isn't sufficient for whatever reason, missing gdisk/gdisk.exe - mkdir -p "$out/share/${pname}" - cp -r data "$out/share/${pname}/data" - ''; - - preFixup = '' - makeWrapperArgs+=( - # Firstly, add all necessary QT variables - "''${qtWrapperArgs[@]}" - - # Then, add the installed scripts/ directory to the python path - --prefix "PYTHONPATH" ":" "$out/lib/${python3Packages.python.libPrefix}/site-packages" - - # Add some runtime dependencies - --prefix "PATH" ":" "${lib.makeBinPath runTimeDeps}" - - # Finally, move to directory that contains data - --run "cd $out/share/${pname}" - ) - ''; - - meta = with lib; { - description = "Multiboot USB creator for Linux live disks"; - homepage = "http://multibootusb.org/"; - license = licenses.gpl2; - maintainers = []; # Looking for a maintainer! - broken = true; # "name 'config' is not defined", added 2021-02-06 - }; -} diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index e8fa4d4fd379c..0ae63d210e767 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "Small weblog engine written in Bash for the command line"; homepage = "http://nanoblogger.sourceforge.net/"; license = lib.licenses.gpl2; + mainProgram = "nb"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/nimbo/default.nix b/pkgs/applications/misc/nimbo/default.nix index 8af9d1471a089..5ad86eeccd448 100644 --- a/pkgs/applications/misc/nimbo/default.nix +++ b/pkgs/applications/misc/nimbo/default.nix @@ -52,6 +52,6 @@ python3.pkgs.buildPythonApplication rec { description = "Run machine learning jobs on AWS with a single command"; homepage = "https://github.com/nimbo-sh/nimbo"; license = licenses.bsl11; - maintainers = with maintainers; [ alex-eyre noreferences ]; + maintainers = with maintainers; [ alexeyre noreferences ]; }; } diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 8ea024320c3ed..87c43628c4f01 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g9GaCc/IWKtih0/A2AZEPImjj7ymJIdYwC5I/6GUh5c="; + sha256 = "sha256-uToAgWpGaTPTMYJh1D0xgvE23GSIshv1OBlWxXI07Mk="; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index deda8b07f475b..24877241f91ef 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -2,52 +2,45 @@ , stdenv , fetchFromGitHub , gtk4 -, hicolor-icon-theme , json-glib , libadwaita , libgee +, desktop-file-utils , meson , ninja , nix-update-script , pkg-config -, python3 , vala , wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "notejot"; - version = "3.4.9"; + version = "3.5.1"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - hash = "sha256-42k9CAnXAb7Ic580SIa95MDCkCWtso1F+0eD69HX8WI="; + hash = "sha256-p5F0OITgfZyvHwndI5r5BE524+nft7A2XfR3BJZFamU="; }; nativeBuildInputs = [ + desktop-file-utils meson ninja pkg-config - python3 vala wrapGAppsHook4 ]; buildInputs = [ gtk4 - hicolor-icon-theme json-glib libadwaita libgee ]; - postPatch = '' - chmod +x build-aux/post_install.py - patchShebangs build-aux/post_install.py - ''; - passthru.updateScript = nix-update-script { attrPath = pname; }; diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 41f46ff1c003d..e0e196ac14325 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + postInstall = '' wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \ "$out/lib:${neon}/lib:${libusb-compat-0_1.out}/lib:${avahi}/lib:${freeipmi}/lib" diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index d34770051d0b8..8daf50f82e70a 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,20 +12,20 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "0.14.2"; + version = "0.14.6"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; - maintainers = with maintainers; [ conradmearns zaninime opeik ]; + maintainers = with maintainers; [ atila conradmearns zaninime opeik ]; }; 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 "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3"; + sha256 = if stdenv.isDarwin then "1zzccwlim3gi6f5czzyddqjzy1xsk6ayx1hljhw6bmnid72km3q2" else "sha256-KieAE13SIYHDoXTqzk1QY+TPjwF9LRzlfm1yFg9hsTc="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix deleted file mode 100644 index 41c6cdee41cad..0000000000000 --- a/pkgs/applications/misc/ocropus/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, fetchFromGitHub, fetchurl, python2Packages, curl }: - -let - getmodel = name: sha256: { - inherit name; - src = fetchurl { - url = "http://www.tmbdev.net/ocropy/${name}"; - inherit sha256; - }; - }; - - models = [ - (getmodel "en-default.pyrnn.gz" - "1xyi3k3p81mfw0491gb1haisazfyi2i18f1wjs1m34ak39qfqjdp") - (getmodel "fraktur.pyrnn.gz" - "1wlwvxn91ilgmlri1hj81arl3mbzxc24ycdnkf5icq4hdi4c6y8b") - ]; - -in -python2Packages.buildPythonApplication rec { - pname = "ocropus"; - version = "1.3.3"; - - src = fetchFromGitHub { - sha256 = "02p1334mic5cfhvpfphfrbim4036yfd8s2zzpwm0xmm829z71nr7"; - rev = "v${version}"; - repo = "ocropy"; - owner = "tmbdev"; - }; - - propagatedBuildInputs = with python2Packages; [ curl numpy scipy pillow - matplotlib beautifulsoup4 pygtk lxml ]; - - enableParallelBuilding = true; - - preConfigure = with lib; '' - ${concatStrings (map (x: "cp -R ${x.src} models/`basename ${x.name}`;") - models)} - - substituteInPlace ocrolib/common.py --replace /usr/local $out - substituteInPlace ocrolib/default.py --replace /usr/local $out - ''; - - doCheck = false; # fails - checkPhase = '' - patchShebangs . - substituteInPlace ./run-test \ - --replace 'ocropus-rpred' 'ocropus-rpred -Q $NIX_BUILD_CORES' - PATH=".:$PATH" ./run-test - ''; - - meta = with lib; { - description = "Open source document analysis and OCR system"; - license = licenses.asl20; - homepage = "https://github.com/tmbdev/ocropy/"; - maintainers = with maintainers; [ domenkozar ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 4dc6f87631894..dbdc15cb9c7a5 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -9,251 +9,11 @@ , packageOverrides ? self: super: { } }: let - mkOverride = attrname: version: sha256: - self: super: { - ${attrname} = super.${attrname}.overridePythonAttrs ( - oldAttrs: { - inherit version; - src = oldAttrs.src.override { - inherit version sha256; - }; - } - ); - }; py = python3.override { self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ( [ - # the following dependencies are non trivial to update since later versions introduce backwards incompatible - # changes that might affect plugins, or due to other observed problems - (mkOverride "click" "7.1.2" "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a") - (mkOverride "flask-babel" "1.0.0" "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn") - (mkOverride "itsdangerous" "1.1.0" "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19") - (mkOverride "jinja2" "2.11.3" "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6") - (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") - (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b") - - # black uses hash, not sha256 identifier. Newer black version requires newer click version - ( - self: super: { - black = super.black.overridePythonAttrs (oldAttrs: rec { - version = "21.12b0"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-d7gPaTpWni5SeVhFljTxjfmwuiYluk4MLV2lvkLm8rM="; - }; - doCheck = false; - }); - } - ) - - # tests need network - ( - self: super: { - curio = super.curio.overridePythonAttrs (oldAttrs: rec { - disabledTests = [ - "test_timeout" - "test_ssl_outgoing" - ]; - }); - } - ) - - # tests need network - ( - self: super: { - trio = super.trio.overridePythonAttrs (oldAttrs: rec { - disabledTests = [ - "test_local_address_real" - ]; - disabledTestPaths = [ - "trio/tests/test_exports.py" - "trio/tests/test_socket.py" - ]; - }); - } - ) - - # Requires flask<2, cannot mkOverride because tests need to be disabled - ( - self: super: { - flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "1.1.4"; - src = oldAttrs.src.override { - inherit version; - sha256 = "15ni4xlm57a15f5hipp8w0c9zba20179bvfns2392fiq1lcbdghg"; - }; - doCheck = false; - }); - } - ) - - # Requires werkezug<2, cannot mkOverride because tests need to be disabled - ( - self: super: { - werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { - version = "1.0.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; - }; - doCheck = false; - }); - } - ) - - # Requires unidecode>=0.04.14,<0.05. Upstream changed the source naming between releases - ( - self: super: { - unidecode = super.unidecode.overridePythonAttrs (oldAttrs: rec { - version = "0.04.21"; - src = fetchFromGitHub { - owner = "avian2"; - repo = "unidecode"; - rev = "release-${version}"; - sha256 = "0p5bkibv0xm1265dlfrz3zq3k9bbx07gl8zyq8mvvb8hi7p5lifg"; - }; - }); - } - ) - - # Requires websocket-client <1.0, >=0.57. Cannot do mkOverride b/c differing underscore/hyphen in pypi source name - ( - self: super: { - websocket-client = super.websocket-client.overridePythonAttrs ( - oldAttrs: rec { - version = "0.59.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0p0cz2mdissq7iw1n7jrmsfir0jfmgs1dvnpnrx477ffx9hbsxnk"; - }; - propagatedBuildInputs = with self; [ - six - pysocks - ]; - disabledTests = [ - "testConnect" # requires network access - ]; - } - ); - } - ) - - # Octoprint needs zeroconf >=0.24 <0.25. This can't be done via mkOverride, because in zeroconf 0.32 - # the super package was migrated to fetchFromGitHub. - ( - self: super: { - zeroconf = super.zeroconf.overrideAttrs (oldAttrs: rec { - version = "0.24.5"; - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9"; - }; - pythonImportsCheck = [ - "zeroconf" - ]; - buildInputs = with self; [ - pytestCheckHook - nose - ]; - pytestFlagsArray = [ "zeroconf/test.py" ]; - }); - } - ) - - # Octoprint pulls in celery indirectly but has no support for the up-to-date releases - ( - self: super: { - celery = super.celery.overrideAttrs (oldAttrs: rec { - version = "5.0.0"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-MTkw/d3nA9jjcCmjBL+RQpzRGu72PFfebayp2Vjh8lU="; - }; - disabledTestPaths = [ - "t/unit/backends/test_mongodb.py" - ]; - }); - } - ) - - # Octoprint would allow later sentry-sdk releases but not later click releases - ( - self: super: { - sentry-sdk = super.sentry-sdk.overrideAttrs (oldAttrs: rec { - pname = "sentry-sdk"; - version = "1.4.3"; - - src = fetchFromGitHub { - owner = "getsentry"; - repo = "sentry-python"; - rev = version; - sha256 = "sha256-vdE6eqELMM69CWHaNYhF0HMCTV3tQsJlMHAA96oCy8c="; - }; - disabledTests = [ - "test_apply_simulates_delivery_info" - "test_auto_enabling_integrations_catches_import_error" - "test_leaks" - ]; - disabledTestPaths = [ - # Don't test integrations - "tests/integrations" - # test crashes on aarch64 - "tests/test_transport.py" - ]; - }); - } - ) - - # Octoprint fails due to a newly added test in pytest-httpbin - # see https://github.com/NixOS/nixpkgs/issues/159864 - ( - self: super: { - pytest-httpbin = super.pytest-httpbin.overridePythonAttrs (oldAttrs: rec { - disabledTests = [ - "test_redirect_location_is_https_for_secure_server" - ]; - }); - } - ) - - # All test fail on aarch64 - ( - self: super: { - azure-core = super.azure-core.overridePythonAttrs (oldAttrs: rec { - doCheck = stdenv.buildPlatform == "x86_64-linux"; - }); - } - ) - - # needs network - ( - self: super: { - falcon = super.falcon.overridePythonAttrs (oldAttrs: rec { - #pytestFlagsArray = [ "-W ignore::DeprecationWarning" ]; - disabledTestPaths = oldAttrs.disabledTestPaths ++ [ - "tests/asgi/test_asgi_servers.py" - ]; - }); - } - ) - - # update broke some tests - ( - self: super: { - sanic = super.sanic.overridePythonAttrs (oldAttrs: rec { - disabledTestPaths = oldAttrs.disabledTestPaths ++ [ - "test_cli.py" - "test_cookies.py" - # requires network - "test_worker.py" - ]; - }); - } - ) - # Built-in dependency ( self: super: { @@ -294,14 +54,14 @@ let self: super: { octoprint-pisupport = self.buildPythonPackage rec { pname = "OctoPrint-PiSupport"; - version = "2021.10.28"; + version = "2022.3.28"; format = "setuptools"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-PiSupport"; rev = version; - sha256 = "01bpvv1sn3113fdpw6b90c2rj8lqay118x609yy64z9ccm93khl9"; + sha256 = "yzE/jz604nX/CHcW3aa7goH1ey8qZ7rLw31SMfNKJZM="; }; # requires octoprint itself during tests @@ -314,13 +74,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.7.3"; + version = "1.8.0rc5"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - sha256 = "sha256-U6g7WysHHOlZ4p5BM4tw3GGAxQmxv6ltYgAp1rO/eCg="; + sha256 = "sha256-FeT45w6VXaFV4BsuOMk58nxxiu9jhCNnA2F7Uh/3sB0="; }; propagatedBuildInputs = with super; [ @@ -368,7 +128,7 @@ let werkzeug wrapt zeroconf - zipstream-new + zipstream-ng ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; @@ -406,6 +166,8 @@ let "watchdog" "wrapt" "zeroconf" + "Flask-Login" + "werkzeug" ]; in '' diff --git a/pkgs/applications/misc/oil-buku/default.nix b/pkgs/applications/misc/oil-buku/default.nix index e0c0548828861..5f895179f1f47 100644 --- a/pkgs/applications/misc/oil-buku/default.nix +++ b/pkgs/applications/misc/oil-buku/default.nix @@ -38,7 +38,8 @@ stdenvNoCC.mkDerivation rec { description = "Search-as-you-type cli frontend for the buku bookmarks manager using peco"; homepage = "https://github.com/AndreiUlmeyda/oil"; license = licenses.gpl3Only; - platforms = platforms.unix; maintainers = with maintainers; [ atila ]; + mainProgram = "oil"; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 522c5739a882c..1e726f81bfb14 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,31 +1,100 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl, - gettext, glib, portaudio }: +{ stdenv, lib +, alsa-utils +, at-spi2-core +, cmake +, curl +, dbus +, epoxy +, fetchFromGitHub +, flac +, gtk3 +, jasper +, libGLU +, libarchive +, libdatrie +, libelf +, libexif +, libogg +, libopus +, libselinux +, libsepol +, libsndfile +, libthai +, libunarr +, libusb +, libvorbis +, libxkbcommon +, lsb-release +, lz4 +, pcre +, pkg-config +, portaudio +, sqlite +, tinyxml +, udev +, util-linux +, wxGTK31-gtk3 +, xorg +}: stdenv.mkDerivation rec { - pname = "opencpn-unstable"; - version = "2019-11-21"; + pname = "opencpn"; + version = "5.6.2"; src = fetchFromGitHub { owner = "OpenCPN"; repo = "OpenCPN"; - rev = "e73dc935545b2bbcf193cc61d987a0178c52d7a7"; - sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk"; + rev = "Release_${version}"; + hash = "sha256-sNZYf/2gtjRrrGPuazVnKTgcuIQpKPazhexqlK21T4g="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ gtk2 wxGTK30 libpulseaudio curl gettext - glib portaudio ]; - - cmakeFlags = [ - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + nativeBuildInputs = [ cmake lsb-release pkg-config ]; + buildInputs = [ + alsa-utils + at-spi2-core + curl + dbus + epoxy + flac + gtk3 + jasper + libGLU + libarchive + libdatrie + libelf + libexif + libogg + libopus + libselinux + libsepol + libsndfile + libthai + libunarr + libusb + libvorbis + libxkbcommon + lz4 + pcre + portaudio + sqlite + tinyxml + udev + util-linux + wxGTK31-gtk3 + xorg.libXdmcp + xorg.libXtst ]; - meta = { + + cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ]; + + doCheck = true; + + meta = with lib; { description = "A concise ChartPlotter/Navigator"; - maintainers = [ lib.maintainers.kragniz ]; + maintainers = with maintainers; [ kragniz lovesegfault ]; platforms = [ "x86_64-linux" ]; - license = lib.licenses.gpl2; + license = licenses.gpl2; homepage = "https://opencpn.org/"; }; } diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 7e320e5f367aa..fa4b5457e4f75 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.03.23-4-android"; + version = "2022.04.27-2"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; - rev = version; - sha256 = "sha256-4VBsHq8z/odD7Nrk9e0sYMEBBLeTAHsWsdgPIN1KVZo="; + rev = "${version}-android"; + sha256 = "sha256-HsskddXne5xClBZoT3aXP+51VRQQJhlUPda/M20SrH0="; fetchSubmodules = true; }; @@ -35,7 +35,7 @@ mkDerivation rec { echo "exit 0" > tools/unix/check_cert.sh # crude fix for https://github.com/organicmaps/organicmaps/issues/1862 - echo "echo ${lib.replaceStrings ["." "-" "android"] ["" "" ""] version}" > tools/unix/version.sh + echo "echo ${lib.replaceStrings ["." "-"] ["" ""] version}" > tools/unix/version.sh ''; nativeBuildInputs = [ @@ -64,19 +64,14 @@ mkDerivation rec { bash ./configure.sh ''; + # Tell the program that the read-only and the read-write data locations + # are different, and create the read-write one. + # https://github.com/organicmaps/organicmaps/issues/2387 postInstall = '' - install -Dm755 OMaps $out/bin/OMaps - # Tell the program that the read-only and the read-write data locations - # are different, and create the read-write one. wrapProgram $out/bin/OMaps \ --add-flags "-resources_path $out/share/organicmaps/data" \ --add-flags '-data_path "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' \ --run 'mkdir -p "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' - - mkdir -p $out/share/organicmaps - cp -r ../data $out/share/organicmaps/data - install -Dm644 ../qt/res/logo.png $out/share/icons/hicolor/96x96/apps/organicmaps.png - install -Dm644 ../qt/res/OrganicMaps.desktop $out/share/applications/OrganicMaps.desktop ''; meta = with lib; { diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix index d6041554705e2..cefce001eba90 100644 --- a/pkgs/applications/misc/osmscout-server/default.nix +++ b/pkgs/applications/misc/osmscout-server/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config +{ lib, mkDerivation, fetchFromGitHub, pkg-config , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation , libosmscout, valhalla, libpostal, osrm-backend, protobuf , libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost @@ -14,30 +14,16 @@ let in mkDerivation rec { pname = "osmscout-server"; - version = "1.17.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "rinigus"; repo = "osmscout-server"; rev = version; - sha256 = "0rpsi6nyhcz6bv0jab4vixkxhjmn84xi0q2xz15a097hn46cklx9"; + sha256 = "sha256-I14nQL0H2rMga+RDdAjykqmf7QIZveA6oGWu5PfZ89s="; fetchSubmodules = true; }; - # Two patches required to work with valhalla 3.1 - patches = [ - # require C++14 to match latest Valhalla - (fetchpatch { - url = "https://github.com/rinigus/osmscout-server/commit/78b41b9b4c607fe9bfd6fbd61ae31cb7c8a725cd.patch"; - sha256 = "0gk9mdwa75awl0bj30gm8waj454d8k2yixxwh05m0p550cbv3lg0"; - }) - # add Valhalla 3.1 config - (fetchpatch { - url = "https://github.com/rinigus/osmscout-server/commit/584de8bd47700053960fa139a2d7f8d3d184c876.patch"; - sha256 = "0liz72n83q93bzzyyiqjkxa6hp9zjx7v9rgsmpwf88gc4caqm2dz"; - }) - ]; - nativeBuildInputs = [ qmake pkg-config qttools ]; buildInputs = [ kirigami2 qtquickcontrols2 qtlocation @@ -45,13 +31,6 @@ mkDerivation rec { libpostal sqlite marisa kyotocabinet boost protobuf date ]; - # OSMScout server currently defaults to an earlier version of valhalla, - # but valhalla 3.1 support has been added. (See patches above) - # Replace the default valhalla.json with the valhalla 3.1 version - postPatch = '' - mv data/valhalla.json-3.1 data/valhalla.json - ''; - qmakeFlags = [ "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant "CONFIG+=disable_mapnik" # Disable the optional mapnik backend diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 1f5f3d187290a..9f416ff75a3c6 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "2.4.9.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QcdPyuwbGK12Kul+gGTfRGmXfghr0qugpBEcrgATOT4="; + sha256 = "sha256-VUrLbGaDfPE+Ak20ZCJDmO/sgBzdf4S+SqvyQ7F6SQU="; }; buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index c91f6f64cf743..e27519da2cd7a 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -12,7 +12,7 @@ in pdfstudio = callPackage ./common.nix rec { pname = program; year = "2021"; - version = "${year}.1.2"; + version = "${year}.1.3"; desktopName = "PDF Studio"; longDescription = '' PDF Studio is an easy to use, full-featured PDF editing software. This is the standard/pro edition, which requires a license. For the free PDF Studio Viewer see the package pdfstudioviewer. @@ -22,21 +22,21 @@ in ]; src = fetchurl { url = makeurl { inherit pname year version; }; - sha256 = "1188ll2qz58rr2slavqxisbz4q3fdzidpasb1p33926z0ym3rk45"; + sha256 = "sha256-2az8/slWeLY7l7dCwyTaT18KFfvsO71vJFDZEvbDHGM="; }; }; pdfstudioviewer = callPackage ./common.nix rec { pname = program; year = "2021"; - version = "${year}.1.2"; + version = "${year}.1.3"; desktopName = "PDF Studio Viewer"; longDescription = '' PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio. ''; src = fetchurl { url = makeurl { inherit pname year version; }; - sha256 = "128k3fm8m8zdykx4s30g5m2zl7cgmvs4qinf1w525zh84v56agz6"; + sha256 = "sha256-kd+rQruBL0fudmc30agRO/XV97l/6unqU0GK25yhOzI="; }; }; }.${program} diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix deleted file mode 100644 index 22d94006ddca0..0000000000000 --- a/pkgs/applications/misc/phwmon/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, python2Packages }: - -stdenv.mkDerivation { - pname = "phwmon"; - version = "2017-04-10"; - - src = fetchFromGitLab { - owner = "o9000"; - repo = "phwmon"; - rev = "b162e53dccc4adf8f11f49408d05fd85d9c6c909"; - sha256 = "1hqmsq66y8bqkpvszw84jyk8haxq3cjnz105hlkmp7786vfmkisq"; - }; - - nativeBuildInputs = [ python2Packages.wrapPython ]; - - buildInputs = [ python2Packages.pygtk python2Packages.psutil ]; - - pythonPath = [ python2Packages.pygtk python2Packages.psutil ]; - - patchPhase = '' - substituteInPlace install.sh --replace "/usr/local" "$out" - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/applications - ./install.sh - ''; - - postFixup = '' - wrapPythonPrograms - ''; - - meta = { - homepage = "https://gitlab.com/o9000/phwmon"; - description = "Hardware monitor (CPU, memory, network and disk I/O) for the system tray"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; - }; -} diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 3660b0d7e0b1c..b670f85f7a60b 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -2,6 +2,7 @@ , cairo , cmake , fetchFromGitHub +, libuv , libXdmcp , libpthreadstubs , libxcb @@ -43,13 +44,13 @@ stdenv.mkDerivation rec { pname = "polybar"; - version = "3.5.7"; + version = "3.6.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-h12VW3IY4do4cKz2Fd/QgVTBk+zJO+qXuRUCQUyO/x0="; + hash = "sha256-FKkPSAEMzptnjJq3xTk+fpD8XjASQ3smX5imstDyLNE="; fetchSubmodules = true; }; @@ -62,6 +63,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo + libuv libXdmcp libpthreadstubs libxcb @@ -84,6 +86,14 @@ stdenv.mkDerivation rec { ++ lib.optional i3Support i3 ++ lib.optional i3GapsSupport i3-gaps; + patches = [ ./remove-hardcoded-etc.diff ]; + + # Replace hardcoded /etc when copying and reading the default config. + postPatch = '' + substituteInPlace CMakeLists.txt --replace "/etc" $out + substituteAllInPlace src/utils/file.cpp + ''; + postInstall = if i3Support then '' wrapProgram $out/bin/polybar \ @@ -110,7 +120,7 @@ stdenv.mkDerivation rec { having a black belt in shell scripting. ''; license = licenses.mit; - maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ]; + maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ckie ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff b/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff new file mode 100644 index 0000000000000..d0c6db8b6b0ac --- /dev/null +++ b/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff @@ -0,0 +1,13 @@ +diff --git a/src/utils/file.cpp b/src/utils/file.cpp +index 9511ad61..d3d82b99 100644 +--- a/src/utils/file.cpp ++++ b/src/utils/file.cpp +@@ -322,7 +322,7 @@ namespace file_util { + possible_paths.push_back(xdg_config_dir + suffix + ".ini"); + } + +- possible_paths.push_back("/etc" + suffix + ".ini"); ++ possible_paths.push_back("@out@" + suffix + ".ini"); + + for (const string& p : possible_paths) { + if (exists(p)) { diff --git a/pkgs/applications/misc/portfolio-filemanager/default.nix b/pkgs/applications/misc/portfolio-filemanager/default.nix index b7cd7c0e1170d..48039b64fb60a 100644 --- a/pkgs/applications/misc/portfolio-filemanager/default.nix +++ b/pkgs/applications/misc/portfolio-filemanager/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "portfolio"; - version = "0.9.12"; + version = "0.9.14"; format = "other"; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { owner = "tchx84"; repo = "Portfolio"; rev = "v${version}"; - sha256 = "sha256-P+XQRIL2DepoOSVElxVxMihqxdxwLVnvXuraZN8L7z8="; + hash = "sha256-mrb202ON0B6VlY+U+jN0jJmbT36jQ8krNnuODynaCUA="; }; postPatch = '' @@ -56,6 +56,10 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ]; + checkPhase = '' + meson test + ''; + postInstall = '' ln -s dev.tchx84.Portfolio "$out/bin/portfolio" ''; diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 2a3a1a47410df..225dfb93637cc 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -9,7 +9,7 @@ let version = "1.3.24"; src = oldAttrs.src.override { inherit version; - sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; + hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; }; }); flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec { diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index dd6184f4ff6f5..8f7e371a8e562 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.4.1"; + version = "2.4.2"; nativeBuildInputs = [ cmake @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "sha256-4L/x8cMQee3n20iyWEiXd62NtA6BYM1SHkCn8ZlDNWA="; + sha256 = "17p56f0zmiryy8k4da02in1l6yxniz286gf9yz8s1gaz5ksqj4af"; rev = "version_${version}"; }; diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index 0914d2599c224..d634f2dd4af98 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "pure-maps"; - version = "2.9.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "rinigus"; repo = "pure-maps"; rev = version; - hash = "sha256-pMPjY6OXR6THiSQZ4mw9Kz+tAXJaOwzJEcpPOyZ+YKI="; + hash = "sha256-r36/Vpt4ZIWV1+VhqRBuo4uT7nmEGiFGIt3QGG3ijjs="; fetchSubmodules = true; }; @@ -37,6 +37,7 @@ mkDerivation rec { meta = with lib; { description = "Display vector and raster maps, places, routes, and provide navigation instructions with a flexible selection of data and service providers"; homepage = "https://github.com/rinigus/pure-maps"; + changelog = "https://github.com/rinigus/pure-maps/blob/${src.rev}/NEWS.md"; license = licenses.gpl3Only; maintainers = [ maintainers.Thra11 ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 4bd8a182d6f1e..95f85430ba0b5 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,5 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, file, less, highlight -, imagePreviewSupport ? true, w3m }: +{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m +, imagePreviewSupport ? true +, neoVimSupport ? true +, improvedEncodingDetection ? true +, rightToLeftTextSupport ? false +}: python3Packages.buildPythonApplication rec { pname = "ranger"; @@ -15,8 +19,13 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; checkInputs = with python3Packages; [ pytestCheckHook ]; - propagatedBuildInputs = [ file ] - ++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ]; + propagatedBuildInputs = [ + less + file + ] ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ] + ++ lib.optionals neoVimSupport [ python3Packages.pynvim ] + ++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ] + ++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ]; preConfigure = '' ${lib.optionalString (highlight != null) '' diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix new file mode 100644 index 0000000000000..d19d27153fa01 --- /dev/null +++ b/pkgs/applications/misc/remnote/default.nix @@ -0,0 +1,19 @@ +{ lib, fetchurl, appimageTools }: + +appimageTools.wrapType2 rec { + pname = "remnote"; + version = "1.7.6"; + + src = fetchurl { + url = "https://download.remnote.io/RemNote-${version}.AppImage"; + sha256 = "sha256-yRUpLev/Fr3mOamkFgevArv2UoXgV4e6zlyv7FaQ4RM="; + }; + + meta = with lib; { + description = "A note-taking application focused on learning and productivity"; + homepage = "https://remnote.com/"; + maintainers = with maintainers; [ max-niederman ]; + license = licenses.unfree; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/rm-improved/default.nix b/pkgs/applications/misc/rm-improved/default.nix index 0a1d38f5f7f96..c35fa3dc887b7 100644 --- a/pkgs/applications/misc/rm-improved/default.nix +++ b/pkgs/applications/misc/rm-improved/default.nix @@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec { description = "Replacement for rm with focus on safety, ergonomics and performance"; homepage = "https://github.com/nivekuil/rip"; maintainers = with maintainers; [ nils-degroot ]; + mainProgram = "rip"; license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix new file mode 100644 index 0000000000000..6a631d5a95087 --- /dev/null +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonApplication, fetchFromGitHub, configargparse }: + +buildPythonApplication rec { + pname = "rofi-rbw"; + version = "0.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "fdw"; + repo = "rofi-rbw"; + rev = version; + hash = "sha256-1RDwb8lKls6+X/XtARbi4F7sK4nT03Iy3Wb9N1LEa5o="; + }; + + propagatedBuildInputs = [ configargparse ]; + + pythonImportsCheck = [ "rofi_rbw" ]; + + meta = with lib; { + description = "Rofi frontend for Bitwarden"; + homepage = "https://github.com/fdw/rofi-rbw"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index d0d59af604d4d..1cc78282f6c26 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -15,13 +15,14 @@ buildPythonApplication rec { pname = "rofimoji"; - version = "5.1.0"; + version = "5.4.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofimoji"; rev = version; - sha256 = "sha256-bLV0hYDjVH11euvNHUHZFcCVywuceRljkCqyX4aANVs="; + sha256 = "sha256-D45XGnKWHUsE0DQThITBcgpghelsfGkSEIdg9jvOJlw="; }; # `rofi` and the `waylandSupport` and `x11Support` dependencies diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index 2e1b94b6b6c7a..a020b15eea3e9 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, alsa-lib }: +{ lib, buildGoModule, fetchFromGitHub, darwin, libiconv, alsa-lib, stdenv }: buildGoModule rec { pname = "sampler"; @@ -17,7 +17,10 @@ buildGoModule rec { subPackages = [ "." ]; - buildInputs = [ alsa-lib ]; + buildInputs = lib.optional stdenv.isLinux alsa-lib + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.OpenAL + ]; meta = with lib; { description = "Tool for shell commands execution, visualization and alerting"; diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 05223aeb5c128..9729301f6e74c 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "isamert"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DUDf5FlcNZzZASa8vTc72Z1/Dk+iAhtcgVJtjDUwyEo="; + sha256 = "sha256-YEgeeoUqDeBx3jPddTeykl+68lS8gVKD+zdo+gRTaT4="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -47,6 +47,6 @@ python3.pkgs.buildPythonApplication rec { description = "Simple terminal user interface for Signal"; homepage = "https://github.com/isamert/scli"; license = licenses.gpl3Only; - maintainers = with maintainers; [ alex-eyre ]; + maintainers = with maintainers; [ alexeyre ]; }; } diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 20b944efd5d50..928a71b69047c 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,17 +1,19 @@ -{ lib, python3Packages, ffmpeg }: +{ lib +, python3 +, ffmpeg +}: -python3Packages.buildPythonApplication rec { - version = "2.2"; - pname = "sigal"; +python3.pkgs.buildPythonApplication rec { + pname = "sigal"; + version = "2.3"; + format = "setuptools"; - src = python3Packages.fetchPypi { + src = python3.pkgs.fetchPypi { inherit version pname; - sha256 = "sha256-49XsNdZuicsiYJZuF1UdqMA4q33Ly/Ug/Hc4ybJKmPo="; + hash = "sha256-4Zsb/OBtU/jV0gThEYe8bcrb+6hW+hnzQS19q1H409Q="; }; - disabled = !(python3Packages.pythonAtLeast "3.6"); - - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ # install_requires jinja2 markdown @@ -29,16 +31,18 @@ python3Packages.buildPythonApplication rec { checkInputs = [ ffmpeg - ] ++ (with python3Packages; [ + ] ++ (with python3.pkgs; [ pytestCheckHook ]); - makeWrapperArgs = [ "--prefix PATH : ${ffmpeg}/bin" ]; + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" + ]; meta = with lib; { description = "Yet another simple static gallery generator"; - homepage = "http://sigal.saimon.org/en/latest/index.html"; - license = licenses.mit; + homepage = "http://sigal.saimon.org/"; + license = licenses.mit; maintainers = with maintainers; [ domenkozar matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/applications/misc/sigi/default.nix index 62b8dd576591f..e3384ff6dd7f5 100644 --- a/pkgs/applications/misc/sigi/default.nix +++ b/pkgs/applications/misc/sigi/default.nix @@ -1,28 +1,25 @@ -{ lib, rustPlatform, fetchCrate, installShellFiles, testVersion, sigi }: +{ lib, rustPlatform, fetchCrate, installShellFiles, testers, sigi }: rustPlatform.buildRustPackage rec { pname = "sigi"; - version = "3.0.3"; + version = "3.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-tjhNE20GE1L8kvhdI5Mc90I75q8szOIV40vq2CBt98U="; + sha256 = "sha256-dcfzCac4dT2X1hgTSh30G7h2XtvVj1jMUmrUzqZ11y8="; }; + cargoSha256 = "sha256-CQofC9Y0y8XASLpjk9B6mMlSQqiXnoGZ8kJh16txiPA="; nativeBuildInputs = [ installShellFiles ]; - # As part of its tests, sigi hard-codes a location to BATS based on git - # submodules. The tests are recommeded to skip for Linux packaging. They'll - # move to Rust after this issue: https://github.com/hiljusti/sigi/issues/19 - checkFlags = [ "SKIP_BATS_TESTS=1" ]; + # In case anything goes wrong. + checkFlags = [ "RUST_BACKTRACE=1" ]; postInstall = '' installManPage sigi.1 ''; - cargoSha256 = "sha256-0e0r6hfXGJmrc6tgCqq2dQXu2MhkThViZwdG3r3g028="; - - passthru.tests.version = testVersion { package = sigi; }; + passthru.tests.version = testers.testVersion { package = sigi; }; meta = with lib; { description = "Organizing CLI for people who don't love organizing."; diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix new file mode 100644 index 0000000000000..7ffb24cb41930 --- /dev/null +++ b/pkgs/applications/misc/sioyek/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, installShellFiles +, fetchFromGitHub +, gumbo +, harfbuzz +, jbig2dec +, mupdf +, openjpeg +, qt3d +, qtbase +, qmake +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "sioyek"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "ahrm"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-G4iZi6xTJjWZN0T3lO0jPquxJ3p8Mc0ewmjJEKcGJ34="; + }; + + buildInputs = [ gumbo harfbuzz jbig2dec mupdf openjpeg qt3d qtbase ]; + + nativeBuildInputs = [ installShellFiles wrapQtAppsHook qmake ]; + + postPatch = '' + substituteInPlace pdf_viewer_build_config.pro \ + --replace "-lmupdf-threads" "-lfreetype -lgumbo -ljbig2dec -lopenjp2 -ljpeg" + substituteInPlace pdf_viewer/main.cpp \ + --replace "/usr/share/sioyek" "$out/share" \ + --replace "/etc/sioyek" "$out/etc" + ''; + + qmakeFlags = "DEFINES+=\"LINUX_STANDARD_PATHS\" pdf_viewer_build_config.pro"; + + postInstall = '' + install -Dm644 tutorial.pdf $out/share/tutorial.pdf + cp -r pdf_viewer/shaders $out/share/ + install -Dm644 -t $out/etc/ pdf_viewer/{keys,prefs}.config + installManPage resources/sioyek.1 + ''; + + meta = with lib; { + description = "Sioyek is a PDF viewer designed for reading research papers and technical books."; + homepage = "https://sioyek.info/"; + changelog = "https://github.com/ahrm/sioyek/releases"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = [ maintainers.podocarp ]; + }; +} diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/applications/misc/skate/default.nix index bb2315e7cff6b..04293d78ad975 100644 --- a/pkgs/applications/misc/skate/default.nix +++ b/pkgs/applications/misc/skate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "skate"; - version = "0.1.4"; + version = "0.2.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "skate"; rev = "v${version}"; - sha256 = "sha256-vZps/VXNK+17quPyE1b56YXE2GsW3oB4vPi7sA8EPGE="; + sha256 = "sha256-glqBiwW87BwGRZGDSvvE/WeK4BKqXGmC6Q9qBk+ROuc="; }; - vendorSha256 = "sha256-7cf/ldBli/q7aNiCO7qIw8o09hVpwDxF2h/UelP86V4="; + vendorSha256 = "sha256-VQvumXQx5Q0gt51NI65kjSnzGRyScpli36vfCygtAjE="; doCheck = false; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index e8c6445d5f84d..0f331ef6e2ce4 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.3.2"; + version = "1.3.10"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "1sx2rib0la3mifvh84ia3jnnq4qw9jxc13vxyidsdkp6x82nbvcg"; + sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; }; buildInputs = [ @@ -26,7 +26,10 @@ python3Packages.buildPythonApplication rec { packaging pycairo pygal + psutil + gbulb pypresence + sentry-sdk setuptools skytemple-dtef skytemple-eventserver diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index 7287958d99ede..aaac0c1065772 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "slides"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "maaslalani"; repo = "slides"; rev = "v${version}"; - sha256 = "sha256-05geDWZSpFjLywuWkI+FPaTaO9dyNuPuMBk7dc1Yl6I="; + sha256 = "sha256-Ca0/M4B6yAdV4hbJ95gH9MVZg3EFIY5bSMkkYy2+P+Q="; }; checkInputs = [ @@ -21,7 +21,7 @@ buildGoModule rec { go ]; - vendorSha256 = "sha256-i+bbSwiH7TD+huxpTREThxnPkQZTMQJO7AP4kTlCseo="; + vendorSha256 = "sha256-pn7c/6RF/GpECQtaxsTau91T7pLg+ZAUBbnR7h8DfnY="; ldflags = [ "-s" @@ -32,7 +32,8 @@ buildGoModule rec { meta = with lib; { description = "Terminal based presentation tool"; homepage = "https://github.com/maaslalani/slides"; + changelog = "https://github.com/maaslalani/slides/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ maaslalani ]; + maintainers = with maintainers; [ maaslalani penguwin ]; }; } diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 39eadc8437001..230abcf28514e 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -13,19 +13,20 @@ # logitech-udev-rules instead of adding this to services.udev.packages on NixOS python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = version; - sha256 = "1yqxk6nfxc1xhk59qbz9m3wqkxv446g17pazvanpavriiysjzbrs"; + hash = "sha256-6z22MnhUL9Da3G7UDmZsBAi2gHLNpiFEwe+pAtnP91s="; }; nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ]; buildInputs = [ libappindicator librsvg ]; propagatedBuildInputs = with python3Packages; [ + evdev gobject-introspection gtk3 psutil diff --git a/pkgs/applications/misc/sqls/default.nix b/pkgs/applications/misc/sqls/default.nix index 2c89d31df35ab..6ac9275570a35 100644 --- a/pkgs/applications/misc/sqls/default.nix +++ b/pkgs/applications/misc/sqls/default.nix @@ -2,19 +2,21 @@ buildGoModule rec { pname = "sqls"; - version = "0.2.20"; + version = "0.2.22"; src = fetchFromGitHub { owner = "lighttiger2505"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QYxiWxgzuD+JymlXlVmzZOtex70JC93VmWljAFQJMPQ="; + sha256 = "sha256-xtvm/NVL98dRzQL1id/WwT/NdsnB7qTRVR7jfrRsabY="; }; - vendorSha256 = "sha256-fo5g6anMcKqdzLG8KCJ/T4uTOp1Z5Du4EtCHYkLgUpo="; + vendorSha256 = "sha256-sowzyhvNr7Ek3ex4BP415HhHSKnqPHy5EbnECDVZOGw="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.revision=${src.rev}" ]; + doCheck = false; + meta = with lib; { homepage = "https://github.com/lighttiger2505/sqls"; description = "SQL language server written in Go"; diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index 42bd58cd78316..4496f2a595324 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -1,17 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, imlib2, libX11 }: +{ lib, stdenv, fetchFromGitHub, imlib2, libX11, pkg-config }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ssocr"; - version = "unstable-2018-08-11"; + version = "2.22.1"; src = fetchFromGitHub { owner = "auerswal"; repo = "ssocr"; - rev = "5e47e26b125a1a13bc79de93a5e87dd0b51354ca"; - sha256 = "0yzprwflky9a7zxa3zic7gvdwqg0zy49zvrqkdxng2k1ng78k3s7"; + rev = "v${version}"; + sha256 = "sha256-j1l1o1wtVQo+G9HfXZ1sJQ8amsUQhuYxFguWFQoRe/s="; }; - nativeBuildInputs = [ imlib2 libX11 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ imlib2 libX11 ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 48e2859fa8498..b65dad4735904 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "stork"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "jameslittle230"; repo = "stork"; rev = "v${version}"; - sha256 = "sha256-aBsxRLUufVUauySCxZKk/ZfcU/5KR7jOHmnx6mHmsFs="; + sha256 = "sha256-itjRJLbRTwovK+HcNEzwViEDTJ1MoRRTvZD412XYVKk="; }; - cargoSha256 = "sha256-oNoWGdXYfp47IpqU1twbORPOYrHjArNf43Zyeyat4Xs="; + cargoSha256 = "sha256-GaYdgC3Bf759ZPcZxoFG0nmCSz7aNHuqtyid6RS8Ui8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index a93436362adf5..c05778d6aaea3 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -4,6 +4,7 @@ , meson , ninja , pkg-config +, scdoc , vala , gtk3 , glib @@ -20,16 +21,16 @@ stdenv.mkDerivation rec { pname = "SwayNotificationCenter"; - version = "0.3"; + version = "0.5"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayNotificationCenter"; rev = "v${version}"; - hash = "sha256-gXo/V2FHkHZBRmaimqJCzi0BqS4tP9IniIlubBmK5u0="; + hash = "sha256-Jjbr6GJ0MHlO+T/simPNYQnB5b7Cr85j4GRjRGa5B6s="; }; - nativeBuildInputs = [ gobject-introspection meson ninja pkg-config vala wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection meson ninja pkg-config scdoc vala wrapGAppsHook ]; buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 json-glib libhandy librsvg ]; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index f2c8e6075d9d3..3ea247f4b080e 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -10,6 +10,7 @@ , gtk3 , gsettings-desktop-schemas , p7zip +, autoPatchelfHook , libXxf86vm , unzip }: @@ -41,14 +42,17 @@ let }; postPatch = '' - patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_awt.so - patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_x11.so - patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_awt.so - patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so + addAutoPatchelfSearchPath ${jre8}/lib/openjdk/jre/lib/ + autoPatchelf lib + + # Nix cannot see the runtime references to the paths we just patched in + # once they've been compressed into the .jar. Scan for and remember them + # as plain text so they don't get overlooked. + find . -name '*.so' | xargs strings | { grep '/nix/store' || :; } >> ./.jar-paths ''; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; + buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas libXxf86vm ]; buildPhase = '' runHook preBuild @@ -80,6 +84,13 @@ let --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" + + # remember the store paths found inside the .jar libraries. note that + # which file they are in does not matter in particular, just that some + # file somewhere lists them in plain-text + mkdir -p $out/nix-support + cp .jar-paths $out/nix-support/depends + runHook postInstall ''; diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 8290a868ef07d..56baa1e9d8228 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "taskwarrior"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "taskwarrior"; rev = "v${version}"; - sha256 = "sha256-jMZzo2cegoapEHTvfD6ThU1IsXru3iOcpyDbZxkSXzQ="; + sha256 = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw="; fetchSubmodules = true; }; @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { homepage = "https://taskwarrior.org"; license = licenses.mit; maintainers = with maintainers; [ marcweber oxalica ]; + mainProgram = "task"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix index c6a700753f3ad..9840da035e5ab 100644 --- a/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://gitlab.com/ttyperacer/terminal-typeracer"; license = licenses.gpl3Plus; maintainers = with maintainers; [ yoctocell ]; + mainProgram = "typeracer"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index adff6741d31fe..819df21ebe1d4 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://timewarrior.net"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer mrVanDalo ]; + mainProgram = "timew"; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/toipe/default.nix b/pkgs/applications/misc/toipe/default.nix index e9cd39162cafd..ca842ff6db00e 100644 --- a/pkgs/applications/misc/toipe/default.nix +++ b/pkgs/applications/misc/toipe/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "toipe"; - version = "0.3.1"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-/vO5ABMldw3soh7mscjhN5TAZOcs+iMTaMxcdMmV0Xo="; + sha256 = "sha256-lAvFCvNm55SjRmrhIkMBiM0nSlAG+jUEKLlLaGs1RkY="; }; - cargoSha256 = "sha256-AsRQ8kvDy1cH4/kaFAoU7en3dzDiG1T+O+4r6PKa0hM="; + cargoSha256 = "sha256-WmWH/x69H17uHQEB0+GRUtApJnSEkoeFLLweP8NoBrk="; meta = with lib; { description = "Trusty terminal typing tester"; diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index be2ee1e7a8510..e46f5d2b8c1d7 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium"; license = licenses.unlicense; maintainers = with maintainers; [ ebzzry infinisil ]; + mainProgram = "trans"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/tty-solitaire/default.nix b/pkgs/applications/misc/tty-solitaire/default.nix index b390c7bf9d142..137e5653d74f9 100644 --- a/pkgs/applications/misc/tty-solitaire/default.nix +++ b/pkgs/applications/misc/tty-solitaire/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mpereira/tty-solitaire"; platforms = ncurses.meta.platforms; maintainers = [ maintainers.AndersonTorres ]; + mainProgram = "ttysolitaire"; }; } diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 2c4cc1a11c096..e7299326e87db 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tut"; - version = "0.0.42"; + version = "0.0.46"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-zWhG9lzerzDqqFN8IG5JSv3voLzvtp/gg6jBisbodMc="; + sha256 = "sha256-C9kyA6QuL8sqzCooaPzSP7VOpu7jcSFCUx9oaZLZ7/w="; }; vendorSha256 = "sha256-kMGEAN/I2XsIc6zCDbhbbstYlyjDpXQsOPUzjaJqJBk="; diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix index bd8fdf5e48c55..887a979219db2 100644 --- a/pkgs/applications/misc/tvbrowser/bin.nix +++ b/pkgs/applications/misc/tvbrowser/bin.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/${pname} \ --add-flags "-jar $out/share/java/${pname}/${pname}.jar" \ - --run "cd $out/share/java/${pname}" + --chdir "$out/share/java/${pname}" ''; meta = with lib; { diff --git a/pkgs/applications/misc/twitch-chat-downloader/default.nix b/pkgs/applications/misc/twitch-chat-downloader/default.nix index a8ffb46c1f88a..779b9ddba63bf 100644 --- a/pkgs/applications/misc/twitch-chat-downloader/default.nix +++ b/pkgs/applications/misc/twitch-chat-downloader/default.nix @@ -9,16 +9,22 @@ buildPythonApplication rec { pname = "twitch-chat-downloader"; - version = "3.2.1"; + version = "3.2.2"; src = fetchPypi { inherit version; pname = "tcd"; - sha256 = "f9b5ea2ad3badb7deffdd9604368ccb54170cd7929efbaa2d7b534e089ae6338"; + sha256 = "ee6a8e22c54ccfd29988554b13fe56b2a1bf524e110fa421d77e27baa8dcaa19"; }; postPatch = '' - substituteInPlace setup.py --replace "'pipenv>=2020.5.28'," "" + substituteInPlace setup.py \ + --replace "'pipenv==2022.4.30'," "" \ + --replace "setuptools==62.1." "setuptools" \ + --replace "requests==2.27.1" "requests" \ + --replace "twitch-python==0.0.20" "twitch-python" \ + --replace "pytz==2022.1" "pytz" \ + --replace "python-dateutil==2.8.2" "python-dateutil" ''; propagatedBuildInputs = [ requests twitch-python pytz python-dateutil ]; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index fb9c7021b15b8..d5d4b766e7752 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,42 +1,47 @@ { lib +, asciidoc , fetchFromGitHub -, buildPythonApplication -, asciidoc-full -, docopt -, gettext , gobject-introspection , gtk3 -, keyutils +, installShellFiles , libappindicator-gtk3 , libnotify , librsvg -, nose -, pygobject3 -, pyyaml +, python3 , udisks2 , wrapGAppsHook }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "udiskie"; - version = "2.4.0"; + version = "2.4.2"; + + format = "setuptools"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = "v${version}"; - hash = "sha256-T4kMPMXfehZT7P+TOd1llR2TbHPA/quNL545xxlmJfE="; + hash = "sha256-lQMJVSY3JeZYYOFDyV29Ye2j8r+ngE/ta2wQYipy4hU="; }; - outputs = [ "out" "man" ]; + patches = [ + ./locale-path.patch + ]; + + postPatch = '' + substituteInPlace udiskie/locale.py --subst-var out + ''; nativeBuildInputs = [ - asciidoc-full # Man page - gettext + asciidoc # Man page gobject-introspection + installShellFiles wrapGAppsHook ]; + dontWrapGApps = true; + buildInputs = [ gobject-introspection gtk3 @@ -46,8 +51,9 @@ buildPythonApplication rec { udisks2 ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ docopt + keyutils pygobject3 pyyaml ]; @@ -57,21 +63,20 @@ buildPythonApplication rec { ''; postInstall = '' - mkdir -p $man/share/man/man8 - cp -v doc/udiskie.8 $man/share/man/man8/ + installManPage doc/udiskie.8 ''; - checkInputs = [ - keyutils - nose - ]; - - checkPhase = '' - nosetests + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + meta = with lib; { homepage = "https://github.com/coldfix/udiskie"; + changelog = "https://github.com/coldfix/udiskie/blob/${src.rev}/CHANGES.rst"; description = "Removable disk automounter for udisks"; longDescription = '' udiskie is a udisks2 front-end that allows to manage removeable media such @@ -88,6 +93,6 @@ buildPythonApplication rec { - password caching (requires python keyutils 0.3) ''; license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres dotlambda ]; }; } diff --git a/pkgs/applications/misc/udiskie/locale-path.patch b/pkgs/applications/misc/udiskie/locale-path.patch new file mode 100644 index 0000000000000..f454bee467dba --- /dev/null +++ b/pkgs/applications/misc/udiskie/locale-path.patch @@ -0,0 +1,17 @@ +diff --git a/udiskie/locale.py b/udiskie/locale.py +index f12bea9..450e38b 100644 +--- a/udiskie/locale.py ++++ b/udiskie/locale.py +@@ -10,10 +10,8 @@ from gettext import translation + testdirs = [ + # manual override: + os.environ.get('TEXTDOMAINDIR'), +- # editable installation: +- os.path.join(os.path.dirname(__file__), '../build/locale'), +- # user or virtualenv installation: +- os.path.join(sys.prefix, 'share/locale'), ++ # Nix installation: ++ os.path.join('@out@', 'share/locale'), + ] + testfile = 'en_US/LC_MESSAGES/udiskie.mo' + localedir = next( diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 9afd1a6930eec..34cc97023989e 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.6.10.7"; + version = "5.6.10.13"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_7_f806fd1250954801/${pname}_${version}_amd64.deb"; - sha256 = "6fe11cd53ffb66a02aa771153c4f58af34fea25847ee5bc13802fec9b0db0280"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_13_3c485d1dd2af4f61/${pname}_${version}_amd64.deb"; + sha256 = "c3e1ecf14c99596f434edf93a2e08f031fbaa167025d1280cf19f68b829d6b79"; }; nativeBuildInputs = [ @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { description = "Online freelancing platform desktop application for time tracking"; homepage = "https://www.upwork.com/ab/downloads/"; license = licenses.unfree; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ zakkor wolfangaukang ]; }; } diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 33d0da5c93a4f..2897bb996c84f 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -18,11 +18,11 @@ with lib; stdenv.mkDerivation rec { pname = "veracrypt"; - version = "1.24-Update7"; + version = "1.25.9"; src = fetchurl { url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "0i7h44zn2mjzgh416l7kfs0dk6qc7b1bxsaxqqqcvgrpl453n7bc"; + sha256 = "sha256-drbhgYS8IaQdKUn/Y9ch1JBUpxbO/zpL13tcNRC3lK8="; }; patches = [ diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index d5c454a06e85d..890a69f3b1616 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -8,18 +8,16 @@ with python3Packages; buildPythonApplication rec { pname = "vit"; - version = "2.1.0"; - disabled = lib.versionOlder python.version "3.6"; + version = "2.2.0"; + disabled = lib.versionOlder python.version "3.7"; src = fetchPypi { inherit pname version; - sha256 = "fd34f0b827953dfdecdc39f8416d41c50c24576c33a512a047a71c1263eb3e0f"; + sha256 = "sha256-6GbIc5giuecxUqswyaAJw675R1M8BvelyyRNFcTqKW8="; }; propagatedBuildInputs = [ - pytz tasklib - tzlocal urwid ]; diff --git a/pkgs/applications/misc/web-media-controller/default.nix b/pkgs/applications/misc/web-media-controller/default.nix index 7e0fbb999f5fa..d2b5b924ea8c0 100644 --- a/pkgs/applications/misc/web-media-controller/default.nix +++ b/pkgs/applications/misc/web-media-controller/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { description = "MPRIS proxy for usage with 'Web Media Controller' web extension"; license = licenses.unlicense; maintainers = with maintainers; [ doronbehar ]; + mainProgram = "web-media-controller"; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 3920a3a86554e..9b8a7f0a348ad 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron -, nodePackages, alsa-lib, gtk3, libxshmfence, mesa, nss }: +, nodePackages, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss }: stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.5.2"; + version = "4.5.4"; src = fetchurl { url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; - sha256 = "sha256-4ksKXVeUGICHfx014s5g9mapS751dbexBjzyqNvk02M="; + sha256 = "048c2hpnlzjli8r1lcm7hd32qfsq4p9vkimrgc049yw9f15ndjpr"; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nodePackages.asar ]; - buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; + buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ]; dontConfigure = true; diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 9e05e09caefed..2a6bab5ebda77 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,25 +1,23 @@ -{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkg-config -, libtool, openssl, qtbase, qttools }: +{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, pkg-config +, libtool, openssl, qtbase, qttools, sphinx }: mkDerivation rec { pname = "xca"; - version = "2.2.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "chris2511"; repo = "xca"; rev = "RELEASE.${version}"; - sha256 = "0na2816lkfkkvssh9kmf5vwy6x8kd4x7h138jzy61wrvs69vhnbi"; + sha256 = "04z0mmjsry72nvib4icmwh1717y4q9pf2gr68ljrzln4vv4ckpwk"; }; - postPatch = '' - substituteInPlace doc/code2html \ - --replace /usr/bin/perl ${perl}/bin/perl - ''; - buildInputs = [ libtool openssl qtbase ]; - nativeBuildInputs = [ autoreconfHook pkg-config qttools ]; + nativeBuildInputs = [ autoreconfHook pkg-config qttools sphinx ]; + + # Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710) + QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/xdragon/default.nix b/pkgs/applications/misc/xdragon/default.nix deleted file mode 100644 index 39f291a884937..0000000000000 --- a/pkgs/applications/misc/xdragon/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gtk3 }: - -stdenv.mkDerivation rec { - pname = "xdragon"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "mwh"; - repo = "dragon"; - rev = "v${version}"; - sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk3 ]; - - installFlags = [ "PREFIX=${placeholder "out"}/bin" ]; - postInstall = '' - ln -s $out/bin/dragon $out/bin/xdragon - ''; - - meta = with lib; { - description = "Simple drag-and-drop source/sink for X (called dragon in upstream)"; - homepage = "https://github.com/mwh/dragon"; - license = licenses.gpl3; - maintainers = with maintainers; [ das_j ]; - }; -} diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index e40a0d7e5adee..b771bd7e62120 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.16.4"; + version = "6.17.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-hfdKhTUGoVN4DIURO+e3MOSpsL6GWxOV3LItd0nA51Y="; + sha256 = "sha256-K8mN3Wzlay2Qgoo70mu3Bh4lXUXNDpXYt17aNnwWkIc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 25f27bd5063a2..2c69a3960f708 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.16.4-mo1"; + version = "6.16.5-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-OnKz/Sl/b0wpZ1tqeEXhNxNNmQJXBhv5YNnKu9aOVZA="; + sha256 = "sha256-TNiHvRLS+eAPHa+qbnVSAyWTPGJxdp9eheQamd4i24E="; }; meta = with lib; { diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 927b04d5e210f..58c0c066d8388 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -12,11 +12,11 @@ assert enablePrinting -> cups != null; stdenv.mkDerivation rec { pname = "xpdf"; - version = "4.03"; + version = "4.04"; src = fetchzip { url = "https://dl.xpdfreader.com/xpdf-${version}.tar.gz"; - sha256 = "09yhvmh1vxjy763nnmawynygp5bh3j4i8ixqja64j11676yl77n6"; + hash = "sha256-ujH9KDwFRjPIKwdMg79Mab9BfA2HooY5+2PESUgnGDY="; }; # Fix "No known features for CXX compiler", see diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index db28952c31f2b..578c08b207eda 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.17.3"; + version = "0.17.6"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM="; + sha256 = "1lgfa1y5vsm3gqxizdgbn816klcamqmshw817mwan5i5yx9nk6xz"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k="; + cargoSha256 = "sha256-va+MKnHVdkQNq1SFvvoYnb28tW61W7d97LoCMNzwZHE="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/applications/misc/xteddy/default.nix index 717ba66feb86a..481255393472d 100644 --- a/pkgs/applications/misc/xteddy/default.nix +++ b/pkgs/applications/misc/xteddy/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { postFixup = '' # this is needed, because xteddy expects images to reside # in the current working directory - wrapProgram $out/bin/xteddy --run "cd $out/share/images/" + wrapProgram $out/bin/xteddy --chdir "$out/share/images/" ''; meta = with lib; { diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/applications/misc/ydict/default.nix new file mode 100644 index 0000000000000..49370870f692a --- /dev/null +++ b/pkgs/applications/misc/ydict/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "ydict"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "TimothyYe"; + repo = "ydict"; + rev = "v${version}"; + sha256 = "sha256-zhjsXZsRk0UNijjqjGjZh4TiPxAM5p+ic3JMx2wrPeY="; + }; + + vendorSha256 = "sha256-O6czDfKD18rGVMIZv6II09oQu1w0ijQRuZRGt2gj9Cs="; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "A command-line Chinese dictionary"; + homepage = "https://github.com/TimothyYe/ydict"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index b0d1b79509a62..d80c8d03bf43b 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.2.4"; + version = "2.2.5"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-lzXciToyUsHl8WV0IvdP6R2pYegL7/G04YPLb6gbCgQ="; + sha256 = "sha256-KP3lt0CweT1f/BR3IpnjwCqNvhFbrpz9KLg6K8OMs+I="; }; appimageContents = appimageTools.extractType2 { inherit name src; diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index f6ed2daf8ec7c..24511096f1d4c 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -10,7 +10,7 @@ , installShellFiles , libsass , zola -, testVersion +, testers }: rustPlatform.buildRustPackage rec { @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { --bash completions/zola.bash ''; - passthru.tests.version = testVersion { package = zola; }; + passthru.tests.version = testers.testVersion { package = zola; }; meta = with lib; { description = "A fast static site generator with everything built-in"; diff --git a/pkgs/applications/networking/alpnpass/default.nix b/pkgs/applications/networking/alpnpass/default.nix new file mode 100644 index 0000000000000..5cc0ac1cf05cf --- /dev/null +++ b/pkgs/applications/networking/alpnpass/default.nix @@ -0,0 +1,34 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "alpnpass"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "VerSprite"; + repo = "alpnpass"; + rev = version; + hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g="; + }; + + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + meta = with lib; { + description = "Inspect the plaintext payload inside of proxied TLS connections"; + longDescription = '' + This tool will listen on a given port, strip SSL encryption, + forward traffic through a plain TCP proxy, + then encrypt the returning traffic again + and send it to the target of your choice. + + Unlike most SSL stripping solutions this tool will negotiate ALPN and + preserve the negotiated protocol all the way to the target. + ''; + homepage = "https://github.com/VerSprite/alpnpass"; + license = licenses.unlicense; + maintainers = [ maintainers.raboof ]; + }; +} diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index 987f6e0c1ca28..7e4c5cfac888d 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -87,11 +87,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "5.5.3"; + version = "5.5.4"; src = fetchurl { url = "https://bin.appgate-sdp.com/${versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-qSo4JX/Jj+JkeetZIMw88MK7SzOgT8aNbQby2kJ91oo="; + sha256 = "sha256-7qfgUYD7uPb+ZEierREVfnHoGz0/b/J+hcsX/duDFWU="; }; # just patch interpreter diff --git a/pkgs/applications/networking/bee/bee.nix b/pkgs/applications/networking/bee/bee.nix index d2f1740a573d9..fd6177c4647da 100644 --- a/pkgs/applications/networking/bee/bee.nix +++ b/pkgs/applications/networking/bee/bee.nix @@ -1,4 +1,4 @@ -{ version ? "release", lib, fetchFromGitHub, buildGoModule, coreutils }: +{ version ? "release", lib, fetchFromGitHub, buildGoModule }: let @@ -39,8 +39,6 @@ buildGoModule { inherit (versionSpec) rev sha256; }; - nativeBuildInputs = [ coreutils ]; - subPackages = [ "cmd/bee" ]; # no symbol table, no debug info, and pass the commit for the version string diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 7c0006f745c65..a0f15253d6a50 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ lib, stdenv, fetchurl, wrapGAppsHook, makeWrapper , dpkg , alsa-lib , at-spi2-atk @@ -15,7 +15,6 @@ , gnome , gsettings-desktop-schemas , gtk3 -, libpulseaudio , libuuid , libdrm , libX11 @@ -37,65 +36,65 @@ , pango , pipewire , udev +, wayland , xorg , zlib , xdg-utils -, wrapGAppsHook +, snappy + +# command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" -}: -let +# Necessary for USB audio devices. +, pulseSupport ? stdenv.isLinux +, libpulseaudio -rpath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libdrm - libpulseaudio - libX11 - libxkbcommon - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libxshmfence - libXtst - libuuid - mesa - nspr - nss - pango - pipewire - udev - xdg-utils - xorg.libxcb - zlib -]; +# For GPU acceleration support on Wayland (without the lib it doesn't seem to work) +, libGL +# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder) +, libvaSupport ? stdenv.isLinux +, libva +, enableVideoAcceleration ? libvaSupport + +# For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API +, vulkanSupport ? false +, addOpenGLRunpath +, enableVulkan ? vulkanSupport +}: + +let + inherit (lib) optional optionals makeLibraryPath makeSearchPathOutput makeBinPath + optionalString strings escapeShellArg; + + deps = [ + alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat + fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11 libGL + libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage + libXext libXfixes libXi libXrandr libXrender libxshmfence + libXtst libuuid mesa nspr nss pango pipewire udev wayland + xdg-utils xorg.libxcb zlib snappy + ] + ++ optional pulseSupport libpulseaudio + ++ optional libvaSupport libva; + + rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps; + binpath = makeBinPath deps; + + enableFeatures = optionals enableVideoAcceleration [ "VaapiVideoDecoder" "VaapiVideoEncoder" ] + ++ optional enableVulkan "Vulkan"; + + # The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935 + disableFeatures = optional enableVideoAcceleration "UseChromeOSDirectVideoDecoder"; in stdenv.mkDerivation rec { pname = "brave"; - version = "1.37.109"; + version = "1.38.115"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "fL3vuCqUnzq38JD0bzM/DxLVb5P31iChbMVY2eax9RE="; + sha256 = "sha256-YQpFsB3VVzsOa7PoZ+TLv10Dzm9z819cmyw7atnG/Cs="; }; dontConfigure = true; @@ -103,9 +102,18 @@ stdenv.mkDerivation rec { dontPatchELF = true; doInstallCheck = true; - nativeBuildInputs = [ dpkg wrapGAppsHook ]; + nativeBuildInputs = [ + dpkg + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + ]; + + buildInputs = [ + # needed for GSETTINGS_SCHEMAS_PATH + glib gsettings-desktop-schemas gtk3 - buildInputs = [ glib gsettings-desktop-schemas gnome.adwaita-icon-theme ]; + # needed for XDG_ICON_DIRS + gnome.adwaita-icon-theme + ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; @@ -126,9 +134,9 @@ stdenv.mkDerivation rec { ln -sf $BINARYWRAPPER $out/bin/brave for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}" $exe + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}" $exe done # Fix paths @@ -159,7 +167,21 @@ stdenv.mkDerivation rec { preFixup = '' # Add command line args to wrapGApp. - gappsWrapperArgs+=(--add-flags ${lib.escapeShellArg commandLineArgs}) + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${rpath} + --prefix PATH : ${binpath} + ${optionalString (enableFeatures != []) '' + --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}" + ''} + ${optionalString (disableFeatures != []) '' + --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}" + ''} + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" + ${optionalString vulkanSupport '' + --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share" + --add-flags ${escapeShellArg commandLineArgs} + ''} + ) ''; installCheckPhase = '' @@ -172,7 +194,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://brave.com/"; description = "Privacy-oriented browser for Desktop and Laptop computers"; - changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + lib.replaceStrings [ "." ] [ "" ] version; + changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + replaceStrings [ "." ] [ "" ] version; longDescription = '' Brave browser blocks the ads and trackers that slow you down, chew up your bandwidth, and invade your privacy. Brave lets you diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 6dd6d98c0efdb..993f95a6bfffb 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -7,7 +7,7 @@ # Native build inputs: , ninja, pkg-config , python3, perl -, gnutar, which +, which , llvmPackages # postPatch: , pkgsBuildHost @@ -39,14 +39,12 @@ , glibc # gconv + locale # Package customization: -, gnomeSupport ? false, gnome2 ? null -, gnomeKeyringSupport ? false, libgnome-keyring3 ? null , cupsSupport ? true, cups ? null , proprietaryCodecs ? true , pulseSupport ? false, libpulseaudio ? null , ungoogled ? false, ungoogled-chromium # Optional dependencies: -, libgcrypt ? null # gnomeSupport || cupsSupport +, libgcrypt ? null # cupsSupport , systemdSupport ? stdenv.isLinux , systemd }: @@ -128,7 +126,7 @@ let nativeBuildInputs = [ ninja pkg-config python3WithPackages perl - gnutar which + which llvmPackages.bintools ]; @@ -154,8 +152,6 @@ let curl libepoxy ] ++ optional systemdSupport systemd - ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] - ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; @@ -164,9 +160,21 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch + ] ++ optionals (versionRange "102" "103") [ + # https://dawn-review.googlesource.com/c/dawn/+/88582 + # Wrap get_gitHash in try-catch to prevent failures in tarball builds. + ./patches/m102-fix-dawn_version_generator-failure.patch ]; - postPatch = '' + postPatch = optionalString (chromiumVersionAtLeast "102") '' + # Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361: + substituteInPlace BUILD.gn \ + --replace '"//infra/orchestrator:orchestrator_all",' "" + # Disable build flags that require LLVM 15: + substituteInPlace build/config/compiler/BUILD.gn \ + --replace '"-Xclang",' "" \ + --replace '"-no-opaque-pointers",' "" + '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do if [ -d "third_party/$lib" ]; then @@ -186,6 +194,7 @@ let --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi chmod -x third_party/webgpu-cts/src/tools/run_deno + ${lib.optionalString (chromiumVersionAtLeast "102") "chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno"} # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ @@ -271,7 +280,7 @@ let # Optional features: use_gio = true; - use_gnome_keyring = gnomeKeyringSupport; + use_gnome_keyring = false; # Superseded by libsecret use_cups = cupsSupport; # Feature overrides: @@ -283,6 +292,8 @@ let enable_widevine = true; # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture: rtc_use_pipewire = true; + # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): + chrome_pgo_phase = 0; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e8d9a13f9ac74..5bd24faafe409 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -8,8 +8,6 @@ # package customization # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" -, gnomeSupport ? false, gnome2 ? null -, gnomeKeyringSupport ? false , proprietaryCodecs ? true , enableWideVine ? false , ungoogled ? false # Whether to build chromium or ungoogled-chromium @@ -46,7 +44,7 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit channel chromiumVersionAtLeast versionRange; - inherit gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs + inherit proprietaryCodecs cupsSupport pulseSupport ungoogled; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 85ebb8a7b9350..45f4282582f5b 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -38,9 +38,9 @@ for entry in feed.entries: else: print('chromium: TODO -> ' + version + '\n') print(url) - if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0): - zero_days = re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content) - if zero_days: + if fixes := re.search(r'This update includes .+ security fix(es)?\.', content): + fixes = fixes.group(0) + if zero_days := re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content): fixes += " " + zero_days.group(0) print('\n' + '\n'.join(textwrap.wrap(fixes, width=72))) if cve_list := re.findall(r'CVE-[^: ]+', content): diff --git a/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch b/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch new file mode 100644 index 0000000000000..e9391541e435c --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch @@ -0,0 +1,43 @@ +From e9ffd084ec1ff9f7bfc86879732953dc58256958 Mon Sep 17 00:00:00 2001 +From: Loko Kung <lokokung@google.com> +Date: Tue, 3 May 2022 00:28:53 +0000 +Subject: [PATCH] Wrap get_gitHash in try-catch to prevent failures in tarball + builds. + +Bug: chromium:1321370 +Change-Id: If39d2236d1b4d965f7bd189f6bd1cdc70436c41d +Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88582 +Commit-Queue: Loko Kung <lokokung@google.com> +Reviewed-by: Austin Eng <enga@chromium.org> +Kokoro: Kokoro <noreply+kokoro@google.com> +(cherry picked from commit 03ddfbb81fb4127ca37ea53e70fcb34fe851e24e) +--- + third_party/dawn/generator/dawn_version_generator.py | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/third_party/dawn/generator/dawn_version_generator.py b/third_party/dawn/generator/dawn_version_generator.py +index 1907e88da..3c1927bee 100644 +--- a/third_party/dawn/generator/dawn_version_generator.py ++++ b/third_party/dawn/generator/dawn_version_generator.py +@@ -23,11 +23,14 @@ def get_git(): + + + def get_gitHash(dawnDir): +- result = subprocess.run([get_git(), 'rev-parse', 'HEAD'], +- stdout=subprocess.PIPE, +- cwd=dawnDir) +- if result.returncode == 0: +- return result.stdout.decode('utf-8').strip() ++ try: ++ result = subprocess.run([get_git(), "rev-parse", "HEAD"], ++ stdout=subprocess.PIPE, ++ cwd=dawnDir) ++ if result.returncode == 0: ++ return result.stdout.decode("utf-8").strip() ++ except Exception: ++ return "" + # No hash was available (possibly) because the directory was not a git checkout. Dawn should + # explicitly handle its absenece and disable features relying on the hash, i.e. caching. + return '' +-- +2.36.0 diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index b83aae6c34bef..031439f75d232 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,63 +1,63 @@ { "stable": { - "version": "100.0.4896.75", - "sha256": "1h60l1g340gvm4lz2lps6dqpvahpzn24hz47y2qvc6mavx9d6ki4", - "sha256bin64": "0nrrkgwcnqg4l8x1nk1rdxnv9xa0c24ync1yls7s9rc34wkk8sc5", + "version": "101.0.4951.64", + "sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w", + "sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v", "deps": { "gn": { - "version": "2022-01-21", + "version": "2022-03-14", "url": "https://gn.googlesource.com/gn", - "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", - "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" + "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", + "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" } }, "chromedriver": { - "version": "100.0.4896.60", - "sha256_linux": "0q9ddwhccd0jmzi8jksxlfjavmm913c9bmb4lz1ahxplsnxd8z31", - "sha256_darwin": "0q0ikhf5pkbrqln91fklbbfmqi33nfcjdg5dm7zb66b4alxwwas9", - "sha256_darwin_aarch64": "1vf3s0gq61riqsv85pr6xj0c2afdnv1b2w4gp2bwlfq4ffkfq38y" + "version": "101.0.4951.41", + "sha256_linux": "0zsh6cm7h1m0k5mx1cd29knxjxaadjjcbp7m5fr2mx9c21a1nlcr", + "sha256_darwin": "09py50436y81lw2vk44256dmzsg8dqj14fd0g0gs1cc3ps6q4awl", + "sha256_darwin_aarch64": "0krjijd0zgwg8d44miz43xrjdlvfiymbrrz5r1hzpx64555ch12y" } }, "beta": { - "version": "101.0.4951.15", - "sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y", - "sha256bin64": "0z2rx7mw9wg5ly8wmxkflk8f9gifq4cxqvi224v9dr11qqj8gwm2", + "version": "102.0.5005.49", + "sha256": "16r9mrsagy8lspr4pcrzfpw0vw0ym9m7n41a9yipjhm2arlhw5b2", + "sha256bin64": "0lyk6rd9c1gyvxsmq1bl7asr7carzyaan306ddvwxsy5rfh53jxa", "deps": { "gn": { - "version": "2022-03-14", + "version": "2022-04-14", "url": "https://gn.googlesource.com/gn", - "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", - "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" + "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167", + "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h" } } }, "dev": { - "version": "102.0.4972.0", - "sha256": "1aihdym7h8sd52wiybnrgjrd618f3yby4bpbkc26xyrl8gviz31d", - "sha256bin64": "0mb67cfr397aclkiy0v9xqga07c166qdylq257k2kmhj7df1gcvn", + "version": "103.0.5056.0", + "sha256": "1mvi7yc38cxn39wqm8ybrn862gaw293rb6lwcszc6rmzwd9jmd29", + "sha256bin64": "06371adaz8llzfjykc72vjvpy3xrgvqzz9kdrr82jdx1pjdbv29d", "deps": { "gn": { - "version": "2022-03-29", + "version": "2022-05-09", "url": "https://gn.googlesource.com/gn", - "rev": "e39d5251c25155b9dfdb96adeab31b795095fd3b", - "sha256": "1clr0f847rmwwpmsl9zv4q6rw1shn09my775666v480szpahj9pk" + "rev": "bf4e17dc67b2a2007475415e3f9e1d1cf32f6e35", + "sha256": "0d2lb4alsx32zsdw3jxpxbzal350mim237p2y984h4r6fd1ddzyi" } } }, "ungoogled-chromium": { - "version": "100.0.4896.75", - "sha256": "1h60l1g340gvm4lz2lps6dqpvahpzn24hz47y2qvc6mavx9d6ki4", - "sha256bin64": "0nrrkgwcnqg4l8x1nk1rdxnv9xa0c24ync1yls7s9rc34wkk8sc5", + "version": "101.0.4951.64", + "sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w", + "sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v", "deps": { "gn": { - "version": "2022-01-21", + "version": "2022-03-14", "url": "https://gn.googlesource.com/gn", - "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", - "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" + "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", + "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" }, "ungoogled-patches": { - "rev": "100.0.4896.75-1", - "sha256": "0s31dclgk3x9302wr5yij77361bqam2sfki39p651gwysfizb73n" + "rev": "101.0.4951.64-1", + "sha256": "0k7w6xvjf1yzyak9ywvcdw762d8zbx6d8haz35q87jz0mxfn2mr3" } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 25a81d11efafc..f05ccab2975dd 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 = "99.0b6"; + version = "101.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ach/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ach/firefox-101.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "0bb4605a97661502cb23fe2ebfdb1a31831f8ca015349b3105d1245fcaa5eb69"; + sha256 = "84d818f3e3533fa8d0f92c00d654023c036238db4a9a9048a0d71c0b60017eb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/af/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/af/firefox-101.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "564fd8895c6fa6aecebd5a7250bd73df45a6e51f90845d9597e59cd9175b6c2c"; + sha256 = "1d60a63bdf28d4e0ad1ffe1459cd949704bed08864d0a1118032acb6f9e9cd82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/an/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/an/firefox-101.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "76035e42b93995e6cda0de737981760a0025013bc3330142b95ba7329d54153b"; + sha256 = "b779cd24703b623d06cf69b60c92e244ed6f8c0df5f30ccf8c3d5d9d08841af1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ar/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ar/firefox-101.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "31abbbdf4378559e6b612fd3b0167bbaad332edc47d6ff67e8d9aa7e01130808"; + sha256 = "b8121d4f1a9b04814933df8e15c7e7c01ed24aba78ce1f43d29ec0130aeb7d50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ast/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ast/firefox-101.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "1c4a2c370c3f566823c722082a3a9f149050cb7a891f3a1f21b7ca8ec899ca92"; + sha256 = "cffaf3288650509a3d25988ba32bcb0e7af0bd787b7b5ea297490f236ee91d5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/az/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/az/firefox-101.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "b1d0effa84614c985001705630da49b70f09e91be3715795fc18d926303b6b95"; + sha256 = "c9e62710701996c4d556320583209402dc955296117e8d70a6ead33472e07d0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/be/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/be/firefox-101.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d0ace001eff838f8dcb80090a193307e143a5c1f3b1dac143ded5af3fecbdfda"; + sha256 = "4bb469f3523bdff58e83d9de56a80f1d9396df2fae2c048ea91cefa14d89def2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/bg/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bg/firefox-101.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "784d6029972a843829783581796263899371c777cf669f0e4f6978f35a8d6199"; + sha256 = "bbe96de47df523971ad2f7e72b4c5ef040b94dcf3d88dcded6a3808098aeb1c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/bn/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bn/firefox-101.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "7cdc3a6f35c2a56b87a58eaf3112148c51b2d2d0fe5d9afc5deccfb2d2269b2e"; + sha256 = "0973eae62bf490af5bdf71d5e33dffe291809a2c4389fb8c9cdf33670ab497cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/br/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/br/firefox-101.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "abbe12c9d887ea98d85479105bf2640bdbe3d295def41b626d3d8feef3627b36"; + sha256 = "f693b340a2d7ac5bf40705b51333bf7bc22e9a62a9dd14952e6835a8d5374267"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/bs/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bs/firefox-101.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "fc1076c2eda5623869a3af5c850fb51cf8611501f51984c85f690b4c545cc93b"; + sha256 = "de631ff909d671164e52e7194c1f5f5ac6156ef66877f4642c5f067e806281b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ca-valencia/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ca-valencia/firefox-101.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "d328055c61c96c92dd05989c23a3f8f49b36cb755f72118c21331f986ba3b44d"; + sha256 = "eb73e92b05b37a7aa042b8b865a630a95fdeed41e9881f659a3589c2dcf3fd99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ca/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ca/firefox-101.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6a020e56c5f4136deff38f07d94b516971af1a31a804384a50396dbf6241877e"; + sha256 = "d227042106358cfc9025f3bdc84e12494550e29ba4a8a622fa6c1b88a6cfe7cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/cak/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cak/firefox-101.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c6298bdeba82a637bb3903aaf73b9de9f0a3ce4ec22637b1ee1340273b7e36af"; + sha256 = "6831c152ec2fcab6fe7e6792887c7b813c2e226836135acbfc4ca66a9b114014"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/cs/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cs/firefox-101.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1facd79fe087052af58205d2a0a9acce68a1d9bc58d1a3bd3e49b740f6e51647"; + sha256 = "c7c52ee04dbc90417e6c6d35cefe315daffddb6b13b7a239254bc15cb22f197c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/cy/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cy/firefox-101.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e7305badc55114c4a39edc317202338b3e61feba9844fc2cd8edc1518486736a"; + sha256 = "e6315de3fc02ab229e1e8422f614ceb0ac4ee1aa913492a24f200dd922dfb2ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/da/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/da/firefox-101.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "6b1d2403e1e74c97c763476a128c56079d546967c87f1b225ac790d9acb6940d"; + sha256 = "1dbcc3ad30cae0c8e5cd29dc480373fe80989d8636d42e45698b8f7a76bb7781"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/de/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/de/firefox-101.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c8d01b9a1bbcdeb1fa0fa63ff553209d095280ebad4eb03efa47e029505b8204"; + sha256 = "43189166f2f1e7a3366922270b62e95027f2d750206bd1878b764a5a7572d360"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/dsb/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/dsb/firefox-101.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "bea09c23f3099c85e415bb05916ab9e3374f78e897e2b8549fb9f67895b7c052"; + sha256 = "2016ca15c4ef78eb8c698646cf6a7ca605f2316cde2df5e1648510c117fa32dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/el/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/el/firefox-101.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "bd740ab9aaad78e4b16e42d610ea1b914db95e2f8396f0e9c4803e38c9810f20"; + sha256 = "7aa33608bd1e9ce1bf3a7b1943644873a7e3d91a5bbc72ac03be5fa1bc4ec8aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/en-CA/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-CA/firefox-101.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "acf5c9da684d5f7bb5b25e5fbd62d5dfafb1a5f33bd6c7baa385a37967e516a1"; + sha256 = "e31cc0e5dd155c22b1b3a6219b154544b729e700496e8d8f83a895174e6ecb7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/en-GB/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-GB/firefox-101.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "76cfab3fb29274bcec47ce72e88f783668653d3f8ea4ad00637bdd7ad5d32364"; + sha256 = "7521c0e6c083d26d1f5a67f695354e64947ec3335d07991e97429e569aa17e23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/en-US/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-US/firefox-101.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "798f68125a37ac1e60d72dff3a773cd167075a58d523d7d9659cd5fb511e2dcb"; + sha256 = "e1ad655ed971655a6b56446b5e09fb7f0415c8ff09370ad8fccf7f28dbbd17b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/eo/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/eo/firefox-101.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0b65dc59679b42a298484d3901f3f47d6073f08e260a792a6e80d9c5a0e6ad0b"; + sha256 = "9afae49a33f2a0aa02a346fe6e456d09dbe88a0c655a015be5e50a307c472d95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-AR/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-AR/firefox-101.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3a894741998ee1a2adb6def1c8d548b2c5fcab8fbea655a013dbeef9a29ab228"; + sha256 = "f8919da0647b6e6a6587f4856ce20be5f6054f4e5b6d71562fbffbac594853cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-CL/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-CL/firefox-101.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "1964534e196d426a9d6dbe664dc16790f010214cfba85e98f5df728e110e0a74"; + sha256 = "b31b8a41ac391aefff8c1d85a29ab129983bd39474a15672cb3e74d916e0c9eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-ES/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-ES/firefox-101.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "32b21ccb56fbe2e46aba0e21c417e2a7d3404a0a3487186c75d042fd84c5033a"; + sha256 = "f4f6e6100d85050d381beaa4f2dfeb6b5e7170cf2c079257ebbfbd80219904b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-MX/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-MX/firefox-101.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "d70ff15a4cced1028433e603151af021be98d1026322203f0412605685611e5d"; + sha256 = "c2e3bd2ccbfe64fc5eb1d4f920554ba3d170c0e2e478791d9cc19da955960200"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/et/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/et/firefox-101.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "df844133edc74d396a2fe66b0a71efda2c4797ca7110a12c4c7e620cbacbfe8d"; + sha256 = "cc0b56f513294b0742023e37a06a462b107a480c1fcab118bfba6894c2e72375"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/eu/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/eu/firefox-101.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "1ca8ba1a7ba29a0c21d7bdf5cbb046fa0e145a9bdad5debd93d121b512a060a4"; + sha256 = "8a18e5428a9dc60cd39ff3a1b0900282178efe54c11b43a8015b86d33368804b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fa/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fa/firefox-101.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "a4c223f683bf75c96650d939c56aa17bfeca975ba8863e44dd5ce0449b436b3e"; + sha256 = "75fce16479f2e95c9a00f369364c279b362c0248e787ade7f14f6aba934cc624"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ff/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ff/firefox-101.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "6b165789213fc3f9c3f46457a04974e3c718b2c0aebd44c57c7bf8f41c73687b"; + sha256 = "90081b6c7b487292a14e2a488a14e9d560183ff6313a67076f1a07033df54a80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fi/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fi/firefox-101.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "eea67a8d94f324a9ab74caae5a7755f9505781ff690760a06a62ad034ba76bd5"; + sha256 = "308fbcc9086fc3f899703a58cd95f55b7e10b7ab4fc0c4cac02c01f5dfd2ffc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fr/firefox-101.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d4cc1a70f8d020870ccac0b023574b9c0f39fd44bbbcfd8a35f6c688183f2a9a"; + sha256 = "91cca9bb622e3546d683a8e3af9984ab63e6aff56a8f0b7a61c84795d452e198"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fy-NL/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fy-NL/firefox-101.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "df49ee1a9db407819fcc7baa9c6bc9c6fc9ab2c2b57b08d85c9478f1b0aaf6c0"; + sha256 = "37f87b1b0df5efce58dbc6366028b069bfd61007bba8a4835b8c72966ebfb584"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ga-IE/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ga-IE/firefox-101.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "e7e846a95ba695a8a3edf233ad31117f4d35d4942784c5f6c5a1ebed7f2f8e4a"; + sha256 = "d4a347e9ee59e1eae54783c9d4c99f88d6fe5eddd541d54f6efb1d2d0c494657"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gd/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gd/firefox-101.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "48ef5fa12ec7415ad23a5a40f2f882147e03ecc074b33b173f413e53cc0cdde6"; + sha256 = "907d68789cfe8e2be69d85cff2b846d91bd9ccf7c3a183891472509db54a5e49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gl/firefox-101.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b44500b87f3b2219ba10e06bd937ba06784fc00085be12a16f69fe26f7733317"; + sha256 = "1d1e107df695c76652207006ed060fcdf2133508c7ea0fee4f402816a4eed53e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gn/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gn/firefox-101.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "0e521a61d44d1058ceb566ae58272e41f0aab7f2267555781bb3235ff5e3a59c"; + sha256 = "b62af16daf08e4a2574bb6b96b4a61cfc64967328dc19fdc56ea56cc431019de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gu-IN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gu-IN/firefox-101.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "2179c82d7763294f5adedb8c905ed5e009a4d3d176fae58c7503404015214c51"; + sha256 = "ef2f317ae3aaf608e74dc882b202a195ad4146295f00bff2673cda02338ae499"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/he/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/he/firefox-101.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "69383070d17f2ae68363e8a29efc53e2748b8f784137c854162ec0132295a9e1"; + sha256 = "4f5cd8a8f6dc9c0588d9a41cc9e68b0f643581cfc42b6f17bde51dc60c3ec2a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hi-IN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hi-IN/firefox-101.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "71e57a59cfc523d5c1c73c9b5547b3247170865a95022e5bd3098967c3e6002c"; + sha256 = "16e96c75e96d656d8a5338c6692ee3c4d94af325b51e3e3326a5024549360f6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hr/firefox-101.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9ea82b192336e83c7ac450dc7068f2730c031f43633a87b7fa554651cf64a912"; + sha256 = "55a692fd61adb3c0cfe05317dac407f5804518d07ad1bdb6aa49a6e7d7635270"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hsb/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hsb/firefox-101.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e3814f823f3bde2812751e9dd6a2b51a8861952eb04cb845d543a9252501dbba"; + sha256 = "d2786cb3a58bfaa5156c9efd5e36743bd30461e922f8d1f8421fc60ba743738f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hu/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hu/firefox-101.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e647f86de2e7687e23320aa0f36d96743f5da2cf43b2d83444a41506d13face9"; + sha256 = "e4100b8208dfb367de6ea92252de3730728651d54027a7d8da989f52afae2f10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hy-AM/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hy-AM/firefox-101.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "21cc172fad6136a17df0a6ae4c6e90ec72a02db744cfcb5252cedcf48223e543"; + sha256 = "5f247f00eb048e01f8ac6f1e7cf8bd9a4e2d012e2534acc2dde7e9cd659ba48e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ia/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ia/firefox-101.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5f0c85a36ec40ef57cfa2bbbc1a4663ce10c8659e0d6ecad67ea993186c9cbb6"; + sha256 = "68a040005c7e2db14d380e36a28725d59635ad6166c3a918676e870207a790e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/id/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/id/firefox-101.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e6671d2ac6b63ea4f2a84d1d0e89038ef1030d85e84d6b47c5b878ddc8d96b60"; + sha256 = "f9dba308d0e9f6e1cdf70c26a914acd234cf8d35aecd5374d8661f2d025492f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/is/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/is/firefox-101.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5bcafb210fa3aa06d56f17972d94c17faaaa2937948890b993bbc6c9bfbeecad"; + sha256 = "5d50987e3ffb7a7818479161ad4d019d59b259575cfcbc4ede9a4a6a5cf1b6ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/it/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/it/firefox-101.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3c14104a82a312324c1d42644eca6f80b7375f946a42edcb0a23f8a824bd0eb7"; + sha256 = "b786c212f61213e69010d930f2eaf5bb3dd9c798446725f4822fc3bb37adc01c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ja/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ja/firefox-101.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "00713bc8710add3312294aa755c881701ebbb2d00e1f5f242ca12d102ab6f19b"; + sha256 = "825af27cf52551dfbc83d7b95e47e64ed0ac7f7db3095bf1debfea87b39a4378"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ka/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ka/firefox-101.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "ba6985797ef85bdccb1f81053456baddbe2cfd9e1097e42b20617270f681c1ad"; + sha256 = "e009b3f2944e6a67d85f8937e5e7472c18049b2569bb2c9f234de468e636862c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/kab/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kab/firefox-101.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "8be17598d305e257005ba0f9ef2f7053ee7e79bf3c1b4caade77c8e5a7e8a57c"; + sha256 = "168c16ddfe42858333d1f53ffae9baa16292687a3d65b29fc9f4605411a4a712"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/kk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kk/firefox-101.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "7e142151f26355256d2923b183fa1d225e3ed26026cbedf9abcebef301dc1045"; + sha256 = "e12266f2f186570c1aa382067f9cbf1cf78e0b14e14cce4b9c822f29366c2b05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/km/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/km/firefox-101.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "0df166d5a55e52ad60f8873afff5c1c43816ef99b56e1d817b4d4c29f173def5"; + sha256 = "77f90b4c24f1dd8ef8ab06f299abfa734da6d74ae1b4298d3b425b08c28fce9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/kn/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kn/firefox-101.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "193c7b709c03212ba91ea99da00c6b1c53edebbc9390d7321bd9815e5ced8233"; + sha256 = "c9015d588d9e1d07499b7f910d9b2236b81a6c3e5002bcc8d18ea970bf2ee8a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ko/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ko/firefox-101.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d265a984bcc6a381f715eff5e2501acde0c8793b111e15877f7d4e9086ddcf10"; + sha256 = "0c880beec3dad250b3e224c2e7b73b15253bda3bc043110aa874cf555d475094"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/lij/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lij/firefox-101.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4a8327447982439a2f9e5ecff39b77ddd2bfdcb081d9b6f89848f2c93db3b3ca"; + sha256 = "ba25d461f97dc3f359a4d525143c5a19859a2c051db87017469ba848c421aef4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/lt/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lt/firefox-101.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "cb2a9545762247192f909c1600097b1198fbddfed1c383adf5dfa9666ddc0e80"; + sha256 = "e73fe6e7477b4c37d33cb31fb872a845f8a67ab659d93752d936a2ce7a1e3d31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/lv/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lv/firefox-101.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "6ed249ade30c7d2d5ff290c4b65d3eaf3df4e49e112412cb3153da15bcf23fcd"; + sha256 = "4b4d510eac153ceb3c2953d1141e893aeb913000cf6d557e4564f8983adf5b29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/mk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/mk/firefox-101.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "56af16c66d20eaae2d6b487c3bec4f438d21effd3e3b1582579bb9c1836956d0"; + sha256 = "8a56b192d42351d40e2d35164f5809ffa5ceb52e16e5d6e85f4819f250deb67b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/mr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/mr/firefox-101.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "fa6f5e496fdac7eda06220a423683f608d6c49b0e3caada52b9fd903b5ebcbe9"; + sha256 = "efe2bcf5f97709240a09680c54c61ae25be5e8019003d67bae8cc166bb6de15c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ms/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ms/firefox-101.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0820d7fcdeb7226d067f920e7cb8a0bb3bfd98ea931d468ae58ed54e074dd1f7"; + sha256 = "a5a1b3d542478648efdbed1f174f87f885593209dceb1b41d5090948a46f8c8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/my/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/my/firefox-101.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "20ab8faa3a4aa4b4f94f6c057d4fc9602201a55482d492bc6dd7acc5173364a7"; + sha256 = "baf5d8a4e2ccfc40fb9383ad84c15d9e47ddb81dca203ac2df5faa2aec6e2031"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/nb-NO/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nb-NO/firefox-101.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "77bf24610d6ad64859c83125909b70b3dd768e90e563971461f2c18fa2cd7693"; + sha256 = "980c1a26381596b76f5519021327f5d3ab104f231e637e9bade9bf34e9f17df2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ne-NP/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ne-NP/firefox-101.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "fe5477509d83a14875e0409f99e2336abba237da75d1e56d753e27b7d1016c9c"; + sha256 = "15bc3ecc249798080feee3214a76fe843f16a68344673c5cbdfc6557d171b77d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/nl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nl/firefox-101.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "3b67159e8d34c836d5367a2e17b54bd2aa274e1f602ae42649afc2ba2fa1429f"; + sha256 = "cad9d94763528115c4ab4af90a722492eb3752066483bbdacea7d6933d2b4b2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/nn-NO/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nn-NO/firefox-101.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4faf2904a8b9a0c315c222d7e810d2fb3e24947dda1e006ddd1f727d2f9f967a"; + sha256 = "27ada324b58968fe5b9e2b6e367dea00097d83d10aa110d4d76db06bd22e9d5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/oc/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/oc/firefox-101.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "1dfa10fd1d9f958d487023144b7fad8ca8d1e528954f11e28509b7e22e48a341"; + sha256 = "9c4dfdfd16cfc0bb8502f31359acb01bda905089781edc89e15eeac4e52d0513"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pa-IN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pa-IN/firefox-101.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "e6e4cc03a47ab8ff0546457b2ee0b55b8702463ed5666c15c0d2d98716fa84d2"; + sha256 = "b10709e964787898a2c5e15c0856b8b580a3221dd33ea441073437f833770552"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pl/firefox-101.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "525023c756ff0a0eae303c02ef9b7155fdad5f0f41bc4e539be5ca21d1af0ceb"; + sha256 = "dd8b9baf6d1083f08695fbee6fdf3a3a14e3831d6cc797bc1e9e8ec0818ab0f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pt-BR/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pt-BR/firefox-101.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1a8070c38035f97ed771b02e59b3c2b0ef0073560c8ba285be9779fd4e99b61f"; + sha256 = "14cd1b927d3dcdfdea02026c3b6a6fb0ecd331652d26f8c7fd344233514ee030"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pt-PT/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pt-PT/firefox-101.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ea356edfa8b398ea16719993cf05e65b5c63b4d2c4e589a9a26814ae275e4be2"; + sha256 = "906bf971747d018c847dd949756618c923cfe72b461636fa4ab809e99c0b0428"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/rm/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/rm/firefox-101.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "f07ca7d4233860a6271eaa972358bd05b834c7f56c4b64d45eb9af72bcf2dd9f"; + sha256 = "9a4d70191390d408104f77595fb8c3442b9133c529152a14edd8b81eb2a9b91b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ro/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ro/firefox-101.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "fccb8f523251dba30a73f6ec9259113142514b6d4657f63b88f5b9d9e8a01923"; + sha256 = "778a0242484198f61e747680eacf4391061255cc4969e1c1ea7d23261f92182a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ru/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ru/firefox-101.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d87928af8f4a0b28abdcd0386755a3f4f70d7e17e455fe5913b1e177c3edff2c"; + sha256 = "f68bd731b44cb75c82f800a0944ff69f738692fb981dd27a097b60efd96bee1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sco/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sco/firefox-101.0b2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "de3bda2032217c56213f64b31332e8e6ea9598c7f31f3dce1a7b136c40c3153d"; + sha256 = "f7f92d0fbc485d099a63b5bb71b349148bd4e475c212e8c4e49f1793f4bf16ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/si/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/si/firefox-101.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "22dbdccec8073bd1d83cc236fc563aa97a3607a92e9b3908d4c8c0307dca8b08"; + sha256 = "0b6e76241d452954a0438f9e3849743034c47089d6352cb22c1957b40a674c75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sk/firefox-101.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "d5f73c93ef57cd600a2c4269a99a498896b580ec99b549db8b0ee1537a644bb1"; + sha256 = "aaecf4614bc84130ae7ea552704e375abccbbd80bdde0848718287d46b61a0db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sl/firefox-101.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "12459b203b0de94241b243b07b9f54e7ae612f7887581c5cd3ac7ca2a08a54d9"; + sha256 = "9fcf2320a0b7ce031ee2d607570177ec3eefe56b5a3e05f29022b6f6b1d4df49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/son/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/son/firefox-101.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "2d44c84feaa5c5e3595055289f84f320b447664d01c653b0a3b50f1da24b1a78"; + sha256 = "70d0fcc6a8ab38fead293a2bf41a4548e027ab34cb1981c0b5cef12301031e5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sq/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sq/firefox-101.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fa3f9724380818a71d895252631b354ffb692f35679eb9b8ffa5b2beede8ab61"; + sha256 = "bfd2966ffc4f244c1af4b115a559865a86358125ca7485df838fa3c4d863237f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sr/firefox-101.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c2e5ad218b8cbadfda7c455266e018a6eaf9b450a905e8a73b01d02b7efed608"; + sha256 = "6f2044c48819edcbb611d7455d30b212206a6427df74c186e7deff84d46607a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sv-SE/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sv-SE/firefox-101.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "12060ac843f03a7544db8631c7f53bcd0cc6fb15d62cd997b02a83f0560722aa"; + sha256 = "9fbd49d8dbb4c89447786380e468e74150ed8a94191fb9d942a3bc5fdd1eed23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/szl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/szl/firefox-101.0b2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "71ace92d020f3fbd1d5e223dfaa01e3a53ac625ba5ecf074153aad8ccb640ede"; + sha256 = "9248fc2d9ae25129ea1dd440d6f3e8168c33809156c0ac28c89cf7a849ab71b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ta/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ta/firefox-101.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "6ace267aab85845babad8b11b68e154e1128b920ed16b8b8d011d53f6dced16c"; + sha256 = "fa62feaac98df16853e98d40796679105efba2f2b133959d57a8c516d7bc679d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/te/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/te/firefox-101.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "e381faff48999b63b4981695e7c80bb946b44503ab5275344f12b7005ed49ef3"; + sha256 = "6ff13809cd57fc9415a78776cd809a07ca2731ffc3297c1315f70a80507a402c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/th/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/th/firefox-101.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "6c2ddea1c0ccf0521b9b647827569b78ac2143163895e67476051f8496011b66"; + sha256 = "984722c2760f9162ea166c004295b529d50e87e983c30e223c19217bf2957349"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/tl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/tl/firefox-101.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9d949c9c61922756d0f2dbcff76906191d438d161c74fbe7d702c7372c11b5d0"; + sha256 = "c7c3570c25909af183593a9cc47dda28417163036af62522b1e762609c906408"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/tr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/tr/firefox-101.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "88763e4847b865603a7d953d54b86e6a053d2476209b4046bcb09149275690f8"; + sha256 = "c09188f66bc7e84ecf36c316f6858786a76b6431b223141d7ddcfe5801017efa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/trs/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/trs/firefox-101.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "b6e7aa724a06f85e4eaae7e1c55e3ed1ec9a6b5664150745a257bd3f63310d53"; + sha256 = "4e0a2711a19e334ea2b0b2b0c9e1f6b2e2dd8946ac5afc017f0b360ce92b1597"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/uk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/uk/firefox-101.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "69b200c0c4c92430f188ea12bf5e60aae18203a76e61cc163738d46c3627b137"; + sha256 = "16c3317d11f94a098e3998e18d6af803e6cacd9cebf3d8aa7be64bb031ed4a1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ur/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ur/firefox-101.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "330bb00cc0c0882a1e8aa06fdf7d283eaeef04500a9bfccef50f7b2ab8becf81"; + sha256 = "59d7c4dd6cb4a62e01863cfdd176d23dea36c7ba9ffcd0e8f4a87803df25772e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/uz/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/uz/firefox-101.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "a9b7087c1deec3aedcc2c279b135b113e79739a28e31ba6cd090541505e5d9e5"; + sha256 = "1874d3bc10804a1bb6ac7b934109649751f694d8eb36ac04c4bfb18df6d7ad49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/vi/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/vi/firefox-101.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "76b034ed53b8c99cf7909a6a5651627fcd9cdebd7f8ccdbd3d2286cb19dc7eaa"; + sha256 = "f4b6bac19de341c1dfec87263e41b4382f8716a9ed1ab61336a29270988bf17e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/xh/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/xh/firefox-101.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a1c9ec73200bea835c46879d8196b380a3157c98404e6a009fbdb24b1662ddde"; + sha256 = "33e01f8d8e6c21afc055f73415c4c4be324cfbc73bfdc42d262ffde0e87301ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/zh-CN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/zh-CN/firefox-101.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "74fd44c26c503014d0fc3a32dbb726feefd572ce52697879a392996243b5811d"; + sha256 = "a17b7f914930ebcbe92e5e8fa8ec0ca8fa121939d65c68287ab668db460097f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/zh-TW/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/zh-TW/firefox-101.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "a9d86ddb8f5388370a28ac643e3d21a411625b7098aca9c399551f8e2c125da9"; + sha256 = "ad987a76a4f4b5b521c7ac6eb1784c84086a7f11d9f9810f95b9219ed9d22c4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ach/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ach/firefox-101.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "67b0501117e5d93046031860df5dc6eef3fc3126f0b10240cc13b83f6f1cfdb9"; + sha256 = "ee933397cb0be5acac1b67853871c5df8ccfca7bf2d8ffbdadd5575218ae317c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/af/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/af/firefox-101.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "43b9b1107fb13b97f6b955b3abaa4f1d590bbb1747859e54bb306c9578fbdfe6"; + sha256 = "c6d21ddbd2eda266e11dc5cb132b0549868706e8d6897a12c570044f0eeafa48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/an/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/an/firefox-101.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "da752ce8f7a9a0769c93f6f1817649354f892c440cdd48f0dd75739baedcff40"; + sha256 = "ae66f452b5ff50aa82867184a0111692d8fcdbfe17a5f8fbc88d2345a058cd1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ar/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ar/firefox-101.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e67fc64daef74e78eee12a1e5d4c1ef5a89a8278d19187d9e0c67ac5ea350623"; + sha256 = "1feea62c9a13828854257a5edd93a139881179f52d735558920f21a67c58f895"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ast/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ast/firefox-101.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "115cb0605bfb7629b854d242634cd2797b5072f735c840a6611325faf7bc3f77"; + sha256 = "05f800f114645ef5859d78d57d3c14ae8af37b27cb0fee766e948faac3548124"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/az/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/az/firefox-101.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "c839a19dc4f5d938fe7a5426a8abd7b228c89a262201c019b4b53953211aea78"; + sha256 = "7170b694f972a73c88d32b1ce8f95d0c29cd549afc77dcc19b0ddb09bc138a1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/be/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/be/firefox-101.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "94c8e688578059f8c4f7fd2a65a8fd77280b4047e845efd6ea66e34f5320d119"; + sha256 = "503e5f53a9fc97e25df4d7b67b5c97fbb809a2bd6a72a99776f1d30acd628f81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/bg/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bg/firefox-101.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9f7acb26e7cd9193e9e435da3e2f4e9d9ee82195cc18e8de8295cba2446da1f0"; + sha256 = "121339b4ced135ecaa3cfa01e8a120f82b8f49d7a12886e81777fddfc9a86d8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/bn/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bn/firefox-101.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "93f31b395a9a42386b0de322db1f675810a3db106a0e8c583f18ad4dd0c56488"; + sha256 = "e94b39bafbcb6d414608b607fda8ac366bc64e498ecc2d6f7ee29f3a807a0cce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/br/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/br/firefox-101.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a04a2b2f2b70f33bfe288d9907291aa61f2daa64d0d6802c784d7b4f44b38326"; + sha256 = "e35d8795752d5389d9cb6dba5657ff03326dc52f53b4523e568cb14a9d7ea812"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/bs/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bs/firefox-101.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "154456c3aeefe93d6891306fe295342aa02c294bf64693fe93943ae836fc796d"; + sha256 = "11ab8f6430b63a8ac4a84418a17bb5d7b347a7a887498b528fa3b07c5f69dc86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ca-valencia/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ca-valencia/firefox-101.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "c00ab86f77e5113f85feb8eb14b74c2c144e9c7e08c4442b06b749ffccde2cf1"; + sha256 = "d9d5848da4d1818619e0b9641cffbee9c63358157be344dc6a30ad0e2230faac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ca/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ca/firefox-101.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "07de1d9c72f9d5487b9ff57ec609a2b6ce37a8b09fc81200a6cc6610a7e66b9f"; + sha256 = "3791d8354df11c7fd77f6e5dae3ee988fe93226ecf57db1d04d31830ee4cfd07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/cak/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cak/firefox-101.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ee05ba6ce42f873ab79032553302caae28069d84c5105192623f1261d2d3d609"; + sha256 = "2d38dc2c29dca9c6618da8bd15a7be4fba88a866247fe975172556378d703a94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/cs/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cs/firefox-101.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9b2af581c1c70b72cbf82cf656f94e65058063f0fd6807d99760dfe9b68af808"; + sha256 = "987ab6a31f40aeb3ba4b4321ff755f8909f7bc78ed1568e01bc0936861d756dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/cy/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cy/firefox-101.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f638faf94045b5e739736926e4b3e173f8830542287d46aed70337d9ac3a4495"; + sha256 = "df843641be4d316cd6630a30158422c023d48bb0a4dd30622cef4e27b97c99ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/da/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/da/firefox-101.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3dad188b310fef15b704ca788b320d502a0a6ee59538296176fb17d2b440163a"; + sha256 = "ca5e5b23e9b4615f5a982b9217dd42b82c1f72b832b3aade4955f9f46f0e3e9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/de/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/de/firefox-101.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1bdb5b60bdf16126de86ba1413eb5ac4184f727b3e57a36d424dfe39647f53be"; + sha256 = "e07f89f21b1952310ce310a54428840053ae8f2dcaad5472b38b1761ef32b649"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/dsb/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/dsb/firefox-101.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "b306d40607d73314c0e3e87bb1bce65369846be3e370943088a8e7e9731098fc"; + sha256 = "c6e32545afdec0bfccc5f568892fc77cb226715fde84bdf2651627ab7d69cbe7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/el/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/el/firefox-101.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "45202f79f9cbf2a44bfefa9ce50bd0a6b88485207105db4df1f26f547c1f556b"; + sha256 = "0a3d7ec83f0a64c6dec14f3649bd6335bb3118120d7b3da50fd0c8498fd899c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/en-CA/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-CA/firefox-101.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "78020bb6fa9395fc4e2cf40645e127d0f6d6dfca4044e5c00f63a90e24824add"; + sha256 = "ce43791e216aa63a250c3d542c4f89eb7199b6d2805b0994f8479a6871f38bfc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/en-GB/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-GB/firefox-101.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "647947c0b765d1142947d3cb35ceb308946090e928ecbd4cf8c3eba4b57afa47"; + sha256 = "61a60147594bea4ce7755d002edc914066f31ac4bab1f2933948b0c0f8987f01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/en-US/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-US/firefox-101.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "4249f742c2918d66af2e7defe1c6b34870f258fe047ae7b38f91b0394b453cbe"; + sha256 = "503b87ed02399c0804edcc99bced3ba07da78781c59616f7469bfbcf8a2ca07e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/eo/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/eo/firefox-101.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "1726df9605c7deafd6963c18c4b8dbd4bbbed86814fa9932367fd04f6ef609fc"; + sha256 = "564b49b4ce197b4237c514a7cbd8cba982b3aa979e5b2ada991b951edee4d9e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-AR/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-AR/firefox-101.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c3820a35047f21efc721889fa0003d8e74e13858aad4d3aea038c01b5cd6c657"; + sha256 = "5f0b4e2c1078456a41f74b284ae424fa7fee61e99df08b1d1fce565bc65d1e25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-CL/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-CL/firefox-101.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "b1f5bf697007d8b6ac9f1fa057f292bcfb860d71229a7d0ad6d611ab02991211"; + sha256 = "333b857e916d2a98c38f61561ad9a1203e82cb8ba232f164b4c863c5d5921273"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-ES/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-ES/firefox-101.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "de33571140d165d0422b2e4543893bab6435b6626333a05bfef39682ef759db0"; + sha256 = "ee9ccde18f190f18abed18fb068cbd10fb81ccd16c0644316d22f838ac68191f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-MX/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-MX/firefox-101.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f681be5b92c8959e0e8c90cf4c7f6cd9197e11be1828797e853310a49dc76698"; + sha256 = "ee18e46695e277001331493060354387cc2dce231e58ddc4c70b693b8a73ea30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/et/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/et/firefox-101.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "476a0ccde58372bffea3ebfb0d88795b31db2ec622f9c1b99df51287aa8ba69b"; + sha256 = "1d2a7947d04503f57098d3e1384c5cd5462674dc423cb5ee9f60d6055cf8d82b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/eu/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/eu/firefox-101.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d465a6a4a01853724894fd81e31b63b80e830cee268298d6e037e6877ae77661"; + sha256 = "bce92157723f47e97d252be307413b3d2423910e37f2d3064f28065391e4c6be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fa/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fa/firefox-101.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "cf8ac9c8d667ccb0066db1d20a9f43af807e40d1746931e001ec900b34fbbc02"; + sha256 = "33fce9fcd652f9d79cbb4f06f8c6566df7227698ff191d5f2a8135e537018ce8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ff/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ff/firefox-101.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "86dcb3f9e1d899973eaccd3caf401471b36ff70f4a4693fa9f857083e8641a2e"; + sha256 = "8f7d299182ca59d040316254a5acad58c133af5f5199b2531388705e9ee74582"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fi/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fi/firefox-101.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ca0b830aa6ec724aa31f957e7c84156726c26fa0a74ace80ecdea899a8091f82"; + sha256 = "f8f49abdcd30b1b9df88a38320235f470aa9932c554a274fb802e2b4b52fe8ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fr/firefox-101.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e94a7a54ba806e2b4baa0159d2f8cb96e79abc9c01e2526821cac8253c6ad495"; + sha256 = "3be37bda9be1c9a5fc4fe899010680499dec0e71ddb151f19e18e55a6450b771"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fy-NL/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fy-NL/firefox-101.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "cae5c9c607c0dc99e4645f756befce2c9c4ae83b7edc39cf12af81781b33a7b9"; + sha256 = "76598f5d5ab6be41b003e7648458d1f03dac48d82716d1072a47047dd4d0aa28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ga-IE/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ga-IE/firefox-101.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b9b1cb2a48cd17179d5e3a8a3fca9ac25c3367ff6281f632d826cd6a9bb4a633"; + sha256 = "d297c383365b1ff0fab543b42621671e96d831f0620751209f04b75b8022e1c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gd/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gd/firefox-101.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b5454de81ba2fee053e98dcb37d3703b5385a51561e45fa32f6872494cfc047b"; + sha256 = "86bd993b81b67f5d907a87f88666cac72413ecd9450d8c482c31738bd22135e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gl/firefox-101.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "be3b3decd8e75740a317f105bfa2e4c919ad7f31e391845fb60b299fae7bea7c"; + sha256 = "e33cffea73148da8b24e59dd7a2e203285af2d08e356e0892dab1a70a40cd4b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gn/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gn/firefox-101.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "394562b739f81ec43a954f7393c5177f87d3d5b36d404d97e2e483f3000bb615"; + sha256 = "574df608df5b04549b2d89edd99a829afd2eea768a7dd33b12c21b8db4e00612"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gu-IN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gu-IN/firefox-101.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "d2e36f37146b48cbc710af7663ad8b4f7770dbb5f6a557e3f54d637e7061ad90"; + sha256 = "910a1eae44a979c09edac6d470fd5cf19428028c8ebe5a04b27c8029700ce682"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/he/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/he/firefox-101.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "17bbbd7768ff852dc1f27b224b77dfdaaebabaf531028c71a371bf302a9dd92d"; + sha256 = "17b634d9c38d21b8dcb6e8b8ae3d89c54099a2b17b68f7acfc56f10191163193"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hi-IN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hi-IN/firefox-101.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "2f431a3e50ac0b74a2bda65652a5aa45c0e1b44ef0837645ec49e30c6d0d7fbc"; + sha256 = "e9fb302f798ede6c518ec72eb103dd087aae86826a61f6ff260bba146bd66cd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hr/firefox-101.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e57e5fe2cb59c25002e9c06cd3298d9cb75c4437ddc9556590d6c56a1eac57bb"; + sha256 = "a976d4bb564eba983412a3301f3ccea463887d3e3c115fe702fc009059c92490"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hsb/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hsb/firefox-101.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7c1eefa455afacf5b3b1ee1d04b6e793e2db210912dae58910093c70a21a73f5"; + sha256 = "4ef0f578d5deb079d5cbec68e61e756b6c44b36a197740dbbcf473d17576d4d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hu/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hu/firefox-101.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "d2b02034ce6686e0743af6444acc2a23ed657124bd7bb6ddfaf6d24cf11730b6"; + sha256 = "0aca5d7dea85d3e0b823f8a209e39b54afe405c9a168d92f04cf8893272d8e45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hy-AM/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hy-AM/firefox-101.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "75589d2abd9488269693c0a0440d6359bafb354b1b5ee91b90306871903eda0b"; + sha256 = "a9595bab34e8034662f6ffc9827e22a97909793bc632ce20f5a12bde711fe77d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ia/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ia/firefox-101.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "b26efd6320a41a558383e22db49cbcdd930161fb48ad0032d24e44b57b01f0c6"; + sha256 = "bf9e13c8c9ea858875d8940fa3ac3b8440f88279bd1e520bf2e8df3cfa1209a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/id/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/id/firefox-101.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d50fff8b0ff7ae5546ad3f25e485ef51280bd022708e3d0aae97d99f79788f0a"; + sha256 = "0a6e0a680e37d53960cfd41c7218dacf359a2dfd9046e4957a64d1cb70cbb9c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/is/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/is/firefox-101.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4cf7fbadac8084b8e134f6110ee07076ddd93cf00a10b6ef3d6276df9080bdc1"; + sha256 = "1a4029b76fa9239669fabb61daeda9dce78198e92c47b24225d01bf3ab38fd1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/it/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/it/firefox-101.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "6fabf495a730600869f6d1e2d9382120361f5061e3a893321f68a6378f7eeddc"; + sha256 = "45b29a5e11f55e3775b3fb8079549edb7d2d51ab70a1486f9b119dea3cc1c5a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ja/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ja/firefox-101.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "95a537b3306ae1f6bfe9c4076042d6c29c6478c0f32e5aa4a01e800c1d2a75a5"; + sha256 = "2ae2d1acb31d8d2cd8aa926b7650b81406444e4abed8fd6e2e1bd245c443405c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ka/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ka/firefox-101.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "e73b2b555f7318650ca1ea20f9d8c1fbc933d230eba3eaeb5e5a47dac24797b1"; + sha256 = "730c2582c36982e81a3e86ad8d4c7f817bb32a1812eed3d0ca7692ee45b24180"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/kab/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kab/firefox-101.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "cd55879a883ac4e4efef972d6200284d6839dc786e7dad4c3a81fd88b89b18ab"; + sha256 = "b72a7e0310bc67576d4e3f882999077e7a8f0604dcbad55aa2c854b2cee858bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/kk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kk/firefox-101.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "cf2dd9ae9cd6347eaf976cdcf4a6cce81abb741b0cc273063cbe1274d271e05b"; + sha256 = "9fa815efcb23f0cc91f1de66b33b9d6fa8e76aa5c03179e0f3808632be25bf60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/km/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/km/firefox-101.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f0f3982e7d838841a01b24c330ed3e74416073c40470293447551aacb5411506"; + sha256 = "d4c451d65b82ef753b651b6404240b2bba5e6798285d3fa2737709e4eabee9a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/kn/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kn/firefox-101.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "3e2953e55e3bc7fa76ff77aac08f79b20bbf2be52683c08b3d54a323a1754ed7"; + sha256 = "a1d0ba8d2b61f5c554a7193e1f2e25f3901b667107b1a926f8ab2d8b28fafe1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ko/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ko/firefox-101.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5c5bec8a40dbea26674eb2d4b7160c1c2f3ef37f68d67c24a7ca6a2cf77eac85"; + sha256 = "c52a38a7c830aecea014596aa035dca5f6b2e8cc28e3455657fd58ccc8dc0a4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/lij/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lij/firefox-101.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "7cc492c5eff065cc3cbceb292d18d833e9f2bf76ace0d5ca960256290f049f94"; + sha256 = "472d0a005d350dc9c358b62b6c428139e5ca784cd6364d73209683c5cdf73a72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/lt/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lt/firefox-101.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "b4b56e01e65ffe4f7232daf661df178d4af1d813e1c8122c4ba56aada0b2ef52"; + sha256 = "e07ebe646f72849afdb0d8e5c41a7654eab3034bf476216cf58a3b7f8e0c3648"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/lv/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lv/firefox-101.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "b13ac2b90f13813b8252c5eb817d0f55f770a58e05f8a98b1a08fdf59fc9191a"; + sha256 = "441ee8be6452b90fe669843410a07b47db7f87ed47795dcbf81d91053ae263d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/mk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/mk/firefox-101.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6b1d2598350feb901e86f332598688853b607c7c14c13ac228610d16e89eeda3"; + sha256 = "a2dbd0436ebf1ee64300668771960d0021c744c2dae8ecc5bf976d7a821a1640"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/mr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/mr/firefox-101.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "9a6a47fc20500b4421b12381374f0a8ecfa9a0929a54a6f6dba73e1c2e5a6c81"; + sha256 = "1311f1b8754f93669011358d574f970f258ca8b32cb5638a12266dc7e2a47595"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ms/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ms/firefox-101.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e79c4f88952ec9061b4d90f8ca5970be8b5c19cbc1df8d9970b9b23c801103a1"; + sha256 = "8e78f3a12c599a29a01c9a84373ee799c3b8a8478e452b0a8ba27f4be9e7ed93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/my/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/my/firefox-101.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "f8ce25b87b639843fa6fab4651326719f229f91a4d6b3a6ef17d0e9f4035b1f3"; + sha256 = "d6be222fb3161f2737f2e54d0e26f208298162be21197b6b5a6e3c05d8948f1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/nb-NO/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nb-NO/firefox-101.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "03f5550bf0c0f33c3cf252cbad1650204e008d852e6db46a6f7fb6f6b5ac10ed"; + sha256 = "c4a2f49f516a19542759296d61ffd5af32640d0e022aa960d6d7f2ec645bb353"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ne-NP/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ne-NP/firefox-101.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "5d94d2dbdbdadf6abb7250772e6e046b9ce03cbf5e4c920ef7e8b5cae69359b7"; + sha256 = "4b9fba6e4cf8e9ef0878bdda30b12f89b857dba2475adccff386bb492f4efc4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/nl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nl/firefox-101.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "3045ce321c102e2c114a48a46526572a2c52d228b44ab35d8241d92bd65dd9fa"; + sha256 = "2561300f8fd8e53ac16506734f17aea5d9cb5b7d970e4070084f944de54c287c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/nn-NO/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nn-NO/firefox-101.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a16aa9b6de0ac4213492ca117eb47fbd4994824c0f080001baa9136231fb69cf"; + sha256 = "f2b880d35f85122c92efa10268f3bacb70063720fb93f85f565ff9d75f4d6a58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/oc/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/oc/firefox-101.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "70bf39cd4c3fc4ef772dd71d97f71fdc92324ce2caf9d359cc1d3f3d1557c3a5"; + sha256 = "ea51d91008fef8163059b1b35403c049b236441c5e87df06f7cf5319dd480680"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pa-IN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pa-IN/firefox-101.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "951263906c05aa6f60a65d77e917a95ce10e8ae31f156acac7f47ab4ec36deab"; + sha256 = "c0332f06388fe11e17599fbd0d2bf4074576d693355f05e0c0ac74b78e8a185a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pl/firefox-101.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "476ca14396dd7ee636ed1e74a20d9d0ff3b0c452e5b5f61eae6f0594ba060f3e"; + sha256 = "ce584b3d90775742be1c521c6e79bc57248eab426d6ea4bba00da22a7e9ced29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pt-BR/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pt-BR/firefox-101.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "33ea09c993bddcc36621ae633713e758ac33349847604995e05fce0d26be398f"; + sha256 = "6ab1beb2ea5aa1390127fc13f8e0de6555f5ccdee64a96fb382dd0d411e5d280"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pt-PT/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pt-PT/firefox-101.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "fd4b924d8afa163ec40a2f5ca6ae0b89e1a22a8be8b8fbf9f43012159d0b7172"; + sha256 = "641396a068e0de827b6feb03edf4f71f343baef24e5409d892c68e4ce48ec51c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/rm/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/rm/firefox-101.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "97ce5f4af9e8ed2af039255e284ce1b55b6a3ac0eacf4c40be82b635b1df0f2b"; + sha256 = "a7cdb00dddcee0ce416c36c160ce9ab5fedc6de4ad3caaa4c8b14f9a6e1ea05c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ro/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ro/firefox-101.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a959d39333b98c5a479e6975dfa82a4c2b3efe5d69d2d99fddc8d2aabdbe95ce"; + sha256 = "eb360965ed5379374b31030b0db3a66e6637687c2b1ee6dcc893c0308bf5ee41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ru/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ru/firefox-101.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e4f65bbf839054b7009e01461cf4a0b943e1373df054e9b40797b5d233654aac"; + sha256 = "7da4c79b922a9e03c0ba677ae01271f10c0408ed0125d6c020182572bc6989d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sco/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sco/firefox-101.0b2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "fac16861dbc011655c3b36b31d5e0816a09e1f88e34032d247d09f691c097ddd"; + sha256 = "af1717f13e40806345ca2042fdcaa5105cbf23845ce63f1e89cbf43e57cf8edd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/si/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/si/firefox-101.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "93423cb2cccf166f374fb4b8779f337fa1cfdff67f0f2c463a398a35ecd251bf"; + sha256 = "673f9978ea53996d6021990373484eede873a13e75bd32caab8d9c8a915e046d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sk/firefox-101.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e63c2240f7b791b01c94084dbb28d74ddd6528a7bd1e62bb74ee9271d0fd81f6"; + sha256 = "db60bfe2a7cb89acc6250304c36c4e665de6c27f788dbb133a68989998e87c27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sl/firefox-101.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "87064873e57431bb9cfd3e231df07753c8f644e218ea0318b3731baa05b16c1e"; + sha256 = "22faba05601722a2e01e93bee941dc8065f35bf235037b5ec2259bcbd6c3c229"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/son/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/son/firefox-101.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "6ecdf2061f0787fc9adcd27465211446df45751d103e279aa50f278361061728"; + sha256 = "b6d6278671e2c7204b5ca7c357390c0abb8ac3fde1ec3f504c808455db990fb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sq/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sq/firefox-101.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "47783d01b35119b158c746c5ccede7e4832d15317958030306035d1b448b77dc"; + sha256 = "5571154a698ee65c6f10cebd318b425b265b36c20b6deac8a6a1fb8699aedee1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sr/firefox-101.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "4aa1908894de6eb3640b497361d5245ed3379d29ffe6e10401540cc1c10cb965"; + sha256 = "130bb0c0fcad5bb8c7f54bf274a6d4dcb69bd4dc622fda9c32361a2859166231"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sv-SE/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sv-SE/firefox-101.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "2334fb5859711a4471f06a9eb81907d0b41ba52a8fce05b7cec320a0d31a4167"; + sha256 = "02199add3347abd89f5ec93f759cf12fd353b63fd4a2f91ee6b3f094f5512a49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/szl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/szl/firefox-101.0b2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "39ad1c9f4da42278f2a1b3c125aa7e2a8005376a6f458a03851d42f85d116dee"; + sha256 = "c1a99c03d63bea1b1130a02d30c051778648c73f18f38b294c53be83f7f978dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ta/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ta/firefox-101.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "24055aedcf23fcde0dc519bc2124a8d42c82ddd74dda46b694a20d25ff76d2ce"; + sha256 = "c01c7a1f56317f2d415bd777e5434366b0b3b2f4ff3a599a25011ef8b90420c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/te/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/te/firefox-101.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "18a90860a6428ab31229c975927b264d75b2e2f186f83ef270262f7598053d48"; + sha256 = "fcda6af3a7611243dac789fec6bf78a8517389ba3df5ccbb50157969281aa8fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/th/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/th/firefox-101.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b965a21a0585cc07714c39ba33afc5ce757294d595c7617ba5b330a0d1d8cf0b"; + sha256 = "2d38c379f9d8aa9e7b7367eeccdf656cc9374858e5bd0cecc19eddd6b1a51cad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/tl/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/tl/firefox-101.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "cd1fb6553daf6b123e6545cf0553038b2f16c12ae4a21425e253c68124a8ce42"; + sha256 = "18e0bc9c89a0e89151b1edfe498760fecdb66b369e49ca4fa7ef3d5fdb0c4151"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/tr/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/tr/firefox-101.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "2a2c6abfa119022520e8a3ab4c430c282a7a3f7d5e72d2a67d070a64398b2bb9"; + sha256 = "bde092819c9f0771bb463df750fb35eb422862a7e28a308209953461be9c9d9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/trs/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/trs/firefox-101.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "aae079859fcf211c1e465a00a6a07514397a9f715bc02d704daf062e3d75220a"; + sha256 = "fca0c955097a04619e834f7bbce4d8bd7f65283dc0dc9bcb07cea7b4d31aa526"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/uk/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/uk/firefox-101.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "04ebb332d79d0a9aef5d2e93b2aa8dae0ded8d4e4c639d192ac969e8033ffa24"; + sha256 = "31c97b928c9a5e7e80ffdcbec67485702de9fb82acc4f0a7cfc7195e8d214d75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ur/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ur/firefox-101.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "8a8d6d6503657665882ccea44a56b324253adc8d98eba20696ecfd096311821f"; + sha256 = "ec9dc26f00786e8dd084d08e7e9c5612e42ada7e5381e889d940915c9360c837"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/uz/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/uz/firefox-101.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "e2990d6a4c3bfb5547bdac49a2499c7dd958d0b8e665b636e0ffd6e9aebaab58"; + sha256 = "9d4de951bfd5d1cf65718f0118807596ce48b2a6a4ce8d29c8ff3c963e39907d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/vi/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/vi/firefox-101.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b7c2a4d8c1c400f44fcad7e91572134328097d183c76b8e22d5eaa0a4959d35f"; + sha256 = "12726a8b22fdfe5d3e9637d665d7d4583e8762362032688367d3a8a5b96665a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/xh/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/xh/firefox-101.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "e3dc9942f397812564b5d7728bb4857f0c217183300ac0ab28590921f56bda34"; + sha256 = "64ee875cda3543a780a6da399ea7750027e85e4abe62d3eef4e4b21f3b0daa77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/zh-CN/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/zh-CN/firefox-101.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "11ff62d8f465b9ce17591177f1fc98d6dcbbd819332f65bcffd685d43b5aa285"; + sha256 = "694bc6bfb4a8ac1bd95f756278fb68514a69e58c17e1a6576aa2574cdafbacd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/zh-TW/firefox-99.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/zh-TW/firefox-101.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "406200aceeae06ce5ae2d736d8ff42713e2275b5f369682cd49946326c5cf21d"; + sha256 = "1a7fb5edb2ce72fb7e2b62f2e6e48f56d44522ef7f11af208b8a2a52e945bd98"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 407bf2ba37534..d076c843fb7d9 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 = "99.0"; + version = "100.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ach/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ach/firefox-100.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "86cf773e1637f17ce85810712c6fae9a2e5d9d7ee0bf7b265a30f4a469c87215"; + sha256 = "3e85609f0b3e4eb15262cd8567d8973bed2195f6a19199d76a99ed361cc0d0cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/af/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/af/firefox-100.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "72e525fee2e85110b77057178e77ddb277dd9c58609befbad04653e40cba6842"; + sha256 = "0950ef9c6c9c386df1e2d9f85312d9f3fe0dbc1668aff6710da54f8a3cdbc5de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/an/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/an/firefox-100.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "373700cebfc90fad01f5add0d5a0ff49ccab3ce8286adf3b3c91f2d69c51a18a"; + sha256 = "af97c6a4dcc34e7edd52111c6ba9480f5ecd2765ca972cb43745ecb54ba01d7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ar/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ar/firefox-100.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "50dcb4b8bf1a6df6fd17975c9f5c3a2b54b23697191c853d48e08a01429ea102"; + sha256 = "0f9947456cee9db27baffd0476e62ce529b349213ad1a0c2196bcf6d7f0e582c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ast/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ast/firefox-100.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "947401a336c715809de254d7e6381b902dc663e350bc1f89bf4ad08819a1f811"; + sha256 = "c0da6abaaecee287732a5e00520d2bacfd61a3a7ca64a5bffe37830f53cf5d20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/az/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/az/firefox-100.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "87115f184011114f54110b3dcdbe2c7833a90be44f38294395274971710f6162"; + sha256 = "1d57a9d3038dff5a354f24e7ebc7d93d11dccc57be72644988dbbb20c734d243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/be/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/be/firefox-100.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "ea0844501b10ece23edc98781a2428de1f9a1b012a06c062765b1558c0d66706"; + sha256 = "d20e556064f10c5730f094b55b4014816df7b49840d0e9934fe3167e135bd789"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/bg/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/bg/firefox-100.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "9cf618bfc8f46e9ec787274b320879d56bb1437685b3a8d057def285a1ab3621"; + sha256 = "2d26cdef7ee0d7c263599c38d5352268380125ccc3f901f48ed60134badae1c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/bn/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/bn/firefox-100.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c41c3fd72734b6f81e4b92682a2b004058dab570e29721d227cc32719c5d7433"; + sha256 = "61395cb64c519a14ef879b6b1f9444f727a6ac73074d0e67e3e68a89428c7651"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/br/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/br/firefox-100.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "627f1cf6109a6c529cabd537ac47a4ba907b7f4a2c2b565f715535d08696d8f4"; + sha256 = "486b59f31c0a63155d04cf0818d5c8629e846b313cd6eabcc762bb0c51adf35a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/bs/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/bs/firefox-100.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "283f229ea9b0430613988fce636ee11a91d73e1e5caba2671965b57df39127ed"; + sha256 = "656911e5fdd030ee191f1bcab6dc9f2a66f888a6fa726007e528716df5d6667e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ca-valencia/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ca-valencia/firefox-100.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "1fb7e3474af461ea33769c8ac2bf3f0c7d6376caf7d8de549f11987fd83be198"; + sha256 = "f31c75df5bf3639bfa4db86cc0237f7602a725b242e6330259ca4cbb61dd715d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ca/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ca/firefox-100.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "68045b6c2fae1024fd85c759e3da18857a7ab335da055c105c428244ef98127c"; + sha256 = "7f53e06ccec188fb5e85a33c7968ba90c88bf1d3a782aee179e3fef5010a33b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/cak/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/cak/firefox-100.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b6bd14470ec62436e99d72097e7f82566cefe70a2a0d57be729b9e3665070004"; + sha256 = "a1b8349ffe436cce151c5358b2e1d5a928a0ef3e623ef2c98e9f55b0ce2f405b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/cs/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/cs/firefox-100.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ad005d5e99575a0773882f933344453a73478e58c7d48769735a69ed39ca59f8"; + sha256 = "b11f724a20c13ccec73c9058e90387a031e6a9b22e02ae4ab59357d8f191ce65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/cy/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/cy/firefox-100.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "6f22fe5b3bc4649b4f73220530571140d94291f69c4fd7c512b88a3471291e3c"; + sha256 = "71e1faa584d6c9243ab806f694e548fec92672f44d6239828fb7f3c5363850b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/da/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/da/firefox-100.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2b1b37cd8e270f410a1bfa1e0e04dfb5acb17853d4f9a184eb52655b79f9d29b"; + sha256 = "e811e13df31bf0e55904a696b69ca0fd0785c7e60f9bc79fae920cc7bb55ee39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/de/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/de/firefox-100.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a115c9b1a29baa75579dd6fea40f7f498177dba0ba901f4c6de35a07fbcbb9a1"; + sha256 = "22c6c8d312db6b64dabc7d401751ce7aecd3b5889eb8e5538433bbf5aeb55d5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/dsb/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/dsb/firefox-100.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "ecdf01b499c393e06caeba03be7e3c89303a3f770859f228155bceb8c1a9c49b"; + sha256 = "76d7d9ba4483c6b727568dfbf497940dc38871cc18f5cf6823cdbd539d9f559d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/el/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/el/firefox-100.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "0205616cbfa802c67abff6cbb8e23e26b45fb8b224b5d7c02dece0ff3da4b924"; + sha256 = "59f4fab29a3888a7b86b8f50281eff8d3c7ed512a92fbceb5ab3ebfaaa4faad6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/en-CA/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/en-CA/firefox-100.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "764ed326f89e0e3ef0cab0252cbfafe8b1b739268f787f5893d1110e4cfde4b5"; + sha256 = "1c493929d5ab703f59b2e6e6ca86004725dcda7ca23c3a2b34de425e6a969cad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/en-GB/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/en-GB/firefox-100.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "dcfe8088136427476353c2797ee9ca159414f60b09fffe126eeb009ea041ebdd"; + sha256 = "2e48068db4bed6722568a35d7a2aaa84b68a8e18304744940c36437cf88b10d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/en-US/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/en-US/firefox-100.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "b6d895047c8911a49d944f78f710718091957f0057344cea735096ab4a8c07d1"; + sha256 = "528845df1a15acf081fdc9e1e7276f0b4601acc9df3553324e02c9c6fb9b7d9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/eo/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/eo/firefox-100.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "acdf7d24ac1c91802938e8151c2876765532d935c3add9028a15ff47e0dedb38"; + sha256 = "0fa2f3f4a7cbe7e9e41d0d08ba8649efa84b727d9adb621b408cf7732312fc6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/es-AR/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-AR/firefox-100.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "6d350750f744ff633168008d364b70a07a3becae1eb102c73bd2ddb6ddd8fbf5"; + sha256 = "6afb61b7e361735321934a4189063cc5f424c79022b7482b0923a0204160c2b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/es-CL/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-CL/firefox-100.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "9a4720bdf50e13bea6c98ba2e48b85dcca13683594e7b4d1e280649ac069ac3b"; + sha256 = "382ba75ab94f81ecdaeeb98b41467969b103e9feb73cbbad18b69d5f39013dc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/es-ES/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-ES/firefox-100.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "cb78b97c05002db97bd15038b2c34f582199934302c1157912f95a7304112536"; + sha256 = "1a09045c93cceb449e6f0dd9d644abcab2ec30bd39f5c9aab091fc49f32a2592"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/es-MX/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-MX/firefox-100.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "10965923df9ed49c0dbe7a00154f70eb7fcc2254de77d0eacb115a0466881dbd"; + sha256 = "68f0ef188418452de2efc73d3f94a5c1e515bd07b6907168b20b909f7739be84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/et/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/et/firefox-100.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "dafe509497714b9fa6d97ff279cb0f79b8ab0ddec1a1ca0f538301875acbf22c"; + sha256 = "7142bcf0d715b73f11cba9f181f3a02cfeef9e07e825dae7120df51b10697765"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/eu/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/eu/firefox-100.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "fa3098d1dc3fe3a4775fb431465ff9f1d6bea286cd0753afe373b907a09a7a41"; + sha256 = "563fed2bb7c6168aa9d973d1578e59c2ed1e785ca82d796de4aecebb8d6dc404"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/fa/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fa/firefox-100.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "cc7374de92c433d30e98f01e0cc742bb0fe3ec90894953423ead3e756b2377aa"; + sha256 = "f7ec308585ab8aa0e112057cd0af1df524e6712611b7ae93e893e681c8b117c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ff/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ff/firefox-100.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "41765b0971f3185b0124726983de84dbfa6ce9f2018ba53cdb69703302ee50f8"; + sha256 = "d678cc64bba6370a300a64dbdc52343b7eaae73953ddec584038d70dee8f09ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/fi/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fi/firefox-100.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b34ac17ab0e2aa8dfce3dbf4f3f50fcc748ad57cb2c5dcfc5026e74243df4b54"; + sha256 = "998746f48e543897806e8024e8e6c6cac3dd63471b3896d83ebd80279d8f026e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/fr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fr/firefox-100.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "62c1a24620ab6010c4a279d3e440e654fb446f8a8cd2c2906253d623d3d6a2a4"; + sha256 = "11bd3ad17ad680049dcb262ffa18a477d9d8285040e403b26a2f45a449a63139"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/fy-NL/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fy-NL/firefox-100.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "34c6bd8a1400f35f970ba5cad69c32826550e3d429e63002a1c34ef5f9c0c98a"; + sha256 = "508f784775df7b89e6144d9290f98e05b17b831f43f81fde5f45cadb0355bfcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ga-IE/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ga-IE/firefox-100.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "0e4954e566f128fe93a970d41df9a05c631fc22fd500b7cae43559ba836c1bba"; + sha256 = "3185a57d4a065ed4cc85fac6c3ee14597b25b5f3acdf9f0c9232d7b1935ad25b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/gd/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gd/firefox-100.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "1dd639f39a95a50d41a7759a43ac0eabea36e1ff80c557222d6b4e8dcf85701c"; + sha256 = "580397f6ec486a571768f9eb4b4d1b5b7e10a9e791c90907c7b0be0eccfb355a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/gl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gl/firefox-100.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ba2525bc4c25c74b0aaaa77dae6c05dd4a7519086d756d34fc462ea907840b8e"; + sha256 = "485a806aeaafda44d687fc41eab57a276cca691c01a67eae6baf10288e7aec67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/gn/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gn/firefox-100.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "6566afd98454031eca6ad3020323b82e1a8beb20a0e1f1ceacd3785a6e53725a"; + sha256 = "44a2699e0c3d79bfb2dbf3d4da4bcb92e7a4453daebfd57a53d9a0a6ac3e3248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/gu-IN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gu-IN/firefox-100.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "afc0da597d00fe408574e4036d2e928c644ff57857f6bf4b3182947e119cde73"; + sha256 = "5d817fdcff89b4c440580facabb01d30915962d8b076e7e79781f7209bf83023"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/he/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/he/firefox-100.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5ec824f60e9b8df7a570eae973489751a2167e423fccdf750ee9320b9a1dee2d"; + sha256 = "1756cb46aa5cae3d4cdedd720441a2ef97dfc5cfb22eed734f0b649eb65a282f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hi-IN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hi-IN/firefox-100.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6640405a9361c4f080b552a4da9757cd7b81030fec328a96793a7cc752e00371"; + sha256 = "27dcf3edd4b9fa67132c761dc3186d8ddbc0f63b32d5606abd43140a4f2a58b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hr/firefox-100.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "75072debad6b291a051dc2af60a52554e9db3e5d87cc3fca2ea2974adfa3c3d5"; + sha256 = "1aa433ebcb2b0fc185efd98b8312dc1c5b5315ffb6710e3ab69ceac0d22e1871"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hsb/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hsb/firefox-100.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "8ce2a5cf8e65d3d5de31105a7db1280c0379c77186af8deae17e6c23c6bd3edf"; + sha256 = "a0d343a341c593f6b746acb81eab4386a68cd023a5409e0182d908786243e5e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hu/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hu/firefox-100.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "595be31ce2c0671916bf8ad66f03e81bd8e53d7136d4e62d50fc7f250629bd05"; + sha256 = "de0a800eef3f292b7157dda727878d9ed953c1ffff1c7ecdd2cf49c1024dfcf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/hy-AM/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hy-AM/firefox-100.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "2a3bcd22400dfe87e6dfcb38b0d4e970a49b9b4386c3d7bb3598299fbdd06c6f"; + sha256 = "44c824309b419151fcc634d4d20774fee6f514df428c6203990ffbe7cb56e6bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ia/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ia/firefox-100.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d13f9cb95fc78bf4f744ada47f2758c61d85ed231b2195ea579635c2aca4c749"; + sha256 = "edf777a9904981d1b345390a7ab06c23e543f600a57d3e0ce0e41ab7dcca2ee0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/id/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/id/firefox-100.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "b6e02073e442960c773a5b77f66d54685dc617f3f6c9ad085caa923e84be5b4c"; + sha256 = "458ad2e7a89dfb4c50376114f270d36220c9986bad5103ccfdb11eb5452d6f5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/is/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/is/firefox-100.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c6f45c0ea25b560e1f3f5a8f4c38d3732e7a944fbaf7ea766eef1a6162830631"; + sha256 = "5bf8868b2dbea3f4d08a4201864dab6682c351912a7cd3622dcda5eb0fc67e20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/it/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/it/firefox-100.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "adf2da8dce907f184cfbcad8ee7cc645fe707b0fb2ccec480f5baf503a03ed0d"; + sha256 = "057b3ee3698696b59b49a66a8622d281c50c35c2b900fcfc95aedf4cb06701b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ja/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ja/firefox-100.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6698d549fdc42794372a32d6a435ebb90300ba42594de94d9ffeaf5aca53002f"; + sha256 = "168207c2ed591603529d9f281f0fba5be8c775d130082fa6016ab77a06e392b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ka/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ka/firefox-100.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "a16e4e6b86c9d1f62f6267417711a668d8899c2ed3414e32da13ac592bbc70c8"; + sha256 = "92564e5dda8d74245d00d83ef06c29fbff798db36d665cdd69b88d4e00474299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/kab/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/kab/firefox-100.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2ee4c463d31a388d22a4039365ed18103b4b56a3b584d32ebe393cfb956b34ea"; + sha256 = "c6641d1b22d9fd07885e18ac4ae6d0770ff6c1f88c04d41c6e43020c774a47cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/kk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/kk/firefox-100.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f4d9a8d6e6fec7f38664dd3c1fa9512dcf734481ffa20029295a86c4944c7b23"; + sha256 = "24dce49c8e0c343f3178b0280e01c34716654fa705cfc16f22b5815f2d4c524b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/km/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/km/firefox-100.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "04fd804bbd428f8441ff1900d356104160dda63ac5c6bdcc54c5fd6ada23185a"; + sha256 = "662aabaa2dfb2d6d217f359979770cc698063816d4f2db28d959cde88931aa4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/kn/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/kn/firefox-100.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "ab8a5e9c60a9bbe1d44ad4c997491e7fed9cdfe7a2c83dbfeda60d7f1a90e1ce"; + sha256 = "343213168dd6522af4e206a33c9c6f8872853207ecfa34e85189439a46be6aa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ko/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ko/firefox-100.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "bf741c3962de3277a00c5aed83e45af14743767000365153a28cbc558a6778d6"; + sha256 = "31cfa145a16c339911b9374f70b9124fcdc94c7fd630263fd19676279f257ab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/lij/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/lij/firefox-100.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "bd40f1f0126d60e539baeb2264b275a0983d83ab56dd8881c838f1d40a7299b7"; + sha256 = "7b3cf0ac4286c6ba3dd8167349cefee9f55979651566e82e2d4e979d5f8b47ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/lt/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/lt/firefox-100.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "29f3ea64fbe0e8fd4c53789de1819c29d497688180c5573fadeedd48182d5044"; + sha256 = "47715eb38d43b6cf2c873d7d7c9f643c3e895dc31e64b0481fe46d20ea670572"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/lv/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/lv/firefox-100.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "f1a6dbf6fb72733e681c000c1ee96b895ad28bd14925185c1f1ba4445e589513"; + sha256 = "77afd745728346eeba893bb8eb7bc2517c69f68ade939fd2273c595607f7a4f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/mk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/mk/firefox-100.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "bc8826ad43d8c51379f4479366b1c52635c69660b7bcc3bcb9897e6be15fc370"; + sha256 = "2c287aa2b2854e45b3a49df38d3aa8ded24d63a931c7f37ff320bc8d4358e0a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/mr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/mr/firefox-100.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7ef006861e0b17df49a08ebd877e91ea78d741c6966569df95554b813d0ad615"; + sha256 = "4212b8ddb9cd59bc692921d2ab70613ea738ca3a4a23bda0cb038707dda1262e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ms/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ms/firefox-100.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2ffd658538429e5dbee797c12a95f5c294622bf110a607bf5cb0219680bde05b"; + sha256 = "a0b878c3171af29ab631b734c20dac581ec7c1cd0487835bdb23db6ca72ca378"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/my/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/my/firefox-100.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "0d533237d125a3c73d36d8a86d58026daf8338df3034cef661510c387109b774"; + sha256 = "afeeea7ec03567ec058c5d77e813997f8cda6a654771da1a433a69bc27bf254a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/nb-NO/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/nb-NO/firefox-100.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "aeef86125435a840bfc23c23d9648e1d49a51079bda1e63276495512c8164391"; + sha256 = "a359e3b9a83aec399890324ab484c811a9a5f615ee8237bf1a1f58d9140432f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ne-NP/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ne-NP/firefox-100.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "30618d33a48ac7cf990e669ff009b36d4ca491f266fb7d917ad64b213d0e47ff"; + sha256 = "2aa43032307675ce450c2e35a2e833edddd9ab94626be008785c8226f0d62ecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/nl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/nl/firefox-100.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "fa30128a44619961b3144b338612b8677bec82c5bb4a3ee37dfda9bc0d54f5bd"; + sha256 = "ca8eaebfbbc6843f1273ff8ae8bca03209a436a3de86784049aafe52d7a3e950"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/nn-NO/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/nn-NO/firefox-100.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "96e31471625624ab0bfeecd2abec6b78bc4414a451ae3b5488ff09fecfac23d2"; + sha256 = "5472b83b2e26c8ce88a959cc3e97c140f6e3efdff5f0c9208fb2d599f43081e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/oc/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/oc/firefox-100.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "3802cce7288bf14780f78e117c528324611683dc1e8bf4db7f4c875958dd5610"; + sha256 = "19552e9822f186ec64e38ce170f0d93f433ba1d15fa25fd7388567af48925bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/pa-IN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pa-IN/firefox-100.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "177241ad04a1d18154657e753c7058e709d260af767bc53d786f5ca76ff2250a"; + sha256 = "75f3516e0f14233bb158cde3a57be644fcd6b01256ade0a9cef21ad81d434454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/pl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pl/firefox-100.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1691326be5d01826c8ebd207a2fe3f00021a8edfcf3b44ab7f28024466118ebb"; + sha256 = "2cbb208a9f23b39c66c9e50be0a873d989083f0abf9ab56e48e9b7ada91718e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/pt-BR/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pt-BR/firefox-100.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6b789a430c5c7b80f230fff69b20429a9329deb6c30f174882d71c80e3af9e02"; + sha256 = "2b9a5b1d37a000d86fb7cc41977c3ff8444047330ab0b2e10da288e418569905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/pt-PT/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pt-PT/firefox-100.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "e45567074b0573a3023e6c70241e0203cb8707e4d8c8a250d42aa29f207a969c"; + sha256 = "73de91287952c4bc9dc53099ce911aab140bcda6356788e8bab5c667f1d363c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/rm/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/rm/firefox-100.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "8e4ca7411436f910d6a2c271924fd61deb295081d7a1218cd19023635f76b18e"; + sha256 = "39c934e5c3b08e41889ed47f63e2e9f24a08602e40d20497cc7d9edb42132aff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ro/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ro/firefox-100.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9df7c85feafd6611c29c38ca25371b224e36fbbd602e74a986c26ef1f6f7c361"; + sha256 = "d23606050f9956d22efd779f09db6cb439cf8624cdc3e509f0ec6a7f0e3c9e46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ru/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ru/firefox-100.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "61015fdab4d7791a2eae09a99440df7a65828a5092d04a7376049dd7f1b5c062"; + sha256 = "b940390f3199cba2de06ef37a48ce6d0a892c8edd6e0125be088d50fa6c2e06b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sco/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sco/firefox-100.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "0481eec6bbe61c586c0a14416d7fc03df661432f2e2ad10c342fd6f6a6132e29"; + sha256 = "3a1bb5b617b7a1633c79b6d7c80e559de15e6e6c9265d574de89628cc246e2f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/si/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/si/firefox-100.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "1443ac2cfcea8fc577e341efc3d87406c01c94af9fadcf9672fd5283794d0107"; + sha256 = "e90f56c11a25fd023b3fe282858d93504e49cace7c26fd542fef10565f844742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sk/firefox-100.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4ffc688b2c38af18d28c7110f51a7a910b6671612b3a9ab657b579fabf9fb7f8"; + sha256 = "a33f598ef8e2d9865cc01ef4a03a1a0e6ea96231dec4301ada4d128bb672d35f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sl/firefox-100.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "7eba5fe498e694650047a2d5a9bcd0ef12f65b32c554ddb64fe79ba16a097927"; + sha256 = "939ffbab94871eb84bf36719debfaad1f160e0b10e0481082e5a1cf534537a54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/son/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/son/firefox-100.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "3dec0e49c906b0923229789fac38927a19e43c27a7a6004223f50bf267fb83e4"; + sha256 = "ecb166da7e16c925f14cbc3fb4748a039b942f20088ff6f9ba02489f1602c0c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sq/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sq/firefox-100.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "c2f9c4ad474223a18b11f8b0f7453b0e2a8800030ae506c7c6aabe56440e9677"; + sha256 = "53b31c2c83fd1aab0b54cbbcf77459c38a8d466b4df866a49b1a0474038651d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sr/firefox-100.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "87d70164fa38d2c8ce13bb7af9c86c84d546bba9e2bd9f37ea345664edb27a76"; + sha256 = "15b9b971d1ca2a7ab1422b040b813de9e984c451ea41eab8bad2939c5b9ae604"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/sv-SE/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sv-SE/firefox-100.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e6a167e9b9e10232ca338560f80eeeedc4b32854893905e97881102c718f8ef7"; + sha256 = "7f44e7cec1f32a69b173ef832501dcb38002c0b690284af21a53b4862053c596"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/szl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/szl/firefox-100.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "49ca939d4a7f714ae4318a13c1229c1f6f5e8b903cba2a31f4ebd98469f6bb14"; + sha256 = "df3d1186c2472d0e42e36efedd231b6beef43c1dbf18bcb1a27f86aee47257d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ta/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ta/firefox-100.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "5f8951a89a1dbe81d5327597373738a87bc5316601714ec759a4dd9d020e7ab6"; + sha256 = "d14d94ab5bed1b3c2118d5ac1dd31caf950f287b3b40de80e136b3500bdc773c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/te/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/te/firefox-100.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "ad4b82cdacbd019a06acdcc7f76385edcd167efa8127a5bb6456ba53bc879298"; + sha256 = "e11c66e7eae928a06f3d705ce3024cda3961c52727bed2217ac6dce444367107"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/th/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/th/firefox-100.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "cbd3ecc7e51e35aad4ab16f91e014e502005903b2a1d2fc3bebcac987e033ba3"; + sha256 = "4b29e95c96b9c8c5ff9fce146c3d85a1313c849a74694b56de177d921173956d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/tl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/tl/firefox-100.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "b0466b793df5feb08eb8ff8f53b70e7d58c56602acf6c7b1dc1c97c96a881348"; + sha256 = "0d9c3749adc06152e7bf8a72f81e1652901a020abee1a46c9e68b1a37009f96c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/tr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/tr/firefox-100.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "9ef3e70378c059075017ab8e3c104651e4845ceb6a981d9da85278881ea05b18"; + sha256 = "fea26051836eaec249373404e594329c7a0f357cf94edd93f494989a80e8b6c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/trs/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/trs/firefox-100.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "c31471dd116db01c888753a77bdd3078a84ad2bbc19d93b91e54ab79fb4b7de7"; + sha256 = "cef307d45f53e95ee954731106a66bc313a007dbaf96ec3b670acc392345cea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/uk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/uk/firefox-100.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4fde8729334a29c38d8bccad9d6632b8ba99a4faa769ce34d59b748aded50a93"; + sha256 = "20b1054ed238bf426ecdc511a86e1a01c946522caed30a21f8d0b470949db921"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/ur/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ur/firefox-100.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "b1476c1b0bdbcc9cc6722db50f12b7fc92dcab3848478a184b6879a927e38d3b"; + sha256 = "3009c02b5983a89dcb331daedc49bfc6bd629161a755a5e29f28405b4706ca32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/uz/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/uz/firefox-100.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "3efae069d67253c450de209a3b028910aa3a3d0c14aae259d8096414d86d6ab5"; + sha256 = "2ecf4078582f805b624f6ac612ceb10c22d1c2c3fd1a855cb86704addb9f9180"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/vi/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/vi/firefox-100.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d781e5fd73bb219fdfeb9be8e6fc861886724c48aaa4bf480605e1d641ff1c80"; + sha256 = "a73072f4a152256972a41a38ebd7dd72f1cae40bbb568bd6384bef2ffa8c7d64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/xh/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xh/firefox-100.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "1db80ed81fd431373338693ea81961089e0251dadeeaf9f4e5179b0f5abd657a"; + sha256 = "eec036004690e9fbd1e1d6934b594787e8e269e2a2a10a818096ea5854da481f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/zh-CN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/zh-CN/firefox-100.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b0c1d1cb71947cdab88859e08c09910120a2117440c03ea29f1c2d0b40d29918"; + sha256 = "b65ee16996593d88be41f19fae95f7f5826db828b3f0d7e40f1dbd9c45f43fbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-x86_64/zh-TW/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/zh-TW/firefox-100.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d4807ad378d61e01d8dcf53530deec5d4fad7b8d7df50f3df0918d2b591e6d46"; + sha256 = "c3e5b7119b95c3da1145cdecded90b8194b99f722d41855e5282d615ae2a86f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ach/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ach/firefox-100.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "79b90de5371b68c404db32c4498b4866b4ed6b10dbf58f9a2e4ebcc6d7b17478"; + sha256 = "6ada766fccaa1e54ecbf0ee75bd807a42ecbfcedd9f218ff65443aa43f4e18e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/af/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/af/firefox-100.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "2a6f75faef4006c878b8a5156412a490c667dd970779d48a891b4d898c664e27"; + sha256 = "6925ff4e7b2746249c526c11b65a87b95ccfaaa2e3f57dfe38fa5ed8bfde7637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/an/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/an/firefox-100.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "613f776853c37115f610206f6769f36adff86ed3b5b46cbe81a2ccece469cacd"; + sha256 = "bf146035e88c2b2c80bd3e352a251f4bf527089fd0252ef320b13752e045b0d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ar/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ar/firefox-100.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a436337365e0865801fab136f710cb3134dfcf93896cf59aa78bf28bd70bb5a1"; + sha256 = "f891728a186e9746b46b12cdaf7a28e81152bf71a361f49b3fb9e048050b216d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ast/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ast/firefox-100.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "85a937e65ac45dde5235e85194c9764056fcbf531f53a443c849fc727bfc5b8a"; + sha256 = "3fe9530affb6eee7fd3c35d8f3274c0659f54ff45a51e04b02d4685b22283d97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/az/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/az/firefox-100.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7a154cf0086ee80e03d88740f3b05d3de288dcab25ac151bc5ebc81af30e1220"; + sha256 = "7d62e6cb2de5130e24aef684a014ae72db408cfd3227e0b67f080a8395004d71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/be/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/be/firefox-100.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c05628994a45f2bebd6b912175b012aca3af563ec70b85c93f65106ccfa5b4f6"; + sha256 = "2c7c9285e61e0b74f7fec985462098459475e9932b6e2a44243bf54c649add52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/bg/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/bg/firefox-100.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9fc5b8266fb107b6ace769a0a75ed47bc4af5a9de6e215c4e0cd59e0f99c0711"; + sha256 = "31ba288d27f7b045cc7c685e83f49ec8b9b6579745f7c1ab373a18c8e8264aa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/bn/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/bn/firefox-100.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "3010fdb412c86b282b6a6bb9531124e8e06c409c64f3738d7c142be7d83277f2"; + sha256 = "927749fadf833f84120c36996e1364e714bf353de6cff38cc68f78af6143390e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/br/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/br/firefox-100.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "acf68c7dbc8f702f1280136f2443effbc8af793bc8be8621e617a757440c6f72"; + sha256 = "82f398c8b1ae36706b8d5e0e1bd12a568de584d342141eab4d35a40abcf14fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/bs/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/bs/firefox-100.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "233b6b37d7e4f15bc971d48c1a0d55be146bdd430bb281472367a5526867f8af"; + sha256 = "01609251ed3198064326e99c9e97b2c9128f1216581971896ccbd692ea9aaefa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ca-valencia/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ca-valencia/firefox-100.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "ee80548107642ed65feacfe480c7fa219b77ec6376244865e0deda14ffea8a7e"; + sha256 = "c35d207480e63f3b2538290e74fe6859e1de3061eeebddc10de4e44d040080b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ca/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ca/firefox-100.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "244107e338a2a290987d452953b93049642eb5008c897216d952851895011adc"; + sha256 = "3419b0ce1e30db92646c4675701eb6a7201c0c65b722b3f86bbd90c4cc236ace"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/cak/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/cak/firefox-100.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8db4e710b982e6f4f0c5e09b170884a8bd44db72a01ebb69f1eb899772132538"; + sha256 = "3f19b7d4a9ab541b12f2a2156039d38af9c13b10ff2f80a22dc365e41d307d96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/cs/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/cs/firefox-100.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "768976418cae1fdeddd8ebbbc53edda46c7b05b997db813573705bcb6dc80d80"; + sha256 = "2df78b68ddf8771f5e0bb2b24d024a04972a75b2b4aacfb85ac5d1b122cfc47d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/cy/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/cy/firefox-100.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "26705ed485b8436861032e74da2ef27b06b0d4471b6f019003175b8ef99e411b"; + sha256 = "263fc246ede739f74cdb5d266a871cfc063fc162c42ace9cd111c2522bd7044a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/da/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/da/firefox-100.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "2828700cbc12e6d349b862bc49258752602ad9ea74a8ad1b52a8171caff3e0ad"; + sha256 = "225a09327f2d8bdcd2084eeb5cba8995b899150fe5a42f97efd34e39ca9b9693"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/de/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/de/firefox-100.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b27bf803ca3ac8f4530339f648c2c7248e674f5e52a327d4d62d5dc8055c8683"; + sha256 = "e636784c7a794d8a18741aa4915c8028dfb8259381c1a0dcccd8a17796a9e340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/dsb/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/dsb/firefox-100.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "b3a31746bf575bf2c06227eb01cd07013b59ec2e17f6603babacc3be76222254"; + sha256 = "f9bad69c8fda65665c556f736401a4ce522fcc90592aedc7576076fa530a3599"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/el/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/el/firefox-100.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "b220df0d42dee179c02066677db3edc3526d1f91df9399d6555f79dc96212ae6"; + sha256 = "b825735e8461779f3dab037360e67fe4fa8d849881f811a179f8db33d49f44f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/en-CA/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/en-CA/firefox-100.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a87252dfa797e7777823a84e80d6f9d8de6d1f17d29f8d2ee4ece46ab8d1b917"; + sha256 = "e944d750a11e9ab1ee653402e058cb3f65b46eadf551a29d31919ee1640b1272"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/en-GB/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/en-GB/firefox-100.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "37001a756bf9ea4e042ec043339e86eba4abaa4bc248bc699836ac8338f56ff8"; + sha256 = "0039ab82d3eb22e9c8d1036f2d3ada46d37faeb192209b447d3e20dbe0450163"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/en-US/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/en-US/firefox-100.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c6e074e4083c366793dbc6d96968fd323fe0ffec1b8629be16e7c984ab1c3bef"; + sha256 = "5013a7a3d601c4f532becf4efad8090e73fab442a1bc8599f4195c65d5813dc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/eo/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/eo/firefox-100.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "a5b6b630d5e58e20d6af73d6646954f0842ef537f8e0fdd4a424e6d34ccd2d7c"; + sha256 = "b05d2600e407bf47c1eeeda8a5154495dfee6f0aa7044f089d5fad558134ff3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/es-AR/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-AR/firefox-100.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "84f7042e098eecf4974fef594c3640bd0e4c1c9fdab373c287ed580b2bac0a8b"; + sha256 = "27e30ab50cf1be112c8dcc625d98de5a14495bdc639de9b0e5d8795eab90f4c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/es-CL/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-CL/firefox-100.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "15a9ee9c9765ad5e0303cd94d22c61af50c723ba5241102d327e88eed2e8110e"; + sha256 = "c82b39f32baf5a63bed4ddd4bd97e7c45ba213957d114559506039986cc78c0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/es-ES/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-ES/firefox-100.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "acd612f04297eed5f09b47615412e3b19099610c7a62ea8468382fdbfccf7d1f"; + sha256 = "1ca07d869f0f36cfb79b00cc24f374f546f8e8ed9061caeba9ccd82ea1890b62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/es-MX/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-MX/firefox-100.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e86c3e1a68e7b33413b0c97ac1ad63535faa618228db207abd1d0fbdae4f5f08"; + sha256 = "8775da0ec29b758d82e2c33defe858c45a50eaeb824c34c1e31f97a07c9a9f48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/et/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/et/firefox-100.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "dcb820763848a5bbe5b32dba6be949877bc38e123c9d7553ed569316ed1d436e"; + sha256 = "29655eefbcbb0975f4d73124881c13ce465d0422088d33ea2c62bcc23a94a372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/eu/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/eu/firefox-100.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "dd1b5cbb48ea9aef8d3acab9f6a4c8de44128584b9d95fd50b2ed1b1ca79d367"; + sha256 = "47394c402cbb327335d7ed47670cc3f0c16a875581637d171d3c714d03e859c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/fa/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fa/firefox-100.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "e4e66fb13ac850712bfa9946c05b97bc69f1d750037f8524ad766d6fcde67d86"; + sha256 = "133433694832d6b4d0a03ff93f1a51a52543e67da3b58d171ee9ddf8caf10d24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ff/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ff/firefox-100.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "a793ad05230d98cfb4a003263082a64de86998eb5148ab3827b3e999e242a758"; + sha256 = "16078dcca2ef7dff68d20f29cdf941f08df9ca2b3c247be26e0386e88fc1b16e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/fi/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fi/firefox-100.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "0567d3400a281bd569c81c406b462a101d3dcf041c4ec4e0e9753301ec0aa629"; + sha256 = "2c2a44c45a3f4e449f270b8eabfbf279c922eaa0596794c0fa80b06d2f17db19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/fr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fr/firefox-100.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "fbb0392b310297e0ee974486092f7e6ed74f63d1f190218c63796bedf4e2b90d"; + sha256 = "59b0f88988d896144cbf6c9f4ed607fc318e8357b2d96c6df6ad3488f73fc9e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/fy-NL/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fy-NL/firefox-100.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "8eccc6e66de2b523e4e811d5d57b8eb17496ea9c5566c29ae7fedeb751876bf9"; + sha256 = "97a98a714e543c101e159d7f3ca052a970421a1f74e2bcbbfdb9b9755388caa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ga-IE/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ga-IE/firefox-100.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "239f4dfc4e5fc29b32a75ce0c4397a8785f3cc0b5e10b61b08565b6902342cbe"; + sha256 = "3221dda3f7d232f986e1e111a6cfb945bc1c1768464cc18d0a345ba140eef706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/gd/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gd/firefox-100.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "312c89bee7911e74fb87ce7cd128d55c7e4b0f706dba5950e7b45d39cfd5a817"; + sha256 = "c61156527cfe9966916573cfd7005a16313b134e353258b05e2362414ef0d9f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/gl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gl/firefox-100.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "98d7ee9fb9dc4442d475db37925128858d807f3e686e9624902e62a872322a91"; + sha256 = "16f762ba8291f190b165b05f9980c22d93a1612ed2251d6ec1ec18fa465044b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/gn/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gn/firefox-100.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "5d1e387fc779d0226347dbc6abfa9acd5ed5c39f30da22f36789dc1b2d68326e"; + sha256 = "c1d51a4e5629a0f04187d76edd1dd94bb5d55ff2e0757932aa218eec3a50027c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/gu-IN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gu-IN/firefox-100.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "51f5f582d2b2bda10ac528a2b0842ca86b29d20421ba83ae56493d791613bbc0"; + sha256 = "a3f92bc8d213b0cdd4df2a853951a5f446786ae5d08bebef2799e866fcde06bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/he/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/he/firefox-100.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d0192b6ad1508b1ebae13cbd3bc3d7fbf5b5e222d5f5cba1857d2b3d73c1c048"; + sha256 = "ea432d8c4cb390f92d42c27101b7b1b3c331d7b1f18a88f6acfbd3ef1b2c1544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hi-IN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hi-IN/firefox-100.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "9bf5814ada09f878d484ccd4a37d56054316372caf9766b8da70cd81f817f208"; + sha256 = "a6aa3110e9b792398860bbb2ceed29d6fa619a8ac73af96b858813d2d388855e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hr/firefox-100.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4c2453a9ac74a71d7f5dfea3474ae68cd5fc2d4a85aeb04e367116d80df9cdbd"; + sha256 = "ea1e36606ac218db3dd39891fb17ce2ac398381ab41102a3dd3170ccc37fd329"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hsb/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hsb/firefox-100.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c3904c1a8b1ecedded23ceef7d8168865a0f18f08b81600e013f7cfebc5d5ce7"; + sha256 = "ec80f48bcc37a517bacc258411da614c472a5179743717cb47561f8968c395e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hu/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hu/firefox-100.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e05debfc803f3752dfaffef6b30e0079f5af44107217c362325e1e5922eb18a0"; + sha256 = "d8622685ea6132887d8f9657d2e09d5dbcf6b9571cc7c64a85646219e5c972b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/hy-AM/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hy-AM/firefox-100.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "364a7408f1d2a150f04ab759da6a45021fad3bca5ba2811931df46960671c1ee"; + sha256 = "dd3eb9c5db97fe3e6c6dd0705406eed897e955423a96e773eb842d2e4d65f845"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ia/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ia/firefox-100.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "5dc2a481ce5e9bd54241363fb88b62a655584293fd9d3f7ddf13dd0195d8cea0"; + sha256 = "7e94b98322ad8cbcbe5ee4bebd84f2ac82a4b78673ed357bbb02a4f0b2c63c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/id/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/id/firefox-100.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b9d5b10461130d5c2895b04604be7eccf8979b87c4e8acc03173709979185eb5"; + sha256 = "b4bc9b6384b44b392a70144cb71fbd9e6d5afc3cccec4e7c86ad023bcc52dd72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/is/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/is/firefox-100.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "6e4506fd90b7f3ee316a500f5e2fd3e2063fbeea79f3a86dcfc8573b8c355469"; + sha256 = "951d6273c916a84e9139f74f916a9db4b4a976f83900d3e5506356b8817943ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/it/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/it/firefox-100.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "2bdc9c8aa3f8b0b86b0310a95e4f3aa74de418aef7dadd7ef3c24af51c4bf0ed"; + sha256 = "ac5c51fb5e42544696d975d769edf81c07e2a42bd5279eddb016e434c1945f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ja/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ja/firefox-100.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "8e035fa783b64ec5e8503bf329346799aec628df03b013319586cf04969d36f9"; + sha256 = "99c6b533a3e3ddab8dfd9b4a66f6e403bc79ab214027d604671d9f27ae897041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ka/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ka/firefox-100.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "59d2b9eaed8a898be979286d7ecf963e4f2241dfcbed9ac8e0d0b1821fb9e2fd"; + sha256 = "73eb8f1c4f22fda48ba752982265363730e23d4695fe2296b30cd74191da3c08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/kab/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/kab/firefox-100.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2506702d67e1576df307bfcfcb9e20809352a37be3650c9a454e906a5d78fd2c"; + sha256 = "a3ee102058a90cc02c745434178fe519aead9ed4552d3923eaddfaed8fbea207"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/kk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/kk/firefox-100.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "df0e505fd8552384ea55024531378e7228e35d9a40b66288631f524a565b94c3"; + sha256 = "0858af4f79d5b8592ce18701968331a19ac0d35d50117dc95096bb9f7d3cbca1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/km/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/km/firefox-100.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "fc2202caadc90364dca89329a335869dd9bc8a2240fb95d5b3c6fcfdd6586be1"; + sha256 = "b4509b98696f18d19850320f6b9e3d97dbcc0f5f55019cf3e0e62581ebd5d747"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/kn/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/kn/firefox-100.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "8b4fe5e47aeaf7d1f15fa00d74088689f40a9d92df893b79d6c3c950f182c234"; + sha256 = "8b9e139b3e0e98f266a77cba5d5a7deb3ee714176cffd5cb2b8f9e8ae85189e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ko/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ko/firefox-100.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "ce2a3f64b6d2b4ca319ed020ef621974977216aa468811609431a618aee9b77e"; + sha256 = "a43471bf0cb5e36f8e8db03e6d9e8be46bf4cb3209f66c6d721cd8ddcaf1b560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/lij/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/lij/firefox-100.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "6b8ebcebb1c9ffec9993663ef6040007909136d99dc9a2f724d16d9b9dc1f647"; + sha256 = "8dadda12fef18c64ed1331eac980c87772a45b821f524f48d73384758a003357"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/lt/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/lt/firefox-100.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "798c36f256f173fc5662d5edca6c4eaa55bc0c4f794a481524871aebabcf9b0f"; + sha256 = "93dbe1924d766b5dce326597c7a5557b26bf1137bae68bed6a319ce5caf63ab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/lv/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/lv/firefox-100.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "4ea59a53fcbfd93959540edd12b4760586ca3f0a26fcdbdafa13cad70db7ca0c"; + sha256 = "a161963a911846e93e64beff2eda2db9bf449f266697214a4483dafa97d1a2fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/mk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/mk/firefox-100.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "c4bab25688564f1dc34b14d96695bb03881af3e2551040a8cd3e4543d8107338"; + sha256 = "77db19a56be146f189436ca7d6c71defa6006ba3e34f2e10a8d1d362526dad71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/mr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/mr/firefox-100.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "e440be0dcd8714e7f08dad0800ccb642677e98444fd115c9a8ee5684f6b619e7"; + sha256 = "fbdf4862658eb780d499f089c1fa89b4374945e1990ed8892b2fdbaeffb28ed5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ms/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ms/firefox-100.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "4d09e9925b2c67c1ea082b895f62db8f1282dbad073a851504187ff9b1725e74"; + sha256 = "16e5dcdba19020f498c767732f3426915cb5f9b8f5b2be3adb2825d0db52a1d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/my/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/my/firefox-100.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "be56fa7ae49aa26d174633d7e2bf426fb6931901176d8ecd26fdcc6e02749b6f"; + sha256 = "c19ed3d409233f055ac633b4baa40de0e2be99d731f3091f0cccf772eaa39f2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/nb-NO/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/nb-NO/firefox-100.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "52a14a147126a49314425fb9ce2c964786cf409e176e1fc949ecf9a1c67627aa"; + sha256 = "c36dd328395d5fe3e7907d990e1f8185144e93961da9d8aaf81a1bbede55eed8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ne-NP/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ne-NP/firefox-100.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "25fa25a6d63008badc2bdab5242c0620520b427df68de45fab873c230f7e948f"; + sha256 = "6672d29f0fb08645f7cd4b7b7de2edff850da86e29f078fe7e49c10dbf4c35ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/nl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/nl/firefox-100.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "0d751560dfd83afdbe69aab576449ab25a3b2b66ebed28ff4d13ddfefe520f9b"; + sha256 = "71f9339624aa2014238c35c78142a1fda6762c61f5b199becc0682532c9c8de8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/nn-NO/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/nn-NO/firefox-100.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "baf6b5ae7d2848344648fe3b3fa95991ccea45d2302eec5c657671a5736cbc7f"; + sha256 = "5f9f59d3ef36aaa01d3b058adb9a08f09e184ed408d1b5b25ec415c3e83b404a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/oc/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/oc/firefox-100.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "bcf9df67acd24f0bdd4794820863f91b60bfe745471b0e88d29a22a225922665"; + sha256 = "76d7b330ba2f5c7df4df6bdddda7a887a5222f0ba3caa13f77d6ea956ec7e685"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/pa-IN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pa-IN/firefox-100.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c0d8aaab99ddfa3b0be3bc323483f99094feaa67aa3d94bab4f5cf2ca8612fb7"; + sha256 = "569b151ad53b47338ad8f78d4266247e7e7fa4ef207ee58b3606dc299b0f16af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/pl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pl/firefox-100.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "df2d1ba0a3db60f32c9031db067d14a56f06ebb8a3e04b540d4d7f15e2bc4367"; + sha256 = "af4ca741d8eb82e40775b0a2cc9338c2e81854df5107815bab8f4b6188c7189a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/pt-BR/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pt-BR/firefox-100.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8f038e619e5380491b2002909930ac254a60f92215ba922a7fb2ec0895047a91"; + sha256 = "16ed593e6c116418ca5969a07fbcbd9f93af3972edc2227271256d269066b61d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/pt-PT/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pt-PT/firefox-100.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "749ba7ce1e93dad3a95f28f5ec6bb81e9bcf63a7c4d436487422126d2f04d8c3"; + sha256 = "2a5b5a26185ff4560691d5f32fbb29ecd9123df63020492aa2829e0088aa6b1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/rm/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/rm/firefox-100.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "1b3ff965145535d0c3275366c27c4ed3a0d95a47e42d8baa7088dcdd58fb5e13"; + sha256 = "e80cf9ebb3010c97acd5d2f6cc672aa6ce4fdca930974238a148c2683f8a8dd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ro/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ro/firefox-100.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "51640a0f3792d962a31ab494fe9c8f6a31cb6c2093d06f2293b2d2614d82e17a"; + sha256 = "4db1842a3ead551700c83be677aacdd00e1957ecb6534f2b8933a19a6eedb38b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ru/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ru/firefox-100.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "01e25d1e39ad93fdaad2382039dbf3b0d9a7e1c6f7993ebe6088a7f0d6545ad1"; + sha256 = "6f821c7186343dc0bc5860bce1ae24f45c3de253223a0e99d05e582f037e7447"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sco/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sco/firefox-100.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "cf27b720e94a69df2a18ff9846108672bfe757224b71625a1ff1445ab11d5489"; + sha256 = "e213b13f3ffc309feb993239308053d029f200fa58cb35f27a52e540e544e83c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/si/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/si/firefox-100.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "4e64606407dfb9d9bbd44dc8eeb493208d546cb8d79c526a3e261a18b899b050"; + sha256 = "a59e9a00f0e1b054e08706abb823ec7c6a87ca0975b97444f6cfd265e0c25b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sk/firefox-100.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7917d08b5870a3e02c7d2393a9bfae39e9bc45114ce37c1e2cebbe81d6ed3f60"; + sha256 = "b6602ad437d41c679d43cbe7e705bb5ed31909591a8ef51ef4b5604b3a4c884e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sl/firefox-100.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "12c7b3b525fc7fa1ab76f12bb837f481ccb30b317202f185cf5e71bda80048d8"; + sha256 = "b82f1f2745235271d7a99ad0c36f664b67826276a447285165100678f4de3030"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/son/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/son/firefox-100.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "b0d0d04af3623eca737b8325e607e330636531525b92e23150d05204b29ba7e3"; + sha256 = "508c90bede375fe243f39a6ee26b972e0ec86bfa2978f3d01d0e83784731cafb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sq/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sq/firefox-100.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "4ee2854ec755ef5c1e4f4761819cd7125bbcff832d7c8ce6f3ee96e92c343b8c"; + sha256 = "db2799e56ade9c1b691d41803255a5fd1ddc08c69e199f5c1b253df11249cf67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sr/firefox-100.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "6a2e415702701fb082beacababab5cf9368790a9876114eb2186f5691f32d265"; + sha256 = "d3502cba898ee0009292f942c2e3fc2ca0225cdd2470667bd943103fa7770201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/sv-SE/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sv-SE/firefox-100.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "cdae3c72e5f79fb2a5ed988d39eac0f21e321feebe9ca67d8b7362c80160d7d4"; + sha256 = "eca5f29ebd1e756206dde952980c03b8d4fb19c544bdf814bdab5ed05ce5fef3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/szl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/szl/firefox-100.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "d39ec7a68195af2bded9826a251904b5f501c58dcb3c92789a2ab5251fe2618f"; + sha256 = "fbc098de33187fde99bbf3d205882d281e404140619d624961d0b8d1af7e3fed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ta/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ta/firefox-100.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "a7220a78f600010125b20c22205865169330c45bb9eacf4496c26ccf780257d2"; + sha256 = "a3f3f3472932be60c4f8296a13538bd12b898057a977dd7c33edc12016438dbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/te/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/te/firefox-100.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "8c4973de96cda2a3448a30ec4776e488ceac9b27a9f5142f2256b92ac5c31102"; + sha256 = "d0b562f554afa76bcc034eca7a167151a7ee38c6e82005d9a47273df08e6c0f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/th/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/th/firefox-100.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "aefbf224abd9b77303b90437a5ab87bacd4f04334d84c29c3d41c4b9922282e3"; + sha256 = "c362a365677131af77786b0f6390b62bd224ba26b7f79e69ad1826a6a15800db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/tl/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/tl/firefox-100.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d0c1e4c099482fbcbfdea2f45b3f6e1ec6744b3073d5c0ab840ed6eab129aa26"; + sha256 = "8249e0d3bb2aaf5c0be9def1842874af417bae275ba224c912371049de62a43d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/tr/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/tr/firefox-100.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "97b7f1c90fe846a4eb8c1a0dbef7eb9fa8f3a536f8e37b24565b4cb42ede27bc"; + sha256 = "82a3a504ba862849c4574ed96bdc5a737479a06a21f011f6cd74b2001bb192ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/trs/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/trs/firefox-100.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "3910053c3e0ab255cd595cdebbbb0e0720a32cc1f20d6e74b5fdd3427fbb5137"; + sha256 = "da6f0d69580df77ae2b1d091aecfbeda640440d3a15348ac38221209c6674079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/uk/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/uk/firefox-100.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4736b57b2beea7f6a09a289b3ce6921082541acf20faf9d6165658ba96e06dc2"; + sha256 = "c04848cd11abb05635e33977c98f76b4acda3a6807c8f5bc8b5d2a9b49208f1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/ur/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ur/firefox-100.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "072b4f58064362f74eef2984c94cf42302bff9e61d0f9d8adf13124cef699386"; + sha256 = "ba779105d6a9dfe3138f4b73ba60078ec66ad9fe8468f2d72f57dd19161fa09c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/uz/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/uz/firefox-100.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "42f99dd9d61f29491ba55edb806131a4768768145676b42c886b5848d09dd451"; + sha256 = "190691fd5777153daa29d56542f6792356aa916073d5e842845fe1c9444e632b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/vi/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/vi/firefox-100.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d9c9cf96117b7e759291d7731fb53b51fc9f7d07b95ec7d479f6a03c34227b9a"; + sha256 = "b5ea01ae5980892d6379eac4ba7d0f3d2643c54ade18452d39be84e44c676c01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/xh/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/xh/firefox-100.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "929005cf3eba0a59e13e9af9f1595e218757a1d08c7c9a50cfc2323cd8d2de1c"; + sha256 = "6c2f218caa8effa6fd6d9553088f7eb9a8ccf6297e3a9cd8c57d0ec5902c4c19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/zh-CN/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/zh-CN/firefox-100.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "06bef0564337cfeab47ce84a095e9bcd347df4f6c821eb5d0404d984689c9e6d"; + sha256 = "61838f9c25bec8dbb0d386ae8412f34be8701e0d6f593503eab51c2009c5e069"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/99.0/linux-i686/zh-TW/firefox-99.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/zh-TW/firefox-100.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7eda1a1131117ceb3b513dc345c62397542bcb58cda1e97ade47fedb4fe704c9"; + sha256 = "48ea7e4ae524dbb9ef83aada60b597524091be85a1dfc3665d1fdc9dba16498b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index a1e836151350c..25eb34c95e826 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -19,12 +19,11 @@ { lib , stdenv -, fetchpatch # build time , autoconf , cargo -, gnused +, dump_syms , makeWrapper , nodejs , perl @@ -61,7 +60,8 @@ , libwebp , nasm , nspr -, nss +, nss_esr +, nss_latest , pango , xorg , zip @@ -81,11 +81,13 @@ , alsaSupport ? stdenv.isLinux, alsa-lib , ffmpegSupport ? true , gssSupport ? true, libkrb5 +, jackSupport ? stdenv.isLinux, libjack2 , jemallocSupport ? true, jemalloc , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , pgoSupport ? (stdenv.isLinux && stdenv.isx86_64 && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run , pipewireSupport ? waylandSupport && webrtcSupport , pulseaudioSupport ? stdenv.isLinux, libpulseaudio +, sndioSupport ? stdenv.isLinux, sndio , waylandSupport ? true, libxkbcommon, libdrm ## privacy-related options @@ -95,6 +97,7 @@ # WARNING: NEVER set any of the options below to `true` by default. # Set to `!privacySupport` or `false`. +, crashreporterSupport ? !privacySupport , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport , webrtcSupport ? !privacySupport @@ -108,11 +111,6 @@ # `browser.eme.ui.enabled` and `media.gmp-widevinecdm.enabled` accordingly , drmSupport ? true -## other - -, crashreporterSupport ? false -, safeBrowsingSupport ? false - # As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at # https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we # have permission to use the official firefox branding. @@ -171,6 +169,11 @@ buildStdenv.mkDerivation ({ inherit src unpackPhase meta; + outputs = [ + "out" + "symbols" + ]; + # Add another configure-build-profiling run before the final configure phase if we build with pgo preConfigurePhases = lib.optionals pgoSupport [ "configurePhase" @@ -179,14 +182,6 @@ buildStdenv.mkDerivation ({ ]; patches = [ - (fetchpatch { - # RDD Sandbox paths for NixOS, remove with Firefox>=100 - # https://hg.mozilla.org/integration/autoland/rev/5ac6a69a01f47ca050d90704a9791b8224d30f14 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1761692 - name = "mozbz-1761692-rdd-sandbox-paths.patch"; - url = "https://hg.mozilla.org/integration/autoland/raw-rev/5ac6a69a01f47ca050d90704a9791b8224d30f14"; - hash = "sha256-+NGRUxXA7HGvPaAwvDveqRsdXof5nBIc+l4hdf7cC/Y="; - }) ] ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch @@ -207,7 +202,7 @@ buildStdenv.mkDerivation ({ nativeBuildInputs = [ autoconf cargo - gnused + dump_syms llvmPackages.llvm # llvm-objdump makeWrapper nodejs @@ -243,13 +238,17 @@ buildStdenv.mkDerivation ({ # Set consistent remoting name to ensure wmclass matches with desktop file export MOZ_APP_REMOTINGNAME="${binaryName}" - # Use our own python - export MACH_USE_SYSTEM_PYTHON=1 - # AS=as in the environment causes build failure # https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 unset AS + '' + lib.optionalString (lib.versionAtLeast version "100.0") '' + # Use our own python + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system + '' + lib.optionalString (lib.versionOlder version "100.0") '' + # Use our own python + export MACH_USE_SYSTEM_PYTHON=1 + '' + lib.optionalString (lib.versionAtLeast version "95.0") '' # RBox WASM Sandboxing export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc @@ -314,7 +313,9 @@ buildStdenv.mkDerivation ({ ++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}" ++ flag alsaSupport "alsa" + ++ flag jackSupport "jack" ++ flag pulseaudioSupport "pulseaudio" + ++ lib.optional (lib.versionAtLeast version "100") (flag sndioSupport "sndio") ++ flag ffmpegSupport "ffmpeg" ++ flag jemallocSupport "jemalloc" ++ flag geolocationSupport "necko-wifi" @@ -356,7 +357,6 @@ buildStdenv.mkDerivation ({ libwebp nasm nspr - nss pango perl xorg.libX11 @@ -373,8 +373,11 @@ buildStdenv.mkDerivation ({ zip zlib ] + ++ [ (if (lib.versionAtLeast version "92") then nss_latest else nss_esr) ] ++ lib.optional alsaSupport alsa-lib + ++ lib.optional jackSupport libjack2 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed + ++ lib.optional (sndioSupport && lib.versionAtLeast version "100") sndio ++ lib.optional gssSupport libkrb5 ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional jemallocSupport jemalloc @@ -416,7 +419,13 @@ buildStdenv.mkDerivation ({ # tests were disabled in configureFlags doCheck = false; + # Generate build symbols once after the final build + # https://firefox-source-docs.mozilla.org/crash-reporting/uploading_symbol.html preInstall = '' + ./mach buildsymbols + mkdir -p $symbols/ + cp mozobj/dist/*.crashreporter-symbols.zip $symbols/ + cd mozobj ''; @@ -475,7 +484,9 @@ buildStdenv.mkDerivation ({ inherit version; inherit alsaSupport; inherit binaryName; + inherit jackSupport; inherit pipewireSupport; + inherit sndioSupport; inherit nspr; inherit ffmpegSupport; inherit gssSupport; diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/firefox/librewolf/src.json deleted file mode 100644 index d209a83ab9dff..0000000000000 --- a/pkgs/applications/networking/browsers/firefox/librewolf/src.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "packageVersion": "99.0-1", - "source": { - "rev": "99.0-1", - "sha256": "0x9c19h4l1djhdq48ylnqjrrfkk2zalfpgj57cba5jqxl2fhglx3" - }, - "firefox": { - "version": "99.0", - "sha512": "08f6d5a668140c4275aba6df463ed3af596043dfe5f27573583afbc1e9f6b27ebca79a52ce2c9598261c631b400b5378744e9e70f51ef9c4098b419e9904aa7c" - } -} diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index cdaf631795128..10249aea4ee92 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,16 +1,12 @@ -{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests }: - -let - common = opts: callPackage (import ./common.nix opts) {}; -in +{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests, buildMozillaMach }: rec { - firefox = common rec { + firefox = buildMozillaMach rec { pname = "firefox"; - version = "99.0"; + version = "100.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "08f6d5a668140c4275aba6df463ed3af596043dfe5f27573583afbc1e9f6b27ebca79a52ce2c9598261c631b400b5378744e9e70f51ef9c4098b419e9904aa7c"; + sha512 = "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa"; }; meta = { @@ -30,12 +26,12 @@ rec { }; }; - firefox-esr-91 = common rec { + firefox-esr-91 = buildMozillaMach rec { pname = "firefox-esr"; - version = "91.8.0esr"; + version = "91.9.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3"; + sha512 = "fd69d489429052013d2c1b8b766a47920ecee62f0688505758f593b27ae66d6343b9107163749406251aedebdf836147e4d562415a811b04d7ab2ae31e32f133"; }; meta = { @@ -54,30 +50,4 @@ rec { versionSuffix = "esr"; }; }; - - librewolf = - let - librewolf-src = callPackage ./librewolf { }; - in - (common rec { - pname = "librewolf"; - binaryName = "librewolf"; - version = librewolf-src.packageVersion; - src = librewolf-src.firefox; - inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru; - - meta = { - description = "A fork of Firefox, focused on privacy, security and freedom"; - homepage = "https://librewolf.net/"; - maintainers = with lib.maintainers; [ squalus ]; - inherit (firefox.meta) platforms badPlatforms broken maxSilent license; - }; - updateScript = callPackage ./librewolf/update.nix { - attrPath = "librewolf-unwrapped"; - }; - }).override { - crashreporterSupport = false; - enableOfficialBranding = false; - pgoSupport = false; # Profiling gets stuck and doesn't terminate. - }; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index d5055f04ed82e..2efd9422328ee 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem, makeWrapper, lndir, config -, replace, fetchurl, zip, unzip, jq, xdg-utils, writeText +, fetchurl, zip, unzip, jq, xdg-utils, writeText ## various stuff that can be plugged in , ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc @@ -13,6 +13,8 @@ , mesa # firefox wants gbm for drm+dmabuf , cups , pciutils +, sndio +, libjack2 }: ## configurability of the wrapper itself @@ -53,6 +55,8 @@ let gssSupport = browser.gssSupport or false; alsaSupport = browser.alsaSupport or false; pipewireSupport = browser.pipewireSupport or false; + sndioSupport = browser.sndioSupport or false; + jackSupport = browser.jackSupport or false; # PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards smartcardSupport = cfg.smartcardSupport or false; @@ -76,6 +80,8 @@ let (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsa-lib zlib ]) ++ lib.optional (config.pulseaudio or true) libpulseaudio ++ lib.optional alsaSupport alsa-lib + ++ lib.optional sndioSupport sndio + ++ lib.optional jackSupport libjack2 ++ lib.optional smartcardSupport opensc ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk3 ]; @@ -176,7 +182,7 @@ let startupWMClass = wmClass; }; - nativeBuildInputs = [ makeWrapper lndir replace jq ]; + nativeBuildInputs = [ makeWrapper lndir jq ]; buildInputs = [ browser.gtk3 ]; @@ -206,48 +212,52 @@ let done # fix links and absolute references - cd "${browser}" find . -type l -print0 | while read -d $'\0' l; do - target="$(readlink "$l" | replace-literal -es -- "${browser}" "$out")" + target="$(readlink "$l")" + target=''${target/#"${browser}"/"$out"} ln -sfT "$target" "$out/$l" done - # This will not patch binaries, only "text" files. - # Its there for the wrapper mostly. cd "$out" - replace-literal -esfR -- "${browser}" "$out" # create the wrapper executablePrefix="$out/bin" executablePath="$executablePrefix/${applicationName}" + oldWrapperArgs=() - if [ ! -x "$executablePath" ] - then - echo "cannot find executable file \`${browser}/bin/${applicationName}'" - exit 1 - fi - - if [ ! -L "$executablePath" ] - then - # Careful here, the file at executablePath may already be - # a wrapper. That is why we postfix it with -old instead - # of -wrapped. - oldExe="$executablePrefix"/".${applicationName}"-old - mv "$executablePath" "$oldExe" - else + if [[ -L $executablePath ]]; then + # Symbolic link: wrap the link's target. oldExe="$(readlink -v --canonicalize-existing "$executablePath")" - fi - - if [ ! -x "${browser}/bin/${applicationName}" ] - then - echo "cannot find executable file \`${browser}/bin/${applicationName}'" - exit 1 + rm "$executablePath" + elif wrapperCmd=$(strings -dw "$executablePath" | sed -n '/^makeCWrapper/,/^$/ p'); [[ $wrapperCmd ]]; then + # If the executable is a binary wrapper, we need to update its target to + # point to $out, but we can't just edit the binary in-place because of length + # issues. So we extract the command used to create the wrapper and add the + # arguments to our wrapper. + parseMakeCWrapperCall() { + shift # makeCWrapper + oldExe=$1; shift + for arg do case $arg in + --inherit-argv0) oldWrapperArgs+=(--argv0 '$0');; # makeWrapper doesn't understand --inherit-argv0 + *) oldWrapperArgs+=("$arg");; + esac done + } + eval "parseMakeCWrapperCall ''${wrapperCmd//"${browser}"/"$out"}" + rm "$executablePath" + else + if read -rn2 shebang < "$executablePath" && [[ $shebang == '#!' ]]; then + # Shell wrapper: patch in place to point to $out. + sed -i "s@${browser}@$out@g" "$executablePath" + fi + # Suffix the executable with -old, because -wrapped might already be used by the old wrapper. + oldExe="$executablePrefix/.${applicationName}"-old + mv "$executablePath" "$oldExe" fi makeWrapper "$oldExe" \ - "$out/bin/${applicationName}${nameSuffix}" \ + "''${executablePath}${nameSuffix}" \ --prefix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --prefix PATH ':' "${xdg-utils}/bin" \ @@ -258,9 +268,8 @@ let --set MOZ_ALLOW_DOWNGRADE 1 \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \ - ${lib.optionalString forceWayland '' - --set MOZ_ENABLE_WAYLAND "1" \ - ''} + ${lib.optionalString forceWayland "--set MOZ_ENABLE_WAYLAND 1"} \ + "''${oldWrapperArgs[@]}" ############################# # # # END EXTRA PREF CHANGES # diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 5ba831b210223..4d096f46ce082 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -32,7 +32,7 @@ , channel ? "stable" # Necessary for USB audio devices. -, pulseSupport ? true, libpulseaudio ? null +, pulseSupport ? true, libpulseaudio # Only needed for getting information about upstream binaries , chromium diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index e744f2a31c657..1c573eb1a58b4 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -6,39 +6,45 @@ , pkg-config , fribidi , harfbuzz -, libunistring , libwebp , mpg123 -, openssl -, pcre , SDL2 +, the-foundation , AppKit , zip -, zlib +, enableTUI ? false, ncurses, sealcurses }: stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.12.1"; + version = "1.13.3"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-CpvoovTn++RTQjyeOlHTG+cjn32F+9qP32+YHpoLB8M="; - fetchSubmodules = true; + sha256 = "sha256-ZCG7i5WmhONockaTt/YCww7N+WvxCX2DIwQIFjAk+K8="; }; - postPatch = '' - rm -r lib/fribidi lib/harfbuzz - ''; - nativeBuildInputs = [ cmake pkg-config zip ]; - buildInputs = [ fribidi harfbuzz libunistring libwebp mpg123 openssl pcre SDL2 zlib ] + buildInputs = [ the-foundation ] + ++ lib.optionals (!enableTUI) [ fribidi harfbuzz libwebp mpg123 SDL2 ] + ++ lib.optionals enableTUI [ ncurses sealcurses ] ++ lib.optional stdenv.isDarwin AppKit; - installPhase = lib.optionalString stdenv.isDarwin '' + cmakeFlags = lib.optionals enableTUI [ + "-DENABLE_TUI=YES" + "-DENABLE_MPG123=NO" + "-DENABLE_WEBP=NO" + "-DENABLE_FRIBIDI=NO" + "-DENABLE_HARFBUZZ=NO" + "-DENABLE_POPUP_MENUS=NO" + "-DENABLE_IDLE_SLEEP=NO" + "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" + ]; + + installPhase = lib.optionalString (stdenv.isDarwin && !enableTUI) '' mkdir -p $out/Applications mv Lagrange.app $out/Applications ''; diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix new file mode 100644 index 0000000000000..8f3100de970d4 --- /dev/null +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, callPackage, buildMozillaMach }: + +let + librewolf-src = callPackage ./librewolf.nix { }; +in +(buildMozillaMach rec { + pname = "librewolf"; + binaryName = "librewolf"; + version = librewolf-src.packageVersion; + src = librewolf-src.firefox; + inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru; + + meta = { + description = "A fork of Firefox, focused on privacy, security and freedom"; + homepage = "https://librewolf.net/"; + maintainers = with lib.maintainers; [ squalus ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) + license = lib.licenses.mpl20; + }; + updateScript = callPackage ./update.nix { + attrPath = "librewolf-unwrapped"; + }; +}).override { + crashreporterSupport = false; + enableOfficialBranding = false; + pgoSupport = false; # Profiling gets stuck and doesn't terminate. +} diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index 10b65e8825c20..68ed776e91c9b 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -1,4 +1,4 @@ -{ callPackage, git }: +{ callPackage }: let src = callPackage ./src.nix { }; in diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json new file mode 100644 index 0000000000000..5bad3f1ed7fb1 --- /dev/null +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -0,0 +1,11 @@ +{ + "packageVersion": "100.0-3", + "source": { + "rev": "100.0-3", + "sha256": "1n99amk6ngxa7wipc402gffqjv4qmgbaahpz3xydfarxw8gk37pl" + }, + "firefox": { + "version": "100.0", + "sha512": "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa" + } +} diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.nix b/pkgs/applications/networking/browsers/librewolf/src.nix index 38c5dc6b593d1..38c5dc6b593d1 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/src.nix +++ b/pkgs/applications/networking/browsers/librewolf/src.nix diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/update.nix b/pkgs/applications/networking/browsers/librewolf/update.nix index 5cb5c6168f730..b8bc64afafe07 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/update.nix +++ b/pkgs/applications/networking/browsers/librewolf/update.nix @@ -20,7 +20,7 @@ writeScript "update-librewolf" '' latestTag=$(curl https://gitlab.com/api/v4/projects/librewolf-community%2Fbrowser%2Fsource/repository/tags?per_page=1 | jq -r .[0].name) echo "latestTag=$latestTag" - srcJson=pkgs/applications/networking/browsers/firefox/librewolf/src.json + srcJson=pkgs/applications/networking/browsers/librewolf/src.json localRev=$(jq -r .source.rev < $srcJson) echo "localRev=$localRev" diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 3a5b31e98e995..02b3f88d1e14e 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = "http://links.twibright.com/"; description = "A small browser with some graphics support"; maintainers = with maintainers; [ raskin ]; + mainProgram = "links"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 6598ba27a872c..4acdd563d66f7 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "99.0.1150.16"; + version = "101.0.1210.19"; revision = "1"; - sha256 = "sha256:0qsgs889d6qwxz9qf42psmjqfhmrqgp07srq5r38npl5pncr137h"; + sha256 = "sha256:1kgc19ryw69xiqppz90d6sa45g99hzkh7x5yk9d3xlh1gc1xn54p"; }; dev = import ./browser.nix { channel = "dev"; - version = "100.0.1163.1"; + version = "102.0.1227.0"; revision = "1"; - sha256 = "sha256:153faqxyw5f5b6cqnvd71dl7941znkzci8dwbcgaxway0b6882jq"; + sha256 = "sha256:0dnyandri7yg7c9812pnsxqszxyqcssxf87yskjg2vw95hawf11x"; }; stable = import ./browser.nix { channel = "stable"; - version = "98.0.1108.56"; + version = "100.0.1185.44"; revision = "1"; - sha256 = "sha256:03jbj2s2fs60fzfgsmyb284q7nckji87qgb86mvl5g0hbl19aza7"; + sha256 = "sha256:0zv1zyijh620xz36a6nmhv7rbv4ln5f245hyh0w1sngynsl1rz89"; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix index b0d954a00d4f8..bba457674c7d0 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + homepage = "https://www.netsurf-browser.org/"; description = "Generalised utility library for netsurf browser"; license = licenses.mit; maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; diff --git a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix index c7362b998beb2..47b53b4781b56 100644 --- a/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix +++ b/pkgs/applications/networking/browsers/netsurf/libutf8proc.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib +, stdenv +, fetchurl +, pkg-config , buildsystem }: @@ -9,10 +12,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI="; + hash = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ buildsystem ]; makeFlags = [ @@ -21,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://www.netsurf-browser.org/projects/${libname}/"; + homepage = "https://www.netsurf-browser.org/"; description = "UTF8 Processing library for netsurf browser"; license = licenses.mit; maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index cce3f39d3c31f..a07ca4e581de5 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -6,7 +6,7 @@ , dbus , dbus-glib , desktop-file-utils -, fetchzip +, fetchFromGitea , ffmpeg , fontconfig , freetype @@ -31,7 +31,7 @@ , zip , zlib , withGTK3 ? true, gtk3, gtk2 -, testVersion +, testers , palemoon }: @@ -39,19 +39,21 @@ # https://developer.palemoon.org/build/linux/ assert stdenv.cc.isGNU; assert with lib.strings; ( - versionAtLeast stdenv.cc.version "4.9" - && !hasPrefix "6" stdenv.cc.version - && versionOlder stdenv.cc.version "11" + versionAtLeast stdenv.cc.version "7.1" + && versionOlder stdenv.cc.version "12" ); stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.5.1"; - - src = fetchzip { - name = "${pname}-${version}"; - url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz"; - sha256 = "sha256-IC7E88dECAz2diVLEEdjMltpNMBhPTlPvbz05BniBMI="; + version = "31.0.0"; + + src = fetchFromGitea { + domain = "repo.palemoon.org"; + owner = "MoonchildProductions"; + repo = "Pale-Moon"; + rev = "${version}_Release"; + fetchSubmodules = true; + sha256 = "sha256-fIQAQCtjA/9Otft3e9Z4xWgE09sqsdArYQtZqmEgfTc="; }; nativeBuildInputs = [ @@ -139,14 +141,9 @@ stdenv.mkDerivation rec { ./mach install - # Fix missing icon due to wrong WMClass - # https://forum.palemoon.org/viewtopic.php?f=3&t=26746&p=214221#p214221 - substituteInPlace ./palemoon/branding/official/palemoon.desktop \ - --replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon' + # Install official branding stuff desktop-file-install --dir=$out/share/applications \ ./palemoon/branding/official/palemoon.desktop - - # Install official branding icons for iconname in default{16,22,24,32,48,256} mozicon128; do n=''${iconname//[^0-9]/} size=$n"x"$n @@ -155,7 +152,7 @@ stdenv.mkDerivation rec { # Remove unneeded SDK data from installation # https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729 - rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}} + rm -r $out/{include,share/idl,lib/palemoon-devel-${version}} runHook postInstall ''; @@ -211,7 +208,7 @@ stdenv.mkDerivation rec { )" update-source-version ${pname} "$version" ''; - tests.version = testVersion { + tests.version = testers.testVersion { package = palemoon; }; }; diff --git a/pkgs/applications/networking/browsers/palemoon/mozconfig b/pkgs/applications/networking/browsers/palemoon/mozconfig index 0eab96e584691..65143fdac1874 100644 --- a/pkgs/applications/networking/browsers/palemoon/mozconfig +++ b/pkgs/applications/networking/browsers/palemoon/mozconfig @@ -20,8 +20,6 @@ ac_add_options --enable-strip ac_add_options --enable-devtools ac_add_options --enable-av1 -ac_add_options --disable-eme -ac_add_options --disable-webrtc ac_add_options --disable-gamepad ac_add_options --disable-tests ac_add_options --disable-debug diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix index 9786fad2fdc65..8ad81139fbe91 100644 --- a/pkgs/applications/networking/browsers/qtchan/default.nix +++ b/pkgs/applications/networking/browsers/qtchan/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { description = "4chan browser in qt5"; homepage = "https://github.com/siavash119/qtchan"; license = licenses.mit; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 6d919ce520f57..2e96266fd7372 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,10 +1,12 @@ { stdenv, lib, fetchurl, fetchzip, python3 , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking -, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, pipewire_0_2 +, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null , withPdfReader ? true , withMediaPlayback ? true , backend ? "webengine" +, pipewireSupport ? stdenv.isLinux +, pipewire_0_2 }: assert withMediaPlayback -> gst_all_1 != null; @@ -77,7 +79,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser" - sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py + sed -i "s,/usr,$out,g" qutebrowser/utils/standarddir.py '' + lib.optionalString withPdfReader '' sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py ''; @@ -121,7 +123,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { "''${qtWrapperArgs[@]}" --add-flags '--backend ${backend}' --set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}" - ${lib.optionalString (!stdenv.isDarwin && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''} + ${lib.optionalString (pipewireSupport && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''} ) ''; @@ -130,5 +132,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; }; } diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 12ff0aa75ec44..9293cc3050d8a 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.10"; + version = "11.0.11"; lang = "en-US"; @@ -98,7 +98,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1j39v01bb97hkhkfvz7xyfmv6y0sjjcymvn3sa9ahz2av1xlrplp"; + sha256 = "1dx92jdnvs7w52mps4zhnnjym6jsl9vwfiav1jw8qq0g8hslgybd"; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0vh913z828ncb8pwz461xx61ylxqp44rf9iah7n6lzda7hcw79r3"; + sha256 = "165mg9gwmlqwskbk3i8lhjjqp4lmpq5vzdvd9zalx69xqh9v85i5"; }; }; in @@ -357,7 +357,7 @@ stdenv.mkDerivation rec { TMPDIR="\''${TMPDIR:-/tmp}" \ HOME="\$HOME" \ XAUTHORITY="\''${XAUTHORITY:-\$HOME/.Xauthority}" \ - DISPLAY="\$DISPLAY" \ + DISPLAY="\''${DISPLAY:-}" \ DBUS_SESSION_BUS_ADDRESS="\''${DBUS_SESSION_BUS_ADDRESS:-unix:path=\$XDG_RUNTIME_DIR/bus}" \\ \ XDG_DATA_HOME="\$HOME/.local/share" \ @@ -366,6 +366,11 @@ stdenv.mkDerivation rec { PULSE_SERVER="\''${PULSE_SERVER:-}" \ PULSE_COOKIE="\''${PULSE_COOKIE:-}" \ \ + MOZ_ENABLE_WAYLAND="\''${MOZ_ENABLE_WAYLAND:-}" \ + WAYLAND_DISPLAY="\''${WAYLAND_DISPLAY:-}" \ + XDG_RUNTIME_DIR="\''${XDG_RUNTIME_DIR:-}" \ + XCURSOR_PATH="\''${XCURSOR_PATH:-}" \ + \ APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \ \ TOR_SKIP_LAUNCH="\''${TOR_SKIP_LAUNCH:-}" \ @@ -404,7 +409,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null echo "Checking tor-browser wrapper ..." - DISPLAY="" XAUTHORITY="" DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \ + TBB_HOME=$(mktemp -d) \ $out/bin/tor-browser --version >/dev/null ''; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 240d9a972fbb0..35fece92529b8 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "vimb"; - version = "3.3.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "fanglingsu"; repo = "vimb"; rev = version; - sha256 = "1qg18z2gnsli9qgrqfhqfrsi6g9mcgr90w8yab28nxrq4aha6brf"; + sha256 = "sha256-Eq4riJSznKpkW9JJDnTCLxZ9oMJTmWkIoGphOiCcSAg="; }; nativeBuildInputs = [ wrapGAppsHook pkg-config ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 30d719593e83c..6e496c30ecf6a 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.1.2567.73-1"; + version = "5.2.2623.41-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "04jzhipn4ip7x3zdwmfnp6w0qc2y1qdfy5w3qyy0r114jz9s9i7g"; + sha256 = "1kyjplymibvs82bqyjmm0vyv08yg4acl2jghh24rm9x53si6qf2d"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 461fd0050cf1a..c550c8cea25a6 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "97.0.4692.71"; + version = "101.0.4951.15"; src = fetchurl { - url = "https://launchpadlibrarian.net/579085093/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; - sha256 = "sha256-YUv1D8U776NJBRPvYJigG7gyH9zd19FbnjAvIEhfYpA="; + url = "https://launchpadlibrarian.net/594594495/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; + sha256 = "sha256-aelr/jODmgyVunSFFn6W+QHEmSWJeWzU4SaS5rjHli4="; }; buildInputs = [ dpkg ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix index 71a5a67331ed6..23205aa6846ef 100644 --- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "widevine"; - version = "4.10.2391.0"; + version = "4.10.2449.0"; src = fetchurl { url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; - sha256 = "sha256-7gH808C67m/s09e4rQUQHb/t+iGVdzW+YzrB1ZxGIdo="; + sha256 = "sha256-XZuXK3NCfqbaQ1tuMOXj/U4yJC18futqo1WjuMqMrRA="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix deleted file mode 100644 index 3a9192164adf5..0000000000000 --- a/pkgs/applications/networking/c14/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "c14-cli"; - version = "0.3"; - - goPackagePath = "github.com/online-net/c14-cli"; - - src = fetchFromGitHub { - owner = "online-net"; - repo = "c14-cli"; - rev = version; - sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf"; - }; - - meta = with lib; { - description = "C14 is designed for data archiving & long-term backups"; - homepage = "https://www.online.net/en/storage/c14-cold-storage"; - license = licenses.mit; - maintainers = with maintainers; [ apeyroux ]; - }; -} diff --git a/pkgs/applications/networking/cloudflare-dyndns/default.nix b/pkgs/applications/networking/cloudflare-dyndns/default.nix new file mode 100644 index 0000000000000..ee7573cf713dd --- /dev/null +++ b/pkgs/applications/networking/cloudflare-dyndns/default.nix @@ -0,0 +1,53 @@ +{ buildPythonApplication +, attrs +, click +, cloudflare +, fetchFromGitHub +, lib +, poetry +, pydantic +, pytestCheckHook +, requests +}: + +buildPythonApplication rec { + pname = "cloudflare-dyndns"; + version = "4.1"; + + src = fetchFromGitHub { + owner = "kissgyorgy"; + repo = pname; + rev = "v${version}"; + hash = "sha256-6Q5fpJ+HuQ+hc3xTtB5tR43pn9WZ0nZZR723iLAkpis="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ + attrs + click + cloudflare + pydantic + requests + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'click = "^7.0"' 'click = "*"' + ''; + + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + "test_get_ipv4" + ]; + + meta = with lib; { + description = " CloudFlare Dynamic DNS client "; + homepage = "https://github.com/kissgyorgy/cloudflare-dyndns"; + license = licenses.mit; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 015612983c296..96cddf0f42a00 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,22 +1,33 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, stdenv }: buildGoModule rec { pname = "cloudflared"; - version = "2022.4.0"; + version = "2022.5.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-+40OK2q4WdvlLhoPfZH6q+pghgS7ZLmaZl2VbZK4rdA="; + hash = "sha256-yv4ulVkc7WX6T287kXecyE6lFlxh4YKAi2UCGkOf/lk="; }; vendorSha256 = null; - doCheck = false; - ldflags = [ "-X main.Version=${version}" ]; + preCheck = '' + # Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory + export HOME="$(mktemp -d)"; + + # Workaround for: protocol_test.go:11: + # lookup protocol-v2.argotunnel.com on [::1]:53: read udp [::1]:51876->[::1]:53: read: connection refused + + substituteInPlace "edgediscovery/protocol_test.go" \ + --replace "TestProtocolPercentage" "SkipProtocolPercentage" + ''; + + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "CloudFlare Tunnel daemon (and DNS-over-HTTPS client)"; homepage = "https://www.cloudflare.com/products/tunnel"; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index de1310f55d740..1881009f3e2c5 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.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-IcKueb/bxPNwJ9bZWwmz4ywCtZGk0PSuH3KYDMp6Qd4="; + sha256 = "sha256-tl1UpoXBuIyJyMLHeIhQ6EHG1XqAGE6Tw5jU6rW+DXc="; }; - vendorSha256 = "sha256-YeSeaYOkNRjQgxsK9G7iPbVpfrPs4HRRFwfoUDxoCm0="; + vendorSha256 = "sha256-cq452XEGMVbLvfJ/UiVyOvnUSJr196owB3SyBYnAmZ0="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 58f5dfed85186..c56f937223c97 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.3.1"; + version = "0.3.5"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-L8+sb0lGPuc6smOFwijRGFS+oSCxEqB5c1tG55MPlgE="; + sha256 = "sha256-YqnmtDVtprQQFbL++X9rUJFGj+fMD+fvDRWsQ+uOxxo="; }; - vendorSha256 = "sha256-sxPTOao3scTmiVKFyGeWPMzXQz/d0HSVmUYocNGm1vA="; + vendorSha256 = "sha256-r8RTwMzFS/BkxW08+wfAovuFLpIOReDsuHi/Hx9cVPc="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 57a56e20c2e5b..47a5e8d22facc 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.20"; + version = "0.8.23"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-DIXvsYYckNlxFzeJqk3TYRQIAtafAfylyDc/a20kl+0="; + sha256 = "sha256-y3NsYPGVlWA/N2AYw3EQKUwLeGYwRI29tC9iTPeyU3Q="; }; CGO_ENABLED = 0; - vendorSha256 = "sha256-An52QMjHaHRIicxCBpjgi+S2QeKXhB9rndjV+FIkS3c="; + vendorSha256 = "sha256-E+fjDW7UIAYDiDI8Eb8atAtccEIRcV5hqYdSxRYM9fc="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index dcb6b823667ee..55807caa5afb1 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,21 +2,24 @@ buildGoModule rec { pname = "atlantis"; - version = "0.16.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-D549pInoK8ispgcn8LYdix19Hp7wO6w2/d2Y1L/9Px8="; + sha256 = "sha256-cd2dhrqJl/VRhOYB1g9OpOnPV92EQm8f3rRGZGVN+IY="; }; - vendorSha256 = null; - - doCheck = false; + vendorSha256 = "sha256-ux+Hw/TjeiY9VYhIQxaltZGk5CkxAab8R7kAsTaMUGc="; subPackages = [ "." ]; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/atlantis version | grep ${version} > /dev/null + ''; + meta = with lib; { homepage = "https://github.com/runatlantis/atlantis"; description = "Terraform Pull Request Automation"; diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index beedc41fa8ec3..069307c41e910 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -39,5 +39,6 @@ buildGoModule rec { changelog = "https://github.com/cloudfoundry/bosh-cli/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ris ]; + mainProgram = "bosh"; }; } diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index cf1ada47189f2..bde7a21b33ef1 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.10.4"; + version = "0.11.1"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1/WXpXZ6f4p4IZ/yropCjH3hHt+t5HGw0aq0HFk04mo="; + sha256 = "sha256-8twqA8aUuk5+LzjxMRbRA3m6qiEbk60A0q3nw9uzCvU="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 4667b130e8db5..ec9f45a83886e 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -39,6 +39,7 @@ buildGoModule rec { description = "The official command line client for Cloud Foundry"; homepage = "https://github.com/cloudfoundry/cli"; maintainers = with maintainers; [ ris ]; + mainProgram = "cf"; license = licenses.asl20; }; } diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index df34db0e14766..86c7eddd7ab02 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cmctl"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - sha256 = "sha256-Hx6MG5GCZyOX0tfpg1bfUT0BOI3p7Mws1VCz2PuUuw8="; + sha256 = "sha256-h7GyzjVrfyMHY7yuNmmsym6KGKCQr5R71gjPBTUeMCg="; }; - vendorSha256 = "sha256-4zhdpedOmLl/i1G0QCto4ACxguWRZLzOm5HfMBMtvPY="; + vendorSha256 = "sha256-UYw9WdQ6VwzuuiOsa1yovkLZG7NmLYSW51p8UhmQMeI="; subPackages = [ "cmd/ctl" ]; diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 2961521af5f6b..899b751462239 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.27.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-C+3eXdSU4FdJVlFvZw8LH768Yx6xvlElV1wsKgoju4o="; + sha256 = "sha256-cn0PhumDaOhTm1vZCj0h9XehnQCDc+mXtne7QQNSbBk="; }; - vendorSha256 = "sha256-verxBwk83Xgg3XEMZpOXD3j3IgE7G4rHWJTj09BW74g="; + vendorSha256 = "sha256-bsIPEjD/kCUvkRKP85CjW3JJf1Hyx9b2pMY9S4HlKrA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index b5250a3bd7faf..131cee6af0323 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.14.3"; + version = "1.14.4"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz"; - sha256 = "sha256-dst0Q1AlDdggtOwYROoV6QcBLRNfmGTo7DL2BV/5PB4="; + sha256 = "sha256-qvWUh+EQT/MljN5LCX2JLMEapIEGAbAljrCMTYsFqtw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 0e9630a23d538..21e2f00c3e2f8 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.28.5"; - sha256 = "11k8sb8pjhrg8ar256rfdw736cg32m6n8xcfhyqc3r4pkj3ksli8"; - manifestsSha256 = "1gjya8xcmx065ywx7bc2xdsp3qj2y47b7l1dlr4y0hzp19pclmcw"; + version = "0.30.2"; + sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl"; + manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-kxI2sOaY66XLIRMT1l3VLQh1XR4nvvsYvsdZbVLxbHM="; + vendorSha256 = "sha256-POziJtCdD4klu23WuGmWdt72Ugr4KwCAjXRTCuzikSk="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests @@ -65,6 +65,7 @@ in buildGoModule rec { ''; homepage = "https://fluxcd.io"; license = licenses.asl20; - maintainers = with maintainers; [ jlesquembre bryanasdev000 ]; + maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ]; + mainProgram = "flux"; }; } diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh index 1ded63d4d86c1..2d25eee6f347e 100755 --- a/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -3,36 +3,43 @@ set -x -eu -o pipefail -cd $(dirname "${BASH_SOURCE[0]}") - -TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/fluxcd/flux2/releases/latest | jq -r '.tag_name') - -VERSION=$(echo ${TAG} | sed 's/^v//') - -SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archive/refs/tags/${TAG}.tar.gz) - -SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${TAG}/manifests.tar.gz) - -setKV () { - sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix -} - -setKV version ${VERSION} -setKV sha256 ${SHA256} -setKV manifestsSha256 ${SPEC_SHA256} -setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The same as lib.fakeSha256 - -cd ../../../../../ -set +e -VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') -set -e - -cd - > /dev/null - -if [ -n "${VENDOR_SHA256:-}" ]; then - setKV vendorSha256 ${VENDOR_SHA256} +NIXPKGS_PATH="$(git rev-parse --show-toplevel)" +FLUXCD_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" + +OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; fluxcd.version or (builtins.parseDrvName fluxcd.name).version" | tr -d '"')" +LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/fluxcd/flux2/releases/latest | jq -r '.tag_name') +LATEST_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//') + +if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then + SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archive/refs/tags/${LATEST_TAG}.tar.gz) + SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${LATEST_TAG}/manifests.tar.gz) + + setKV () { + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${FLUXCD_PATH}/default.nix" + } + + setKV version ${LATEST_VERSION} + setKV sha256 ${SHA256} + setKV manifestsSha256 ${SPEC_SHA256} + setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The same as lib.fakeSha256 + + set +e + VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') + set -e + + if [ -n "${VENDOR_SHA256:-}" ]; then + setKV vendorSha256 ${VENDOR_SHA256} + else + echo "Update failed. 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 + git switch -c "package-fluxcd-${LATEST_VERSION}" + git add "$FLUXCD_PATH"/default.nix + git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}" + fi else - echo "Update failed. VENDOR_SHA256 is empty." - exit 1 + echo "fluxcd is already up-to-date at $OLD_VERSION" fi - diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index adb46540cba7d..202b9fd5e68d6 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -17,6 +17,8 @@ , openssl , glibc , nixosTests +, sparkSupport ? true +, spark }: with lib; @@ -52,6 +54,9 @@ let --prefix PATH : "${makeBinPath [ bash coreutils which]}"\ --prefix JAVA_LIBRARY_PATH : "${makeLibraryPath buildInputs}" done + '' + optionalString sparkSupport '' + # Add the spark shuffle service jar to YARN + cp ${spark.src}/yarn/spark-${spark.version}-yarn-shuffle.jar $out/lib/${untarDir}/share/hadoop/yarn/ '' + libPatches; passthru = { inherit tests; }; diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index f7c05843bcfc3..1d3c9f43e906b 100644 --- a/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-docs"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - sha256 = "sha256-TXwEVyRYRiVqCDL7IR+DIu1iKqaq81W5xkvz+laxVek="; + sha256 = "sha256-OpS/CYBb2Ll6ktvEhqkw/bWMSrFa4duidK3Glu8EnPw="; }; - vendorSha256 = "sha256-XTV0gyUWe6G5gxucsXOaDOUQoKMCfhrWzlKwUOaA6y4="; + vendorSha256 = "sha256-FpmeOQ8nV+sEVu2+nY9o9aFbCpwSShQUFOmyzwEQ9Pw="; subPackages = [ "cmd/helm-docs" ]; ldflags = [ diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 408f1bd3ed8a6..b6f9028d52abd 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,19 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { - pname = "helm"; - version = "3.8.1"; - gitCommit = "5cb9af4b1b271d11d7a97a71df3ac337dd94ad37"; + pname = "kubernetes-helm"; + version = "3.8.2"; + gitCommit = "6e3701edea09e5d55a8ca2aae03a68917630e91b"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-AjNrn46l9gVC7MtGF59QWv+l6qYn+jzopsZtM/2faXY="; + sha256 = "sha256-lFAzp7ZxyMZAEO1cNFkEPLgTLEGa6azv36xiTIz4FZY="; }; - vendorSha256 = "sha256-ffbp7J8XDxo/s79pjoiDVbft0pr/lJpuJuKiMpQwkT0="; - - doCheck = false; + vendorSha256 = "sha256-FLEydmR+UEZ80VYLxBU1ZdwpdLgTjUpqiMItnt9UuLY="; subPackages = [ "cmd/helm" ]; ldflags = [ @@ -23,6 +21,19 @@ buildGoModule rec { "-X helm.sh/helm/v3/internal/version.gitCommit=${gitCommit}" ]; + preCheck = '' + # skipping version tests because they require dot git directory + substituteInPlace cmd/helm/version_test.go \ + --replace "TestVersion" "SkipVersion" + '' + lib.optionalString stdenv.isLinux '' + # skipping plugin tests on linux + substituteInPlace cmd/helm/plugin_test.go \ + --replace "TestPluginDynamicCompletion" "SkipPluginDynamicCompletion" \ + --replace "TestLoadPlugins" "SkipLoadPlugins" + substituteInPlace cmd/helm/helm_test.go \ + --replace "TestPluginExitCode" "SkipPluginExitCode" + ''; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' $out/bin/helm completion bash > helm.bash @@ -33,7 +44,8 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/kubernetes/helm"; description = "A package manager for kubernetes"; + mainProgram = "helm"; license = licenses.asl20; - maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman Chili-Man ]; + maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman Chili-Man techknowlogick ]; }; } diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index da3b85d899334..14cb38d60ce2c 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmfile"; - version = "0.143.5"; + version = "0.144.0"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-48DbN3O5HVlNpHct6uKw9CjeaDlAZqY+/Tqd4a9mmUw="; + sha256 = "sha256-mfRPrgnOXqfmbpvaIxJNkgkdTEJKcFycrgFmQ7YDvTU="; }; vendorSha256 = "sha256-ddf3m0DGsjubzp/aERvhfJ51UKKSNMC1Xu7ybyif8HA="; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 6c88926ca2429..1f2e98593529f 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-7YtszdwauTz9LfZ77d13fDU6vQm5hiJrIOiqpqIginQ="; + sha256 = "sha256-XvV6OlGHW/eB0EUrmyTlFVbDjbxUpVo6WvrEnh6Q68I="; }; - vendorSha256 = "sha256-AOcWkcw+2DcgBxvxRO/sdb339a7hmI7Oy5I4kW4oE+k="; + vendorSha256 = "sha256-Ex86yLMTqqiSkJns/eeodmGswAzPVQAQOf8Wqi7DRaE="; nativeBuildInputs = [ installShellFiles ]; @@ -26,6 +26,11 @@ buildGoModule rec { subPackages = [ "istioctl/cmd/istioctl" ]; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/istioctl version --remote=false | grep ${version} > /dev/null + ''; + postInstall = '' $out/bin/istioctl collateral --man --bash --zsh installManPage *.1 diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index fa355b65131a8..3cceae804cff6 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -46,17 +46,15 @@ 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.23.4+k3s1"; # k3s git tag - k3sCommit = "43b1cb48200d8f6af85c16ed944d68fcc96b6506"; # k3s git commit at the above version - k3sRepoSha256 = "1sn7rd5hqfqvwj036blk0skmq6r8igbmiqk1dnpaqnkkddpzdgmc"; - k3sVendorSha256 = "sha256-1/kQvNqFUWwch1JH+twWzBdjNYseoZyVObB1+s9WPM4="; - - k3sServerVendorSha256 = "sha256-2KIFff43jfqWdxX61aWofrjmc5mMkr5aEJRFdGpLyU8="; + k3sVersion = "1.23.6+k3s1"; # k3s git tag + k3sCommit = "418c3fa858b69b12b9cefbcff0526f666a6236b9"; # k3s git commit at the above version + k3sRepoSha256 = "0fmw491dn5mpi058mr7sij51i5m4qg2grx30cnl3h2v4s0sdkx2i"; + k3sVendorSha256 = "sha256-iHg5ySMaiSWXs98YGmxPwdZr4zdBIFma12dNEuf30Hs="; # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. - traefikChartVersion = "10.14.1"; - traefikChartSha256 = "09a6cialx7nrh7nwi1gkkh8zcsasxcgb52dyx0r8bjq9ng29simj"; + traefikChartVersion = "10.19.3"; + traefikChartSha256 = "04zg5li957svgscdmkzmzjkwljaljyav68rzxmhakkwgav6q9058"; # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 k3sRootVersion = "0.11.0"; @@ -68,8 +66,8 @@ let # taken from go.mod, the 'github.com/containerd/containerd' line # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` - containerdVersion = "1.5.9-k3s1"; - containerdSha256 = "09wfy20z3c9fnla353pibpsb10xzl0f4xwp8qdjh3fwa1q2626gg"; + containerdVersion = "1.5.11-k3s2"; + containerdSha256 = "16132snvrg8r0vwm6c0lz0q6fx686s2ix53nm3aka9a83xs75vf2"; # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag criCtlVersion = "1.22.0-k3s1"; @@ -175,7 +173,7 @@ let version = k3sVersion; src = k3sRepo; - vendorSha256 = k3sServerVendorSha256; + vendorSha256 = k3sVendorSha256; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp ]; @@ -223,14 +221,28 @@ buildGoModule rec { version = k3sVersion; src = k3sRepo; - proxyVendor = true; vendorSha256 = k3sVendorSha256; patches = [ ./patches/0001-scrips-download-strip-downloading-just-package-CRD.patch - ./patches/0002-Don-t-build-a-static-binary-in-package-cli.patch ]; + postPatch = '' + # Nix prefers dynamically linked binaries over static binary. + + substituteInPlace scripts/package-cli \ + --replace '"$LDFLAGS $STATIC" -o' \ + '"$LDFLAGS" -o' \ + --replace "STATIC=\"-extldflags \'-static\'\"" \ + "" + + # Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate': + + substituteInPlace scripts/package-cli \ + --replace '"''${GO}" generate' \ + 'GOFLAGS="" "''${GO}" generate' + ''; + # Important utilities used by the kubelet, see # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 # Note the list in that issue is stale and some aren't relevant for k3s. diff --git a/pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patch b/pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patch deleted file mode 100644 index 886b6ec7409be..0000000000000 --- a/pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 49c000c7c5dd7a502a2be4c638d2c32b65673c00 Mon Sep 17 00:00:00 2001 -From: Euan Kemp <euank@euank.com> -Date: Sun, 6 Feb 2022 23:13:00 -0800 -Subject: [PATCH] Don't build a static binary in package-cli - -since nixpkgs prefers dynamically linked binaries. - -Also remove "trimpath" for the 'go generate' step because the codegen -they use doesn't work with trimpath set. ---- - scripts/package-cli | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/scripts/package-cli b/scripts/package-cli -index 28927327b7..95dbb469f1 100755 ---- a/scripts/package-cli -+++ b/scripts/package-cli -@@ -48,14 +48,13 @@ fi - - CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX} - --"${GO}" generate -+GOFLAGS="" "${GO}" generate - LDFLAGS=" - -X github.com/rancher/k3s/pkg/version.Version=$VERSION - -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8} - -w -s - " --STATIC="-extldflags '-static'" --CGO_ENABLED=0 "${GO}" build -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go -+CGO_ENABLED=0 "${GO}" build -ldflags "$LDFLAGS" -o ${CMD_NAME} ./cmd/k3s/main.go - - stat ${CMD_NAME} - --- -2.34.1 - diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index 8f199bf9cc0cd..6c9755334cde0 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -81,19 +81,6 @@ setKV containerdSha256 ${CONTAINERD_SHA256} setKV criCtlVersion ${CRI_CTL_VERSION} -setKV k3sServerVendorSha256 "0000000000000000000000000000000000000000000000000000" - -set +e -K3S_SERVER_VENDOR_SHA256=$(nix-build ${NIXPKGS_ROOT} --no-out-link -A k3s 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') -set -e - -if [ -n "${K3S_SERVER_VENDOR_SHA256:-}" ]; then - setKV k3sServerVendorSha256 ${K3S_SERVER_VENDOR_SHA256} -else - echo "Update failed. K3S_SERVER_VENDOR_SHA256 is empty." - exit 1 -fi - set +e K3S_VENDOR_SHA256=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })") set -e diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index 93ccd873f777f..69142045fee8f 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-xpSnirdEZ/Cua/wicu62HzeDm0E8Xo/Jt2eMfUS7mDo="; + sha256 = "sha256-Q67dictDE+HWw99lFAiidBvIL30mMAkjYb2CDLDcalw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index c01e1c8c00417..2b80dfc6815a3 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,19 +1,24 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose }: -buildGoPackage rec { +buildGoModule rec { pname = "kompose"; - version = "1.21.0"; - - goPackagePath = "github.com/kubernetes/kompose"; + version = "1.26.1"; src = fetchFromGitHub { - rev = "v${version}"; owner = "kubernetes"; repo = "kompose"; - sha256 = "15a1alf6ywwfc4z5kdcnv64fp3cfy3qrcw62ny6xyn1kh1w24vkh"; + rev = "v${version}"; + sha256 = "sha256-NfzqGG5ZwPpmjhvcvXN1AA+kfZG/oujbAEtXkm1mzeU="; }; + vendorSha256 = "sha256-OR5U2PnebO0a+lwU09Dveh0Yxk91cmSRorTxQIO5lHc="; + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-s" "-w" ]; + + checkFlags = [ "-short" ]; + postInstall = '' for shell in bash zsh; do $out/bin/kompose completion $shell > kompose.$shell @@ -21,6 +26,11 @@ buildGoPackage rec { done ''; + passthru.tests.version = testers.testVersion { + package = kompose; + command = "kompose version"; + }; + meta = with lib; { description = "A tool to help users who are familiar with docker-compose move to Kubernetes"; homepage = "https://kompose.io"; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index da8e14d1f3074..69eafdddf93f9 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -65,8 +65,8 @@ rec { }; kops_1_23 = mkKops rec { - version = "1.23.0"; - sha256 = "sha256-tiVNUaW0an6C8M9bxEX5pvB/W5IjZ/S24RdPikzm3bc="; + version = "1.23.1"; + sha256 = "sha256-SiseHs5cMj8DR1f6z9PTbtF/h3Bn9riiLWW5KMYwVUg="; rev = "v${version}"; }; } diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index 1c1b8dc7b7157..ba7e5bb0a633f 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.1) + activesupport (7.0.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -9,11 +9,11 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) colorize (0.8.1) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) ejson (1.3.1) - faraday (1.9.3) + faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -58,12 +58,12 @@ GEM http-form_data (2.3.0) http-parser (1.2.3) ffi-compiler (>= 1.0, < 2.0) - i18n (1.8.11) + i18n (1.10.0) concurrent-ruby (~> 1.0) - jsonpath (1.1.0) + jsonpath (1.1.1) multi_json jwt (2.3.0) - krane (2.4.0) + krane (2.4.6) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -74,7 +74,7 @@ GEM oj (~> 3.0) statsd-instrument (>= 2.8, < 4) thor (>= 1.0, < 2.0) - kubeclient (4.9.2) + kubeclient (4.9.3) http (>= 3.0, < 5.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -89,7 +89,7 @@ GEM netrc (0.11.0) oj (3.13.11) os (1.1.4) - public_suffix (4.0.6) + public_suffix (4.0.7) rake (13.0.6) recursive-open-struct (1.1.3) rest-client (2.1.0) @@ -98,9 +98,9 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) ruby2_keywords (0.0.5) - signet (0.16.0) + signet (0.16.1) addressable (~> 2.8) - faraday (>= 0.17.3, < 2.0) + faraday (>= 0.17.5, < 3.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) statsd-instrument (3.1.2) @@ -109,7 +109,7 @@ GEM concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.1) PLATFORMS ruby @@ -118,4 +118,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.2.24 + 2.3.9 diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index e14b6902fe26e..058910072a783 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02lys9pnb99hsczs551iqzjn008i8k7c728xxba7acfi9rdw9pa6"; + sha256 = "1jpydd414j0fig3r0f6ci67mchclg6cq2qgqbq9zplrbg40pzfi8"; type = "gem"; }; - version = "7.0.1"; + version = "7.0.2.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; domain_name = { dependencies = ["unf"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6"; + sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.0"; }; faraday-em_http = { groups = ["default"]; @@ -265,10 +265,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; type = "gem"; }; - version = "1.8.11"; + version = "1.10.0"; }; jsonpath = { dependencies = ["multi_json"]; @@ -276,10 +276,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12hjsr0plnx6v0bh1rhhimfi7z3rqm19xb47ybdkc1h9yhynnmdq"; + sha256 = "0slr38w21gwizkq4nk6c7l7lcqc2c733zfn5fq1pmbwy5bwiggad"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; jwt = { groups = ["default"]; @@ -297,10 +297,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xnf0cw5i1i8l5nm1c9z02h184ad6hvy7fydr4bdzckjkyinamv9"; + sha256 = "16rf7qzwshlbhrc9fdgq44fcf2qbgjwik1kwkv1gncy12lvwfdmz"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.6"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -308,10 +308,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kld1w4706dfd6jx3snsi4h2pvqfazz1fni5al2ln60s3b8sybq4"; + sha256 = "0ih04d0vgj91rl66iaqh8jmpskwz3g6mgajid0wlzi5skxqqxlym"; type = "gem"; }; - version = "4.9.2"; + version = "4.9.3"; }; memoist = { groups = ["default"]; @@ -409,10 +409,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; rake = { groups = ["default"]; @@ -461,10 +461,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cgmadrpgkpcklvvm2cga9mnrfqwqlydwpask1wx617h5ha6954k"; + sha256 = "1jwyggz80xb3yi2hycmmw214c4072g8i56y0b0gsmpkiyk5d0vh1"; type = "gem"; }; - version = "0.16.0"; + version = "0.16.1"; }; statsd-instrument = { groups = ["default"]; @@ -513,9 +513,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd"; + sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz"; type = "gem"; }; - version = "0.0.8"; + version = "0.0.8.1"; }; } diff --git a/pkgs/applications/networking/cluster/krelay/default.nix b/pkgs/applications/networking/cluster/krelay/default.nix index f0a9912ab914e..16e9203bf9c3d 100644 --- a/pkgs/applications/networking/cluster/krelay/default.nix +++ b/pkgs/applications/networking/cluster/krelay/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { changelog = "https://github.com/knight42/krelay/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ivankovnatsky ]; + mainProgram = "kubectl-relay"; }; } diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index ebcb3bda73815..355ef154555cf 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -1,16 +1,28 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.22.2-k3s2" }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, k3sVersion ? null +}: +let + hasVPrefix = ver: (builtins.elemAt (lib.stringToCharacters ver) 0) == "v"; + k3sVersionSet = + if k3sVersion != null then + if hasVPrefix k3sVersion then throw "k3sVersion should not have a v prefix" else true + else + false; +in buildGoModule rec { pname = "kube3d"; - version = "5.3.0"; + version = "5.4.1"; src = fetchFromGitHub { - owner = "rancher"; + owner = "k3d-io"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-ZuUjk1wb7iRZX+OpjLJHp1T0WYNjCHU6DpYF4V/heVc="; + sha256 = "sha256-DVQrD4JMei9yRFzuiVb6AcydEupNSlpgYLfGWWRiaao="; }; - vendorSha256 = null; nativeBuildInputs = [ installShellFiles ]; @@ -18,10 +30,14 @@ buildGoModule rec { excludedPackages = [ "tools" "docgen" ]; ldflags = - let t = "github.com/rancher/k3d/v5/version"; in - [ "-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.K3sVersion=v${k3sVersion}" ]; + let t = "github.com/k3d-io/k3d/v5/version"; in + [ "-s" "-w" "-X ${t}.Version=v${version}" ] ++ lib.optionals k3sVersionSet [ "-X ${t}.K3sVersion=v${k3sVersion}" ]; - doCheck = false; + preCheck = '' + # skip test that uses networking + substituteInPlace version/version_test.go \ + --replace "TestGetK3sVersion" "SkipGetK3sVersion" + ''; postInstall = '' installShellCompletion --cmd k3d \ @@ -34,13 +50,13 @@ buildGoModule rec { installCheckPhase = '' runHook preInstallCheck $out/bin/k3d --help - $out/bin/k3d --version | grep -e "k3d version v${version}" -e "k3s version v${k3sVersion}" + $out/bin/k3d --version | grep -e "k3d version v${version}" ${lib.optionalString k3sVersionSet "-e \"k3s version v${k3sVersion}\""} runHook postInstallCheck ''; meta = with lib; { - homepage = "https://github.com/rancher/k3d"; - changelog = "https://github.com/rancher/k3d/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/k3d-io/k3d/"; + changelog = "https://github.com/k3d-io/k3d/blob/v${version}/CHANGELOG.md"; description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d"; longDescription = '' k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s @@ -51,5 +67,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ricochet ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "k3d"; }; } diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 0169442e1bfe9..4bf05a7e1e120 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "kubecfg"; - version = "0.22.0"; + version = "0.26.0"; src = fetchFromGitHub { - owner = "bitnami"; + owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-8U/A4F4DboS46ftpuk5fQGT2Y0V+X0y0L3/o4x8qpnY="; + sha256 = "sha256-ekojX7gl8wC7GlHG3Y+dwry7jxjIm5dbS7cNN1xu4kY="; }; - goPackagePath = "github.com/bitnami/kubecfg"; + vendorSha256 = "sha256-dPdF3qTrYRbKUepgo6WVIVyGnaWxhQ0371fzXlBD8rE="; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; @@ -25,7 +25,7 @@ buildGoPackage rec { meta = { description = "A tool for managing Kubernetes resources as code"; - homepage = "https://github.com/bitnami/kubecfg"; + homepage = "https://github.com/kubecfg/kubecfg"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ benley ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index b1c15458543d3..ae8db695b9fe0 100644 --- a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix +++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { installShellCompletion --cmd kubectl \ --bash <($out/bin/kubectl completion bash) \ + --fish <($out/bin/kubectl completion fish) \ --zsh <($out/bin/kubectl completion zsh) runHook postInstall ''; diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index 64f13ad6b60f9..13a16c6c50c2f 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { homepage = "https://github.com/kudobuilder/kuttl"; license = licenses.asl20; maintainers = with maintainers; [ diegolelis ]; + mainProgram = "kubectl-kuttl"; }; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index d4a9ba4af7d30..3ee00d4121a90 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -7,6 +7,7 @@ , which , libvirt , vmnet +, makeWrapper }: buildGoModule rec { @@ -24,7 +25,7 @@ buildGoModule rec { sha256 = "sha256-WIk4ibq7jcqao0Qiz3mz9yfHdxTUlvtPuEh4gApSDBg="; }; - nativeBuildInputs = [ installShellFiles pkg-config which ]; + nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; @@ -35,9 +36,8 @@ buildGoModule rec { installPhase = '' install out/minikube -Dt $out/bin + wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false export HOME=$PWD - export MINIKUBE_WANTUPDATENOTIFICATION=false - export MINIKUBE_WANTKUBECTLDOWNLOADMSG=false for shell in bash zsh fish; do $out/bin/minikube completion $shell > minikube.$shell diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 936e768234894..acc3370ce83b7 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gkfy/tKzh6EO+nyjuiU3InSErKvGcJp/X7oqYk0Msr0="; + sha256 = "sha256-FuWfHd4LfFHX5oRopDIDTi90cARi8cYjJBK0BgeCD/U="; }; - vendorSha256 = "sha256-hjhZYNpqt9yFNrDVpFlguESUAAqU+AhpUQTCvyMadPk="; + vendorSha256 = "sha256-mHitGjOfSRlqORWFtB16buSSJrCf7Li9+oHX4rcO4ek="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nomad-pack/default.nix b/pkgs/applications/networking/cluster/nomad-pack/default.nix index 93d1d3badad20..394e75f911255 100644 --- a/pkgs/applications/networking/cluster/nomad-pack/default.nix +++ b/pkgs/applications/networking/cluster/nomad-pack/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "nomad-pack"; - version = "2022-02-11"; - rev = "568ac5e42bc41172a1fa3c8b18af2f42b9e341ff"; + version = "2022-04-12"; + rev = "50ad747d2a5a2b90af1b3564483510cb04fefbea"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-0hvnGdUT72sWvMER67ZBxcC+VTbuFMIos2NudOjeTB8="; + sha256 = "sha256-VG6Dmx5WD2AzKReMbmrpzXCNhrJqaZY3aQV9P+4ET68="; }; - vendorSha256 = "sha256-wmoXZIogKj4i9+AsEjY7QaT2Tn4LQyGQcEFHrRO0W9s="; + vendorSha256 = "sha256-7ovR2F9N94iFK/B5OXRcqfykOYHST3354+Ge2L8yzq0="; # skip running go tests as they require network access doCheck = false; diff --git a/pkgs/applications/networking/cluster/nomad/1.1.nix b/pkgs/applications/networking/cluster/nomad/1.1.nix index 750e49fc1e186..bbc1dc9949bba 100644 --- a/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix { inherit buildGoModule nvidia_x11 nvidiaGpuSupport; - version = "1.1.8"; - sha256 = "05k1r157h3jaqzzsrkgc96zcny3mi8dvixc2v1w0lwcxixqk0y2l"; - vendorSha256 = "03hjin9nybf7fpbj5r82qh19qh3cc8m0b236mk0ajhsyjqrk8pir"; + version = "1.1.12"; + sha256 = "19y52sn4qz0vx9s188nf7rkr7y2cbq6h33l98sr4w85kmainn86s"; + vendorSha256 = "0p582y2q6zpyn7vmv1p8p8r2gbh786pqc6lpipgr7rpxbnxf5v4b"; } diff --git a/pkgs/applications/networking/cluster/nomad/1.2.nix b/pkgs/applications/networking/cluster/nomad/1.2.nix index 81a31de7e506a..a45d5b2e98d94 100644 --- a/pkgs/applications/networking/cluster/nomad/1.2.nix +++ b/pkgs/applications/networking/cluster/nomad/1.2.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix { inherit buildGoModule nvidia_x11 nvidiaGpuSupport; - version = "1.2.6"; - sha256 = "1ik8v1jznky9y4m85bzxgyba256zqmm5fs6d5xsvp5rzcylcdwgd"; - vendorSha256 = "1mbvpssf7haaxzx6ka9qzixm49jck8i89w8ymkaddgmxhlbxjv05"; + version = "1.2.7"; + sha256 = "13whyjl0shr00mn46f361ybz90zwkiyab9ygcs0hrs75lgvkmfm9"; + vendorSha256 = "177gv0h8bhxd5j78sf4is86zzq8xl9schg1hbyh0hmwg4whhqm8a"; } diff --git a/pkgs/applications/networking/cluster/nomad/1.3.nix b/pkgs/applications/networking/cluster/nomad/1.3.nix new file mode 100644 index 0000000000000..932bbc7270f6c --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/1.3.nix @@ -0,0 +1,12 @@ +{ callPackage +, buildGoModule +, nvidia_x11 +, nvidiaGpuSupport +}: + +callPackage ./generic.nix { + inherit buildGoModule nvidia_x11 nvidiaGpuSupport; + version = "1.3.0"; + sha256 = "098sg7jl257r6zfi2fsp9dwm0rrzi8m2k85bb097q14n3p4s3pna"; + vendorSha256 = "037bdgnyv8gkm2hz7h727ss46adnkywg28j6i1canmdacpi3qv5c"; +} diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/applications/networking/cluster/ocm/default.nix index 1bacd8510dc40..73a5d964f34bb 100644 --- a/pkgs/applications/networking/cluster/ocm/default.nix +++ b/pkgs/applications/networking/cluster/ocm/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, testVersion, ocm }: +{ lib, buildGoModule, fetchFromGitHub, testers, ocm }: buildGoModule rec { pname = "ocm"; @@ -18,7 +18,7 @@ buildGoModule rec { ln -s $GOPATH/bin/ocm ocm ''; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = ocm; command = "ocm version"; }; diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/applications/networking/cluster/odo/default.nix index be85981f7bf4a..fb1888d62358f 100644 --- a/pkgs/applications/networking/cluster/odo/default.nix +++ b/pkgs/applications/networking/cluster/odo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, testVersion, odo }: +{ lib, buildGoModule, fetchFromGitHub, testers, odo }: buildGoModule rec { pname = "odo"; @@ -22,7 +22,7 @@ buildGoModule rec { cp -a odo $out/bin ''; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = odo; command = "odo version"; version = "v${version}"; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index aade6c549f31c..89bbd0cb7d6df 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -4,7 +4,7 @@ , libkrb5 , git , installShellFiles -, testVersion +, testers , openshift }: @@ -52,7 +52,7 @@ buildGoModule rec { installShellCompletion --zsh contrib/completions/zsh/* ''; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = openshift; command = "oc version"; version = "v${version}"; @@ -60,9 +60,10 @@ buildGoModule rec { meta = with lib; { description = "Build, deploy, and manage your applications with Docker and Kubernetes"; - license = licenses.asl20; homepage = "http://www.openshift.org"; + license = licenses.asl20; maintainers = with maintainers; [ offline bachp moretea stehessel ]; + mainProgram = "oc"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 65a4a19384305..570481f49b27e 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -20,5 +20,6 @@ buildGoPackage rec { homepage = "https://github.com/pachyderm/pachyderm"; license = licenses.asl20; maintainers = with maintainers; [offline]; + mainProgram = "pachctl"; }; } diff --git a/pkgs/applications/networking/cluster/pgo-client/default.nix b/pkgs/applications/networking/cluster/pgo-client/default.nix index 33dbb47d11c2d..fc7110a89ae81 100644 --- a/pkgs/applications/networking/cluster/pgo-client/default.nix +++ b/pkgs/applications/networking/cluster/pgo-client/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { changelog = "https://github.com/CrunchyData/postgres-operator/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ maintainers.bryanasdev000 ]; + mainProgram = "pgo"; }; } diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 25fa2c4adc551..08e55ec6693fd 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "popeye"; - version = "0.9.8"; + version = "0.10.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-uGy2BbZS4SGT0w9ICYPUIfFawSvIVMsEezPfPAPQU/Q="; + sha256 = "sha256-iCsEYbEENDOg69wdWu9QQ8tTGxvaY2i/Hboc6XSYyEM="; }; ldflags = [ @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/derailed/popeye/cmd.commit=${version}" ]; - vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8="; + vendorSha256 = "sha256-aLTzhBMwQHa6twzBC3FyMsZa1vQsBDdg4MpzJWZz3n4="; doCheck = true; diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix new file mode 100644 index 0000000000000..4d62dad4af6e5 --- /dev/null +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -0,0 +1,44 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, roxctl }: + +buildGoModule rec { + pname = "roxctl"; + version = "3.69.1"; + + src = fetchFromGitHub { + owner = "stackrox"; + repo = "stackrox"; + rev = version; + sha256 = "sha256-fB43C+gMtUOg/Ah1fOTnOWOUmS0TjXkNCzw/TKfMzj4="; + }; + + vendorSha256 = "sha256-M+ZueycJEaDVzC2bFwQc5EulCrdz6lvzyD8YCoGyW1g="; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "roxctl" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/stackrox/rox/pkg/version/internal.MainVersion=${version}" + ]; + + postInstall = '' + installShellCompletion --cmd roxctl \ + --bash <($out/bin/roxctl completion bash) \ + --fish <($out/bin/roxctl completion fish) \ + --zsh <($out/bin/roxctl completion zsh) + ''; + + passthru.tests.version = testVersion { + package = roxctl; + command = "roxctl version"; + }; + + meta = with lib; { + description = "Command-line client of the StackRox Kubernetes Security Platform"; + license = licenses.asl20; + homepage = "https://www.stackrox.io"; + maintainers = with maintainers; [ stehessel ]; + }; +} diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 057be75aeb343..a3ca42dff3424 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -6,6 +6,7 @@ , python3Packages , extraPythonPackages ? [ ] , coreutils +, hadoopSupport ? true , hadoop , RSupport ? true , R @@ -17,12 +18,13 @@ let spark = { pname, version, sha256, extraMeta ? {} }: stdenv.mkDerivation rec { inherit pname version; + jdk = if hadoopSupport then hadoop.jdk else jdk8; src = fetchzip { url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; sha256 = sha256; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk8 python3Packages.python ] + buildInputs = [ jdk python3Packages.python ] ++ extraPythonPackages ++ optional RSupport R; @@ -34,9 +36,11 @@ let cp $out/lib/${untarDir}/conf/log4j.properties{.template,} cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF - export JAVA_HOME="${jdk8}" + export JAVA_HOME="${jdk}" export SPARK_HOME="$out/lib/${untarDir}" + '' + optionalString hadoopSupport '' export SPARK_DIST_CLASSPATH=$(${hadoop}/bin/hadoop classpath) + '' + '' export PYSPARK_PYTHON="${python3Packages.python}/bin/${python3Packages.python.executable}" export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH" ${optionalString RSupport '' diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index f7401d36b0ea6..1fd71cb8e9914 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }: let - ver = "1.2.54.0"; + ver = "1.2.312.0"; source = if stdenv.isDarwin then { url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip"; - sha256 = "kgxoQrtu2tsV5t/3oA+Z2juY24hPOznPGjlQMsqOIZg="; + sha256 = "50aac34a4dedddf20c20be24989ee5d33b46a72187791715fb9b395b54db8ef9"; } else { url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb"; - sha256 = "uug1cT4yRxNQcf+zWz0mi72G4EGa3eZHVuG36INSqrM="; + sha256 = "2e51ce5bf8f23a1e590fff866bbdadcf82aa03c5054c671d9115482a1b263cc7"; }; archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin"; in @@ -17,7 +17,12 @@ stdenv.mkDerivation rec { src = fetchurl source; - nativeBuildInputs = [ autoPatchelfHook ] ++ (if stdenv.isDarwin then [ unzip ] else [ dpkg ]); + nativeBuildInputs = lib.optionals stdenv.isLinux [ + autoPatchelfHook + dpkg + ] ++ lib.optionals stdenv.isDarwin [ + unzip + ]; unpackPhase = if stdenv.isDarwin then "unzip $src" else "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index 30ca2ee1cdee5..9dc32d67dff62 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,36 +2,42 @@ buildGoModule rec { pname = "starboard"; - version = "0.14.1"; + version = "0.15.4"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sB7C0IKadgpQ2h6HuH4D6ku/GXnFfFS+fGCW/RBSc10="; + sha256 = "sha256-GhcHvKqYktBAPB443ZjJ3LYRJZorO7IH1OEnEQKUO0g="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; postFetch = '' cd "$out" - commit="$(git rev-parse HEAD)" - source_date_epoch=$(git log --date=format:'%Y-%m-%dT%H:%M:%SZ' -1 --pretty=%ad) - substituteInPlace "$out/cmd/starboard/main.go" \ - --replace 'commit = "none"' "commit = \"$commit\"" \ - --replace 'date = "unknown"' "date = \"$source_date_epoch\"" + git rev-parse HEAD > $out/COMMIT + # 0000-00-00T00:00:00Z + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-R7tF724y5WNIByE+9nRoNSZDZzfLtPfK/9tSBkARaN0="; + vendorSha256 = "sha256-ozbejIFR0mDgCgca+2yaPRiMMHLOEsC9u+kQUe69spc="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/starboard" ]; ldflags = [ - "-s" "-w" "-X main.version=v${version}" + "-s" + "-w" + "-X main.version=v${version}" ]; + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X main.gitCommit=$(cat COMMIT)" + ldflags+=" -X main.buildDate=$(cat SOURCE_DATE_EPOCH)" + ''; + preCheck = '' # Remove test that requires networking rm pkg/plugin/aqua/client/client_integration_test.go diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 7e12f18a78c51..8476fc810ba43 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: let # look for GO_LDFLAGS getting set in the Makefile - version = "1.0.1"; - sha256 = "sha256-IqFnVOnmYqf2K3TX+gwFPmBBksYz+56Oy/t8xWhi7fc="; - vendorSha256 = "sha256-GKdAMmU4HiOFYR0SFeFvwFGTXc2lmzO/fAlR1vCDfX4="; - pkgsVersion = "v1.0.0-6-g7c293d5"; - extrasVersion = "v1.0.0"; + version = "1.0.5"; + sha256 = "sha256-xgzIbhgV1AAUa0tooYtzUMqK4Co3PvWQ0YbZuf0JgFE="; + vendorSha256 = "sha256-Gp30qCGV+EaJ1lvfleZHRWVL6rdSj0mvpumWsqr9IT0="; + pkgsVersion = "v1.0.0-17-g7567bf4"; + extrasVersion = "v1.0.0-3-g6327c36"; in buildGoModule rec { pname = "talosctl"; @@ -13,7 +13,7 @@ buildGoModule rec { # nixpkgs-update: no auto update src = fetchFromGitHub { - owner = "talos-systems"; + owner = "siderolabs"; repo = "talos"; rev = "v${version}"; inherit sha256; @@ -26,14 +26,16 @@ buildGoModule rec { mgmtHelpersPkg = "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers"; #MGMT_HELPERS_PKG in [ - "-X ${versionPkg}.Name=Talos" + "-X ${versionPkg}.Name=Client" "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do "-X ${versionPkg}.Tag=${src.rev}" "-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS "-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS - "-X ${imagesPkgs}.Username=talos-systems" # USERNAME + "-X ${imagesPkgs}.Username=siderolabs" # USERNAME "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS + "-s" + "-w" ]; subPackages = [ "cmd/talosctl" ]; @@ -51,7 +53,7 @@ buildGoModule rec { meta = with lib; { description = "A CLI for out-of-band management of Kubernetes nodes created by Talos"; - homepage = "https://github.com/talos-systems/talos"; + homepage = "https://www.talos.dev/"; license = licenses.mpl20; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 0d21e440031da..0c9776f9f7920 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -31,6 +31,7 @@ buildGoModule rec { homepage = "https://tanka.dev"; license = licenses.asl20; maintainers = with maintainers; [ mikefaille ]; + mainProgram = "tk"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 673a8c9a8f0a9..bf5dc60d88b5e 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -61,5 +61,6 @@ buildGoModule rec { ''; license = licenses.asl20; maintainers = with maintainers; [ jk mstrangfeld vdemeester ]; + mainProgram = "tkn"; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 01c7a0a919837..0be97ceb9b14f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -32,6 +32,7 @@ let CGO_ENABLED = 0; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ]; src = fetchFromGitHub { + name = "source-${rev}"; inherit owner repo rev sha256; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0df988b9f98a0..82e0d6ff85173 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -17,33 +17,42 @@ "vendorSha256": "1gpbc72q7mjyjxk75dyfi3j2fk6glgz0a15m2pq7clyc35kapnkc", "version": "2.8.0" }, + "age": { + "owner": "clementblaise", + "provider-source-address": "registry.terraform.io/clementblaise/age", + "repo": "terraform-provider-age", + "rev": "v0.1.1", + "sha256": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", + "vendorSha256": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=", + "version": "0.1.1" + }, "aiven": { "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v2.7.1", - "sha256": "sha256-tXg9VpP3kj32Q9ktU5FrcQStIRlDtMLXYzn0RvLQCRk=", - "vendorSha256": "sha256-1Eenm7dgQc4jCPm7BfuiXR2B3IJRBAYdGD7CSs49koo=", - "version": "2.7.1" + "rev": "v2.7.3", + "sha256": "sha256-ZAYnP2XEa2eJ0YZkqXQedRysmQI31RQ1osg/TqCqthE=", + "vendorSha256": "sha256-nBVLgOrtINrDziQLdqo5rFWfeY/cOdBW/XVDjtNaNhE=", + "version": "2.7.3" }, "akamai": { "owner": "akamai", "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v1.12.1", - "sha256": "sha256-UQD1RiXIRcP0CvVO8Tx/qkBhRD3LFj/KI3WP/yKeBek=", - "vendorSha256": "sha256-GZFLnKHk6YaMwFGgy79ric388EMIH6NUVw4JVLNxWZY=", - "version": "1.12.1" + "rev": "v2.0.0", + "sha256": "sha256-LcqP4gO1dhNaLkpaZIRxmC8B7DUTLC1fPZutohBqKSQ=", + "vendorSha256": "sha256-Vu5vyCEkZNf8TXryDalI5RKM/hjWeEkXbnYLhGwc2y8=", + "version": "2.0.0" }, "alicloud": { "deleteVendor": true, "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.162.0", - "sha256": "sha256-xqZv15Tst+7o9HhNu6/bW+a4z7FTkra+MfS8jKrfeNs=", - "vendorSha256": "sha256-RbOf/S0rkbhW0s+/YOqu+BQuE0V4aS2x36Xf+hgBkqY=", - "version": "1.162.0" + "rev": "v1.166.0", + "sha256": "sha256-+aRRsN3ALTmQOnDciHjoVFKV/W+/gjtdZeg3eyJ+0fY=", + "vendorSha256": "sha256-2w8o0Fc61ayyUyE4RVcmV4A0heuaIXnOZX040l2ws/Y=", + "version": "1.166.0" }, "ansible": { "owner": "nbering", @@ -76,10 +85,10 @@ "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/avi", "repo": "terraform-provider-avi", - "rev": "v21.1.3", - "sha256": "160l9864p73283hc27qaabd3lrh7lm8fyh6k9xlal5isfd9vrm5p", - "vendorSha256": "1hw1xp20nhs4p1q9l887m82456fg5977pm66165gdkczwrq2zr6v", - "version": "21.1.3" + "rev": "v21.1.4", + "sha256": "sha256-6H56TRA3I0CQ9/d8JdP5JNL0u3lpS8YhCvdSM5bxYp8=", + "vendorSha256": "sha256-b0MwGmgugZdmVk7ZVBSCivDQ4n+tLABymH/igo/S1Wc=", + "version": "21.1.4" }, "aviatrix": { "owner": "AviatrixSystems", @@ -94,28 +103,28 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.9.0", - "sha256": "sha256-VLw2bqL6VEKwqzXYkNJGJtIi8gg+3/oCwbBf9UtATE4=", - "vendorSha256": "sha256-7pwwQHgtHO3GfcEAOHALo01i1pt9WsriZZkJjFzjwRE=", - "version": "4.9.0" + "rev": "v4.13.0", + "sha256": "sha256-KEu+7hKMWsrpS1WYxj3El7M43Chy9HTBjePhWO6bXMo=", + "vendorSha256": "sha256-Ez6uCriNm1OJ2EyMAyjXihzJ/Pzf2p/oAvJ3HN6fDnA=", + "version": "4.13.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.20.0", - "sha256": "sha256-x1tSrejqsw3A/1n+PbG9wWx7q7qRciCjdwPAFT4lc2E=", + "rev": "v2.22.0", + "sha256": "sha256-x3SRTGCokEZGoG2l46PSelI8+FkHp5sbDdd14Iyei54=", "vendorSha256": null, - "version": "2.20.0" + "version": "2.22.0" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.1.0", - "sha256": "sha256-idrGxmfhnMKvxtKJtjLs321D008Mcv27cHyhAjwCZfA=", + "rev": "v3.5.0", + "sha256": "sha256-LF2Mqj/w1AtoYVGkZJsFpz81cfoUR80PURIsYoIYfsI=", "vendorSha256": null, - "version": "3.1.0" + "version": "3.5.0" }, "azurestack": { "owner": "hashicorp", @@ -139,19 +148,19 @@ "owner": "F5Networks", "provider-source-address": "registry.terraform.io/F5Networks/bigip", "repo": "terraform-provider-bigip", - "rev": "v1.13.0", - "sha256": "0l1fgbzv3zjsgmnkg96ac299plx9zi4j54cjxrl27csvf87wi4lv", + "rev": "v1.13.1", + "sha256": "sha256-nNcOHTFJrvvjKAZUsb1IVTp71/Xk5OuSzihPyi08anw=", "vendorSha256": null, - "version": "1.13.0" + "version": "1.13.1" }, "bitbucket": { "owner": "DrFaust92", "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", - "rev": "v2.13.1", - "sha256": "sha256-P/6scAuRMRrACHmEdWjn+W37ptVmVgtj+iTXQDrG+WM=", - "vendorSha256": "sha256-o1CZ4VuGCPALqSIz8KSm1zCwd3r9bR13CRvP7XpVBAM=", - "version": "2.13.1" + "rev": "v2.15.0", + "sha256": "sha256-m9LNW73CZHfOHX7qIn5Xm5JbMoV6ADGpxL9HNn8E+kA=", + "vendorSha256": "sha256-L8QYz1xgw8ZQjrU33uP18XxNUjImPYATZ02h46G4aXs=", + "version": "2.15.0" }, "brightbox": { "owner": "brightbox", @@ -162,6 +171,15 @@ "vendorSha256": "03761vl8xcirmas38q8xivx2r312c07fmg1y80lklmswbd8d0f71", "version": "2.2.0" }, + "buildkite": { + "owner": "buildkite", + "provider-source-address": "registry.terraform.io/buildkite/buildkite", + "repo": "terraform-provider-buildkite", + "rev": "v0.9.0", + "sha256": "sha256-k7caRT/9YA198I6K3Qv3UcyQiULpOvJ3Smc816sKHkQ=", + "vendorSha256": "sha256-smBADIbH/t2IUt2w0VQ2BOU6iAuxVRa1yu4C5P2VeIo=", + "version": "0.9.0" + }, "checkly": { "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", @@ -190,14 +208,23 @@ "vendorSha256": null, "version": "1.3.0" }, + "cloudamqp": { + "owner": "cloudamqp", + "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp", + "repo": "terraform-provider-cloudamqp", + "rev": "v1.16.0", + "sha256": "sha256-swE4Nr1cQzNQOq8q6o0nZhhYRtgAwTfx6Epm76Jjjqg=", + "vendorSha256": "sha256-oPeldPn30uS5Yl6IfXVPy2R7/wsAdZsEbbhVnVHQVwk=", + "version": "1.16.0" + }, "cloudflare": { "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.12.0", - "sha256": "sha256-y2qq0asEnhnOjthLBFxyQjf1N5KNlXXK0eXjT1/vCXg=", - "vendorSha256": "sha256-v6fUzYwrYt4rk5LT0LyNd8e9X79r3dwtd3s1QIV/w/s=", - "version": "3.12.0" + "rev": "v3.14.0", + "sha256": "sha256-WjtAqL4gzr7NdRLf7mr6OULee35kyyZpr5crR514Mak=", + "vendorSha256": "sha256-xqjhSu1bUSpQ1A2Ga2IS2fdyIXcnt/nbQNXhcxVi22Q=", + "version": "3.14.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -227,22 +254,23 @@ "version": "3.2.0" }, "constellix": { + "deleteVendor": true, "owner": "Constellix", "provider-source-address": "registry.terraform.io/Constellix/constellix", "repo": "terraform-provider-constellix", - "rev": "v0.4.3", - "sha256": "sha256-U5jQVa4dJTqH06psx/vNLSlL8muV15SgkyoM820PwjI=", - "vendorSha256": null, - "version": "0.4.3" + "rev": "v0.4.5", + "sha256": "sha256-ecwXWYrs7XJM1web+kia2ccpvTjxAVFPzav6lLal4e4=", + "vendorSha256": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=", + "version": "0.4.5" }, "consul": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/consul", "repo": "terraform-provider-consul", - "rev": "v2.15.0", - "sha256": "sha256-6NQL1ZlHZsxfoRV0zMOXApuCR+nj8CPWjpxj7BAJivY=", + "rev": "v2.15.1", + "sha256": "sha256-QX0f9yM408HfdGNIpmkAKFUz0RfH90V4WBt1Hnwzoy8=", "vendorSha256": null, - "version": "2.15.0" + "version": "2.15.1" }, "ct": { "owner": "poseidon", @@ -257,10 +285,10 @@ "owner": "DataDog", "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.10.0", - "sha256": "sha256-M9Pbvcg6HJY4S7Syu3XFsyjsCfeZxS17Ke2FpN+2HV4=", - "vendorSha256": "sha256-IJ8K2pRfvajdPkM3EjJe1B9PstJozETMert+O6Xpa88=", - "version": "3.10.0" + "rev": "v3.11.0", + "sha256": "sha256-9ugNj/D6VPaERckV0cCPlBjNtzS9tLJj+rc/8MhxCVU=", + "vendorSha256": "sha256-XxOOOljx+p4onI6SF8UY+gy7x7G2pduEqODT1UX4zfg=", + "version": "3.11.0" }, "dhall": { "owner": "awakesecurity", @@ -302,10 +330,10 @@ "owner": "dnsimple", "provider-source-address": "registry.terraform.io/dnsimple/dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.11.1", - "sha256": "0jzw1kjykbka59kx30xm3qicjb6fdmm5l4f2dr8g7nxdaqnxri0s", - "vendorSha256": "06wggchs5khzyg6fd9s0qj76awnw28s7l278awanqimqgqajijkj", - "version": "0.11.1" + "rev": "v0.11.3", + "sha256": "sha256-fUs54xIecPgeQucuQmlpF2iHGonx4OsqFbhkMnO7d0c=", + "vendorSha256": "sha256-csooFX64RmwVV+gIejQS3HJljsRAp+bM8x/OoiF7jxs=", + "version": "0.11.3" }, "docker": { "owner": "kreuzwerker", @@ -320,28 +348,28 @@ "owner": "dome9", "provider-source-address": "registry.terraform.io/dome9/dome9", "repo": "terraform-provider-dome9", - "rev": "v1.24.5", - "sha256": "0a4q5lf11xxfc9ndicdmjir77rdsiq5a8fwb6065879qaamvaxqi", + "rev": "v1.25.4", + "sha256": "sha256-s/wglGsk/Lm45PWmqNHiVjj6sfQzXue+GnjEALp5yDc=", "vendorSha256": null, - "version": "1.24.5" + "version": "1.25.4" }, "elasticsearch": { "owner": "phillbaker", "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", - "rev": "v2.0.0", - "sha256": "sha256-wl8pRAB97JObpZvi2rdyDZP5itKcOnm6Gsbku1+5oqQ=", - "vendorSha256": "sha256-OCXTZg0JkaxJDEgoF2Qs4BcMSiYkQpLmehWdCpEmTzk=", - "version": "2.0.0" + "rev": "v2.0.1", + "sha256": "sha256-WdGwLQe4jInZiMxJ7BasfwVBsei0V02D6vAA4dLLoAI=", + "vendorSha256": "sha256-gBC5+6bGJzfb0yLKlolfrZNuhpPacqX3p1HjIB4i3IU=", + "version": "2.0.1" }, "exoscale": { "owner": "exoscale", "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.34.0", - "sha256": "sha256-GDN3cN+zNiTxJlKeQr4PGOFybIrVLL31VBMRhZ9PDQ4=", + "rev": "v0.35.0", + "sha256": "sha256-iIClnbCldGnihpML9xF0kyR4viXZzAsTF8MFT53wg+A=", "vendorSha256": null, - "version": "0.34.0" + "version": "0.35.0" }, "external": { "owner": "hashicorp", @@ -356,84 +384,93 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v1.1.2", - "sha256": "sha256-CxyVW9uE9mK+ZF8fyjAsrFKY82xAyGn9k1jOFqTaAhA=", + "rev": "v1.1.4", + "sha256": "sha256-sLVeVXVCvhSx51B4unYEOs0UpNsChF9guB22gpsratw=", "vendorSha256": null, - "version": "1.1.2" + "version": "1.1.4" }, "flexibleengine": { "owner": "FlexibleEngineCloud", "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.28.0", - "sha256": "sha256-UeRgbPHwKZ6HfoHOG3yYLFhv6GqzGhLB3fETYWq6k7A=", - "vendorSha256": "sha256-/Z8VbNtwBYROyzvhwFwpmyGMWF1LeWEKxgwbFd9M+Gw=", - "version": "1.28.0" + "rev": "v1.29.0", + "sha256": "sha256-HPcJRLP20fDt3qr2edkol2jXSsWLotJkx13ZV7n7w8g=", + "vendorSha256": "sha256-De4NRWTdE4QutQkB0m0YlJg6LNysxi4bSSIxYY6lRP0=", + "version": "1.29.0" }, "fortios": { "owner": "fortinetdev", "provider-source-address": "registry.terraform.io/fortinetdev/fortios", "repo": "terraform-provider-fortios", - "rev": "v1.14.0", - "sha256": "078wvbihrs6j5yrbqsx5g6l7z05y98kwlyanq5w99fsazz78rr4h", + "rev": "v1.14.1", + "sha256": "sha256-9e1PEg8RtJa7DR5g3cCdAhubFxt7vN5dPjaBA+F7Y4E=", "vendorSha256": null, - "version": "1.14.0" + "version": "1.14.1" }, "gandi": { "owner": "go-gandi", "provider-source-address": "registry.terraform.io/go-gandi/gandi", "repo": "terraform-provider-gandi", - "rev": "v2.0.0", - "sha256": "0xvdnjadcddrrfhhp198mraf2bm01xfy7gapjay441dbzffynw1m", - "vendorSha256": "1yccjnz6xw3b51xqmiaw78m87y2xmlp9z5z3gx5dbzz0lkj1k523", - "version": "2.0.0" + "rev": "v2.0.1", + "sha256": "sha256-lcJoDBVoNvNbB5V1rSk09d7pnfVN+FHROtyZCNmZfBk=", + "vendorSha256": "sha256-sloRWqk8j8UWM7gVFaiJ3SmBgnWN/BbFfATQWzpXI7k=", + "version": "2.0.1" }, "github": { "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.23.0", - "sha256": "sha256-N7PFLh7qr8OPB92ePLS1B/KexipKV5LFRWvrxdS8cGk=", + "rev": "v4.25.0-alpha", + "sha256": "sha256-9BE19VywtNIeDfjBKzle5nGFPmpS8lHV60w0h2xTztU=", "vendorSha256": null, - "version": "4.23.0" + "version": "4.25.0-alpha" }, "gitlab": { "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.13.0", - "sha256": "sha256-Rm7j290Pr65F6JqSNpjK8bR1EhXev/74MpUa7SRNf3o=", - "vendorSha256": "sha256-hlcJn54paYJ1nlmqirOvC3Z4y8cMqv6etlDdihV9+R4=", - "version": "3.13.0" + "rev": "v3.14.0", + "sha256": "sha256-KUlFEVeST/ujerpkjHYzdROwkFD4ASx0juHOKWKM14o=", + "vendorSha256": "sha256-M03+MK7YB3IPHA/w+yrO6YohPzknCmhguO5b25qzDzw=", + "version": "3.14.0" }, "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.16.0", - "sha256": "sha256-kp6AldlkjiNd3R3hz+wB2uBQ37TyZ0hoEhxQYiFmO7g=", + "rev": "v4.20.0", + "sha256": "sha256-eZNa6V3aVtEgTZgTNgB4EUK3S6iKfk9qI7OnAQ5Mbp4=", "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=", - "version": "4.16.0" + "version": "4.20.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.16.0", - "sha256": "sha256-m5K2q83WbWVfjG7vhlh71k14GEXNs+2JfK/S1GnC5c0=", + "rev": "v4.20.0", + "sha256": "sha256-Dr3G7KskfL+4WNOPL3SZCKf+Lo6wP3XS1JrlC6Mv3O8=", "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=", - "version": "4.16.0" + "version": "4.20.0" + }, + "googleworkspace": { + "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/googleworkspace", + "repo": "terraform-provider-googleworkspace", + "rev": "v0.6.0", + "sha256": "06cbwkrqrsshnv8ccsnl424l2sq0shi18kxwvrnwg88xvm8qpcfi", + "vendorSha256": "1zid2f8c9yfl6zwqiacngaf2rvvgs4w9phqjamgzibz41ijk6655", + "version": "0.6.0" }, "grafana": { "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.21.1", - "sha256": "sha256-2eTVJB0Scs6cZzwy+DQLgKqP0JPNnQMjUcG7THH2Cgg=", - "vendorSha256": "sha256-YfE5ob/gB+X9x0Zx6gqjUR3+P+EhQrZ6aNiHOkbkNIc=", - "version": "1.21.1" + "rev": "v1.22.0", + "sha256": "sha256-0OkFf2YiwJHwXheYkN1HA1DG5vadyhZOzVjmu0BNDHI=", + "vendorSha256": "sha256-Pd4cSmDzRhu8MD2osXg6mVYiKG2VM6MQ67aC6jDy59U=", + "version": "1.22.0" }, "gridscale": { "owner": "gridscale", @@ -448,19 +485,19 @@ "owner": "hetznercloud", "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", - "rev": "v1.33.1", - "sha256": "1mskbr0adhnri72fa3afghxpcfbzq0qnpslhh9gdnymvs3afjbdg", - "vendorSha256": "0rc4pznb16fm5dhi54fwka44zvngy3hp0cfwlrh84ifmzqgx0mlv", - "version": "1.33.1" + "rev": "v1.33.2", + "sha256": "sha256-kERpOIEy6UsT2BEY9kkINuWbncDXJuwWjR/Kzua97m8=", + "vendorSha256": "sha256-p+NFt9QjbR12bGnCrhUTJzwtBagjXn5w1UcQFMQpY+I=", + "version": "1.33.2" }, "helm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", - "rev": "v2.5.0", - "sha256": "sha256-stJO23B/DNOvAU71S/N3iML1PVQrpmbhoh7e31MI+BY=", + "rev": "v2.5.1", + "sha256": "sha256-PX8mls0m/7B5WULEDVHutzvjAr0a54vg734mBbRQZNA=", "vendorSha256": null, - "version": "2.5.0" + "version": "2.5.1" }, "heroku": { "owner": "heroku", @@ -471,6 +508,15 @@ "vendorSha256": "sha256-HrsjhaMlzs+uel5tBlxJD69Kkjl+4qVisWWREANBx40=", "version": "5.0.2" }, + "htpasswd": { + "owner": "loafoe", + "provider-source-address": "registry.terraform.io/loafoe/htpasswd", + "repo": "terraform-provider-htpasswd", + "rev": "v1.0.2", + "sha256": "sha256-U8rArNTOmiB06Vrvet6PnkIuylRzswJvVptijvcuVFQ=", + "vendorSha256": "sha256-rotGWkaNbsU+9tGENvkNkR7C3d6334hfPNcvJaZDSKw=", + "version": "1.0.2" + }, "http": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/http", @@ -484,10 +530,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.35.0", - "sha256": "sha256-OQGrxnXeYSGLnfD8NuWncag1sSGlSZCipe0CykzzupU=", + "rev": "v1.35.2", + "sha256": "sha256-D1ZaYz+leYU2UNq9c589KVISSNdcjFnDO4JccSVRPYw=", "vendorSha256": null, - "version": "1.35.0" + "version": "1.35.2" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -511,10 +557,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.40.1", - "sha256": "sha256-7NdpMWEpkcqEwi7xAedc/NPJ6e+RZZ4HdrKtmb/H6xU=", - "vendorSha256": "sha256-rVV6oeqIj4o9qxw2V67G3cgERJaccejaAAtEOJVLm4U=", - "version": "1.40.1" + "rev": "v1.41.0", + "sha256": "sha256-5kHoTmQlEzTSjDnAJPdEN2y+DF9gB2BHJFHEYLh6h48=", + "vendorSha256": "sha256-8s32A0qgODZZy3rSrHnnBkQyKLBj0fcCBJ9ja9gXc5Q=", + "version": "1.41.0" }, "icinga2": { "owner": "Icinga", @@ -556,10 +602,10 @@ "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.7.0", - "sha256": "1qzdm0jgk6f0zyjbv5qaq24h9a37bgb4ghym61vg763lqra69als", - "vendorSha256": "1q5z54rz5lqgdv9gfl20gfnzi4in0d65jkfxnmmsx6fjcb9ih4p6", - "version": "3.7.0" + "rev": "v3.8.0", + "sha256": "sha256-TVSP0oORtiVkPGjgiHHJAsaWDhlN5lnpC3eJ4Ogf2Ss=", + "vendorSha256": "sha256-8x0MlwAzeA2O6wXXHSk++K0ePmzE9/2lfo2ID83LzRM=", + "version": "3.8.0" }, "ksyun": { "owner": "kingsoftcloud", @@ -583,19 +629,19 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.10.0", - "sha256": "sha256-pA0yI59iRBmiT3rdvoP4vkSz/+bH29O4eLGPCBjfiZU=", + "rev": "v2.11.0", + "sha256": "sha256-qrADveCJUvYcseTUmqQzmRKn4Whb/KfJjwz2+6V7yZc=", "vendorSha256": null, - "version": "2.10.0" + "version": "2.11.0" }, "launchdarkly": { "owner": "launchdarkly", "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.6.0", - "sha256": "sha256-Mf7oV5G5XjnE+3m8EDczDvrtn2s4nrNCTdAJz1n9v2Y=", + "rev": "v2.7.0", + "sha256": "sha256-V7osiBlNDzJbmVUUhpRUi9tnoY1HccdZ5ub83ciSvbY=", "vendorSha256": "sha256-HKea86ck97uc/Gv6geJm9TTRfG6bnpB+q8cuU/jubI8=", - "version": "2.6.0" + "version": "2.7.0" }, "libvirt": { "owner": "dmacvicar", @@ -610,10 +656,10 @@ "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.27.0", - "sha256": "sha256-m2dD/BP5oNRUge3SXhSIptrQhj3Sez4O3hIdrJn45Y4=", + "rev": "v1.27.1", + "sha256": "sha256-rEXGKytKdlHO3RcZT+3e85cGfQ6b7mhdcFK+unw44ug=", "vendorSha256": "sha256-ZJQAZk4TaKT+hLM46gtV1XmBCtwuKwtoom9tPGaOWhc=", - "version": "1.27.0" + "version": "1.27.1" }, "linuxbox": { "owner": "numtide", @@ -637,19 +683,19 @@ "owner": "logicmonitor", "provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor", "repo": "terraform-provider-logicmonitor", - "rev": "v2.0.0", - "sha256": "sha256-wamP36zV5HZ1qQlNZWIZyAYx/jOiRO1ODQpcd10Sl4w=", + "rev": "v2.0.1", + "sha256": "sha256-LW88NTWwzGrpOpliVqc1AOjxaZ4p/8gq9twEpjY3FzE=", "vendorSha256": null, - "version": "2.0.0" + "version": "2.0.1" }, "lxd": { "owner": "terraform-lxd", "provider-source-address": "registry.terraform.io/terraform-lxd/lxd", "repo": "terraform-provider-lxd", - "rev": "v1.7.1", - "sha256": "0r1d0d6fp3rihxhfsxlay0dqp5rmnja9s369msra8jylqyharnrh", - "vendorSha256": "11x12jxh4q99hinpljqfchysgkhch93sgv0mz065ws20y0dxzfvs", - "version": "1.7.1" + "rev": "v1.7.2", + "sha256": "sha256-rNqlPyKpBNaIRtiNHB8U8jowWhqdQtDIMxreZ5Dfm3E=", + "vendorSha256": "sha256-ervfG/BAaF4M+BXsp0eCDM6nPWQOS3pthClhArsUoYc=", + "version": "1.7.2" }, "mailgun": { "owner": "wgebis", @@ -673,10 +719,10 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", - "rev": "v3.3.0-alpha.2", - "sha256": "sha256-RUD4BJy0/s23+OWlQfFEh59BEhhtobW7zDOOcosC0l4=", + "rev": "v3.3.0-alpha.3", + "sha256": "sha256-wuZp0Be8a84y7JqpCGnBDPXgNG8JJcNWsIICP3ZjSVk=", "vendorSha256": "sha256-Ln9EyycPduVuj+JefH9f+Q5KlNGvbcwcEDgaqH2M0So=", - "version": "3.3.0-alpha.2" + "version": "3.3.0-alpha.3" }, "minio": { "owner": "aminueza", @@ -709,10 +755,10 @@ "owner": "NaverCloudPlatform", "provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud", "repo": "terraform-provider-ncloud", - "rev": "v2.2.6", - "sha256": "sha256-Sw3Z6hi+nm/e+lMQQkk8KIa2AK2+q+0gBUe091GnQq0=", + "rev": "v2.2.7", + "sha256": "sha256-5WZOZBFZkJtPdWmxznv/ML6d+UTr+qw+SbBuaG+bGS8=", "vendorSha256": "sha256-ovHg4GcbMzjEi+qJBpdqhR0YUakZCdnpc10SCu8FP8I=", - "version": "2.2.6" + "version": "2.2.7" }, "netlify": { "owner": "AegirHealth", @@ -727,10 +773,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.42.0", - "sha256": "sha256-OD0wahsEw86E7TbUxIqEhoZ85An9yRwgTENtdoYnFB0=", - "vendorSha256": "sha256-G/GWIE+XeLiHW0xxyjbIpncAnpBmC/+iZnI8MFmi80k=", - "version": "2.42.0" + "rev": "v2.44.0", + "sha256": "sha256-CR1GPm8K/9ZOFYvgKqMW63sbnRx0HyAYYESC/ZnBNYI=", + "vendorSha256": "sha256-2m5T6+GJTUDS345GDOW7Yf8X+JpxvtdYvInBjNvNXlg=", + "version": "2.44.0" }, "nomad": { "owner": "hashicorp", @@ -745,19 +791,19 @@ "owner": "ns1-terraform", "provider-source-address": "registry.terraform.io/ns1-terraform/ns1", "repo": "terraform-provider-ns1", - "rev": "v1.12.5", - "sha256": "0g69jr96ns2h578cmh5zz27m5dkgygrfr6shvx79wal26fpr8413", - "vendorSha256": "0s70626ng7pvqxnx0a4rp22b8spy45y011bvvm77fndm8fc1w9zn", - "version": "1.12.5" + "rev": "v1.12.6", + "sha256": "sha256-nP951YipGzsweJvV2PE0UlWGP+cAM6s18F5MCcxTxeo=", + "vendorSha256": "sha256-MaJHCxvD9BM5G8wJbSo06+TIPvJTlXzQ+l9Kdbg0QQw=", + "version": "1.12.6" }, "nsxt": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/nsxt", "repo": "terraform-provider-nsxt", - "rev": "v3.2.5", - "sha256": "0j5kspfmqxdnvk3sfb476rckkn9fdgpw5haf495901a114wynr2l", + "rev": "v3.2.6", + "sha256": "sha256-1uQMjzqMJ1NQVVCXy5aHrrZ4vDK5s1JqUnLyYf1qLVw=", "vendorSha256": null, - "version": "3.2.5" + "version": "3.2.6" }, "null": { "owner": "hashicorp", @@ -773,28 +819,28 @@ "owner": "nutanix", "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.5.0-beta", - "sha256": "sha256-Luu0myRCzlVpKouFnE7MXESzkxCXxNe2ZfxFUCpGpiU=", + "rev": "v1.5.0", + "sha256": "sha256-H8wLMLBB4pSbiilmP9C0WPn62fCYHgPhy8OlvtrUYro=", "vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=", - "version": "1.5.0-beta" + "version": "1.5.0" }, "oci": { "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.70.0", - "sha256": "sha256-KgpYl1DllCkpXbxYp8cqKE28l4digmaB75BoL6CpkQA=", + "rev": "v4.74.0", + "sha256": "sha256-hZpEhhI2pqOPLQm6XnVGIccyC1kVmLusUzF3KRbAHys=", "vendorSha256": null, - "version": "4.70.0" + "version": "4.74.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.22.1", - "sha256": "sha256-G1KJJSxJmzFlIUWOs+7htcgp61oWCu+ryCKaIHzxhzw=", - "vendorSha256": "sha256-n7ih8QtapA+xno1twlM2b2XGEesdJdJIPD+QWpmJDVA=", - "version": "3.22.1" + "rev": "v3.26.0", + "sha256": "sha256-Mnc3JZtKNOB9VpsjXq8WiZz0+zmTmFRfOY23F186tw4=", + "vendorSha256": "sha256-LHiOQNFkMajqytrv387yIhAyCQCaG2Kw5OCI8Xe7u2k=", + "version": "3.26.0" }, "oktaasa": { "owner": "oktadeveloper", @@ -836,10 +882,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.29.0", - "sha256": "sha256-jhG2TyinnlPPIVA2K+ckOcxlqxeUFkp+WFJcJqYQ13k=", - "vendorSha256": "sha256-qNJ1jkbGgFUxvHYUMPX9kBAwQSx4vfOr7eS0Z6J7X8Q=", - "version": "1.29.0" + "rev": "v1.29.2", + "sha256": "sha256-V5EGRd5/JmCDaF1fQkpwHA4DNVFKwvGnMR/AyKvgLtk=", + "vendorSha256": "sha256-FOcddb1+uG5avqYZMvzR1UXDvtDDwtxBzf7FsN6ZROM=", + "version": "1.29.2" }, "opsgenie": { "owner": "opsgenie", @@ -872,10 +918,10 @@ "owner": "PagerDuty", "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.4.0", - "sha256": "sha256-pWfpist6nG6lQ1ep+Aje6LQgN/1ab5FtSoJKkoLDxAs=", + "rev": "v2.4.1", + "sha256": "sha256-2Ot6TxWN+t33EfT5wmkkPjj9DUrPum9whl5wimgjAp0=", "vendorSha256": null, - "version": "2.4.0" + "version": "2.4.1" }, "panos": { "owner": "PaloAltoNetworks", @@ -899,19 +945,19 @@ "owner": "cyrilgdn", "provider-source-address": "registry.terraform.io/cyrilgdn/postgresql", "repo": "terraform-provider-postgresql", - "rev": "v1.15.0", - "sha256": "04gm7y5qyvipg0a0glgyx257vjrkk4k5pjrvzik6adyrjyidixw1", - "vendorSha256": "0pp9c76zdpfyq57jcwv258gipvmy6hjqi933xdi155hkx45cnixr", - "version": "1.15.0" + "rev": "v1.16.0", + "sha256": "sha256-nueqs2SJZxGNzm/gv/mBo8geXI8nZqmDFQ0e539oV2M=", + "vendorSha256": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=", + "version": "1.16.0" }, "powerdns": { "owner": "pan-net", "provider-source-address": "registry.terraform.io/pan-net/powerdns", "repo": "terraform-provider-powerdns", - "rev": "v1.4.1", - "sha256": "1v1qs042jpin5454yqbdfp2xsgf68cgwlsqfah5hqy1qnq5zbl3z", + "rev": "v1.5.0", + "sha256": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", "vendorSha256": null, - "version": "1.4.1" + "version": "1.5.0" }, "rabbitmq": { "owner": "cyrilgdn", @@ -935,10 +981,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/random", "repo": "terraform-provider-random", - "rev": "v3.1.2", - "sha256": "sha256-Yk1CPR9gN70E+Qpc20vBQG2MY/RCO5cvaNtD8N++d5A=", - "vendorSha256": "sha256-/IjOv7/kQlGuV9+9Vhc7zUrr6hbcoxZyKi+q52YA/kk=", - "version": "3.1.2" + "rev": "v3.1.3", + "sha256": "sha256-q4j3DXbLiVeSyWGywwLiJspmE08ip3zL8vabfVDWnUo=", + "vendorSha256": "sha256-sg89QS0ncCrBGoLvsWFlyCYwNZHNG6iadNJIHWRmhXE=", + "version": "3.1.3" }, "rundeck": { "owner": "rundeck", @@ -953,10 +999,10 @@ "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.1-rc.2", - "sha256": "sha256-7T+J4T0qm7QMGWWjIT0nKHkHzd6wfFNP3suF7GitErc=", - "vendorSha256": "sha256-kfr8YqLr8CXntkiMEHA5kosZqkloV4rGjEmdXosT7WU=", - "version": "2.2.1-rc.2" + "rev": "v2.2.1-rc.3", + "sha256": "sha256-XprfY4Zy3PIrIJA2F1tnwafg4wYuzrm9nwVZULdX1D0=", + "vendorSha256": "sha256-H5KAo2rpgFGYmOgGOx9Z5LuApmftuYA6PfYCjnr7zC0=", + "version": "2.2.1-rc.3" }, "secret": { "owner": "numtide", @@ -971,10 +1017,10 @@ "owner": "selectel", "provider-source-address": "registry.terraform.io/selectel/selectel", "repo": "terraform-provider-selectel", - "rev": "v3.8.0", - "sha256": "0qc08v217cv2i43cxcx854rvhihrlhlakfark37vcdrh9z6swf1n", - "vendorSha256": "1mjp5yqwl1nya82yf5v6l3sq7iv0m94xy5w7y5avn8h40dl1wfnf", - "version": "3.8.0" + "rev": "v3.8.2", + "sha256": "sha256-Lp2ptLuN/+/fcqeSbIMmL4dmOCoplyZeA10wAsCnYlg=", + "vendorSha256": "sha256-kmsO9jFoR/93PkOeIo0pkS/OjE+m3QbIspobAv/9+KI=", + "version": "3.8.2" }, "sentry": { "owner": "jianyuan", @@ -998,10 +1044,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.11.1", - "sha256": "sha256-37D4nblpGK8duohDiyY4UR0jn+T6QX7LnCfGtPdYQ3k=", - "vendorSha256": "sha256-PVbqS37MBkIrr8CO6LxB0NjWWiTI5NFDipX6GvokrnY=", - "version": "6.11.1" + "rev": "v6.13.1", + "sha256": "sha256-OtWJgLObTaWCGOjxN8nlkmfW+D6EMS0esht/OkJaioM=", + "vendorSha256": "sha256-yWqUsObvABwmA6V9ecz8SFtk1Bhdq2/dUpnNLKQtuNM=", + "version": "6.13.1" }, "skytap": { "owner": "skytap", @@ -1016,10 +1062,10 @@ "owner": "chanzuckerberg", "provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.30.0", - "sha256": "sha256-JHpwqMyt/oMZv6P4xEOlyV0pL32HQselDg+dP9JGRpg=", - "vendorSha256": "sha256-G/UIKuKtolLY7RIQF06wzn/ZYTMihEmJZ1DqVcHFGdg=", - "version": "0.30.0" + "rev": "v0.33.1", + "sha256": "sha256-xFtk1WbMe2/UFGB/ej6QEL07+dZTsWFmqvyVCa2YBw8=", + "vendorSha256": "sha256-l++IzY3/W4qsdFJY7ik0xF6tZWluLb4EcW5KQtBVY5s=", + "version": "0.33.1" }, "sops": { "owner": "carlpett", @@ -1034,10 +1080,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.71.0", - "sha256": "sha256-Fcx0KHTAAOQE/Qa+84p5l5ve5nrWXZHgRyc3xNYBJoQ=", - "vendorSha256": "sha256-pI9jX/Wp6Nu1ix82ZE2CBZYu0j4S+HH2+dD5G679VrE=", - "version": "1.71.0" + "rev": "v1.73.2", + "sha256": "sha256-Q5DNFJ1g6jfHQVYF5Xf5Phx/4b2nbUvE651JNp/zgJg=", + "vendorSha256": "sha256-szdzI/42RExYQlHnm178RM3wlKOLax+nwgRVzonxXoI=", + "version": "1.73.2" }, "stackpath": { "owner": "stackpath", @@ -1052,10 +1098,10 @@ "owner": "StatusCakeDev", "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake", "repo": "terraform-provider-statuscake", - "rev": "v2.0.1-pre", - "sha256": "sha256-/SWmGy6kMAt4TAswlpmfs4rVAa/DZBFoE1Yv+EcWfGo=", - "vendorSha256": "sha256-sFKhbOsE2eQ4Qxfbtab19nZRIKhJXNdsg274tWRjoVg=", - "version": "2.0.1-pre" + "rev": "v2.0.2-pre", + "sha256": "sha256-a8F6jDSYDal6U0Uu/iXprUb2lrwwUMOOkIZDftIiaLI=", + "vendorSha256": "sha256-E6DvzloOaamSX3jLKUQQmIccGiI6sFo4oNwU86td05E=", + "version": "2.0.2-pre" }, "sumologic": { "owner": "SumoLogic", @@ -1079,19 +1125,19 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.67.0", - "sha256": "sha256-61Fhh/BW1Iv/7wMU0lDMxPdB86Wqf43F90ZoWM990K0=", + "rev": "v1.72.1", + "sha256": "sha256-vCCIHp8tpAn7PIIBMVXRSI9G420E1ijfYow9bfC3RKs=", "vendorSha256": null, - "version": "1.67.0" + "version": "1.72.1" }, "tfe": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.30.2", - "sha256": "sha256-qJGHOZdnigflapWHhmvALNMzqDxJ4RSAgGFzm+3z7GA=", + "rev": "v0.31.0", + "sha256": "sha256-BvA+1oCh8xB0XcXMGOmAEdi/lEwGdRed5vDEDVBUMhE=", "vendorSha256": "sha256-7TFfIk+aPbl3CLuNdeJg1O2n3WlCuG5tsayCtbo77I0=", - "version": "0.30.2" + "version": "0.31.0" }, "thunder": { "owner": "a10networks", @@ -1152,37 +1198,37 @@ "owner": "cloudposse", "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "0.17.19", - "sha256": "sha256-FTZyri4/6QWkLKKectzx3av8fnoDkOIyAkAPasFU8sU=", - "vendorSha256": "sha256-FA2Hev7RS3ZJ/cDTgyZ7uMFlQB/VdJ19GZUpkWTEPV8=", - "version": "0.17.19" + "rev": "0.17.23", + "sha256": "sha256-/m2K91I1BtzfKTO6sbYL6r0N6GGtd4Ux+GSL0Ut4GUg=", + "vendorSha256": "sha256-Rmv3B8Sczvohlfwu248a1pi1VmFGNCB77/IFTBKKeiM=", + "version": "0.17.23" }, "vault": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v3.4.1", - "sha256": "sha256-xG16n25upU9giQ76FEx6as2GvyhAk6kZixmJCJFti2s=", - "vendorSha256": "sha256-JiNYM8P6ExGVVOVBYA2WJSZOpZ0PAyoncENqYRXPo7c=", - "version": "3.4.1" + "rev": "v3.5.0", + "sha256": "sha256-Ap96unJFTJ8HKcIs3LYSHfTXszh1gAcZSTEWpS2W2AQ=", + "vendorSha256": "sha256-UvczG/31YPIxPBZhwoBC3QS+QA8PRtRqgA/0W8tcXD0=", + "version": "3.5.0" }, "vcd": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/vcd", "repo": "terraform-provider-vcd", - "rev": "v3.5.1", - "sha256": "1fwkbsgnxn0jl84nji57grasdsbw0ydd7vzcllpv7r1z3jpa545q", - "vendorSha256": "0bzp6807l4hspk1c1pmgnzk0axk0nir3v0lqmw9xvkij4c5rnz9s", - "version": "3.5.1" + "rev": "v3.6.0", + "sha256": "sha256-vtqlT3cfrEsbTmsKY6SVYUgyo+zIiX0cK080H03C1d0=", + "vendorSha256": "sha256-g5qcT4xaXQMih4WN3ysk+xGwd3ux8XjMceXgmw8gYB0=", + "version": "3.6.0" }, "venafi": { "owner": "Venafi", "provider-source-address": "registry.terraform.io/Venafi/venafi", "repo": "terraform-provider-venafi", - "rev": "v0.15.3", - "sha256": "sha256-qucPKnzUNYnnEe0rJoe3RhzBYIJJJroz3qTo8VlQBAE=", - "vendorSha256": "sha256-lj8cuv9jR+3P7OiO/eW8poHcX+LsQo+kOyspiqdMXRY=", - "version": "0.15.3" + "rev": "v0.15.5", + "sha256": "sha256-aNh9P7QqhmdywP47mddcGSDRxkwkrus14tku/xrQcz8=", + "vendorSha256": "sha256-SKdSjBXLX344zt0GeGBLNp8cFw+PO9ObT9jC+dHp/h8=", + "version": "0.15.5" }, "vercel": { "owner": "ondrejsika", @@ -1242,9 +1288,9 @@ "owner": "yandex-cloud", "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", - "rev": "v0.73.0", - "sha256": "sha256-nhmy/DlO8JCjPRnm/o9R/+qq8k5kjEuNgYrGAdZWnVI=", - "vendorSha256": "sha256-GyLvc6mDA6F2xkT0bP3zjTWFmrOWodLCB4apYsBE95Q=", - "version": "0.73.0" + "rev": "v0.74.0", + "sha256": "sha256-TeApvGYWBlCzxE7/t6cbb47L1oGUfx2B/cEW8UQieoU=", + "vendorSha256": "sha256-n1qcrvBKftKYm7nlTCeAOU/Q40xMpVlyKUKxR7wgPu4=", + "version": "0.74.0" } } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 39283a8646e9a..b4191bbd78c80 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -63,11 +63,10 @@ let kalbasit marsam maxeaubrey + techknowlogick timstott - zimbatm zowoq - techknowlogick - ]; + ] ++ teams.numtide.members; }; } // attrs'); @@ -192,9 +191,9 @@ rec { }; terraform_1 = mkTerraform { - version = "1.1.8"; - sha256 = "sha256-U3RuLnDQD1EbPZG/wPuVMbSKmR3EqspkoK0Ky8aZb7k="; - vendorSha256 = "sha256-Jy9o0O80OjagrHG25CSPblI49zKx0N8pwvEotk9qm3s="; + version = "1.1.9"; + sha256 = "sha256-6dyP3Y5cK+/qLoC2QPZW3QNgqOeVXegC06Pa7pSv1iE="; + vendorSha256 = "sha256-YI/KeoOIxgCAS3Q6SXaW8my0PyFD+pyksshQEAknsz4="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 48025dfd7f729..57cd5e11df8c6 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.36.6"; + version = "0.37.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WSvdv4E/m6mJZdo3s9FHMETKaYNB7mltWrQlTHTFJ/E="; + sha256 = "sha256-7nil/T6q1crZh9ARTP615UzfjKcgsclpIt2N1ifABBk="; }; - vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg="; + vendorSha256 = "sha256-7SUf4r+6r6dkBoBZFg2AUK114QEl0+1lwRA4ymYArFs="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 1287171917251..df0ae08eede4f 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.7.2"; + version = "0.8.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ek3WOL1sNPAIkZN/cWDSmlNtN41VL3SKb7Qb4kew8vo="; + sha256 = "sha256-NRR/N61QdBF4jaioF7+X3xOdvaJ8COEzXL4hVHYSqW4="; }; - vendorSha256 = "sha256-a0O36zyQQSVrGXWpTdCkAAwNAXU23pcFJBB+o2KYnWw="; + vendorSha256 = "sha256-57/MzO5TulGKMkGdQRoFNKIKF7upJiPazF0+Ovt/LG8="; nativeBuildInputs = [ go-bindata installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 9a9f454ac0039..65e057b69fd13 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -2,6 +2,7 @@ , stdenv , buildGoModule , fetchFromGitHub +, installShellFiles , pkg-config , gpgme , glibc @@ -11,18 +12,18 @@ buildGoModule rec { pname = "werf"; - version = "1.2.78"; + version = "1.2.99"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-ehrzb7WvkYL8oj2RSzKc1KDagV0zg6vMzgpT2sPyhcI="; + sha256 = "sha256-D9NwVZGB0UV0tRe927GpxHzdvAeqcRJOYfocbbj6BRM="; }; - vendorSha256 = "sha256-w8ZeAQbZIVOBoRa9fJhXgTeYRCYpkh/U4pwb5u6A9mQ="; + vendorSha256 = "sha256-ZMSTl9WFTF5x+tiQZ37ihVrOuLS0W5PjyXbbzyHJNsI="; proxyVendor = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ glibc.static lvm2 btrfs-progs ]; @@ -44,6 +45,12 @@ buildGoModule rec { subPackages = [ "cmd/werf" ]; + postInstall = '' + installShellCompletion --cmd werf \ + --bash <($out/bin/werf completion --shell=bash) \ + --zsh <($out/bin/werf completion --shell=zsh) + ''; + meta = with lib; { homepage = "https://github.com/werf/werf"; description = "GitOps delivery tool"; diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 459b5652089cf..de96a3ddaa8a0 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , asciidoctor, autoreconfHook, pkg-config -, boost, libctemplate, libmaxminddb, libpcap, libtins, openssl, protobuf, xz, zlib +, boost, libctemplate, libmaxminddb, libpcap, libtins, openssl, protobuf, xz, zlib, catch2 , cbor-diag, cddl, diffutils, file, mktemp, netcat, tcpdump, wireshark-cli }: @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs test-scripts/ + cp ${catch2}/include/catch2/catch.hpp tests/catch.hpp ''; preConfigure = '' diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix deleted file mode 100644 index 4eb8da760bff1..0000000000000 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3 -, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts -, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas -, curl, glib, gnome, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 -}: - -stdenv.mkDerivation rec { - pname = "feedreader"; - version = "2.11.0"; - - src = fetchFromGitHub { - owner = "jangernert"; - repo = pname; - rev = "v${version}"; - sha256 = "1agy1nkpkdsy2kbrrc8nrwphj5n86rikjjvwkr8klbf88mzl6civ"; - }; - - nativeBuildInputs = [ - meson ninja pkg-config vala gettext appstream-glib desktop-file-utils - libxml2 python3 wrapGAppsHook - ]; - - buildInputs = [ - curl glib json-glib libnotify libsecret sqlite gumbo gtk3 - libgee libpeas gnome.libsoup librest webkitgtk gsettings-desktop-schemas - gnome-online-accounts - ] ++ (with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good - ]); - - postPatch = '' - patchShebangs build-aux/meson_post_install.py - ''; - - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - - meta = with lib; { - description = "A modern desktop application designed to complement existing web-based RSS accounts"; - homepage = "https://jangernert.github.io/FeedReader/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix new file mode 100644 index 0000000000000..b937c35a3f969 --- /dev/null +++ b/pkgs/applications/networking/firewalld/default.nix @@ -0,0 +1,104 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, bash +, docbook_xml_dtd_42 +, docbook-xsl-nons +, glib +, gobject-introspection +, gtk3 +, intltool +, libnotify +, libxml2 +, libxslt +, networkmanagerapplet +, pkg-config +, python3 +, wrapGAppsNoGuiHook +, withGui ? false +}: + +let + pythonPath = python3.withPackages (ps: with ps; [ + dbus-python + nftables + pygobject3 + ] ++ lib.optionals withGui [ + pyqt5 + pyqt5_sip + ]); +in +stdenv.mkDerivation rec { + pname = "firewalld"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "firewalld"; + repo = "firewalld"; + rev = "v${version}"; + sha256 = "sha256-w8TbovIhOhJAUZWbKdBd/+db8Hro/ttlxWZDcrCXX4Q="; + }; + + patches = [ + ./respect-xml-catalog-files-var.patch + ]; + + postPatch = '' + substituteInPlace src/firewall/config/__init__.py.in \ + --replace "/usr/share" "$out/share" + + for file in config/firewall-{applet,config}.desktop.in; do + substituteInPlace $file \ + --replace "/usr/bin/" "$out/bin/" + done + '' + lib.optionalString withGui '' + substituteInPlace src/firewall-applet.in \ + --replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-conenction-editor" + ''; + + nativeBuildInputs = [ + autoreconfHook + docbook_xml_dtd_42 + docbook-xsl-nons + glib + intltool + libxml2 + libxslt + pkg-config + python3 + python3.pkgs.wrapPython + ] ++ lib.optionals withGui [ + gobject-introspection + wrapGAppsNoGuiHook + ]; + + buildInputs = [ + bash + glib + ] ++ lib.optionals withGui [ + gtk3 + libnotify + pythonPath + ]; + + dontWrapGApps = true; + + preFixup = lib.optionalString withGui '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite + patchShebangs --host $out/share/firewalld/testsuite/{,integration/}testsuite $out/share/firewalld/*.py + wrapPythonProgramsIn "$out/bin" "$out ${pythonPath}" + wrapPythonProgramsIn "$out/share/firewalld/testsuite/python" "$out ${pythonPath}" + ''; + + meta = with lib; { + description = "Firewall daemon with D-Bus interface"; + homepage = "https://github.com/firewalld/firewalld"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch b/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch new file mode 100644 index 0000000000000..03a10121c6be1 --- /dev/null +++ b/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch @@ -0,0 +1,13 @@ +--- a/m4/jh_path_xml_catalog.m4 ++++ b/m4/jh_path_xml_catalog.m4 +@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], + [ + AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl + AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) +- if $jh_found_xmlcatalog && \ +- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then ++ # empty argument forces libxml to use XML_CATALOG_FILES variable ++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then + AC_MSG_RESULT([found]) + ifelse([$3],,,[$3 + ])dnl diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index ad18f4e1e611d..d74378378b968 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.8"; + version = "3.3.9"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; - rev = "v${version}"; - hash = "sha256-ZGs5ixNcrkoZ4TRVuIUeNF1FNJwKpYElNv6oPhGiEmU="; + rev = "refs/tags/v${version}"; + hash = "sha256-29V22B1Nkgj/qc6uyAOSOZ1rrjjtf75I9Eycu8I5ysQ="; }; postPatch = '' @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { ln -sf requirements.in requirements.txt # remove dependency constraints - sed 's/[>=]=.*//' -i requirements.txt + sed 's/[~<>=].*//' -i requirements.txt # "zxcvbn-python" was renamed to "zxcvbn", and we don't have the former in # nixpkgs. See: https://github.com/NixOS/nixpkgs/issues/62110 @@ -35,6 +35,8 @@ python3Packages.buildPythonApplication rec { # See https://github.com/Flexget/Flexget/blob/master/requirements.in APScheduler beautifulsoup4 + click + colorama feedparser guessit html5lib @@ -62,6 +64,7 @@ python3Packages.buildPythonApplication rec { flask-restx flask pyparsing + werkzeug zxcvbn # Plugins requirements diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index 9fc1e25a92d7a..e1ce1914db927 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -6,18 +6,16 @@ buildGoModule rec { pname = "gmailctl"; - # on an unstable version because of https://github.com/mbrt/gmailctl/issues/232 - # and https://github.com/mbrt/gmailctl/commit/484bb689866987580e0576165180ef06375a543f - version = "unstable-2022-03-24"; + version = "0.10.2"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; - rev = "484bb689866987580e0576165180ef06375a543f"; - sha256 = "sha256-hIoS64QEDJ1qq3KJ2H8HjgQl8SxuIo+xz7Ot8CdjjQA="; + rev = "v${version}"; + sha256 = "sha256-tj+jKJuKwuqic/qfaUbf+Tao1X2FW0VVoGwqyx3q+go="; }; - vendorSha256 = "sha256-KWM20a38jZ3/a45313kxY2LaCQyiNMEdfdIV78phrBo="; + vendorSha256 = "sha256-aBw9C488a3Wxde3QCCU0eiagiRYOS9mkjcCsB2Mrdr0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 5bb125c10077e..7f6ff3be034f9 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,9 @@ -{ callPackage, libsForQt5 }: +{ callPackage +, libsForQt5 +}: let - stableVersion = "2.2.29"; + stableVersion = "2.2.31"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -18,16 +20,13 @@ let }); }; commonOverrides = [ - (mkOverride "psutil" "5.8.0" - "sha256-DJzLmat2Al8vC77PNB1GVunBNR24zIoDzNYuMYq0tcY=") - (mkOverride "jsonschema" "3.2.0" - "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") + (mkOverride "jsonschema" "3.2.0" "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "04yqh0kq5pkmadcxf090ilh9sqqxajcg65nf7ai1iikxi3x7z3r8"; - serverSrcHash = "0p6q421rldmyqi0padssgrssf4d9mb5ifiqjm5y8vfhwfl5a2cqk"; + guiSrcHash = "sha256-o9j/avuapiUKIDO6aO/uWFF/5gu+xdfhL7ZSDSaQ858="; + serverSrcHash = "sha256-8r8nWNqbHUDtJ6x+/SxHxaw1isSuWF/5as3YXLB6LFw="; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 95ec995cbfd56..8d1ab4e590c56 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -1,6 +1,16 @@ -{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }: +{ stable +, branch +, version +, sha256Hash +, mkOverride +, commonOverrides +}: -{ lib, python3, fetchFromGitHub, wrapQtAppsHook }: +{ lib +, python3 +, fetchFromGitHub +, wrapQtAppsHook +}: let defaultOverrides = commonOverrides ++ [ @@ -34,21 +44,33 @@ in python.pkgs.buildPythonPackage rec { sha256 = sha256Hash; }; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ + wrapQtAppsHook + ]; + propagatedBuildInputs = with python.pkgs; [ - sentry-sdk psutil jsonschema # tox for check - # Runtime dependencies - sip_4 (pyqt5.override { withWebSockets = true; }) distro setuptools + distro + jsonschema + psutil + sentry-sdk + setuptools + sip_4 (pyqt5.override { withWebSockets = true; }) ]; doCheck = false; # Failing + dontWrapQtApps = true; + postFixup = '' wrapQtApp "$out/bin/gns3" ''; + postPatch = '' substituteInPlace requirements.txt \ - --replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \ + --replace "sentry-sdk==" "sentry-sdk>=" \ + --replace "psutil==" "psutil>=" \ + --replace "distro==" "distro>=" \ + --replace "setuptools==" "setuptools>=" ''; meta = with lib; { diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 818c01a89ab4c..50a2453b04084 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,23 +1,20 @@ -{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }: +{ stable +, branch +, version +, sha256Hash +, mkOverride +, commonOverrides +}: -{ lib, python3, fetchFromGitHub, packageOverrides ? self: super: {} - }: +{ lib +, python3 +, fetchFromGitHub +, packageOverrides ? self: super: {} +}: let defaultOverrides = commonOverrides ++ [ (self: super: { - aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { - pname = "aiofiles"; - version = "0.7.0"; - src = fetchFromGitHub { - owner = "Tinche"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-njQ7eRYJO+dUrwO5pZwKHXn9nVSGYcEhwhs3x5BMc28="; - }; - doCheck = false; - }); - jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { version = "3.2.0"; @@ -51,16 +48,33 @@ in python.pkgs.buildPythonApplication { postPatch = '' substituteInPlace requirements.txt \ - --replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \ - --replace "Jinja2==3.0.1" "Jinja2>=3.0.1" \ - --replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \ - --replace "async-timeout==3.0.1" "async-timeout>=3.0.1" \ + --replace "aiohttp==" "aiohttp>=" \ + --replace "aiofiles==" "aiofiles>=" \ + --replace "Jinja2==" "Jinja2>=" \ + --replace "sentry-sdk==" "sentry-sdk>=" \ + --replace "async-timeout==" "async-timeout>=" \ + --replace "psutil==" "psutil>=" \ + --replace "distro==" "distro>=" \ + --replace "py-cpuinfo==" "py-cpuinfo>=" \ + --replace "setuptools==" "setuptools>=" ''; propagatedBuildInputs = with python.pkgs; [ - aiohttp-cors yarl aiohttp multidict setuptools - jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles - prompt-toolkit py-cpuinfo + aiofiles + aiohttp + aiohttp-cors + async_generator + distro + jinja2 + jsonschema + multidict + prompt-toolkit + psutil + py-cpuinfo + sentry-sdk + setuptools + yarl + zipstream ]; # Requires network access diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index e91b517e81584..adbda434b422d 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "zeek"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "sha256-jZoCjKn+x61KnkinY+KWBSOEz0AupM03FXe/8YPCdFE="; + sha256 = "sha256-axNImzBJTHxd2kU/xQmB5ZQ9ZxW2ybW3qFq7gLvm0RY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index a810dbdc3a1f9..90a0cd6f53a37 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -1,21 +1,22 @@ -{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper +{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook, makeWrapper, wrapGAppsHook , alsa-lib, dbus, fontconfig, freetype, glib, gst_all_1, libGL , libinput, libpulseaudio, libsecret, libtiff, libxkbcommon , mesa, openssl, systemd, xorg }: stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.41.0"; + version = "8.44.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-qW+MB71sylKJQycSX6hiBgxAO4MuhnBaPGFjm+6y4vk="; + sha256 = "sha256-6BhhUfULtCUO5jZFF+HxGuFCg0XojQ0NJUXHxMtnwN4="; }; nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook + wrapGAppsHook ]; buildInputs = [ @@ -25,6 +26,7 @@ stdenv.mkDerivation rec { freetype glib gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-base libGL libinput @@ -72,7 +74,7 @@ stdenv.mkDerivation rec { description = "Video-conferencing application, specialized in virtual online meetings, seminars, training sessions and conferences"; homepage = "https://alfaview.com"; license = licenses.unfree; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = with maintainers; [ wolfangaukang hexchen ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index ad57e2c6623b2..c902a7e67c57e 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.26.0.136"; + version = "2.27.0.130"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-9QiE7CjCepDXQCzduqGzNUGqUgYS+PWBS71ouzHa83o="; + sha256 = "sha256-J0BGL03k1NAJLLEUOfvKjZEsBlupeHJR2Bp3c0ANBwg="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix new file mode 100644 index 0000000000000..aa0a8f7bfc467 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix @@ -0,0 +1,50 @@ +{ lib +, fetchurl +, appimageTools +, gtk3 +, gsettings-desktop-schemas +, xorg +, pname +, version +, sha256 +, metaCommon ? { } +}: + +let + name = "${pname}-${version}"; + src = fetchurl { + url = "https://github.com/sindresorhus/caprine/releases/download/v${version}/Caprine-${version}.AppImage"; + name = "Caprine-${version}.AppImage"; + inherit sha256; + }; + extracted = appimageTools.extractType2 { inherit name src; }; +in +(appimageTools.wrapType2 { + inherit name src; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs; + + extraInstallCommands = '' + mv $out/bin/{${name},caprine} + + mkdir -p $out/share + "${xorg.lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share" + ln -s ${extracted}/caprine.png $out/share/icons/caprine.png + mkdir $out/share/applications + cp ${extracted}/caprine.desktop $out/share/applications/ + substituteInPlace $out/share/applications/caprine.desktop \ + --replace AppRun caprine + ''; + + meta = metaCommon // { + platforms = [ "x86_64-linux" ]; + mainProgram = "caprine"; + }; +}) // { + inherit pname version; +} diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix new file mode 100644 index 0000000000000..3dc457c48826e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix @@ -0,0 +1,35 @@ +{ stdenvNoCC +, lib +, fetchurl +, undmg +, pname +, version +, sha256 +, metaCommon ? { } +}: + +stdenvNoCC.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://github.com/sindresorhus/caprine/releases/download/v${version}/Caprine-${version}.dmg"; + name = "Caprine-${version}.dmg"; + inherit sha256; + }; + + sourceRoot = "Caprine.app"; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + mkdir -p "$out/Applications/Caprine.app" + cp -R . "$out/Applications/Caprine.app" + mkdir "$out/bin" + ln -s "$out/Applications/Caprine.app/Contents/MacOS/Caprine" "$out/bin/caprine" + ''; + + meta = metaCommon // { + platforms = with lib.platforms; darwin; + mainProgram = "caprine"; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix new file mode 100644 index 0000000000000..04e0e91ddc280 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -0,0 +1,25 @@ +{ lib, callPackage, stdenvNoCC }: +let + pname = "caprine"; + version = "2.55.4"; + metaCommon = with lib; { + description = "An elegant Facebook Messenger desktop app"; + homepage = "https://sindresorhus.com/caprine"; + license = licenses.mit; + maintainers = with maintainers; [ ShamrockLee ]; + }; + x86_64-appimage = callPackage ./build-from-appimage.nix { + inherit pname version metaCommon; + sha256 = "221PyDoCkWqDdewCkFycpjMTcVOcl58blCjrC7O7xyk="; + }; + x86_64-dmg = callPackage ./build-from-dmg.nix { + inherit pname version metaCommon; + sha256 = "6SOqlH7Z9DuQVR4i1OltnSb4dJscFUxaXxgNkE5FVUE="; + }; +in +(if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { + passthru = (oldAttrs.passthru or { }) // { inherit x86_64-appimage x86_64-dmg; }; + meta = oldAttrs.meta // { + platforms = x86_64-appimage.meta.platforms ++ x86_64-dmg.meta.platforms; + }; +}) diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 34b525a98a61d..35266eff90092 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.6.1"; + version = "0.6.4"; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { repo = "chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-AufxwuOibTx5OvLBVbJqay/mYLmcDpE2BgwVv6Y5IlY="; + hash = "sha256-uDuSx+tWv6DV93/99QUcUKZaWA9kNW8phHZhetYlG/M="; }; postPatch = '' @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PURPLE_PLUGIN_PATH : ${pidgin.makePluginPath plugins} + --prefix PURPLE_PLUGIN_PATH : ${lib.escapeShellArg (pidgin.makePluginPath plugins)} ${lib.concatMapStringsSep " " (p: p.wrapArgs or "") plugins} ) ''; diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 940d0b6b92b3a..57fb1b58d90f3 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "1.8.2"; + version = "2.0.2"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "sha256-0harFaO1MWzTmN/Q3e38MC2O7P9yVeQ5ZSy0yiGbtCs="; + sha256 = "sha256-qVnNVJK/Y76cZTh8QNeSNHDxHA/Ekbt7X6mKYkYAPNU="; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 266f3958adfd8..009ece90b4c69 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -31,6 +31,7 @@ let name = "${old.pname}-${version}"; hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok="; }; + patches = [ ./libdeltachat-darwin-dylib.patch ] ++ old.patches; }); electronExec = if stdenv.isDarwin then "${electron_16}/Applications/Electron.app/Contents/MacOS/Electron" diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch b/pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch new file mode 100644 index 0000000000000..caa44a62a062d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch @@ -0,0 +1,53 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ed8020c..44ca43e7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,12 +2,20 @@ cmake_minimum_required(VERSION 3.16) + project(deltachat LANGUAGES C) + include(GNUInstallDirs) + ++if(APPLE) ++ set(DYNAMIC_EXT "dylib") ++elseif(UNIX) ++ set(DYNAMIC_EXT "so") ++else() ++ set(DYNAMIC_EXT "dll") ++endif() ++ + find_program(CARGO cargo) + + add_custom_command( + OUTPUT + "target/release/libdeltachat.a" +- "target/release/libdeltachat.so" ++ "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + COMMAND + PREFIX=${CMAKE_INSTALL_PREFIX} +@@ -32,11 +40,11 @@ add_custom_target( + ALL + DEPENDS + "target/release/libdeltachat.a" +- "target/release/libdeltachat.so" ++ "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + ) + + install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-install(FILES "target/release/libdeltachat.so" DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +diff --git a/python/install_python_bindings.py b/python/install_python_bindings.py +index c8ed43e2..714c7e30 100755 +--- a/python/install_python_bindings.py ++++ b/python/install_python_bindings.py +@@ -24,7 +24,7 @@ + + print("running:", " ".join(cmd)) + subprocess.check_call(cmd) +- subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True) ++ subprocess.check_call("rm -rf build/ src/deltachat/*.so src/deltachat/*.dylib" , shell=True) + + if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild": + subprocess.check_call([ diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index d3416ef588014..287c23401e064 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.17"; ptb = "0.0.29"; - canary = "0.0.134"; + canary = "0.0.135"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -31,7 +31,7 @@ let canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-HyJa6lGcKMPKWffO/pnNcn8fDTJj6O4J8Y5RA23a1kM="; + sha256 = "sha256-dmG+3BWS1BMHHQAv4fsXuObVeAJBeD+TqnyQz69AMac="; }; }; x86_64-darwin = { diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 05833c1eeaf43..f5d984bf3a67d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,5 +1,5 @@ { pname, version, src, meta, binaryName, desktopName, autoPatchelfHook -, makeDesktopItem, lib, stdenv, wrapGAppsHook, alsa-lib, at-spi2-atk +, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf , glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libxshmfence mesa nss - wrapGAppsHook + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) ]; dontWrapGApps = true; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 46ee444c37839..46a64d1b533ca 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.8", + "version": "1.10.12", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -81,14 +81,15 @@ "rimraf": "^3.0.2", "tar": "^6.1.2", "ts-node": "^10.4.0", - "typescript": "^4.5.3" + "typescript": "4.5.5" }, "hakDependencies": { - "matrix-seshat": "^2.3.0", - "keytar": "^5.6.0" + "matrix-seshat": "^2.3.3", + "keytar": "^7.9.0" }, "build": { "appId": "im.riot.app", + "asarUnpack": "**/*.node", "files": [ "package.json", { diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index d487e9ae31602..77058ce04c318 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.10.8", - "desktopSrcHash": "S9MQIn773BzCH4dsTkD1DpIThDzoIGr4Heaie2Qs0jY=", - "desktopYarnHash": "1imx43qbpj08l6d0fji31kcxqshcpr0ch8dzfbbgxyjvblq2p8ln", - "webHash": "02i6l3armzr19kki3hgshhzkdpb3001nilh4h10hr3xw5z711ppr" + "version": "1.10.12", + "desktopSrcHash": "K1p/+dZRtKb+AiU2EcikAsmiTIKPw0zaVzAfUDzsYZY=", + "desktopYarnHash": "09ri87ynfgxrv22sykggiy6nlcf20qwj7zj9qq0rz3c2acr6g9mn", + "webHash": "1m7pvliymyggg6qx8gj6l3j2f4rml0km1vmk1zdspxa4l6p0qxd8" } diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 6e0e39043ee05..90ab331426a09 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -19,7 +19,7 @@ mkFranzDerivation' rec { name = "Ferdi"; version = "5.8.1"; src = fetchurl { - url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; + url = "https://master.dl.sourceforge.net/project/ferdi.mirror/v${version}/ferdi_${version}_amd64.deb"; sha256 = "sha256-Bl7bM5iDQlfPSZxksqlg7GbuwWlm53QkOf/TQEg3/n0="; }; extraBuildInputs = [ xorg.libxshmfence ]; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 9f772bf3f6d7b..b3d9194c6fe4b 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,10 +3,10 @@ mkFranzDerivation rec { pname = "franz"; name = "Franz"; - version = "5.6.1"; + version = "5.9.2"; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "1gn0n1hr6z2gsdnpxysyq6sm8y7cjr9jafhsam8ffw0bq74kph7p"; + sha256 = "sha256-W/60g5CbSUZcNASjdbiS7DNv9375GiesEG60QLLAh1g="; }; meta = with lib; { description = "A free messaging app that combines chat & messaging services into one application"; diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index 4c28e346a124c..ffe82e6708aad 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo , automake, autoconf }: @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757"; }; + patches = [ + # Pull pending patch for -fno-common tuulchain support: + # https://github.com/GNUFreetalk/freetalk/pull/39 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/GNUFreetalk/freetalk/commit/f04d6bc8422be44cdf51b29c9a4310f20a18775a.patch"; + sha256 = "1zjm56cdibnqabgcwl2bx79dj6dmqjf40zghqwwb0lfi60v1njqf"; + }) + ]; + preConfigure = '' ./autogen.sh ''; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 3c56d84db4b50..118a35381a66d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { ''; propagatedBuildInputs = with python3.pkgs; [ - nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools + nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ] ++ lib.optional enableRST docutils ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] diff --git a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix index f44c05da5c018..9cab98156c81c 100644 --- a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gotktrix"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K+q0sykdOMnAWypOXnwTU5oTokpYw61CTsAW1gIvGSQ="; + sha256 = "sha256-/UDXqN7FnFvbiXp3pID1WbNfCuKDsMrFQvL1101xxOo="; }; - vendorSha256 = "sha256-Br9KgUoN01yoGujgbj5UEoB57K87oEH/o40rrRtIZVY="; + vendorSha256 = "sha256-xA2DW4v6aT4fEW2WSa96oRr5Yrb2HoR054V1+BiWSvk="; buildInputs = [ gtk4 diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 2395a196f6056..9625f8dcb2c3b 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2022.1.1"; + version = "2022.3.1"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "0x3fdqgjnsd570b7nszfx3h8l5c8x2kg32ig85n2a2g481c7xi6l"; + sha256 = "sha256-/5WpjmTLwQN73m7nHg4DKPbXIbD9WyJ+YBbFMD4ZDfg="; name = "${pname}-${version}.AppImage"; }; @@ -46,7 +46,8 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXtst pipewire ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXtst pipewire ]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/kaidan/default.nix b/pkgs/applications/networking/instant-messengers/kaidan/default.nix index fc14f77198b5c..c296118eff9e2 100644 --- a/pkgs/applications/networking/instant-messengers/kaidan/default.nix +++ b/pkgs/applications/networking/instant-messengers/kaidan/default.nix @@ -12,6 +12,7 @@ , knotifications , zxing-cpp , qxmpp +, sonnet , gst_all_1 }: @@ -38,6 +39,7 @@ mkDerivation rec { knotifications zxing-cpp qxmpp + sonnet gstreamer gst-plugins-bad gst-plugins-base diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index 5fe90d50a31a8..baa4613b1731d 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2022-01-02"; + version = "unstable-2022-03-20"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "ec545c8208c870c44312558f91c79e6ffce4444e"; - hash = "sha256-s/dJ2ahdUK7ODKsna+tl81e+VQLkCAELb/iEXf9WlIM="; + rev = "8cce6d20b49e917929521a13caed30e81037c868"; + hash = "sha256-1L45KodOmvy6pBbBzJwGWMAY7y3+lfxjeXtsH1SdipU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 47ee2a68a51a4..306a53f0a3c0e 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,57 +1,39 @@ -{ bcg729 -, bctoolbox -, bcunit +{ bctoolbox , belcard , belle-sip , belr -, bzrtp -, cairo , cmake -, cyrus_sasl , fetchFromGitLab -, fetchurl -, ffmpeg -, gdk-pixbuf -, glib -, gnused -, graphviz -, gtk2 -, intltool , lib -, libexosip , liblinphone -, libmatroska -, libnotify -, libosip -, libsoup -, libupnp -, libX11 -, libxml2 -, makeWrapper -, mbedtls , mediastreamer , mediastreamer-openh264 , minizip2 , mkDerivation -, openldap -, ortp -, pango -, pkg-config -, qtbase , qtgraphicaleffects , qtquickcontrols2 , qttranslations -, readline -, speex -, sqlite - -, udev -, zlib }: +# How to update Linphone? (The Qt desktop app) +# +# Belledonne Communications (BC), the company making Linphone, has split the +# project into several sub-projects that they maintain, plus some third-party +# dependencies that they also extend with commits of their own, specific to +# Linphone and not (yet?) upstreamed. +# +# All of this is organised in a Software Development Kit (SDK) meta-repository +# with git submodules to pin all those repositories into a coherent whole. +# +# The Linphone Qt desktop app uses this SDK as submodule as well. +# +# So, in order to update the desktop app to a new release, one has to follow +# the submodule chain and update the corresponding derivations here, in nixpkgs, +# with the corresponding version number (or commit hash) + mkDerivation rec { pname = "linphone-desktop"; - version = "4.2.5"; + version = "4.4.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -59,12 +41,13 @@ mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1gq4l9p21rbrcksa7fbkzn9fzbbynqmn6ni6lhnvzk359sb1xvbz"; + sha256 = "sha256-BBOTyKMZikkxMJSmzAuChVHpVeCvbAimn1K3REGbqEg="; }; patches = [ ./do-not-build-linphone-sdk.patch ./remove-bc_compute_full_version-usage.patch + ./no-store-path-in-autostart.patch ]; # See: https://gitlab.linphone.org/BC/public/linphone-desktop/issues/21 @@ -78,57 +61,26 @@ mkDerivation rec { # there might be some build inputs here that aren't needed for # linphone-desktop. buildInputs = [ - bcg729 + # Made by BC bctoolbox belcard belle-sip belr - bzrtp - cairo - cyrus_sasl - ffmpeg - gdk-pixbuf - glib - gtk2 - libX11 - libexosip liblinphone - libmatroska - libnotify - libosip - libsoup - libupnp - libxml2 - mbedtls mediastreamer mediastreamer-openh264 + minizip2 - openldap - ortp - pango - qtbase qtgraphicaleffects qtquickcontrols2 qttranslations - readline - speex - sqlite - udev - zlib ]; nativeBuildInputs = [ - bcunit cmake - gnused - graphviz - intltool - makeWrapper - pkg-config ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DMINIZIP_INCLUDE_DIRS=${minizip2}/include" "-DMINIZIP_LIBRARIES=minizip" ]; @@ -162,18 +114,25 @@ mkDerivation rec { # Linphone will randomly crash when it tries to access those files. Then, # those just need to be copied manually below. installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin $out/lib cp linphone-app/linphone $out/bin/ + cp linphone-app/libapp-plugin.so $out/lib/ + mkdir -p $out/lib/mediastreamer/plugins + ln -s ${mediastreamer-openh264}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ + ln -s ${mediastreamer}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ wrapProgram $out/bin/linphone \ --set MEDIASTREAMER_PLUGINS_DIR \ - ${mediastreamer-openh264}/lib/mediastreamer/plugins + $out/lib/mediastreamer/plugins mkdir -p $out/share/applications cp linphone-app/linphone.desktop $out/share/applications/ - cp -r ../linphone-app/assets/icons $out/share/ + mkdir -p $out/share/icons/hicolor/scalable/apps + cp ../linphone-app/assets/images/linphone_logo.svg $out/share/icons/hicolor/scalable/apps/linphone.svg mkdir -p $out/share/belr/grammars ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/ + ln -s ${belle-sip}/share/belr/grammars/* $out/share/belr/grammars/ mkdir -p $out/share/linphone ln -s ${liblinphone}/share/linphone/* $out/share/linphone/ + ln -s ${liblinphone}/share/sounds $out/share/sounds ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch b/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch index fe774a479fac2..dc635b32a0312 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch +++ b/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch @@ -1,30 +1,31 @@ -From 08b8b1811a1ad079fa713d19a8cc6bf2dc782bb7 Mon Sep 17 00:00:00 2001 -From: David P <megver83@parabola.nu> -Date: Thu, 26 Nov 2020 15:56:30 -0300 -Subject: [PATCH 1/2] do not build linphone-sdk +From e6a9992461f368d08d1ad63ffe454714ec0c59ce Mon Sep 17 00:00:00 2001 +From: Lorenz Brun <lorenz@brun.one> +Date: Fri, 28 Jan 2022 02:36:01 +0100 +Subject: [PATCH] Remove Linphone SDK build -Signed-off-by: David P <megver83@parabola.nu> --- - CMakeLists.txt | 61 +------------------ - .../cmake_builder/additional_steps.cmake | 9 --- - 2 files changed, 3 insertions(+), 67 deletions(-) + CMakeLists.txt | 86 ++----------------- + .../cmake_builder/additional_steps.cmake | 9 -- + 2 files changed, 5 insertions(+), 90 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index f7eb05f2..5921ee5b 100644 +index 2002b925..6d92a8e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -118,7 +118,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") - +@@ -152,7 +152,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") + list(APPEND APP_OPTIONS "-DENABLE_QT_GL=${ENABLE_VIDEO}")#Activate on video -include(ExternalProject) set(PROJECT_BUILD_COMMAND "") if(CMAKE_BUILD_PARALLEL_LEVEL) list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") -@@ -136,29 +135,8 @@ if(UNIX AND NOT APPLE) - set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}") - list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}") +@@ -190,30 +189,8 @@ if(ENABLE_BUILD_APP_PLUGINS) + endif() endif() + +- +-if(NOT LINPHONE_QT_ONLY) -ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" - SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" - INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" @@ -35,7 +36,7 @@ index f7eb05f2..5921ee5b 100644 - INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." - LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -- #BUILD_ALWAYS NO #${DO_BUILD} +- BUILD_ALWAYS NO #${DO_BUILD} -) -ExternalProject_Add_Step(sdk force_build - COMMENT "Forcing build for 'desktop'" @@ -43,18 +44,17 @@ index f7eb05f2..5921ee5b 100644 - DEPENDERS build - ALWAYS 1 -) +-endif() include(FindPkgConfig) -set(APP_DEPENDS sdk) -- -- - find_package(Qt5 5.12 COMPONENTS Core REQUIRED) + find_package(Qt5 5.10 COMPONENTS Core REQUIRED) if ( NOT Qt5_FOUND ) -@@ -173,39 +151,6 @@ find_package(Mediastreamer2 CONFIG QUIET) +@@ -227,62 +204,9 @@ find_package(belcard CONFIG QUIET) + find_package(Mediastreamer2 CONFIG QUIET) find_package(ortp CONFIG QUIET) - -if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS) - message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install") - ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app" @@ -63,23 +63,51 @@ index f7eb05f2..5921ee5b 100644 - BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" - DEPENDS ${APP_DEPENDS} - BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} -- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be done by external project" +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." - LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} - # ${APP_OPTIONS} - BUILD_ALWAYS ON - ) +- if( ENABLE_BUILD_APP_PLUGINS) +- ExternalProject_Add(app-plugins PREFIX "${CMAKE_BINARY_DIR}/plugins-app" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/plugins" +- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- BINARY_DIR "${CMAKE_BINARY_DIR}/plugins-app" +- DEPENDS linphone-qt +- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- ) +- endif() - install(CODE "message(STATUS Running install)") - set(AUTO_REGENERATION auto_regeneration) -- add_custom_target(${AUTO_REGENERATION} ALL -- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -- DEPENDS linphone-qt) +- if( ENABLE_BUILD_APP_PLUGINS) +- add_custom_target(${AUTO_REGENERATION} ALL +- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} +- DEPENDS app-plugins) +- else() +- add_custom_target(${AUTO_REGENERATION} ALL +- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} +- DEPENDS linphone-qt) +- endif() -else() - message("Adding Linphone Desktop in an IDE-friendly state") - set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") - add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) -- add_dependencies(app-library ${APP_DEPENDS}) --endif() +- if(NOT LINPHONE_QT_ONLY) +- add_dependencies(app-library ${APP_DEPENDS}) +- endif() +- if( ENABLE_BUILD_APP_PLUGINS) +- add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app") +- endif() ++message("Adding Linphone Desktop in an IDE-friendly state") ++set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") ++add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) ++if( ENABLE_BUILD_APP_PLUGINS) ++ add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app") + endif() -ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app" - SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" - INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" @@ -89,11 +117,8 @@ index f7eb05f2..5921ee5b 100644 - LIST_SEPARATOR | # Use the alternate list separator - CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} - EXCLUDE_FROM_ALL ON -- BUILD_ALWAYS ON +- #BUILD_ALWAYS ON -) -+message("Adding Linphone Desktop in an IDE-friendly state") -+set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") -+add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake index 7f7fd573..a69a04e8 100644 --- a/linphone-app/cmake_builder/additional_steps.cmake @@ -114,5 +139,5 @@ index 7f7fd573..a69a04e8 100644 endif () endif () -- -2.29.2 +2.25.1 diff --git a/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch b/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch new file mode 100644 index 0000000000000..dc1b0be916cdf --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch @@ -0,0 +1,27 @@ +From 6a26922e5e4363de36057d635a1bf889160b2533 Mon Sep 17 00:00:00 2001 +From: Lorenz Brun <lorenz@brun.one> +Date: Fri, 28 Jan 2022 18:44:43 +0100 +Subject: [PATCH] Do not use store path for autostart on Nix + +--- + linphone-app/src/app/App.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp +index 868f8f44..2c61c648 100644 +--- a/linphone-app/src/app/App.cpp ++++ b/linphone-app/src/app/App.cpp +@@ -858,6 +858,10 @@ void App::setAutoStart (bool enabled) { + exec = QProcessEnvironment::systemEnvironment().value(QStringLiteral("APPIMAGE")); + qDebug() << "exec path autostart set appimage=" << exec; + } ++ else if (binPath.startsWith("/nix/store")) { // Nix/NixOS ++ exec = QStringLiteral("linphone"); ++ qDebug() << "exec path autostart set nix=" << exec; ++ } + else { //classic package + exec = binPath; + qDebug() << "exec path autostart set classic package=" << exec; +-- +2.25.1 + diff --git a/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch b/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch index 547652d3af7fb..225f0e78db233 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch +++ b/pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch @@ -1,7 +1,7 @@ -From 6fc23da651d54979e73776fcda38614e290d65dc Mon Sep 17 00:00:00 2001 +From 4849d5633b98e6d3514355436eab5ba537cbfd99 Mon Sep 17 00:00:00 2001 From: David P <megver83@parabola.nu> Date: Fri, 23 Oct 2020 16:44:17 -0300 -Subject: [PATCH 2/2] remove bc_compute_full_version usage +Subject: [PATCH] remove bc_compute_full_version usage --- linphone-app/CMakeLists.txt | 11 +---------- @@ -10,7 +10,7 @@ Subject: [PATCH 2/2] remove bc_compute_full_version usage 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt -index 3bc9420a..27b418ee 100644 +index de7f917f..ee14ff78 100644 --- a/linphone-app/CMakeLists.txt +++ b/linphone-app/CMakeLists.txt @@ -21,17 +21,8 @@ @@ -30,8 +30,8 @@ index 3bc9420a..27b418ee 100644 - -project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") + if(ENABLE_BUILD_VERBOSE) - #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") diff --git a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt index 8ef03faa..97d94bd6 100644 --- a/linphone-app/build/CMakeLists.txt @@ -49,7 +49,7 @@ index 8ef03faa..97d94bd6 100644 set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}) diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt -index baea03cf..08ffc1b5 100644 +index ac85c68a..e6af5a66 100644 --- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt @@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui") @@ -70,5 +70,5 @@ index baea03cf..08ffc1b5 100644 endif () string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}") -- -2.29.2 +2.25.1 diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix index 2992bf22cb311..c1eafe304a9df 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix index 9e35279488184..f2b02ebdec4f5 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix @@ -6,13 +6,13 @@ postInstall = '' mkdir "$out/bin" echo '#!/bin/sh' >> "$out/bin/matrix-recorder" - echo "'${pkgs.nodejs-12_x}/bin/node'" \ + echo "'${pkgs.nodejs-14_x}/bin/node'" \ "'$out/lib/node_modules/matrix-recorder/matrix-recorder.js'" \ '"$@"' >> "$out/bin/matrix-recorder" echo '#!/bin/sh' >> "$out/bin/matrix-recorder-to-html" echo 'cd "$1"' >> "$out/bin/matrix-recorder-to-html" echo "test -d templates/ || ln -sfT '$out/lib/node_modules/matrix-recorder/templates' templates" >> "$out/bin/matrix-recorder-to-html" - echo "'${pkgs.nodejs-12_x}/bin/node'" \ + echo "'${pkgs.nodejs-14_x}/bin/node'" \ "'$out/lib/node_modules/matrix-recorder/recorder-to-html.js'" \ '.' >> "$out/bin/matrix-recorder-to-html" chmod a+x "$out/bin/matrix-recorder" diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 2034f1761f2e3..8ffe6f05f5df7 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -18,30 +18,23 @@ , pkg-config , readline , sqlite -, autoAwaySupport ? true, libXScrnSaver ? null, libX11 +, autoAwaySupport ? true, libXScrnSaver, libX11 , notifySupport ? true, libnotify, gdk-pixbuf , omemoSupport ? true, libsignal-protocol-c, libgcrypt , pgpSupport ? true, gpgme -, pythonPluginSupport ? true, python -, traySupport ? true, gtk +, pythonPluginSupport ? true, python3 +, traySupport ? true, gtk3 }: -assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; -assert notifySupport -> libnotify != null && gdk-pixbuf != null; -assert traySupport -> gtk != null; -assert pgpSupport -> gpgme != null; -assert pythonPluginSupport -> python != null; -assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; - stdenv.mkDerivation rec { pname = "profanity"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - hash = "sha256-kmixWp9Q2tMVp+tk5kbTdBfgRNghKk3+48L582hqlm8="; + hash = "sha256-yUiiww8yhymdqR6CITRnItxZhfpZiEbu1WyD8bDW+vc="; }; patches = [ @@ -75,8 +68,8 @@ stdenv.mkDerivation rec { ++ lib.optionals notifySupport [ libnotify gdk-pixbuf ] ++ lib.optionals omemoSupport [ libsignal-protocol-c libgcrypt ] ++ lib.optionals pgpSupport [ gpgme ] - ++ lib.optionals pythonPluginSupport [ python ] - ++ lib.optionals traySupport [ gtk ]; + ++ lib.optionals pythonPluginSupport [ python3 ] + ++ lib.optionals traySupport [ gtk3 ]; # Enable feature flags, so that build fail if libs are missing configureFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index aeb20d6779ef5..fe3f90346f1cc 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins; mkDerivation rec { pname = "psi-plus"; - version = "1.5.1615"; + version = "1.5.1618"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "sha256-aD+JVGmBWHUav2bH9rXGtgqI+/5lJTMrYLRP7E65JxI="; + sha256 = "sha256-ueZYFOZFCPQrg9etZCrY5ZTn7PZMkcuwbXVPPbW9S/A="; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 76f93d9d2173a..7379d769288bd 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -48,7 +48,7 @@ mkDerivation rec { install -Dm755 ${src}/Ripcord $out/Ripcord patchelf --replace-needed libsodium.so.18 libsodium.so $out/Ripcord makeQtWrapper $out/Ripcord $out/bin/ripcord \ - --run "cd $out" \ + --chdir "$out" \ --set FONTCONFIG_FILE "${fontsConf}" \ --prefix LD_LIBRARY_PATH ":" "${xorg.libXcursor}/lib" \ --prefix QT_XKB_CONFIG_ROOT ":" "${xorg.xkeyboardconfig}/share/X11/xkb" \ diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index ac17f7590888e..71379039de6f2 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.7.8"; + version = "3.8.5"; src = fetchurl { - url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb"; - sha256 = "sha256-61HSJIFir+ikwui7KtPm2BDstIRWY/WruGX3WSfY5ZI="; + url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; + sha256 = "sha256-nKEfdbHfLjM4w79hzQdKiC4+IT3WXdDdlXkzelCKqOw"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json index d227dc4b0fbe3..ef981716ef1d4 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,9 +1,9 @@ { - "version": "1.10.4-sc.1", - "rev": "v1.10.4-sc.1", - "srcHash": "0sxibzskbw9pa6wmbk1y3n7p74cfj9zvm2hsw76sp6wfac1wnbwl", - "webYarnHash": "1z8xr35gh74y2iv9kfk6d6b6f3iclcrpkdds5q7rh2irpf14fwpw", - "jsSdkYarnHash": "1cwvb0hwq19dh2937fmcbfvnkkfmalk9wrxf1yv81nsbyjnx86di", - "reactSdkYarnHash": "0j4rxg11q35idfzvjrpmyrwkz9yqgzpwps3xqx1k4qcs844jjs9f", - "desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn" + "version": "1.10.12-sc.1", + "rev": "v1.10.12-sc.1", + "srcHash": "1rpfax6xx731w59a2i7v6jr17l3rnrn79d666f0cjchg36nkqqg9", + "webYarnHash": "0m5dnz3m68iz94siwmavzj50wxd6w6wanjsm1zhq76lgymgcbqc2", + "jsSdkYarnHash": "1k1jvavbqr7vcbdaxc6yqiq5254kxhywn1s2zndrfny7ap8z5c1c", + "reactSdkYarnHash": "0cz7pgrbysljmhpf4m0wqwqjqijxahl3wz5qhczlkj46dvq6qyxb", + "desktopYarnHash": "09ri87ynfgxrv22sykggiy6nlcf20qwj7zj9qq0rz3c2acr6g9mn" } diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix index a7ad6fb4d9b1d..7041a19684c30 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -78,13 +78,8 @@ in stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - pushd matrix-react-sdk - ../element-web/node_modules/.bin/reskindex -h ../element-web/src/header - popd - pushd element-web node scripts/copy-res.js - node_modules/.bin/reskindex -h ../element-web/src/header node_modules/.bin/webpack --progress --mode production popd diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index 4518627fe2b89..0c11beb9ebc25 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -7,12 +7,12 @@ }: let - version = "1.7.9"; + version = "1.8.4"; pname = "session-desktop-appimage"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "ca7754e59146633b71e66b02a90cff87e4f2574e57ff831ca4a5f983b7e2fbef"; + sha256 = "Az9NEsqU4ZcmuSno38zflT4M4lI6/4ShEh3FVTcyRJg="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 64586dcd70ef8..d63c87ee5da55 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests +{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, makeWrapper, nixosTests , gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.38.0"; # Please backport all updates to the stable channel. + version = "5.43.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: @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-PmeJ6ZNjQjxuPl1UqunQT0q6uUZxt5gDFJS/WCcHE68="; + sha256 = "sha256-DYJ3WZbaalKhQXhVQO3qhJiGj92Cc+pwRDx/YBIi6gg="; }; nativeBuildInputs = [ autoPatchelfHook dpkg - wrapGAppsHook + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index f03a91faa23f9..f81b8853c8b26 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220316"; + version = "20220430"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-c9eqY3KBzCrNOLNf1DGpARmxGzwga3+tBg3e7Yr+Rb8="; + sha256 = "sha256-clG0B7PgtlpsSnZgglkv7y7SOtMTBvwJMnvMrcTWXdI="; }; # Remove when Apple SDK is >= 10.13 diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 5b542efff2309..f4574e02a49dc 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.25.0"; x86_64-darwin-sha256 = "1ffg003ic0jhkis9ai2873axwzqj9yvjab8212zwhvr3a23zzr5c"; - x86_64-linux-version = "4.25.0"; - x86_64-linux-sha256 = "0b22hnf9bzdzffnxrsjqcimqhz5imshvp9gw9baz12d45jh610g8"; + x86_64-linux-version = "4.25.1"; + x86_64-linux-sha256 = "sha256-ndDVipgcLELRZ2siIAurq7umL62+g3yRL0U311DC8Ik="; aarch64-darwin-version = "4.25.0"; aarch64-darwin-sha256 = "0s4c66bzi42y2r1c94r4ds5fyzzgvzkvrria0z45ysa47lnldp0f"; @@ -81,7 +81,7 @@ let description = "Desktop client for Slack"; homepage = "https://slack.com"; license = licenses.unfree; - maintainers = with maintainers; [ mmahut ]; + maintainers = with maintainers; [ mmahut maxeaubrey ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 84310498eee40..07462b4cc26f8 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, runtimeShell , fetchurl , autoPatchelfHook , wrapGAppsHook @@ -22,7 +23,7 @@ let pname = "teams"; - version = "1.4.00.26453"; + version = "1.5.00.10453"; meta = with lib; { description = "Microsoft Teams"; homepage = "https://teams.microsoft.com"; @@ -37,7 +38,7 @@ let src = fetchurl { url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "0ndqk893l17m42hf5fiiv6mka0v7v8r54kblvb67jsxajdvva5gf"; + hash = "sha256-fLVw2axSMetuaoRzjg+x4DRYY8WP5TQbL7LbfF6LFfA="; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ]; @@ -57,8 +58,6 @@ let preFixup = '' gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin") - gappsWrapperArgs+=(--add-flags --disable-namespace-sandbox) - gappsWrapperArgs+=(--add-flags --disable-setuid-sandbox) ''; @@ -121,9 +120,13 @@ let done; # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406 - # while we create the wrapper ourselves, gappsWrapperArgs leads to the same issue - # another option would be to introduce gappsWrapperAppendedArgs, to allow control of positioning - substituteInPlace "$out/bin/teams" --replace '.teams-wrapped" --disable-namespace-sandbox --disable-setuid-sandbox "$@"' '.teams-wrapped" "$@" --disable-namespace-sandbox --disable-setuid-sandbox' + wrapped=$out/bin/.teams-old + mv "$out/bin/teams" "$wrapped" + cat > "$out/bin/teams" << EOF + #! ${runtimeShell} + exec $wrapped "\$@" --disable-namespace-sandbox --disable-setuid-sandbox + EOF + chmod +x "$out/bin/teams" ''; }; @@ -134,7 +137,7 @@ let src = fetchurl { url = "https://statics.teams.cdn.office.net/production-osx/${version}/Teams_osx.pkg"; - sha256 = "1mg6a3b3954w4xy5rlcrwxczymygl61dv2rxqp45sjcsh3hp39q0"; + hash = "sha256-vLUEvOSBUyAJIWHOAIkTqTW/W6TkgmeyRzQbquZP810="; }; buildInputs = [ xar cpio makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index ce5dc0e266e63..d7dbff715bacd 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -7,7 +7,6 @@ , ninja , clang , python3 -, wrapGAppsHook , wrapQtAppsHook , removeReferencesTo , extra-cmake-modules @@ -27,7 +26,6 @@ , tl-expected , hunspell , glibmm -, webkitgtk , jemalloc , rnnoise , abseil-cpp @@ -65,7 +63,6 @@ , IOSurface , Metal , MetalKit -, withWebKit ? false }: with lib; @@ -101,6 +98,7 @@ stdenv.mkDerivation rec { }; patches = [ + ./kf594.patch ./shortcuts-binary-path.patch # let it build with nixpkgs 10.12 sdk ./kotato-10.12-sdk.patch @@ -113,9 +111,6 @@ stdenv.mkDerivation rec { --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' - '' + optionalString (stdenv.isLinux && withWebKit) '' - 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"' '' + optionalString stdenv.isDarwin '' substituteInPlace Telegram/CMakeLists.txt \ --replace 'COMMAND iconutil' 'COMMAND png2icns' \ @@ -124,10 +119,6 @@ stdenv.mkDerivation rec { --replace "\''${appicon_path}" "\''${appicon_path}/icon_16x16.png \''${appicon_path}/icon_32x32.png \''${appicon_path}/icon_128x128.png \''${appicon_path}/icon_256x256.png \''${appicon_path}/icon_512x512.png" ''; - # We want to run wrapProgram manually (with additional parameters) - dontWrapGApps = stdenv.isLinux; - dontWrapQtApps = stdenv.isLinux && withWebKit; - nativeBuildInputs = [ pkg-config cmake @@ -139,8 +130,6 @@ stdenv.mkDerivation rec { # to build bundled libdispatch clang extra-cmake-modules - ] ++ optionals (stdenv.isLinux && withWebKit) [ - wrapGAppsHook ]; buildInputs = [ @@ -166,8 +155,6 @@ stdenv.mkDerivation rec { glibmm jemalloc wayland - ] ++ optionals (stdenv.isLinux && withWebKit) [ - webkitgtk ] ++ optionals stdenv.isDarwin [ Cocoa CoreFoundation @@ -225,13 +212,6 @@ stdenv.mkDerivation rec { remove-references-to -t ${tg_owt.dev} $out/bin/$binName ''; - postFixup = optionalString (stdenv.isLinux && withWebKit) '' - # We also use gappsWrapperArgs from wrapGAppsHook. - wrapProgram $out/bin/kotatogram-desktop \ - "''${gappsWrapperArgs[@]}" \ - "''${qtWrapperArgs[@]}" - ''; - passthru = { inherit tg_owt; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch new file mode 100644 index 0000000000000..0fa2d8bc8f6ee --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch @@ -0,0 +1,57 @@ +diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp +index 7641579aa..3c195e397 100644 +--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp ++++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp +@@ -9,10 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + + #include "base/platform/base_platform_info.h" + +-#include <connection_thread.h> +-#include <registry.h> +-#include <surface.h> +-#include <plasmashell.h> ++#include <KWayland/Client/connection_thread.h> ++#include <KWayland/Client/registry.h> ++#include <KWayland/Client/surface.h> ++#include <KWayland/Client/plasmashell.h> + + using namespace KWayland::Client; + +Submodule Telegram/lib_base contains modified content +diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp +index 32f0de6..30a087f 100644 +--- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp ++++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp +@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #include <QtCore/QPointer> + #include <QtGui/QWindow> + +-#include <connection_thread.h> +-#include <registry.h> +-#include <surface.h> +-#include <xdgforeign.h> +-#include <idleinhibit.h> ++#include <KWayland/Client/connection_thread.h> ++#include <KWayland/Client/registry.h> ++#include <KWayland/Client/surface.h> ++#include <KWayland/Client/xdgforeign.h> ++#include <KWayland/Client/idleinhibit.h> + + using namespace KWayland::Client; + +Submodule Telegram/lib_ui contains modified content +diff --git a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp +index 01f1e80..163cb6a 100644 +--- a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp ++++ b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp +@@ -24,8 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #include <private/qwaylandwindow_p.h> + #include <private/qwaylandshellsurface_p.h> + +-#include <connection_thread.h> +-#include <registry.h> ++#include <KWayland/Client/connection_thread.h> ++#include <KWayland/Client/registry.h> + + Q_DECLARE_METATYPE(QMargins); + diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch index d603c967cfde2..8c80cafc6dad5 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch @@ -1,8 +1,8 @@ diff --git a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm -index 337055443..09604b117 100644 +index 9e9a1744b..ae55f873f 100644 --- a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm +++ b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm -@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL +@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include <Cocoa/Cocoa.h> #include <CoreFoundation/CFURL.h> @@ -11,10 +11,10 @@ index 337055443..09604b117 100644 namespace Platform { namespace { diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm -index 3b4395ae3..7f8ee401f 100644 +index 1d68457bb..ac8c4e0ab 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm -@@ -119,6 +119,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { +@@ -118,6 +118,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { switch (type) { case PermissionType::Microphone: case PermissionType::Camera: @@ -22,7 +22,7 @@ index 3b4395ae3..7f8ee401f 100644 const auto nativeType = (type == PermissionType::Microphone) ? AVMediaTypeAudio : AVMediaTypeVideo; -@@ -133,6 +134,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { +@@ -132,6 +133,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { return PermissionStatus::Denied; } } @@ -30,7 +30,7 @@ index 3b4395ae3..7f8ee401f 100644 break; } return PermissionStatus::Granted; -@@ -142,6 +144,7 @@ void RequestPermission(PermissionType type, Fn<void(PermissionStatus)> resultCal +@@ -141,6 +143,7 @@ void RequestPermission(PermissionType type, Fn<void(PermissionStatus)> resultCal switch (type) { case PermissionType::Microphone: case PermissionType::Camera: @@ -38,7 +38,7 @@ index 3b4395ae3..7f8ee401f 100644 const auto nativeType = (type == PermissionType::Microphone) ? AVMediaTypeAudio : AVMediaTypeVideo; -@@ -152,6 +155,7 @@ void RequestPermission(PermissionType type, Fn<void(PermissionStatus)> resultCal +@@ -151,6 +154,7 @@ void RequestPermission(PermissionType type, Fn<void(PermissionStatus)> resultCal }); }]; } @@ -217,7 +217,7 @@ index 464f87c9c..9a008c75e 100644 controller:(not_null<Window::Controller*>)controller Submodule Telegram/ThirdParty/tgcalls contains modified content diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm -index 8a4417b..2d9794e 100644 +index b280c1b..a1ed0d2 100644 --- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm +++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm @@ -71,7 +71,7 @@ @@ -239,10 +239,10 @@ index 8a4417b..2d9794e 100644 if ([info.name isEqualToString:kRTCVideoCodecH265Name]) { return [[TGRTCVideoDecoderH265 alloc] init]; diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm -index 2901417..ac9ec2a 100644 +index 9960607..f3659b3 100644 --- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm +++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm -@@ -76,7 +76,7 @@ +@@ -89,7 +89,7 @@ [result addObject:h265Info]; } } @@ -251,7 +251,7 @@ index 2901417..ac9ec2a 100644 if (@available(macOS 10.13, *)) { if ([[AVAssetExportSession allExportPresets] containsObject:AVAssetExportPresetHEVCHighestQuality]) { [result addObject:h265Info]; -@@ -112,7 +112,7 @@ +@@ -129,7 +129,7 @@ return [[TGRTCVideoEncoderH265 alloc] initWithCodecInfo:info]; } } @@ -261,7 +261,7 @@ index 2901417..ac9ec2a 100644 if ([info.name isEqualToString:kRTCVideoCodecH265Name]) { return [[TGRTCVideoEncoderH265 alloc] initWithCodecInfo:info]; diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm -index de92427..9a5b20d 100644 +index bf99063..b717645 100644 --- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm +++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm @@ -507,8 +507,7 @@ static tgcalls::DarwinVideoTrackSource *getObjCVideoSource(const rtc::scoped_ref @@ -274,11 +274,20 @@ index de92427..9a5b20d 100644 RTCLogError(@"Dropped sample buffer. Reason: %@", droppedReason); } +@@ -682,7 +681,7 @@ static tgcalls::DarwinVideoTrackSource *getObjCVideoSource(const rtc::scoped_ref + int closest = -1; + CMTime result; + for (int i = 0; i < format.videoSupportedFrameRateRanges.count; i++) { +- const auto rateRange = format.videoSupportedFrameRateRanges[i]; ++ const AVFrameRateRange *rateRange = format.videoSupportedFrameRateRanges[i]; + int gap = abs(rateRange.minFrameRate - target); + if (gap <= closest || closest == -1) { + closest = gap; diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm -index bcabcf7..de7b6c7 100644 +index 4ef8630..3fc753c 100644 --- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm +++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm -@@ -245,9 +245,11 @@ private: +@@ -243,9 +243,11 @@ private: layer.framebufferOnly = true; layer.opaque = false; // layer.cornerRadius = 4; @@ -290,7 +299,7 @@ index bcabcf7..de7b6c7 100644 // layer.presentsWithTransaction = YES; layer.backgroundColor = [NSColor clearColor].CGColor; layer.contentsGravity = kCAGravityResizeAspectFill; -@@ -334,9 +336,7 @@ private: +@@ -332,9 +334,7 @@ private: - (RTCVideoRotation)rtcFrameRotation { if (_rotationOverride) { RTCVideoRotation rotation; @@ -323,10 +332,10 @@ index 5491702..32befc6 100644 } diff --git a/Telegram/lib_base/base/platform/mac/base_info_mac.mm b/Telegram/lib_base/base/platform/mac/base_info_mac.mm -index 29e368f..ea1f65f 100644 +index f1f259a..6629eb6 100644 --- a/Telegram/lib_base/base/platform/mac/base_info_mac.mm +++ b/Telegram/lib_base/base/platform/mac/base_info_mac.mm -@@ -203,16 +203,20 @@ void Finish() { +@@ -226,16 +226,20 @@ void Finish() { } void OpenInputMonitoringPrivacySettings() { @@ -348,10 +357,10 @@ index 29e368f..ea1f65f 100644 } diff --git a/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm b/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm -index c86ac77..b081162 100644 +index 6102705..8981239 100644 --- a/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm +++ b/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm -@@ -271,6 +271,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) { +@@ -277,6 +277,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) { if (thumbnail.isNull()) { return; } @@ -359,7 +368,7 @@ index c86ac77..b081162 100644 if (@available(macOS 10.13.2, *)) { const auto copy = thumbnail; [_private->info -@@ -284,6 +285,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) { +@@ -290,6 +291,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) { forKey:MPMediaItemPropertyArtwork]; updateDisplay(); } @@ -367,7 +376,7 @@ index c86ac77..b081162 100644 } void SystemMediaControls::setDuration(int duration) { -@@ -302,10 +304,12 @@ void SystemMediaControls::setVolume(float64 volume) { +@@ -308,10 +310,12 @@ void SystemMediaControls::setVolume(float64 volume) { } void SystemMediaControls::clearThumbnail() { @@ -380,7 +389,7 @@ index c86ac77..b081162 100644 } void SystemMediaControls::clearMetadata() { -@@ -367,9 +371,11 @@ bool SystemMediaControls::volumeSupported() const { +@@ -373,9 +377,11 @@ bool SystemMediaControls::volumeSupported() const { } bool SystemMediaControls::Supported() { diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch index a9adf5737a55c..af1d47a3b44e6 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch @@ -1,3 +1,16 @@ +diff --git a/src/rtc_base/async_resolver.cc b/src/rtc_base/async_resolver.cc +index ad1598f2..fe9c3832 100644 +--- a/src/rtc_base/async_resolver.cc ++++ b/src/rtc_base/async_resolver.cc +@@ -57,7 +57,7 @@ void GlobalGcdRunTask(void* context) { + + // Post a task into the system-defined global concurrent queue. + void PostTaskToGlobalQueue(std::unique_ptr<webrtc::QueuedTask> task) { +- dispatch_queue_global_t global_queue = ++ dispatch_queue_t global_queue = + dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); + webrtc::QueuedTask* context = task.release(); + dispatch_async_f(global_queue, context, &GlobalGcdRunTask); diff --git a/src/rtc_base/system/gcd_helpers.m b/src/rtc_base/system/gcd_helpers.m index fd9a361f..3a63be6d 100644 --- a/src/rtc_base/system/gcd_helpers.m @@ -13,10 +26,10 @@ index fd9a361f..3a63be6d 100644 dispatch_set_target_queue(queue, target); return queue; diff --git a/src/sdk/objc/components/video_codec/nalu_rewriter.cc b/src/sdk/objc/components/video_codec/nalu_rewriter.cc -index 61c1e7d6..b19f3f91 100644 +index 1121c921..f21926b0 100644 --- a/src/sdk/objc/components/video_codec/nalu_rewriter.cc +++ b/src/sdk/objc/components/video_codec/nalu_rewriter.cc -@@ -245,10 +245,7 @@ bool H265CMSampleBufferToAnnexBBuffer( +@@ -242,10 +242,7 @@ bool H265CMSampleBufferToAnnexBBuffer( int nalu_header_size = 0; size_t param_set_count = 0; OSStatus status = noErr; @@ -28,7 +41,7 @@ index 61c1e7d6..b19f3f91 100644 RTC_LOG(LS_ERROR) << "Not supported."; return false; } -@@ -271,10 +268,7 @@ bool H265CMSampleBufferToAnnexBBuffer( +@@ -268,10 +265,7 @@ bool H265CMSampleBufferToAnnexBBuffer( size_t param_set_size = 0; const uint8_t* param_set = nullptr; for (size_t i = 0; i < param_set_count; ++i) { @@ -40,7 +53,7 @@ index 61c1e7d6..b19f3f91 100644 RTC_LOG(LS_ERROR) << "Not supported."; return false; } -@@ -514,11 +508,7 @@ CMVideoFormatDescriptionRef CreateH265VideoFormatDescription( +@@ -501,11 +495,7 @@ CMVideoFormatDescriptionRef CreateH265VideoFormatDescription( // Parse the SPS and PPS into a CMVideoFormatDescription. CMVideoFormatDescriptionRef description = nullptr; OSStatus status = noErr; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index fe62270b8e809..9146da94530c7 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -25,8 +25,8 @@ , abseil-cpp , pipewire , mesa -, libglvnd -, libepoxy +, libdrm +, libGL , Cocoa , AppKit , IOKit @@ -46,13 +46,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2022-02-26"; + version = "unstable-2022-04-13"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "a264028ec71d9096e0aa629113c49c25db89d260"; - sha256 = "sha256-JR+M+4w0QsQLfIunZ/7W+5Knn+gX+RR3DBrpOz7q44I="; + rev = "63a934db1ed212ebf8aaaa20f0010dd7b0d7b396"; + sha256 = "sha256-WddSsQ9KW1zYyYckzdUOvfFZArYAbyvXmABQNMtK6cM="; fetchSubmodules = true; }; @@ -61,6 +61,14 @@ stdenv.mkDerivation { ./tg_owt-10.12-sdk.patch ]; + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \ + --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ + --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \ + --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \ + --replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"' + ''; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config cmake ninja yasm ]; @@ -87,8 +95,8 @@ stdenv.mkDerivation { glib pipewire mesa - libepoxy - libglvnd + libdrm + libGL ] ++ lib.optionals stdenv.isDarwin [ Cocoa AppKit diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix new file mode 100644 index 0000000000000..435268cdf6230 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk, makeWrapper }: + +with lib; + +stdenv.mkDerivation { + pname = "${kotatogram-desktop.pname}-with-webkit"; + version = kotatogram-desktop.version; + nativeBuildInputs = [ makeWrapper ]; + dontUnpack = true; + installPhase = '' + mkdir -p $out + cp -r ${kotatogram-desktop}/share $out + ''; + postFixup = '' + mkdir -p $out/bin + makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ + --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ webkitgtk ]} + ''; + meta = kotatogram-desktop.meta // { + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c23e416d2c627..b5b30b0834868 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -82,6 +82,14 @@ env.mkDerivation rec { sha256 = "0zcjm08nfdlxrsv0fi6dqg3lk52bcvsxnsf6jm5fv6gf5v9ia3hq"; }; + patches = [ + # fix build with KWayland 5.94+ + # cf. https://invent.kde.org/frameworks/kwayland/-/commit/de442e4a94e249a29cf2e005db8e0a5e4a6a13ed + # upstream bug: https://github.com/telegramdesktop/tdesktop/issues/24375 + # FIXME remove when no longer necessary + ./kf594.diff + ]; + postPatch = '' substituteInPlace Telegram/CMakeLists.txt \ --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/kf594.diff b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/kf594.diff new file mode 100644 index 0000000000000..0fa2d8bc8f6ee --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/kf594.diff @@ -0,0 +1,57 @@ +diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp +index 7641579aa..3c195e397 100644 +--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp ++++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp +@@ -9,10 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + + #include "base/platform/base_platform_info.h" + +-#include <connection_thread.h> +-#include <registry.h> +-#include <surface.h> +-#include <plasmashell.h> ++#include <KWayland/Client/connection_thread.h> ++#include <KWayland/Client/registry.h> ++#include <KWayland/Client/surface.h> ++#include <KWayland/Client/plasmashell.h> + + using namespace KWayland::Client; + +Submodule Telegram/lib_base contains modified content +diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp +index 32f0de6..30a087f 100644 +--- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp ++++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp +@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #include <QtCore/QPointer> + #include <QtGui/QWindow> + +-#include <connection_thread.h> +-#include <registry.h> +-#include <surface.h> +-#include <xdgforeign.h> +-#include <idleinhibit.h> ++#include <KWayland/Client/connection_thread.h> ++#include <KWayland/Client/registry.h> ++#include <KWayland/Client/surface.h> ++#include <KWayland/Client/xdgforeign.h> ++#include <KWayland/Client/idleinhibit.h> + + using namespace KWayland::Client; + +Submodule Telegram/lib_ui contains modified content +diff --git a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp +index 01f1e80..163cb6a 100644 +--- a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp ++++ b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp +@@ -24,8 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #include <private/qwaylandwindow_p.h> + #include <private/qwaylandshellsurface_p.h> + +-#include <connection_thread.h> +-#include <registry.h> ++#include <KWayland/Client/connection_thread.h> ++#include <KWayland/Client/registry.h> + + Q_DECLARE_METATYPE(QMargins); + diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 3278d68cd0b53..224a70ce9f723 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cp -rf * $out/lib/torchat makeWrapper ${python2}/bin/python $out/bin/torchat \ --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \ - --run "cd $out/lib/torchat" \ + --chdir "$out/lib/torchat" \ --add-flags "-O $out/lib/torchat/torchat.py" ''; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 974d9a6a05df8..4d7a2218e7dfa 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -11,6 +11,7 @@ , cpio , xar , libdbusmenu +, libxshmfence }: let @@ -22,13 +23,13 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.26.4145"; - x86_64-linux = "3.26.2941"; + x86_64-darwin = "3.27.4357"; + x86_64-linux = "3.27.2944"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "1ck74a9z2mrwmljrqm347bqhjiaf1v0bf1jfnp58cqngh5ygqnf2"; - x86_64-linux = "01gy84gr0gw5ap7hpy72azaf6hlzac7vxkn5cgad5sfbyzxgjgc9"; + x86_64-darwin = "0xihg9fzsbwib2fmb1yqx9015i9q4k0ph8lna4mzgicmrjkw54g8"; + x86_64-linux = "1wqnrmp8q84izvqv25fgks5pv6la3vahm5dsn7bc6zxqb0xz2xvy"; }.${system} or throwSystem; meta = with lib; { @@ -90,7 +91,7 @@ let wrapGAppsHook ]; - buildInputs = atomEnv.packages; + buildInputs = [ libxshmfence ] ++ atomEnv.packages; unpackPhase = '' runHook preUnpack diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 4aa9dbc9b10c9..db38a2d0e8629 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -2,6 +2,8 @@ , lib , fetchurl , makeWrapper +, xar +, cpio # Dynamic libraries , alsa-lib , atk @@ -28,8 +30,27 @@ }: let - version = "5.9.6.2225"; + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + # Zoom versions are released at different times for each platform and linux + # is stuck on 5.9.6 until https://github.com/NixOS/nixpkgs/pull/166085 is + # resolved + version = { + aarch64-darwin = "5.10.4.6592"; + x86_64-darwin = "5.10.4.6592"; + x86_64-linux = "5.9.6.2225"; + }.${system} or throwSystem; + srcs = { + aarch64-darwin = fetchurl { + url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64"; + sha256 = "0jg5f9hvb67hhfnifpx5fzz65fcijldy1znlia6pqflxwci3m5rq"; + }; + x86_64-darwin = fetchurl { + url = "https://zoom.us/client/${version}/Zoom.pkg"; + sha256 = "1p83691bid8kz5mw09x6l9zvjglfszi5vbhfmbbpiqhiqcxlfz83"; + }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53"; @@ -69,23 +90,41 @@ stdenv.mkDerivation rec { pname = "zoom"; inherit version; - src = srcs.${stdenv.hostPlatform.system}; + src = srcs.${system} or throwSystem; - dontUnpack = true; + dontUnpack = stdenv.isLinux; + unpackPhase = lib.optionalString stdenv.isDarwin '' + xar -xf $src + zcat < zoomus.pkg/Payload | cpio -i + ''; nativeBuildInputs = [ makeWrapper + ] + ++ lib.optionals stdenv.isDarwin [ + xar + cpio ]; installPhase = '' runHook preInstall - mkdir $out - tar -C $out -xf $src - mv $out/usr/* $out/ + ${rec { + aarch64-darwin = '' + mkdir -p $out/Applications + cp -R zoom.us.app $out/Applications/ + ''; + # darwin steps same on both architectures + x86_64-darwin = aarch64-darwin; + x86_64-linux = '' + mkdir $out + tar -C $out -xf $src + mv $out/usr/* $out/ + ''; + }.${system} or throwSystem} runHook postInstall ''; - postFixup = '' + postFixup = lib.optionalString stdenv.isLinux '' # Desktop File substituteInPlace $out/share/applications/Zoom.desktop \ --replace "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" @@ -104,7 +143,7 @@ stdenv.mkDerivation rec { # Clear Qt paths to prevent tripping over "foreign" Qt resources. # Clear Qt screen scaling settings to prevent over-scaling. makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \ - --run "cd $out/opt/zoom" \ + --chdir "$out/opt/zoom" \ --unset QML2_IMPORT_PATH \ --unset QT_PLUGIN_PATH \ --unset QT_SCREEN_SCALE_FACTORS \ diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 3c43715dd9812..c56e78b9f9452 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "5.9.0"; + version = "5.9.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-qiGkZuGJsKuquMuAcO+9wbU4KW++uyOb4TKb9lCgZmI="; + hash = "sha256-Hws9vENGzCLQqav4uXtbbI0iNoS3JozC5m2DG38+3Fk="; name="${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index de4bb988d768a..85ad97f41b0bc 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,26 +2,17 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "0.14.5"; + version = "1.0.0"; - vendorSha256 = "sha256-ykUjq7Svp3+kUNnFkwsBlC+C4nws6Yvu3bk2Wb4c8vY="; + vendorSha256 = "sha256-b0k1V1+JikGemSQjyiKcH7cgyDEt0Nn5aVUf6nnE+/0="; src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-Xb7QbBmCJKgokxvdbtWxtnNIS/iUsYFLlRzgfoABAq8="; + sha256 = "sha256-vwu+Fj7PegbK9pmnsNuEl/AQz2gejRiFAAAov5+VNMQ="; }; - # Remove patch when updating to >0.14.5 - patches = [ - (fetchpatch { - name = "remove-distribution-test.patch"; - url = "https://github.com/ipfs/ipfs-cluster/pull/1589/commits/49825d1df76f848806f1d76abce5e279221cc8c5.patch"; - sha256 = "sha256-mM2rc4ai/qhbvxnoRw5jO7BTRlD2/Tp037EuqqS49DE="; - }) - ]; - meta = with lib; { description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons"; homepage = "https://cluster.ipfs.io/"; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 04854840112f4..e501137fa8383 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "ipfs"; - version = "0.12.1"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.12.2"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; repoVersion = "12"; # Also update ipfs-migrator when changing the repo version @@ -10,7 +10,7 @@ buildGoModule rec { # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "sha256-fUExCvE6x5VFBl66y52DGvr8ZNSXZ6MYpVQP/D7X328="; + sha256 = "sha256-66NNLMSfeBHQh/QlnETB/ssra9CKbD+jtaJuX+14x00="; }; # tarball contains multiple files/directories diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/applications/networking/irc/senpai/default.nix index 0fc0284a183e5..d12ee05d4e246 100644 --- a/pkgs/applications/networking/irc/senpai/default.nix +++ b/pkgs/applications/networking/irc/senpai/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "senpai"; - version = "unstable-2021-12-14"; + version = "unstable-2022-05-10"; src = fetchFromSourcehut { owner = "~taiite"; repo = "senpai"; - rev = "8091752a67781273944e7a79a803b7a671378313"; - sha256 = "sha256-tZp0ra/Sq/5MAFlAFHPJ94jYxtHbDiG1wSD4NOH1x7I="; + rev = "7a9fe74fdfb3f334b97434df0aa74b2b32e3582e"; + sha256 = "sha256-uagdJG+YVryzsaZfkg5W2F8mQSc1bpflL77tqMHp1Ck="; }; - vendorSha256 = "sha256-xkJh7k8GZmoZqE0HgbFp2xMJQOVDkPEXOZEl6bJZz1A="; + vendorSha256 = "sha256-hgojB1D0/SZWLEzJ48EBoT/InYYmqD/1qoTknfk/aTo="; subPackages = [ "cmd/senpai" diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix index 2fb6fed15ca83..302fe96f1eca5 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.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; rev = version; - sha256 = "sha256-JsXReGmdBtzMXhrT1cFlkBbw8j/SxzgXSeHcHlns2po="; + sha256 = "sha256-oeC0zyDyh0lW1IMIJ9bjqryqz3Km4JJzRUxkO6LadoQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 541ad8c68f216..1b5f797e98c62 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -28,14 +28,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.4.1"; + version = "3.5"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "sha256-TJ4JI97WiobkBxgnkUGh/XQAIlDV+PDgIxCzTqefiMw="; + sha256 = "sha256-8ZSa2dQPTiChGW00T5OASHmd0C2PatUtTu9Gr4CF4Oc="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index a900a469e0315..2dc167012221e 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -18,7 +18,7 @@ let scriptPython = python.withPackages (ps: with ps; [ aiohttp requests - python_magic + python-magic ]); version = "0.3.0"; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix index 987271e4ffa29..fd5f376ad2636 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix @@ -24,6 +24,9 @@ let buildInputs = [ gmp ]; + # Tests are relying on old Python 2 modules. + doCheck = false; + preConfigure = '' sed -i 's,/usr/include,/no-such-dir,' configure sed -i "s!,'/usr/include/'!!" setup.py @@ -66,5 +69,9 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ oxzi ]; description = "WeeChat script for Off-the-Record messaging"; + knownVulnerabilities = [ + "There is no upstream release since 2018-03." + "Utilizes deprecated and vulnerable pycrypto library with Debian patches from 2020-04." + ]; }; } diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 172cea3d061d8..97634c1d2cdb7 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,21 +1,27 @@ -{ lib, buildGoModule, fetchFromSourcehut -, ncurses, notmuch, scdoc -, python3, w3m, dante +{ lib +, buildGoModule +, fetchFromSourcehut +, ncurses +, notmuch +, scdoc +, python3 +, w3m +, dante }: buildGoModule rec { pname = "aerc"; - version = "0.7.1"; + version = "0.10.0"; src = fetchFromSourcehut { owner = "~rjarry"; repo = pname; rev = version; - sha256 = "sha256-wiylBBqnivDnMUyCg3Zateu4jcjicTfrQFALT8dg5No="; + sha256 = "sha256-v1+12UCgBbH/2PxZ9QdDN30LmyzVcfGlYiVNVPYO3zs="; }; proxyVendor = true; - vendorSha256 = "sha256-hpGd78PWk3tIwB+TPmPy0gKkU8+t5NTm9RzPuLae+Fk="; + vendorSha256 = "sha256-fGQ15i3mWNmmfypRt5A7SAVYSEg9m4so4FYlUY+7mW8="; doCheck = false; @@ -28,22 +34,25 @@ buildGoModule rec { ./runtime-sharedir.patch ]; + postPatch = '' + substituteAllInPlace config/aerc.conf + substituteAllInPlace config/config.go + substituteAllInPlace doc/aerc-config.5.scd + ''; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + pythonPath = [ python3.pkgs.colorama ]; buildInputs = [ python3 notmuch ]; - buildPhase = " - runHook preBuild - # we use make instead of go build - runHook postBuild - "; - installPhase = '' runHook preInstall - make PREFIX=$out GOFLAGS="$GOFLAGS -tags=notmuch" install - wrapPythonProgramsIn $out/share/aerc/filters "$out $pythonPath" + + make $makeFlags GOFLAGS="$GOFLAGS -tags=notmuch" install + runHook postInstall ''; diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch index e08161e61eb68..d5e40edeb6617 100644 --- a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch +++ b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch @@ -1,60 +1,90 @@ -From c715a96c693baa0e6c8ab3c96b6c10e0a40bf7af Mon Sep 17 00:00:00 2001 -From: Tadeo Kondrak <me@tadeo.ca> -Date: Thu, 21 Jan 2021 10:40:49 +0100 -Subject: [PATCH] Fix aerc breaking every time the package is rebuilt. - -On NixOS, the SHAREDIR changes on every rebuild to the package, but aerc -fills it in as part of the default config and then installs that config -to the users home folder. Fix this by not substituting @SHAREDIR@ in the -default config until runtime. ---- - Makefile | 2 +- - config/config.go | 13 +++++++++++++ - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 77f5e61..98cbc11 100644 ---- a/Makefile -+++ b/Makefile -@@ -23,7 +23,7 @@ aerc: $(GOSRC) - -o $@ - - aerc.conf: config/aerc.conf.in -- sed -e 's:@SHAREDIR@:$(SHAREDIR):g' > $@ < config/aerc.conf.in -+ cat config/aerc.conf.in > $@ - - debug: $(GOSRC) - GOFLAGS="-tags=notmuch" \ +diff --git a/config/aerc.conf b/config/aerc.conf +index fbbf587..ede1a03 100644 +--- a/config/aerc.conf ++++ b/config/aerc.conf +@@ -107,8 +107,7 @@ next-message-on-delete=true + # + # ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets + # ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets +-# /usr/local/share/aerc/stylesets +-# /usr/share/aerc/stylesets ++# @out@/share/aerc/stylesets + # + # default: "" + stylesets-dirs= +@@ -254,8 +253,7 @@ new-email= + # + # ${XDG_CONFIG_HOME:-~/.config}/aerc/templates + # ${XDG_DATA_HOME:-~/.local/share}/aerc/templates +-# /usr/local/share/aerc/templates +-# /usr/share/aerc/templates ++# @out@/share/aerc/templates + # + # default: "" + template-dirs= diff --git a/config/config.go b/config/config.go -index 87d183a..cb6611a 100644 +index 2120310..92b7655 100644 --- a/config/config.go +++ b/config/config.go -@@ -470,6 +470,16 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { - return nil, err - } +@@ -331,8 +331,8 @@ func buildDefaultDirs() []string { } -+ if sec, err := file.GetSection("templates"); err == nil { -+ if key, err := sec.GetKey("template-dirs"); err == nil { -+ sec.NewKey("template-dirs", strings.ReplaceAll(key.String(), "@SHAREDIR@", sharedir)) -+ } -+ } -+ if sec, err := file.GetSection("ui"); err == nil { -+ if key, err := sec.GetKey("stylesets-dirs"); err == nil { -+ sec.NewKey("stylesets-dirs", strings.ReplaceAll(key.String(), "@SHAREDIR@", sharedir)) -+ } -+ } - file.NameMapper = mapName - config := &AercConfig{ - Bindings: BindingConfig{ -@@ -547,6 +557,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { - return nil, err - } - -+ for i, filter := range config.Filters { -+ config.Filters[i].Command = strings.ReplaceAll(filter.Command, "@SHAREDIR@", sharedir) -+ } - if ui, err := file.GetSection("general"); err == nil { - if err := ui.MapTo(&config.General); err != nil { - return nil, err --- -2.30.0 + + // Add fixed fallback locations +- defaultDirs = append(defaultDirs, "/usr/local/share/aerc") +- defaultDirs = append(defaultDirs, "/usr/share/aerc") ++ defaultDirs = append(defaultDirs, "@out@/local/share/aerc") ++ defaultDirs = append(defaultDirs, "@out@/share/aerc") + + return defaultDirs + } +diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd +index 885c4f8..77a853e 100644 +--- a/doc/aerc-config.5.scd ++++ b/doc/aerc-config.5.scd +@@ -12,7 +12,7 @@ account credentials. We look for these files in your XDG config home plus + "aerc", which defaults to ~/.config/aerc. + + Examples of these config files are typically included with your installation of +-aerc and are usually installed in /usr/share/aerc. ++aerc and are usually installed in @out@/share/aerc. + + Each file uses the _ini_ format, and consists of sections with keys and values. + A line beginning with # is considered a comment and ignored, as are empty lines. +@@ -221,8 +221,7 @@ These options are configured in the *[ui]* section of aerc.conf. + ``` + ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets + ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets +- /usr/local/share/aerc/stylesets +- /usr/share/aerc/stylesets ++ @out@/share/aerc/stylesets + ``` + + Default: "" +@@ -381,7 +380,7 @@ against (non-case-sensitive) and a comma, e.g. subject,text will match a + subject which contains "text". Use header,~regex to match against a regex. + + aerc ships with some default filters installed in the share directory (usually +-_/usr/share/aerc/filters_). Note that these may have additional dependencies ++_@out@/share/aerc/filters_). Note that these may have additional dependencies + that aerc does not have alone. + + ## TRIGGERS +@@ -407,7 +406,7 @@ and forward commands can be called with the -T flag with the name of the + template name. + + aerc ships with some default templates installed in the share directory (usually +-_/usr/share/aerc/templates_). ++_@out@/share/aerc/templates_). + + These options are configured in the *[templates]* section of aerc.conf. + +@@ -419,8 +418,7 @@ These options are configured in the *[templates]* section of aerc.conf. + ``` + ${XDG_CONFIG_HOME:-~/.config}/aerc/templates + ${XDG_DATA_HOME:-~/.local/share}/aerc/templates +- /usr/local/share/aerc/templates +- /usr/share/aerc/templates ++ @out@/share/aerc/templates + ``` + + Default: "" diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index cb49829dce073..d8a4d1066ecb2 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -40,7 +40,7 @@ with python3.pkgs; buildPythonApplication rec { file gpgme notmuch2 - python_magic + python-magic service-identity twisted urwid diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index af1099cbcf3e3..93160a6e7b5e1 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -33,6 +33,7 @@ , enablePluginDillo ? true , enablePluginFancy ? true, libsoup, webkitgtk , enablePluginFetchInfo ? true +, enablePluginKeywordWarner ? true , enablePluginLibravatar ? enablePluginRavatar , enablePluginLitehtmlViewer ? true, gumbo , enablePluginMailmbox ? true @@ -70,6 +71,7 @@ let { flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; } { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ libsoup webkitgtk ]; } { flags = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; } + { flags = [ "keyword_warner-plugin" ]; enabled = enablePluginKeywordWarner; } { flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; } { flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; } { flags = [ "libetpan" ]; enabled = enableLibetpan; deps = [ libetpan ]; } diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index db7771bc3c9ff..d678e3b517b3d 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.44.0"; + version = "3.44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "q4Cg6eLOdn+56EruBl0Ote9QLNebLiykUeyoQpIpeoA="; + sha256 = "LJNidefwnQtOtWgMVb/4Xw2A0lU4R2Gm0Z3XfOaU/oM="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 2fae122fc1b6c..1581790c3d4c3 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.44.0"; + version = "3.44.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "3yHT31Ik36hC6ikO/82QKv1LFBhgik37aQejt9TZlPk="; + sha256 = "dEx+CK0R4bYQPO60u/2Jo7Yo4SbOOGe7AI80F8wEnqk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index d30282f44c7f4..b522b51906397 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -95,6 +95,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ toschmidt doronbehar ]; homepage = "https://getmailspring.com"; downloadPage = "https://github.com/Foundry376/Mailspring"; - platforms = platforms.x86_64; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index d4076c88bb8f4..160065effefd7 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -6,7 +6,6 @@ , dbus , sqlite , file -, gzip , makeWrapper , notmuch # Build with support for notmuch backend @@ -25,7 +24,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ZE653OtXyZ9454bKPApmuL2kVko/hGBWEAya1L1KIoc="; - nativeBuildInputs = [ pkg-config gzip makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 9904e2db362d9..5af97fa0f9389 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.2.2"; + version = "2.2.4"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1k0ghbpc4gn3sydbw10xv9djin9grk1pkxdwynrw0iknyc68gphh"; + sha256 = "0q70qrsjvmkfns1qxc0il2rlmfjwzbmfg89zlch0iqghpyz7c9xq"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 6d5ab96b4edc8..2bcfd839e2854 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,18 +1,17 @@ { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib -, fetchpatch }: stdenv.mkDerivation rec { - version = "20211029"; + version = "20220429"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "sha256-haPDZorAfKuIEMiBCXJRMALAYnurQyjmCSOnj9IsoKk="; + sha256 = "sha256-LBY7WtmEMg/PcMS/Tc5XEYunIWjoI4IQfUJURKgy1YA="; }; buildInputs = [ @@ -25,15 +24,6 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m ]; - patches = [ - # Remove on next update, see - # https://github.com/NixOS/nixpkgs/pull/143641#issuecomment-954991746 for context. - (fetchpatch { - url = "https://github.com/neomutt/neomutt/commit/4242a31313e0b600693215c01047bbda8a6dd25a.patch"; - sha256 = "sha256-fcuNeBkPjqln5QA9VFcfXCQD/VrUoSEMSxQ//Xj+yxY="; - }) - ]; - enableParallelBuilding = true; postPatch = '' diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index feca7bd201823..46115f4a56d76 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }: +{ lib, stdenv, fetchFromGitHub, mercury, pandoc, ncurses, gpgme }: stdenv.mkDerivation rec { pname = "notmuch-bower"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0r5s16pc3ym5nd33lv9ljv1p1gpb7yysrdni4g7w7yvjrnwk35l6"; }; - nativeBuildInputs = [ gawk mercury pandoc ]; + nativeBuildInputs = [ mercury pandoc ]; buildInputs = [ ncurses gpgme ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index e89216802e50f..06bbf293f1d64 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -6,7 +6,7 @@ , pythonPackages , emacs , ruby -, testVersion +, testers , which, dtach, openssl, bash, gdb, man , withEmacs ? true , withRuby ? true @@ -79,6 +79,11 @@ stdenv.mkDerivation rec { in '' mkdir -p test/test-databases ln -s ${test-database} test/test-databases/database-v1.tar.xz + '' + # TODO: restore after resolved upstream + # https://www.mail-archive.com/notmuch@notmuchmail.org/msg52808.html + + '' + rm test/T355-smime.sh ''; doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3"); @@ -102,7 +107,7 @@ stdenv.mkDerivation rec { passthru = { pythonSourceRoot = "notmuch-${version}/bindings/python"; - tests.version = testVersion { package = notmuch; }; + tests.version = testers.testVersion { package = notmuch; }; inherit version; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 98792527faf1c..e4e5332e07f33 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -38,7 +38,7 @@ , adwaita-icon-theme , libGLU, libGL , nspr -, nss +, nss_latest , pango , pipewire , pciutils @@ -132,7 +132,7 @@ stdenv.mkDerivation { libnotify libGLU libGL nspr - nss + nss_latest pango pipewire pciutils diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 492abf1f37c49..4705eab12930b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.7.0"; + version = "91.8.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/af/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/af/thunderbird-91.8.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "bcc9a123b3de4d442836820d3eff52a37ff513b063850493e58c2132ad0ec029"; + sha256 = "b7a5a88216d094bce6d1f18f506dc4c500c13340e0c6a9da2aeadc32d9ae0062"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ar/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ar/thunderbird-91.8.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "4800a0be829e654d6917271b4944a5be3a8688e75eed58a4a5bae3643d2bce4b"; + sha256 = "33f807c2a2182149f2da7a394e455775027753a082b998db766c036d0aa7c976"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ast/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ast/thunderbird-91.8.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "779bf2732f89a82f36449d75d14ec4f8cbceb79c7f2d590f0407f4261fd9a5f9"; + sha256 = "08a38759b492ac47e567774b5a4fe5ee75f5a4c513ee046b7ace9636cd61a00a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/be/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/be/thunderbird-91.8.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "e1f033cf11d1d18828771ca81e90e6851a1b96971f0d3d81665ca6aebb6c737c"; + sha256 = "09644be773dea25b602b30c0e783a2be3de406d63a1aa528e80830357cec8756"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/bg/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/bg/thunderbird-91.8.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "293917397d1d52415bab86a1d27e9442b5bafb989e65cb3cbee0ba601970bc2d"; + sha256 = "546bc2422a40ed4c04b1d8fa2c203a60fbb8c2a060b7c63ae4464109d08c440e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/br/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/br/thunderbird-91.8.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "317883e2764505713e4507fffeaf1528f685fc774b99dc5b802164cdd1473292"; + sha256 = "1977584751a826bb52e8bd154880f34b009df777481915f0cb84e018f7a3a1fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ca/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ca/thunderbird-91.8.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "cdfcbddc1697b46a85b67382d7b4a9d64d1ffc31d5faeb8e0edd21f4868a6008"; + sha256 = "e2c6e403fbcdb58eaf747f36796d4a0af1d8f112715c068ca98f85198189e884"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cak/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/cak/thunderbird-91.8.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "8c1d1dff29b7631d5aad6384d02269b5c058bd1c37d85de0c92fd74e2a08e37c"; + sha256 = "f5992ea2ab6acf94993f6bc590e95e36c5ab87b650e0f38ee5e808a2bf9189da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cs/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/cs/thunderbird-91.8.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "3d1818c6d067552a7f7c62fc9dfae7370c309c9604f20ba1f1f4723020f04c7f"; + sha256 = "4770e0c95ba84953aab5585f4059c1e20e69b9ee98578ebda34ded2a1b170a25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cy/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/cy/thunderbird-91.8.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d339d87800e4060120468314544b34b4dfc355a5369363d6df826a6f10682afc"; + sha256 = "a9729784e7a05d763e6dd715da80ca7f65e42f27b25e58ed2139f26f12061855"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/da/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/da/thunderbird-91.8.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e00bb159fa9d113272866986eb8f9c3e6c3f29748cc7240cc736c00ed3eb1927"; + sha256 = "a917c157c7507d2ee457a5c8dcff3b1b23225b5ea946be547e801e93c10d4a5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/de/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/de/thunderbird-91.8.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "af8365195927f75f6aac52fd91904193172f5e3b7bc09a7e52a94840ede1a6aa"; + sha256 = "73141650aba88315828e5419d9a9a05861dcd504b9256c8a184396e3824211f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/dsb/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/dsb/thunderbird-91.8.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "96bdb60659052126bca84a64a1f2fdd26654875d74feacd4b9d50cf66b90c3d9"; + sha256 = "7b7adb5c1e01efa9a0129a22308eb878f45d1ed0190b7430aae92b55f061fb35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/el/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/el/thunderbird-91.8.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "af0101f1d999947cb02b3cf7c92eadab0f360b64f64788a3ea2ecbb6e8628c9d"; + sha256 = "ffa921418d6d334e48aa51f4fff1b4855f3cf7ce3ac77ed38c6b0b699606d971"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-CA/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/en-CA/thunderbird-91.8.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "3537bfe2ffe474e587df4549a243ace7fb02236e8a424fac9c9e23ea74978969"; + sha256 = "caa62088b677cbf18cd95a80ebc57b97597df35f8172d27a7cc55ded145e29c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-GB/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/en-GB/thunderbird-91.8.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ff0daecd9a50d9bb060750d822bd0da409ac838f9280faf71ed6f146f1bd928d"; + sha256 = "6dff28a894f3b48798939105a9742b3f9dcc3c4389160f71126cdd08ff573c74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-US/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/en-US/thunderbird-91.8.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f4da2a0627b042e61b8f25eb57396ab71d862c728abd9cc82e9eb102b27d26f5"; + sha256 = "3a6c1302f51a86297960d40f40fe6273349ae407b07e634b1c01758bc8cc3a0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/es-AR/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/es-AR/thunderbird-91.8.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "a052ed75f7b3aaa2fea27b7eaa658a0d75e03c5d8e51214e9207e79c8c656489"; + sha256 = "383d13f5094543f99dd64e29df261c956e6f13782c3158d4ac831a8c734b7d18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/es-ES/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/es-ES/thunderbird-91.8.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "312b2eb38ec895a77a10cbd41cf861f03520d9ce7ff6cc0b2fd9e282c1a85743"; + sha256 = "d2753f076d929933cb51e79c0c0b66f2fc3457e3f25bb68b9b10c84566cfb70d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/et/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/et/thunderbird-91.8.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "257137eab9877c8c6663cfa9200707f5ff5ff30076c72952f43db9eeb3fc334b"; + sha256 = "a71e3bdee857892bd62d582fd6cd9e7df41be92854c65d34b26b57fbad16ce2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/eu/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/eu/thunderbird-91.8.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "69e426d23b3d29aa625d3fcc18080befe5ea717279a4d17a798c987819ce9f0d"; + sha256 = "40f3aa9558eab5511c0176dd817880142e49bfc157546676ce15d559ace8e359"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fi/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/fi/thunderbird-91.8.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2acb1d75cf32c65ca281ee353a79973bda5b96cfb1b8c6d55f91f5051ad9b720"; + sha256 = "c758f45ff3b714e6e7fd1c66421a0f815ac54fa3590df682c11bd05f604bd848"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/fr/thunderbird-91.8.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "979a4ab6ae26ed9fe2320bc0baf828588ee96899d9aa04781aa5e3f7e1e4e35a"; + sha256 = "1e2588b80017f6f10ada4675c4af5165de9216d65881f20feb844fa59fa60fbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fy-NL/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/fy-NL/thunderbird-91.8.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "2cad6ddf73676bedc04d18afec2fce7f8085fe10400b514d5091113dbd1ccd39"; + sha256 = "c3ab99f1539a40f60cb2b3ca68178307b39b013a763a671ffd05124ed8d82988"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ga-IE/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ga-IE/thunderbird-91.8.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "6a8b5f6f413bf2d9122b90865131f1b2e3d1f528a2c0c54b0c3118b16948ef6f"; + sha256 = "7af72cd55c26e368378a3b86844b6ee72f08b7f2c207170817ccbeaad1a114a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/gd/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/gd/thunderbird-91.8.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "e739fdbcd525b1ec9a6415a1fc2b4f982895bc07e503324f8ee7cb9c44e30bf1"; + sha256 = "9a91e7b6d3572ee78a4df915a2b30e5dbd10351e6f16316e6dbbbffdbe1217d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/gl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/gl/thunderbird-91.8.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b8b87d0c8d200264e7aab95fc2f1a59b3ffd1b0a6143409cb947df6acce2711b"; + sha256 = "2c8f4043668dfa15ab191ed05218c1772472dbee932ea98e3cc08c05764812cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/he/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/he/thunderbird-91.8.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "3d8048e55eb538414b436387419d0ed2b4589a6846d55c49665af2741082bd03"; + sha256 = "e3b038e94553d388eb4cf53c250d8297531ddb2fb0fc7c678291fa48c46fbc12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/hr/thunderbird-91.8.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "e3eb72e83138d593046db8c72a09538b3b83abdef9b1534b9cf757751f172f78"; + sha256 = "a66c1c904f58879e11ceeba5c214302fc982468718af1567634ec53d16850cc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hsb/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/hsb/thunderbird-91.8.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e110bd72de8a035ba2de4f849b09e60d11db161b09dda2bd4ba01ee7e42c0075"; + sha256 = "e2f3b04485ba430799e1049ed9cdc4cf191014f6a2aa44c3f8e51d87d47332dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hu/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/hu/thunderbird-91.8.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2fc4d4e970257aff81352132dd73fc365cc7df822b70aef9716082cb455bbc6b"; + sha256 = "611bd8281d26324503fac16bd6e25175c988f6fb12b6bcf6f3016dcfa6ec44d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hy-AM/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/hy-AM/thunderbird-91.8.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ff5d16b7712f6975e68305f4d50e3c97846238021a4ffeb87526a5db0eb76db3"; + sha256 = "88cd6e24ae4a54f0b4684bf3ab7116fcdce2dbe2d6a074af5cb50c3967ebda1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/id/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/id/thunderbird-91.8.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5063b921fbe8ea8273441868f1cda6e0e32a8fe00b2b866dd4f91c9f12f15011"; + sha256 = "1be3f82fc0a8254548c35a08d2fd4ef77b86df774acbe5bb17784d25af802eb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/is/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/is/thunderbird-91.8.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "55d42de9dea45c13ad4288144b544d61b789d94d85976525b18c6dd32a75d210"; + sha256 = "332e85aba591c744a9d53b70e06218fafbdc94600643963c63f6a693edbfd035"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/it/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/it/thunderbird-91.8.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7a6774106b689e6f829f8f74b03d23a85d79b9f8304d9a60d3fd172188e1bc26"; + sha256 = "95ca9342dd991d8306922df03c5f09adeb63dc93f678384989315ddf1df622d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ja/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ja/thunderbird-91.8.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b557c29aa992758dd4f92d3dab71cdac764b82b66359b75f2695de4fa052f918"; + sha256 = "977a0e4ca8d9e8d8d6c289608a9318971553b011bbcda66ee888624ef6b9d56b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ka/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ka/thunderbird-91.8.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "681430faee4d1e6512ca4a68142b6c3314f26e2944c7de04016404c60bae735e"; + sha256 = "1a8360cd576a4e2a0b6d316441eff481c2a1d9b80e7f9eeeb0fc6fc38df08d1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/kab/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/kab/thunderbird-91.8.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "5b45b128a48395300ed63e033ea09562b368276c7e6a9ea7801db74b8db13e97"; + sha256 = "d318ccb72f4476d8222eb4423c755378f10cf187cc6ea73152833953375cac35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/kk/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/kk/thunderbird-91.8.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a44dfb8259cd9e8c694e8c842cf5b691f2bfe5d9c5176dcc65bcfa9a316e78d5"; + sha256 = "854f310728f2c1c2e3e3dec57787bb293f344a31cb1f0b8a131f0768c409fb08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ko/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ko/thunderbird-91.8.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "e04ab8d19264afe6207875ea08b878993041ca84b613c4184d608a4f8bbedcba"; + sha256 = "c740a972a708627d9700c9dd3b2bb56a5b1a3e0ac6f438021aa56033e6e6b40e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/lt/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/lt/thunderbird-91.8.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4cc3797ed91e6edfe994821bca011f20a64a7d1f6bc13634c1a31c877b161b2c"; + sha256 = "7a1c14eb2fd539dc9e2681a8868fb6e82ed2e9ce0b9523a613e20a48ec52d2ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/lv/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/lv/thunderbird-91.8.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "011867f9ee77187f02b6ce0040ab9c2d4babd6d2bbbb4c174094cc5f35eca65d"; + sha256 = "bde11f8e943b462f4c8a084ee7d1328f59e93a6bf2d39fed8a3dd1408b0ee716"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ms/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ms/thunderbird-91.8.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "8f9bd1f1d5052a8259f1096b38fef693f5a74e81b8a2bb69477fc1cfa7461796"; + sha256 = "f76f9bde41a1be40c32bb3fa1990adba3460bdca0b98e466e6dcbbc6d8d944a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nb-NO/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/nb-NO/thunderbird-91.8.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "7bc57e4bc1373b5b484eb98f9775b85bbe9c6564e246af157b51314f74a20c67"; + sha256 = "e8a052e7c841feda1c54b5f349181695c03f2549f95ca1d9108b60e8dd13c85e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/nl/thunderbird-91.8.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "bff24b619fa4282cc6341828528798d0d256213b43f1bcb4b36070e370bd2ba6"; + sha256 = "5eea4e47045706a621ca398a55a76a2165d461c061ea3e410418839a9a069ca7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nn-NO/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/nn-NO/thunderbird-91.8.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4286c9c093aacb233874bb1439e8b7880d7f3e81dc1bdeb24dd0096075d34b7d"; + sha256 = "a819e0ede22abce7d3e10ab1dbe3d4571889c63284e6f1c917834f766ad3c73a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pa-IN/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/pa-IN/thunderbird-91.8.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "6ae5d50b4296201996b6ddf9ab2614534ec5fa3ed903c8e9d36c3254af820862"; + sha256 = "523f7c451f618b1f7705d0892b50700f61c0c3a12ca85957630e5e146ed7eccd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/pl/thunderbird-91.8.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "ac2fb293885f0a37d0ec6903cb72ca0d2126e18540a8e542ebf89e15748ed9e7"; + sha256 = "45d17f737b24ab1ca34e7dc5d16493203e1673c4592a099b3dffa8559908b64b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pt-BR/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/pt-BR/thunderbird-91.8.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "7d31e4ea4f14cf1b3c2c2c7dc9af2d0c2e97d397a6748cb53f8fc0ded21c3d5b"; + sha256 = "d4d3cc55f0924a9eefb2b76d3cf524238e87ee0f016b5fcb4df59c28a6f8539c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pt-PT/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/pt-PT/thunderbird-91.8.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "7eedd322ea310df8b308a075c995cb530892be67348b66bac82096cc3d7da035"; + sha256 = "1a6b22cc0fca62a1fac036b87f04a7ef2d101e8a4323e370856338ceffd3193f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/rm/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/rm/thunderbird-91.8.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "606b4d58bc6afd7fe67be985d3eac5ad2c734c0037bd5e6380e9b0993579d762"; + sha256 = "cd9b4f7274a3fe1c5c29ac68377b82ac134a9d23828700399009021ae6920c1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ro/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ro/thunderbird-91.8.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a189258f7986e540edec1c0cb35f84f58924a079cce2da2332ad80a323c63241"; + sha256 = "0c0dd2e9612c64eb2f70d52f32fad70af989537018d2d1457941d773e5d8200c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ru/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/ru/thunderbird-91.8.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "2677c5d98c13ad6cdf3698b644b38ea9c94e94e46eec9ef307036d5bd3d32c9d"; + sha256 = "4f89db6c6bff251b9e642b6525e2d6dab30fd5faddff814a8566e3db0109f895"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sk/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/sk/thunderbird-91.8.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "f3d630189c20ff6d4246f4f67173f60ff89bc4643267e6fd27cc37a25437b6d6"; + sha256 = "9b7c6e1536dd288634f1e635cf65b59bfd8953853143ad4611b66189119fe8ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/sl/thunderbird-91.8.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d2020220b3c54b9bbc114ff367c10818541bd070f5e0e0d4c56fdbb027bd8d85"; + sha256 = "9b55f025b7b64d57c0ae1ffb54fcfd24dfffedaf8dcfb0cff870e5023e018e22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sq/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/sq/thunderbird-91.8.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "91cc13d2a69372b619273feeabb961ae4e27dda6973b64cbb316db7207760c27"; + sha256 = "a7c42d3f546482eec81a021f299bc57fc05d349cfbfdd65ad3dbe46019e29851"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/sr/thunderbird-91.8.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7b4c459eb200c9d407acfbcc451290a5f43c6b9f0aa4dac6d4536c267b6afadf"; + sha256 = "c990d6f1d94f50ba0edc2683acb89fd17dc94ceb0406549309c85be3e294c43a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sv-SE/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/sv-SE/thunderbird-91.8.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "be920ab8279dfe412f5e12082a7709d0e24ea7869f5a86d36e65962430a5798e"; + sha256 = "cff7a55dd6a5ef6a3bff8757decda52e685fd500ba00ddc9f96724a6e803759e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/th/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/th/thunderbird-91.8.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2a6d558efee3c0d02e4695b77b1f9dbaacf673f499a4ef28e3763358bb61346f"; + sha256 = "e04a3b749f86f8f13b26d58c1562f7249e9d298431f348709678d6b5eb2d56c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/tr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/tr/thunderbird-91.8.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "0cb0bb5991481cdb80d729f1c59276f4e1e12fac48b820fe5e352d63a44ff8ea"; + sha256 = "f3bc44135cc943509e5f821b011b30df42ba9e44884be588130326dd123ffc13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/uk/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/uk/thunderbird-91.8.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "056a958ad687e5b3a0c707379d15ba2b23e17a5c11f113edebcecaf5ab229ada"; + sha256 = "c93fbc4795bc051ff6e55ced73765673c347a6fcea5c0b0f12d5a2b7e4ea13f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/uz/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/uz/thunderbird-91.8.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "31bf50803722d1b8017861da34237c41d725649a5884b33a15a3bc35738adb94"; + sha256 = "4737baf26dd8ae9a9fe4a52c56e75a2e76e76a976dac66cb02cc9175a432d114"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/vi/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/vi/thunderbird-91.8.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "55b5d7c9c3ce8b02d58cb371b58afeff39f08e8b45b1d8875aaa267273ff65b0"; + sha256 = "8962b27c70530ad685753df464c4f4c982258abb82fc9788c623eebd2bd319fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/zh-CN/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/zh-CN/thunderbird-91.8.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "39983db7492adfd30f7c281f7de16f5538e65dfffd86579cc6abd91936c420b7"; + sha256 = "e9343251571b2922f5ab2f84590759e41fb0734c38541336215f9984c4fe6882"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/zh-TW/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-x86_64/zh-TW/thunderbird-91.8.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "0b0dbff293c33ed286904f798153c64e8ee631430e9293bc384ca1f1368c44f8"; + sha256 = "efbcb13dcb468a82b0ec71d67af4addefce97addfca6befaba0b96c92617091b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/af/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/af/thunderbird-91.8.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "dd662bf17307215d0ffab8ea10852bf1a742b5dc0564b07b1f3583239169fccb"; + sha256 = "d96e9de630ad5502fd86de653337ff7df4444ea5bdc22e07cb77f67f1dc4d04f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ar/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ar/thunderbird-91.8.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "b3ea9d805c423c3ae2b7bdf74bcc3bc3cda88467c28c3eb02c5cf9f42bcee801"; + sha256 = "d5273d01309d15e77a897fa25a142851470f9569b25b253e66d09dee6984d061"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ast/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ast/thunderbird-91.8.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5853f37ec0ac021ace8ee23b2255bc680c2ac5a8c81a4023a98235d3fa2b53d4"; + sha256 = "8466aa8df2090de75cd7140b58c03856b351536f14875569c18abeaebdcb3249"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/be/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/be/thunderbird-91.8.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ef0149c8c758a487cfd748f0a0cd114ee01d3fe63605952e3f5cb02c0fe2e351"; + sha256 = "f2940433250516531cd782e5f7a2c85dbb81d5fae83b29ff2fba93450dcb14ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/bg/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/bg/thunderbird-91.8.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9ce3b7ee2fae34af3e272d1a0a24a086901e032e589169005a4b75ca1dff6051"; + sha256 = "70198e5c4857d84b0c84c158fabf269d759fcd7b966d82e2f529c540d833a244"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/br/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/br/thunderbird-91.8.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "6bb10ee9209b264889fd5338be11a6ed0295c4480eae1b0ca35ca8cd5e173066"; + sha256 = "02391abf4167231531b8e8490fd2d7feab36cf89ddc5cb6d072cb33a67d4520a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ca/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ca/thunderbird-91.8.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "8b2cbcce416213c2628656722f2d6f4a8de47b8f601e6da665c99ba2710e3ae5"; + sha256 = "7178baf7bdc7914bb803995b8d1fc66087f9c65264b100e8876fa1be463623d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cak/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/cak/thunderbird-91.8.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "140658bf9d5d0e7d8cdf7a6ecd987fd9d18a789d92a7ccc9fe64200fa531c0b6"; + sha256 = "579bdce1b8b4a2ebf2688c95e5ee4f2e20347a983874633bcdb92c3d6c19ee8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cs/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/cs/thunderbird-91.8.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5c4dffc7b3f672edbaf6906e487fc6636ab25fcc8dc9e3697b2b8d2a90ba24da"; + sha256 = "2eccefb9c82eae0f339ec9d5291c82a873ddcdc80822a7588e686ffaa50e7763"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cy/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/cy/thunderbird-91.8.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "b248ee575f00f1b4de3ac4be15886f270366b1073ad6dd84f4807ecc7fbd9a9f"; + sha256 = "0616bd3fb1baa79b4dbfddf260d013c03829edcdf761e25980b8600e63922f52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/da/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/da/thunderbird-91.8.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "e2c03805474f8c39467217cd26a08133fd3cba61de35d4a2515b1d535bea6d0b"; + sha256 = "56c3cf0930c0966212d607589a32cec910d6b0a7bc7db314b317e0f717321fc6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/de/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/de/thunderbird-91.8.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "5de15b1da2b90eac08889791178a2d8b304b97bb4377c2478a0142ad0dc166f0"; + sha256 = "5ef59f3d0575ec3f570f4b1d0a401ac3eaf42a901ccece9bbb46cd4bab4a61b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/dsb/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/dsb/thunderbird-91.8.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "20c2c5e9a57440eb046b35ce7f549d846e17afd26cf4883d7ee9de2223bce0d2"; + sha256 = "e4ba253ee1f3629d5e3bde8475a49b8a95fb1a0bb76c14cb62a53a6e6f545804"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/el/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/el/thunderbird-91.8.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "3c5c3462455517f391ef0aa194a39522397d971e8d5ab2113a47cde1bea3b7b6"; + sha256 = "7c342ff901eb195ee06b0b67d4a52b118053ee8153d9dffae48c83e937a04be4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-CA/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/en-CA/thunderbird-91.8.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "adee07c4cc48bcd3595d32c881bedabf3410df9c3517c3f8f6feeb237552451d"; + sha256 = "35cc280dfa58eeb62c12d133d4bccfcd85e694121129e154770c840f6e87169d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-GB/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/en-GB/thunderbird-91.8.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b9eaf0f03ac73e961a160017bfc3f4537592d6d6d63239c3a8249fdb08a5f232"; + sha256 = "ac393ceb36bcf7afefdaa1f6fdbdc49ef739781979878f055d623cae78cc0468"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-US/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/en-US/thunderbird-91.8.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "50783e08cf7bcb904bcca66270b55570a961390d078dae9998fcf8e527f92d3f"; + sha256 = "bac3f4695e762b67b21b399edd406340a6500a8a5bcf4973a74904b9065078c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/es-AR/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/es-AR/thunderbird-91.8.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e43babb45d6bffed8e2f27b7a21c211306322cec480b928124118b6bf999b6f9"; + sha256 = "5ec79874c0a76555e68a84aa8f41ceff5ff72877d4636301cae99ef56ea16e74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/es-ES/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/es-ES/thunderbird-91.8.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "eead62cde35d787634bb1b6e6e8a96458f05e68d0bb9cd66c3926350d890c5a2"; + sha256 = "3465df8574f3d9dcb86a458147c388ae662cd17b998176591eb3841a448c543a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/et/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/et/thunderbird-91.8.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c3b4d1ebdc325e6ecd6f35012634ea5f4ffd620de7c30589a8999b128b986d59"; + sha256 = "58a1a76c81c6687a5673150ad5effa421b5a32a8825c52a7106a5a77cf4d66bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/eu/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/eu/thunderbird-91.8.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b23c783109a22c71bd5b337e2633bf2d17f8ee7b580faa43164b2ce7d70d5c45"; + sha256 = "c90e4acc10b1157d3f1009f55d5ebe70828288ebf057f01d0cfc78f306536d19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fi/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/fi/thunderbird-91.8.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "a34afada49c57d6816cfc472681b100366df881fdd343495b959df44dcc8bf5b"; + sha256 = "249943c795ac7b7d94331399c7badfd2d7ea86ccbf96e7eb653985ead8d50975"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/fr/thunderbird-91.8.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "85c5472de95eb357bba1eb697b17b309ec586717ef09a735cc94b3d7ee069ce3"; + sha256 = "6464ce3e03ec947fe8752096d3049390b307ed44eaea036194c6d58750064a1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fy-NL/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/fy-NL/thunderbird-91.8.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e654bd29cd2a4a99a09d0d7feca2af89cd308d8d9fca6ad1069e5b026e04cee2"; + sha256 = "a45de5dd3f37b9a7c39b260ba84a03cef94b103787235cd34ad45cf4592e7ed2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ga-IE/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ga-IE/thunderbird-91.8.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ae2e865abb044bb61f51f46636f84054f87ef0e2d46b0c4d85d990bcb05d45da"; + sha256 = "ed509287d305e2457137d051b1842d26401b5b337a5272562a7b19922e874c2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/gd/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/gd/thunderbird-91.8.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "54b117bb7ba110de0c3fb5e9c4d2743d54a49b941c273ed7f8c11dae30c1517e"; + sha256 = "2c8a2c587bb522aa2dceb3fb3d68e338f9e22b1be57745e26441c4c72257b22b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/gl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/gl/thunderbird-91.8.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "bcec6b86c99fd463cbb16974e43fb232bc93e5ff2b1b08b18332000b274eaa67"; + sha256 = "4dd7eb1c72eca568c03c233f5078bbcf24da14e123106ce877096ab2b1637b61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/he/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/he/thunderbird-91.8.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9ab72a7b9a87a75b113421ceef891b3e546a056e48c039f7af20e85a1b17b598"; + sha256 = "82f8168ab4eceaf92f03fd777160ec28d25f4801944469a5ac3f6df8de1773e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/hr/thunderbird-91.8.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b8ec76e30180214f2c4d2743686e8de374207fbad8677d5801eb941174217834"; + sha256 = "80221f2fc08812f864dd09edc4e6b7693d5966b292d8ea66c2931a51f35bfaa8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hsb/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/hsb/thunderbird-91.8.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "5d35c9c51d1d94c55cf72901866ce0896770d8939fbbefe234f312f1b18c6b17"; + sha256 = "9e6b7c4cd402675cbac43088328e321a6f738cd7d83406d7cd7f8ac6060b6f11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hu/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/hu/thunderbird-91.8.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "dc34328fd070973dd230158679bc34ba79075eaf8c62b4c3d67fc9daa8fd04a2"; + sha256 = "4cea9f48504060e31006f69eecafe3c352440f54d599f637d4a1a536d48e27a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hy-AM/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/hy-AM/thunderbird-91.8.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "6e94dca126ef9f60dc8f6086b4396548fbf3db4cd85feba332ee9cdc5c5546e1"; + sha256 = "55d887cf63952b1eec43bf2449fa3eb8c543d91ee4cdeaa1e54a00cd4a009357"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/id/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/id/thunderbird-91.8.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "7ef09c4636f141fc19ca67e0787d1a04d4b6856d6bfc57732f1eacc31fe6b437"; + sha256 = "32dcdae28370e35f61a3f5c12085830f6263b0b4b9b272d780f2c748d1474961"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/is/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/is/thunderbird-91.8.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "8644c28c791152e6de4bf932417328afbcb3ff1832e85ded577d88a045071ceb"; + sha256 = "df47af9356ee1b9bed415421f14f797499402dccc96f3aef18538d64b4b5b8b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/it/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/it/thunderbird-91.8.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "a17c80fdb39ff828ab0b7d8fb2274a2f9c1dafb4d8657c510e894697f72e6941"; + sha256 = "1cf50c518e5d8137c52bf37eaeac618007e2efbc8f94deb9461a01b2787df434"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ja/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ja/thunderbird-91.8.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "50f48c0bb455132ee1a8e7f2a98a7e01688c0517c134dbf706538432615f44ec"; + sha256 = "031d2db07bc2dfc8dbb4c86119a993725a661ad4f6596241bd5590ebbdc01e3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ka/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ka/thunderbird-91.8.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "16b4cdc1dda75f62f664f5d0780e4dd9e65c91414fa3c6e546ed9ae39a5f251b"; + sha256 = "18f1b2a900381ce85cded1046e0bc10c015eb3ab5602497e93190229aea26bcd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/kab/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/kab/thunderbird-91.8.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "ef2db45999395216684c0cdee16fbaa9ad8a665088d529bcb80df72d442b433b"; + sha256 = "10b42a83af77d82343297439f8c56cdb3ab85fa4ea88aa77e49aeb6a01a90c99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/kk/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/kk/thunderbird-91.8.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "fb1e05654c70c6b4361892799bf5e2b2035183407db9cae5307b4191548c3bd9"; + sha256 = "1e0b1740eaf8c48ecb2a41c3687f51afc07b9243c098637d60c5452259ae9192"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ko/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ko/thunderbird-91.8.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "ca29bff1b2276510bba6bdaf280ea8a198fc36c77b325e60a4c1f5207a16a7e2"; + sha256 = "da9a00752a4e6a3aca2f298eecae39e661435f95c723f7327ed60eeb0e75d50d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/lt/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/lt/thunderbird-91.8.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "7551bc85a46fa13c4fd7d72b31d34bda108bf5c7831825b7906c153542918f86"; + sha256 = "7ece24971b0a7b901ab165ff30c3b5239161a488be02c7f5cf5d6a2dfc6dce3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/lv/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/lv/thunderbird-91.8.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "a6fd175e80f8f14431500cd272f7a277ab7b210b6d81c4b80c333e34e13260f7"; + sha256 = "baf96d476ec159bbc4567e4beae29d3c61fef9683190cdc7c207163ed67797fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ms/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ms/thunderbird-91.8.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "5fcb5b9a0a04957192a40fda0b097a1f781a98d9b18e6165810bbfad96cf188a"; + sha256 = "3b356c61079130bd3d5b5023116f74961ed84595222284fadc45f3224281bbfc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nb-NO/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/nb-NO/thunderbird-91.8.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "50d5e767ea3c826d3c924d5a50bce2db2eff9b5ada8c2fd10b4bd8c85061e9da"; + sha256 = "225a885cc788b64c864efab9cb0adbb0399a7e68e747551bb98cfba903898bec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/nl/thunderbird-91.8.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "c44d23adedd33715a38aa6a704de273de1034dbf0964698224463a2eb3a22fde"; + sha256 = "1c75e3df164a37c46f83421e0df28dd1cd4fd9e725a4e6c8d03378c800c53f04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nn-NO/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/nn-NO/thunderbird-91.8.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "c2081d7dc420cf97cbfc38901af9e3654bdd00610ad27cfc0a006afb7de003c5"; + sha256 = "fc154d52fa4e19ef4e727663a1bc4599da9e7c3aba0e563d823a3d4995d2632e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pa-IN/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/pa-IN/thunderbird-91.8.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "426e6b686e8cfa660dadda666b7bfdc0a70ccb5db4134e4960cf7c408e88c9e4"; + sha256 = "27a95c486a5a075fa8011add5c06c616ffafa7cb266afc26f7511cd510f8f403"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/pl/thunderbird-91.8.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c667bddefd1b82dd4945ca3a4a392f60b27ab7ab56e1b9fece0cac0dc4eb4971"; + sha256 = "34563d04912e27e93f122c47eca56a368f2b723406498f98f312f92459265f87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pt-BR/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/pt-BR/thunderbird-91.8.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ea24bf62001fa225ed08a05a34f8e5b0579de6c6b79fa08bd28760f41607ffd2"; + sha256 = "6ab98477ca80c945c4b780aa704b231e7831fd2334a70c57937b2815357f3150"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pt-PT/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/pt-PT/thunderbird-91.8.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "8676b8fcd019099ede4973fa1e949e63ea06bd5dc599cc6dcc836dc49fdf4470"; + sha256 = "0919ca9a0125a8545de083f629a4f338e8db0f0e7a87bb7c55172f163605f8d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/rm/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/rm/thunderbird-91.8.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "4aa9681f172a62d5be35c5c4e3ba500253541ef4f8e38eaf37fcb41dac7989c2"; + sha256 = "31d4de40f1ad6c284e388ffd760d3758174ce99c01ca23b0ccbf9d1a4f343bab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ro/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ro/thunderbird-91.8.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "12c57824de26d6bfde6e9de1c3d5b5b1481213ce939fc4860c2fc86aaf8d64a1"; + sha256 = "3e0a763faa79aa775e29907e018f81d506fbaa025d9900516447c6081e6c31b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ru/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/ru/thunderbird-91.8.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "3afa7da7eacf0a3479b92a72c3d1f503d62961a9683c9cf5a538da90e5a3bae8"; + sha256 = "ee485a4f7287d770107d9d41d678ace5873079e1fdc726a30800b6d055f68267"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sk/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/sk/thunderbird-91.8.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "1f5b0a28de82f795eb54daf44b8b807fdd30a7bff9dc5d1565adb001d38bd354"; + sha256 = "e8cc9b1a9e767ab548de614da8feb1b42213444e91e4a1382b2cdc7323872215"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sl/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/sl/thunderbird-91.8.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "340026146fd09e3ed7a49a7123898b3d005a147d4988bc2df2c86b173fa088fb"; + sha256 = "271b3fa48e9f1cedfe3fbfbd72fd23b0b477e9993108996dbc897835de0750c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sq/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/sq/thunderbird-91.8.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "64a9d0d4652d2d709aed3aa1e2a09bcf17ce936c0c4c950a27f8784e0a89d995"; + sha256 = "7fac9e56f3e5070f0b9e038483f0b0fb97a42d947410c3f8677b7e6d8ebf3828"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/sr/thunderbird-91.8.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "eb59bc42ef366a5ecf98f20f53113e69cc2f6591008bcccf592bc76dab636945"; + sha256 = "903c9408c4bce12a78cf5941b9413f65d946b49c5c6819c1cc1c7006373d6802"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sv-SE/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/sv-SE/thunderbird-91.8.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0f833b8b7a83b06b2f3cab5bffe94bfe28cbfc043543f73102f6789fdce95e61"; + sha256 = "c6ff664cd1d80bd36f1bbcffa239f3f8d7b31e5b68918001b1a26bd91ea49376"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/th/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/th/thunderbird-91.8.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "149d88dbb883e9eb04584d080d5e746a0165fa9cecc100e1af875414bd2c1154"; + sha256 = "ad27252f979daad7e7e842ff1144ab731fa4e588adc015f3e388ba26f2cf21de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/tr/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/tr/thunderbird-91.8.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "7b92aa7c7ace49f7e7d0489b5c69a2c1282fc267b3650aec765e194413b6e9e4"; + sha256 = "55581a2277ea6fa27389fa4ffdda72a02a8c3f8b2c92b0b04e7deb2d24840ee4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/uk/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/uk/thunderbird-91.8.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "217e921fb8d0fb6773ec7b4dabcb9a29293b15d2024353a4b542c8660f93e924"; + sha256 = "5b687b3839f6c4ce67c71c56965eccd85eab94063fb9bfc5d4e2f30336f3fe0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/uz/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/uz/thunderbird-91.8.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9428919a2d99f2ae953e50d148ab27200a3d9d8d02e5a8f5615a804468867922"; + sha256 = "41344413282a295db0c33e7ba01074b46c69d6267f94b36d10200f2adb42b39e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/vi/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/vi/thunderbird-91.8.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "2ee2b69190e6a5640b378d8a4b1dbe78aff7cae1db131aa162e23ee6626ee215"; + sha256 = "57bfaac37e13e218d631af0830cef177d342f45a64fc19f86bfc5aa9c940e632"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/zh-CN/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/zh-CN/thunderbird-91.8.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "e0537b6f509428a3721bac1ab4ff4567568d9854ece675a68a7bc2c058176e7f"; + sha256 = "417a2b7ca7f3981d171e453ca7ea709fbb05bc2283d874d82a4b002d8e64f816"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/zh-TW/thunderbird-91.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.8.1/linux-i686/zh-TW/thunderbird-91.8.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ec7aec372154e7e7281fd1b2d84068140c50577d8e1f3ad30006092fefc61766"; + sha256 = "2c92131700a89dc2c590901cf356705d308aa3520ad3f713ba866fce04edb8c7"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 91db452356f2c..b99d5dedd4b75 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = (common rec { pname = "thunderbird"; - version = "91.8.0"; + version = "91.8.1"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "147c7ad68b0a32cc0fd4405935836af1fa77bbce6a1e367b51ef9871e7fc2a8fe908a1d200be34326f4f339d272e62f619b75680201fe82d301ddd02e23824d5"; + sha512 = "1591f3e9c76c1f2ea7fa5e194a7d030c8657a7855a95c8a177e8067c5aa838f0d8ca2652cd049b4bc88d0c9e604285a47b0c8316c190e2ceadfc1130d1e4de6c"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index e5edfaa467090..92a8563633c2e 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.91.10"; + version = "3.95.4"; src = fetchurl { - url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; + url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-RlEgpXco0lkkjlJ8FZz4MxYznKLPl1Lxkb5MSmhOTzI="; + sha256 = "0kkkp0nw4fby4663w7g0k2y1sg89pm336slzii1s3n70h8cak3dx"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index ca5e2222c8e17..b7d5dbae760a1 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -21,7 +21,7 @@ let pname = "zammad"; - version = "5.1.0"; + version = "5.1.1"; src = applyPatches { diff --git a/pkgs/applications/networking/misc/zammad/gemset.nix b/pkgs/applications/networking/misc/zammad/gemset.nix index 2f9e77d425317..ceb3ef12958b3 100644 --- a/pkgs/applications/networking/misc/zammad/gemset.nix +++ b/pkgs/applications/networking/misc/zammad/gemset.nix @@ -664,10 +664,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04vxmjr200akcil9fqxc9ghbb9q0lyrh2q03xxncycd5vln910fi"; + sha256 = "1pfk942d6qwhw151hxaz7n4knk6whyxqvvywdx2cdw9yhykyaqzq"; type = "gem"; }; - version = "6.2.0"; + version = "6.2.1"; }; factory_bot_rails = { dependencies = ["factory_bot" "railties"]; @@ -1452,10 +1452,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.4"; }; nori = { groups = ["default"]; @@ -1700,10 +1700,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19mf9f5zx23cjjn0p77wz1igzpfr22mxhljgavffl8fwqq74v4ih"; + sha256 = "01ldw5ba6xfn2k97n75n52qs4f0fy8xmn58c4247xf476nfvg035"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; power_assert = { groups = ["default" "development" "test"]; @@ -1786,10 +1786,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xvkz9xrd1cqnlm0qac1iwwxzndx3cc17zrjncpa4lzjfwbxhsnm"; + sha256 = "0df9bknc2dllk8v9fhgidzbvbryaxa8fgifrk40cdz9csjsphbky"; type = "gem"; }; - version = "4.3.11"; + version = "4.3.12"; }; pundit = { dependencies = ["activesupport"]; @@ -1833,6 +1833,17 @@ }; version = "2.2.3"; }; + rack-attack = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rc6simyql7ax5zzp667x6krl0xxxh3asc1av6gcn8j6cyl86wsx"; + type = "gem"; + }; + version = "6.6.0"; + }; rack-livereload = { dependencies = ["rack"]; groups = ["development" "test"]; @@ -2273,10 +2284,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "134zg0dzd7216lyczkhv01v27ikkmipjihcy2bzi0qv72p1i923i"; + sha256 = "1wybcipkfawg4pragmayiig03xc084x3hbwywsh1dr9x9pa8f9hj"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; slack-notifier = { groups = ["default"]; diff --git a/pkgs/applications/networking/misc/zammad/package.json b/pkgs/applications/networking/misc/zammad/package.json index 00c22263200bd..28fd3fdf11263 100644 --- a/pkgs/applications/networking/misc/zammad/package.json +++ b/pkgs/applications/networking/misc/zammad/package.json @@ -14,5 +14,5 @@ "stylelint-prettier": "^2.0.0" }, "name": "Zammad", - "version": "5.1.0" + "version": "5.1.1" } diff --git a/pkgs/applications/networking/misc/zammad/source.json b/pkgs/applications/networking/misc/zammad/source.json index 76e1321433f14..03e8e1103b1a3 100644 --- a/pkgs/applications/networking/misc/zammad/source.json +++ b/pkgs/applications/networking/misc/zammad/source.json @@ -1,7 +1,8 @@ { "owner": "zammad", "repo": "zammad", - "rev": "eefae45c2ad6e6a96b8df631d2f50f290ecbd27d", - "sha256": "EjowvM//+UsAfEH9/0jgLkiD7EWH34M1NQ9U2DotBqc=", + "rev": "d71bd90ef964426230664cdfbaa2572325bfed4f", + "sha256": "yzDTkjnRBl71REtSKRblkanJWhj7gp/+exhWjxGCFWw=", "fetchSubmodules": true } + diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 2723f34204368..0eb0a02ed01f9 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -2,6 +2,7 @@ , pkg-config , python3 , fetchFromGitLab +, fetchpatch , gtk3 , glib , gdbm @@ -44,6 +45,20 @@ stdenv.mkDerivation rec { libayatana-appindicator-gtk3 ]; + patches = [ + # Fix missing tray icon + (fetchpatch { + url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/fix-tray-icon.patch"; + sha256 = "sha256-9LjCEQl8YfraVlO1W7+Yy7egLAPu5YfnvGvCI3uGFh8="; + }) + # Fix build with meson 0.61 + # appdata/meson.build:3:5: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/meson0.61.patch"; + sha256 = "sha256-B+tBPIz5RxOwZWYEWttqSKGw2Wbfk0mnBY0Zy0evvAQ="; + }) + ]; + postPatch = '' patchShebangs man/manhelper.py ''; diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 72b4c7720480d..84ac952846f3c 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -1,9 +1,8 @@ -{ pkgs, nodejs-14_x, stdenv, lib }: +{ pkgs, nodejs-16_x, stdenv, lib, nixosTests }: let nodePackages = import ./node-composition.nix { inherit pkgs; - nodejs = nodejs-14_x; inherit (stdenv.hostPlatform) system; }; in @@ -12,7 +11,17 @@ nodePackages.n8n.override { node-pre-gyp ]; - passthru.updateScript = ./generate-dependencies.sh; + dontNpmInstall = true; + + postInstall = '' + mkdir -p $out/bin + ln -s $out/lib/node_modules/n8n/bin/n8n $out/bin/n8n + ''; + + passthru = { + updateScript = ./generate-dependencies.sh; + tests = nixosTests.n8n; + }; meta = with lib; { description = "Free and open fair-code licensed node based Workflow Automation Tool"; diff --git a/pkgs/applications/networking/n8n/generate-dependencies.sh b/pkgs/applications/networking/n8n/generate-dependencies.sh index f7412bc5e5e26..7c1b90a040343 100755 --- a/pkgs/applications/networking/n8n/generate-dependencies.sh +++ b/pkgs/applications/networking/n8n/generate-dependencies.sh @@ -13,7 +13,7 @@ cd "$(dirname $(readlink -f $0))" node2nix \ - --14 \ + --nodejs-16 \ --strip-optional-dependencies \ --node-env node-env.nix \ --input package.json \ diff --git a/pkgs/applications/networking/n8n/node-composition.nix b/pkgs/applications/networking/n8n/node-composition.nix index 53bdef1f98646..ca76a98f5a657 100644 --- a/pkgs/applications/networking/n8n/node-composition.nix +++ b/pkgs/applications/networking/n8n/node-composition.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/applications/networking/n8n/node-env.nix index 5f055785791ba..2590dd267a4ef 100644 --- a/pkgs/applications/networking/n8n/node-env.nix +++ b/pkgs/applications/networking/n8n/node-env.nix @@ -98,7 +98,7 @@ let '' + (lib.concatMapStrings (dependency: '' - if [ ! -e "${dependency.name}" ]; then + if [ ! -e "${dependency.packageName}" ]; then ${composePackage dependency} fi '' @@ -257,8 +257,8 @@ let var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); } if(packageLock.dependencies !== undefined) { @@ -390,7 +390,7 @@ let buildNodePackage = { name , packageName - , version + , version ? null , dependencies ? [] , buildInputs ? [] , production ? true @@ -409,7 +409,7 @@ let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "${name}-${version}"; + name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -441,6 +441,14 @@ let if [ -d "$out/lib/node_modules/.bin" ] then ln -s $out/lib/node_modules/.bin $out/bin + + # Patch the shebang lines of all the executables + ls $out/bin/* | while read i + do + file="$(readlink -f "$i")" + chmod u+rwx "$file" + patchShebangs "$file" + done fi # Create symlinks to the deployed manual page folders, if applicable @@ -471,7 +479,7 @@ let buildNodeDependencies = { name , packageName - , version + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -489,7 +497,7 @@ let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; in stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; + name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux @@ -519,6 +527,7 @@ let if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . + chmod 644 package-lock.json fi ''} @@ -541,7 +550,7 @@ let buildNodeShell = { name , packageName - , version + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -557,9 +566,10 @@ let let nodeDependencies = buildNodeDependencies args; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; + stdenv.mkDerivation ({ + name = "node-shell-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' @@ -578,7 +588,7 @@ let export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; - }; + } // extraArgs); in { buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 1793956b1d3a6..1c0eeeb8266de 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -1,16 +1,16 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { - "@azure/abort-controller-1.0.5" = { + "@azure/abort-controller-1.1.0" = { name = "_at_azure_slash_abort-controller"; packageName = "@azure/abort-controller"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.5.tgz"; - sha512 = "G5sjKExiVsbFQo+4YY5MBPOSsh3EUv6XmqjgJaF/VCjckWLGGKPUPGfbCSn6Xal6gzGoPQMOQ+wCCGNCX9NAPg=="; + url = "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz"; + sha512 = "TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw=="; }; }; "@azure/core-asynciterator-polyfill-1.0.2" = { @@ -31,13 +31,13 @@ let sha512 = "7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA=="; }; }; - "@azure/core-http-2.2.4" = { + "@azure/core-http-2.2.5" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.4.tgz"; - sha512 = "QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A=="; + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.5.tgz"; + sha512 = "kctMqSQ6zfnlFpuYzfUKadeTyOQYbIQ+3Rj7dzVC3Dk1dOnHroTwR9hLYKX8/n85iJpkyaksaXpuh5L7GJRYuQ=="; }; }; "@azure/core-lro-2.2.4" = { @@ -112,13 +112,13 @@ let sha512 = "ank38FdCLfJ+EoeMzCz3hkYJuZAd63ARvDKkxZYRDb+beBYf+/+gx8jNTqkq/hfyUl4dJQ/a7tECU0Y0F98CHg=="; }; }; - "@babel/runtime-7.17.8" = { + "@babel/runtime-7.17.9" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.17.8"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz"; - sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz"; + sha512 = "lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg=="; }; }; "@colors/colors-1.5.0" = { @@ -148,6 +148,24 @@ let sha512 = "3b94XDdRLqL7OlE7OjWg/4pgG825Juw8PLVEDm6h5pio0gMU89ICxfatGxHsBxMGfqad+wnvdmUweZWlELDFpQ=="; }; }; + "@fortawesome/fontawesome-common-types-6.1.1" = { + name = "_at_fortawesome_slash_fontawesome-common-types"; + packageName = "@fortawesome/fontawesome-common-types"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.1.tgz"; + sha512 = "wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA=="; + }; + }; + "@fortawesome/free-regular-svg-icons-6.1.1" = { + name = "_at_fortawesome_slash_free-regular-svg-icons"; + packageName = "@fortawesome/free-regular-svg-icons"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.1.1.tgz"; + sha512 = "xXiW7hcpgwmWtndKPOzG+43fPH7ZjxOaoeyooptSztGmJxCAflHZxXNK0GcT0uEsR4jTGQAfGklDZE5NHoBhKg=="; + }; + }; "@icetee/ftp-0.3.15" = { name = "_at_icetee_slash_ftp"; packageName = "@icetee/ftp"; @@ -184,6 +202,15 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; + "@mapbox/node-pre-gyp-1.0.9" = { + name = "_at_mapbox_slash_node-pre-gyp"; + packageName = "@mapbox/node-pre-gyp"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz"; + sha512 = "aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw=="; + }; + }; "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; @@ -328,6 +355,15 @@ let sha512 = "/5O7Fq6Vnv8L6ucmPjaWbVG1XkP4FO+w5glqfkIsq3Xw4oyNAdJddbnYodNDAfjVUvo/rrSCTom4kAND7T1o5Q=="; }; }; + "@techteamer/ocsp-1.0.0" = { + name = "_at_techteamer_slash_ocsp"; + packageName = "@techteamer/ocsp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@techteamer/ocsp/-/ocsp-1.0.0.tgz"; + sha512 = "lNAOoFHaZN+4huo30ukeqVrUmfC+avoEBYQ11QAnAw1PFhnI5oBCg8O/TNiCoEWix7gNGBIEjrQwtPREqKMPog=="; + }; + }; "@tokenizer/token-0.1.1" = { name = "_at_tokenizer_slash_token"; packageName = "@tokenizer/token"; @@ -427,6 +463,15 @@ let sha512 = "L7wFlX3t9GsGgNS0oxLt6zbAZZGgsdptMmciL4cdxHmbL3Hz4Lysh8YqAR34eHsJ1uacJITcZBBDl5XpQlxPpQ=="; }; }; + "@types/generic-pool-3.1.10" = { + name = "_at_types_slash_generic-pool"; + packageName = "@types/generic-pool"; + version = "3.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/generic-pool/-/generic-pool-3.1.10.tgz"; + sha512 = "WRT/9taXh9XJRA9yvrbC02IqGZhK9GbFE/vuP2LeSLrqmDzz5wdXsH0Ige/F+3+rbbZfwH3LEazDsU0JiSV3vA=="; + }; + }; "@types/json-diff-0.5.2" = { name = "_at_types_slash_json-diff"; packageName = "@types/json-diff"; @@ -445,13 +490,13 @@ let sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A=="; }; }; - "@types/lodash-4.14.181" = { + "@types/lodash-4.14.182" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.181"; + version = "4.14.182"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.181.tgz"; - sha512 = "n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz"; + sha512 = "/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q=="; }; }; "@types/lossless-json-1.0.1" = { @@ -472,22 +517,22 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/node-12.20.47" = { + "@types/node-12.20.50" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.47"; + version = "12.20.50"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz"; - sha512 = "BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.50.tgz"; + sha512 = "+9axpWx2b2JCVovr7Ilgt96uc6C1zBKOQMpGtRbWT9IoR/8ue32GGMfGA4woP8QyP2gBs6GQWEVM3tCybGCxDA=="; }; }; - "@types/node-17.0.23" = { + "@types/node-17.0.31" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.23"; + version = "17.0.31"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz"; - sha512 = "UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.31.tgz"; + sha512 = "AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q=="; }; }; "@types/node-fetch-2.6.1" = { @@ -553,13 +598,13 @@ let sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; }; }; - "@types/snowflake-sdk-1.6.2" = { + "@types/snowflake-sdk-1.6.4" = { name = "_at_types_slash_snowflake-sdk"; packageName = "@types/snowflake-sdk"; - version = "1.6.2"; + version = "1.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.2.tgz"; - sha512 = "68albQhKcrtz6G7IhXab8JE/96EN5COPo63+xUxvjwbYXe1BD8WTLVIXIxLdvC5oLmrK8Tf5W0mz+swaH/AfBQ=="; + url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.4.tgz"; + sha512 = "v3QjPbvd2dhyI5fPU5whxgUjhf9O19acIGiL65aUPCnkLIla5Z0ZqOiP3Jw5eyghunZHWohKfvtV+UdesCi29g=="; }; }; "@types/tough-cookie-2.3.8" = { @@ -625,13 +670,13 @@ let sha512 = "H5aqjkogmFxfaOrfn/e42vyspHVXuJ8er63KuljJXpOyJ1ZO/U5CrHfO8BLKIy2w7mBM02L5quL0vbfQqrGQbA=="; }; }; - "acorn-8.7.0" = { + "acorn-8.7.1" = { name = "acorn"; packageName = "acorn"; - version = "8.7.0"; + version = "8.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz"; - sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz"; + sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; }; }; "acorn-walk-8.2.0" = { @@ -769,22 +814,22 @@ let sha512 = "qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw=="; }; }; - "aproba-1.2.0" = { + "aproba-2.0.0" = { name = "aproba"; packageName = "aproba"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + url = "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz"; + sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; }; }; - "are-we-there-yet-1.1.7" = { + "are-we-there-yet-2.0.0" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; - version = "1.1.7"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; - sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz"; + sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; }; }; "argparse-1.0.10" = { @@ -841,15 +886,6 @@ let sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; }; }; - "asn1.js-4.10.1" = { - name = "asn1.js"; - packageName = "asn1.js"; - version = "4.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; - sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; - }; - }; "asn1.js-5.4.1" = { name = "asn1.js"; packageName = "asn1.js"; @@ -859,15 +895,6 @@ let sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; }; }; - "asn1.js-rfc2560-4.0.6" = { - name = "asn1.js-rfc2560"; - packageName = "asn1.js-rfc2560"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1.js-rfc2560/-/asn1.js-rfc2560-4.0.6.tgz"; - sha512 = "ysf48ni+f/efNPilq4+ApbifUPcSW/xbDeQAh055I+grr2gXgNRQqHew7kkO70WSMQ2tEOURVwsK+dJqUNjIIg=="; - }; - }; "asn1.js-rfc2560-5.0.1" = { name = "asn1.js-rfc2560"; packageName = "asn1.js-rfc2560"; @@ -877,15 +904,6 @@ let sha512 = "1PrVg6kuBziDN3PGFmRk3QrjpKvP9h/Hv5yMrFZvC1kpzP6dQRzf5BpKstANqHBkaOUmTpakJWhicTATOA/SbA=="; }; }; - "asn1.js-rfc5280-2.0.1" = { - name = "asn1.js-rfc5280"; - packageName = "asn1.js-rfc5280"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1.js-rfc5280/-/asn1.js-rfc5280-2.0.1.tgz"; - sha512 = "1e2ypnvTbYD/GdxWK77tdLBahvo1fZUHlQJqAVUuZWdYj0rdjGcf2CWYUtbsyRYpYUMwMWLZFUtLxog8ZXTrcg=="; - }; - }; "asn1.js-rfc5280-3.0.0" = { name = "asn1.js-rfc5280"; packageName = "asn1.js-rfc5280"; @@ -913,22 +931,13 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "async-1.5.2" = { - name = "async"; - packageName = "async"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; - sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; - }; - }; - "async-2.6.3" = { + "async-2.6.4" = { name = "async"; packageName = "async"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; - sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; + url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz"; + sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; }; "async-3.2.3" = { @@ -940,6 +949,15 @@ let sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; }; + "async-validator-1.8.5" = { + name = "async-validator"; + packageName = "async-validator"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz"; + sha512 = "tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA=="; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -967,13 +985,13 @@ let sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w=="; }; }; - "aws-sdk-2.1106.0" = { + "aws-sdk-2.1131.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1106.0"; + version = "2.1131.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1106.0.tgz"; - sha512 = "3dr0TTR2LI70ST8fa4IgXHpWdH4yv7FLnt9YEndwFQ8ar2EMCMpMU67wwCGBA72GUi0aOg4+lsLjGmCvIq3jug=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1131.0.tgz"; + sha512 = "Ic3f2fSgVhYDQ0OBGxE6ODtSwaKyxBPGrI2RGrYt2Oj0Z8f227P7dB90o9X7y2MtnuJ4WoAzkf3Vc1c1UnnZlA=="; }; }; "aws-sign2-0.7.0" = { @@ -1003,13 +1021,31 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; - "axios-retry-3.2.4" = { + "axios-retry-3.2.5" = { name = "axios-retry"; packageName = "axios-retry"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.2.4.tgz"; - sha512 = "Co3UXiv4npi6lM963mfnuH90/YFLKWWDmoBYfxkHT5xtkSSWNqK9zdG3fw5/CP/dsoKB5aMMJCsgab+tp1OxLQ=="; + url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.2.5.tgz"; + sha512 = "a8umkKbfIkTiYJQLx3v3TzKM85TGKB8ZQYz4zwykt2fpO64TsRlUhjaPaAb3fqMWCXFm2YhWcd8V5FHDKO9bSA=="; + }; + }; + "babel-helper-vue-jsx-merge-props-2.0.3" = { + name = "babel-helper-vue-jsx-merge-props"; + packageName = "babel-helper-vue-jsx-merge-props"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz"; + sha512 = "gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="; + }; + }; + "babel-runtime-6.26.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; }; }; "balanced-match-1.0.2" = { @@ -1165,15 +1201,6 @@ let sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; }; }; - "body-parser-1.19.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; - }; - }; "body-parser-1.20.0" = { name = "body-parser"; packageName = "body-parser"; @@ -1381,13 +1408,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "cfb-1.2.1" = { + "cfb-1.2.2" = { name = "cfb"; packageName = "cfb"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/cfb/-/cfb-1.2.1.tgz"; - sha512 = "wT2ScPAFGSVy7CY+aauMezZBnNrfnaLSrxHUHdea+Td/86vrk6ZquggV+ssBR88zNs0OnBkL2+lf9q0K+zVGzQ=="; + url = "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz"; + sha512 = "KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA=="; }; }; "chalk-1.1.3" = { @@ -1462,13 +1489,13 @@ let sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; }; }; - "chownr-1.1.4" = { + "chownr-2.0.0" = { name = "chownr"; packageName = "chownr"; - version = "1.1.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; - sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; }; "clamp-1.0.1" = { @@ -1561,15 +1588,6 @@ let sha512 = "2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="; }; }; - "code-point-at-1.1.0" = { - name = "code-point-at"; - packageName = "code-point-at"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; - }; - }; "codepage-1.15.0" = { name = "codepage"; packageName = "codepage"; @@ -1624,13 +1642,22 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.9.0" = { + "color-string-1.9.1" = { name = "color-string"; packageName = "color-string"; - version = "1.9.0"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"; + sha512 = "shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="; + }; + }; + "color-support-1.1.3" = { + name = "color-support"; + packageName = "color-support"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz"; - sha512 = "9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ=="; + url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; + sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; "colornames-1.1.1" = { @@ -1678,6 +1705,15 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; + "commander-9.2.0" = { + name = "commander"; + packageName = "commander"; + version = "9.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-9.2.0.tgz"; + sha512 = "e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w=="; + }; + }; "commist-1.1.0" = { name = "commist"; packageName = "commist"; @@ -1777,13 +1813,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "convict-6.2.2" = { + "convict-6.2.3" = { name = "convict"; packageName = "convict"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/convict/-/convict-6.2.2.tgz"; - sha512 = "3MsROJiEFN3BAzeFit1t87t7EUFzd44MNd13MLSikV2dsnDl7znwKgtYPPONtnDzxiDW0nBAsxVhSRNrjUrTTg=="; + url = "https://registry.npmjs.org/convict/-/convict-6.2.3.tgz"; + sha512 = "mTY04Qr7WrqiXifdeUYXr4/+Te4hPFWDvz6J2FVIKCLc2XBhq63VOSSYAKJ+unhZAYOAjmEdNswTOeHt7s++pQ=="; }; }; "cookie-0.4.1" = { @@ -1795,13 +1831,13 @@ let sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; }; - "cookie-0.4.2" = { + "cookie-0.5.0" = { name = "cookie"; packageName = "cookie"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; - sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; + sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; }; }; "cookie-parser-1.4.6" = { @@ -1822,13 +1858,22 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "core-js-3.21.1" = { + "core-js-2.6.12" = { name = "core-js"; packageName = "core-js"; - version = "3.21.1"; + version = "2.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz"; - sha512 = "FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"; + sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; + }; + }; + "core-js-3.22.5" = { + name = "core-js"; + packageName = "core-js"; + version = "3.22.5"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz"; + sha512 = "VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA=="; }; }; "core-util-is-1.0.2" = { @@ -1840,13 +1885,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "crc-32-1.2.1" = { + "crc-32-1.2.2" = { name = "crc-32"; packageName = "crc-32"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz"; - sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w=="; + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz"; + sha512 = "ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="; }; }; "cron-1.7.2" = { @@ -1993,13 +2038,13 @@ let sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; }; }; - "deep-extend-0.6.0" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.6.0"; + "deepmerge-1.5.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz"; + sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; }; }; "deepmerge-4.2.2" = { @@ -2011,13 +2056,13 @@ let sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; }; }; - "define-properties-1.1.3" = { + "define-properties-1.1.4" = { name = "define-properties"; packageName = "define-properties"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; + sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; }; }; "delayed-stream-1.0.0" = { @@ -2056,15 +2101,6 @@ let sha512 = "tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ=="; }; }; - "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"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; - }; - }; "depd-2.0.0" = { name = "depd"; packageName = "depd"; @@ -2074,15 +2110,6 @@ let sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; - "destroy-1.0.4" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; - }; - }; "destroy-1.2.0" = { name = "destroy"; packageName = "destroy"; @@ -2092,13 +2119,13 @@ let sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; }; }; - "detect-libc-1.0.3" = { + "detect-libc-2.0.1" = { name = "detect-libc"; packageName = "detect-libc"; - version = "1.0.3"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz"; + sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; }; }; "diagnostics-1.1.1" = { @@ -2137,22 +2164,22 @@ let sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a"; }; }; - "dom-serializer-1.3.2" = { + "dom-serializer-1.4.1" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.3.2"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; - sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"; + sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; }; }; - "domelementtype-2.2.0" = { + "domelementtype-2.3.0" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; - sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"; + sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; }; }; "domhandler-4.3.1" = { @@ -2236,6 +2263,15 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; + "element-ui-2.15.8" = { + name = "element-ui"; + packageName = "element-ui"; + version = "2.15.8"; + src = fetchurl { + url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.8.tgz"; + sha512 = "N54zxosRFqpYax3APY3GeRmtOZwIls6Z756WM0kdPZ5Q92PIeKHnZgF1StlamIg9bLxP1k+qdhTZvIeQlim09A=="; + }; + }; "emoji-regex-8.0.0" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -2272,13 +2308,13 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "encoding-japanese-1.0.30" = { + "encoding-japanese-2.0.0" = { name = "encoding-japanese"; packageName = "encoding-japanese"; - version = "1.0.30"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/encoding-japanese/-/encoding-japanese-1.0.30.tgz"; - sha512 = "bd/DFLAoJetvv7ar/KIpE3CNO8wEuyrt9Xuw6nSMiZ+Vrz/Q21BPsMHvARL2Wz6IKHKXgb+DWZqtRg1vql9cBg=="; + url = "https://registry.npmjs.org/encoding-japanese/-/encoding-japanese-2.0.0.tgz"; + sha512 = "++P0RhebUC8MJAwJOsT93dT+5oc5oPImp1HubZpAuCZ5kTLnhuuBhKHj2jJeO/Gj93idPBWmIuQ9QWMe5rX3pQ=="; }; }; "end-of-stream-1.4.4" = { @@ -2317,13 +2353,13 @@ let sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; }; }; - "es-abstract-1.19.2" = { + "es-abstract-1.20.0" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.19.2"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz"; - sha512 = "gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz"; + sha512 = "URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA=="; }; }; "es-to-primitive-1.2.1" = { @@ -2461,13 +2497,13 @@ let sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; - "express-4.17.3" = { + "express-4.18.1" = { name = "express"; packageName = "express"; - version = "4.17.3"; + version = "4.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz"; - sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; + url = "https://registry.npmjs.org/express/-/express-4.18.1.tgz"; + sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; }; }; "extend-3.0.2" = { @@ -2533,13 +2569,13 @@ let sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; }; }; - "fecha-4.2.1" = { + "fecha-4.2.3" = { name = "fecha"; packageName = "fecha"; - version = "4.2.1"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz"; - sha512 = "MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="; + url = "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz"; + sha512 = "OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="; }; }; "fflate-0.7.3" = { @@ -2587,13 +2623,13 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; - "finalhandler-1.1.2" = { + "finalhandler-1.2.0" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; + sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; }; }; "flatted-3.2.5" = { @@ -2614,13 +2650,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.14.9" = { + "follow-redirects-1.15.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.9"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz"; - sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz"; + sha512 = "aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ=="; }; }; "for-each-0.3.3" = { @@ -2722,13 +2758,13 @@ let sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; }; - "fs-minipass-1.2.7" = { + "fs-minipass-2.1.0" = { name = "fs-minipass"; packageName = "fs-minipass"; - version = "1.2.7"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; - sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; }; }; "fs.realpath-1.0.0" = { @@ -2749,13 +2785,31 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; - "gauge-2.7.4" = { + "function.prototype.name-1.1.5" = { + name = "function.prototype.name"; + packageName = "function.prototype.name"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; + sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; + }; + }; + "functions-have-names-1.2.3" = { + name = "functions-have-names"; + packageName = "functions-have-names"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"; + sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; + }; + }; + "gauge-3.0.2" = { name = "gauge"; packageName = "gauge"; - version = "2.7.4"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + url = "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz"; + sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; }; }; "generate-function-2.3.1" = { @@ -2902,13 +2956,13 @@ let sha512 = "UWXQ7BpSCW8erDespU2I4cri22xsKgwOCyhsJal0OJhi2tFpwJpsYNJt4vCiFPL1p2HzCGiS713LKpNR25n9Kg=="; }; }; - "graceful-fs-4.2.9" = { + "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.9"; + version = "4.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; - sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; "handlebars-4.7.7" = { @@ -2956,13 +3010,13 @@ let sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; }; - "has-bigints-1.0.1" = { + "has-bigints-1.0.2" = { name = "has-bigints"; packageName = "has-bigints"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz"; - sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; + url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"; + sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; }; }; "has-flag-4.0.0" = { @@ -2974,6 +3028,15 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; + "has-property-descriptors-1.0.0" = { + name = "has-property-descriptors"; + packageName = "has-property-descriptors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; + sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; + }; + }; "has-symbols-1.0.3" = { name = "has-symbols"; packageName = "has-symbols"; @@ -3055,13 +3118,13 @@ let sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; - "html-to-text-8.0.0" = { + "html-to-text-8.2.0" = { name = "html-to-text"; packageName = "html-to-text"; - version = "8.0.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.0.0.tgz"; - sha512 = "fEtul1OerF2aMEV+Wpy+Ue20tug134jOY1GIudtdqZi7D0uTudB2tVJBKfVhTL03dtqeJoF8gk8EPX9SyMEvLg=="; + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.2.0.tgz"; + sha512 = "CLXExYn1b++Lgri+ZyVvbUEFwzkLZppjjZOwB7X1qv2jIi8MrMEvxWX5KQ7zATAzTvcqgmtO00M2kCRMtEdOKQ=="; }; }; "htmlparser2-6.1.0" = { @@ -3073,15 +3136,6 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; - "http-errors-1.8.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; - sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; - }; - }; "http-errors-2.0.0" = { name = "http-errors"; packageName = "http-errors"; @@ -3109,22 +3163,13 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "http-signature-1.3.6" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz"; - sha512 = "3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw=="; - }; - }; - "https-proxy-agent-5.0.0" = { + "https-proxy-agent-5.0.1" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; "iconv-lite-0.4.24" = { @@ -3145,15 +3190,6 @@ let sha512 = "kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="; }; }; - "iconv-lite-0.6.2" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz"; - sha512 = "2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ=="; - }; - }; "iconv-lite-0.6.3" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -3199,15 +3235,6 @@ let sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; }; }; - "ignore-walk-3.0.4" = { - name = "ignore-walk"; - packageName = "ignore-walk"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz"; - sha512 = "PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ=="; - }; - }; "imap-0.8.19" = { name = "imap"; packageName = "imap"; @@ -3253,15 +3280,6 @@ 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"; @@ -3397,15 +3415,6 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - }; "is-fullwidth-code-point-3.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -3478,6 +3487,15 @@ let sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; }; }; + "is-plain-object-5.0.0" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; + }; + }; "is-promise-1.0.1" = { name = "is-promise"; packageName = "is-promise"; @@ -3622,13 +3640,13 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "isbot-3.4.5" = { + "isbot-3.4.6" = { name = "isbot"; packageName = "isbot"; - version = "3.4.5"; + version = "3.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.4.5.tgz"; - sha512 = "+KD6q1BBtw0iK9aGBGSfxJ31/ZgizKRjhm8ebgJUBMx0aeeQuIJ1I72beCoIrltIZGrSm4vmrxRxrG5n1aUTtw=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.4.6.tgz"; + sha512 = "EEi3SVCPB4WHtMBaAYzYLgCP7yG9qixseYCf3IG0Yc+howLia+XFPLTT1437rzeViLeDInKOXOdFhs9Fa/xgWQ=="; }; }; "isexe-2.0.0" = { @@ -3775,15 +3793,6 @@ let sha512 = "P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="; }; }; - "jsprim-2.0.2" = { - name = "jsprim"; - packageName = "jsprim"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz"; - sha512 = "gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ=="; - }; - }; "jwa-1.4.1" = { name = "jwa"; packageName = "jwa"; @@ -3856,22 +3865,22 @@ let sha512 = "l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew=="; }; }; - "libmime-5.0.0" = { + "libmime-5.1.0" = { name = "libmime"; packageName = "libmime"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-5.0.0.tgz"; - sha512 = "2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg=="; + url = "https://registry.npmjs.org/libmime/-/libmime-5.1.0.tgz"; + sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA=="; }; }; - "libphonenumber-js-1.9.50" = { + "libphonenumber-js-1.9.53" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.9.50"; + version = "1.9.53"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.50.tgz"; - sha512 = "cCzQPChw2XbordcO2LKiw5Htx5leHVfFk/EXkxNHqJfFo7Fndcb1kF5wPJpc316vCJhhikedYnVysMh3Sc7Ocw=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.53.tgz"; + sha512 = "3cuMrA2CY3TbKVC0wKye5dXYgxmVVi4g13gzotprQSguFHMqf0pIrMM2Z6ZtMsSWqvtIqi5TuQhGjMhxz0O9Mw=="; }; }; "libqp-1.1.0" = { @@ -3892,13 +3901,13 @@ let sha512 = "FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="; }; }; - "linkify-it-3.0.3" = { + "linkify-it-4.0.0" = { name = "linkify-it"; packageName = "linkify-it"; - version = "3.0.3"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz"; - sha512 = "ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ=="; + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.0.tgz"; + sha512 = "QAxkXyzT/TXgwGyY4rTgC95Ex6/lZ5/lYTV9nug6eJt93BCBQGOE47D/g2+/m5J1MrVLr2ot97OXkBZ9bBpR4A=="; }; }; "localtunnel-2.0.2" = { @@ -4162,31 +4171,31 @@ let sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ=="; }; }; - "luxon-2.3.1" = { + "luxon-2.4.0" = { name = "luxon"; packageName = "luxon"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.3.1.tgz"; - sha512 = "I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA=="; + url = "https://registry.npmjs.org/luxon/-/luxon-2.4.0.tgz"; + sha512 = "w+NAwWOUL5hO0SgwOHsMBAmZ15SoknmQXhSO0hIbJCAmPKSsGeK8MlmhYh2w6Iib38IxN2M+/ooXWLbeis7GuA=="; }; }; - "mailparser-3.4.0" = { + "mailparser-3.5.0" = { name = "mailparser"; packageName = "mailparser"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-3.4.0.tgz"; - sha512 = "u2pfpLg+xr7m2FKDl+ohQhy2gMok1QZ+S9E5umS9ez5DSJWttrqSmBGswyj9F68pZMVTwbhLpBt7Kd04q/W4Vw=="; + url = "https://registry.npmjs.org/mailparser/-/mailparser-3.5.0.tgz"; + sha512 = "mdr2DFgz8LKC0/Q6io6znA0HVnzaPFT0a4TTnLeZ7mWHlkfnm227Wxlq7mHh7AgeP32h7gOUpXvyhSfJJIEeyg=="; }; }; - "mailsplit-5.3.1" = { + "mailsplit-5.3.2" = { name = "mailsplit"; packageName = "mailsplit"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.3.1.tgz"; - sha512 = "o6R6HCzqWYmI2/IYlB+v2IMPgYqC2EynmagZQICAhR7zAq0CO6fPcsO6CrYmVuYT+SSwvLAEZR5WniohBELcAA=="; + url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.3.2.tgz"; + sha512 = "coES12hhKqagkuBTJoqERX+y9bXNpxbxw3Esd07auuwKYmcagouVlgucyIVRp48fnswMKxcUtLoFn/L1a75ynQ=="; }; }; "make-dir-3.1.0" = { @@ -4360,31 +4369,22 @@ let sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; }; - "minipass-2.9.0" = { + "minipass-3.1.6" = { name = "minipass"; packageName = "minipass"; - version = "2.9.0"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; - sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz"; + sha512 = "rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ=="; }; }; - "minizlib-1.3.3" = { + "minizlib-2.1.2" = { name = "minizlib"; packageName = "minizlib"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; - sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; - }; - }; - "mkdirp-0.5.6" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.6"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; - sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; + url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; }; "mkdirp-1.0.4" = { @@ -4405,13 +4405,13 @@ let sha512 = "lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg=="; }; }; - "moment-2.29.1" = { + "moment-2.29.3" = { name = "moment"; packageName = "moment"; - version = "2.29.1"; + version = "2.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"; - sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz"; + sha512 = "c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="; }; }; "moment-timezone-0.5.34" = { @@ -4531,49 +4531,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.112.0" = { + "n8n-core-0.116.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.112.0"; + version = "0.116.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.112.0.tgz"; - sha512 = "1b/J9XWBrjqMCcDAM1vZlsEpeBXI7gZ9Jpxgpgu4eHh3l/BJfyeqq5KXgULfyDtolDn/bil0s7qXA2njmZLerw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.116.0.tgz"; + sha512 = "D9X+D7gsUTKMacHIixEJuZpOB7DW/g42W+FBKLrj+6BUP1JMKG02G0C+Ef38e2XuNObMoLdLkI70snyvi1oq1g=="; }; }; - "n8n-design-system-0.16.0" = { + "n8n-design-system-0.19.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.16.0"; + version = "0.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.16.0.tgz"; - sha512 = "X7Qa+DoXRyJL4gqh7x59udnPIBYAUgDvhchL33dpI/Rgq9gaFajT9eAuOFQnXKMUaL0FZ5hu3rRGcAmwwEA/bA=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.19.0.tgz"; + sha512 = "qIcmHAtVJotgiYo3vVMLwC9qaU5ih5ti4+aPu2I1onD6WEu8GMNF38AzIAceYl6U8EhvDB+DOsF/SjYHfl26iw=="; }; }; - "n8n-editor-ui-0.138.0" = { + "n8n-editor-ui-0.142.1" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.138.0"; + version = "0.142.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.138.0.tgz"; - sha512 = "1/mUJYSWG4vmUfMlT65lvtQzfDBMCHxhdIU3TUG2umvdIEsSHJM1gZwAPfoJZppoZ6DX/ApuxXY/67OXfgatQw=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.142.1.tgz"; + sha512 = "Me8fk76HeWUmTPnksH4kzG0bKOp1yLFjAC4F+EcEllIIf+x75kjN+gSH4uwgvspzGCVO88ZnppWoGQwvHQpXQw=="; }; }; - "n8n-nodes-base-0.169.0" = { + "n8n-nodes-base-0.174.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.169.0"; + version = "0.174.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.169.0.tgz"; - sha512 = "O8vwS7ROybSRLqXwG58xdLNrbA8hAvX4jSodXsztpGChbDWcrYJUXBewN9+Lfh1UAegz12G1devygc1W92qveQ=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.174.0.tgz"; + sha512 = "2yYWeSkfI08BtgGZvOksmQOpjNPYmhvkqO2SBTuTAqkryZ1AHiw6RtILsf2575prQDdep2clxIZxW7owxxFmLA=="; }; }; - "n8n-workflow-0.94.0" = { + "n8n-workflow-0.98.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.94.0"; + version = "0.98.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.94.0.tgz"; - sha512 = "cVs5XPlbNDcCrGU5IoYzjO7IOsYNsNtEt5vVxkL9q5EgEmHhPYakValJN4GyLQ7Otdpsf47lJg/0EG3TvOssGQ=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.98.0.tgz"; + sha512 = "MrlEpSUueIkMc9P75h09ozXN2SQyV26qEe2PlQ9+nwRnCPYkikQQtgYZDqQI+bHVHFCMdBZOnq59fse0cMpYfQ=="; }; }; "named-placeholders-1.1.2" = { @@ -4594,13 +4594,13 @@ let sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="; }; }; - "nanoid-3.3.2" = { + "nanoid-3.3.4" = { name = "nanoid"; packageName = "nanoid"; - version = "3.3.2"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz"; - sha512 = "CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"; + sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; }; }; "native-duplexpair-1.0.0" = { @@ -4621,15 +4621,6 @@ let sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ=="; }; }; - "needle-2.9.1" = { - name = "needle"; - packageName = "needle"; - version = "2.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz"; - sha512 = "6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ=="; - }; - }; "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; @@ -4657,13 +4648,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-addon-api-3.2.1" = { + "node-addon-api-4.3.0" = { name = "node-addon-api"; packageName = "node-addon-api"; - version = "3.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz"; - sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz"; + sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ=="; }; }; "node-ensure-0.0.0" = { @@ -4684,13 +4675,22 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; - "node-pre-gyp-0.11.0" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.11.0"; + "node-html-markdown-1.2.0" = { + name = "node-html-markdown"; + packageName = "node-html-markdown"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz"; - sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; + url = "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.2.0.tgz"; + sha512 = "mGA53bSqo7j62PjmMuFPdO0efNT9pqiGYhQTNVCWkY7PdduRIECJF7n7NOrr5cb+d/js1GdYRLpoTYDwawRk6A=="; + }; + }; + "node-html-parser-5.3.3" = { + name = "node-html-parser"; + packageName = "node-html-parser"; + version = "5.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.3.3.tgz"; + sha512 = "ncg1033CaX9UexbyA7e1N0aAoAYRDiV8jkTvzEnfd1GDvzFdrsXLzR4p4ik8mwLgnaKP/jyUFWDy9q3jvRT2Jw=="; }; }; "node-ssh-12.0.4" = { @@ -4711,31 +4711,31 @@ let sha1 = "64ab69a7bdbaf03ce107b4f0335c87c0b9e91b1d"; }; }; - "nodemailer-6.7.0" = { + "nodemailer-6.7.3" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.7.0"; + version = "6.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.0.tgz"; - sha512 = "AtiTVUFHLiiDnMQ43zi0YgkzHOEWUkhDgPlBXrsDzJiJvB29Alo4OKxHQ0ugF3gRqRQIneCLtZU3yiUo7pItZw=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.3.tgz"; + sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g=="; }; }; - "nodemailer-6.7.3" = { + "nodemailer-6.7.5" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.7.3"; + version = "6.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.3.tgz"; - sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.5.tgz"; + sha512 = "6VtMpwhsrixq1HDYSBBHvW0GwiWawE75dS3oal48VqRhUvKJNnKnJo2RI/bCVQubj1vgrgscMNW4DHaD6xtMCg=="; }; }; - "nopt-4.0.3" = { + "nopt-5.0.0" = { name = "nopt"; packageName = "nopt"; - version = "4.0.3"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz"; - sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; + url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"; + sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; }; }; "normalize-path-2.1.1" = { @@ -4756,40 +4756,22 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "npm-bundled-1.1.2" = { - name = "npm-bundled"; - packageName = "npm-bundled"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz"; - sha512 = "x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ=="; - }; - }; - "npm-normalize-package-bin-1.0.1" = { - name = "npm-normalize-package-bin"; - packageName = "npm-normalize-package-bin"; + "normalize-wheel-1.0.1" = { + name = "normalize-wheel"; + packageName = "normalize-wheel"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; - sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="; - }; - }; - "npm-packlist-1.4.8" = { - name = "npm-packlist"; - packageName = "npm-packlist"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz"; - sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; + url = "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz"; + sha1 = "aec886affdb045070d856447df62ecf86146ec45"; }; }; - "npmlog-4.1.2" = { + "npmlog-5.0.1" = { name = "npmlog"; packageName = "npmlog"; - version = "4.1.2"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz"; + sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="; }; }; "nth-check-2.0.1" = { @@ -4801,15 +4783,6 @@ let sha512 = "it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w=="; }; }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - }; "oauth-1.0a-2.2.6" = { name = "oauth-1.0a"; packageName = "oauth-1.0a"; @@ -4873,24 +4846,6 @@ let sha512 = "VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw=="; }; }; - "ocsp-1.2.0" = { - name = "ocsp"; - packageName = "ocsp"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ocsp/-/ocsp-1.2.0.tgz"; - sha1 = "469a1776b457dee67eb0201408c1946bac4076cc"; - }; - }; - "on-finished-2.3.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; - }; - }; "on-finished-2.4.1" = { name = "on-finished"; packageName = "on-finished"; @@ -4981,15 +4936,6 @@ let sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; }; }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; @@ -4999,15 +4945,6 @@ let sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; - "osenv-0.1.5" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; - sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; - }; - }; "p-cancelable-2.1.1" = { name = "p-cancelable"; packageName = "p-cancelable"; @@ -5089,6 +5026,15 @@ let sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; }; + "parse-srcset-1.0.2" = { + name = "parse-srcset"; + packageName = "parse-srcset"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; + sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; + }; + }; "parse5-5.1.1" = { name = "parse5"; packageName = "parse5"; @@ -5350,6 +5296,15 @@ let sha512 = "FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug=="; }; }; + "picocolors-1.0.0" = { + name = "picocolors"; + packageName = "picocolors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; + sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; + }; + }; "picomatch-2.3.1" = { name = "picomatch"; packageName = "picomatch"; @@ -5422,6 +5377,15 @@ let sha512 = "epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA=="; }; }; + "postcss-8.4.13" = { + name = "postcss"; + packageName = "postcss"; + version = "8.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz"; + sha512 = "jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA=="; + }; + }; "postgres-array-2.0.0" = { name = "postgres-array"; packageName = "postgres-array"; @@ -5467,15 +5431,6 @@ let sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; }; }; - "printj-1.3.1" = { - name = "printj"; - packageName = "printj"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz"; - sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg=="; - }; - }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -5665,15 +5620,6 @@ let sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; }; - "qs-6.9.7" = { - name = "qs"; - packageName = "qs"; - version = "6.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz"; - sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; - }; - }; "querystring-0.2.0" = { name = "querystring"; packageName = "querystring"; @@ -5755,15 +5701,6 @@ let sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; - "raw-body-2.4.3" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz"; - sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; - }; - }; "raw-body-2.5.1" = { name = "raw-body"; packageName = "raw-body"; @@ -5773,15 +5710,6 @@ 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.1.14" = { name = "readable-stream"; packageName = "readable-stream"; @@ -5872,6 +5800,15 @@ let sha512 = "Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="; }; }; + "regenerator-runtime-0.11.1" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; + }; + }; "regenerator-runtime-0.13.9" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -5881,6 +5818,15 @@ let sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; }; }; + "regexp.prototype.flags-1.4.3" = { + name = "regexp.prototype.flags"; + packageName = "regexp.prototype.flags"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; + sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; + }; + }; "reinterval-1.1.0" = { name = "reinterval"; packageName = "reinterval"; @@ -5935,13 +5881,13 @@ let sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; - "requestretry-7.0.2" = { + "requestretry-7.1.0" = { name = "requestretry"; packageName = "requestretry"; - version = "7.0.2"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/requestretry/-/requestretry-7.0.2.tgz"; - sha512 = "Zz8z7G2OuVs4F0wR0shKMEMm7lNvPNHM0UIHNns9qfyuBDKSExoTsZGtSjKst6nPEwlMrbA9G+m/yC0AbGj+8w=="; + url = "https://registry.npmjs.org/requestretry/-/requestretry-7.1.0.tgz"; + sha512 = "TqVDgp251BW4b8ddQ2ptaj/57Z3LZHLscAUT7v6qs70buqF2/IoOVjYbpjJ6HiW7j5+waqegGI8xKJ/+uzgDmw=="; }; }; "require-at-1.0.6" = { @@ -5971,6 +5917,15 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; + "resize-observer-polyfill-1.5.1" = { + name = "resize-observer-polyfill"; + packageName = "resize-observer-polyfill"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"; + sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="; + }; + }; "restore-cursor-3.1.0" = { name = "restore-cursor"; packageName = "restore-cursor"; @@ -6016,15 +5971,6 @@ let sha512 = "PEl62U2EhxCO5wMUZ2/bCBcXAVKN9AdMSNQOrp3+R5b77TEaOSiy16MQ0sIOmzj/iqsgIAgPs1mt3FYfu1vIXA=="; }; }; - "rimraf-2.7.1" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; - }; - }; "rimraf-3.0.2" = { name = "rimraf"; packageName = "rimraf"; @@ -6124,6 +6070,15 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; + "sanitize-html-2.7.0" = { + name = "sanitize-html"; + packageName = "sanitize-html"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.0.tgz"; + sha512 = "jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA=="; + }; + }; "sax-1.2.1" = { name = "sax"; packageName = "sax"; @@ -6196,22 +6151,22 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.3.5" = { + "semver-7.3.7" = { name = "semver"; packageName = "semver"; - version = "7.3.5"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; - sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; }; - "send-0.17.2" = { + "send-0.18.0" = { name = "send"; packageName = "send"; - version = "0.17.2"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; - sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; + url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; + sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; }; }; "sentence-case-3.0.4" = { @@ -6241,13 +6196,13 @@ let sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; }; }; - "serve-static-1.14.2" = { + "serve-static-1.15.0" = { name = "serve-static"; packageName = "serve-static"; - version = "1.14.2"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; - sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; + sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; }; }; "servie-4.3.3" = { @@ -6304,6 +6259,15 @@ let sha1 = "68fd025eb0490b4f567a027f0bf22480b5f84133"; }; }; + "showdown-2.1.0" = { + name = "showdown"; + packageName = "showdown"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/showdown/-/showdown-2.1.0.tgz"; + sha512 = "/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ=="; + }; + }; "side-channel-1.0.4" = { name = "side-channel"; packageName = "side-channel"; @@ -6322,13 +6286,13 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "simple-git-3.5.0" = { + "simple-git-3.7.1" = { name = "simple-git"; packageName = "simple-git"; - version = "3.5.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.5.0.tgz"; - sha512 = "fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.7.1.tgz"; + sha512 = "+Osjtsumbtew2y9to0pOYjNzSIr4NkKGBg7Po5SUtjQhaJf2QBmiTX/9E9cv9rmc7oUiSGFIB9e7ys5ibnT9+A=="; }; }; "simple-lru-cache-0.0.2" = { @@ -6367,13 +6331,13 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.8" = { + "snowflake-sdk-1.6.9" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.8"; + version = "1.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.8.tgz"; - sha512 = "ZmzeR2W4mQVri546mUxUW+jBxTn0JRKm06EtndO7MUFLcS8YChf60tXTa+s7A0hO8FxQkSQAFonCmtz4nzPoSA=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.9.tgz"; + sha512 = "Rt16zh5t++mZH+CXUBq3sYUUaEQnEMKT86mFtzfgIUk8MnZFJ4qBOwdheSWYU7OI9QnLqLmy8nZN40o9CFgm5A=="; }; }; "source-map-0.6.1" = { @@ -6385,6 +6349,15 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; + "source-map-js-1.0.2" = { + name = "source-map-js"; + packageName = "source-map-js"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"; + sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; + }; + }; "spex-3.2.0" = { name = "spex"; packageName = "spex"; @@ -6430,13 +6403,13 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "sqlite3-5.0.2" = { + "sqlite3-5.0.8" = { name = "sqlite3"; packageName = "sqlite3"; - version = "5.0.2"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.2.tgz"; - sha512 = "1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.8.tgz"; + sha512 = "f2ACsbSyb2D1qFFcqIXPfFscLtPVOWJr5GmUzYxf4W+0qelu5MWrR+FAQE1d5IUArEltBrzSDxDORG8P/IkqyQ=="; }; }; "sqlstring-2.3.3" = { @@ -6466,13 +6439,13 @@ let sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; }; }; - "ssh2-1.9.0" = { + "ssh2-1.10.0" = { name = "ssh2"; packageName = "ssh2"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-1.9.0.tgz"; - sha512 = "rhhIZT0eMPvCBSOG8CpqZZ7gre2vgXaIqmb3Jb83t88rjsxIsFzDanqBJM9Ns8BmP1835A5IbQ199io4EUZwOA=="; + url = "https://registry.npmjs.org/ssh2/-/ssh2-1.10.0.tgz"; + sha512 = "OnKAAmf4j8wCRrXXZv3Tp5lCZkLJZtgZbn45ELiShCg27djDQ3XFGvIzuGsIsf4hdHslP+VdhA9BhUQdTdfd9w=="; }; }; "ssh2-sftp-client-7.2.3" = { @@ -6511,15 +6484,6 @@ let sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="; }; }; - "statuses-1.5.0" = { - name = "statuses"; - packageName = "statuses"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; - }; - }; "statuses-2.0.1" = { name = "statuses"; packageName = "statuses"; @@ -6556,15 +6520,6 @@ let sha512 = "/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ=="; }; }; - "string-width-1.0.2" = { - name = "string-width"; - packageName = "string-width"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - }; "string-width-4.2.3" = { name = "string-width"; packageName = "string-width"; @@ -6574,22 +6529,22 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string.prototype.trimend-1.0.4" = { + "string.prototype.trimend-1.0.5" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; - sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; + sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; }; }; - "string.prototype.trimstart-1.0.4" = { + "string.prototype.trimstart-1.0.5" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; - sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; + sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; }; }; "string_decoder-0.10.31" = { @@ -6637,15 +6592,6 @@ 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"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; - }; - }; "strtok3-6.3.0" = { name = "strtok3"; packageName = "strtok3"; @@ -6673,13 +6619,13 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; - "tar-4.4.19" = { + "tar-6.1.11" = { name = "tar"; packageName = "tar"; - version = "4.4.19"; + version = "6.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz"; - sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"; + sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; }; }; "tarn-1.1.5" = { @@ -6745,6 +6691,15 @@ let sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; }; }; + "throttle-debounce-1.1.0" = { + name = "throttle-debounce"; + packageName = "throttle-debounce"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz"; + sha512 = "XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="; + }; + }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -6799,13 +6754,13 @@ let sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="; }; }; - "tlds-1.224.0" = { + "tlds-1.231.0" = { name = "tlds"; packageName = "tlds"; - version = "1.224.0"; + version = "1.231.0"; src = fetchurl { - url = "https://registry.npmjs.org/tlds/-/tlds-1.224.0.tgz"; - sha512 = "Jgdc8SEijbDFUsmCn6Wk/f7E6jBLFZOG3U1xK0amGSfEH55Xx97ItUS/d2NngsuApjn11UeWCWj8Um3VRhseZQ=="; + url = "https://registry.npmjs.org/tlds/-/tlds-1.231.0.tgz"; + sha512 = "L7UQwueHSkGxZHQBXHVmXW64oi+uqNtzFt2x6Ssk7NVnpIbw16CRs4eb/jmKOZ9t2JnqZ/b3Cfvo97lnXqKrhw=="; }; }; "tmp-0.0.33" = { @@ -6943,13 +6898,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.3.1" = { + "tslib-2.4.0" = { name = "tslib"; packageName = "tslib"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; - sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"; + sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; }; }; "tsscmp-1.0.6" = { @@ -7051,13 +7006,13 @@ let sha512 = "KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA=="; }; }; - "unbox-primitive-1.0.1" = { + "unbox-primitive-1.0.2" = { name = "unbox-primitive"; packageName = "unbox-primitive"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; - sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; + url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; + sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; "unc-path-regex-0.1.2" = { @@ -7069,13 +7024,13 @@ let sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; }; }; - "underscore-1.13.2" = { + "underscore-1.13.3" = { name = "underscore"; packageName = "underscore"; - version = "1.13.2"; + version = "1.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz"; - sha512 = "ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="; + url = "https://registry.npmjs.org/underscore/-/underscore-1.13.3.tgz"; + sha512 = "QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA=="; }; }; "unique-stream-2.3.1" = { @@ -7375,13 +7330,13 @@ let sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; }; - "winston-3.6.0" = { + "winston-3.7.2" = { name = "winston"; packageName = "winston"; - version = "3.6.0"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.6.0.tgz"; - sha512 = "9j8T75p+bcN6D00sF/zjFVmPp+t8KMPB1MzbbzYjeN9VWxdsYnTB40TkbNUEXAmILEfChMvAMgidlX64OG3p6w=="; + url = "https://registry.npmjs.org/winston/-/winston-3.7.2.tgz"; + sha512 = "QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng=="; }; }; "winston-transport-4.5.0" = { @@ -7555,15 +7510,6 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; - "yallist-3.1.1" = { - name = "yallist"; - packageName = "yallist"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; - }; - }; "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; @@ -7624,47 +7570,47 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.171.0"; + version = "0.176.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.171.0.tgz"; - sha512 = "GenMxluqj0PfttyWndoMUsmyJ8r5pilWoY7xT+TVjCl5znhtIUT+3GTeDZ8K3vYqJILHXVxspyF5yLz2Ytnjow=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.176.0.tgz"; + sha512 = "eJTzCFcujAfJegWKQhGi+upAsfTEpW1/2HC5vwV2btdgm8XCMyhVBMJJR7ZJMozFNDz8ErLhwtlIfQCQSXRP0A=="; }; dependencies = [ - (sources."@azure/abort-controller-1.0.5" // { + (sources."@azure/abort-controller-1.1.0" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."@azure/core-asynciterator-polyfill-1.0.2" (sources."@azure/core-auth-1.3.2" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) - (sources."@azure/core-http-2.2.4" // { + (sources."@azure/core-http-2.2.5" // { dependencies = [ sources."tough-cookie-4.0.0" - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) (sources."@azure/core-lro-2.2.4" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) (sources."@azure/core-paging-1.2.1" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) (sources."@azure/core-tracing-1.0.0-preview.13" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) (sources."@azure/logger-1.0.3" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."@azure/ms-rest-azure-env-2.0.0" @@ -7676,10 +7622,10 @@ in sources."@azure/ms-rest-nodeauth-3.1.1" (sources."@azure/storage-blob-12.9.0" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) - sources."@babel/runtime-7.17.8" + sources."@babel/runtime-7.17.9" sources."@colors/colors-1.5.0" (sources."@dabh/diagnostics-2.0.3" // { dependencies = [ @@ -7688,17 +7634,20 @@ in ]; }) sources."@fontsource/open-sans-4.5.8" + sources."@fortawesome/fontawesome-common-types-6.1.1" + sources."@fortawesome/free-regular-svg-icons-6.1.1" sources."@icetee/ftp-0.3.15" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" + sources."@mapbox/node-pre-gyp-1.0.9" 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" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) (sources."@oclif/errors-1.3.5" // { @@ -7709,13 +7658,13 @@ in (sources."@oclif/help-1.0.1" // { dependencies = [ sources."@oclif/config-1.18.2" - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."@oclif/linewrap-1.0.0" (sources."@oclif/parser-3.8.7" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."@opentelemetry/api-1.1.0" @@ -7724,6 +7673,11 @@ in sources."@selderee/plugin-htmlparser2-0.6.0" sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.2" + (sources."@techteamer/ocsp-1.0.0" // { + dependencies = [ + sources."async-3.2.3" + ]; + }) sources."@tokenizer/token-0.3.0" sources."@tootallnate/once-1.1.2" sources."@types/bluebird-3.5.36" @@ -7734,12 +7688,13 @@ in sources."@types/express-serve-static-core-4.17.28" sources."@types/express-unless-0.5.3" sources."@types/ftp-0.3.33" + sources."@types/generic-pool-3.1.10" sources."@types/json-diff-0.5.2" sources."@types/jsonwebtoken-8.5.8" - sources."@types/lodash-4.14.181" + sources."@types/lodash-4.14.182" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.23" + sources."@types/node-17.0.31" (sources."@types/node-fetch-2.6.1" // { dependencies = [ sources."form-data-3.0.1" @@ -7751,7 +7706,7 @@ in sources."@types/range-parser-1.2.4" sources."@types/readable-stream-2.3.13" sources."@types/serve-static-1.13.10" - sources."@types/snowflake-sdk-1.6.2" + sources."@types/snowflake-sdk-1.6.4" sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" sources."@xmldom/xmldom-0.7.5" @@ -7759,7 +7714,7 @@ in sources."abort-controller-3.0.0" sources."accepts-1.3.8" sources."access-control-1.0.1" - sources."acorn-8.7.0" + sources."acorn-8.7.1" sources."acorn-walk-8.2.0" (sources."adal-node-0.2.3" // { dependencies = [ @@ -7776,13 +7731,11 @@ in sources."any-promise-1.3.0" sources."anymatch-3.1.2" sources."app-root-path-3.0.0" - sources."aproba-1.2.0" - (sources."are-we-there-yet-1.1.7" // { + sources."aproba-2.0.0" + (sources."are-we-there-yet-2.0.0" // { dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.0" + sources."string_decoder-1.3.0" ]; }) (sources."argparse-1.0.10" // { @@ -7800,7 +7753,8 @@ in sources."asn1.js-rfc5280-3.0.0" sources."assert-options-0.7.0" sources."assert-plus-1.0.0" - sources."async-2.6.3" + sources."async-2.6.4" + sources."async-validator-1.8.5" sources."asynckit-0.4.0" (sources."auto-changelog-1.16.4" // { dependencies = [ @@ -7808,7 +7762,7 @@ in ]; }) sources."avsc-5.7.4" - (sources."aws-sdk-2.1106.0" // { + (sources."aws-sdk-2.1131.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7823,7 +7777,14 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."axios-0.21.4" - sources."axios-retry-3.2.4" + sources."axios-retry-3.2.5" + sources."babel-helper-vue-jsx-merge-props-2.0.3" + (sources."babel-runtime-6.26.0" // { + dependencies = [ + sources."core-js-2.6.12" + sources."regenerator-runtime-0.11.1" + ]; + }) sources."balanced-match-1.0.2" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -7887,25 +7848,24 @@ in sources."callsites-3.1.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) (sources."capital-case-1.0.4" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."caseless-0.12.0" - (sources."cfb-1.2.1" // { + (sources."cfb-1.2.2" // { dependencies = [ sources."adler-32-1.3.1" - sources."printj-1.3.1" ]; }) sources."chalk-4.1.2" (sources."change-case-4.1.2" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."chardet-0.7.0" @@ -7913,7 +7873,7 @@ in sources."cheerio-1.0.0-rc.6" sources."cheerio-select-1.6.0" sources."chokidar-3.5.2" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."clamp-1.0.1" sources."class-validator-0.13.2" sources."clean-stack-3.0.1" @@ -7933,7 +7893,6 @@ in ]; }) sources."cluster-key-slot-1.1.0" - sources."code-point-at-1.1.0" sources."codepage-1.15.0" (sources."color-3.2.1" // { dependencies = [ @@ -7943,7 +7902,8 @@ in }) sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."color-string-1.9.0" + sources."color-string-1.9.1" + sources."color-support-1.1.3" sources."colornames-1.1.1" sources."colorspace-1.1.4" sources."combined-stream-1.0.8" @@ -7970,22 +7930,18 @@ in sources."console-control-strings-1.1.0" (sources."constant-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."convict-6.2.2" + sources."convict-6.2.3" sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" - sources."core-js-3.21.1" + sources."core-js-3.22.5" sources."core-util-is-1.0.2" - (sources."crc-32-1.2.1" // { - dependencies = [ - sources."printj-1.3.1" - ]; - }) + sources."crc-32-1.2.2" sources."cron-1.7.2" sources."cron-parser-2.18.0" (sources."cross-spawn-4.0.2" // { @@ -8004,26 +7960,25 @@ in sources."date-utils-1.2.21" sources."debug-4.3.4" sources."debuglog-1.0.1" - sources."deep-extend-0.6.0" - sources."deepmerge-4.2.2" - sources."define-properties-1.1.3" + sources."deepmerge-1.5.2" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."denque-1.5.1" sources."depd-2.0.0" sources."destroy-1.2.0" - sources."detect-libc-1.0.3" + sources."detect-libc-2.0.1" sources."diagnostics-1.1.1" sources."difflib-0.2.4" sources."dir-glob-3.0.1" sources."discontinuous-range-1.0.0" - sources."dom-serializer-1.3.2" - sources."domelementtype-2.2.0" + sources."dom-serializer-1.4.1" + sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."dotenv-8.6.0" @@ -8039,15 +7994,16 @@ in sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" + sources."element-ui-2.15.8" sources."emoji-regex-8.0.0" sources."enabled-1.0.2" sources."encodeurl-1.0.2" - sources."encoding-japanese-1.0.30" + sources."encoding-japanese-2.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" sources."env-variable-0.0.6" sources."err-code-2.0.3" - sources."es-abstract-1.19.2" + sources."es-abstract-1.20.0" sources."es-to-primitive-1.2.1" sources."es5-ext-0.8.2" sources."escalade-3.1.1" @@ -8061,18 +8017,11 @@ in sources."eventsource-1.1.0" sources."exit-on-epipe-1.0.1" sources."expand-tilde-2.0.2" - (sources."express-4.17.3" // { + (sources."express-4.18.1" // { dependencies = [ - sources."body-parser-1.19.2" - sources."cookie-0.4.2" + sources."cookie-0.5.0" sources."debug-2.6.9" - sources."depd-1.1.2" - sources."http-errors-1.8.1" sources."ms-2.0.0" - sources."on-finished-2.3.0" - sources."qs-6.9.7" - sources."raw-body-2.4.3" - sources."statuses-1.5.0" ]; }) sources."extend-3.0.2" @@ -8082,7 +8031,7 @@ in sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.13.0" - sources."fecha-4.2.1" + sources."fecha-4.2.3" sources."fflate-0.7.3" sources."figlet-1.5.2" (sources."figures-3.2.0" // { @@ -8092,17 +8041,15 @@ in }) sources."file-type-14.7.1" sources."fill-range-7.0.1" - (sources."finalhandler-1.1.2" // { + (sources."finalhandler-1.2.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" - sources."on-finished-2.3.0" - sources."statuses-1.5.0" ]; }) sources."flatted-3.2.5" sources."fn.name-1.1.0" - sources."follow-redirects-1.14.9" + sources."follow-redirects-1.15.0" sources."for-each-0.3.3" sources."forever-agent-0.6.1" sources."form-data-4.0.0" @@ -8111,17 +8058,12 @@ in sources."frac-1.1.2" sources."fresh-0.5.2" sources."fs-extra-8.1.0" - sources."fs-minipass-1.2.7" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) + sources."function.prototype.name-1.1.5" + sources."functions-have-names-1.2.3" + sources."gauge-3.0.2" sources."generate-function-2.3.1" sources."generic-pool-3.8.2" sources."get-caller-file-2.0.5" @@ -8149,7 +8091,7 @@ in ]; }) sources."google-timezones-json-1.0.2" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."handlebars-4.7.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -8159,38 +8101,41 @@ in sources."ansi-regex-2.1.1" ]; }) - sources."has-bigints-1.0.1" + sources."has-bigints-1.0.2" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" (sources."header-case-2.0.4" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."heap-0.2.7" sources."help-me-1.1.0" sources."highlight.js-10.7.3" sources."homedir-polyfill-1.0.3" - sources."html-to-text-8.0.0" + (sources."html-to-text-8.2.0" // { + dependencies = [ + sources."deepmerge-4.2.2" + ]; + }) sources."htmlparser2-6.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.0" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" sources."ics-2.35.0" sources."ieee754-1.2.1" sources."ignore-5.2.0" - sources."ignore-walk-3.0.4" sources."imap-0.8.19" sources."imap-simple-4.3.0" sources."indent-string-4.0.0" 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."ioredis-4.28.5" @@ -8213,6 +8158,7 @@ in sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" sources."is-number-object-1.0.7" + sources."is-plain-object-5.0.0" sources."is-promise-1.0.1" sources."is-property-1.0.2" sources."is-regex-1.1.4" @@ -8228,7 +8174,7 @@ in sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-0.0.1" - sources."isbot-3.4.5" + sources."isbot-3.4.6" sources."isexe-2.0.0" sources."iso-639-1-2.1.13" sources."isstream-0.1.2" @@ -8256,15 +8202,15 @@ in sources."kuler-1.0.1" sources."leven-2.1.0" sources."libbase64-1.2.1" - (sources."libmime-5.0.0" // { + (sources."libmime-5.1.0" // { dependencies = [ - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" ]; }) - sources."libphonenumber-js-1.9.50" + sources."libphonenumber-js-1.9.53" sources."libqp-1.1.0" sources."limiter-1.1.5" - sources."linkify-it-3.0.3" + sources."linkify-it-4.0.0" (sources."localtunnel-2.0.2" // { dependencies = [ sources."debug-4.3.2" @@ -8295,7 +8241,7 @@ in sources."lossless-json-1.0.5" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."lru-cache-6.0.0" @@ -8305,14 +8251,14 @@ in sources."yallist-2.1.2" ]; }) - sources."luxon-2.3.1" - (sources."mailparser-3.4.0" // { + sources."luxon-2.4.0" + (sources."mailparser-3.5.0" // { dependencies = [ sources."iconv-lite-0.6.3" - sources."nodemailer-6.7.0" + sources."nodemailer-6.7.3" ]; }) - sources."mailsplit-5.3.1" + sources."mailsplit-5.3.2" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -8336,12 +8282,8 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - (sources."minipass-2.9.0" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) - sources."minizlib-1.3.3" + sources."minipass-3.1.6" + sources."minizlib-2.1.2" sources."mkdirp-1.0.4" (sources."mock-require-3.0.3" // { dependencies = [ @@ -8349,7 +8291,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."moment-2.29.1" + sources."moment-2.29.3" sources."moment-timezone-0.5.34" sources."monaco-editor-0.29.1" sources."mongodb-3.7.3" @@ -8377,15 +8319,15 @@ in ]; }) sources."mz-2.7.0" - sources."n8n-core-0.112.0" - sources."n8n-design-system-0.16.0" - sources."n8n-editor-ui-0.138.0" - (sources."n8n-nodes-base-0.169.0" // { + sources."n8n-core-0.116.0" + sources."n8n-design-system-0.19.0" + sources."n8n-editor-ui-0.142.1" + (sources."n8n-nodes-base-0.174.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.94.0" + sources."n8n-workflow-0.98.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8393,46 +8335,33 @@ in ]; }) sources."nanoclone-0.2.1" - sources."nanoid-3.3.2" + sources."nanoid-3.3.4" sources."native-duplexpair-1.0.0" (sources."nearley-2.20.1" // { dependencies = [ sources."commander-2.20.3" ]; }) - (sources."needle-2.9.1" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) sources."negotiator-0.6.3" sources."neo-async-2.6.2" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) - sources."node-addon-api-3.2.1" + sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" sources."node-fetch-2.6.7" - (sources."node-pre-gyp-0.11.0" // { - dependencies = [ - sources."mkdirp-0.5.6" - sources."rimraf-2.7.1" - sources."semver-5.7.1" - ]; - }) + sources."node-html-markdown-1.2.0" + sources."node-html-parser-5.3.3" sources."node-ssh-12.0.4" sources."nodeify-1.0.1" - sources."nodemailer-6.7.3" - sources."nopt-4.0.3" + sources."nodemailer-6.7.5" + sources."nopt-5.0.0" sources."normalize-path-3.0.0" - sources."npm-bundled-1.1.2" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" - sources."npmlog-4.1.2" + sources."normalize-wheel-1.0.1" + sources."npmlog-5.0.1" sources."nth-check-2.0.1" - sources."number-is-nan-1.0.1" sources."oauth-1.0a-2.2.6" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" @@ -8440,14 +8369,6 @@ in sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.3" - (sources."ocsp-1.2.0" // { - dependencies = [ - sources."asn1.js-4.10.1" - sources."asn1.js-rfc2560-4.0.6" - sources."asn1.js-rfc5280-2.0.1" - sources."async-1.5.2" - ]; - }) sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -8465,9 +8386,7 @@ in ]; }) sources."original-1.0.2" - sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" sources."p-map-2.1.0" @@ -8475,19 +8394,20 @@ in sources."packet-reader-1.0.0" (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."parent-require-1.0.0" sources."parse-github-url-1.0.2" sources."parse-passwd-1.0.0" + sources."parse-srcset-1.0.2" sources."parse5-6.0.1" sources."parse5-htmlparser2-tree-adapter-6.0.1" sources."parseley-0.7.0" sources."parseurl-1.3.3" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."passport-0.5.2" @@ -8496,7 +8416,7 @@ in sources."passport-strategy-1.0.0" (sources."path-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."path-dirname-1.0.2" @@ -8528,6 +8448,7 @@ in sources."split2-4.1.0" ]; }) + sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" @@ -8536,6 +8457,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.13" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" @@ -8577,7 +8499,6 @@ in sources."randombytes-2.1.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" - sources."rc-1.2.8" sources."readable-stream-1.1.14" sources."readable-web-to-node-stream-2.0.0" sources."readdirp-3.6.0" @@ -8587,6 +8508,7 @@ in sources."redis-parser-3.0.0" sources."reflect-metadata-0.1.13" sources."regenerator-runtime-0.13.9" + sources."regexp.prototype.flags-1.4.3" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" sources."remove-trailing-slash-0.1.1" @@ -8604,10 +8526,11 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."requestretry-7.0.2" + sources."requestretry-7.1.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" sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."retry-0.12.0" @@ -8627,61 +8550,65 @@ in sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" + (sources."sanitize-html-2.7.0" // { + dependencies = [ + sources."deepmerge-4.2.2" + ]; + }) sources."sax-1.2.4" sources."sb-promise-queue-2.1.0" sources."sb-scandir-3.1.0" sources."selderee-0.6.0" - sources."semver-7.3.5" - (sources."send-0.17.2" // { + sources."semver-7.3.7" + (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ sources."ms-2.0.0" ]; }) - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."http-errors-1.8.1" sources."ms-2.1.3" - sources."on-finished-2.3.0" - sources."statuses-1.5.0" ]; }) (sources."sentence-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."seq-queue-0.0.5" sources."serialize-javascript-5.0.1" - sources."serve-static-1.14.2" + sources."serve-static-1.15.0" sources."servie-4.3.3" sources."set-blocking-2.0.0" sources."setheader-1.0.2" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shell-escape-0.2.0" + (sources."showdown-2.1.0" // { + dependencies = [ + sources."commander-9.2.0" + ]; + }) sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."simple-git-3.5.0" + sources."simple-git-3.7.1" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" (sources."snake-case-3.0.4" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) - (sources."snowflake-sdk-1.6.8" // { + (sources."snowflake-sdk-1.6.9" // { dependencies = [ sources."debug-3.2.7" - sources."http-signature-1.3.6" - sources."jsprim-2.0.2" sources."tmp-0.2.1" sources."uuid-3.4.0" ]; }) sources."source-map-0.6.1" + sources."source-map-js-1.0.2" sources."spex-3.2.0" (sources."split2-3.2.2" // { dependencies = [ @@ -8690,11 +8617,11 @@ in ]; }) sources."sprintf-js-1.1.2" - sources."sqlite3-5.0.2" + sources."sqlite3-5.0.8" sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" - sources."ssh2-1.9.0" + sources."ssh2-1.10.0" sources."ssh2-sftp-client-7.2.3" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" @@ -8704,24 +8631,18 @@ in sources."stream-shift-1.0.1" sources."string-similarity-4.0.4" sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.4" - sources."string.prototype.trimstart-1.0.4" + sources."string.prototype.trimend-1.0.5" + sources."string.prototype.trimstart-1.0.5" sources."string_decoder-0.10.31" 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."tar-4.4.19" // { - dependencies = [ - sources."mkdirp-0.5.6" - sources."yallist-3.1.1" - ]; - }) + sources."tar-6.1.11" sources."tarn-1.1.5" sources."tdigest-0.1.1" (sources."tedious-6.7.1" // { dependencies = [ - sources."@types/node-12.20.47" + sources."@types/node-12.20.50" sources."bl-3.0.1" sources."iconv-lite-0.5.2" sources."readable-stream-3.6.0" @@ -8732,6 +8653,7 @@ in sources."text-hex-1.0.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" + sources."throttle-debounce-1.1.0" sources."through-2.3.8" (sources."through2-2.0.5" // { dependencies = [ @@ -8745,7 +8667,7 @@ in sources."throwback-4.1.0" sources."timeago.js-4.0.2" sources."tinycolor2-1.4.2" - sources."tlds-1.224.0" + sources."tlds-1.231.0" sources."tmp-0.0.33" (sources."tmp-promise-3.0.3" // { dependencies = [ @@ -8781,20 +8703,20 @@ in }) sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" - sources."unbox-primitive-1.0.1" + sources."unbox-primitive-1.0.2" sources."unc-path-regex-0.1.2" - sources."underscore-1.13.2" + sources."underscore-1.13.3" sources."unique-stream-2.3.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" (sources."upper-case-2.0.2" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) (sources."upper-case-first-2.0.2" // { dependencies = [ - sources."tslib-2.3.1" + sources."tslib-2.4.0" ]; }) sources."uri-js-4.4.1" @@ -8831,7 +8753,7 @@ in sources."which-boxed-primitive-1.0.2" sources."wide-align-1.1.5" sources."widest-line-3.1.0" - (sources."winston-3.6.0" // { + (sources."winston-3.7.2" // { dependencies = [ sources."async-3.2.3" sources."readable-stream-3.6.0" diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index fe5588d81f88a..880ebdd2d4ef7 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "netperf"; - version = "20180613"; + version = "20210121"; src = fetchFromGitHub { owner = "HewlettPackard"; repo = "netperf"; - rev = "bcb868bde7f0203bbab69609f65d4088ba7398db"; - sha256 = "1wbbgdvhadd3qs3afv6i777argdpcyxkwz4yv6aqp223n8ki6dm8"; + rev = "3bc455b23f901dae377ca0a558e1e32aa56b31c4"; + sha256 = "s4G1ZN+6LERdEMDkc+12ZQgTi6K+ppUYUCGn4faCS9c="; }; buildInputs = lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Benchmark to measure the performance of many different types of networking"; homepage = "http://www.netperf.org/netperf/"; - license = "Hewlett-Packard BSD-like license"; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.mmlb ]; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index f4e4c8279de84..4d62cc4c828e2 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.12.9"; + version = "1.13.8"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "06ybr1wjlfir8iqjx6x0v1knd4b2hsy30qmkk4kssy6ky2ahc66q"; + sha256 = "0x2857nhn98hlzqxmxb2h2wcasr5jkhciih71wcnp0cja60aw20h"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/applications/networking/newsreaders/raven-reader/default.nix new file mode 100644 index 0000000000000..0858b4690bb81 --- /dev/null +++ b/pkgs/applications/networking/newsreaders/raven-reader/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "raven-reader"; + version = "1.0.72"; + src = fetchurl { + url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage"; + sha256 = "sha256-Sx02VMAgmncT9f5Hvs0LugzhD6Z8cWXHx4kn8IG9seU="; + }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; + +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + mkdir -p $out/share/${pname} + cp -a ${appimageContents}/locales $out/share/${pname} + cp -a ${appimageContents}/resources $out/share/${pname} + + install -m 444 -D ${appimageContents}/raven-reader.desktop -t $out/share/applications + + cp -a ${appimageContents}/usr/share/icons $out/share/ + + substituteInPlace $out/share/applications/raven-reader.desktop \ + --replace 'Exec=AppRun' 'Exec=raven-reader' + ''; + + meta = with lib; { + description = "Open source desktop news reader with flexible settings to optimize your experience"; + homepage = "https://ravenreader.app/"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index deac64c903e1a..52e2e083ca173 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,9 +1,13 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , cmake +, extra-cmake-modules , inotify-tools +, installShellFiles , libcloudproviders +, librsvg , libsecret , openssl , pcre @@ -15,32 +19,49 @@ , qtwebsockets , qtquickcontrols2 , qtgraphicaleffects +, plasma5Packages +, sphinx , sqlite -, inkscape , xdg-utils }: mkDerivation rec { pname = "nextcloud-client"; - version = "3.4.4"; + version = "3.5.0"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-e4me4mpK0N3UyM5MuJP3jxwM5h1dGBd+JzAr5f3BOGQ="; + sha256 = "sha256-eFtBdnwHaLirzZaHDw6SRfmsqO3dmBB8Y9csJuiTf1A="; }; patches = [ # Explicitly move dbus configuration files to the store path rather than `/etc/dbus-1/services`. ./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch ./0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch + # don't write cacheDir into home directory + (fetchpatch { + url = "https://github.com/nextcloud/desktop/commit/3a8aa8a2a88bc9b68098b7866e2a07aa23d3a33c.patch"; + sha256 = "sha256-OviPANvXap3mg4haxRir/CK1aq8maWZDM/IVsN+OHgk="; + }) ]; + postPatch = '' + for file in src/libsync/vfs/*/CMakeLists.txt; do + substituteInPlace $file \ + --replace "PLUGINDIR" "KDE_INSTALL_PLUGINDIR" + done + ''; + nativeBuildInputs = [ pkg-config cmake - inkscape + extra-cmake-modules + librsvg + sphinx ]; buildInputs = [ @@ -49,6 +70,7 @@ mkDerivation rec { libsecret openssl pcre + plasma5Packages.kio qtbase qtkeychain qttools @@ -71,11 +93,15 @@ mkDerivation rec { "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit ]; + postBuild = '' + make doc-man + ''; + meta = with lib; { description = "Nextcloud themed desktop client"; homepage = "https://nextcloud.com"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ kranzes ]; + maintainers = with maintainers; [ kranzes SuperSandro2000 ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 006310e912b2f..992058bdb3052 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "owncloud-client"; - version = "2.10.0.6519"; + version = "2.10.1.7187"; src = fetchurl { url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz"; - sha256 = "sha256-HDH8s/VPeOAbkyrfE7hbhePhtWcx1IUdlhDCnodomh8="; + sha256 = "sha256-SNabKv5z7viDI3XDQ2mWjEgFKAGSR5K9sI3Tu5eZbwU="; }; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index f24f74e5ae054..541570a3ada7b 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.16.0"; + version = "0.16.3"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-0y2m8T/xzYZwUlcZ6g956fdtLef2Bphg4Kd/xpo2AGg="; + sha256 = "sha256-MjkFLxNTepqrqqZuxCh12+4vaDjF8Ys674VOa1Mew4o="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix new file mode 100644 index 0000000000000..a760a0f96c35c --- /dev/null +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, curl +, gtest +, libtorrent +, ncurses +, jsonRpcSupport ? true, nlohmann_json +, xmlRpcSupport ? true, xmlrpc_c +}: + +stdenv.mkDerivation rec { + pname = "jesec-rtorrent"; + version = "0.9.8-r16"; + + src = fetchFromGitHub { + owner = "jesec"; + repo = "rtorrent"; + rev = "v${version}"; + hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + curl + libtorrent + ncurses + ] + ++ lib.optional jsonRpcSupport nlohmann_json + ++ lib.optional xmlRpcSupport xmlrpc_c; + + cmakeFlags = [ + "-DUSE_RUNTIME_CA_DETECTION=NO" + ] + ++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO" + ++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO"; + + doCheck = true; + + checkInputs = [ + gtest + ]; + + prePatch = '' + substituteInPlace src/main.cc \ + --replace "/etc/rtorrent/rtorrent.rc" "${placeholder "out"}/etc/rtorrent/rtorrent.rc" + ''; + + postFixup = '' + mkdir -p $out/etc/rtorrent + cp $src/doc/rtorrent.rc $out/etc/rtorrent/rtorrent.rc + ''; + + meta = with lib; { + description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)"; + homepage = "https://github.com/jesec/rtorrent"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ winter AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix new file mode 100644 index 0000000000000..ac7e15b6a2e5b --- /dev/null +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +, openssl +, zlib +}: + +stdenv.mkDerivation rec { + pname = "jesec-libtorrent"; + version = "0.13.8-r4"; + + src = fetchFromGitHub { + owner = "jesec"; + repo = "libtorrent"; + rev = "v${version}"; + hash = "sha256-jC/hgGSi2qy+ToZgdxl1PhASLYbUL0O8trX0th2v5H0="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + openssl + zlib + ]; + + # Disabled because a test is flaky; see https://github.com/jesec/libtorrent/issues/4. + # doCheck = true; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD + ''; + + checkInputs = [ + gtest + ]; + + meta = with lib; { + homepage = "https://github.com/jesec/libtorrent"; + description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ winter AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 41b8a7d0b6c2e..374f2419b96d4 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocamlPackages, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, ocamlPackages, zlib }: stdenv.mkDerivation rec { pname = "mldonkey"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "b926e7aa3de4b4525af73c88f1724d576b4add56ef070f025941dd51cb24a794"; }; + patches = [ + # Fixes C++17 compat + (fetchpatch { + url = "https://github.com/ygrek/mldonkey/pull/66/commits/20ff84c185396f3d759cf4ef46b9f0bd33a51060.patch"; + hash = "sha256-MCqx0jVfOaLkZhhv0b1cTdO6BK2/f6TxTWmx+NZjXME="; + }) + ]; + preConfigure = '' substituteInPlace Makefile --replace '+camlp4' \ '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4' diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 3c05398df0ea3..e00af5fdc8055 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.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-HNgegPL7M0zwkn7+lcNcsgWgrCbY9/d0nuIlIC5hkAM="; + sha256 = "sha256-xBNN9YYKMDcoL1wvERjlAjV8vb2GVgwwlHtb5y0+f+8="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix new file mode 100644 index 0000000000000..f166f6d0e29f2 --- /dev/null +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, autoreconfHook +, autoconf-archive +, cppunit +, curl +, libsigcxx +, libtool +, libtorrent +, ncurses +, openssl +, pkg-config +, xmlrpc_c +, zlib +}: + +stdenv.mkDerivation rec { + pname = "rakshasa-rtorrent"; + version = "0.9.8+date=2021-08-07"; + + src = fetchFromGitHub { + owner = "rakshasa"; + repo = "rtorrent"; + rev = "a6bc99bb821d86b3b0633552db3fbd0a22497657"; + hash = "sha256-HTwAs8dfZVXfLRNiT6QpjKGnuahHfoMfYWqdKkedUL0="; + }; + + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + pkg-config + ]; + + buildInputs = [ + cppunit + curl + libsigcxx + libtool + libtorrent + ncurses + openssl + xmlrpc_c + zlib + ]; + + configureFlags = [ + "--with-xmlrpc-c" + "--with-posix-fallocate" + ]; + + enableParallelBuilding = true; + + postInstall = '' + mkdir -p $out/share/man/man1 $out/share/doc/rtorrent + mv doc/old/rtorrent.1 $out/share/man/man1/rtorrent.1 + mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc + ''; + + meta = with lib; { + homepage = "https://rakshasa.github.io/rtorrent/"; + description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ebzzry codyopel ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix new file mode 100644 index 0000000000000..fff4cbb36cf62 --- /dev/null +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix @@ -0,0 +1,48 @@ +# Note: this is rakshasa's version of libtorrent, used mainly by rtorrent. +# *Do not* mistake it by libtorrent-rasterbar, used by Deluge, qbitttorent etc. +{ lib +, stdenv +, fetchFromGitHub +, autoconf-archive +, autoreconfHook +, cppunit +, libsigcxx +, openssl +, pkg-config +, zlib +}: + +stdenv.mkDerivation rec { + pname = "rakshasa-libtorrent"; + version = "0.13.8+date=2021-08-07"; + + src = fetchFromGitHub { + owner = "rakshasa"; + repo = "libtorrent"; + rev = "53596afc5fae275b3fb5753a4bb2a1a7f7cf6a51"; + hash = "sha256-gyl/jfbptHz/gHkkVGWShhv1Z7o9fa9nJIz27U2A6wg="; + }; + + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + pkg-config + ]; + + buildInputs = [ + cppunit + libsigcxx + openssl + zlib + ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/rakshasa/libtorrent"; + description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ebzzry codyopel ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index da7633221a5a1..a0e2388d16cc7 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -1,30 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, unzip, fpc, lazarus, -libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, fetchpatch, unzip +, fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }: stdenv.mkDerivation rec { pname = "transgui"; - version = "5.18.0"; + version = "unstable-2022-02-02"; src = fetchFromGitHub { owner = "transmission-remote-gui"; repo = "transgui"; - rev = "v${version}"; - sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5"; + rev = "0e2c2a07c1b21b1704c0a4945a111a8aa1050a1a"; + sha256 = "1x9wzii3q9zanpik4xc99jqsfrqch8vjmlx12jrvczxcfy51b1ba"; }; + patches = [ + # TDDO: remove when transgui updates for transmission-daemon v3 rpc protocol + (fetchpatch { + url = "https://github.com/transmission-remote-gui/transgui/commit/9275c3fb877dd753a1940d1b900630cdc09a0cc2.patch"; + sha256 = "0w2x7gcxp5kqczdz7ckfqhdz9hhkm62k8gcws54d6km7x9vc1023"; + }) + ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ - fpc lazarus stdenv.cc - libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl + fpc lazarus stdenv.cc libX11 glib gtk2 gdk-pixbuf + pango atk cairo openssl ]; - NIX_LDFLAGS = " - -L${stdenv.cc.cc.lib}/lib - -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 - -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo -lc -lcrypto - "; + NIX_LDFLAGS = '' + -L${stdenv.cc.cc.lib}/lib -lX11 -lglib-2.0 -lgtk-x11-2.0 + -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpango-1.0 -latk-1.0 -lcairo + -lc -lcrypto + ''; - prePatch = '' + postPatch = '' substituteInPlace restranslator.pas --replace /usr/ $out/ ''; @@ -33,23 +41,19 @@ stdenv.mkDerivation rec { lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus ''; - makeFlags = [ - "FPC=fpc" - "PP=fpc" - "INSTALL_PREFIX=$(out)" - ]; + makeFlags = [ "FPC=fpc" "PP=fpc" "INSTALL_PREFIX=$(out)" ]; LCL_PLATFORM = "gtk2"; - desktopItem = makeDesktopItem rec { - name = "transgui"; - exec = name + " %U"; - icon = name; + desktopItem = makeDesktopItem { + name = pname; + exec = "${pname} %U"; + icon = pname; type = "Application"; comment = meta.description; desktopName = "Transmission Remote GUI"; genericName = "BitTorrent Client"; - categories = [ "Application" "Network" "FileTransfer" "P2P" "GTK" ]; + categories = [ "Network" "FileTransfer" "P2P" "GTK" ]; startupNotify = true; mimeTypes = [ "application/x-bittorrent" "x-scheme-handler/magnet" ]; }; @@ -64,10 +68,11 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A cross platform front-end for the Transmission Bit-Torrent client"; + description = "A cross platform front-end for the Transmission BitTorrent client"; homepage = "https://sourceforge.net/p/transgui"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ramkromberg ]; - platforms = lib.platforms.linux; + mainProgram = "transgui"; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 7f48ad2d3b48f..f5a8188334ce6 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -86,8 +86,6 @@ in stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ inotify-tools ] ; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; - postInstall = '' mkdir $apparmor cat >$apparmor/bin.transmission-daemon <<EOF diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index ea6b92c08e7e4..6ff10989b1d3e 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { dontBuild = true; doCheck = false; - makeWrapperArgs = ["--prefix PATH : ${wrapperPath}"]; + makeWrapperArgs = ["--prefix PATH : ${lib.escapeShellArg wrapperPath}"]; installPhase = '' make DESTDIR=$out install diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index d1df2fea444c0..e74db03b5332c 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -74,10 +74,10 @@ stdenv.mkDerivation rec { makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \ --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ --set QT_PLUGIN_PATH "${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" \ - --set _TRIBLERPATH $out/src \ + --set _TRIBLERPATH "$out/src" \ --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \ --set NO_AT_BRIDGE 1 \ - --run 'cd $_TRIBLERPATH' \ + --chdir "$out/src" \ --add-flags "-O $out/src/run_tribler.py" mkdir -p $out/share/applications $out/share/icons diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix deleted file mode 100644 index 979ac955caf31..0000000000000 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2 -, boost, db, openssl, geoip, libiconv, miniupnpc, srcOnly -}: - -let - twisterHTML = srcOnly { - name = "twister-html"; - src = fetchFromGitHub { - owner = "miguelfreitas"; - repo = "twister-html"; - rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b"; - sha256 = "sha256-Hi/VAEwujWhKAPaYIuvrxRIuPQa9AYwXiHUGbWxckmk="; - }; - }; - - boostPython = boost.override { - enablePython = true; - python = python2; - }; - -in stdenv.mkDerivation rec { - pname = "twister"; - version = "2019-08-19"; - - src = fetchFromGitHub { - owner = "miguelfreitas"; - repo = "twister-core"; - rev = "31faf3f63e461ea0a9b23081567a4a552cf06873"; - sha256 = "0xh1lgnl9nd86jr0mp7m8bkd7r5j4d6chd0y73h2xv4aq5sld0sp"; - }; - - configureFlags = [ - "--with-libgeoip" - "--with-libiconv" - "--disable-deprecated-functions" - "--enable-tests" - "--enable-python-binding" - "--with-boost-libdir=${boostPython.out}/lib" - ]; - - nativeBuildInputs = [ pkg-config automake autoconf ]; - buildInputs = [ - libtool python2 - boostPython db openssl geoip miniupnpc libiconv - ]; - - postPatch = '' - sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \ - src/init.cpp - sed -i -e '/GetDataDir.*html/s|path *= *[^;]*|path = "${twisterHTML}"|' \ - src/util.cpp - ''; - - preConfigure = '' - sh autotool.sh - ''; - - installPhase = '' - install -vD twisterd "$out/bin/twisterd" - ''; - - enableParallelBuilding = true; - - meta = { - homepage = "http://www.twister.net.co/"; - description = "Peer-to-peer microblogging"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix deleted file mode 100644 index 6074b1a51ccb7..0000000000000 --- a/pkgs/applications/networking/ping/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, nix-update-script -, meson -, ninja -, vala -, pkg-config -, pantheon -, python3 -, glib -, gtk3 -, gtksourceview -, json-glib -, libsoup -, libgee -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "ping"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "jeremyvaartjes"; - repo = "ping"; - rev = version; - sha256 = "1h9cdy2jxa2ffykjg89j21hazls32z9yyv3g0x07x3vizzl5xcij"; - }; - - nativeBuildInputs = [ - meson - ninja - vala - pkg-config - python3 - wrapGAppsHook - ]; - - buildInputs = [ - glib - gtk3 - gtksourceview - json-glib - libgee - libsoup - pantheon.granite - ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - - meta = with lib; { - description = "A helpful tool that lets you debug what part of your API is causing you issues"; - homepage = "https://github.com/jeremyvaartjes/ping"; - maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; - platforms = platforms.linux; - license = licenses.gpl3; - mainProgram = "com.github.jeremyvaartjes.ping"; - # Does not build with vala 0.48 or later - # ../src/Application.vala:696.46-696.57: error: Assignment: Cannot convert from - # `GLib.HashTable<weak string,weak string>' to `GLib.HashTable<string,string>?' - # HashTable<string,string> tempDataList = Soup.Form.decode(testObjs[id].data); - # ^^^^^^^^^^^^ - # Upstream has no activity since 28 Dec 2020 - broken = true; - }; -} diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 8b0fad83b9600..6406337541f85 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }: +{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit, fetchpatch }: stdenv.mkDerivation rec { pname = "pjsip"; @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { patches = [ ./fix-aarch64.patch + (fetchpatch { + name = "CVE-2022-24764.patch"; + url = "https://github.com/pjsip/pjproject/commit/560a1346f87aabe126509bb24930106dea292b00.patch"; + sha256 = "1fy78v3clm0gby7qcq3ny6f7d7f4qnn01lkqq67bf2s85k2phisg"; + }) ]; buildInputs = [ openssl libsamplerate ] @@ -38,6 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://pjsip.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ olynch ]; + mainProgram = "pjsua"; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/networking/protonvpn-cli/2.nix b/pkgs/applications/networking/protonvpn-cli/2.nix new file mode 100644 index 0000000000000..c3e9bd2ac2159 --- /dev/null +++ b/pkgs/applications/networking/protonvpn-cli/2.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, pythonOlder +, requests +, docopt +, pythondialog +, jinja2 +, distro +, dialog +, iptables +, openvpn }: + +buildPythonApplication rec { + pname = "protonvpn-cli_2"; + version = "2.2.11"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "Rafficer"; + repo = "linux-cli-community"; + # There is a tag and branch with the same name + rev = "refs/tags/v${version}"; + sha256 = "sha256-CWQpisJPBXbf+d5tCGuxfSQQZBeF36WFF4b6OSUn3GY="; + }; + + propagatedBuildInputs = [ + requests + docopt + pythondialog + jinja2 + distro + dialog + openvpn + iptables + ]; + + # No tests + doCheck = false; + + meta = with lib; { + description = "Linux command-line client for ProtonVPN using Openvpn"; + homepage = "https://github.com/Rafficer/linux-cli-community"; + maintainers = with maintainers; [ jtcoolen jefflabonte shamilton ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + mainProgram = "protonvpn"; + }; +} diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index e46909d2a7c32..5182b5c256f37 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -1,37 +1,41 @@ -{ lib, fetchFromGitHub, python3Packages, openvpn, dialog, iptables }: +{ lib +, buildPythonApplication +, pythonOlder +, fetchFromGitHub +, protonvpn-nm-lib +, pythondialog +, dialog +}: -python3Packages.buildPythonApplication rec { - pname = "protonvpn-linux-cli"; - version = "2.2.6"; +buildPythonApplication rec { + pname = "protonvpn-cli"; + version = "3.11.1"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "protonvpn"; repo = "linux-cli"; - rev = "v${version}"; - sha256 = "0y7v9ikrmy5dbjlpbpacp08gy838i8z54m8m4ps7ldk1j6kyia3n"; + rev = version; + sha256 = "sha256-u+POtUz7NoGS23aOmvDCZPUp2HW1xXGtfbZR88cWCBc="; }; - propagatedBuildInputs = (with python3Packages; [ - requests - docopt - setuptools - jinja2 - pythondialog - ]) ++ [ - dialog - openvpn - iptables - ]; + propagatedBuildInputs = [ + protonvpn-nm-lib + pythondialog + dialog + ]; - # No tests + # Project has a dummy test doCheck = false; meta = with lib; { description = "Linux command-line client for ProtonVPN"; homepage = "https://github.com/protonvpn/linux-cli"; - maintainers = with maintainers; [ jtcoolen jefflabonte shamilton ]; + maintainers = with maintainers; [ wolfangaukang ]; license = licenses.gpl3Plus; platforms = platforms.linux; - mainProgram = "protonvpn"; + mainProgram = "protonvpn-cli"; }; } diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index ecfde0a39c200..032d9e3d5b83c 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -16,13 +16,13 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "linux-app"; - rev = version; - sha256 = "sha256-uzooFQBq2mhqTBr/cgea5cVQ889P70sgSk2vjXBQEfw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-Od12qHiyXHu2JnjYV7amZz5xxL+eiWUVbcG5Tbcrr28="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 852fcf68987eb..99a81fd1a809e 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.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-+yKdB/glNf74drv9EvBwVMWrqr5ADBkSJVVDH+UKb2U="; + sha256 = "sha256-XBYRhbwknVa8eXxk31b7n9gMWBcTjCecDN+j2FGcpw0="; }; postPatch = '' diff --git a/pkgs/applications/networking/remote/rustdesk/default.nix b/pkgs/applications/networking/remote/rustdesk/default.nix index 677629dbcfbaa..2850995bd13cb 100644 --- a/pkgs/applications/networking/remote/rustdesk/default.nix +++ b/pkgs/applications/networking/remote/rustdesk/default.nix @@ -86,7 +86,7 @@ rustPlatform.buildRustPackage rec { ln -s ${libsciter}/lib/libsciter-gtk.so $out/lib/rustdesk makeWrapper $out/lib/rustdesk/rustdesk $out/bin/rustdesk \ - --run "cd $out/share" + --chdir "$out/share" cp -a $src/src/ui $out/share/src diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 00289e5c62869..7ee1cc9ab4fa3 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.26.4"; + version = "15.29.4"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-2CprtdKHHTLxS8jA4bRVoHvj/8zyVUV0aGPzU7mNxM8="; + sha256 = "sha256-jkFqOtU+D62S7QmNPvz58Z8wJ79lkN11pWQrtNdD+Uk="; }; unpackPhase = '' @@ -30,7 +30,7 @@ mkDerivation rec { $out/share/teamviewer/config \ $out/share/teamviewer/tv_bin/RTlib \ $out/share/teamviewer/tv_bin/xdg-utils \ - $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh} + $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,tv-delayed-start.sh} ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index f114f8a3091b5..f3461a4265861 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -9,7 +9,7 @@ , configText ? "" }: let - version = "2111"; + version = "2203"; sysArch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" @@ -33,8 +33,8 @@ let name = "vmwareHorizonClientFiles"; inherit version; src = fetchurl { - url = "https://download3.vmware.com/software/view/viewclients/CART22FH2/VMware-Horizon-Client-Linux-2111-8.4.0-18957622.tar.gz"; - sha256 = "2f79d2d8d34e6f85a5d21a3350618c4763d60455e7d68647ea40715eaff486f7"; + url = "https://download3.vmware.com/software/CART23FQ1_LIN_2203_TARBALL/VMware-Horizon-Client-Linux-2203-8.5.0-19586897.tar.gz"; + sha256 = "27429dddaeedfa8b701d7aa7868f60ad58efa42687d7f27e84375fda9f5cd137"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index fdd4ebdbd92f5..bbce0e1d350e3 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -1,25 +1,25 @@ { lib, stdenv, fetchurl, ... }: -let - arch = { - x86_64-linux = "x64"; - i686-linux = "i386"; - aarch64-linux = "arm64"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - libPath = lib.makeLibraryPath [ stdenv.cc.libc ]; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "resilio-sync"; - version = "2.7.2"; + version = "2.7.3"; - src = fetchurl { - url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; - sha256 = { - x86_64-linux = "0gar5lzv1v4yqmypwqsjnfb64vffzn8mw9vnjr733fgf1pmr57hf"; - i686-linux = "1bws7r86h1vysjkhyvp2zk8yvxazmlczvhjlcayldskwq48iyv6w"; - aarch64-linux = "0j8wk5cf8bcaaqxi8gnqf1mpv8nyfjyr4ibls7jnn2biqq767af2"; - }.${stdenv.hostPlatform.system}; - }; + src = { + x86_64-linux = fetchurl { + url = "https://download-cdn.resilio.com/${version}/linux-x64/resilio-sync_x64.tar.gz"; + sha256 = "sha256-DYQs9KofHkvtlsRQHRLwQHoHwSZkr40Ih0RVAw2xv3M="; + }; + + i686-linux = fetchurl { + url = "https://download-cdn.resilio.com/${version}/linux-i386/resilio-sync_i386.tar.gz"; + sha256 = "sha256-PFKVBs0KthG4tuvooHkAciPhNQP0K8oi2LyoRUs5V7I="; + }; + + aarch64-linux = fetchurl { + url = "https://download-cdn.resilio.com/${version}/linux-arm64/resilio-sync_arm64.tar.gz"; + sha256 = "sha256-o2DlYOBTkFhQMEDJySlVSNlVqLNbBzacyv2oTwxrXto="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); dontStrip = true; # Don't strip, otherwise patching the rpaths breaks sourceRoot = "."; @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { install -D rslsync "$out/bin/rslsync" patchelf \ --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath} "$out/bin/rslsync" + --set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc ]} "$out/bin/rslsync" ''; meta = with lib; { diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index f2cd1282fc6e4..adda284a6b8c0 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,15 @@ mkDerivation rec { pname = "seafile-client"; - version = "8.0.6"; + version = "8.0.7"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; - rev = "v${version}"; - sha256 = "sha256-pImSrQ63AS1hi9CUvFAR91ZHgPCJB0ZOAA0fEZ24O8o="; + # Tag v8.0.7 used to point to this commit, but was re-tagged later to a state + # that fails to link properly + rev = "8b96abf64e6aa19e3beeff6b322bcd6d28120bdd"; + sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj"; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index 8c26b72908368..1338f3e56f8ef 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3, makeWrapper }: +{ lib +, fetchFromGitHub +, python3 +, makeWrapper +}: let # Seahub 8.x.x does not support django-webpack-loader >=1.x.x python = python3.override { @@ -25,9 +29,12 @@ python.pkgs.buildPythonApplication rec { }; dontBuild = true; + doCheck = false; # disabled because it requires a ccnet environment - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; propagatedBuildInputs = with python.pkgs; [ django @@ -44,7 +51,7 @@ python.pkgs.buildPythonApplication rec { djangorestframework openpyxl requests - requests_oauthlib + requests-oauthlib pyjwt pycryptodome qrcode @@ -65,10 +72,10 @@ python.pkgs.buildPythonApplication rec { }; meta = with lib; { - homepage = "https://github.com/haiwen/seahub"; description = "The web end of seafile server"; + homepage = "https://github.com/haiwen/seahub"; license = licenses.asl20; - platforms = platforms.linux; maintainers = with maintainers; [ greizgh schmittlauch ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 257d6c526893c..bd6df5ef6bee6 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildGoModule -, testVersion +, testers , seaweedfs }: @@ -21,12 +21,13 @@ buildGoModule rec { subPackages = [ "weed" ]; passthru.tests.version = - testVersion { package = seaweedfs; command = "weed version"; }; + testers.testVersion { package = seaweedfs; command = "weed version"; }; meta = with lib; { description = "Simple and highly scalable distributed file system"; homepage = "https://github.com/chrislusf/seaweedfs"; maintainers = with maintainers; [ cmacrae raboof ]; + mainProgram = "weed"; license = licenses.asl20; }; } diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 7384f7c350a5a..f584eea5cca59 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "E1TX3GBVKn0tXloNhyiXOtDwSlO7mwXJ6zaOSHKZEFc="; + sha256 = "clLSkby7bmjScUpSZkVvHt5nSIoQOaYrxsoLqiuQZik="; }; modRoot = "./agent"; - vendorSha256 = "sha256-sPb49tRUHhwow7+IKiN33sgWYAa3lTpOD1vh8e5Wy68="; + vendorSha256 = "sha256-XVLsmU4EfOTFVpF5he+FCyDr/NuApUBC9R00nO1HJrg="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/networking/soju/default.nix b/pkgs/applications/networking/soju/default.nix index f5ffc03dc0f2e..dc20578cf021e 100644 --- a/pkgs/applications/networking/soju/default.nix +++ b/pkgs/applications/networking/soju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soju"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "soju"; rev = "v${version}"; - sha256 = "sha256-j7LwWBBJvNUeg0+P632HaGliVtrrCD0VNxkynaZzidQ="; + sha256 = "sha256-4ixPEnSa1m52Hu1dzxMG8c0bkqGN04vRlIzvdZ/ES4A="; }; - vendorSha256 = "sha256-fDfH2pQ5MtZDjiGx26vS5dBzxejVXPfflLX8N8VcJTA="; + vendorSha256 = "sha256-UVFi/QK2zwzhBkPXEJLYc5WSu3OOvWTVVGkMhrrufyc="; subPackages = [ "cmd/soju" diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 335ba4a4de146..0b02b87a1b2f6 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -7,13 +7,13 @@ let apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; in stdenv.mkDerivation rec { pname = "backintime-common"; - version = "1.2.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "mBjheLY7DHs995heZmxVnDdvABkAROCjRJ4a/uJmJcg="; + sha256 = "sha256-7iTQZ7SiESsKK8F8BpLrRNkj8JhHo64kliaOvMvYGvw="; }; nativeBuildInputs = [ makeWrapper gettext ]; diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 68af0bd2890a3..a76be3d318c3c 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.16"; + version = "2.4.17"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GoufEcCu/Cg2Fu0RcjTi4te/7+gZfQRTj+AtK0YnF5I="; + hash = "sha256-+ADAPxAZNDqLKLz6rAProqSDINDiTZhc2trxJFFMQeA="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 9ebd9db67f9da..a08c01019200a 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.58.0"; + version = "1.58.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-zCKXi3qeiq2AGT7UioVfCbB4bc5F2tXJ507zPa+O0pc="; + sha256 = "sha256-Hh0IVNaLAUOmdYJ6cbYFyDCLwL+0HyZdRzKnXAT0CB8="; }; - vendorSha256 = "sha256-mgupx5SNQ3wUkQCeTVnw3wwdSCrTcwLYxcX6tlqXTyQ="; + vendorSha256 = "sha256-MPo1t1gzlrzAzbTOv/dSs2BH8NwlXmf6vo1DOFP2TrM="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index b3c40b0f2fcd1..96420ff04de1c 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication, pyside2, shiboken2, twisted, certifi, qt5 }: +{ lib, fetchFromGitHub, buildPythonApplication, pyside2, twisted, certifi, qt5, enableGUI ? true }: buildPythonApplication rec { pname = "syncplay"; @@ -13,12 +13,14 @@ buildPythonApplication rec { sha256 = "0qm3qn4a1nahhs7q81liz514n9blsi107g9s9xfw2i8pzi7v9v0v"; }; - propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = [ twisted certifi ] + ++ twisted.extras-require.tls + ++ lib.optional enableGUI pyside2; + nativeBuildInputs = lib.optionals enableGUI [ qt5.wrapQtAppsHook ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; - postFixup = '' + postFixup = lib.optionalString enableGUI '' wrapQtApp $out/bin/syncplay ''; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 31d0ce461d09b..fc10b706bdce7 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,21 +4,21 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.19.1"; + version = "1.20.1"; src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing"; - rev = "v${version}"; - sha256 = "sha256-/CRDdKUeLQ/jSLrd44Tjbb0lfgFFnJkpmFEYZJFQHY8="; + owner = "syncthing"; + repo = "syncthing"; + rev = "v${version}"; + hash = "sha256-QJevD/meVPEHnfwT1Eu3cwfVFU+ab/16eJBl6cuhGdA="; }; - vendorSha256 = "sha256-GBDGckGewo5Yp8zwAKwwXkSP5lx0fQR4AHQFkzO7Q0Q="; + vendorSha256 = "sha256-NuiT2GytWaGkgSyl+qoe9DjCCL7wSHc6FU8C6rsy6Vc="; doCheck = false; - BUILD_USER="nix"; - BUILD_HOST="nix"; + BUILD_USER = "nix"; + BUILD_HOST = "nix"; buildPhase = '' runHook preBuild @@ -45,11 +45,13 @@ let changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}"; license = licenses.mpl20; maintainers = with maintainers; [ joko peterhoeg andrew-d ]; + mainProgram = target; platforms = platforms.unix; }; }; -in { +in +{ syncthing = common { stname = "syncthing"; target = "syncthing"; diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index 459e38970ddd0..3184c192b127f 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, qt5, fetchurl, autoPatchelfHook, dpkg, glibc, cpio, xar, undmg, gtk3, pango }: let pname = "synology-drive-client"; - buildNumber = "12682"; - version = "3.0.2"; baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient"; + buildNumber = "12920"; + version = "3.1.0"; meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; homepage = "https://www.synology.com/en-global/dsm/feature/drive"; @@ -17,7 +17,7 @@ let src = fetchurl { url = "${baseUrl}/${version}-${buildNumber}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "19fd2r39lb7bb6vkxfxyq0gp3l7pk5wy9fl0r7qwhym2jpi8yv6l"; + sha256 = "sha256-UAO/LwqPchIMhjdQP4METjVorMJsbvIDRkp4JxtZgOs="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -47,7 +47,7 @@ let src = fetchurl { url = "${baseUrl}/${version}-${buildNumber}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "1mlv8gxzivgxm59mw1pd63yq9d7as79ihm7166qyy0h0b0m04q2m"; + sha256 = "15wici8ycil1mfh5cf89rfan4kb93wfkdsd4kmpvzjj4bnddwlxa"; }; nativeBuildInputs = [ cpio xar undmg ]; diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 318ac8762395c..30a2570cada77 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "7.37.0"; + version = "7.40.2"; src = fetchurl { # find the latest version with @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_108.snap"; - sha512 = "05c4a0baeee8c1ff9547017288d099a9ef7b3049647ef0318ca4b1112df26f9f3a844bbae5f9ada59adaf07838987e2a685aee21ea494945202009236fe5f6bc"; + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_113.snap"; + sha512 = "33f8f367a9fe232cf359869dfa0aa55c9be6f6c0e1ebdf7d65ae4616afe0fe2b61c57697f6d67d5e71f5dffd163eb601d8f2d2757712b01d0d32eb027018c2d3"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/tetrd/default.nix b/pkgs/applications/networking/tetrd/default.nix index 94e7950ecdbba..937992a63d718 100644 --- a/pkgs/applications/networking/tetrd/default.nix +++ b/pkgs/applications/networking/tetrd/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "Share your internet connection from your device to your PC and vice versa through a USB cable"; homepage = "https://tetrd.app"; license = licenses.unfree; - platforms = platforms.all; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/applications/networking/tmpmail/default.nix index 535f5ce6d9d55..d29d5816f449d 100644 --- a/pkgs/applications/networking/tmpmail/default.nix +++ b/pkgs/applications/networking/tmpmail/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, stdenvNoCC, w3m, curl, jq, makeWrapper, installShellFiles }: +{ lib, fetchFromGitHub, stdenvNoCC, w3m, curl, jq, makeWrapper, installShellFiles, xclip }: stdenvNoCC.mkDerivation rec { pname = "tmpmail"; - version = "1.1.9"; + version = "1.2.3"; src = fetchFromGitHub { owner = "sdushantha"; repo = "tmpmail"; rev = "v${version}"; - sha256 = "sha256-sWcsmBUHSfo7sICXyhNhbfRFSHumObnWc7stWxcwVTg="; + sha256 = "sha256-s4c1M4YHK/CNpH7nPt7rRqlkLUZrpBXvAVS/qxCai9c="; }; dontConfigure = true; @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { mkdir -p $out/bin install -Dm755 -t $out/bin tmpmail installManPage tmpmail.1 - wrapProgram $out/bin/tmpmail --prefix PATH : ${lib.makeBinPath [ w3m curl jq ]} + wrapProgram $out/bin/tmpmail --prefix PATH : ${lib.makeBinPath [ w3m curl jq xclip ]} ''; meta = with lib; { diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/applications/networking/twtxt/default.nix index 27420f8bd3395..792c13aa23fa8 100644 --- a/pkgs/applications/networking/twtxt/default.nix +++ b/pkgs/applications/networking/twtxt/default.nix @@ -23,6 +23,11 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook tox ]; + disabledTests = [ + # Disable test using relative date and time + "test_tweet_relative_datetime" + ]; + meta = with lib; { description = "Decentralised, minimalist microblogging service for hackers"; homepage = "https://github.com/buckket/twtxt"; diff --git a/pkgs/applications/networking/zerobin/default.nix b/pkgs/applications/networking/zerobin/default.nix index 56d5274751fce..ca55085d8085f 100644 --- a/pkgs/applications/networking/zerobin/default.nix +++ b/pkgs/applications/networking/zerobin/default.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { # relax version constraints of some dependencies substituteInPlace setup.cfg \ --replace "clize==4.1.1" "clize" \ - --replace "bleach==3.1.5" "bleach>=3.1.5,<5" \ + --replace "bleach==3.1.5" "bleach>=3.1.5,<6" \ --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \ --replace "Paste==3.4.3" "Paste>=3.4.3,<4" ''; diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/applications/office/banking/default.nix index 8f2636395292a..c46fba171495a 100644 --- a/pkgs/applications/office/banking/default.nix +++ b/pkgs/applications/office/banking/default.nix @@ -5,27 +5,26 @@ , appstream-glib , desktop-file-utils , glib -, gtk3 , libxml2 , meson , ninja , pkg-config , wrapGAppsHook , gobject-introspection -, libhandy +, libadwaita , librsvg }: python3.pkgs.buildPythonApplication rec { pname = "banking"; - version = "0.3.0"; + version = "0.4.0"; format = "other"; src = fetchFromGitLab { owner = "tabos"; repo = "banking"; rev = version; - sha256 = "1w5x9iczw5hb9bfdm1df37n8xhdrida1yfrd82k9l8hb1k4q3h9d"; + sha256 = "sha256-VGNCSirQslRfLIFeo375BNlHujoNXm+s55Ty+hB+ZRI="; }; patches = [ @@ -35,17 +34,21 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.com/tabos/banking/-/commit/c3cc9afc380fe666ae6e331aa8a97659c60397a4.patch"; sha256 = "r9n9l47XU4Tg4U5sfiFdGkbG8QB7O4ol9CB1ya06yOc="; }) + # fix build with libadwaita 1.0.0 + (fetchpatch { + url = "https://gitlab.com/tabos/banking/-/commit/27ac4a89ba6047005d43de71a469ef30d1fda8b5.patch"; + hash = "sha256-dpDjdYf3gDsyFMTfGes+x27yUxKEnKjLulJxX2encG0="; + }) ]; postPatch = '' - patchShebangs meson_post_install.py + patchShebangs meson_post_conf.py meson_post_install.py ''; nativeBuildInputs = [ appstream-glib # for appstream-util desktop-file-utils # for desktop-file-validate glib # for glib-compile-resources - gtk3 # for gtk-update-icon-cache libxml2 # for xmllint meson ninja @@ -55,8 +58,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gobject-introspection - gtk3 - libhandy + libadwaita librsvg ]; diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index aee809eb82413..5f8d3adf8c2f5 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -1,46 +1,69 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, - qmake, qtbase, qtmultimedia, wrapQtAppsHook, - poppler, mupdf, freetype, jbig2dec, openjpeg, gumbo, - renderer ? "mupdf" }: +{ lib, + stdenv, + fetchFromGitHub, + installShellFiles, + pkg-config, + cmake, + qtbase, + qtmultimedia, + qttools, + wrapQtAppsHook, + bash, + zlib, + gcc, + gnumake, + coreutils, + # only required when using poppler + poppler, + # only required when using mupdf + mupdf, + freetype, + jbig2dec, + openjpeg, + gumbo, + # choose renderer: mupdf or poppler or both (not recommended) + renderer ? "mupdf", + # choose major Qt version: "5" or "6" (only 5 is tested) + qt_version ? "5"}: let renderers = { mupdf.buildInputs = [ mupdf freetype jbig2dec openjpeg gumbo ]; poppler.buildInputs = [ poppler ]; }; - + use_poppler = if "${renderer}" == "poppler" || "${renderer}" == "both" then "ON" else "OFF"; + use_mupdf = if "${renderer}" == "mupdf" || "${renderer}" == "both" then "ON" else "OFF"; in stdenv.mkDerivation rec { pname = "beamerpresenter"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "stiglers-eponym"; repo = "BeamerPresenter"; rev = "v${version}"; - sha256 = "sha256-+ZxllYL2wco4bG2pqInIbL9qfOoqoUJJUReqDyEBRcI="; + sha256 = "16v263nnnipih3lxg95rmwz0ihnvpl4n1wlj9r6zavnspzlp9dvb"; }; - nativeBuildInputs = [ qmake installShellFiles wrapQtAppsHook ]; - buildInputs = [ qtbase qtmultimedia ] ++ renderers.${renderer}.buildInputs; - - qmakeFlags = [ "RENDERER=${renderer}" ]; + nativeBuildInputs = [ pkg-config installShellFiles wrapQtAppsHook ]; + buildInputs = [ gcc cmake coreutils gnumake bash zlib qtbase qtmultimedia qttools ] ++ renderers.${renderer}.buildInputs; - postPatch = '' - shopt -s globstar - for f in **/*.{pro,conf,h,cpp}; do - substituteInPlace "$f" \ - --replace "/usr/" "$out/" \ - --replace "/etc/" "$out/etc/" \ - --replace '$${GUI_CONFIG_PATH}' "$out/etc/xdg/beamerpresenter/gui.json" - done - ''; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE='Release'" + "-DGIT_VERSION=OFF" + "-DUSE_POPPLER=${use_poppler}" + "-DUSE_MUPDF=${use_mupdf}" + "-DUSE_MUJS=OFF" + "-DUSE_GUMBO=ON" + "-DUSE_TRANSLATIONS=ON" + "-DQT_VERSION_MAJOR=${qt_version}" + ]; meta = with lib; { - description = "Modular multi screen pdf presentation software respecting your window manager"; + description = "Modular multi screen pdf presentation viewer"; homepage = "https://github.com/stiglers-eponym/BeamerPresenter"; - license = licenses.agpl3Plus; + license = with licenses; [ agpl3 gpl3Plus ]; platforms = platforms.all; maintainers = with maintainers; [ pacien ]; }; diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index 9cdbd14e105c9..c30b9ede2bba0 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , appstream -, bash , coreutils , curl , desktop-file-utils @@ -40,7 +39,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - bash meson ninja pkg-config diff --git a/pkgs/applications/office/buho/default.nix b/pkgs/applications/office/buho/default.nix new file mode 100644 index 0000000000000..997b1c9d502d5 --- /dev/null +++ b/pkgs/applications/office/buho/default.nix @@ -0,0 +1,58 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, applet-window-buttons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, mauikit-filebrowsing +, mauikit-accounts +, mauikit-texteditor +, qtmultimedia +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "buho"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "buho"; + rev = "v${version}"; + sha256 = "sha256-rHjjvjRY2WsyZfj3fzp46copZ1g2ae6PVv9lBNZDzcI="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + applet-window-buttons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + mauikit-filebrowsing + mauikit-accounts + mauikit-texteditor + qtmultimedia + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Task and Note Keeper"; + homepage = "https://invent.kde.org/maui/buho"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 234d49102889c..e18c0f21ae3f7 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -30,7 +30,23 @@ mkDerivation rec { sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma"; excludes = [ "CMakeLists.txt" ]; }) + # Fixes for building calligra with modern poppler[-qt5] + (fetchpatch { + name = "poppler-22.03.0.patch"; + url = "https://github.com/archlinux/svntogit-packages/raw/8f328bef497a9e3bc628e4e294c1a70b0c8b0eab/trunk/poppler-22.03.0.patch"; + sha256 = "sha256-bOTnQcavXF49LIshNgzhXhyoEjzLmQJC/U7hO5P0bfY="; + }) + # Fixes for building calligra with gcc11/c++17 + (fetchpatch { + name = "build_c++17_poppler.patch"; + url = "https://github.com/archlinux/svntogit-packages/raw/bbbe35f97eb1033798f1cf95d427890168598199/trunk/068cd9ae.patch"; + sha256 = "sha256-d9/ILwSeW+ov11DF191hzIaUafO/rjQrAeONwqDSKbA="; + }) ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' + ''; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 92f48eb91b82c..5833e5e4adf3b 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,14 +1,26 @@ -{ lib, python3 }: +{ lib, python3, fetchpatch }: python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.19"; + version = "1.21"; + format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "def7c0210bf0ce8dfffdb46ce21b3efcf71eba5a4e903565258419e4c53c2d43"; + sha256 = "sha256-0aFCKEjmXn6yddgNMi9t4rzqHcN7VBLoz3LEg9apmNY="; }; + patches = [ + (fetchpatch { + # Update werkzeug compatibility + url = "https://github.com/beancount/fava/commit/5a99417a42e1d739b1e57fae2d01ff1d146dcbc2.patch"; + hash = "sha256-Y6IcxZAcFJEYgT8/xBIABdkP+pUdQX1EgSS5uNdSJUE="; + excludes = [ + ".pre-commit-config.yaml" + ]; + }) + ]; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 13b0c84cfaa59..c9b4ef1391265 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.51"; + version = "1.12.52"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "oA5sbk7N2tq9mwrhgBPXsFk3/cuPmq1ac7lZI8eusd0="; + sha256 = "c89zBJoiodgoUGJ1ssk3jsN8X/N7aLsfL0lPDWQAgjs="; }; configureFlags = [ "--disable-component" ]; @@ -38,6 +38,7 @@ in stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; homepage = "http://projects.gnome.org/gnumeric/"; platforms = platforms.unix; + broken = with stdenv; isDarwin && isAarch64; maintainers = [ maintainers.vcunat ]; }; } diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index d5c4dcb65011c..1e34b7918da14 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { --add-flags "-cp $out/share/java/jameica.jar:$out/share/jameica-${version}/* ${ lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' } de.willuhn.jameica.Main" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} \ - --run "cd $out/share/java/" + --prefix LD_LIBRARY_PATH : ${lib.escapeShellArg (lib.makeLibraryPath buildInputs)} \ + --chdir "$out/share/java/" ''; meta = with lib; { diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index 668b36324f62f..55c672a1dc0d6 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -7,7 +7,6 @@ , vala , pkg-config , desktop-file-utils -, python3 , glib , gtk4 , json-glib @@ -18,13 +17,13 @@ stdenv.mkDerivation rec { pname = "khronos"; - version = "3.6.6"; + version = "3.7.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "sha256-EFoW/2IZuCo6sg7q87XRrJJ7dmYtVZr2bJQUEiiMiVI="; + sha256 = "sha256-k3U8ICnwMbR6vN+gELWytI2Etri5lvbE6AX6lUpr7dQ="; }; nativeBuildInputs = [ @@ -33,7 +32,6 @@ stdenv.mkDerivation rec { ninja vala pkg-config - python3 wrapGAppsHook4 ]; @@ -45,11 +43,6 @@ stdenv.mkDerivation rec { libgee ]; - postPatch = '' - chmod +x build-aux/post_install.py - patchShebangs build-aux/post_install.py - ''; - passthru = { updateScript = nix-update-script { attrPath = pname; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 5478382cbd83d..83c47848bc4a0 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3 -, texinfo, gnused, usePython ? true }: +, fetchpatch, installShellFiles, texinfo, gnused, usePython ? true }: stdenv.mkDerivation rec { pname = "ledger"; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { buildInputs = [ (boost.override { enablePython = usePython; python = python3; }) - gmp mpfr libedit python3 gnused - ]; + gmp mpfr libedit gnused + ] ++ lib.optional usePython python3; - nativeBuildInputs = [ cmake texinfo ]; + nativeBuildInputs = [ cmake texinfo installShellFiles ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" @@ -34,8 +34,21 @@ stdenv.mkDerivation rec { --replace 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${python3.sitePackages}"' ''; + patches = [ + # Add support for $XDG_CONFIG_HOME. Remove with the next release + (fetchpatch { + url = "https://github.com/ledger/ledger/commit/c79674649dee7577d6061e3d0776922257520fd0.patch"; + sha256 = "sha256-vwVQnY9EUCXPzhDJ4PSOmQStb9eF6H0yAOiEmL6sAlk="; + excludes = [ "doc/NEWS.md" ]; + }) + ]; + installTargets = [ "doc" "install" ]; + postInstall = '' + installShellCompletion --cmd ledger --bash $src/contrib/ledger-completion.bash + ''; + meta = with lib; { homepage = "https://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; @@ -49,6 +62,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with maintainers; [ jwiegley marsam ]; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 5ebde5e10dece..74a4c156b8307 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,29 +1,125 @@ -{ stdenv, fetchurl, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext -, IOCompress, zlib, libjpeg, expat, freetype, libwpd -, libxml2, db, curl, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, cups, xorg, fontforge, jre_minimal -, openssl, gperf, cppunit, poppler, util-linux -, librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient -, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus-glib, clucene_core, libcdr, lcms -, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkg-config, bluez5, libtool, carlito -, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf -, librevenge, libe-book, libmwaw, glm, gst_all_1 -, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, gnome, glib, ncurses, libepoxy, gpgme +{ stdenv +, fetchurl +, lib +, pam +, python3 +, libxslt +, perl +, ArchiveZip +, box2d +, gettext +, IOCompress +, zlib +, libjpeg +, expat +, freetype +, libwpd +, libxml2 +, db +, curl +, fontconfig +, libsndfile +, neon +, bison +, flex +, zip +, unzip +, gtk3 +, libmspack +, getopt +, file +, cairo +, which +, icu +, boost +, jdk +, ant +, cups +, xorg +, fontforge +, jre_minimal +, openssl +, gperf +, cppunit +, poppler +, util-linux +, librsvg +, libGLU +, libGL +, bsh +, CoinMP +, libwps +, libabw +, libmysqlclient +, autoconf +, automake +, openldap +, bash +, hunspell +, librdf_redland +, nss +, nspr +, libwpg +, dbus-glib +, clucene_core +, libcdr +, lcms +, unixODBC +, mdds +, sane-backends +, mythes +, libexttextcat +, libvisio +, fontsConf +, pkg-config +, bluez5 +, libtool +, carlito +, libatomic_ops +, graphite2 +, harfbuzz +, libodfgen +, libzmf +, librevenge +, libe-book +, libmwaw +, glm +, gst_all_1 +, gdb +, commonsLogging +, librdf_rasqal +, wrapGAppsHook +, gnome +, glib +, ncurses +, libepoxy +, gpgme +, abseil-cpp , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "uk" "zh-CN" ] , withHelp ? true -, kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null -, ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null +, kdeIntegration ? false +, mkDerivation ? null +, qtbase ? null +, qtx11extras ? null +, ki18n ? null +, kconfig ? null +, kcoreaddons ? null +, kio ? null +, kwindowsystem ? null , wrapQtAppsHook ? null , variant ? "fresh" +, symlinkJoin } @ args: assert builtins.elem variant [ "fresh" "still" ]; let + inherit (lib) + flatten flip + concatMapStrings concatMapStringsSep concatStringsSep + getDev getLib + optional optionals optionalString; + jre' = jre_minimal.override { modules = [ "java.base" "java.desktop" "java.logging" ]; }; @@ -34,27 +130,43 @@ let inherit (primary-src) major minor subdir version; - langsSpaces = lib.concatStringsSep " " langs; + langsSpaces = concatStringsSep " " langs; mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation; srcs = { third_party = - map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) - (importVariant "download.nix" ++ [ - (rec { - name = "unowinreg.dll"; - url = "https://dev-www.libreoffice.org/extern/${md5name}"; - sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; - md5 = "185d60944ea767075d27247c3162b3bc"; - md5name = "${md5}-${name}"; - }) - ]); + map (x: ((fetchurl { inherit (x) url sha256 name; }) // { inherit (x) md5name md5; })) + (importVariant "download.nix" ++ [ + (rec { + name = "unowinreg.dll"; + url = "https://dev-www.libreoffice.org/extern/${md5name}"; + sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; + md5 = "185d60944ea767075d27247c3162b3bc"; + md5name = "${md5}-${name}"; + }) + ]); translations = primary-src.translations; help = primary-src.help; }; -in (mkDrv rec { + + # See `postPatch` for details + kdeDeps = symlinkJoin { + name = "libreoffice-kde-dependencies-${version}"; + paths = flatten (map (e: [ (getDev e) (getLib e) ]) [ + qtbase + qtx11extras + kconfig + kcoreaddons + ki18n + kio + kwindowsystem + ]); + }; + +in +(mkDrv rec { pname = "libreoffice"; inherit version; @@ -71,10 +183,10 @@ in (mkDrv rec { postUnpack = '' mkdir -v $sourceRoot/${tarballPath} - '' + (lib.flip lib.concatMapStrings srcs.third_party (f: '' - ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name} - ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name} - '')) + '' + (flip concatMapStrings srcs.third_party (f: '' + ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name} + ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name} + '')) + '' ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name} ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name} @@ -90,20 +202,27 @@ in (mkDrv rec { url = "https://github.com/archlinux/svntogit-packages/raw/f82958b9538f86e41b51f1ba7134968d2f3788d1/trunk/poppler-22.03.0.patch"; sha256 = "5h4qJmx6Q3Q3dHUlSi8JXBziN2mAswGVWk5aDTLTwls="; }) + + # Fix build with poppler 22.04 + ./poppler-22-04-0.patch ]; ### QT/KDE # - # We have to resort to the ugly patching of configure.ac as it assumes that - # the first directory that contains headers and libraries during the check - # contains all the relevant headers/libs which doesn't work with both as they - # are in multiple directories due to each having their own derivation. - postPatch = let - inc = e: path: - "${lib.getDev e}/include/KF5/${path}"; - libs = list: - lib.concatMapStringsSep " " (e: "-L${lib.getLib e}/lib") list; - in '' + # configure.ac assumes that the first directory that contains headers and + # libraries during its checks contains *all* the relevant headers/libs which + # obviously doesn't work for us, so we have 2 options: + # + # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE + # dependencies which is ugly and brittle, or + # + # 2. use symlinkJoin to pull in the relevant dependencies and just patch in + # that path which is *also* ugly, but far less likely to break + # + # The 2nd option is not very Nix'y, but I'll take robust over nice any day. + # Additionally, it's much easier to fix if LO breaks on the next upgrade (just + # add the missing dependencies to it). + postPatch = '' substituteInPlace shell/source/unix/exec/shellexec.cxx \ --replace /usr/bin/xdg-open ${if kdeIntegration then "kde-open5" else "xdg-open"} @@ -116,21 +235,12 @@ in (mkDrv rec { substituteInPlace configure.ac --replace \ 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' - '' + lib.optionalString kdeIntegration '' - substituteInPlace configure.ac \ - --replace kcoreaddons_version.h KCoreAddons/kcoreaddons_version.h \ - --replace '$QT5INC' ${qtbase.dev}/include \ - --replace '$QT5LIB' ${qtbase.out}/lib \ - --replace '-I$qt5_incdir ' '-I${qtx11extras.dev}/include '\ - --replace '-L$qt5_libdir ' '${libs [ qtbase qtx11extras ]} ' \ - --replace '$KF5INC' ${kcoreaddons.dev}/include \ - --replace '$KF5LIB' ${kcoreaddons.out}/lib \ - --replace '$kf5_incdir/KCore' ${inc kcoreaddons "KCore"} \ - --replace '$kf5_incdir/KI18n' ${inc ki18n "KI18n"} \ - --replace '$kf5_incdir/KConfig' ${inc kconfig "KConfig"} \ - --replace '$kf5_incdir/KWindow' ${inc kwindowsystem "KWindow"} \ - --replace '$kf5_incdir/KIO' ${inc kio "KIO"} \ - --replace '-L$kf5_libdir ' '${libs [ kconfig kcoreaddons ki18n kio kwindowsystem ]} ' + '' + optionalString kdeIntegration '' + substituteInPlace configure.ac \ + --replace '$QT5INC ' '$QT5INC ${kdeDeps}/include ' \ + --replace '$QT5LIB ' '$QT5LIB ${kdeDeps}/lib ' \ + --replace '$KF5INC ' '$KF5INC ${kdeDeps}/include ${kdeDeps}/include/KF5 '\ + --replace '$KF5LIB ' '$KF5LIB ${kdeDeps}/lib ' ''; dontUseCmakeConfigure = true; @@ -174,7 +284,6 @@ in (mkDrv rec { # this I actually hate, this should be a data consistency test! sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx # rendering-dependent test - sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx # tilde expansion in path processing checks the existence of $HOME sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 @@ -187,9 +296,6 @@ in (mkDrv rec { # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx # rendering-dependent tests - sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx - sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx - sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -220,37 +326,6 @@ in (mkDrv rec { sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(test);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testConditionalFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF16LErtlSHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256ODF12);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256W3C);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_XL_SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testColorScaleExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testDataBarExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testNamedRangeBugfdo62729);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testRichTextExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testFormulaRefSheetNameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testCellValuesExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testCellNoteExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedChartODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testCellAnchoredGroupXLS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testCeilingFloorODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testRelativePathsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testSheetProtectionODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testSwappedOutImageExport);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testLinkedGraphicRT);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testImageWithSpecialID);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testAbsNamedRangeHTML);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testMoveCellAnchoredShapesODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testRefStringUnspecified);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testHeaderImageODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testTdf88657ODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testExponentWithoutSignFormatXLSX);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testHiddenRepeatedRowsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testHyperlinkTargetFrameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' @@ -271,18 +346,16 @@ in (mkDrv rec { '' # This to avoid using /lib:/usr/lib at linking + '' - sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk + sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk - find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; + find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; ''; makeFlags = [ "SHELL=${bash}/bin/bash" ]; enableParallelBuilding = true; - buildPhase = '' - make build-nocheck - ''; + buildTargets = [ "build-nocheck" ]; doCheck = true; @@ -310,19 +383,18 @@ in (mkDrv rec { mkdir -p $dev cp -r include $dev - '' + lib.optionalString kdeIntegration '' - for prog in $out/bin/* - do - wrapQtApp $prog - done + '' + optionalString kdeIntegration '' + for prog in $out/bin/*; do + wrapQtApp $prog + done ''; dontWrapQtApps = true; configureFlags = [ (if withHelp then "" else "--without-help") - "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" + "--with-boost=${getDev boost}" + "--with-boost-libdir=${getLib boost}/lib" "--with-beanshell-jar=${bsh}" "--with-vendor=NixOS" "--disable-report-builder" @@ -331,7 +403,7 @@ in (mkDrv rec { "--enable-dbus" "--enable-release-build" "--enable-epm" - "--with-ant-home=${ant}/lib/ant" + "--with-ant-home=${getLib ant}/lib/ant" "--with-system-cairo" "--with-system-libs" "--with-system-headers" @@ -379,44 +451,128 @@ in (mkDrv rec { # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" "--without-system-xmlsec" - ] ++ lib.optionals kdeIntegration [ + ] ++ optionals kdeIntegration [ "--enable-kf5" "--enable-qt5" "--enable-gtk3-kde5" ]; - checkPhase = '' - make unitcheck - make slowcheck - ''; + checkTarget = concatStringsSep " " [ + "unitcheck" + "slowcheck" + ]; nativeBuildInputs = [ - gdb fontforge autoconf automake bison pkg-config libtool jdk - ] ++ lib.optional (!kdeIntegration) wrapGAppsHook - ++ lib.optional kdeIntegration wrapQtAppsHook; - - buildInputs = with xorg; - [ ant ArchiveZip boost box2d cairo clucene_core - IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig - freetype getopt gperf gtk3 - hunspell icu jre' lcms libcdr libexttextcat unixODBC libjpeg - libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 - libXaw libXext libXi libXinerama libxml2 libxslt libXtst - libXdmcp libpthreadstubs libGLU libGL mythes - glib libmysqlclient - neon nspr nss openldap openssl pam perl pkg-config poppler - python3 sane-backends unzip which zip zlib - mdds bluez5 libwps libabw libzmf - libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux - librevenge libe-book libmwaw glm ncurses libepoxy - libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly - gst-libav - ]) - ++ lib.optional kdeIntegration [ qtbase qtx11extras kcoreaddons kio ]; + autoconf + automake + bison + fontforge + gdb + jdk + libtool + pkg-config + ] + ++ [ (if kdeIntegration then wrapQtAppsHook else wrapGAppsHook) ]; + + buildInputs = with xorg; [ + ArchiveZip + CoinMP + IOCompress + abseil-cpp + ant + bluez5 + boost + box2d + cairo + clucene_core + cppunit + cups + curl + db + dbus-glib + expat + file + flex + fontconfig + freetype + getopt + gettext + glib + glm + gnome.adwaita-icon-theme + gperf + gpgme + graphite2 + gtk3 + harfbuzz + hunspell + icu + jre' + lcms + libGL + libGLU + libX11 + libXaw + libXdmcp + libXext + libXi + libXinerama + libXtst + libabw + libatomic_ops + libcdr + libe-book + libepoxy + libexttextcat + libjpeg + libmspack + libmwaw + libmysqlclient + libodfgen + libpthreadstubs + librdf_rasqal + librdf_redland + librevenge + librsvg + libsndfile + libvisio + libwpd + libwpg + libwps + libxml2 + libxshmfence + libxslt + libzmf + mdds + mythes + ncurses + neon + nspr + nss + openldap + openssl + pam + perl + pkg-config + poppler + python3 + sane-backends + unixODBC + unzip + util-linux + which + zip + zlib + ] + ++ (with gst_all_1; [ + gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + ]) + ++ optionals kdeIntegration [ qtbase qtx11extras kcoreaddons kio ]; passthru = { inherit srcs; diff --git a/pkgs/applications/office/libreoffice/poppler-22-04-0.patch b/pkgs/applications/office/libreoffice/poppler-22-04-0.patch new file mode 100644 index 0000000000000..c907bf1680b4f --- /dev/null +++ b/pkgs/applications/office/libreoffice/poppler-22-04-0.patch @@ -0,0 +1,100 @@ +Patch from OpenSUSE +https://build.opensuse.org/package/view_file/LibreOffice:Factory/libreoffice/poppler-22-04-0.patch?expand=1&rev=45e176f964509ebe3560d0dbf1ec8be9 +Index: libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +=================================================================== +--- libreoffice-7.3.3.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -474,12 +474,21 @@ int PDFOutDev::parseFont( long long nNew + { + // TODO(P3): Unfortunately, need to read stream twice, since + // we must write byte count to stdout before ++#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed ++ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef()); ++ if ( pBuf ) ++ { ++ aNewFont.isEmbedded = true; ++ nSize = pBuf->size(); ++ } ++#else + char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); + if( pBuf ) + { + aNewFont.isEmbedded = true; + gfree(pBuf); + } ++#endif + } + + m_aFontMap[ nNewId ] = aNewFont; +@@ -492,21 +501,35 @@ void PDFOutDev::writeFontFile( GfxFont* + return; + + int nSize = 0; ++#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed ++ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef()); ++ if ( !pBuf ) ++ return; ++ nSize = pBuf->size(); ++#else + char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); + if( !pBuf ) + return; ++#endif + + // ---sync point--- see SYNC STREAMS above + fflush(stdout); + ++#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed ++ if( fwrite(pBuf->data(), sizeof(unsigned char), nSize, g_binary_out) != static_cast<size_t>(nSize) ) ++ { ++#else + if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) ) + { + gfree(pBuf); ++#endif + exit(1); // error + } + // ---sync point--- see SYNC STREAMS above + fflush(g_binary_out); ++#if !POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed + gfree(pBuf); ++#endif + } + + #if POPPLER_CHECK_VERSION(0, 83, 0) +@@ -759,7 +782,11 @@ void PDFOutDev::updateFont(GfxState *sta + { + assert(state); + ++#if POPPLER_CHECK_VERSION(22, 04, 0) ++ std::shared_ptr<GfxFont> gfxFont = state->getFont(); ++#else + GfxFont *gfxFont = state->getFont(); ++#endif + if( !gfxFont ) + return; + +@@ -776,7 +803,11 @@ void PDFOutDev::updateFont(GfxState *sta + m_aFontMap.find( fontID ); + if( it == m_aFontMap.end() ) + { ++#if POPPLER_CHECK_VERSION(22, 04, 0) ++ nEmbedSize = parseFont( fontID, gfxFont.get(), state ); ++#else + nEmbedSize = parseFont( fontID, gfxFont, state ); ++#endif + it = m_aFontMap.find( fontID ); + } + +@@ -806,7 +837,11 @@ void PDFOutDev::updateFont(GfxState *sta + + if (nEmbedSize) + { ++#if POPPLER_CHECK_VERSION(22, 04, 0) ++ writeFontFile(gfxFont.get()); ++#else + writeFontFile(gfxFont); ++#endif + } + } + diff --git a/pkgs/applications/office/libreoffice/soffice-template.desktop b/pkgs/applications/office/libreoffice/soffice-template.desktop new file mode 100644 index 0000000000000..4adb91284a955 --- /dev/null +++ b/pkgs/applications/office/libreoffice/soffice-template.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=LibreOffice @app@... +Comment=Enter LibreOffice @app@ filename: +Type=Link +URL=.source/soffice.@ext@ +Icon=libreoffice-oasis-@type@ diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 9bfccf4c30694..5ed0517e944c2 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -21,11 +21,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_75_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_75_0.tar.xz"; - sha256 = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b"; + name = "boost_1_77_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_77_0.tar.xz"; + sha256 = "9b334d6c6d7af5a0687280788cd84444398b8e0b472cd88e52bbc3c3ef11d98e"; md5 = ""; - md5name = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b-boost_1_75_0.tar.xz"; + md5name = "9b334d6c6d7af5a0687280788cd84444398b8e0b472cd88e52bbc3c3ef11d98e-boost_1_77_0.tar.xz"; } { name = "box2d-2.3.1.tar.gz"; @@ -56,11 +56,11 @@ md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz"; } { - name = "cairo-1.16.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; - sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"; + name = "cairo-1.17.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/cairo-1.17.4.tar.xz"; + sha256 = "74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705"; md5 = ""; - md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; + md5name = "74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705-cairo-1.17.4.tar.xz"; } { name = "libcdr-0.1.7.tar.xz"; @@ -126,11 +126,11 @@ md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { - name = "libepoxy-1.5.3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; - sha256 = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"; + name = "libepoxy-1.5.9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.9.tar.xz"; + sha256 = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4"; md5 = ""; - md5name = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d-libepoxy-1.5.3.tar.xz"; + md5name = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4-libepoxy-1.5.9.tar.xz"; } { name = "epm-3.7.tar.gz"; @@ -154,11 +154,11 @@ md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; } { - name = "expat-2.4.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2"; - sha256 = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40"; + name = "expat-2.4.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.4.6.tar.xz"; + sha256 = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b"; md5 = ""; - md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2"; + md5name = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b-expat-2.4.6.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -168,11 +168,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.13.91.tar.gz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz"; - sha256 = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5"; + name = "fontconfig-2.13.94.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.94.tar.xz"; + sha256 = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c"; md5 = ""; - md5name = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5-fontconfig-2.13.91.tar.gz"; + md5name = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c-fontconfig-2.13.94.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -315,25 +315,25 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.9.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; - sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; + name = "freetype-2.11.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.11.0.tar.xz"; + sha256 = "8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7"; md5 = ""; - md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; + md5name = "8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7-freetype-2.11.0.tar.xz"; } { - name = "glm-0.9.9.7.zip"; - url = "https://dev-www.libreoffice.org/src/glm-0.9.9.7.zip"; - sha256 = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95"; + name = "glm-0.9.9.8.zip"; + url = "https://dev-www.libreoffice.org/src/glm-0.9.9.8.zip"; + sha256 = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad"; md5 = ""; - md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip"; + md5name = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad-glm-0.9.9.8.zip"; } { - name = "gpgme-1.13.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.13.1.tar.bz2"; - sha256 = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46"; + name = "gpgme-1.16.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.16.0.tar.bz2"; + sha256 = "6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0"; md5 = ""; - md5name = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46-gpgme-1.13.1.tar.bz2"; + md5name = "6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0-gpgme-1.16.0.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -343,11 +343,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-2.6.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"; - sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966"; + name = "harfbuzz-2.8.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-2.8.2.tar.xz"; + sha256 = "d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7"; md5 = ""; - md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz"; + md5name = "d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7-harfbuzz-2.8.2.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -371,18 +371,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-69_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-69_1-src.tgz"; - sha256 = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745"; + name = "icu4c-70_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-70_1-src.tgz"; + sha256 = "8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5"; md5 = ""; - md5name = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745-icu4c-69_1-src.tgz"; + md5name = "8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5-icu4c-70_1-src.tgz"; } { - name = "icu4c-69_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-69_1-data.zip"; - sha256 = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf"; + name = "icu4c-70_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-70_1-data.zip"; + sha256 = "c72723ddba3300ffb231d6b09e2a728ea6e89de10ed5927f74bacbd77042336e"; md5 = ""; - md5name = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf-icu4c-69_1-data.zip"; + md5name = "c72723ddba3300ffb231d6b09e2a728ea6e89de10ed5927f74bacbd77042336e-icu4c-70_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -462,18 +462,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-1.5.3.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; - sha256 = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523"; + name = "libjpeg-turbo-2.1.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.1.tar.gz"; + sha256 = "20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4"; md5 = ""; - md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; + md5name = "20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4-libjpeg-turbo-2.1.1.tar.gz"; } { - name = "language-subtag-registry-2021-08-06.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-08-06.tar.bz2"; - sha256 = "08452d3997c78e21f2d81e31409dc46557707be6dc1df3129674019659e5ff9b"; + name = "language-subtag-registry-2021-12-29.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-12-29.tar.bz2"; + sha256 = "d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837"; md5 = ""; - md5name = "08452d3997c78e21f2d81e31409dc46557707be6dc1df3129674019659e5ff9b-language-subtag-registry-2021-08-06.tar.bz2"; + md5name = "d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837-language-subtag-registry-2021-12-29.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -483,18 +483,18 @@ md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { - name = "lcms2-2.11.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.11.tar.gz"; - sha256 = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e"; + name = "lcms2-2.12.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.12.tar.gz"; + sha256 = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5"; md5 = ""; - md5name = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e-lcms2-2.11.tar.gz"; + md5name = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5-lcms2-2.12.tar.gz"; } { - name = "libassuan-2.5.3.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.3.tar.bz2"; - sha256 = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702"; + name = "libassuan-2.5.5.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.5.tar.bz2"; + sha256 = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4"; md5 = ""; - md5name = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702-libassuan-2.5.3.tar.bz2"; + md5name = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4-libassuan-2.5.5.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; @@ -511,11 +511,11 @@ md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { - name = "libexttextcat-3.4.5.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; - sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"; + name = "libexttextcat-3.4.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.6.tar.xz"; + sha256 = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df"; md5 = ""; - md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; + md5name = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df-libexttextcat-3.4.6.tar.xz"; } { name = "libffi-3.3.tar.gz"; @@ -525,25 +525,25 @@ md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; } { - name = "libgpg-error-1.37.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.37.tar.bz2"; - sha256 = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"; + name = "libgpg-error-1.43.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.43.tar.bz2"; + sha256 = "a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf"; md5 = ""; - md5name = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763-libgpg-error-1.37.tar.bz2"; + md5name = "a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf-libgpg-error-1.43.tar.bz2"; } { - name = "liblangtag-0.6.2.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; - sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; + name = "liblangtag-0.6.3.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.3.tar.bz2"; + sha256 = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd"; md5 = ""; - md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; + md5name = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd-liblangtag-0.6.3.tar.bz2"; } { - name = "libnumbertext-1.0.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.7.tar.xz"; - sha256 = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc"; + name = "libnumbertext-1.0.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.10.tar.xz"; + sha256 = "a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31fda00264a76f2633beb"; md5 = ""; - md5name = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc-libnumbertext-1.0.7.tar.xz"; + md5name = "a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31fda00264a76f2633beb-libnumbertext-1.0.10.tar.xz"; } { name = "ltm-1.0.zip"; @@ -553,25 +553,25 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.32.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.32.tar.gz"; - sha256 = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043"; + name = "xmlsec1-1.2.33.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.33.tar.gz"; + sha256 = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931"; md5 = ""; - md5name = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043-xmlsec1-1.2.32.tar.gz"; + md5name = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931-xmlsec1-1.2.33.tar.gz"; } { - name = "libxml2-2.9.12.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz"; - sha256 = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"; + name = "libxml2-2.9.13.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.13.tar.xz"; + sha256 = "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e"; md5 = ""; - md5name = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92-libxml2-2.9.12.tar.gz"; + md5name = "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e-libxml2-2.9.13.tar.xz"; } { - name = "libxslt-1.1.34.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; - sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; + name = "libxslt-1.1.35.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.35.tar.xz"; + sha256 = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79"; md5 = ""; - md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; + md5name = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79-libxslt-1.1.35.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -595,11 +595,11 @@ md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-1.7.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/mdds-1.7.0.tar.bz2"; - sha256 = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf"; + name = "mdds-2.0.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/mdds-2.0.1.tar.bz2"; + sha256 = "3ab33fce58e6acf9540cc1a52264be6863ef80f55ac287194cc98cda48e71fe6"; md5 = ""; - md5name = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf-mdds-1.7.0.tar.bz2"; + md5name = "3ab33fce58e6acf9540cc1a52264be6863ef80f55ac287194cc98cda48e71fe6-mdds-2.0.1.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -616,11 +616,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.19.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.19.tar.xz"; - sha256 = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af"; + name = "libmwaw-0.3.21.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.21.tar.xz"; + sha256 = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c"; md5 = ""; - md5name = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af-libmwaw-0.3.19.tar.xz"; + md5name = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c-libmwaw-0.3.21.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -679,11 +679,11 @@ md5name = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1-openssl-1.1.1l.tar.gz"; } { - name = "liborcus-0.16.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/liborcus-0.16.1.tar.bz2"; - sha256 = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4"; + name = "liborcus-0.17.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.17.2.tar.bz2"; + sha256 = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143"; md5 = ""; - md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2"; + md5name = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143-liborcus-0.17.2.tar.bz2"; } { name = "libpagemaker-0.0.4.tar.xz"; @@ -693,18 +693,18 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-4500.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-4500.tar.bz2"; - sha256 = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304"; + name = "pdfium-4699.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-4699.tar.bz2"; + sha256 = "ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf"; md5 = ""; - md5name = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304-pdfium-4500.tar.bz2"; + md5name = "ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf-pdfium-4699.tar.bz2"; } { - name = "pixman-0.34.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; - sha256 = "21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e"; - md5 = "e80ebae4da01e77f68744319f01d52a3"; - md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; + name = "pixman-0.40.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/pixman-0.40.0.tar.gz"; + sha256 = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc"; + md5 = ""; + md5name = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc-pixman-0.40.0.tar.gz"; } { name = "libpng-1.6.37.tar.xz"; @@ -791,11 +791,11 @@ md5name = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc-serf-1.3.9.tar.bz2"; } { - name = "skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; - sha256 = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d"; + name = "skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"; + sha256 = "97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177"; md5 = ""; - md5name = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d-skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; + md5name = "97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177-skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -861,11 +861,11 @@ md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { - name = "zlib-1.2.11.tar.xz"; - url = "https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; - sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; + name = "zlib-1.2.12.tar.xz"; + url = "https://dev-www.libreoffice.org/src/zlib-1.2.12.tar.xz"; + sha256 = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"; md5 = ""; - md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; + md5name = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18-zlib-1.2.12.tar.xz"; } { name = "libzmf-0.0.2.tar.xz"; @@ -875,10 +875,17 @@ md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } { - name = "zxing-cpp-1.1.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.1.1.tar.gz"; - sha256 = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86"; + name = "zxing-cpp-1.2.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.2.0.tar.gz"; + sha256 = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a"; + md5 = ""; + md5name = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a-zxing-cpp-1.2.0.tar.gz"; + } + { + name = "libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"; + sha256 = "471dd83a813ed2816c2246c373004470ad0f6612c7ce72038929dc5161cdd58e"; md5 = ""; - md5name = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86-zxing-cpp-1.1.1.tar.gz"; + md5name = "471dd83a813ed2816c2246c373004470ad0f6612c7ce72038929dc5161cdd58e-libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"; } ] diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix index 1e0ee64bd1f82..ace442176dd91 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -3,9 +3,21 @@ attrs: { postConfigure = attrs.postConfigure + '' sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' + sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' + + sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + + sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' ''; configureFlags = attrs.configureFlags ++ [ (lib.enableFeature kdeIntegration "kf5") "--without-system-zxing" + "--without-system-cuckoo" ]; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 7d13558b93579..50b28e6cf6b57 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -7,8 +7,8 @@ rec { }; major = "7"; - minor = "2"; - patch = "5"; + minor = "3"; + patch = "3"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "sha256-Z8G/sFnUMyhrAlKpFWJ7M69ju19LbslQnRO53UdVEqc="; + sha256 = "sha256-7hK9vhYhwg4nRLxbbFlngQ8lpXYLmKxYEtVQqwCWhoU="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "sha256-9rnuRifsEX7RAUdsX6VVw/xQS6dZeS3RbKnoC39uMd8="; + sha256 = "sha256-uRsKSC+kLVnhYF85o5FxZuf/dr+o6bYtbu8KmwSzNRw="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "sha256-6vERLWh0fkQcSRkC37fw2HBqxVtbr9kPEhOyWXjMrfM="; + sha256 = "sha256-aIY07MuALBVklhJLOUwOxeIQWam2zQCVkw+edvnu/ps="; }; } diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index 57eebe6ec6dd7..dddb89671b0d7 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -7,13 +7,6 @@ md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { - name = "commons-logging-1.2-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; - sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; - md5 = ""; - md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; - } - { name = "apr-1.5.2.tar.gz"; url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; @@ -28,11 +21,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_71_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz"; - sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543"; + name = "boost_1_75_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_75_0.tar.xz"; + sha256 = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b"; md5 = ""; - md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; + md5name = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b-boost_1_75_0.tar.xz"; } { name = "box2d-2.3.1.tar.gz"; @@ -42,11 +35,11 @@ md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz"; } { - name = "breakpad.zip"; - url = "https://dev-www.libreoffice.org/src/breakpad.zip"; - sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; + name = "breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; + sha256 = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91"; md5 = ""; - md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; + md5name = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91-breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; } { name = "bsh-2.0b6-src.zip"; @@ -56,11 +49,11 @@ md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; } { - name = "bzip2-1.0.6.tar.gz"; - url = "https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; - sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"; - md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; - md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + name = "bzip2-1.0.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/bzip2-1.0.8.tar.gz"; + sha256 = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269"; + md5 = ""; + md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz"; } { name = "cairo-1.16.0.tar.xz"; @@ -70,11 +63,11 @@ md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { - name = "libcdr-0.1.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz"; - sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861"; + name = "libcdr-0.1.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz"; + sha256 = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4"; md5 = ""; - md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz"; + md5name = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4-libcdr-0.1.7.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -119,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.78.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-7.78.0.tar.xz"; - sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5"; + name = "curl-7.79.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.79.1.tar.xz"; + sha256 = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689"; md5 = ""; - md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz"; + md5name = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689-curl-7.79.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -154,25 +147,25 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; - sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"; + name = "libetonyek-0.1.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz"; + sha256 = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a"; md5 = ""; - md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; + md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; } { - name = "expat-2.4.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2"; - sha256 = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40"; + name = "expat-2.4.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.4.6.tar.xz"; + sha256 = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b"; md5 = ""; - md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2"; + md5name = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b-expat-2.4.6.tar.xz"; } { - name = "Firebird-3.0.0.32483-0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; - sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; + name = "Firebird-3.0.7.33374-0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2"; + sha256 = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76"; md5 = ""; - md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; + md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { name = "fontconfig-2.13.91.tar.gz"; @@ -217,11 +210,11 @@ md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { - name = "liberation-fonts-ttf-2.00.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; - sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45"; + name = "liberation-fonts-ttf-2.1.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz"; + sha256 = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef"; md5 = ""; - md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz"; + md5name = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef-liberation-fonts-ttf-2.1.4.tar.gz"; } { name = "LinLibertineG-20120116.zip"; @@ -266,11 +259,11 @@ md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; } { - name = "culmus-0.131.tar.gz"; - url = "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; - sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b"; + name = "culmus-0.133.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz"; + sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05"; md5 = ""; - md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz"; + md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; @@ -378,18 +371,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-68_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-68_1-src.tgz"; - sha256 = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d"; + name = "icu4c-69_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-69_1-src.tgz"; + sha256 = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745"; md5 = ""; - md5name = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d-icu4c-68_1-src.tgz"; + md5name = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745-icu4c-69_1-src.tgz"; } { - name = "icu4c-68_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-68_1-data.zip"; - sha256 = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510"; + name = "icu4c-69_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-69_1-data.zip"; + sha256 = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf"; md5 = ""; - md5name = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510-icu4c-68_1-data.zip"; + md5name = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf-icu4c-69_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -476,11 +469,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2021-03-05.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2"; - sha256 = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a"; + name = "language-subtag-registry-2021-12-29.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-12-29.tar.bz2"; + sha256 = "d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837"; md5 = ""; - md5name = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a-language-subtag-registry-2021-03-05.tar.bz2"; + md5name = "d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837-language-subtag-registry-2021-12-29.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -560,25 +553,25 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.30.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz"; - sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8"; + name = "xmlsec1-1.2.32.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.32.tar.gz"; + sha256 = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043"; md5 = ""; - md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; + md5name = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043-xmlsec1-1.2.32.tar.gz"; } { - name = "libxml2-2.9.12.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz"; - sha256 = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"; + name = "libxml2-2.9.13.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.13.tar.xz"; + sha256 = "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e"; md5 = ""; - md5name = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92-libxml2-2.9.12.tar.gz"; + md5name = "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e-libxml2-2.9.13.tar.xz"; } { - name = "libxslt-1.1.34.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; - sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; + name = "libxslt-1.1.35.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.35.tar.xz"; + sha256 = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79"; md5 = ""; - md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; + md5name = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79-libxslt-1.1.35.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -623,11 +616,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.17.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz"; - sha256 = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c"; + name = "libmwaw-0.3.19.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.19.tar.xz"; + sha256 = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af"; md5 = ""; - md5name = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c-libmwaw-0.3.17.tar.xz"; + md5name = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af-libmwaw-0.3.19.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -651,11 +644,11 @@ md5name = "07a9e5b70f121a62706140d4cacc3006d3efb869da40f3a2bf7a65d37847f4d9-nss-3.73-with-nspr-4.32.tar.gz"; } { - name = "libodfgen-0.1.6.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; - sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; + name = "libodfgen-0.1.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz"; + sha256 = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625"; md5 = ""; - md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; + md5name = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625-libodfgen-0.1.8.tar.xz"; } { name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; @@ -672,11 +665,11 @@ md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { - name = "openldap-2.4.45.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; - sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; + name = "openldap-2.4.59.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz"; + sha256 = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34"; md5 = ""; - md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; + md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; } { name = "openssl-1.1.1l.tar.gz"; @@ -693,13 +686,6 @@ md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2"; } { - name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - url = "https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; - md5 = ""; - md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - } - { name = "libpagemaker-0.0.4.tar.xz"; url = "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"; @@ -707,11 +693,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-4306.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2"; - sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8"; + name = "pdfium-4500.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-4500.tar.bz2"; + sha256 = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304"; md5 = ""; - md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2"; + md5name = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304-pdfium-4500.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -728,32 +714,32 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-21.01.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz"; - sha256 = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3"; + name = "poppler-21.11.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-21.11.0.tar.xz"; + sha256 = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584"; md5 = ""; - md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz"; + md5name = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584-poppler-21.11.0.tar.xz"; } { - name = "postgresql-13.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2"; - sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f"; + name = "poppler-data-0.4.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.10.tar.gz"; + sha256 = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30"; md5 = ""; - md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2"; + md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz"; } { - name = "Python-3.8.8rc1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.8rc1.tar.xz"; - sha256 = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6"; + name = "postgresql-13.5.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2"; + sha256 = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3"; md5 = ""; - md5name = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6-Python-3.8.8rc1.tar.xz"; + md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2"; } { - name = "QR-Code-generator-1.4.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; - sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a"; + name = "Python-3.8.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.10.tar.xz"; + sha256 = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9"; md5 = ""; - md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz"; + md5name = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9-Python-3.8.10.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -798,18 +784,18 @@ md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { - name = "serf-1.2.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; - sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; + name = "serf-1.3.9.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/serf-1.3.9.tar.bz2"; + sha256 = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc"; md5 = ""; - md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; + md5name = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc-serf-1.3.9.tar.bz2"; } { - name = "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; - sha256 = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301"; + name = "skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; + sha256 = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d"; md5 = ""; - md5name = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301-skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; + md5name = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d-skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -888,4 +874,11 @@ md5 = ""; md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } + { + name = "zxing-cpp-1.1.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.1.1.tar.gz"; + sha256 = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86"; + md5 = ""; + md5name = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86-zxing-cpp-1.1.1.tar.gz"; + } ] diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 186f4b17d6aaa..75fb085b9c91c 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -3,11 +3,46 @@ attrs: { postConfigure = attrs.postConfigure + '' sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx + sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx + sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx + sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx + sed -e '/CPPUNIT_TEST(test);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testConditionalFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF16LErtlSHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256ODF12);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256W3C);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_XL_SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testColorScaleExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testDataBarExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testNamedRangeBugfdo62729);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRichTextExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testFormulaRefSheetNameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellValuesExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellNoteExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedChartODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellAnchoredGroupXLS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCeilingFloorODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRelativePathsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testSheetProtectionODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testSwappedOutImageExport);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testLinkedGraphicRT);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testImageWithSpecialID);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testAbsNamedRangeHTML);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testMoveCellAnchoredShapesODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRefStringUnspecified);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHeaderImageODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testTdf88657ODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testExponentWithoutSignFormatXLSX);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHiddenRepeatedRowsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHyperlinkTargetFrameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' ''; configureFlags = attrs.configureFlags ++ [ (lib.enableFeature kdeIntegration "kf5") - "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar" - "--without-system-qrcodegen" + "--without-system-zxing" ]; - patches = attrs.patches or [] ++ [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2 + + patches = attrs.patches or []; } diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index 83179f2a136af..52226fdc2d931 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -7,9 +7,9 @@ rec { }; major = "7"; - minor = "1"; - patch = "8"; - tweak = "1"; + minor = "2"; + patch = "6"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "sha256-TGcR2/TSQJOjq7G1vXSa4MaEA6fG95rHVZfnjoiqeJM="; + sha256 = "sha256-SDdlqYuS2Q6MjHNeCNM8KjS1/h+8jn9rH5x0rRoUHjE="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "sha256-jy5dUzKCEBYiTXh6dBwgdfW1Ok5l1iDGyL13icQHWEM="; + sha256 = "sha256-fUZflmrCi4mOa6iZTm+K9IvRTlSjcI4UJ4EoyK/HHck="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "sha256-tr2hmCeRRyft03Nfk8afSaurCV6DJSYuxKo4GPK/It4="; + sha256 = "sha256-TjAgz7yV7y5VNrEuT2eElkNGZzh6J58T1TC3u2Ap2o4="; }; } diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index 08b01a4a051bd..fd9ef63dc73fd 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -1,19 +1,32 @@ -{ libreoffice, runCommand, dbus, bash }: -let - jdk = libreoffice.jdk; -in -(runCommand libreoffice.name { - inherit dbus libreoffice jdk bash; -} '' +{ lib, runCommand +, libreoffice, dbus, bash, substituteAll +, dolphinTemplates ? true +}: +runCommand libreoffice.name { + inherit (libreoffice) jdk meta; + inherit dbus libreoffice bash; +} ('' mkdir -p "$out/bin" - ln -s "${libreoffice}/share" "$out/share" substituteAll "${./wrapper.sh}" "$out/bin/soffice" chmod a+x "$out/bin/soffice" for i in $(ls "${libreoffice}/bin/"); do test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")" done -'') // { - inherit libreoffice dbus; - meta = libreoffice.meta; -} + + mkdir -p "$out/share" + ln -s "${libreoffice}/share"/* $out/share +'' + lib.optionalString dolphinTemplates '' + # Add templates to dolphin "Create new" menu - taken from debian + + # We need to unpack the core source since the necessary files aren't available in the libreoffice output + unpackFile "${libreoffice.src}" + + install -D "${libreoffice.name}"/extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source" + + cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop + cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop + cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop + cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop +'') + diff --git a/pkgs/applications/office/libreoffice/xdg-open-brief.patch b/pkgs/applications/office/libreoffice/xdg-open-brief.patch deleted file mode 100644 index 0a2f02e71fedc..0000000000000 --- a/pkgs/applications/office/libreoffice/xdg-open-brief.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh -index 4519e01f26e2..8985711a2c01 100755 ---- a/shell/source/unix/misc/senddoc.sh -+++ b/shell/source/unix/misc/senddoc.sh -@@ -393,6 +393,8 @@ case `basename "$MAILER" | sed 's/-.*$//'` in - MAILER=/usr/bin/kde-open - elif [ -x /usr/bin/xdg-open ] ; then - MAILER=/usr/bin/xdg-open -+ elif type -p xdg-open >/dev/null 2>&1 ; then -+ MAILER="$(type -p xdg-open)" - else - echo "Unsupported mail client: `basename $MAILER | sed 's/-.*^//'`" - exit 2 diff --git a/pkgs/applications/office/paperless-ng/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index ab140f90ceda9..17a1a56b769ae 100644 --- a/pkgs/applications/office/paperless-ng/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -18,16 +18,6 @@ let py = python3.override { packageOverrides = self: super: { django = super.django_3; - # Avoid warning in django-q versions > 1.3.4 - # https://github.com/jonaswinkler/paperless-ng/issues/857 - # https://github.com/Koed00/django-q/issues/526 - django-q = super.django-q.overridePythonAttrs (oldAttrs: rec { - version = "1.3.4"; - src = oldAttrs.src.override { - inherit version; - sha256 = "Uj1U3PG2YVLBtlj5FPAO07UYo0MqnezUiYc4yo274Q8="; - }; - }); # Incompatible with aioredis 2 aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec { @@ -43,30 +33,16 @@ let path = lib.makeBinPath [ ghostscript imagemagick jbig2enc optipng pngquant qpdf tesseract4 unpaper ]; in py.pkgs.pythonPackages.buildPythonApplication rec { - pname = "paperless-ng"; - version = "1.5.0"; + pname = "paperless-ngx"; + version = "1.6.0"; src = fetchurl { - url = "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-${version}/${pname}-${version}.tar.xz"; - sha256 = "oVSq0AWksuWC81MF5xiZ6ZbdKKtqqphmL+xIzJLaDMw="; + url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/ngx-${version}/${pname}-${version}.tar.xz"; + sha256 = "07mrxbwahkm00n9nvssd6d13p80w333g84cd38bzp0l34nzim5zl"; }; - patches = [ - # Fix the `slow_write_pdf` test: - # https://github.com/NixOS/nixpkgs/issues/136626 - (fetchpatch { - url = "https://github.com/paperless-ngx/paperless-ngx/commit/4fbabe43ea12811864e9676b04d82a82b38e799d.patch"; - sha256 = "sha256-8ULep5aeW3wJAQGy2OEAjFYybELNq1DzCC1uBrZx36I="; - }) - ]; - format = "other"; - # Make bind address configurable - postPatch = '' - substituteInPlace gunicorn.conf.py --replace "bind = '0.0.0.0:8000'" "" - ''; - propagatedBuildInputs = with py.pkgs.pythonPackages; [ aioredis arrow @@ -130,7 +106,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { python-dotenv python-gnupg python-Levenshtein - python_magic + python-magic pytz pyyaml redis @@ -146,7 +122,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { threadpoolctl tika tqdm - twisted.extras.tls + twisted.extras-require.tls txaio tzlocal urllib3 @@ -161,11 +137,17 @@ py.pkgs.pythonPackages.buildPythonApplication rec { zope_interface ]; + # Compile manually because `pythonRecompileBytecodeHook` only works for + # files in `python.sitePackages` + postBuild = '' + ${py.interpreter} -OO -m compileall src + ''; + installPhase = '' mkdir -p $out/lib - cp -r . $out/lib/paperless-ng - chmod +x $out/lib/paperless-ng/src/manage.py - makeWrapper $out/lib/paperless-ng/src/manage.py $out/bin/paperless-ng \ + cp -r . $out/lib/paperless-ngx + chmod +x $out/lib/paperless-ngx/src/manage.py + makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix PATH : "${path}" ''; @@ -200,13 +182,13 @@ py.pkgs.pythonPackages.buildPythonApplication rec { pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; inherit path; - tests = { inherit (nixosTests) paperless-ng; }; + tests = { inherit (nixosTests) paperless; }; }; meta = with lib; { description = "A supercharged version of paperless: scan, index, and archive all of your physical documents"; - homepage = "https://paperless-ng.readthedocs.io/en/latest/"; + homepage = "https://paperless-ngx.readthedocs.io/en/latest/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ earvstedt Flakebi ]; + maintainers = with maintainers; [ lukegb ]; }; } diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index f80f40929a19a..81fc8c075f1c9 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -138,7 +138,7 @@ python3Packages.buildPythonApplication rec { passthru.updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl common-updater-scripts - version=$(list-git-tags https://gitlab.gnome.org/World/OpenPaperwork/paperwork.git | sed 's/^v//' | sort -V | tail -n1) + version=$(list-git-tags | sed 's/^v//' | sort -V | tail -n1) update-source-version paperwork "$version" --file=pkgs/applications/office/paperwork/src.nix docs_version="$(curl https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/raw/$version/paperwork-gtk/src/paperwork_gtk/model/help/screenshot.sh | grep TEST_DOCS_TAG= | cut -d'"' -f2)" update-source-version paperwork.sample_docs "$docs_version" --file=pkgs/applications/office/paperwork/src.nix --version-key=rev diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index ecabdb85a93c8..653e72a163eb3 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.56.5"; + version = "0.57.2"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-g/MjOrivqbZ93iSs5mLQT36gn72KCJEOgEssBZER+TA="; + sha256 = "sha256-ftLKlNzr46iL/V+P3J1wtoUByGHHl7wrh4xctU4JYkM="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "A simple tool to calculate the overall performance of an investment portfolio"; homepage = "https://www.portfolio-performance.info/"; license = licenses.epl10; - maintainers = with maintainers; [ elohmeier oyren ]; + maintainers = with maintainers; [ elohmeier oyren shawn8901 ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index b40085e852932..3fd9c3410693a 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.3.4"; + version = "22.5.0"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "bec1ee9735821a7c4556c00790e3acfef06f21490ec8b7d99d9e002c9c0a1207"; + sha256 = "52a81401a4a03c77e28f37f56c3ebdc6696ff43c75cc9330d10ba7e801f48ccd"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 754c9ba03d4eb..d3f706bbf0549 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -84,6 +84,11 @@ mkDerivation rec { url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch"; sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ="; }) + # For Poppler 22.04 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch"; + sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/office/shelf/default.nix b/pkgs/applications/office/shelf/default.nix new file mode 100644 index 0000000000000..7ad3b915188c1 --- /dev/null +++ b/pkgs/applications/office/shelf/default.nix @@ -0,0 +1,58 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, applet-window-buttons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, mauikit-filebrowsing +, mauikit-texteditor +, qtmultimedia +, qtquickcontrols2 +, poppler +}: + +mkDerivation rec { + pname = "shelf"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "shelf"; + rev = "v${version}"; + sha256 = "sha256-0a5UHrYrkLR35cezjin+K9cTk3+aLeUAkvBbmKMK61w="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + applet-window-buttons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + mauikit-filebrowsing + mauikit-texteditor + qtmultimedia + qtquickcontrols2 + poppler + ]; + + meta = with lib; { + description = "Document and EBook collection manager"; + homepage = "https://invent.kde.org/maui/shelf"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/office/teapot/default.nix b/pkgs/applications/office/teapot/default.nix index 62a48cebf19b2..d2d44511bc63f 100644 --- a/pkgs/applications/office/teapot/default.nix +++ b/pkgs/applications/office/teapot/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchzip +, fetchFromGitHub , cmake , libtirpc , ncurses @@ -10,12 +10,18 @@ stdenv.mkDerivation rec { pname = "teapot"; version = "2.3.0"; - src = fetchzip { + src = fetchFromGitHub { name = "${pname}-${version}"; - url = "https://www.syntax-k.de/projekte/teapot/${pname}-${version}.tar.gz"; - sha256 = "sha256-wzAwZwOMeTsuR5LhfjspGdejT6X1V8YJ8B7v9pcbxaY="; + owner = "museoa"; + repo = pname; + rev = version; + hash = "sha256-38XFjRzOGasr030f+mRYT+ptlabpnVJfa+1s7ZAjS+k="; }; + prePatch = '' + cd src + ''; + patches = [ # include a local file in order to make cc happy ./001-fix-warning.patch @@ -41,8 +47,8 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://www.syntax-k.de/projekte/teapot/"; - description = "Table Editor And Planner, Or: Teapot!"; + inherit (src.meta) homepage; + description = "Table Editor And Planner, Or: Teapot"; longDescription = '' Teapot is a compact spreadsheet software originally written by Michael Haardt. It features a (n)curses-based text terminal interface, and @@ -70,4 +76,4 @@ stdenv.mkDerivation rec { }; } # TODO: patch/fix FLTK building -# TODO: add documentation from +# TODO: add documentation diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 477ae48b5f4bf..aa591c225ad06 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -7,35 +7,30 @@ }: let - version = "3.9.1"; + version = "4.8.0"; pname = "timeular"; - name = "${pname}-${version}"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "103hy443p697jdkz6li8s1n6kg1r55jmiw2vbjz12kskf7njg4y4"; + sha256 = "sha256:0y2asw3jf2n4c7y0yr669jfqw4frp5nzzv3lffimfdr78gihma66"; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; - - profile = '' - export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - ''; + inherit pname version src; extraPkgs = pkgs: with pkgs; [ libsecret ]; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} + mv $out/bin/{${pname}-${version},${pname}} install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png substituteInPlace $out/share/applications/timeular.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace "Exec=AppRun --no-sandbox %U" "Exec=$out/bin/${pname}" ''; meta = with lib; { diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index 0e06cf2f65a1c..fbeea83996278 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -23,6 +23,7 @@ in stdenv.mkDerivation { description = "Simple plaintext todo list manager"; homepage = "http://todotxt.com"; license = lib.licenses.gpl3; + mainProgram = "todo.sh"; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index c73c0b87c0c15..9e2752e163f05 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.50.2"; + version = "0.51.2"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "0fljza5afpjxgrzgskjhs7w86aa51d88xzv2h43666638j3c5mvk"; + sha256 = "17bqcnpvflpi5dlz9m294diwd6as5wha5jcv9a3qvhh4pq0nyr4z"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "0jqpi1gc48jxvc68yzx80jp553haihybj3g3c5ymvqmgivwn7n4c"; + sha256 = "0jjvg75a4va5d81x8dvpzmzax7p0bqd7psv0alkkl13m91gai6ig"; }; in { diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/applications/office/tusk/default.nix index 5bfc8ebc97039..f23e88a323c23 100644 --- a/pkgs/applications/office/tusk/default.nix +++ b/pkgs/applications/office/tusk/default.nix @@ -21,7 +21,8 @@ let }; in appimageTools.wrapType2 rec { - name = "${pname}-v${version}"; + inherit pname version; + src = fetchurl { url = "https://github.com/klaussinani/tusk/releases/download/v${version}/${pname}-${version}-x86_64.AppImage"; sha256 = "02q7wsnhlyq8z74avflrm7805ny8fzlmsmz4bmafp4b4pghjh5ky"; @@ -36,7 +37,7 @@ in appimageTools.wrapType2 rec { multiPkgs = null; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} + mv $out/bin/{${pname}-${version},${pname}} mkdir "$out/share" ln -s "${desktopItem}/share/applications" "$out/share/" ''; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 749b6959b7409..7baac9f35fd6a 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0"; + version = "6.0.4"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "0zkgmmflcj6vbyv8rs51jf3vx1zq8pl7b5d5asgayhrdlwi0qgff"; + sha256 = "sha256-KPvsyN3qpnG8/qRwTlWe2mZWnI9OfxlHu6OUubItJZc="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index 5df1d93f9c829..4c0bcfb4ed38e 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub +, fetchpatch , avahi , cups , gnutls @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-FsmR0fFb9bU9G3oUyJU1eDLcoZ6OQ2//TINlPrW6lU0="; }; + patches = [ + (fetchpatch { + name = "file-offset-bits-64-linux.patch"; + url = "https://github.com/michaelrsweet/pappl/commit/7ec4ce4331b6637c54a37943269e05d15ff6dd47.patch"; + sha256 = "sha256-x5lriopWw6Mn2qjv19flsleEzPMHU4jYWRy0y6hTL5k="; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index 7e346bcbf8484..23b64e124c553 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -1,34 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, +{ lib, stdenv, fetchFromGitHub, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, pkg-config, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: stdenv.mkDerivation rec { pname = "cubicsdr"; - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitHub { owner = "cjcliffe"; repo = "CubicSDR"; rev = version; - sha256 = "1ihbn18bzdcdvwpa4hnb55ns38bj4b8xy53hkmra809f9qpbcjhn"; + sha256 = "0cyv1vk97x4i3h3hhh7dx8mv6d1ad0fypdbx5fl26bz661sr8j2n"; }; - # Allow cubicsdr 0.2.5 to build with wxGTK 3.1.3 - # these come from cubicsdr's master branch, subsequent releases may include them - patches = [ - (fetchpatch { - url = "https://github.com/cjcliffe/CubicSDR/commit/65a160fa356ce9665dfe05c6bfc6754535e16743.patch"; - sha256 = "0vbr5x9fnm09bws5crqcm6kkhr1bg5r0bc1pxnwwjyc6jpvqi6ad"; - }) - (fetchpatch { - url = "https://github.com/cjcliffe/CubicSDR/commit/f449a65457e35bf8260d0b16b8a47b6bc0ea2c7e.patch"; - sha256 = "1zjvjmhm8ybi6i9pq7by3fj3mvx37dy7gj4gk23d79yrnl9mk25p"; - }) - (fetchpatch { - url = "https://github.com/cjcliffe/CubicSDR/commit/0540d08c2dea79b668b32b1a6d58f235d65ce9d2.patch"; - sha256 = "07l7b82f779sbcj0jza0mg463ac1153bs9hn6ai388j7dm3lvasn"; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ]; @@ -44,4 +27,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/applications/radio/flex-ncat/default.nix index dee9f29da73f5..95c61dabf78ca 100644 --- a/pkgs/applications/radio/flex-ncat/default.nix +++ b/pkgs/applications/radio/flex-ncat/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { description = "FlexRadio remote control (CAT) via hamlib/rigctl protocol"; license = licenses.mit; maintainers = with maintainers; [ mvs ]; + mainProgram = "nCAT"; }; } diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix index 8be72ef3d6b50..9e29249c06591 100644 --- a/pkgs/applications/radio/flex-ndax/default.nix +++ b/pkgs/applications/radio/flex-ndax/default.nix @@ -1,19 +1,19 @@ -{ lib, buildGoModule, fetchFromGitHub, pulseaudio }: +{ lib, buildGoModule, fetchFromGitHub, libpulseaudio }: buildGoModule rec { pname = "flex-ndax"; - version = "0.2-20211111.0"; + version = "0.2-20220427"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nDAX"; rev = "v${version}"; - sha256 = "0m2hphj0qvgq25pfm3s76naf672ll43jv7gll8cfs7276ckg1904"; + hash = "sha256-KmvTLfGC6xzXcWYAzmBYiYSF65lqMdsdMQjUEk3siqc="; }; - buildInputs = [ pulseaudio ]; + buildInputs = [ libpulseaudio ]; - vendorSha256 = "1bf0iidb8ggzahy3fvxispf3g940mv6vj9wqd8i3rldc6ca2i3pf"; + vendorSha256 = "sha256-u/5LiVo/ZOefprEKr/L1+3+OfYb0a4wq+CWoUjYNvzg="; meta = with lib; { homepage = "https://github.com/kc2g-flex-tools/nDAX"; diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index c927d77bef44b..43f223980178d 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -3,21 +3,23 @@ , fetchurl , fltk13 , libjpeg +, eudev , pkg-config }: stdenv.mkDerivation rec { - version = "1.3.54"; + version = "1.4.5"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "sha256-zw0xi4AVnm8Vi/oWkh13C9BjabOKUtZaVmLN++zKGug="; + sha256 = "sha256-Zj/LkP1nSm1zLKLxuGfaKuVuP8jaVlvK/TzX504VKHk="; }; buildInputs = [ fltk13 libjpeg + eudev ]; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 383c5710808f5..6aac0112f9614 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , armadillo , cmake , gmp @@ -20,13 +21,13 @@ gnuradio.pkgs.mkDerivation rec { pname = "gnss-sdr"; - version = "0.0.16"; + version = "0.0.17"; src = fetchFromGitHub { owner = "gnss-sdr"; repo = "gnss-sdr"; rev = "v${version}"; - sha256 = "sha256-ODe4k6PDGtDX11FrbggEbN3tc4UtATaItUIpCKl4JjM="; + sha256 = "sha256-0aAjkrVAswoRL/KANBSZ5Jq4Y9VwOHZKUKLpXDdKtk8="; }; patches = [ diff --git a/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch b/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch index cfeb0bd416b40..46925e741a1c2 100644 --- a/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch +++ b/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch @@ -1,6 +1,6 @@ ---- a/CMakeLists.txt 1970-01-01 08:00:01.000000000 +0800 -+++ b/CMakeLists.txt 2022-02-16 20:41:53.725290020 +0800 -@@ -1214,7 +1214,7 @@ +--- i/CMakeLists.txt ++++ w/CMakeLists.txt +@@ -1210,7 +1210,7 @@ if(NOT VOLKGNSSSDR_FOUND) BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN> @@ -9,16 +9,16 @@ DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" -@@ -1247,7 +1247,7 @@ - ) - set(VOLK_GNSSSDR_BUILD_BYPRODUCTS - ${VOLK_GNSSSDR_BUILD_BYPRODUCTS} -- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} -+ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} - ) +@@ -1248,7 +1248,7 @@ if(NOT VOLKGNSSSDR_FOUND) + ) + set(VOLK_GNSSSDR_BUILD_BYPRODUCTS + ${VOLK_GNSSSDR_BUILD_BYPRODUCTS} +- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} ++ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} + ) + endif() endif() - ExternalProject_Add(volk_gnsssdr_module -@@ -1256,7 +1256,7 @@ +@@ -1261,7 +1261,7 @@ if(NOT VOLKGNSSSDR_FOUND) BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN> @@ -27,7 +27,7 @@ DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" -@@ -1271,7 +1271,7 @@ +@@ -1280,7 +1280,7 @@ if(NOT VOLKGNSSSDR_FOUND) BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN> @@ -36,9 +36,9 @@ DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" -@@ -1310,7 +1310,7 @@ +@@ -1319,7 +1319,7 @@ if(NOT VOLKGNSSSDR_FOUND) if(CMAKE_VERSION VERSION_GREATER 3.0 AND SUPPORTED_CPU_FEATURES_ARCH) - if(NOT CpuFeatures_FOUND) + if(NOT CPUFEATURES_FOUND AND ENABLE_CPUFEATURES) set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES - INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} + INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 638064bbd0729..989722fdc3ecd 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -46,13 +46,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "5"; + minor = "6"; patch = "0"; } }: let - sourceSha256 = "sha256-TWCXLoS+ImKNd2zkxMks4FXsQMvGKgcW5/MW8S1Y1TY="; + sourceSha256 = "sha256-0JODgv9MNOkHDQYTVCZMzjr/G542+NvGP9wlH9iwLeg="; featuresInfo = { # Needed always basic = { @@ -134,6 +134,12 @@ let ]; cmakeEnableFlag = "GRC"; }; + jsonyaml_blocks = { + pythonRuntime = [ + python.pkgs.jsonschema + ]; + cmakeEnableFlag = "JSONYAML_BLOCKS"; + }; gr-blocks = { cmakeEnableFlag = "GR_BLOCKS"; }; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index eef1960ae1f48..14a4763259fa9 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -48,13 +48,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.10"; - minor = "1"; - patch = "1"; + minor = "2"; + patch = "0"; } }: let - sourceSha256 = "sha256-vsAK+GQzcpA9Vsa6q4RFEzVpbF7/+yZkMsemKn6VhIg="; + sourceSha256 = "sha256-WcfmW39wHhFdpbdBSjOfuDkxL8/fuMjjJoLUyCUud/o="; featuresInfo = { # Needed always basic = { @@ -136,6 +136,12 @@ let ]; cmakeEnableFlag = "GRC"; }; + jsonyaml_blocks = { + pythonRuntime = [ + python.pkgs.jsonschema + ]; + cmakeEnableFlag = "JSONYAML_BLOCKS"; + }; gr-blocks = { cmakeEnableFlag = "GR_BLOCKS"; }; @@ -221,6 +227,7 @@ let setuptools click click-plugins + pygccxml ]; cmakeEnableFlag = "GR_MODTOOL"; }; diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 6765c877437b2..57d8f75320bb2 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -137,8 +137,8 @@ let self = if doWrap then stdenv.mkDerivation { inherit pname version passthru; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - makeWrapper xorg.lndir ]; buildCommand = '' diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 28be25920a459..d138dd350c04c 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -23,13 +23,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradio3_8Minimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.15.8"; + version = "2.15.9"; src = fetchFromGitHub { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - sha256 = "sha256-RxwkiJdPHWyhU3azSpWV2M0tG5GInQBpc/ls16V1B94="; + sha256 = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index 4fe9ad0867814..b463faa4a255d 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "kalibrate-rtl"; - version = "unstable-2013-12-14"; + version = "unstable-2022-02-02"; src = fetchFromGitHub { owner = "steve-m"; repo = "kalibrate-rtl"; - rev = "aae11c8a8dc79692a94ccfee39ba01e8c8c05d38"; - sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn"; + rev = "340003eb0846b069c3edef19ed3363b8ac7b5215"; + sha256 = "n9mfu8H2OS8dKPNhtJxBfMDp8aHEIcxg/R+kcRNOBpk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -26,7 +26,8 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/steve-m/kalibrate-rtl"; license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; + maintainers = with maintainers; [ bjornfor viraptor ]; + mainProgram = "kal"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/applications/radio/rtl-ais/default.nix index 243d3126b5f4b..c244868f65d89 100644 --- a/pkgs/applications/radio/rtl-ais/default.nix +++ b/pkgs/applications/radio/rtl-ais/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { homepage = "https://github.com/dgiardini/rtl-ais"; license = licenses.gpl2Plus; maintainers = with maintainers; [ mgdm ]; + mainProgram = "rtl_ais"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index ff06eb4c04478..e7fbb50cfd086 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchgit +, fetchFromGitHub , cmake , pkg-config , libusb1 @@ -8,12 +8,13 @@ stdenv.mkDerivation rec { pname = "rtl-sdr"; - version = "0.6.0"; + version = "0.8.0"; - src = fetchgit { - url = "git://git.osmocom.org/rtl-sdr.git"; - rev = "refs/tags/${version}"; - sha256 = "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k"; + src = fetchFromGitHub { + owner = "librtlsdr"; + repo = "librtlsdr"; + rev = "v${version}"; + sha256 = "1fgxlkgmdchbrf0nn98ivjr6css5hak3608nr4xrf2qzf7xy2kdk"; }; postPatch = '' @@ -28,7 +29,10 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; - cmakeFlags = lib.optional stdenv.isLinux "-DINSTALL_UDEV_RULES=ON"; + cmakeFlags = lib.optional stdenv.isLinux [ + "-DINSTALL_UDEV_RULES=ON" + "-DWITH_RPC=ON" + ]; meta = with lib; { description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 54dfe21ce04e6..e04a8a907d191 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, fetchpatch , libusb1, rtl-sdr, soapysdr-with-plugins }: @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-KoDKyI7KDdGSe79ZTuL9ObKnOJsqTN4wrMq+/cvQ/Xk="; }; + patches = [( fetchpatch { + name = "CVE-2022-27419"; + url = "https://github.com/merbanan/rtl_433/commit/37455483889bd1c641bdaafc493d1cc236b74904.patch"; + sha256 = "172jndh8x5nlcbx2jp5y8fgfxsawwfz95037pcjp170gf93ijy88"; + })]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ]; @@ -23,7 +29,7 @@ stdenv.mkDerivation rec { description = "Decode traffic from devices that broadcast on 433.9 MHz, 868 MHz, 315 MHz, 345 MHz and 915 MHz"; homepage = "https://github.com/merbanan/rtl_433"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ earldouglas ]; + maintainers = with maintainers; [ earldouglas markuskowa ]; platforms = platforms.all; }; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 79dcab19acb42..1e5052d4f9bed 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation { done # Needed for at least the remote plugin server for file in $out/bin/*; do - wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${extraPackagesSearchPath} + wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.escapeShellArg extraPackagesSearchPath} done ''; @@ -51,6 +51,7 @@ in stdenv.mkDerivation { description = "Vendor and platform neutral SDR support library"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; + mainProgram = "SoapySDRUtil"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 2928b19f29df2..6fa8462ec10c0 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { # and xxx.yyy.zzz. Hrmpf... style keeps changing version = "4.1.0.5"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix index 3802f2bada86d..3364cbf6f0c21 100644 --- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix +++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { description = "A Java-based tool for generating EPS files for constructing astrolabes and related tools"; license = licenses.gpl3; maintainers = [ ]; + mainProgram = "AstrolabeGenerator"; platforms = platforms.all; }; } diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 7b5f28fbd8484..df73df2ec284a 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-scG/SS9emEmrZunv6n3Vzcchoh0Cf9rDOkuxAMnxNk4="; + sha256 = "sha256-zDYZBV/76BDWWfiug0fFvMe3pdE4xfKgSmVJJd3Qu9Y="; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; diff --git a/pkgs/applications/science/biology/bayescan/default.nix b/pkgs/applications/science/biology/bayescan/default.nix index 043ee3ca52de0..cd5bb3210364e 100644 --- a/pkgs/applications/science/biology/bayescan/default.nix +++ b/pkgs/applications/science/biology/bayescan/default.nix @@ -29,11 +29,14 @@ stdenv.mkDerivation rec { cp -r ../*pdf ../input_examples ../"R functions" $out/share/doc/bayescan ''; + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + meta = with lib; { description = "Detecting natural selection from population-based genetic data"; homepage = "http://cmpg.unibe.ch/software/BayeScan"; license = licenses.gpl3; maintainers = [ maintainers.bzizou ]; + mainProgram = "bayescan_${version}"; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index 15e1b3eb9891b..eb94a06944e50 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "blast"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz"; - sha256 = "122bf45cyj3s3zv2lw1y1rhz7g22v0va560ai30xdjl8sk4wk8zx"; + sha256 = "sha256-iVU3FNEz2vKMR3+D0zN5Szxi5BSECMByobRiDl7E/rI="; }; sourceRoot = "ncbi-blast-${version}+-src/c++"; diff --git a/pkgs/applications/science/biology/bowtie/default.nix b/pkgs/applications/science/biology/bowtie/default.nix index 81cdaecf2c1cd..ccb797d8a227e 100644 --- a/pkgs/applications/science/biology/bowtie/default.nix +++ b/pkgs/applications/science/biology/bowtie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib }: stdenv.mkDerivation rec { pname = "bowtie"; @@ -11,6 +11,26 @@ stdenv.mkDerivation rec { sha256 = "sha256-mWItmrTMPst/NnzSpxxTHcBztDqHPCza9yOsZPwp7G4="; }; + patches = [ + # Without this patch, compiling with clang on an M1 Mac fails because + # 'cpuid.h' is included. It only works on x86 and throws an error. + (fetchpatch { + name = "fix_compilation_on_arm64"; + url = "https://github.com/BenLangmead/bowtie/commit/091d72f4cb69ca0713704d38bd7f9b37e6c4ff2d.patch"; + sha256 = "sha256-XBvgICUBnE5HKpJ36IHTDiKjJgLFKETsIaJC46uN+2I="; + }) + + # Without this patch, compilation adds the current source directory to the + # include search path, and #include <version> in standard library code can + # end up picking the unrelated VERSION source code file on case-insensitive + # file systems. + (fetchpatch { + name = "fix_include_search_path"; + url = "https://github.com/BenLangmead/bowtie/commit/c208b9db936eab0bc3ffdf0182b4f59a9017a1c4.patch"; + sha256 = "sha256-772EE+oWFWXssSMabPryb0AfIS1tC10mPTRCBm7RrUs="; + }) + ]; + buildInputs = [ zlib ]; installFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index a2a11b1d4517f..801ad00876bf5 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, zlib }: stdenv.mkDerivation rec { pname = "bwa"; @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1zfhv2zg9v1icdlq4p9ssc8k01mca5d1bd87w71py2swfi74s6yy"; }; + patches = [ + # Pull upstream patch for -fno-common toolchain support like upstream + # gcc-10: https://github.com/lh3/bwa/pull/267 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/lh3/bwa/commit/2a1ae7b6f34a96ea25be007ac9d91e57e9d32284.patch"; + sha256 = "1lihfxai6vcshv5vr3m7yhk833bdivkja3gld6ilwrc4z28f6wqy"; + }) + ]; + buildInputs = [ zlib ]; # Avoid hardcoding gcc to allow environments with a different @@ -17,6 +27,8 @@ stdenv.mkDerivation rec { sed -i '/^CC/d' Makefile ''; + makeFlags = lib.optional stdenv.hostPlatform.isStatic "AR=${stdenv.cc.targetPrefix}ar"; + # it's unclear which headers are intended to be part of the public interface # so we may find ourselves having to add more here over time installPhase = '' diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/applications/science/biology/clustal-omega/default.nix index 6377e1fce855d..6a39a889f55fb 100644 --- a/pkgs/applications/science/biology/clustal-omega/default.nix +++ b/pkgs/applications/science/biology/clustal-omega/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { homepage = "http://www.clustal.org/omega/"; license = licenses.gpl2; maintainers = [ maintainers.bzizou ]; + mainProgram = "clustalo"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index b6286d11c8cbd..36db47ad168a7 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = [ + "-std=c++11" + (lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing") + ]; meta = with lib; { description = "Computational Morphometry Toolkit "; diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index 36dddad5db5ac..90eef027a8425 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -1,10 +1,26 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, substituteAll , cmake +, openjpeg , libyamlcpp -, git +, batchVersion ? false +, withJpegLs ? true +, withOpenJpeg ? true +, withCloudflareZlib ? true }: +let + cloudflareZlib = fetchFromGitHub { + owner = "ningfei"; + repo = "zlib"; + # HEAD revision of the gcc.amd64 branch on 2022-04-14. Reminder to update + # whenever bumping package version. + rev = "fda61188d1d4dcd21545c34c2a2f5cc9b0f5db4b"; + sha256 = "sha256-qySFwY0VI2BQLO2XoCZeYshXEDnHh6SmJ3MvcBUROWU="; + }; +in stdenv.mkDerivation rec { version = "1.0.20211006"; pname = "dcm2niix"; @@ -16,18 +32,37 @@ stdenv.mkDerivation rec { sha256 = "sha256-fQAVOzynMdSLDfhcYWcaXkFW/mnv4zySGLVJNE7ql/c="; }; - nativeBuildInputs = [ cmake git ]; - buildInputs = [ libyamlcpp ]; + patches = lib.optionals withCloudflareZlib [ + (substituteAll { + src = ./dont-fetch-external-libs.patch; + inherit cloudflareZlib; + }) + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals batchVersion [ libyamlcpp ] + ++ lib.optionals withOpenJpeg [ openjpeg openjpeg.dev ]; + + cmakeFlags = lib.optionals batchVersion [ + "-DBATCH_VERSION=ON" + "-DYAML-CPP_DIR=${libyamlcpp}/lib/cmake/yaml-cpp" + ] ++ lib.optionals withJpegLs [ + "-DUSE_JPEGLS=ON" + ] ++ lib.optionals withOpenJpeg [ + "-DUSE_OPENJPEG=ON" + "-DOpenJPEG_DIR=${openjpeg}/lib/${openjpeg.pname}-${lib.versions.majorMinor openjpeg.version}" + ] ++ lib.optionals withCloudflareZlib [ + "-DZLIB_IMPLEMENTATION=Cloudflare" + ]; meta = with lib; { description = "DICOM to NIfTI converter"; longDescription = '' - dcm2niix is a designed to convert neuroimaging data from the - DICOM format to the NIfTI format. + dcm2niix is designed to convert neuroimaging data from the DICOM format to the NIfTI format. ''; homepage = "https://www.nitrc.org/projects/dcm2nii"; license = licenses.bsd3; - maintainers = [ maintainers.ashgillman ]; + maintainers = with maintainers; [ ashgillman rbreslow ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch b/pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch new file mode 100644 index 0000000000000..493f0fb11f461 --- /dev/null +++ b/pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch @@ -0,0 +1,36 @@ +diff --git a/SuperBuild/External-CLOUDFLARE-ZLIB.cmake b/SuperBuild/External-CLOUDFLARE-ZLIB.cmake +index 9f064eb..fe74df5 100644 +--- a/SuperBuild/External-CLOUDFLARE-ZLIB.cmake ++++ b/SuperBuild/External-CLOUDFLARE-ZLIB.cmake +@@ -1,8 +1,5 @@ +-set(CLOUDFLARE_BRANCH gcc.amd64) # Cloudflare zlib branch +- + ExternalProject_Add(zlib +- GIT_REPOSITORY "${git_protocol}://github.com/ningfei/zlib.git" +- GIT_TAG "${CLOUDFLARE_BRANCH}" ++ URL file://@cloudflareZlib@ + SOURCE_DIR cloudflare-zlib + BINARY_DIR cloudflare-zlib-build + CMAKE_ARGS +diff --git a/SuperBuild/SuperBuild.cmake b/SuperBuild/SuperBuild.cmake +index 2a0a956..81354a7 100644 +--- a/SuperBuild/SuperBuild.cmake ++++ b/SuperBuild/SuperBuild.cmake +@@ -1,17 +1,3 @@ +-# Check if git exists +-find_package(Git) +-if(NOT GIT_FOUND) +- message(FATAL_ERROR "Cannot find Git. Git is required for Superbuild") +-endif() +- +-# Use git protocol or not +-option(USE_GIT_PROTOCOL "If behind a firewall turn this off to use http instead." ON) +-if(USE_GIT_PROTOCOL) +- set(git_protocol "git") +-else() +- set(git_protocol "https") +-endif() +- + # Basic CMake build settings + if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release" CACHE STRING diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index b42fed8da2819..44caca2fa2c8a 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -1,29 +1,43 @@ -{ lib, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }: +{ lib +, autoPatchelfHook +, fetchFromGitHub +, python3Packages +, wget +, zlib +}: -python27Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "eggnog-mapper"; - version = "1.0.3"; + version = "2.1.7"; src = fetchFromGitHub { owner = "eggnogdb"; - repo = "eggnog-mapper"; + repo = pname; rev = version; - sha256 = "1aaaflppy84bhkh2hb5gnzm4xgrz0rz0cgfpadr9w8cva8p0sqdv"; + hash = "sha256-auVD/r8m3TAB1KYMQ7Sae23eDg6LRx/daae0505cjwU="; }; - patches = (fetchpatch { - url = "https://github.com/eggnogdb/eggnog-mapper/commit/6972f601ade85b65090efca747d2302acb58507f.patch"; - sha256 = "0abnmn0bh11jihf5d3cggiild1ykawzv5f5fhb4cyyi8fvy4hcxf"; - }); + postPatch = '' + # Not a great solution... + substituteInPlace setup.cfg \ + --replace "==" ">=" + ''; - nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ python27Packages.biopython wget diamond hmmer ]; + nativeBuildInputs = [ + autoPatchelfHook + ]; - # make emapper find diamond & hmmer - makeWrapperArgs = [ - ''--prefix PATH ':' "${diamond}/bin"'' - ''--prefix PATH ':' "${hmmer}/bin"'' - ]; + buildInputs = [ + zlib + ]; + + propagatedBuildInputs = [ + wget + ] ++ (with python3Packages; [ + biopython + psutil + XlsxWriter + ]); # Tests rely on some of the databases being available, which is not bundled # with this package as (1) in total, they represent >100GB of data, and (2) diff --git a/pkgs/applications/science/biology/megahit/default.nix b/pkgs/applications/science/biology/megahit/default.nix index ee2f16f389b25..45cb7560502dc 100644 --- a/pkgs/applications/science/biology/megahit/default.nix +++ b/pkgs/applications/science/biology/megahit/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; + cmakeFlags = lib.optional stdenv.hostPlatform.isStatic [ + "-DSTATIC_BUILD=ON" + ]; meta = with lib; { description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph"; license = licenses.gpl3; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 526a5b3ed33b8..ace2eea89305b 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = "https://broadinstitute.github.io/picard/"; maintainers = with maintainers; [ jbedo ]; + mainProgram = "picard"; platforms = platforms.all; }; } diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index 553fb1de53983..ed3fc116ddaba 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, zlib, bash, coreutils }: +{ lib, stdenv, fetchurl, python3Packages, zlib, bash }: let pythonPackages = python3Packages; @@ -16,8 +16,6 @@ pythonPackages.buildPythonApplication rec { pythonPath = with pythonPackages; [ simplejson joblib setuptools matplotlib ]; - nativeBuildInputs = [ coreutils ]; - buildInputs = [ zlib ] ++ pythonPath; dontConfigure = true; diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 98b0394c35f1f..ec61e0bd7ce43 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -22,8 +22,15 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ncurses htslib ]; + preConfigure = lib.optional stdenv.hostPlatform.isStatic '' + export LIBS="-lz -lbz2 -llzma" + ''; + makeFlags = lib.optional stdenv.hostPlatform.isStatic "AR=${stdenv.cc.targetPrefix}ar"; + configureFlags = [ "--with-htslib=${htslib}" ] - ++ lib.optional (ncurses == null) "--without-curses"; + ++ lib.optional (ncurses == null) "--without-curses" + ++ lib.optional stdenv.hostPlatform.isStatic ["--without-curses" ] + ; preCheck = '' patchShebangs test/ diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/applications/science/biology/tebreak/default.nix index e56d91dc2cd12..a046aee1c6c34 100644 --- a/pkgs/applications/science/biology/tebreak/default.nix +++ b/pkgs/applications/science/biology/tebreak/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, last, exonerate, minia, python3, bwa -, samtools, findutils }: +, samtools }: python3.pkgs.buildPythonApplication rec { pname = "tebreak"; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "13mgh775d8hkl340923lfwwm4r5ps70girn8d6wgfxzwzxylz8iz"; }; - nativeBuildInputs = [ findutils python3.pkgs.cython ]; + nativeBuildInputs = [ python3.pkgs.cython ]; propagatedBuildInputs = with python3.pkgs; [ pysam scipy diff --git a/pkgs/applications/science/chemistry/chemtool/default.nix b/pkgs/applications/science/chemistry/chemtool/default.nix index bf78aeb825d5d..37057e1c604a4 100644 --- a/pkgs/applications/science/chemistry/chemtool/default.nix +++ b/pkgs/applications/science/chemistry/chemtool/default.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { fig2dev ]; + # Workaround build on -fno-common toolchains like upstream gcc-10. + # Otherwise built fails as: + # ld: inout.o:/build/chemtool-1.6.14/ct1.h:279: multiple definition of + # `outtype'; draw.o:/build/chemtool-1.6.14/ct1.h:279: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + preFixup = '' gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ fig2dev ]}") ''; diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 584554232ab20..8ab389afaee52 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -1,36 +1,22 @@ { lib, stdenv, fetchurl, gtk2, pkg-config, fftw, file, - pythonSupport ? false, pythonPackages ? null, - gnome2 ? null, - openexrSupport ? true, openexr ? null, - libzipSupport ? true, libzip ? null, - libxml2Support ? true, libxml2 ? null, - libwebpSupport ? true, libwebp ? null, + pythonSupport ? false, python2Packages, + gnome2, + openexrSupport ? true, openexr, + libzipSupport ? true, libzip, + libxml2Support ? true, libxml2, + libwebpSupport ? true, libwebp, # libXmu is not used if libunique is. - libXmuSupport ? false, xorg ? null, - libxsltSupport ? true, libxslt ? null, - fitsSupport ? true, cfitsio ? null, - zlibSupport ? true, zlib ? null, - libuniqueSupport ? true, libunique ? null, - libpngSupport ? true, libpng ? null, + libXmuSupport ? false, xorg, + libxsltSupport ? true, libxslt, + fitsSupport ? true, cfitsio, + zlibSupport ? true, zlib, + libuniqueSupport ? true, libunique, + libpngSupport ? true, libpng, openglSupport ? !stdenv.isDarwin }: -assert openexrSupport -> openexr != null; -assert libzipSupport -> libzip != null; -assert libxml2Support -> libxml2 != null; -assert libwebpSupport -> libwebp != null; -assert libXmuSupport -> xorg != null; -assert libxsltSupport -> libxslt != null; -assert fitsSupport -> cfitsio != null; -assert zlibSupport -> zlib != null; -assert libuniqueSupport -> libunique != null; -assert libpngSupport -> libpng != null; -assert openglSupport -> gnome2 != null; -assert pythonSupport -> (pythonPackages != null && gnome2 != null); - let - inherit (pythonPackages) pygtk pygobject2 python; - + inherit (python2Packages) pygtk pygobject2 python; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 03f7c6c2b40f1..fc5c18e4ccdff 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -19,7 +19,11 @@ stdenv.mkDerivation rec { --replace '-I/usr/X11R6/include' "" \ --replace '/usr/local/' $out/ \ --replace 'sudo' "" \ - --replace '-C surf depend' '-C surf' + --replace '-C surf depend' '-C surf' \ + --replace 'FFLAGS =' 'FFLAGS = -fallow-argument-mismatch' + + substituteInPlace ambfor/makefile --replace 'FFLAGS =' 'FFLAGS = -fallow-argument-mismatch' + sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile ''; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 86addd5bd6960..25749b8947c4a 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.3"; + version = "11.4"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "0n04yvnc0rg3lvnkkdpbwkfl6zg544260p3s65vwkc5dflrhk34r"; + sha256 = "1z423sjpc4ajjy3s7623z3rfwmp2hgis7iiiy8gb5apw73k33dyv"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/chemistry/openmolcas/MKL-MPICH.patch b/pkgs/applications/science/chemistry/openmolcas/MKL-MPICH.patch new file mode 100644 index 0000000000000..c1bc211a68e4f --- /dev/null +++ b/pkgs/applications/science/chemistry/openmolcas/MKL-MPICH.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 276ae4e..5e56176 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1304,9 +1304,9 @@ if (LINALG STREQUAL "MKL") + endif () + else () + if (ADDRMODE EQUAL 64) +- set (libpath "${MKLROOT}/lib/intel64") ++ set (libpath "${MKLROOT}/lib") + elseif (ADDRMODE EQUAL 32) +- set (libpath "${MKLROOT}/lib/ia32") ++ set (libpath "${MKLROOT}/lib") + endif () + endif () + set (MKL_LIBRARY_PATH ${libpath} CACHE PATH "location of MKL libraries." FORCE) +@@ -1380,7 +1380,7 @@ if (LINALG STREQUAL "MKL") + find_library (LIBMKL_BLACS NAMES "mkl_blacs_intelmpi_ilp64" + PATHS ${MKL_LIBRARY_PATH} NO_DEFAULT_PATH) + elseif (MPI_IMPLEMENTATION STREQUAL "mpich") +- find_library (LIBMKL_BLACS NAMES "mkl_blacs_ilp64" ++ find_library (LIBMKL_BLACS NAMES "mkl_blacs_intelmpi_ilp64" + PATHS ${MKL_LIBRARY_PATH} NO_DEFAULT_PATH) + endif () diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 1c3203354873d..c5f60c395ae27 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -1,30 +1,35 @@ { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl -, openblas, hdf5-cpp, python3, texlive -, armadillo, mpi, globalarrays, openssh -, makeWrapper +, blas-ilp64, hdf5-cpp, python3, texlive +, armadillo, libxc, makeWrapper +# Note that the CASPT2 module is broken with MPI +# See https://gitlab.com/Molcas/OpenMolcas/-/issues/169 +, enableMpi ? false +, mpi, globalarrays } : -let - version = "21.10"; - # The tag keeps moving, fix a hash instead - gitLabRev = "117305462bac932106e8e3a0347238b768bcb058"; +assert blas-ilp64.isILP64; +assert lib.elem blas-ilp64.passthru.implementation [ "openblas" "mkl" ]; - python = python3.withPackages (ps : with ps; [ six pyparsing ]); +let + python = python3.withPackages (ps : with ps; [ six pyparsing numpy h5py ]); in stdenv.mkDerivation { pname = "openmolcas"; - inherit version; + version = "22.02"; src = fetchFromGitLab { owner = "Molcas"; repo = "OpenMolcas"; - rev = gitLabRev; - sha256 = "sha256-GMi2dsNBog+TmpmP6fhQcp6Z5Bh2LelV//MqLnvRP5c="; + # The tag keeps moving, fix a hash instead + rev = "f8df69cf87b241a15ebc82d72a8f9a031a385dd4"; # 2022-02-10 + sha256 = "0p2xj8kgqdk5kb1jv5k77acbiqkbl2sh971jnz9p00cmbh556r6a"; }; patches = [ # Required to handle openblas multiple outputs ./openblasPath.patch + # Required for MKL builds + ./MKL-MPICH.patch ]; nativeBuildInputs = [ @@ -36,27 +41,35 @@ in stdenv.mkDerivation { ]; buildInputs = [ - openblas + blas-ilp64.passthru.provider hdf5-cpp python armadillo + libxc + ] ++ lib.optionals enableMpi [ mpi globalarrays - openssh ]; + passthru = lib.optionalAttrs enableMpi { inherit mpi; }; + cmakeFlags = [ "-DOPENMP=ON" - "-DGA=ON" - "-DMPI=ON" "-DLINALG=OpenBLAS" "-DTOOLS=ON" "-DHDF5=ON" "-DFDE=ON" - "-DOPENBLASROOT=${openblas.dev}" + "-DEXTERNAL_LIBXC=${libxc}" + ] ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [ + "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}" "-DLINALG=OpenBLAS" + ] ++ lib.optionals (blas-ilp64.passthru.implementation == "mkl") [ + "-DMKLROOT=${blas-ilp64.passthru.provider}" "-DLINALG=MKL" + ] ++ lib.optionals enableMpi [ + "-DGA=ON" + "-DMPI=ON" ]; - preConfigure = '' + preConfigure = lib.optionalString enableMpi '' export GAROOT=${globalarrays}; ''; @@ -68,6 +81,8 @@ in stdenv.mkDerivation { postInstall = '' mv $out/pymolcas $out/bin + find $out/Tools -type f -exec mv \{} $out/bin \; + rm -r $out/Tools ''; postFixup = '' @@ -84,6 +99,7 @@ in stdenv.mkDerivation { maintainers = [ maintainers.markuskowa ]; license = licenses.lgpl21Only; platforms = [ "x86_64-linux" ]; + mainProgram = "pymolcas"; }; } diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index 7ee46f7d7e22f..f49b9d1f45f9f 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "0lz8rfl5xwdj17zn7a30ipi7cgjwqki21a7wg9rdg7iwx27bpnmg"; }; + postPatch = '' + substituteInPlace Src/siesta_init.F --replace '/bin/rm' 'rm' + ''; + passthru = { inherit mpi; }; @@ -25,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ blas lapack ] ++ lib.optionals useMpi [ mpi scalapack ]; - enableParallelBuilding = true; + enableParallelBuilding = false; # Started making trouble with gcc-11 # Must do manualy becuase siesta does not do the regular # ./configure; make; make install @@ -35,17 +39,23 @@ stdenv.mkDerivation rec { cp gfortran.make arch.make ''; - preBuild = if useMpi then '' + preBuild = '' + # See https://gitlab.com/siesta-project/siesta/-/commit/a10bf1628e7141ba263841889c3503c263de1582 + # This may be fixed in the next release. makeFlagsArray=( + FFLAGS="-fallow-argument-mismatch" + ) + '' + (if useMpi then '' + makeFlagsArray+=( CC="mpicc" FC="mpifort" FPPFLAGS="-DMPI" MPI_INTERFACE="libmpi_f90.a" MPI_INCLUDE="." COMP_LIBS="" LIBS="-lblas -llapack -lscalapack" ); '' else '' - makeFlagsArray=( + makeFlagsArray+=( COMP_LIBS="" LIBS="-lblas -llapack" ); - ''; + ''); installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix index fc840fe45fbc8..c4bb788798d6a 100644 --- a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix +++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "QtRVSim"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "cvut"; repo = "qtrvsim"; rev = "refs/tags/v${version}"; - sha256 = "B1l+ysrodeDbxYfdLLMF8yk4/uPXTcDrTaMtYm89HuU="; + sha256 = "BV/nHRvimPaBtY1nfK1PZ2yJ9xWZpNlwiTRfI/9KQec="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index cf135b9469a77..f4333be8475e8 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "alliance"; - version = "unstable-2021-09-15"; + version = "unstable-2022-01-13"; src = fetchFromGitLab { domain = "gitlab.lip6.fr"; owner = "vlsi-eda"; repo = "alliance"; - rev = "5e83c92d0307cce9d599f7099fb0023f81d26d65"; - sha256 = "Vd3MTT4eKn4FMt0/F4fQUPcWq25kH0FpeGxQUOetKPY="; + rev = "ebece102e15c110fc79f1da50524c68fd9523f0c"; + hash = "sha256-NGtE3ZmN9LrgXG4NIKrp7dFRVzrKMoudlPUtYYKrZjY="; }; prePatch = "cd alliance/src"; diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index c5723dbab98ea..668a34b511d49 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -78,7 +78,7 @@ mkDerivation rec { description = "An open source prototyping tool for Arduino-based projects"; homepage = "https://fritzing.org/"; license = with licenses; [ gpl3 cc-by-sa-30 ]; - maintainers = with maintainers; [ robberer musfay ]; + maintainers = with maintainers; [ robberer muscaln ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index 6029bf5a9948a..f18afb77587c1 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -8,10 +8,11 @@ , glm , gtkmm3 , lib +, libarchive , libgit2 , librsvg +, libspnav , libuuid -, libzip , opencascade , pkg-config , podofo @@ -23,13 +24,13 @@ stdenv.mkDerivation rec { pname = "horizon-eda"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - sha256 = "sha256-MUS1dIsULDJ5DahCtDpbHZq56nltHShli7+uoW1/Tqw="; + sha256 = "0lw5j1zqd2wdafgxl4ahcphaabs7vlw4kaa1c566hwfjxs46dmg9"; }; buildInputs = [ @@ -38,10 +39,11 @@ stdenv.mkDerivation rec { libepoxy glm gtkmm3 + libarchive libgit2 librsvg + libspnav libuuid - libzip opencascade podofo python3 diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 9adfac344b38b..658223dc4ec66 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,45 +3,45 @@ { "kicad" = { kicadVersion = { - version = "6.0.4"; + version = "6.0.5"; src = { - rev = "6f826c9f35a3dc9a104bb24a0a89a2e04b2d9721"; - sha256 = "0lki59ws0ncqkp9wxrhyni1ck2sx5z07mmpkjg0d9jpkync9hx9y"; + rev = "a6ca702e916df70e499615d8613102e780e96a40"; + sha256 = "19mg672h1gjdvnkp13cpkhk67xpwms72y4gd6g8983fcsxr8nq23"; }; }; libVersion = { - version = "6.0.4"; + version = "6.0.5"; libSources = { - symbols.rev = "9d00fbb9373571e54d9f29985b21a03d862795a4"; - symbols.sha256 = "12lyc187337bf2frl3jvwqdwwnd69f7l414k3kxhccs3sa2mcf1y"; - templates.rev = "c4f4fe4b821e062a3ddd275f9313d5d81ff8f8d7"; + symbols.rev = "c7f82c947ab3a1afec8d7b602ee7c6bfdfb24693"; + symbols.sha256 = "1dhgdp08ah08fc5nvwkqmgpl2any9vgy1gykmyzsd4dl8hhvznh5"; + templates.rev = "5ec65bfd3ecefaf85f79db02981f0568fe8b0eb8"; templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; - footprints.rev = "c48d3dfcfa6ce58ec11e10b7a74878bb69fae580"; - footprints.sha256 = "0px2g9jansky0rvc0bdjylbmv8xwhc0q63g88hd2nzbknqli9f1y"; - packages3d.rev = "b1de0b5c3edc16999602b809a05017da62ff52cc"; - packages3d.sha256 = "0ms9py93qyihxrhh9wm2ziycmdn88m36r8adx22ynjnxixw1f9ja"; + footprints.rev = "35e3d08f1ab23b5b08ba903572776aab6de7499f"; + footprints.sha256 = "0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai"; + packages3d.rev = "6ea94caf40c4bdccecb569e81ed82b902d4c104e"; + packages3d.sha256 = "00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2022-03-19"; + version = "2022-05-06"; src = { - rev = "58c146a7c00ee64ca07cacbcc594121f40aa2aeb"; - sha256 = "0gcbl11pq0dgp590hdwsh5np7spixk5kgva0v8mx9rqd374z4bdm"; + rev = "dfdedfa605f58711d286d6e24e4ae9b5f75444e6"; + sha256 = "1bs7s2x0zh3wbk2hawg47v1s3nidmcl0xaardbpiafrrnh1qprf2"; }; }; libVersion = { - version = "2022-03-19"; + version = "2022-05-06"; libSources = { - symbols.rev = "9b8d3163450172a7f368462c6d005841ad199144"; - symbols.sha256 = "12lyc187337bf2frl3jvwqdwwnd69f7l414k3kxhccs3sa2mcf1y"; + symbols.rev = "e1d70243a68a721a9f94a7df1d04c9c6ebc056ef"; + symbols.sha256 = "0gbl22g73cms9jrk9f6dlgd3ksnhiik39aywfm15m98jfglnlbg8"; templates.rev = "a27d83f0a20f0be0c1ab04b139a0c518da51a5d4"; templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; - footprints.rev = "c871df2c81a894bc5e91d2d517b76884d5a918aa"; - footprints.sha256 = "0px2g9jansky0rvc0bdjylbmv8xwhc0q63g88hd2nzbknqli9f1y"; - packages3d.rev = "6ff98426fd51d53c55bc48025d66d3d0b0c5df92"; - packages3d.sha256 = "0ms9py93qyihxrhh9wm2ziycmdn88m36r8adx22ynjnxixw1f9ja"; + footprints.rev = "25bb68c2d0e61d1e1e31375adfcf0b6ccdb33ff9"; + footprints.sha256 = "0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai"; + packages3d.rev = "ac7189ed55d5a3bf5eaa87d31fb97a3e7b5ad80e"; + packages3d.sha256 = "00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc"; }; }; }; diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index af78fc71ebf30..06b77294da7ea 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -1,36 +1,23 @@ -{ lib -, python3 -, fetchFromGitHub -, wrapQtAppsHook +{ + lib, + python3, + fetchFromGitHub, + wrapQtAppsHook, }: - -let - python = python3.override { - packageOverrides = self: super: { - scipy = super.scipy.overridePythonAttrs (oldAttrs: rec { - version = "1.4.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0ndw7zyxd2dj37775mc75zm4fcyiipnqxclc45mkpxy8lvrvpqfy"; - }; - doCheck = false; - }); - }; - }; -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "nanovna-saver"; - version = "0.3.8"; + version = "0.4.0"; src = fetchFromGitHub { owner = "NanoVNA-Saver"; repo = pname; rev = "v${version}"; - sha256 = "0z83rwpnbbs1n74mx8dgh1d1crp90mannj9vfy161dmy4wzc5kpv"; + sha256 = "1n1bh46spdyk7kgvv95hyfy9f904czhzlvk41vliqkak56hj2ss1"; }; nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ cython scipy pyqt5 diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix index 6507198a790f4..9c692865f6e3a 100644 --- a/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preConfigure = '' # Make custom kernels avaible from qucs-s - gappsWrapperArgs+=(--prefix PATH ":" ${lib.makeBinPath kernels}) + gappsWrapperArgs+=(--prefix PATH ":" ${lib.escapeShellArg (lib.makeBinPath kernels)}) ''; QTDIR=qt4; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 5ee89dfa8c439..05d7d0388f0d8 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.218"; + version = "4.222"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-FukC60z7Y3bb3I/dgzqCh6kFP6DDBOGi0M8IIZ50P3g="; + sha256 = "sha256-AvjcStbiXDdhJnaSJJ5Mp6zscvaxhb+A2J+0gpm2rFI="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix index f0dd990a35bc8..089ebb9bb1988 100644 --- a/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , bison , flex , verilog @@ -19,12 +18,8 @@ stdenv.mkDerivation rec { }; patches = lib.optionals (!stdenv.isAarch64) [ - # fix build with verilog 11.0 - https://github.com/ldoolitt/vhd2vl/pull/15 - # for some strange reason, this is not needed for aarch64 - (fetchpatch { - url = "https://github.com/ldoolitt/vhd2vl/commit/ce9b8343ffd004dfe8779a309f4b5a594dbec45e.patch"; - sha256 = "1qaqhm2mk66spb2dir9n91b385rarglc067js1g6pcg8mg5v3hhf"; - }) + # fix build with verilog 11.0 + ./test.patch ]; nativeBuildInputs = [ @@ -37,6 +32,13 @@ stdenv.mkDerivation rec { verilog ]; + # the "translate" target both (a) builds the software and (b) runs + # the tests (without validating the results) + buildTargets = [ "translate" ]; + + # the "diff" target examines the test results + checkTarget = "diff"; + installPhase = '' runHook preInstall install -D -m755 src/vhd2vl $out/bin/vdh2vl diff --git a/pkgs/applications/science/electronics/vhd2vl/test.patch b/pkgs/applications/science/electronics/vhd2vl/test.patch new file mode 100644 index 0000000000000..85b91964e3922 --- /dev/null +++ b/pkgs/applications/science/electronics/vhd2vl/test.patch @@ -0,0 +1,35 @@ +--- a/translated_examples/fifo.v 1970-01-01 00:00:01.000000000 +0000 ++++ a/temp/verilog/fifo.v 2022-05-11 03:44:43.173604945 +0000 +@@ -107,7 +107,7 @@ + //--- Read address counter -------------- + //--------------------------------------- + assign add_RD_CE = (iempty == 1'b1) ? 1'b0 : (RD == 1'b0) ? 1'b0 : 1'b1; +- assign n_add_RD = (add_RD) + 4'h1; ++ assign n_add_RD = add_RD + 4'h1; + always @(posedge clk_RD, posedge rst) begin + if((rst == 1'b1)) begin + add_RD <= {5{1'b0}}; +diff -u '--exclude=Makefile' '--exclude-from=examples/exclude' translated_examples/test.v temp/verilog/test.v +--- a/translated_examples/test.v 1970-01-01 00:00:01.000000000 +0000 ++++ a/temp/verilog/test.v 2022-05-11 03:44:43.189604945 +0000 +@@ -125,7 +125,7 @@ + endcase + end + +- assign code1[1:0] = a[6:5] ^ ({a[4],b[6]}); ++ assign code1[1:0] = a[6:5] ^ {a[4],b[6]}; + // Asynch process + always @(we, addr, config1, bip) begin + if(we == 1'b1) begin +diff -u '--exclude=Makefile' '--exclude-from=examples/exclude' translated_examples/withselect.v temp/verilog/withselect.v +--- a/translated_examples/withselect.v 1970-01-01 00:00:01.000000000 +0000 ++++ a/temp/verilog/withselect.v 2022-05-11 03:44:43.193604945 +0000 +@@ -33,7 +33,7 @@ + endcase + end + +- assign code1[1:0] = a[6:5] ^ ({a[4],b[6]}); ++ assign code1[1:0] = a[6:5] ^ {a[4],b[6]}; + assign foo = {(((1 + 1))-((0))+1){1'b0}}; + assign egg = {78{1'b0}}; + assign baz = {(((bus_width * 4))-((bus_width * 3 - 1))+1){1'b1}}; diff --git a/pkgs/applications/science/engineering/brmodelo/default.nix b/pkgs/applications/science/engineering/brmodelo/default.nix new file mode 100644 index 0000000000000..c0573ae131d3c --- /dev/null +++ b/pkgs/applications/science/engineering/brmodelo/default.nix @@ -0,0 +1,109 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, openjdk8 +, ant +, makeWrapper +, makeDesktopItem +, copyDesktopItems +}: + +stdenv.mkDerivation rec { + pname = "brmodelo"; + version = "3.31"; + + src = fetchFromGitHub { + owner = "chcandido"; + repo = pname; + rev = version; + sha256 = "09qrhqhv264x8phnf3pnb0cwq75l7xdsj9xkwlvhry81nxz0d5v0"; + }; + + nativeBuildInputs = [ ant makeWrapper copyDesktopItems ]; + + buildInputs = [ openjdk8 ]; + + patches = [ + # Fixes for building with Ant. + # https://github.com/chcandido/brModelo/pull/22 + (fetchpatch { + name = "fix-self-closing-element-not-allowed.patch"; + url = "https://github.com/yuuyins/brModelo/commit/0d712b74fd5d29d67be07480ed196da28a77893b.patch"; + sha256 = "sha256-yy03arE6xetotzyvpToi9o9crg3KnMRn1J70jDUvSXE="; + }) + (fetchpatch { + name = "fix-tag-closing.patch"; + url = "https://github.com/yuuyins/brModelo/commit/e8530ff75f024cf6effe0408ed69985405e9709c.patch"; + sha256 = "sha256-MNuh/ORbaAkB5qDSlA/nPrXN+tqzz4oOglVyEtSangI="; + }) + (fetchpatch { + name = "fix-bad-use-greater-than.patch"; + url = "https://github.com/yuuyins/brModelo/commit/498a6ef8129daff5a472b318f93c8f7f2897fc7f.patch"; + sha256 = "sha256-MmAwYUmx38DGRsiSxCWCObtpqxk0ykUQiDSC76bCpFc="; + }) + (fetchpatch { + name = "fix-param-errors.patch"; + url = "https://github.com/yuuyins/brModelo/commit/8a508aaba0bcffe13a3f95cff495230beea36bc4.patch"; + sha256 = "sha256-qME9gZChSMzu1vs9HaosD+snb+jlOrQLY97meNoA8oU="; + }) + + # Add SVG icons. + # https://github.com/chcandido/brModelo/pull/23 + (fetchpatch { + name = "add-brmodelo-logo-icons-svg.patch"; + url = "https://github.com/yuuyins/brModelo/commit/f260b82b664fad3325bbf3ebd7a15488d496946b.patch"; + sha256 = "sha256-UhgcWxsHkNFS1GgaRnmlZohjDR8JwHof2cIb3SBetYs="; + }) + ]; + + buildPhase = '' + ant + ''; + + desktopItems = [ + (makeDesktopItem { + name = "brmodelo"; + desktopName = "brModelo"; + genericName = "Entity-relationship diagramming tool"; + exec = "brmodelo"; + icon = "brmodelo"; + comment = meta.description; + categories = [ "Development" "Education" "Database" "2DGraphics" "ComputerScience" "DataVisualization" "Engineering" "Java" ]; + }) + ]; + + installPhase = '' + install -d $out/bin $out/share/doc/${pname} $out/share/java + + cp -rv ./dist/javadoc $out/share/doc/${pname}/ + + install -Dm755 ./dist/brModelo.jar -t $out/share/java/ + # NOTE: The standard Java GUI toolkit has a + # hard-coded list of "non-reparenting" window managers, + # which cause issues while running brModelo + # in WMs that are not in that list (e.g. XMonad). + # Solution/Workaround: set the environment variable + # _JAVA_AWT_WM_NONREPARENTING=1. + makeWrapper ${openjdk8}/bin/java $out/bin/brmodelo \ + --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ + --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" \ + --add-flags "-jar $out/share/java/brModelo.jar" + + runHook postInstall + ''; + + postInstall = '' + for size in 16 24 32 48 64 128 256; do + install -Dm644 ./src/imagens/icone_"$size"x"$size".svg \ + $out/share/icons/hicolor/"$size"x"$size"/apps/brmodelo.svg + done + ''; + + meta = with lib; { + description = "Entity-relationship diagram tool for making conceptual and logical database models"; + homepage = "https://github.com/chcandido/brModelo"; + license = licenses.gpl3; + maintainers = with maintainers; [ yuu ]; + }; +} diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 60454ca9ce994..4e808dd8f19e8 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.03.04"; + version = "2022.03.22"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "d7ecb23eeee9c9b4924182ce570c2e33eb18abff"; - hash = "sha256-aufWRTggJNOaUFsjh5+HFDqEur+nuM0hZSsTfGptbks="; + rev = "00b674d5b3ccefc7f2abcbf5b650fc14298ac549"; + hash = "sha256-jQgHptARRuhlF+8R92so8PyBTI5t/q/rSGO5yce5WSs="; }; nativeBuildInputs = [ cmake ]; @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { description = "A tool for squential logic synthesis and formal verification"; homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; + mainProgram = "abc"; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index fc16423b671ef..02f6dba4dedb8 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -9,13 +9,13 @@ in stdenv.mkDerivation { pname = "aspino"; - version = "unstable-2017-03-09"; + version = "unstable-2018-03-24"; src = fetchFromGitHub { owner = "alviano"; repo = "aspino"; - rev = "e31c3b4e5791a454e6602439cb26bd98d23c4e78"; - sha256 = "0annsjs2prqmv1lbs0lxr7yclfzh47xg9zyiq6mdxcc02rxsi14f"; + rev = "4d7483e328bdf9a00ef1eb7f2868e7b0f2a82d56"; + hash = "sha256-R1TpBDGdq+NQQzmzqk0wYaz2Hns3qru0AkAyFPQasPA="; }; buildInputs = [ zlib boost ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index a9fb21681586b..c078287b85ee3 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -56,8 +56,8 @@ let args.version; version = fetched.version; coq-version = args.coq-version or (if version != "dev" then versions.majorMinor version else "dev"); - versionAtLeast = v: (coq-version == "dev") || (lib.versionAtLeast coq-version v); - ideFlags = optionalString (buildIde && !versionAtLeast "8.10") + coqAtLeast = v: coq-version == "dev" || versionAtLeast coq-version v; + ideFlags = optionalString (buildIde && !coqAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" @@ -71,11 +71,11 @@ let { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } ] ocamlPackages_4_12; ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] - ++ optional (versionAtLeast "8.14") ocamlPackages.dune_2; + ++ optional (coqAtLeast "8.14") ocamlPackages.dune_2; ocamlBuildInputs = [] - ++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5 - ++ optional (!versionAtLeast "8.13") ocamlPackages.num - ++ optional (versionAtLeast "8.13") ocamlPackages.zarith; + ++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5 + ++ optional (!coqAtLeast "8.13") ocamlPackages.num + ++ optional (coqAtLeast "8.13") ocamlPackages.zarith; self = stdenv.mkDerivation { pname = "coq"; inherit (fetched) version src; @@ -134,11 +134,11 @@ self = stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ] ++ ocamlNativeBuildInputs ++ optional buildIde copyDesktopItems - ++ optional (buildIde && versionAtLeast "8.10") wrapGAppsHook - ++ optional (!versionAtLeast "8.6") gnumake42; + ++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook + ++ optional (!coqAtLeast "8.6") gnumake42; buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde - (if versionAtLeast "8.10" + (if coqAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) ; @@ -147,7 +147,7 @@ self = stdenv.mkDerivation { UNAME=$(type -tp uname) RM=$(type -tp rm) substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - ${if !versionAtLeast "8.7" then "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\"" else ""} + ${if !coqAtLeast "8.7" then "substituteInPlace configure.ml --replace \"md5 -q\" \"md5sum\"" else ""} ${csdpPatch} ''; @@ -161,7 +161,7 @@ self = stdenv.mkDerivation { addEnvHooks "$targetOffset" addCoqPath ''; - preConfigure = if versionAtLeast "8.10" then '' + preConfigure = if coqAtLeast "8.10" then '' patchShebangs dev/tools/ '' else '' configureFlagsArray=( @@ -171,7 +171,7 @@ self = stdenv.mkDerivation { prefixKey = "-prefix "; - buildFlags = [ "revision" "coq" ] ++ optional buildIde "coqide" ++ optional (!versionAtLeast "8.14") "bin/votour"; + buildFlags = [ "revision" "coq" ] ++ optional buildIde "coqide" ++ optional (!coqAtLeast "8.14") "bin/votour"; enableParallelBuilding = true; createFindlibDestdir = true; @@ -185,10 +185,10 @@ self = stdenv.mkDerivation { categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; }); - postInstall = let suffix = if versionAtLeast "8.14" then "-core" else ""; in '' + postInstall = let suffix = if coqAtLeast "8.14" then "-core" else ""; in '' cp bin/votour $out/bin/ ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix} - '' + optionalString (versionAtLeast "8.14") '' + '' + optionalString (coqAtLeast "8.14") '' ln -s $out/lib/coqide-server $OCAMLFIND_DESTDIR/coqide-server '' + optionalString buildIde '' mkdir -p "$out/share/pixmaps" diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix new file mode 100644 index 0000000000000..5f28ca73c4e73 --- /dev/null +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }: + +stdenv.mkDerivation rec { + pname = "easycrypt"; + version = "2022.04"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "r${version}"; + sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7"; + }; + + nativeBuildInputs = with ocamlPackages; [ + dune_3 + findlib + menhir + ocaml + ]; + buildInputs = with ocamlPackages; [ + batteries + dune-build-info + inifiles + yojson + zarith + ]; + + propagatedBuildInputs = [ why3 ]; + + strictDeps = true; + + postPatch = '' + substituteInPlace dune-project --replace '(name easycrypt)' '(name easycrypt)(version ${version})' + ''; + + installPhase = '' + runHook preInstall + dune install --prefix $out ${pname} + rm $out/bin/ec-runtest + runHook postInstall + ''; + + meta = { + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + platforms = lib.platforms.all; + homepage = "https://easycrypt.info/"; + description = "Computer-Aided Cryptographic Proofs"; + }; +} diff --git a/pkgs/applications/science/logic/easycrypt/runtest.nix b/pkgs/applications/science/logic/easycrypt/runtest.nix new file mode 100644 index 0000000000000..79a034b936937 --- /dev/null +++ b/pkgs/applications/science/logic/easycrypt/runtest.nix @@ -0,0 +1,24 @@ +{ python3Packages, easycrypt }: + +python3Packages.buildPythonApplication rec { + inherit (easycrypt) src version; + + pname = "easycrypt-runtest"; + + dontConfigure = true; + dontBuild = true; + doCheck = false; + + pythonPath = with python3Packages; [ pyyaml ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp scripts/testing/runtest $out/bin/ec-runtest + runHook postInstall + ''; + + meta = easycrypt.meta // { + description = "Testing program for EasyCrypt formalizations"; + }; +} diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 89331f53686a4..1c16de8ad9513 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.3.1"; + version = "1.4.1"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-QNVzpnT77+9PXhq4Yz0q3o+GiQTVy7dOrg2yBTscoek="; + sha256 = "sha256-jHECNSXSATLuNHNSVwi7mBTI8l6+cLPDISc5T/4yHDg="; }; - cargoSha256 = "sha256-G70QopoMqFrkOnuui3+3cEHYvmnf0meX1Ecv4q8FCpM="; + cargoSha256 = "sha256-/XwlTmUboDbB6RTanhKyO6o2GBUhxpH/NQjeNsKpse0="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index ece9367e30bdf..1fe770a599d0f 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -1,20 +1,27 @@ -{ stdenv, lib, fetchhg, cmake, which, python3, osi, cplex }: +{ stdenv +, lib +, fetchFromGitHub +, cmake +, python3 +, osi +, cplex +}: -stdenv.mkDerivation { - version = "19.12"; +stdenv.mkDerivation rec { pname = "fast-downward"; + version = "21.12.0"; - src = fetchhg { - url = "http://hg.fast-downward.org/"; - rev = "41688a4f16b3"; - sha256 = "08m4k1mkx4sz7c2ab7xh7ip6b67zxv7kl68xrvwa83xw1yigqkna"; + src = fetchFromGitHub { + owner = "aibasel"; + repo = "downward"; + rev = "release-${version}"; + sha256 = "sha256-qc+SaUpIYm7bnOZlHH2mdvUaMBB+VRyOCQM/BOoOaPE="; }; - nativeBuildInputs = [ cmake which ]; - buildInputs = [ python3 python3.pkgs.wrapPython osi ]; + nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; + buildInputs = [ python3 osi ]; - cmakeFlags = - lib.optional osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ]; + cmakeFlags = lib.optional osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ]; configurePhase = '' python build.py release @@ -54,7 +61,7 @@ stdenv.mkDerivation { description = "A domain-independent planning system"; homepage = "https://www.fast-downward.org/"; license = licenses.gpl3Plus; - platforms = with platforms; (linux ++ darwin); + platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 6696527cece2c..9e5d40be2c6d5 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -1,7 +1,33 @@ -{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, naproche, rlwrap, perl, makeDesktopItem, isabelle-components, isabelle, symlinkJoin }: +{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, naproche, rlwrap, perl, makeDesktopItem, isabelle-components, isabelle, symlinkJoin, fetchhg }: # nettools needed for hostname -stdenv.mkDerivation rec { +let + sha1 = stdenv.mkDerivation { + pname = "isabelle-sha1"; + version = "2021-1"; + + src = fetchhg { + url = "https://isabelle.sketis.net/repos/sha1"; + rev = "e0239faa6f42"; + sha256 = "sha256-4sxHzU/ixMAkSo67FiE6/ZqWJq9Nb9OMNhMoXH2bEy4="; + }; + + buildPhase = (if stdenv.isDarwin then '' + LDFLAGS="-dynamic -undefined dynamic_lookup -lSystem" + '' else '' + LDFLAGS="-fPIC -shared" + '') + '' + CFLAGS="-fPIC -I." + $CC $CFLAGS -c sha1.c -o sha1.o + $LD $LDFLAGS sha1.o -o libsha1.so + ''; + + installPhase = '' + mkdir -p $out/lib + cp libsha1.so $out/lib/ + ''; + }; +in stdenv.mkDerivation rec { pname = "isabelle"; version = "2021-1"; @@ -82,6 +108,9 @@ stdenv.mkDerivation rec { --replace 'cmd.add("/usr/bin/env");' "" \ --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");" + substituteInPlace src/Pure/General/sha1.ML \ + --replace '"$ML_HOME/" ^ (if ML_System.platform_is_windows then "sha1.dll" else "libsha1.so")' '"${sha1}/lib/libsha1.so"' + rm -r heaps '' + (if ! stdenv.isLinux then "" else '' arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index 85a7ecb08c396..5a48abfc4aa48 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -7,7 +7,7 @@ , makeWrapper , makeDesktopItem , copyDesktopItems -, testVersion +, testers , key }: @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { ''; passthru.tests.version = - testVersion { + testers.testVersion { package = key; command = "KeY --help"; }; @@ -115,7 +115,7 @@ in stdenv.mkDerivation rec { ''; license = licenses.gpl2; maintainers = with maintainers; [ fgaz ]; + mainProgram = executable-name; platforms = platforms.all; }; } - diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 1356c88d478fc..e49c80db9d6e6 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -65,7 +65,7 @@ let }; }; - python = { buildPythonPackage, cython }: buildPythonPackage { + python = { buildPythonPackage, cython, pytestCheckHook }: buildPythonPackage { inherit pname version src patches; propagatedBuildInputs = [ core cython ]; @@ -85,5 +85,12 @@ let substituteInPlace setup.py \ --replace 'library_dir = "../../../../"' 'library_dir = "${core}/lib/"' ''; + + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + "test_assertAtMostOne" + "test_assertEqual" + ]; }; in core diff --git a/pkgs/applications/science/logic/naproche/default.nix b/pkgs/applications/science/logic/naproche/default.nix index 5e286a9b57e32..047ed73262eee 100644 --- a/pkgs/applications/science/logic/naproche/default.nix +++ b/pkgs/applications/science/logic/naproche/default.nix @@ -2,13 +2,13 @@ with haskellPackages; mkDerivation { pname = "Naproche-SAD"; - version = "0.1.0.0"; + version = "2022-04-19"; src = fetchFromGitHub { owner = "naproche"; repo = "naproche"; - rev = "d39cea85ace04d5b3775fde9972a33886799bfe6"; - sha256 = "1zqrldmxkzbyg9bssrbwb00zic29904igcipaz1m9al0456yjnkf"; + rev = "2514c04e715395b7a839e11b63046eafb9c6a1da"; + sha256 = "1bdgyk4fk65xi7n778rbgddpg4zhggj8wjslxbizrzi81my9a3vm"; }; isExecutable = true; diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 8752c4ef59d43..4b7166ad99865 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ott"; - version = "0.31"; + version = "0.32"; src = fetchFromGitHub { owner = "ott-lang"; repo = "ott"; rev = version; - sha256 = "0l81126i2qkz11fs5yrjdgymnqgjcs5avb7f951h61yh1s68jpnn"; + sha256 = "sha256-vdDsfsIi1gRW1Sowf29VyQ4C5UKyQZaVgS2uTb8VeW4="; }; nativeBuildInputs = [ pkg-config opaline ]; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index b9bf480f7e6da..ffc61ed1d03bb 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation { homepage = "https://symbiyosys.readthedocs.io/"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ thoughtpolice emily ]; + mainProgram = "sby"; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 7b1ee4384c9e8..d84f0b2abf699 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -34,7 +34,10 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ + makeWrapper + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + ]; dontWrapGApps = true; @@ -62,7 +65,7 @@ stdenv.mkDerivation rec { "$(find "$out/toolbox" -name jspawnhelper)" makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ - --run "set -x; cd $out/toolbox" \ + --chdir "$out/toolbox" \ --add-flags "-data ~/.tla-toolbox" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}" \ "''${gappsWrapperArgs[@]}" diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index dbb187dc35eeb..0df8a0525be51 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -50,5 +50,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/finalfusion/finalfusion-utils/"; license = licenses.asl20; maintainers = with maintainers; [ ]; + mainProgram = "finalfusion"; }; } diff --git a/pkgs/applications/science/math/adolc/default.nix b/pkgs/applications/science/math/adolc/default.nix new file mode 100644 index 0000000000000..636c3ea177a03 --- /dev/null +++ b/pkgs/applications/science/math/adolc/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "adolc"; + version = "2.7.2"; + + src = fetchFromGitHub { + owner = "coin-or"; + repo = "ADOL-C"; + sha256 = "1w0x0p32r1amfmh2lyx33j4cb5bpkwjr5z0ll43zi5wf5gsvckd1"; + rev = "releases/${version}"; + }; + + configureFlags = [ "--with-openmp-flag=-fopenmp" ]; + + meta = with lib; { + description = "Automatic Differentiation of C/C++"; + homepage = "https://github.com/coin-or/ADOL-C"; + maintainers = [ maintainers.bzizou ]; + license = licenses.gpl2Plus; + }; +} + diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index f9931c7d4c96b..41adb1cfbe6cb 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.14.0.14"; + version = "2.14.1.0"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-93J4NaED2XEsVxlY6STpwlS9FI8I60NIAZvDT45xxV0="; + sha256 = "sha256-C1YWZS4x7htUWF3MhRLQIYChL4rdwJxASdPQjttUr0A="; }; postPatch = '' diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/applications/science/math/calculix/calculix.patch index 2334d54711e5a..36048546948c5 100644 --- a/pkgs/applications/science/math/calculix/calculix.patch +++ b/pkgs/applications/science/math/calculix/calculix.patch @@ -1,7 +1,8 @@ -diff -Naur a/ccx_2.17/src/Makefile b/ccx_2.17/src/Makefile ---- a/ccx_2.17/src/Makefile 2020-07-23 21:41:38.507761972 +0200 -+++ b/ccx_2.17/src/Makefile 2020-08-22 16:53:50.004938281 +0200 -@@ -18,15 +18,10 @@ +diff --git a/ccx_2.19/src/Makefile b/ccx_2.19/src/Makefile +index c503513..8a69a0c 100755 +--- a/ccx_2.19/src/Makefile ++++ b/ccx_2.19/src/Makefile +@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o) OCCXC = $(SCCXC:.c=.o) OCCXMAIN = $(SCCXMAIN:.c=.o) @@ -13,10 +14,10 @@ diff -Naur a/ccx_2.17/src/Makefile b/ccx_2.17/src/Makefile - ../../../ARPACK/libarpack_INTEL.a \ - -lpthread -lm -lc - --ccx_2.17: $(OCCXMAIN) ccx_2.17.a $(LIBS) -- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS) -+ccx_2.17: $(OCCXMAIN) ccx_2.17.a -+ $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS) +-ccx_2.19: $(OCCXMAIN) ccx_2.19.a $(LIBS) +- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp ++ccx_2.19: $(OCCXMAIN) ccx_2.19.a ++ $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp - ccx_2.17.a: $(OCCXF) $(OCCXC) + ccx_2.19.a: $(OCCXF) $(OCCXC) ar vr $@ $? diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index e9766b32c2a48..df943277a627e 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -2,18 +2,21 @@ stdenv.mkDerivation rec { pname = "calculix"; - version = "2.17"; + version = "2.19"; src = fetchurl { url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2"; - sha256 = "0l3fizxfdj2mpdp62wnk9v47q2yc3cy39fpsm629z7bjmba8lw6a"; + sha256 = "01vdy9sns58hkm39z6d0r5y7gzqf5z493d18jin9krqib1l6jnn7"; }; nativeBuildInputs = [ gfortran ]; buildInputs = [ arpack spooles blas lapack ]; - NIX_CFLAGS_COMPILE = "-I${spooles}/include/spooles"; + NIX_CFLAGS_COMPILE = [ + "-I${spooles}/include/spooles" + "-std=legacy" + ]; patches = [ ./calculix.patch diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 4700402ff21e2..d684865432d5c 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas -, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty -, readline, gettext, libpng, libao, gfortran, perl +, autoreconfHook, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty +, buildPackages, readline, gettext, libpng, libao, gfortran, perl , enableGUI ? false, libGL, libGLU, xorg, fltk , enableMicroPy ? false, python3 }: @@ -9,11 +9,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; - version = "1.6.0-47"; # TODO try to remove preCheck phase on upgrade + version = "1.9.0-5"; # TODO try to remove preCheck phase on upgrade src = fetchurl { url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; - sha256 = "sha256-c5A9/I6L/o3Y3dxEPoTKpw/fJqYMr6euLldaQ1HWT5c="; + sha256 = "sha256-EP8wRi8QZPrr1lfKN6da87s1FCy8AuDYbzcvsJCWyLE="; }; patches = [ @@ -32,18 +32,21 @@ stdenv.mkDerivation rec { }) ]; + # 1.9.0-5's tarball contains a binary (src/mkjs) which is executed + # at build time. we will delete and rebuild it. + depsBuildBuild = [ buildPackages.stdenv.cc ]; + postPatch = '' for i in doc/*/Makefile* micropython*/xcas/Makefile*; do substituteInPlace "$i" --replace "/bin/cp" "cp"; done; - '' + - # workaround for 1.6.0-47, should not be necessary in future versions - lib.optionalString (!enableMicroPy) '' - sed -i -e 's/micropython-[0-9.]* //' Makefile* + rm src/mkjs + substituteInPlace src/Makefile.am --replace "g++ mkjs.cc" \ + "${buildPackages.stdenv.cc.targetPrefix}c++ mkjs.cc" ''; nativeBuildInputs = [ - texlive.combined.scheme-small bison flex + autoreconfHook texlive.combined.scheme-small bison flex ]; # perl is only needed for patchShebangs fixup. @@ -58,13 +61,6 @@ stdenv.mkDerivation rec { libGL libGLU fltk xorg.libX11 ] ++ lib.optional enableMicroPy python3; - /* fixes: - configure:16211: checking for main in -lntl - configure:16230: g++ -o conftest -g -O2 conftest.cpp -lntl -llapack -lblas -lgfortran -ldl -lpng16 -lm -lmpfi -lmpfr -lgmp >&5 - /nix/store/y9c1v4x7y39j2rfbg17agjwqdzxpsn18-ntl-11.3.2/lib/libntl.so: undefined reference to `pthread_key_create' - */ - NIX_CFLAGS_LINK="-lpthread"; - # xcas Phys and Turtle menus are broken with split outputs # and interactive use is likely to need docs outputs = [ "out" ] ++ lib.optional (!enableGUI) "doc"; diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index dc947a94001b1..399fa3a3c544a 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gurobi"; - version = "9.5.0"; + version = "9.5.1"; src = fetchurl { url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; - sha256 = "sha256-u1QuWl0WhfbjZOrwXqbFVySF/8N6IkUWnPPLQCiLwp4="; + sha256 = "sha256-+oKFnTPwj7iuudpmsPvZFxjtVzxTT1capSNyyd64kdo="; }; sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64"; diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index 6fed10da18bc0..d1397d228df00 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -1,19 +1,30 @@ -{ lib, stdenv -, coreutils +{ lib , patchelf , requireFile +, stdenv +# arguments from default.nix +, lang +, meta +, name +, src +, version +# dependencies , alsa-lib +, coreutils +, cudaPackages , fontconfig , freetype , gcc , glib +, libuuid +, libxml2 , ncurses , opencv2 , openssl , unixODBC , xorg -, libxml2 -, libuuid +# options +, cudaSupport }: let @@ -24,20 +35,10 @@ let throw "Mathematica requires i686-linux or x86_64 linux"; in stdenv.mkDerivation rec { - version = "10.0.2"; + inherit meta src version; pname = "mathematica"; - src = requireFile rec { - name = "Mathematica_${version}_LINUX.sh"; - message = '' - This nix expression requires that ${name} is - already part of the store. Find the file on your Mathematica CD - and add it to the nix store with nix-store --add-fixed sha256 <FILE>. - ''; - sha256 = "1d2yaiaikzcacjamlw64g3xkk81m3pb4vz4an12cv8nb7kb20x9l"; - }; - buildInputs = [ coreutils patchelf @@ -127,10 +128,4 @@ stdenv.mkDerivation rec { # we did this in prefixup already dontPatchELF = true; - - meta = { - description = "Wolfram Mathematica computational software system"; - homepage = "http://www.wolfram.com/mathematica/"; - license = lib.licenses.unfree; - }; } diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix index f6f0046d2725a..50f2644a10b72 100644 --- a/pkgs/applications/science/math/mathematica/11.nix +++ b/pkgs/applications/science/math/mathematica/11.nix @@ -1,14 +1,26 @@ -{ lib, stdenv -, coreutils +{ lib , patchelf , requireFile -, callPackage +, stdenv +# arguments from default.nix +, lang +, meta +, name +, src +, version +# dependencies , alsa-lib +, coreutils +, cudaPackages , dbus , fontconfig , freetype , gcc , glib +, libGL +, libGLU +, libuuid +, libxml2 , ncurses , opencv2 , openssl @@ -16,23 +28,12 @@ , xkeyboard_config , xorg , zlib -, libxml2 -, libuuid -, lang ? "en" -, libGL -, libGLU +# options +, cudaSupport }: -let - l10n = - import ./l10ns.nix { - lib = lib; - inherit requireFile lang; - majorVersion = "11"; - }; -in stdenv.mkDerivation rec { - inherit (l10n) version name src; + inherit meta name src version; buildInputs = [ coreutils @@ -141,10 +142,4 @@ stdenv.mkDerivation rec { # we did this in prefixup already dontPatchELF = true; - - meta = { - description = "Wolfram Mathematica computational software system"; - homepage = "http://www.wolfram.com/mathematica/"; - license = lib.licenses.unfree; - }; } diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 90a7ada99504b..c3d74d8a00277 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -1,9 +1,17 @@ { lib -, stdenv -, coreutils , patchelf , requireFile +, stdenv +# arguments from default.nix +, lang +, meta +, name +, src +, version +# dependencies , alsa-lib +, coreutils +, cudaPackages , fontconfig , freetype , gcc @@ -13,6 +21,8 @@ , openssl , unixODBC , xorg +# options +, cudaSupport }: let @@ -23,18 +33,8 @@ let throw "Mathematica requires i686-linux or x86_64 linux"; in stdenv.mkDerivation rec { + inherit meta src version; pname = "mathematica"; - version = "9.0.0"; - - src = requireFile { - name = "Mathematica_${version}_LINUX.sh"; - message = '' - This nix expression requires that Mathematica_9.0.0_LINUX.sh is - already part of the store. Find the file on your Mathematica CD - and add it to the nix store with nix-store --add-fixed sha256 <FILE>. - ''; - sha256 = "106zfaplhwcfdl9rdgs25x83xra9zcny94gb22wncbfxvrsk3a4q"; - }; buildInputs = [ coreutils @@ -114,10 +114,4 @@ stdenv.mkDerivation rec { # we did this in prefixup already dontPatchELF = true; - - meta = { - description = "Wolfram Mathematica computational software system"; - homepage = "http://www.wolfram.com/mathematica/"; - license = lib.licenses.unfree; - }; } diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index d24cff9e86cee..e48af60cc2fb7 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -1,173 +1,48 @@ -{ lib -, stdenv -, autoPatchelfHook -, buildEnv -, makeWrapper -, requireFile -, alsa-lib -, cups -, dbus -, flite -, fontconfig -, freetype -, gcc-unwrapped -, glib -, gmpxx -, keyutils -, libGL -, libGLU -, libpcap -, libtins -, libuuid -, libxkbcommon -, libxml2 -, llvmPackages_12 -, matio -, mpfr -, ncurses -, opencv4 -, openjdk11 -, openssl -, pciutils -, tre -, unixODBC -, xkeyboard_config -, xorg -, zlib +{ callPackage +, config +, lib +, cudaPackages +, cudaSupport ? config.cudaSupport or false , lang ? "en" +, version ? null }: -let - l10n = import ./l10ns.nix { - inherit lib requireFile lang; - }; -in stdenv.mkDerivation { - inherit (l10n) version name src; - - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - ]; - - buildInputs = [ - alsa-lib - cups.lib - dbus - flite - fontconfig - freetype - glib - gmpxx - keyutils.lib - libGL - libGLU - libpcap - libtins - libuuid - libxkbcommon - libxml2 - llvmPackages_12.libllvm.lib - matio - mpfr - ncurses - opencv4 - openjdk11 - openssl - pciutils - tre - unixODBC - xkeyboard_config - ] ++ (with xorg; [ - libICE - libSM - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXinerama - libXmu - libXrandr - libXrender - libXtst - libxcb - ]); - - wrapProgramFlags = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib zlib ]}" - "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}" - # Fix libQt errors - #96490 - "--set USE_WOLFRAM_LD_LIBRARY_PATH 1" - # Fix xkeyboard config path for Qt - "--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" - ]; - - unpackPhase = '' - runHook preUnpack - - # Find offset from file - offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) - tail -c +$(($offset + 1)) $src | tar -xf - - - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - - cd "$TMPDIR/Unix/Installer" - - mkdir -p "$out/lib/udev/rules.d" - - # Patch MathInstaller's shebangs and udev rules dir - patchShebangs MathInstaller - substituteInPlace MathInstaller \ - --replace /etc/udev/rules.d $out/lib/udev/rules.d - - # Remove PATH restriction, root and avahi daemon checks, and hostname call - sed -i ' - s/^PATH=/# &/ - s/isRoot="false"/# &/ - s/^checkAvahiDaemon$/# &/ - s/`hostname`/""/ - ' MathInstaller - - # NOTE: some files placed under HOME may be useful - XDG_DATA_HOME="$out/share" HOME="$TMPDIR/home" vernierLink=y \ - ./MathInstaller -execdir="$out/bin" -targetdir="$out/libexec/Mathematica" -auto -verbose -createdir=y - - # Check if MathInstaller produced any errors - errLog="$out/libexec/Mathematica/InstallErrors" - if [ -f "$errLog" ]; then - echo "Installation errors:" - cat "$errLog" - return 1 - fi - - runHook postInstall - ''; - - preFixup = '' - for bin in $out/libexec/Mathematica/Executables/*; do - wrapProgram "$bin" ''${wrapProgramFlags[@]} - done - ''; - - dontConfigure = true; - dontBuild = true; - - # This is primarily an IO bound build; there's little benefit to building remotely - preferLocalBuild = true; - - # All binaries are already stripped - dontStrip = true; - - # NOTE: Some deps are still not found; ignore for now - autoPatchelfIgnoreMissingDeps = true; - +let versions = callPackage ./versions.nix { }; + + matching-versions = + lib.sort (v1: v2: lib.versionAtLeast v1.version v2.version) (lib.filter + (v: v.lang == lang + && (if version == null then true else isMatching v.version version)) + versions); + + found-version = + if matching-versions == [] + then throw ("No registered Mathematica version found to match" + + " version=${version} and language=${lang}") + else lib.head matching-versions; + + specific-drv = ./. + "/(lib.versions.major found-version.version).nix"; + + real-drv = if lib.pathExists specific-drv + then specific-drv + else ./generic.nix; + + isMatching = v1: v2: + let as = lib.splitVersion v1; + bs = lib.splitVersion v2; + n = lib.min (lib.length as) (lib.length bs); + sublist = l: lib.sublist 0 n l; + in lib.compareLists lib.compare (sublist as) (sublist bs) == 0; + +in + +callPackage real-drv { + inherit cudaSupport cudaPackages; + inherit (found-version) version lang src; + name = ("mathematica" + + lib.optionalString cudaSupport "-cuda" + + "-${found-version.version}" + + lib.optionalString (lang != "en") "-${lang}"); meta = with lib; { description = "Wolfram Mathematica computational software system"; homepage = "http://www.wolfram.com/mathematica/"; diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix new file mode 100644 index 0000000000000..0f4819172cea9 --- /dev/null +++ b/pkgs/applications/science/math/mathematica/generic.nix @@ -0,0 +1,192 @@ +{ addOpenGLRunpath +, autoPatchelfHook +, lib +, makeWrapper +, requireFile +, runCommand +, stdenv +, symlinkJoin +# arguments from default.nix +, lang +, meta +, name +, src +, version +# dependencies +, alsa-lib +, cudaPackages +, cups +, dbus +, flite +, fontconfig +, freetype +, gcc-unwrapped +, glib +, gmpxx +, keyutils +, libGL +, libGLU +, libpcap +, libtins +, libuuid +, libxkbcommon +, libxml2 +, llvmPackages_12 +, matio +, mpfr +, ncurses +, opencv4 +, openjdk11 +, openssl +, pciutils +, tre +, unixODBC +, xkeyboard_config +, xorg +, zlib +# options +, cudaSupport +}: + +let cudaEnv = symlinkJoin { + name = "mathematica-cuda-env"; + paths = with cudaPackages; [ + cuda_cudart cuda_nvcc libcublas libcufft libcurand libcusparse + ]; + postBuild = '' + ln -s ${addOpenGLRunpath.driverLink}/lib/libcuda.so $out/lib + ln -s lib $out/lib64 + ''; + }; + +in stdenv.mkDerivation { + inherit meta name src version; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ] ++ lib.optional cudaSupport addOpenGLRunpath; + + buildInputs = [ + alsa-lib + cups.lib + dbus + flite + fontconfig + freetype + glib + gmpxx + keyutils.lib + libGL + libGLU + libpcap + libtins + libuuid + libxkbcommon + libxml2 + llvmPackages_12.libllvm.lib + matio + mpfr + ncurses + opencv4 + openjdk11 + openssl + pciutils + tre + unixODBC + xkeyboard_config + ] ++ (with xorg; [ + libICE + libSM + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXinerama + libXmu + libXrandr + libXrender + libXtst + libxcb + ]) ++ lib.optional cudaSupport cudaEnv; + + wrapProgramFlags = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib zlib ]}" + "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}" + # Fix libQt errors - #96490 + "--set USE_WOLFRAM_LD_LIBRARY_PATH 1" + # Fix xkeyboard config path for Qt + "--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" + ] ++ lib.optionals cudaSupport [ + "--set CUDA_PATH ${cudaEnv}" + "--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so" + "--set CUDA_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libcuda.so" + ]; + + unpackPhase = '' + runHook preUnpack + + # Find offset from file + offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) + tail -c +$(($offset + 1)) $src | tar -xf - + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + cd "$TMPDIR/Unix/Installer" + + mkdir -p "$out/lib/udev/rules.d" + + # Patch MathInstaller's shebangs and udev rules dir + patchShebangs MathInstaller + substituteInPlace MathInstaller \ + --replace /etc/udev/rules.d $out/lib/udev/rules.d + + # Remove PATH restriction, root and avahi daemon checks, and hostname call + sed -i ' + s/^PATH=/# &/ + s/isRoot="false"/# &/ + s/^checkAvahiDaemon$/# &/ + s/`hostname`/""/ + ' MathInstaller + + # NOTE: some files placed under HOME may be useful + XDG_DATA_HOME="$out/share" HOME="$TMPDIR/home" vernierLink=y \ + ./MathInstaller -execdir="$out/bin" -targetdir="$out/libexec/Mathematica" -auto -verbose -createdir=y + + # Check if MathInstaller produced any errors + errLog="$out/libexec/Mathematica/InstallErrors" + if [ -f "$errLog" ]; then + echo "Installation errors:" + cat "$errLog" + return 1 + fi + + runHook postInstall + ''; + + preFixup = '' + for bin in $out/libexec/Mathematica/Executables/*; do + wrapProgram "$bin" ''${wrapProgramFlags[@]} + done + ''; + + dontConfigure = true; + dontBuild = true; + + # This is primarily an IO bound build; there's little benefit to building remotely + preferLocalBuild = true; + + # All binaries are already stripped + dontStrip = true; + + # NOTE: Some deps are still not found; ignore for now + autoPatchelfIgnoreMissingDeps = true; +} diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix deleted file mode 100644 index 60841eaa3ee2b..0000000000000 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ lib -, requireFile -, lang -, majorVersion ? null -}: - -let allVersions = with lib; flip map - # N.B. Versions in this list should be ordered from newest to oldest. - [ - { - version = "13.0.1"; - lang = "en"; - language = "English"; - sha256 = "3672a920c1b4af1afd480733f6d67665baf8258757dfe59a6ed6d7440cf26dba"; - installer = "Mathematica_13.0.1_BNDL_LINUX.sh"; - } - { - version = "13.0.0"; - lang = "en"; - language = "English"; - sha256 = "15bbad39a5995031325d1d178f63b00e71706d3ec9001eba6d1681fbc991d3e1"; - installer = "Mathematica_13.0.0_BNDL_LINUX.sh"; - } - { - version = "12.3.1"; - lang = "en"; - language = "English"; - sha256 = "51b9cab12fd91b009ea7ad4968a2c8a59e94dc55d2e6cc1d712acd5ba2c4d509"; - installer = "Mathematica_12.3.1_LINUX.sh"; - } - { - version = "12.3.0"; - lang = "en"; - language = "English"; - sha256 = "045df045f6e796ded59f64eb2e0f1949ac88dcba1d5b6e05fb53ea0a4aed7215"; - installer = "Mathematica_12.3.0_LINUX.sh"; - } - { - version = "12.2.0"; - lang = "en"; - language = "English"; - sha256 = "3b6676a203c6adb7e9c418a5484b037974287b5be09c64e7dfea74ddc0e400d7"; - installer = "Mathematica_12.2.0_LINUX.sh"; - } - { - version = "12.1.1"; - lang = "en"; - language = "English"; - sha256 = "02mk8gmv8idnakva1nc7r7mx8ld02lk7jgsj1zbn962aps3bhixd"; - installer = "Mathematica_12.1.1_LINUX.sh"; - } - { - version = "12.1.0"; - lang = "en"; - language = "English"; - sha256 = "15m9l20jvkxh5w6mbp81ys7mx2lx5j8acw5gz0il89lklclgb8z7"; - installer = "Mathematica_12.1.0_LINUX.sh"; - } - { - version = "12.0.0"; - lang = "en"; - language = "English"; - sha256 = "b9fb71e1afcc1d72c200196ffa434512d208fa2920e207878433f504e58ae9d7"; - installer = "Mathematica_12.0.0_LINUX.sh"; - } - { - version = "11.3.0"; - lang = "en"; - language = "English"; - sha256 = "0fcfe208c1eac8448e7be3af0bdb84370b17bd9c5d066c013928c8ee95aed10e"; - installer = "Mathematica_11.3.0_LINUX.sh"; - } - { - version = "11.2.0"; - lang = "ja"; - language = "Japanese"; - sha256 = "916392edd32bed8622238df435dd8e86426bb043038a3336f30df10d819b49b1"; - installer = "Mathematica_11.2.0_ja_LINUX.sh"; - } - ] - ({ version, lang, language, sha256, installer }: { - inherit version lang; - name = "mathematica-${version}" + optionalString (lang != "en") "-${lang}"; - src = requireFile { - name = installer; - message = '' - This nix expression requires that ${installer} is - already part of the store. Find the file on your Mathematica CD - and add it to the nix store with nix-store --add-fixed sha256 <FILE>. - ''; - inherit sha256; - }; - }); -minVersion = - with lib; - if majorVersion == null - then elemAt (builtins.splitVersion (elemAt allVersions 0).version) 0 - else majorVersion; -maxVersion = toString (1 + builtins.fromJSON minVersion); -in -with lib; -findFirst (l: (l.lang == lang - && l.version >= minVersion - && l.version < maxVersion)) - (throw "Version ${minVersion} in language ${lang} not supported") - allVersions diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix new file mode 100644 index 0000000000000..8f056a2342700 --- /dev/null +++ b/pkgs/applications/science/math/mathematica/versions.nix @@ -0,0 +1,103 @@ +{ lib, requireFile }: + +let versions = [ + { + version = "13.0.1"; + lang = "en"; + language = "English"; + sha256 = "sha256-NnKpIMG0rxr9SAcz9tZ2Zbr4JYdX3+WabtbXRAzybbo="; + installer = "Mathematica_13.0.1_BNDL_LINUX.sh"; + } + { + version = "13.0.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-FbutOaWZUDEyXR0Xj2OwDnFwbT7JAB66bRaB+8mR0+E="; + installer = "Mathematica_13.0.0_BNDL_LINUX.sh"; + } + { + version = "12.3.1"; + lang = "en"; + language = "English"; + sha256 = "sha256-UbnKsS/ZGwCep61JaKLIpZ6U3FXS5swdcSrNW6LE1Qk="; + installer = "Mathematica_12.3.1_LINUX.sh"; + } + { + version = "12.3.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-BF3wRfbnlt7Vn2TrLg8ZSayI3LodW24F+1PqCkrtchU="; + installer = "Mathematica_12.3.0_LINUX.sh"; + } + { + version = "12.2.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-O2Z2ogPGrbfpxBilSEsDeXQoe1vgnGTn3+p03cDkANc="; + installer = "Mathematica_12.2.0_LINUX.sh"; + } + { + version = "12.1.1"; + lang = "en"; + language = "English"; + sha256 = "sha256-rUe4hr5KmGTXD1I/eSYVoFHU68mH2aD2VLZFtOtDswo="; + installer = "Mathematica_12.1.1_LINUX.sh"; + } + { + version = "12.1.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-56P1KKOTJkQj+K9wppAsnYpej/YB3VUNL7DPLYGgqZY="; + installer = "Mathematica_12.1.0_LINUX.sh"; + } + { + version = "12.0.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-uftx4a/MHXLCABlv+kNFEtII+ikg4geHhDP1BOWK6dc="; + installer = "Mathematica_12.0.0_LINUX.sh"; + } + { + version = "11.3.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-D8/iCMHqyESOe+OvC9uENwsXvZxdBmwBOSjI7pWu0Q4="; + installer = "Mathematica_11.3.0_LINUX.sh"; + } + { + version = "11.2.0"; + lang = "ja"; + language = "Japanese"; + sha256 = "sha256-kWOS7dMr7YYiI430Nd2OhkJrsEMDijM28w3xDYGbSbE="; + installer = "Mathematica_11.2.0_ja_LINUX.sh"; + } + { + version = "9.0.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-mKgxdd7dLWa5EOuR5C37SeU+UC9Cv5YTbY5xSK9y34A="; + installer = "Mathematica_9.0.0_LINUX.sh"; + } + { + version = "10.0.2"; + lang = "en"; + language = "English"; + sha256 = "sha256-NHUg1jzLos1EsIr8TdYdNaA5+3jEcFqVZIr9GVVUXrQ="; + installer = "Mathematica_10.0.2_LINUX.sh"; + } +]; + +in + +lib.flip map versions ({ version, lang, language, sha256, installer }: { + inherit version lang; + src = requireFile { + name = installer; + message = '' + This nix expression requires that ${installer} is + already part of the store. Find the file on your Mathematica CD + and add it to the nix store with nix-store --add-fixed sha256 <FILE>. + ''; + inherit sha256; + }; +}) diff --git a/pkgs/applications/science/math/primecount/default.nix b/pkgs/applications/science/math/primecount/default.nix new file mode 100644 index 0000000000000..993092c4653fc --- /dev/null +++ b/pkgs/applications/science/math/primecount/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, primesieve +}: + +stdenv.mkDerivation rec { + pname = "primecount"; + version = "7.3"; + + src = fetchFromGitHub { + owner = "kimwalisch"; + repo = "primecount"; + rev = "v${version}"; + hash = "sha256-hxnn1uiGSB6XRC7yK+SXTwTsJfjhemWXsMNhhL7Ghek="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ primesieve ]; + + cmakeFlags = [ + "-DBUILD_LIBPRIMESIEVE=ON" + "-DBUILD_PRIMECOUNT=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_TESTS=ON" + ]; + + meta = with lib; { + homepage = "https://github.com/kimwalisch/primecount"; + description = "Fast prime counting function implementations"; + longDescription = '' + primecount is a command-line program and C/C++ library that counts the + primes below an integer x ≤ 10^31 using highly optimized implementations + of the combinatorial prime counting algorithms. + + primecount includes implementations of all important combinatorial prime + counting algorithms known up to this date all of which have been + parallelized using OpenMP. primecount contains the first ever open source + implementations of the Deleglise-Rivat algorithm and Xavier Gourdon's + algorithm (that works). primecount also features a novel load balancer + that is shared amongst all implementations and that scales up to hundreds + of CPU cores. primecount has already been used to compute several prime + counting function world records. + ''; + license = licenses.bsd2; + inherit (primesieve.meta) maintainers platforms; + }; +} diff --git a/pkgs/applications/science/math/primesieve/default.nix b/pkgs/applications/science/math/primesieve/default.nix new file mode 100644 index 0000000000000..c57e2d71f1ee4 --- /dev/null +++ b/pkgs/applications/science/math/primesieve/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "primesieve"; + version = "7.9"; + + src = fetchFromGitHub { + owner = "kimwalisch"; + repo = "primesieve"; + rev = "v${version}"; + hash = "sha256-lwT+adKFoNI125y5FuJMovtMh8sFi9oqMLYGLabzrCI="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://primesieve.org/"; + description = "Fast C/C++ prime number generator"; + longDescription = '' + primesieve is a command-line program and C/C++ library for quickly + generating prime numbers. It is very cache efficient, it detects your + CPU's L1 & L2 cache sizes and allocates its main data structures + accordingly. It is also multi-threaded by default, it uses all available + CPU cores whenever possible i.e. if sequential ordering is not + required. primesieve can generate primes and prime k-tuplets up to 264. + ''; + license = licenses.bsd2; + maintainers = teams.sage.members ++ + (with maintainers; [ abbradar AndersonTorres ]); + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 4f68eb6ae78d4..9571588040b33 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-EOiExp8JBc3SybSiBVbuRxBqTujzLjysWM0v94goups="; + sha256 = "sha256-itYNKcdWYMoqlvZ7CYJ6WMv7rS/y1SVdt3O7ahkjPOk="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index 21f0d00339151..50ccee58f5039 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub -, assembleReductionMatrix ? false +{ lib, stdenv, fetchFromGitHub , useCoefficients ? false , indicateProgress ? false , useGoogleHashmap ? false, sparsehash ? null @@ -14,7 +13,7 @@ assert useGoogleHashmap -> sparsehash != null; let inherit (lib) optional; - version = "1.0"; + version = "1.2.1"; in stdenv.mkDerivation { pname = "ripser"; @@ -23,25 +22,17 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "Ripser"; repo = "ripser"; - rev = "f69c6af6ca6883dd518c48faf41cf8901c379598"; - sha256 = "1mw2898s7l29hgajsaf75bs9bjn2sn4g2mvmh41a602jpwp9r0rz"; + rev = "v${version}"; + sha256 = "sha256-BxmkPQ/nl5cF+xwQMTjXnLgkLgdmT/39y7Kzl2wDfpE="; }; - #Patch from dev branch to make compilation work. - #Will be removed when it gets merged into master. - patches = [(fetchurl { - url = "https://github.com/Ripser/ripser/commit/dc78d8ce73ee35f3828f0aad67a4e53620277ebf.patch"; - sha256 = "1y93aqpqz8fm1cxxrf90dhh67im3ndkr8dnxgbw5y96296n4r924"; - })]; - buildInputs = optional useGoogleHashmap sparsehash; buildFlags = [ "-std=c++11" - "-Ofast" + "-O3" "-D NDEBUG" ] - ++ optional assembleReductionMatrix "-D ASSEMBLE_REDUCTION_MATRIX" ++ optional useCoefficients "-D USE_COEFFICIENTS" ++ optional indicateProgress "-D INDICATE_PROGRESS" ++ optional useGoogleHashmap "-D USE_GOOGLE_HASHMAP" diff --git a/pkgs/applications/science/math/sage/patches/docutils-0.18.1-deprecation.patch b/pkgs/applications/science/math/sage/patches/docutils-0.18.1-deprecation.patch new file mode 100644 index 0000000000000..94e0488e21e77 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/docutils-0.18.1-deprecation.patch @@ -0,0 +1,13 @@ +diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py +index 4c56aea078..e51a77ae8a 100644 +--- a/src/sage/misc/sagedoc.py ++++ b/src/sage/misc/sagedoc.py +@@ -1402,6 +1402,8 @@ class _sage_doc: + sage: identity_matrix.__doc__ in browse_sage_doc(identity_matrix, 'rst') + True + sage: browse_sage_doc(identity_matrix, 'html', False) # optional - sphinx ++ ... ++ FutureWarning: The configuration setting "embed_images" will be removed in Docutils 1.2. Use "image_loading: link". + '...div...File:...Type:...Definition:...identity_matrix...' + + In the 'text' version, double colons have been replaced with diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 04c2355d26aa4..b230b0d42a03a 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -13,9 +13,14 @@ let # Fetch a diff between `base` and `rev` on sage's git server. # Used to fetch trac tickets by setting the `base` to the last release and the # `rev` to the last commit of the ticket. - fetchSageDiff = { base, name, rev, sha256, squashed ? false, ...}@args: ( + # + # We don't use sage's own build system (which builds all its + # dependencies), so we exclude changes to "build/" from patches by + # default to avoid conflicts. + fetchSageDiff = { base, name, rev, sha256, squashed ? false, excludes ? [ "build/*" ] + , ...}@args: ( fetchpatch ({ - inherit name sha256; + inherit name sha256 excludes; # There are three places to get changes from: # @@ -49,11 +54,7 @@ let "https://github.com/sagemath/sagetrac-mirror/compare/${base}...${rev}.diff" ] else [ "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}" ]; - - # We don't care about sage's own build system (which builds all its dependencies). - # Exclude build system changes to avoid conflicts. - excludes = [ "build/*" ]; - } // builtins.removeAttrs args [ "rev" "base" "sha256" "squashed" ]) + } // builtins.removeAttrs args [ "rev" "base" "sha256" "squashed" "excludes" ]) ); in stdenv.mkDerivation rec { @@ -172,6 +173,29 @@ stdenv.mkDerivation rec { rev = "8452003846a7303100847d8d0ed642fc642c11d6"; sha256 = "sha256-A/XMouPlc2sjFp30L+56fBGJXydS2EtzfPOV98FCDqI="; }) + + # https://trac.sagemath.org/ticket/33226 + (fetchSageDiff { + base = "9.6.beta0"; + name = "giac-1.7.0-45-update.patch"; + rev = "33ea2adf01e9e2ce9f1e33779f0b1ac0d9d1989c"; + sha256 = "sha256-DOyxahf3+IaYdkgmAReNDCorRzMgO8+yiVrJ5TW1km0="; + }) + + # https://trac.sagemath.org/ticket/33398 + (fetchSageDiff { + base = "9.6.beta4"; + name = "sympy-1.10-update.patch"; + rev = "6b7c3a28656180e42163dc10f7b4a571b93e5f27"; + sha256 = "sha256-fnUyM2yjHkCykKRfzQQ4glcUYmCS/fYzDzmCf0nuebk="; + # The patch contains a whitespace change to a file that didn't exist in Sage 9.5. + excludes = [ "build/*" "src/sage/manifolds/vector_bundle_fiber_element.py" ]; + }) + + # docutils 0.18.1 now triggers Sphinx warnings. tolerate them for + # now, because patching Sphinx is not feasible. + # https://github.com/sphinx-doc/sphinx/issues/9777#issuecomment-1104481271 + ./patches/docutils-0.18.1-deprecation.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 23712061160e4..aad3eaf529a0a 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -4,6 +4,7 @@ , buildPackages , sharutils , file +, getconf , flint , ntl , cddlib @@ -87,7 +88,7 @@ stdenv.mkDerivation rec { latex2html texinfo4 texlive.combined.scheme-small - ]; + ] ++ lib.optionals stdenv.isDarwin [ getconf ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; preAutoreconf = '' diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix new file mode 100644 index 0000000000000..cf9364ffac174 --- /dev/null +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -0,0 +1,147 @@ +{ lib +, stdenv +, autoPatchelfHook +, requireFile +, callPackage +, makeWrapper +, alsa-lib +, dbus +, fontconfig +, freetype +, gcc +, glib +, installShellFiles +, libssh2 +, ncurses +, opencv4 +, openssl +, unixODBC +, xkeyboard_config +, xorg +, zlib +, libxml2 +, libuuid +, lang ? "en" +, libGL +, libGLU +}: + +let + l10n = import ./l10ns.nix { + lib = lib; + inherit requireFile lang; + }; + dirName = "WolframEngine"; +in +stdenv.mkDerivation rec { + inherit (l10n) version name src; + + nativeBuildInputs = [ + autoPatchelfHook + installShellFiles + makeWrapper + ]; + + buildInputs = [ + alsa-lib + dbus + fontconfig + freetype + gcc.cc + gcc.libc + glib + libssh2 + ncurses + opencv4 + openssl + stdenv.cc.cc.lib + unixODBC + xkeyboard_config + libxml2 + libuuid + zlib + libGL + libGLU + ] ++ (with xorg; [ + libX11 + libXext + libXtst + libXi + libXmu + libXrender + libxcb + libXcursor + libXfixes + libXrandr + libICE + libSM + ]); + + # some bundled libs are found through LD_LIBRARY_PATH + autoPatchelfIgnoreMissingDeps = true; + + ldpath = lib.makeLibraryPath buildInputs + + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); + + unpackPhase = '' + # find offset from file + offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) + dd if="$src" ibs=$offset skip=1 | tar -xf - + cd Unix + ''; + + installPhase = '' + cd Installer + sed -i -e 's/^PATH=/# PATH=/' -e 's/=`id -[ug]`/=0/' MathInstaller + + # Installer wants to write default config in HOME + export HOME=$(mktemp -d) + + # Fix the installation script + patchShebangs MathInstaller + substituteInPlace MathInstaller \ + --replace '`hostname`' "" \ + --replace "chgrp" "# chgrp" \ + --replace "chown" ": # chown" + + # Install the desktop items + export XDG_DATA_HOME="$out/share" + + ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/${dirName} -silent + + # Fix library paths + cd $out/libexec/${dirName}/Executables + for path in MathKernel math mcc wolfram; do + makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" + done + + for path in WolframKernel wolframscript; do + makeWrapper $out/libexec/${dirName}/SystemFiles/Kernel/Binaries/Linux-x86-64/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" + done + + # ... and xkeyboard config path for Qt + for path in WolframPlayer wolframplayer; do + makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path \ + --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" + done + + # Install man pages + installManPage $out/libexec/${dirName}/SystemFiles/SystemDocumentation/Unix/* + ''; + + # This is primarily an IO bound build; there's little benefit to building remotely. + preferLocalBuild = true; + + # Stripping causes the program to core dump. + dontStrip = true; + + meta = with lib; { + description = "Wolfram Engine computational software system"; + homepage = "https://www.wolfram.com/engine/"; + license = licenses.unfree; + maintainers = with maintainers; [ fbeffa ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/math/wolfram-engine/l10ns.nix b/pkgs/applications/science/math/wolfram-engine/l10ns.nix new file mode 100644 index 0000000000000..9bee8052c6e36 --- /dev/null +++ b/pkgs/applications/science/math/wolfram-engine/l10ns.nix @@ -0,0 +1,51 @@ +{ lib +, requireFile +, lang +, majorVersion ? null +}: + +let allVersions = with lib; flip map + # N.B. Versions in this list should be ordered from newest to oldest. + [ + { + version = "13.0.1"; + lang = "en"; + language = "English"; + sha256 = "1rrxi7d51m02407k719fq829jzanh550wr810i22n3irhk8axqga"; + installer = "WolframEngine_13.0.1_LINUX.sh"; + } + { + version = "13.0.0"; + lang = "en"; + language = "English"; + sha256 = "10cpwllz9plxz22iqdh6xgkxqphl9s9nq8ax16pafjll6j9kqy1q"; + installer = "WolframEngine_13.0.0_LINUX.sh"; + } + ] + ({ version, lang, language, sha256, installer }: { + inherit version lang; + name = "wolfram-engine-${version}" + optionalString (lang != "en") "-${lang}"; + src = requireFile { + name = installer; + message = '' + This nix expression requires that ${installer} is + already part of the store. Download the file from + https://www.wolfram.com/engine/ and add it to the nix store + with nix-store --add-fixed sha256 <FILE>. + ''; + inherit sha256; + }; + }); +minVersion = + with lib; + if majorVersion == null + then elemAt (builtins.splitVersion (elemAt allVersions 0).version) 0 + else majorVersion; +maxVersion = toString (1 + builtins.fromJSON minVersion); +in +with lib; +findFirst (l: (l.lang == lang + && l.version >= minVersion + && l.version < maxVersion)) + (throw "Version ${minVersion} in language ${lang} not supported") + allVersions diff --git a/pkgs/applications/science/math/wolfram-engine/notebook.nix b/pkgs/applications/science/math/wolfram-engine/notebook.nix new file mode 100644 index 0000000000000..85570eeca7fbc --- /dev/null +++ b/pkgs/applications/science/math/wolfram-engine/notebook.nix @@ -0,0 +1,9 @@ +{ lib, stdenv, writeScriptBin, jupyter, wolfram-for-jupyter-kernel }: + +let + wolfram-jupyter = jupyter.override { definitions = { wolfram = wolfram-for-jupyter-kernel.definition; }; }; +in + writeScriptBin "wolfram-notebook" '' + #! ${stdenv.shell} + ${wolfram-jupyter}/bin/jupyter-notebook + '' diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix index bee2be729d1ed..2050517894b97 100644 --- a/pkgs/applications/science/medicine/xmedcon/default.nix +++ b/pkgs/applications/science/medicine/xmedcon/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xmedcon"; - version = "0.21.2"; + version = "0.22.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0svff8rc3j2p47snaq1hx9mv4ydmxawpb0hf3d165g1ccjwvmm6m"; + sha256 = "sha256-Ui7XoLSzTMPIFW/3nARCmvlGF+1l7pmcnKsnvn3NFJE="; }; buildInputs = [ diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 6dfc6f7ea55ac..8f840b2998db2 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -17,15 +17,15 @@ python3Packages.buildPythonApplication rec { pname = "bada-bib"; - version = "0.6.1"; + version = "0.6.2"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitHub { owner = "RogerCrocker"; repo = "BadaBib"; - rev = "v${version}"; - sha256 = "sha256-fuGGKBScdo9rI3tLSBWIcWEME8nSuct0IUyfmI7PzCc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-3dXtBwqEqiXLjntmqLYeuwLv0RDb774+yOXc7vdf8+Y="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index c41c8593a5c49..8dc8f749897ee 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,10 +1,14 @@ { mkDerivation, lib, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, - cudaSupport ? false, cudatoolkit ? null }: + cudaSupport ? false, cudaPackages }: -assert !cudaSupport || cudatoolkit != null; +assert cudaSupport -> cudaPackages != { }; -let boost_static = boost17x.override { enableStatic = true; }; +let + boost_static = boost17x.override { enableStatic = true; }; + + # TODO: migrate to redist packages + inherit (cudaPackages) cudatoolkit; in mkDerivation rec { version = "3.7"; @@ -13,15 +17,27 @@ mkDerivation rec { owner = "colmap"; repo = "colmap"; rev = version; - sha256 = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I="; + hash = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I="; }; + # TODO: rm once the gcc11 issue is closed, https://github.com/colmap/colmap/issues/1418#issuecomment-1049305256 + cmakeFlags = lib.optionals cudaSupport [ + "-DCUDA_ENABLED=ON" + "-DCUDA_NVCC_FLAGS=--std=c++14" + ]; + buildInputs = [ boost_static ceres-solver eigen freeimage glog libGLU glew qtbase - ] ++ lib.optional cudaSupport cudatoolkit; + ] ++ lib.optionals cudaSupport [ + cudatoolkit + ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals cudaSupport [ + cudaPackages.autoAddOpenGLRunpathHook + ]; meta = with lib; { description = "COLMAP - Structure-From-Motion and Multi-View Stereo pipeline"; diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index b3647e0f1b60b..6a1bdc3de1607 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20220221074232"; + version = "3.1.20220224085855"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = version; - sha256 = "sha256-hUdwtqYHcfyJ68LzwwCXAxr7YIkJm64brb+kA/WJqU8="; + sha256 = "sha256-7+1xOV5Lodqtku0wX1urAEHsCcYKM3Vcd5RDg4DdVow="; }; postPatch = '' diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index a3d6e1564666e..6bc65e644b214 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline gnuplot swig3 ]; + NIX_CFLAGS_COMPILE = [ + "-std=c++11" + ]; + meta = { description = "Curve fitting and peak fitting software"; license = lib.licenses.gpl2; diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix index ed92dfb90dabc..d32f4312047a3 100644 --- a/pkgs/applications/science/misc/netlogo/default.nix +++ b/pkgs/applications/science/misc/netlogo/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # launcher with `cd` is required b/c otherwise the model library isn't usable makeWrapper "${jre}/bin/java" "$out/bin/netlogo" \ - --run "cd $out/share/netlogo/app" \ + --chdir "$out/share/netlogo/app" \ --add-flags "-jar netlogo-${version}.jar" cp $src1 $out/share/icons/hicolor/256x256/apps/netlogo.png diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index de85043f127e0..40a5412e7af77 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -85,6 +85,11 @@ stdenv.mkDerivation rec { patchShebangs build/unix/ ln -s ${lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/ + + # __malloc_hook is deprecated + substituteInPlace misc/memstat/src/TMemStatHook.cxx \ + --replace "defined(R__GNU) && (defined(R__LINUX) || defined(__APPLE__))" \ + "defined(R__GNU) && (defined(__APPLE__))" '' # Fix CINTSYSDIR for "build" version of rootcint # This is probably a bug that breaks out-of-source builds diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index f4a3da9711dda..66acf07f8e4d7 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -1,10 +1,21 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, fetchFromGitHub +, python3 +}: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "6.15.5"; + version = "7.6.2"; + format = "setuptools"; - propagatedBuildInputs = with python3Packages; [ + src = fetchFromGitHub { + owner = "snakemake"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-mIl5c+HR2kqgJzbLVTQjJlf4Ca/+Icqg9G49yIUyipc="; + }; + + propagatedBuildInputs = with python3.pkgs; [ appdirs configargparse connection-pool @@ -22,26 +33,21 @@ python3Packages.buildPythonApplication rec { pyyaml ratelimiter requests + retry smart-open stopit tabulate toposort wrapt + yte ]; - src = fetchFromGitHub { - owner = "snakemake"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-i8C7gPLzUzSxNH9xwpr+fUKI1SvpYFsFBlspS74LoWU="; - }; - # See # https://github.com/snakemake/snakemake/blob/main/.github/workflows/main.yml#L99 # for the current basic test suite. Tibanna and Tes require extra # setup. - checkInputs = with python3Packages; [ + checkInputs = with python3.pkgs; [ pandas pytestCheckHook requests-mock @@ -53,7 +59,15 @@ python3Packages.buildPythonApplication rec { "tests/test_linting.py" ]; - pythonImportsCheck = [ "snakemake" ]; + disabledTests = [ + # Tests require network access + "test_github_issue1396" + "test_github_issue1460" + ]; + + pythonImportsCheck = [ + "snakemake" + ]; meta = with lib; { homepage = "https://snakemake.github.io"; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 69810f95b8465..b3a3eb2bd2a8e 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2022"; + version = "2022.1"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "0s1bv8nvmdpiyk2yhcmzq8q936hm5jgnqb393101drh2dih0vmps"; + sha256 = "sha256-hd2rUZfXlSSnAsSVnCxDvodeD8Rx3zo1Ikk53OhRJFA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index 63dfe6c283730..a203db1204cb3 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, qt4, qwt6_qt4, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtkWithQt5}: stdenv.mkDerivation rec { pname = "elmerfem"; @@ -13,19 +13,44 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ cmake gfortran pkg-config git ]; - buildInputs = [ mpi blas liblapack qt4 qwt6_qt4 ]; + nativeBuildInputs = [ + cmake + gfortran + pkg-config + libsForQt5.wrapQtAppsHook + ]; + buildInputs = [ + mpi + blas + liblapack + libsForQt5.qtbase + libsForQt5.qtscript + libsForQt5.qwt + libGL + libGLU + opencascade + vtkWithQt5 + ]; preConfigure = '' patchShebangs ./ ''; + patches = [ + ./patches/0001-fix-import-of-QPainterPath.patch + ./patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch + ./patches/0003-ignore-qwt_compat.patch + ]; + storepath = placeholder "out"; cmakeFlags = [ "-DELMER_INSTALL_LIB_DIR=${storepath}/lib" "-DWITH_OpenMP:BOOLEAN=TRUE" "-DWITH_MPI:BOOLEAN=TRUE" + "-DWITH_QT5:BOOLEAN=TRUE" + "-DWITH_OCC:BOOLEAN=TRUE" + "-DWITH_VTK:BOOLEAN=TRUE" "-DWITH_ELMERGUI:BOOLEAN=TRUE" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" diff --git a/pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch b/pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch new file mode 100644 index 0000000000000..a9e1ba442b452 --- /dev/null +++ b/pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch @@ -0,0 +1,24 @@ +From 87885de957aa3f891fe963503c94685675c24f49 Mon Sep 17 00:00:00 2001 +From: grindhold <grindhold@gmx.net> +Date: Wed, 27 Apr 2022 19:16:42 +0200 +Subject: [PATCH] fix import of QPainterPath + +--- + ElmerGUI/Application/twod/renderarea.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ElmerGUI/Application/twod/renderarea.cpp b/ElmerGUI/Application/twod/renderarea.cpp +index 4c2515c5..65128ea9 100644 +--- a/ElmerGUI/Application/twod/renderarea.cpp ++++ b/ElmerGUI/Application/twod/renderarea.cpp +@@ -38,6 +38,7 @@ + * * + *****************************************************************************/ + #include <QPainter> ++#include <QPainterPath> + #include <QMouseEvent> + #include <QFile> + #include <QTextStream> +-- +2.33.3 + diff --git a/pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch b/pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch new file mode 100644 index 0000000000000..6c2782b9e0bd8 --- /dev/null +++ b/pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch @@ -0,0 +1,82 @@ +From 06634e5fd46a27dca11b87d4a38e9ead561de3d5 Mon Sep 17 00:00:00 2001 +From: grindhold <grindhold@gmx.net> +Date: Thu, 28 Apr 2022 15:47:07 +0200 +Subject: [PATCH] fem: rename loopvars to avoid redefinition + +--- + fem/src/modules/DCRComplexSolve.F90 | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/fem/src/modules/DCRComplexSolve.F90 b/fem/src/modules/DCRComplexSolve.F90 +index 469214ee..268591fd 100644 +--- a/fem/src/modules/DCRComplexSolve.F90 ++++ b/fem/src/modules/DCRComplexSolve.F90 +@@ -502,14 +502,14 @@ CONTAINS + + IF ( SIZE(Hwrk,1) == 1 ) THEN + +- DO i=1,MIN(3,SIZE(Hwrk,2)) +- Tensor( i,1:n ) = Hwrk( 1,1,1:n ) ++ DO k=1,MIN(3,SIZE(Hwrk,2)) ++ Tensor( k,1:n ) = Hwrk( 1,1,1:n ) + END DO + + ELSE + +- DO i=1,MIN(3,SIZE(Hwrk,1)) +- Tensor( i,1:n ) = Hwrk( i,1,1:n ) ++ DO k=1,MIN(3,SIZE(Hwrk,1)) ++ Tensor( k,1:n ) = Hwrk( k,1,1:n ) + END DO + + END IF +@@ -1391,21 +1391,21 @@ contains + + IF ( SIZE(Hwrk,1) == 1 ) THEN + +- DO i=1,MIN(3,SIZE(Hwrk,2)) +- Tensor( i,i,1:n ) = Hwrk( 1,1,1:n ) ++ DO k=1,MIN(3,SIZE(Hwrk,2)) ++ Tensor( k,k,1:n ) = Hwrk( 1,1,1:n ) + END DO + + ELSE IF ( SIZE(Hwrk,2) == 1 ) THEN + +- DO i=1,MIN(3,SIZE(Hwrk,1)) +- Tensor(i,i,1:n) = Hwrk(i,1,1:n) ++ DO k=1,MIN(3,SIZE(Hwrk,1)) ++ Tensor(k,k,1:n) = Hwrk(k,1,1:n) + END DO + + ELSE + +- DO i=1,MIN(3,SIZE(Hwrk,1)) ++ DO k=1,MIN(3,SIZE(Hwrk,1)) + DO j=1,MIN(3,SIZE(Hwrk,2)) +- Tensor( i,j,1:n ) = Hwrk(i,j,1:n) ++ Tensor( k,j,1:n ) = Hwrk(k,j,1:n) + END DO + END DO + +@@ -1443,14 +1443,14 @@ contains + + IF ( SIZE(Hwrk,1) == 1 ) THEN + +- DO i=1,MIN(3,SIZE(Hwrk,2)) +- Tensor( i,1:n ) = Hwrk( 1,1,1:n ) ++ DO k=1,MIN(3,SIZE(Hwrk,2)) ++ Tensor( k,1:n ) = Hwrk( 1,1,1:n ) + END DO + + ELSE + +- DO i=1,MIN(3,SIZE(Hwrk,1)) +- Tensor( i,1:n ) = Hwrk( i,1,1:n ) ++ DO k=1,MIN(3,SIZE(Hwrk,1)) ++ Tensor( k,1:n ) = Hwrk( k,1,1:n ) + END DO + + END IF +-- +2.33.3 + diff --git a/pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch b/pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch new file mode 100644 index 0000000000000..26954008d5d40 --- /dev/null +++ b/pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch @@ -0,0 +1,36 @@ +From 26601fec36a4978e805aad40e6d0cbf268c653d2 Mon Sep 17 00:00:00 2001 +From: grindhold <grindhold@gmx.net> +Date: Thu, 28 Apr 2022 17:13:06 +0200 +Subject: [PATCH] ignore qwt_compat + +--- + ElmerGUI/Application/src/convergenceview.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ElmerGUI/Application/src/convergenceview.h b/ElmerGUI/Application/src/convergenceview.h +index 377b644b..64250149 100755 +--- a/ElmerGUI/Application/src/convergenceview.h ++++ b/ElmerGUI/Application/src/convergenceview.h +@@ -52,7 +52,7 @@ + #include <qwt_plot_grid.h> + #include <qwt_legend.h> + /*#include <qwt_data.h> <-- deprecated in Qwt6, using qwt_compat.h instead*/ +-#include <qwt_compat.h> ++/*#include <qwt_compat.h>*/ + #include <qwt_text.h> + #include <qwt_scale_engine.h> + +@@ -76,8 +76,8 @@ public: + + private: + int d_count; +- QwtArray<double> d_x; +- QwtArray<double> d_y; ++ QVector<double> d_x; ++ QVector<double> d_y; + }; + + class Curve +-- +2.33.3 + diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 51d6c9d68fe4b..2be6153878893 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -1,53 +1,57 @@ -{ lib, stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, lapack, libyaml, lynx -, mela, root5, qcdnum, which, libtirpc +{ lib +, stdenv +, fetchurl +, apfel +, apfelgrid +, applgrid +, blas +, ceres-solver +, cmake +, gfortran +, gsl +, lapack +, lhapdf +, libtirpc +, libyaml +, libyamlcpp +, pkg-config +, qcdnum +, root +, zlib , memorymappingHook, memstreamHook }: stdenv.mkDerivation rec { pname = "xfitter"; - version = "2.0.1"; + version = "2.2.0"; src = fetchurl { name = "${pname}-${version}.tgz"; url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${pname}-${version}.tgz"; - sha256 = "0kmgc67nw5flp92yw5x6l2vsnhwsfi5z2a20404anisdgdjs8zc6"; + sha256 = "sha256-ZHIQ5hOY+k0/wmpE0o4Po+RZ4MkVMk+bK1Rc6eqwwH0="; }; - patches = [ - ./undefined_behavior.patch - ]; + preConfigure = '' + substituteInPlace CMakeLists.txt \ + --replace "-fallow-argument-mismatch" "" + ''; - preConfigure = - # Fix F77LD to workaround for a following build error: - # - # gfortran: error: unrecognized command line option '-stdlib=libc++' - # - lib.optionalString stdenv.isDarwin '' - substituteInPlace src/Makefile.in \ - --replace "F77LD = \$(F77)" "F77LD = \$(CXXLD)" \ - ''; - - configureFlags = [ - "--enable-apfel" - "--enable-apfelgrid" - "--enable-applgrid" - "--enable-mela" - "--enable-lhapdf" - ]; - - nativeBuildInputs = [ gfortran which ]; + nativeBuildInputs = [ cmake gfortran pkg-config ]; buildInputs = - [ apfel apfelgrid applgrid blas lhapdf libyaml lapack mela root5 qcdnum ] + [ apfel blas ceres-solver lhapdf lapack libyaml root qcdnum gsl libyamlcpp zlib ] + ++ lib.optionals ("5" == lib.versions.major root.version) [ apfelgrid applgrid ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ] ++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc ; - propagatedBuildInputs = [ lynx ]; - - enableParallelBuilding = true; NIX_CFLAGS_COMPILE = lib.optional (stdenv.hostPlatform.libc == "glibc") "-I${libtirpc.dev}/include/tirpc"; NIX_LDFLAGS = lib.optional (stdenv.hostPlatform.libc == "glibc") "-ltirpc"; + # workaround wrong library IDs + postInstall = lib.optionalString stdenv.isDarwin '' + ln -sv "$out/lib/xfitter/"* "$out/lib/" + ''; + meta = with lib; { description = "The xFitter project is an open source QCD fit framework ready to extract PDFs and assess the impact of new data"; license = licenses.gpl3; diff --git a/pkgs/applications/science/physics/xfitter/undefined_behavior.patch b/pkgs/applications/science/physics/xfitter/undefined_behavior.patch deleted file mode 100644 index 53278527a807a..0000000000000 --- a/pkgs/applications/science/physics/xfitter/undefined_behavior.patch +++ /dev/null @@ -1,454 +0,0 @@ -diff --git a/DY/src/finterface.cc b/DY/src/finterface.cc ---- a/DY/src/finterface.cc -+++ b/DY/src/finterface.cc -@@ -14,17 +14,17 @@ - using namespace std; - - extern "C" { -- int dy_create_calc_(const int *ds_id, const int *chg_prod, -+ void dy_create_calc_(const int *ds_id, const int *chg_prod, - const double *beam_en, const char *boz, - const double *ranges, const char *var_name, - const int *n_bins, const double *bin_edges); - -- int dy_do_calc_(); -+ void dy_do_calc_(); - -- int dy_get_res_(const int *ds_id, double *calc_res); -+ void dy_get_res_(const int *ds_id, double *calc_res); - -- int dy_release_(); -- int dy_set_ewpars_(); -+ void dy_release_(); -+ void dy_set_ewpars_(); - } - - typedef map <int, DYcalc* > DCmap; -@@ -34,7 +34,7 @@ vector<BinMatrix*> gBinMatrices; - - // initializes Drell-Yan LO calculations with info on - // beam, process, kinematic cuts, and bins. --int dy_create_calc_(const int *ds_id, const int *chg_prod, -+void dy_create_calc_(const int *ds_id, const int *chg_prod, - const double *beam_en, const char *boz, - const double *ranges, const char *var_name, - const int *n_bins, const double *bin_edges) -@@ -99,13 +99,11 @@ int dy_create_calc_(const int *ds_id, const int *chg_prod, - // create calculator and put to map - DYcalc * dc = new DYcalc(bm, pc, int_steps); - gCalcs.insert( pair<int,DYcalc*>( *ds_id,dc ) ); -- -- return 1; - } - - - // calculate Drell-Yan LO cross sections for all data sets --int dy_do_calc_() -+void dy_do_calc_() - { - // evolve convolutions - vector<PDFconv*>::iterator ipc = gPDFconvs.begin(); -@@ -118,28 +116,24 @@ int dy_do_calc_() - if ( true != idc->second->Integrate() ) { - cout << "Something is wrong with DY integration for " - << idc->first << " data set." << endl; -- return 0; -+ return; - } - } -- -- return 1; - } - - - // return DY calculations for data set ds_name --int dy_get_res_(const int *ds_id, double *calc_res) -+void dy_get_res_(const int *ds_id, double *calc_res) - { - DYcalc * dc = gCalcs.find(*ds_id)->second; - dc->getCalcRes(calc_res); -- -- return 1; - } - --int dy_set_ewpars_(){ -+void dy_set_ewpars_(){ - PhysPar::setPhysPar(); - } - --int dy_release_() -+void dy_release_() - { - vector<PDFconv*>::iterator ipc = gPDFconvs.begin(); - for (; ipc!=gPDFconvs.end(); ipc++){ -@@ -155,6 +149,4 @@ int dy_release_() - for (; idc != gCalcs.end() ; idc++){ - delete (idc->second); - } -- -- return 1; - } -diff --git a/DiffDIS/include/DataTable.h b/DiffDIS/include/DataTable.h ---- a/DiffDIS/include/DataTable.h -+++ b/DiffDIS/include/DataTable.h -@@ -307,6 +307,7 @@ class DataTable_t { - for(ic=0; ic < GetNcols(); ic++) { - for(ir=0; ir < npt; ir++) Data[ic][ir] = A.Data[ic][ir]; - } -+ return *this; - } - - //@} -diff --git a/FastNLO/src/FastNLOInterface.cc b/FastNLO/src/FastNLOInterface.cc ---- a/FastNLO/src/FastNLOInterface.cc -+++ b/FastNLO/src/FastNLOInterface.cc -@@ -39,14 +39,14 @@ void gauleg(double x1,double x2,double *x,double *w, int n); - - - extern "C" { -- int fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_FIT_ORDER, bool *PublicationUnits , double* murdef, double* murscale, double *mufdef, double* mufscale); -- int fastnlocalc_(const int *idataset, double *xsec); -- int fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *tot, int *Npt); -- int fastnlopointskip_(const int *idataset, int *point, int *npoints); -- int hf_errlog_(const int* ID, const char* TEXT, long length); -- int hf_stop_(); -+ void fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_FIT_ORDER, bool *PublicationUnits , double* murdef, double* murscale, double *mufdef, double* mufscale); -+ void fastnlocalc_(const int *idataset, double *xsec); -+ void fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *tot, int *Npt); -+ void fastnlopointskip_(const int *idataset, int *point, int *npoints); -+ void hf_errlog_(const int* ID, const char* TEXT, long length); -+ void hf_stop_(); - double interp_(double *A, double *xx1, double *x, int *NGrid1, double *res); -- int setfastnlotoppar_(const int *idataset); -+ void setfastnlotoppar_(const int *idataset); - } - - -@@ -58,7 +58,7 @@ map<int, FastNLOxFitter*> gFastNLO_array; - map<int, BoolArray*> gUsedPoints_array; - int CreateUsedPointsArray(int idataset, int npoints); - --int fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_FIT_ORDER, bool *PublicationUnits , double* murdef, double* murscale, double *mufdef, double* mufscale) { -+void fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_FIT_ORDER, bool *PublicationUnits , double* murdef, double* murscale, double *mufdef, double* mufscale) { - - - map<int, FastNLOxFitter*>::const_iterator FastNLOIterator = gFastNLO_array.find(*idataset); -@@ -67,7 +67,7 @@ int fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_ - const char* text = "I: Double initialization of the same fastnlo data set!"; - hf_errlog_(&id, text, (long)strlen(text)); - //hf_stop_(); -- return 1; -+ return; - } - - FastNLOxFitter* fnloreader = new FastNLOxFitter( thfile ); -@@ -112,10 +112,9 @@ int fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_ - } - - gFastNLO_array.insert(pair<int, FastNLOxFitter*>(*idataset, fnloreader) ); -- return 0; - } - --int setfastnlotoppar_(const int *idataset) { -+void setfastnlotoppar_(const int *idataset) { - //!< Dedicated settings for difftop - map<int, FastNLOxFitter*>::const_iterator FastNLOIterator = gFastNLO_array.find(*idataset); - map<int, BoolArray*>::const_iterator UsedPointsIterator = gUsedPoints_array.find(*idataset); -@@ -130,11 +129,9 @@ int setfastnlotoppar_(const int *idataset) { - fnloreader->SetExternalFuncForMuF( &Function_Mu ); - fnloreader->SetExternalFuncForMuR( &Function_Mu); - //fnloreader->SetScaleFactorsMuRMuF(1.0,1.0); //Be reminded that muR and muF scales are hard coded (that's not true!) -- -- return 0; - } - --int fastnlocalc_(const int *idataset, double *xsec) { -+void fastnlocalc_(const int *idataset, double *xsec) { - - map<int, FastNLOxFitter*>::const_iterator FastNLOIterator = gFastNLO_array.find(*idataset); - map<int, BoolArray*>::const_iterator UsedPointsIterator = gUsedPoints_array.find(*idataset); -@@ -176,13 +173,10 @@ int fastnlocalc_(const int *idataset, double *xsec) { - outputidx++; - } - } -- -- -- return 0; - } - - //MK14 New function for Difftop calculation: it is called in trunk/src/difftop_fastnlo.f --int fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *tot, int *Npt){ -+void fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *tot, int *Npt){ - - map<int, FastNLOxFitter*>::const_iterator FastNLOIterator = gFastNLO_array.find(*idataset); - map<int, BoolArray*>::const_iterator UsedPointsIterator = gUsedPoints_array.find(*idataset); -@@ -262,10 +256,6 @@ int fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *to - Total += interpC(xsec,xg[k],thbin,Nthpoints)*wg[k]; - - *tot = Total; -- -- -- -- return 0; - } - - -@@ -277,7 +267,7 @@ int fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *to - - - --int fastnlopointskip_(const int *idataset, int *point, int *npoints) { -+void fastnlopointskip_(const int *idataset, int *point, int *npoints) { - map<int, BoolArray*>::const_iterator UsedPointsIterator = gUsedPoints_array.find(*idataset); - if(UsedPointsIterator == gUsedPoints_array.end( )) - CreateUsedPointsArray(*idataset, *npoints); -@@ -292,8 +282,6 @@ int fastnlopointskip_(const int *idataset, int *point, int *npoints) { - - BoolArray* usedpoints = UsedPointsIterator->second; - usedpoints->at(*point-1) = false; -- -- return 0; - } - - int CreateUsedPointsArray(int idataset, int npoints) { -diff --git a/Hathor/src/HathorInterface.cc b/Hathor/src/HathorInterface.cc ---- a/Hathor/src/HathorInterface.cc -+++ b/Hathor/src/HathorInterface.cc -@@ -6,9 +6,9 @@ - #include "../interface/xFitterPdf.h" - - extern "C" { -- int hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, const double& mt, -+ void hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, const double& mt, - const unsigned int& pertubOrder, const unsigned int& precisionLevel); -- int hathorcalc_(const int *idataset, double *xsec); -+ void hathorcalc_(const int *idataset, double *xsec); - } - - extern "C" { -@@ -19,7 +19,7 @@ extern "C" { - } - - extern "C" { -- int hf_errlog_(const int* ID, const char* TEXT, long length); -+ void hf_errlog_(const int* ID, const char* TEXT, long length); - } - - // FIXME: delete pointers at the end! (in some hathordestroy_ or so) -@@ -28,7 +28,7 @@ xFitterPdf* pdf; - int* rndStore; - double mtop; - --int hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, const double& mt, -+void hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, const double& mt, - const unsigned int& pertubOrder, const unsigned int& precisionLevel) { - - if(hathor_array.size()==0) { -@@ -69,7 +69,7 @@ int hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, con - return 0; - } - --int hathorcalc_(const int *idataset, double *xsec) { -+void hathorcalc_(const int *idataset, double *xsec) { - rlxd_reset(rndStore); - - std::map<int, Hathor*>::const_iterator hathorIter = hathor_array.find(*idataset); -diff --git a/src/TheorEval.cc b/src/TheorEval.cc ---- a/src/TheorEval.cc -+++ b/src/TheorEval.cc -@@ -62,6 +62,7 @@ TheorEval::initTheory() - list<tToken> sl; - this->assignTokens(sl); - this->convertToRPN(sl); -+ return 0; - } - - int -@@ -167,6 +168,7 @@ TheorEval::assignTokens(list<tToken> &sl) - sl.push_back(t); - } - } -+ return 0; - } - - int -@@ -217,6 +219,7 @@ TheorEval::convertToRPN(list<tToken> &sl) - cout << endl; - */ - -+ return 0; - } - - int -@@ -236,6 +239,7 @@ TheorEval::initTerm(int iterm, valarray<double> *val) - hf_errlog_(id, text, textlen); - return -1; - } -+ return 0; - } - - int -@@ -348,6 +352,7 @@ TheorEval::initGridTerm(int iterm, valarray<double> *val) - - // associate grid and valarray pointers in token - _mapGridToken[g] = val; -+ return 0; - } - - int -@@ -430,6 +435,7 @@ TheorEval::initKfTerm(int iterm, valarray<double> *val) - - // write k-factor array to the token valarray - *val = valarray<double>(vkf.data(), vkf.size()); -+ return 0; - } - - int -@@ -465,6 +471,7 @@ TheorEval::setCKM(const vector<double> &v_ckm) - int textlen = strlen(text); - hf_errlog_(id, text, textlen); - #endif -+ return 0; - } - - int -@@ -531,6 +538,7 @@ TheorEval::Evaluate(valarray<double> &vte ) - } - //vte /= _units; - } -+ return 0; - } - - int -@@ -555,6 +563,7 @@ TheorEval::getGridValues() - - - } -+ return 0; - } - - int -diff --git a/src/ftheor_eval.cc b/src/ftheor_eval.cc ---- a/src/ftheor_eval.cc -+++ b/src/ftheor_eval.cc -@@ -19,15 +19,15 @@ - using namespace std; - - extern "C" { -- int set_theor_eval_(int *dsId);//, int *nTerms, char **TermName, char **TermType, -+ void set_theor_eval_(int *dsId);//, int *nTerms, char **TermName, char **TermType, - // char **TermSource, char *TermExpr); -- int set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, -+ void set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, - double *allBins); - // int set_theor_units_(int *dsId, double *units); -- int init_theor_eval_(int *dsId); -- int update_theor_ckm_(); -- int get_theor_eval_(int *dsId, int* np, int* idx); -- int close_theor_eval_(); -+ void init_theor_eval_(int *dsId); -+ void update_theor_ckm_(); -+ void get_theor_eval_(int *dsId, int* np, int* idx); -+ void close_theor_eval_(); - } - - /// global dataset to theory evaluation pointer map -@@ -59,7 +59,7 @@ extern struct ord_scales { - dataset ID. - write details on argumets - */ --int set_theor_eval_(int *dsId)//, int *nTerms, char **TermName, char **TermType, -+void set_theor_eval_(int *dsId)//, int *nTerms, char **TermName, char **TermType, - // char **TermSource, char *TermExpr) - { - // convert fortran strings to c++ -@@ -90,15 +90,13 @@ int set_theor_eval_(int *dsId)//, int *nTerms, char **TermName, char **TermType, - << " already exists." << endl; - exit(1); // make proper exit later - } -- -- return 1; - } - - /*! - Sets datasets bins in theory evaluations. - write details on argumets - */ --int set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, -+void set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, - double *allBins) - { - tTEmap::iterator it = gTEmap.find(*dsId); -@@ -110,7 +108,6 @@ int set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, - - TheorEval *te = gTEmap.at(*dsId); - te->setBins(*nBinDimension, *nPoints, binFlags, allBins); -- return 1; - } - - /* -@@ -132,7 +129,7 @@ int set_theor_units_(int *dsId, double *units) - /*! - Initializes theory for requested dataset. - */ --int init_theor_eval_(int *dsId) -+void init_theor_eval_(int *dsId) - { - tTEmap::iterator it = gTEmap.find(*dsId); - if (it == gTEmap.end() ) { -@@ -148,7 +145,7 @@ int init_theor_eval_(int *dsId) - /*! - Updates the CKM matrix to all the initialized appl grids - */ --int update_theor_ckm_() -+void update_theor_ckm_() - { - double a_ckm[] = { ckm_matrix_.Vud, ckm_matrix_.Vus, ckm_matrix_.Vub, - ckm_matrix_.Vcd, ckm_matrix_.Vcs, ckm_matrix_.Vcb, -@@ -164,7 +161,7 @@ int update_theor_ckm_() - /*! - Evaluates theory for requested dataset and writes it to the global THEO array. - */ --int get_theor_eval_(int *dsId, int *np, int*idx) -+void get_theor_eval_(int *dsId, int *np, int*idx) - { - - tTEmap::iterator it = gTEmap.find(*dsId); -@@ -194,11 +191,11 @@ int get_theor_eval_(int *dsId, int *np, int*idx) - // write the predictions to THEO array - if( ip != *np ){ - cout << "ERROR in get_theor_eval_: number of points mismatch" << endl; -- return -1; -+ return; - } - } - --int close_theor_eval_() -+void close_theor_eval_() - { - tTEmap::iterator it = gTEmap.begin(); - for (; it!= gTEmap.end(); it++){ -diff --git a/src/lhapdf6_output.c b/src/lhapdf6_output.c ---- a/src/lhapdf6_output.c -+++ b/src/lhapdf6_output.c -@@ -64,7 +64,7 @@ extern double bvalij_(int *,int *,int *,int *,int *); - extern double bvalxq_(int *,int *,double *,double *,int *); - extern double hf_get_alphas_(double *); - extern int getord_(int *); --extern int grpars_(int *, double *, double *, int *, double *, double *, int *); -+extern void grpars_(int *, double *, double *, int *, double *, double *, int *); - extern int getcbt_(int *, double *, double *, double *); - extern void getpdfunctype_heraf_(int *mc, int *asymh, int *symh, char *name, size_t size); - extern void hf_errlog_(int *, char *, size_t); -diff --git a/tools/draw/include/FileOpener.h b/tools/draw/include/FileOpener.h ---- a/tools/draw/include/FileOpener.h -+++ b/tools/draw/include/FileOpener.h -@@ -61,7 +61,7 @@ class InFileOpener_t { - string GetPath() const {return ind < 0 ? "" : Flist[ind];} - - // ================================== -- int Add(const string& fname) { -+ void Add(const string& fname) { - Flist.push_back(fname); - } - diff --git a/pkgs/applications/science/programming/jflap/default.nix b/pkgs/applications/science/programming/jflap/default.nix new file mode 100644 index 0000000000000..9a7922ba1205c --- /dev/null +++ b/pkgs/applications/science/programming/jflap/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "jflap"; + version = "7.1"; + + src = fetchurl { + url = "https://www.jflap.org/jflaptmp/july27-18/JFLAP7.1.jar"; + sha256 = "oiwJXdxWsYFj6Ovu7xZbOgTLVw8160a5YQUWbgbJlAY="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/java + cp -s $src $out/share/java/jflap.jar + makeWrapper ${jre}/bin/java $out/bin/jflap --add-flags "-jar $out/share/java/jflap.jar" + runHook postInstall + ''; + + meta = with lib; { + description = "GUI tool for experimenting with formal languages topics"; + homepage = "https://www.jflap.org/"; + license = licenses.unfree; + maintainers = [ maintainers.grnnja ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index c1e5b128fc71f..8b69539d6bc61 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.46"; + version = "1.8.49"; src = fetchPypi { inherit pname version; - sha256 = "c740c11551af4bcb1378772bde77ca6c846c6fd261b79d932c0ecbb164afe3bd"; + sha256 = "sha256-eJ/QxtMUq7DN/cH9qUHNIJv48r0NJrbZfML74DpYamQ="; }; postPatch = '' diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index afd05c3e8f711..7a75c8edb2b36 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -68,6 +68,12 @@ mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # fix build problems caused by https://github.com/mavlink/qgroundcontrol/pull/10132 + # remove once updated past 4.2.0 + ./fix-10132.patch + ]; + meta = with lib; { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; homepage = "http://qgroundcontrol.com/"; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch b/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch new file mode 100644 index 0000000000000..0a666132f9319 --- /dev/null +++ b/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch @@ -0,0 +1,62 @@ +diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc +index 2b314e0..ad1425e 100644 +--- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc ++++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc +@@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); + + GstQSGTexture::GstQSGTexture () + { +- static volatile gsize _debug; ++ static gsize _debug; + + initializeOpenGLFunctions(); + +diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc +index 3a68576..5203d13 100644 +--- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc ++++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc +@@ -58,7 +58,7 @@ gst_qt_get_gl_display () + { + GstGLDisplay *display = NULL; + QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ()); +- static volatile gsize _debug; ++ static gsize _debug; + + g_assert (app != NULL); + +diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc +index f031b36..3c6722a 100644 +--- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc ++++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc +@@ -106,7 +106,7 @@ void InitializeSceneGraph::run() + + QtGLVideoItem::QtGLVideoItem() + { +- static volatile gsize _debug; ++ static gsize _debug; + + if (g_once_init_enter (&_debug)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget"); +diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc +index 8bf14ae..2f88aa9 100644 +--- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc ++++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc +@@ -107,7 +107,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) : + QQuickWindow( parent ), source (src) + { + QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ()); +- static volatile gsize _debug; ++ static gsize _debug; + + g_assert (app != NULL); + +@@ -156,7 +156,7 @@ QtGLWindow::beforeRendering() + + g_mutex_lock (&this->priv->lock); + +- static volatile gsize once = 0; ++ static gsize once = 0; + if (g_once_init_enter(&once)) { + this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch(); + g_once_init_leave(&once,1); + diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix index c0f619b9592ce..343f9fad105b0 100644 --- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix +++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mkdir $out/bin dos2unix $out/opt/sumorobot-manager/main.py makeQtWrapper $out/opt/sumorobot-manager/main.py $out/bin/sumorobot-manager \ - --run "cd $out/opt/sumorobot-manager" + --chdir "$out/opt/sumorobot-manager" ''; preFixup = '' diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 4c8a4b7850bdc..78b1901be4c05 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -35,14 +35,14 @@ mkDerivation rec { pname = "recoll"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-TtkfohzeT0HO6ywCMNxrODW1DnJg5KMFkx9AbDfQt+c="; + sha256 = "sha256-4kt6g5MVZTyYLSH7q2z72nzAsU6fatC0vTebEKhSA6E="; }; - configureFlags = [ "--enable-recollq" "--disable-webkit" ] + configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ] ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ] ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); @@ -87,6 +87,9 @@ mkDerivation rec { done '' + lib.optionalString stdenv.isLinux '' substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' + '' + lib.optionalString (stdenv.isDarwin && withGui) '' + mkdir $out/Applications + mv $out/bin/recoll.app $out/Applications ''; enableParallelBuilding = true; diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index e6762f543cb92..32d1286ab1b3f 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -6,7 +6,6 @@ , nixosTests , cmake -, gzip , installShellFiles , makeWrapper , ncurses @@ -68,7 +67,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake - gzip installShellFiles makeWrapper ncurses diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix index 769104fea4317..a0bccbfcb1edd 100644 --- a/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/pkgs/applications/terminal-emulators/eterm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "eterm"; - version = "0.9.6-unstable=2020-03-03"; + version = "0.9.6+date=2020-03-03"; src = fetchFromGitHub { owner = "mej"; @@ -43,7 +43,10 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; knownVulnerabilities = [ - "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)" + ''Usage of ANSI escape sequences causes unexpected newline-termination, + leading to unexpected command execution. More info at: + - https://www.cve.org/CVERecord?id=CVE-2021-33477 + - https://www.openwall.com/lists/oss-security/2021/05/17/1'' ]; }; } diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 41154cc1034fc..abcea5f69a066 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.11.0"; + version = "1.12.1"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = pname; rev = version; - sha256 = "1d9bk8lhmw5lc8k0mw80g0vbwgxyh3gw5c7ppy3sir07s9y0y0fn"; + sha256 = "14jqs4sarxbrgi5pxz0afqa9jxq90cb5ayqd21qj2n65whqa5bpk"; }; depsBuildBuild = [ @@ -144,6 +144,7 @@ stdenv.mkDerivation rec { mesonBuildType = "release"; # See https://codeberg.org/dnkl/foot/src/tag/1.9.2/INSTALL.md#options + # TODO(@sternenseemann): install systemd user units mesonFlags = [ # Use lto "-Db_lto=true" diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 485c1dead14c6..2266e884454b2 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "hyper"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb"; - sha256 = "1ryw3315x0lb60j8nzz78h7zd36r2l1j39hnlfav0p7nq8dhqbpm"; + sha256 = "sha256-nwaJ+lnuHv+Qb/QkKF/9jG8cvq1Z+urz8CPwxSsMmuA="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 52e691f985045..65e15a12cc7a4 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -58,7 +58,7 @@ buildPythonApplication rec { ] ++ lib.optionals stdenv.isLinux [ fontconfig libunistring libcanberra libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext - wayland-protocols wayland dbus + wayland-protocols wayland dbus libGL ]; nativeBuildInputs = [ @@ -75,8 +75,6 @@ buildPythonApplication rec { libicns # For the png2icns tool. ]; - propagatedBuildInputs = lib.optional stdenv.isLinux libGL; - outputs = [ "out" "terminfo" "shell_integration" ]; patches = [ diff --git a/pkgs/applications/terminal-emulators/syncterm/default.nix b/pkgs/applications/terminal-emulators/syncterm/default.nix index d1f0ab5e8cf1a..d56db734a8855 100644 --- a/pkgs/applications/terminal-emulators/syncterm/default.nix +++ b/pkgs/applications/terminal-emulators/syncterm/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { homepage = "https://syncterm.bbsdev.net/"; description = "BBS terminal emulator"; maintainers = with maintainers; [ embr ]; + platforms = platforms.unix; license = licenses.gpl2Plus; + broken = stdenv.isDarwin; # error: unsupported option '-fsanitize=safe-stack' for target 'x86_64-apple-darwin' }; } diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 6d1276035c13e..8f15a38111c8f 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -23,20 +23,19 @@ , Foundation , libiconv , nixosTests +, runCommand }: rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220319-142410-0fcdea07"; - - outputs = [ "out" "terminfo" ]; + version = "20220408-101518-b908e2dd"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-KmIlfzSbVY003WesodN5srJ7qEQaU93izmrZW1MobCo="; + sha256 = "sha256-kuuoD+hqgj7QXFRIxa112oc4idtcK0ptFACDpI0bzGY="; }; postPatch = '' @@ -46,7 +45,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-+Iu6/pd14O1QIsLkHe7fTP30XyI+8J0GiRY8cnRPS5I="; + cargoSha256 = "sha256-iIb2zLUZpn23ooEiOP+yQMYUUmvef/KqvjzgLOFmjs0="; nativeBuildInputs = [ pkg-config @@ -75,10 +74,8 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - # terminfo - mkdir -p $terminfo/share/terminfo/w $out/nix-support - tic -x -o $terminfo/share/terminfo termwiz/data/wezterm.terminfo - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + mkdir -p $out/nix-support + echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages # desktop icon install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png @@ -100,7 +97,21 @@ rustPlatform.buildRustPackage rec { ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP" ''; - passthru.tests.test = nixosTests.terminal-emulators.wezterm; + passthru = { + tests = { + all-terminfo = nixosTests.allTerminfo; + terminal-emulators = nixosTests.terminal-emulators.wezterm; + }; + terminfo = runCommand "wezterm-terminfo" + { + nativeBuildInputs = [ + ncurses + ]; + } '' + mkdir -p $out/share/terminfo $out/nix-support + tic -x -o $out/share/terminfo ${src}/termwiz/data/wezterm.terminfo + ''; + }; meta = with lib; { description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; diff --git a/pkgs/applications/version-management/commit-formatter/default.nix b/pkgs/applications/version-management/commit-formatter/default.nix index eb475dca78a00..03eead59a6ba3 100644 --- a/pkgs/applications/version-management/commit-formatter/default.nix +++ b/pkgs/applications/version-management/commit-formatter/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Eliot00/commit-formatter"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ elliot ]; + mainProgram = "git-cf"; }; } diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 9f1df695a1743..a5903b7266e46 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -1,6 +1,7 @@ { lib, fetchurl, makeWrapper , pypy2Packages , cvs, subversion, git, breezy +, installShellFiles }: pypy2Packages.buildPythonApplication rec { @@ -12,7 +13,7 @@ pypy2Packages.buildPythonApplication rec { sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; checkInputs = [ subversion git breezy ]; @@ -24,13 +25,15 @@ pypy2Packages.buildPythonApplication rec { for i in bzr svn git; do wrapProgram $out/bin/cvs2$i \ --prefix PATH : "${lib.makeBinPath [ cvs ]}" + $out/bin/cvs2$i --man > csv2$i.1 + installManPage csv2$i.1 done ''; meta = with lib; { description = "A tool to convert CVS repositories to Subversion repositories"; homepage = "https://github.com/mhagger/cvs2svn"; - maintainers = [ maintainers.makefu ]; + maintainers = with maintainers; [ makefu viraptor ]; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index 1e234dea5e3e6..564bcdc5897bc 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,12 +1,12 @@ -{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }: +{ lib, fetchurl, fetchpatch, stdenv, zlib, ncurses, libiconv }: stdenv.mkDerivation rec { pname = "fnc"; - version = "0.10"; + version = "0.12"; src = fetchurl { url = "https://fnc.bsdbox.org/tarball/${version}/fnc-${version}.tar.gz"; - sha256 = "1phqxh0afky7q2qmhgjlsq1awbv4254yd8wpzxlww4p7a57cp0lk"; + sha256 = "05cg8id4d1ia8y60y3x23167bl1rn2fdpkf1jfj3aklhlihvkbxd"; }; buildInputs = [ libiconv ncurses zlib ]; @@ -17,14 +17,6 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - test "$($out/bin/fnc --version)" = '${pname} ${version}' - runHook postInstallCheck - ''; - meta = with lib; { description = "Interactive ncurses browser for Fossil repositories"; longDescription = '' diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index 7de53c7c541f1..ca47942a3f9a9 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3; maintainers = [ maintainers.changlinli ]; + mainProgram = "bfg"; platforms = platforms.unix; downloadPage = "https://mvnrepository.com/artifact/com.madgag/bfg/${version}"; }; diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix index 695250a5cc476..ecbe064826c5f 100644 --- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix @@ -16,6 +16,7 @@ bundlerEnv rec { homepage = "https://bitbucket.org/atlassian/bitbucket-server-cli"; license = licenses.mit; maintainers = with maintainers; [ jgertm nicknovitski ]; + mainProgram = "stash"; platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index c1f2c281c7a08..92914f4549681 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-khW+Ri+MZytMZcd2tRXhc/D6kOOhk+LP6MsS+GijjQM="; + sha256 = "sha256-5h4epV3RORZiynW1fkFLImqPunC3PZ/YzLiSrzescww="; }; - cargoSha256 = "sha256-SD1y+l86wqlJUUaG4ae4PXXSMS+4CPth3F4pLYbXMVc="; + cargoSha256 = "sha256-4dPTcrT8Gx3WfT0sauqnCSmcGE9LrgIqgHrY5l503ZA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/gfold/default.nix b/pkgs/applications/version-management/git-and-tools/gfold/default.nix index ee280c6620c05..d3b960208fc92 100644 --- a/pkgs/applications/version-management/git-and-tools/gfold/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gfold/default.nix @@ -1,28 +1,43 @@ -{ lib, fetchFromGitHub, gitMinimal, makeWrapper, rustPlatform }: +{ fetchFromGitHub +, gitMinimal +, gfold +, lib +, libiconv +, makeWrapper +, rustPlatform +, Security +, stdenv +, testVersion +}: -rustPlatform.buildRustPackage rec { +let pname = "gfold"; - version = "3.0.0"; + version = "4.0.0"; +in +rustPlatform.buildRustPackage { + inherit pname version; src = fetchFromGitHub { owner = "nickgerace"; repo = pname; rev = version; - sha256 = "0ss6vfrc6h3jlh5qilh82psd3vdnfawf1wl4cf64mfm4hm9dda63"; + sha256 = "1yh5173qhi9bd41zss9k21nm0xnr2sa918kvlyr5xvzhq47rrwz5"; }; - cargoSha256 = "09ywwgxm8l1p0jypp65zpqryjnb2g4gririf1dmqb9148dsj29x2"; + cargoSha256 = "sha256-o2fMIlj+veTmhfqi7BVpxr3520SOwWLmVS2UU83EVjo="; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - postInstall = '' - wrapProgram "$out/bin/gfold" --prefix PATH : "${gitMinimal}/bin" - ''; + passthru.tests.version = testVersion { + package = gfold; + command = "gfold --version"; + inherit version; + }; meta = with lib; { - inherit (src.meta) homepage; description = - "A tool to help keep track of your Git repositories, written in Rust"; + "CLI tool to help keep track of your Git repositories, written in Rust"; + homepage = "https://github.com/nickgerace/gfold"; license = licenses.asl20; maintainers = [ maintainers.shanesveller ]; platforms = platforms.unix; 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 3a66a4d8af7db..78ec57b9059ec 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.7.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-edlGJD+80k1ySpyNcKc5c2O0MX+S4fQgH5mwHQUxXM8="; + sha256 = "sha256-2lIHEO4+oW9+C7VSulmVwZJ1l6RYBbV6wlKMvdOGqi8="; }; - vendorSha256 = "sha256-YLkNua0Pz0gVIYnWOzOlV5RuLBaoZ4l7l1Pf4QIfUVQ="; + vendorSha256 = "sha256-EFJfd6sUK5iquFW0kXaiH6tLiNqbZNe9awpIqmqhp7I="; nativeBuildInputs = [ installShellFiles ]; 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 87d11dd9c1e98..f991bccf0e288 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.7.12"; + version = "1.7.13"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-y5o4yY5M9eDKN9LtbrPR29EafN3X7J51ARCEpFtLxCo="; + sha256 = "sha256-EQCu+2qMKu+e6G5iXAQn5cz0MZqHrF2wnKNO8Fkpp/Y="; }; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix index 0ba747d72350c..07af33951dfb4 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { homepage = "http://git-annex.mysteryvortex.com/git-annex-utils.html"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ woffs ]; + mainProgram = "gadu"; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index c9bf60a1eb939..ced8244256a60 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-CJ/2Cv/XoLq9U7u5mexH8iCCHbGtV6xohP3FapqO3+g="; + sha256 = "sha256-wVHL2+didmiN7UlEeIuSr+8LhkFKCOD3of4rKVg1i1o="; }; - cargoSha256 = "sha256-pYStKDgvvV/Z96TAonpDW7DIs1YSO6gAoiUCieVa9QY="; + cargoSha256 = "sha256-5jhloUnaGXXDu2LCO86SMJo8ETIxLAivv3hx9gEqtJ4="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix b/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix index 9028140784859..43de62876858d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix @@ -1,17 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, git }: -buildGoPackage { +buildGoModule rec { pname = "git-codereview"; - version = "2020-01-15"; - goPackagePath = "golang.org/x/review"; + version = "1.0.3"; src = fetchFromGitHub { owner = "golang"; repo = "review"; - rev = "f51a73253c4da005cfdf18a036e11185c04c8ce3"; - sha256 = "0c4vsyy5zp7pngqn4q87xipndghxyw2x57dkv1kxnrffckx1s3pc"; + rev = "v${version}"; + sha256 = "sha256-Hyo2UWGlxxeSz3E73DeA0VoOnBJ1VedvpshnATJGbFo="; }; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + ldflags = [ "-s" "-w" ]; + + checkInputs = [ git ]; + meta = with lib; { description = "Manage the code review process for Git changes using a Gerrit server"; homepage = "https://golang.org/x/review/git-codereview"; diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index f0184c6637771..1cf29fbd6c2d9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -1,23 +1,32 @@ -{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, lib, stdenv -, libxslt, docbook_xsl +{ fetchFromGitHub +, git +, gnupg +, makeWrapper +, openssl +, lib +, stdenv +, libxslt +, docbook_xsl }: stdenv.mkDerivation rec { pname = "git-crypt"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "AGWA"; repo = pname; rev = version; - sha256 = "13m9y0m6gc3mlw3pqv9x4i0him2ycbysizigdvdanhh514kga602"; + sha256 = "sha256-GcGCX6hoKL+sNLAeGEzZpaM+cdFjcNlwYExfOFEPi0I="; }; + strictDeps = true; + nativeBuildInputs = [ libxslt makeWrapper ]; buildInputs = [ openssl ]; - patchPhase = '' + postPatch = '' substituteInPlace commands.cpp \ --replace '(escape_shell_arg(our_exe_path()))' '= "git-crypt"' ''; @@ -29,7 +38,8 @@ stdenv.mkDerivation rec { ]; postFixup = '' - wrapProgram $out/bin/git-crypt --prefix PATH : $out/bin:${git}/bin:${gnupg}/bin + wrapProgram $out/bin/git-crypt \ + --suffix PATH : ${lib.makeBinPath [ git gnupg ]} ''; meta = with lib; { @@ -48,7 +58,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/AGWA/git-crypt/releases"; license = licenses.gpl3; - maintainers = [ maintainers.dochang ]; + maintainers = with maintainers; [ dochang SuperSandro2000 ]; platforms = platforms.unix; }; 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 2037122bf277a..f0932fde2d5e2 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 @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-extras"; - version = "6.3.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "tj"; repo = "git-extras"; rev = version; - sha256 = "sha256-mmvDsK+SgBXQSKNKuPt+K4sgtdrtqPx9Df2E3kKLdJM="; + sha256 = "sha256-Cn7IXMzgg0QIsNIHz+X14Gkmop0UbsSBlGlGkmg71ek="; }; postPatch = '' 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 91f6f2039838e..b85f6d973cf22 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 @@ -1,25 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, libiconv, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "MitMaro"; repo = pname; rev = version; - sha256 = "sha256-DYl/GUbeNtKmXoR3gq8mK8EfsZNVNlrdngAwfzG+epw="; + sha256 = "sha256-++KTMzTt84dowoZP+Bc9E/jUS21YN5ybKrlpQUKCir0="; }; - cargoPatches = [ - # update git2 crate to fix a compile error - (fetchpatch { - url = "https://github.com/MitMaro/git-interactive-rebase-tool/commit/f4d3026f23118d29a263bbca6c83f963e76c34c4.patch"; - sha256 = "sha256-6ErPRcPbPRXbEslNiNInbbUhbOWb9ZRll7ZDRgTpWS4="; - }) - ]; - - cargoSha256 = "sha256-2aHW9JIiqkO0X0B0D44tSZ8QkmKH/QZoYvKNEQWldo4="; + cargoSha256 = "sha256-OUaP/nDs589FYaGYcleRMTQNu3/q/2wBjHSv2q8OyjA="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -39,5 +31,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ masaeedu SuperSandro2000 zowoq ]; + mainProgram = "interactive-rebase-tool"; }; } 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 829ebedc1e8e0..d5fc50ff3fd62 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 @@ -1,27 +1,29 @@ { lib , buildPythonApplication +, pytest-mock +, pytestCheckHook , fetchFromGitHub , installShellFiles , git , nix-update-script -, testVersion +, testers , git-machete }: buildPythonApplication rec { pname = "git-machete"; - version = "3.7.2"; + version = "3.9.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7WaLUCJr29i7JW5YAJG1AuYnSLKRMpAEnCY2i4Zle+c="; + sha256 = "sha256-/oX3x5F5/gV8YuRLzAviE7RM+Gen0gIypHs34iUnVOM="; }; nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ git ]; + checkInputs = [ git pytest-mock pytestCheckHook ]; postInstall = '' installShellCompletion --bash --name git-machete completion/git-machete.completion.bash 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 1f08cd26ef368..c09de9968511a 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -4,20 +4,21 @@ , openssh, pcre2, bash , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv -, svnSupport, subversionClient, perlLibs, smtpPerlLibs +, svnSupport ? false, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform , nlsSupport ? true , osxkeychainSupport ? stdenv.isDarwin -, guiSupport +, guiSupport ? false , withManual ? true , pythonSupport ? true , withpcre2 ? true -, sendEmailSupport -, darwin +, sendEmailSupport ? false +, Security, CoreServices , nixosTests , withLibsecret ? false , pkg-config, glib, libsecret , gzip # needed at runtime by gitweb.cgi +, withSsh ? false }: assert osxkeychainSupport -> stdenv.isDarwin; @@ -25,9 +26,8 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.35.1"; + version = "2.36.0"; svn = subversionClient.override { perlBindings = perlSupport; }; - gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -39,37 +39,37 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "100h37cpw49pmlpf6lcpm1xi578gllf6y9in60h5mxj3cj754s6p"; + sha256 = "sha256-r16/wWWEZPXQ1For/YhMk1+2B6EMwCHZW8gHeIYcwdM="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; + separateDebugInfo = true; hardeningDisable = [ "format" ]; enableParallelBuilding = true; - ## Patch - patches = [ ./docbook2texi.patch ./git-sh-i18n.patch - ./ssh-path.patch ./git-send-email-honor-PATH.patch ./installCheck-path.patch + ] ++ lib.optionals withSsh [ + ./ssh-path.patch ]; postPatch = '' - for x in connect.c git-gui/lib/remote_add.tcl ; do - substituteInPlace "$x" \ - --subst-var-by ssh "${openssh}/bin/ssh" - done - # Fix references to gettext introduced by ./git-sh-i18n.patch substituteInPlace git-sh-i18n.sh \ --subst-var-by gettext ${gettext} # ensure we are using the correct shell when executing the test scripts patchShebangs t/*.sh + '' + lib.optionalString withSsh '' + for x in connect.c git-gui/lib/remote_add.tcl ; do + substituteInPlace "$x" \ + --subst-var-by ssh "${openssh}/bin/ssh" + done ''; nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] @@ -79,7 +79,7 @@ stdenv.mkDerivation { ++ lib.optionals perlSupport [ perlPackages.perl ] ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] - ++ lib.optionals stdenv.isDarwin [ darwin.Security ] + ++ lib.optionals stdenv.isDarwin [ Security CoreServices ] ++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; # required to support pthread_cancel() @@ -354,6 +354,8 @@ stdenv.mkDerivation { disable_test t9902-completion # not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin) disable_test t5003-archive-zip + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + disable_test t7527-builtin-fsmonitor '' + lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) disable_test t3900-i18n-commit diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix index 25f7e95d184f7..75fea7bf871fc 100644 --- a/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix @@ -1,20 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - pname = "gitbatch-unstable"; - version = "2019-12-19"; - - goPackagePath = "github.com/isacikgoz/gitbatch"; - - goDeps = ./deps.nix; +buildGoModule rec { + pname = "gitbatch"; + version = "0.6.1"; src = fetchFromGitHub { owner = "isacikgoz"; repo = "gitbatch"; - rev = "381b0df7f86056c625c0d4d2d979733c1ee5def7"; - sha256 = "0613vfqdn3k0w7fm25rqnqdr67w9vii3i56dfslqcn1vqjfrff3q"; + rev = "v${version}"; + sha256 = "sha256-ovmdbyPRSebwmW6AW55jBgBKaNdY6w5/wrpUF2cMKw8="; }; + vendorSha256 = "sha256-wwpaJO5cXMsvqFXj+qGiIm4zg/SL4YCm2mNnG/qdilw="; + + ldflags = [ "-s" "-w" ]; + + checkFlags = [ "-short" ]; + meta = with lib; { description = "Running git UI commands"; homepage = "https://github.com/isacikgoz/gitbatch"; diff --git a/pkgs/applications/version-management/git-and-tools/gitbatch/deps.nix b/pkgs/applications/version-management/git-and-tools/gitbatch/deps.nix deleted file mode 100644 index 53784b4eacf00..0000000000000 --- a/pkgs/applications/version-management/git-and-tools/gitbatch/deps.nix +++ /dev/null @@ -1,543 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alcortesm/tgz"; - fetch = { - type = "git"; - url = "https://github.com/alcortesm/tgz"; - rev = "9c5fe88206d7"; - sha256 = "04dcwnz2c2i4wbq2vx3g2wrdgqpncr2r1h6p1k08rdwk4bq1h8c5"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/anmitsu/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/anmitsu/go-shlex"; - rev = "648efa622239"; - sha256 = "10rgdp5d106iisgz25ic8k6f44s9adh4sjh6fyxq9ccm21gw49b7"; - }; - } - { - goPackagePath = "github.com/armon/consul-api"; - fetch = { - type = "git"; - url = "https://github.com/armon/consul-api"; - rev = "eb2c6b5be1b6"; - sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "v3.3.10"; - sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; - }; - } - { - goPackagePath = "github.com/coreos/go-etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-etcd"; - rev = "v2.0.0"; - sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "v0.2.0"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/emirpasic/gods"; - fetch = { - type = "git"; - url = "https://github.com/emirpasic/gods"; - rev = "v1.9.0"; - sha256 = "1zhkppqzy149fp561pif8d5d92jd9chl3l9z4yi5f8n60ibdmmjf"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/flynn/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/flynn/go-shlex"; - rev = "3f9db97f8568"; - sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/gliderlabs/ssh"; - fetch = { - type = "git"; - url = "https://github.com/gliderlabs/ssh"; - rev = "v0.1.1"; - sha256 = "0bylkc7yg8bxxffhchikcnzwli5n95cfmbji6v2a4mn1h5n36mdm"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/jbenet/go-context"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-context"; - rev = "d14ea06fba99"; - sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl"; - }; - } - { - goPackagePath = "github.com/jessevdk/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/jessevdk/go-flags"; - rev = "v1.4.0"; - sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a"; - }; - } - { - goPackagePath = "github.com/jroimartin/gocui"; - fetch = { - type = "git"; - url = "https://github.com/jroimartin/gocui"; - rev = "v0.4.0"; - sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; - }; - } - { - goPackagePath = "github.com/kevinburke/ssh_config"; - fetch = { - type = "git"; - url = "https://github.com/kevinburke/ssh_config"; - rev = "81db2a75821e"; - sha256 = "0hwmv2h83aa7r6l7yqwsxdyldnlhb4gbbkc3ww9nys7impjcjnsp"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.1"; - sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.7"; - sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.0.0"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.1.2"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "288510b9734e"; - sha256 = "0hdyisfaf8yb55h3p03p4sbq19546mp9fy28f2kn659mycmhxqk4"; - }; - } - { - goPackagePath = "github.com/pelletier/go-buffruneio"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-buffruneio"; - rev = "v0.2.0"; - sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.2.0"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.0.0"; - sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.0"; - sha256 = "1y1qjcg19z7q9sy32rhc148kdql2aw7xkcm9d6r1blrl0mdgpx0w"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.3.0"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "v1.0.0"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.3.2"; - sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; - }; - } - { - goPackagePath = "github.com/src-d/gcfg"; - fetch = { - type = "git"; - url = "https://github.com/src-d/gcfg"; - rev = "v1.4.0"; - sha256 = "044j95skmyrwjw5fwjk6ka32rjgsg0ar0mfp9np19sh1acwv4x4r"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "d75b2dcb6bc8"; - sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; - }; - } - { - goPackagePath = "github.com/xanzy/ssh-agent"; - fetch = { - type = "git"; - url = "https://github.com/xanzy/ssh-agent"; - rev = "v0.2.0"; - sha256 = "069nlriymqswg52ggiwi60qhwrin9nzhd2g65a7h59z2qbcvk2hy"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a77"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a9"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "161cd47e91fd"; - sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "e225da77a7e6"; - sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "a9d3bda3a223"; - sha256 = "1w45zc13xrjzl19s1sx74r5mg3lf2z2nm13wygcdq5r5pyjlhdz9"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/src-d/go-billy.v4"; - fetch = { - type = "git"; - url = "https://gopkg.in/src-d/go-billy.v4"; - rev = "v4.2.1"; - sha256 = "1n8nc0m2hidbrlcl643cd0bdm07pjr0qji47gbfpfj99791sv1d1"; - }; - } - { - goPackagePath = "gopkg.in/src-d/go-git-fixtures.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/src-d/go-git-fixtures.v3"; - rev = "v3.1.1"; - sha256 = "1fq3j5chck6883jbn33gwm6dxdgzsphjq97psyn81hz9bc1ili8p"; - }; - } - { - goPackagePath = "gopkg.in/src-d/go-git.v4"; - fetch = { - type = "git"; - url = "https://gopkg.in/src-d/go-git.v4"; - rev = "v4.10.0"; - sha256 = "18bx3m5ddvb20figd8pc3lgf9hn85pifc6xy72bb83lv2nxii2rx"; - }; - } - { - goPackagePath = "gopkg.in/warnings.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/warnings.v0"; - rev = "v0.1.2"; - sha256 = "1kzj50jn708cingn7a13c2wdlzs6qv89dr2h4zj8d09647vlnd81"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index 69e9508676318..70d82410997ce 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv }: buildGoModule rec { pname = "glab"; @@ -24,6 +24,15 @@ buildGoModule rec { subPackages = [ "cmd/glab" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + installShellCompletion --cmd glab \ + --bash <($out/bin/glab completion -s bash) \ + --fish <($out/bin/glab completion -s fish) \ + --zsh <($out/bin/glab completion -s zsh) + ''; + meta = with lib; { description = "An open-source GitLab command line tool"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index 87d92e72a8fec..d5791f6506cdf 100644 --- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -2,17 +2,17 @@ let pname = "radicle-upstream"; - version = "0.2.12"; + version = "0.3.0"; name = "${pname}-${version}"; srcs = { x86_64-linux = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "7520c7feb94234df6f8523689d098e0d19510e2ac0122e482d1e01086c9b02fe"; + sha256 = "sha256-Y7V89G+nXRtknOukvBN8Q+sNx91YNPDT0p5hrFYe/Sk="; }; x86_64-darwin = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.dmg"; - sha256 = "8bbff051f169f029044e4c4965cad88f48e939b945fd5c253f0c39665a19ce44"; + sha256 = "sha256-EuWGbn6qggi8/9Rci8iaXfuVKE+QXb1BHEYDvotR/q4="; }; }; src = srcs.${stdenv.hostPlatform.system}; diff --git a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix index 3396718edbc27..65ca1b476d4d6 100644 --- a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, testVersion, scmpuff }: +{ lib, buildGoModule, fetchFromGitHub, testers, scmpuff }: buildGoModule rec { pname = "scmpuff"; @@ -15,7 +15,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = scmpuff; command = "scmpuff version"; }; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 9f0126d9ac4c8..8871ac2306efd 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "3.1.2"; + version = "3.1.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "sha256-IEo8poEYPjAbBGk+SQdJqyhwgMYjNLdibI+AktVIg1g="; + sha256 = "sha256-dGqb7gw7l2SPGwhHIFbEq6XqMB9QRw3+3Pfbk2S4kW4="; }; goPackagePath = "github.com/git-lfs/git-lfs"; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 7fe27da6080ad..ad41afe5ac156 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.22"; + version = "2.25"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-oVwvoZdjD6V3CHECZOYBSYVtCX1XwW5fynyCn7Oj+Bc="; + sha256 = "sha256-3S4peybytlO432ui+bECVWQTbyNfs2kSMqcqQyVc1os="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index 98c9c5312e610..1eaedf218cda4 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { pname = "git-review"; - version = "2.2.0"; + version = "2.3.1"; # Manually set version because prb wants to get it from the git # upstream repository (and we are installing from tarball instead) @@ -20,7 +20,7 @@ buildPythonApplication rec { owner = "opendev"; repo = pname; rev = version; - sha256 = "sha256-2+X5fPxB2FIp1fwqEUc+W0gH2NjhF/V+La+maE+XEpo="; + sha256 = "sha256-C8M4b/paHJB9geizc1eIhXsTuLeeS4dDisCfCQF1RuU="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix index 049a2aa2c1d0b..ed7239b80cb33 100644 --- a/pkgs/applications/version-management/git-sizer/default.nix +++ b/pkgs/applications/version-management/git-sizer/default.nix @@ -1,20 +1,29 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, git-sizer }: -buildGoPackage rec { +buildGoModule rec { pname = "git-sizer"; - version = "1.3.0"; - - goPackagePath = "github.com/github/git-sizer"; + version = "1.5.0"; src = fetchFromGitHub { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "0kmyvai5xfalm56ywa6mhdvvjnacdzwcyz28bw0pz9a4gyf1mgvh"; + sha256 = "sha256-On7QBTzKfnuuzwMQ8m1odxGqfIKL+EDg5V05Kxuhmqw="; + }; + + vendorSha256 = "sha256-oRlsD99XiI/0ZWibjyRcycmGab+vMbXrV5hIdIyUDYg="; + + ldflags = [ "-s" "-w" "-X main.BuildVersion=${version}" ]; + + doCheck = false; + + passthru.tests.vesion = testers.testVersion { + package = git-sizer; }; meta = with lib; { description = "Compute various size metrics for a Git repository"; + homepage = "https://github.com/github/git-sizer"; license = licenses.mit; maintainers = with maintainers; [ matthewbauer ]; }; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 840937c190f00..6ad600e07ccb8 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.16.5"; + version = "1.16.7"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-2aqy6DV8oaIur/syg1bk41Wo+FGk3m+05+tUyoDwGHs="; + sha256 = "sha256-UVmbFtHC4W3WF+DptdHMMUoe8UE5TVgoM9QRuczSrEg="; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 52ad060c990d2..8d89420607a3f 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -11,24 +11,24 @@ with lib; let curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; pname = "gitkraken"; - version = "8.3.3"; + version = "8.4.0"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "185msrpa33w40prc88n5m0g12wh8r6szj56iikk4ps6kwr6wamy7"; + sha256 = "sha256-yVQILgEn67iiUUQqpQqt++cZMN5u9FT0MbNf7pFES9Y="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "0iam5ni8imajxhcv12zib6m475i6czllmqy512r1wmzw9zbilf43"; + sha256 = "sha256-cTHMl5peXj52Fy2XBfKaUKLuZnPCC4XdReOiB0fbCNk="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - sha256 = "12af421r4d8s4l5j54xyd3x8pa72nbilass95v0y3b0wgsi35g0z"; + sha256 = "sha256-M3Y5qP0nozk5iTnEGK2+ds8/Vb/l0nhIo4LSrCWLDu8="; }; }; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index dbae269aab8c5..cc8cd00b7d14e 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.9.2", - "repo_hash": "sha256-+tZN6isOb7LtUVwGshx9TP+P42sftJmQGVk1L9UJqcY=", - "yarn_hash": "1mya6y0cb9x8491gpf7f1i7qi2rb0l7d9g5yzj44vvy3mb4rcqaj", + "version": "14.10.2", + "repo_hash": "0f7cfc1wrzz4m5yhd6jnp3dqpdy7vbj8bf826zjsi2ss48430bk0", + "yarn_hash": "17wxqvig34namf8kvh8bwci3y0f3k2nl4zs99jcvskdad9p45rlc", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.9.2-ee", + "rev": "v14.10.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.9.2", + "GITALY_SERVER_VERSION": "14.10.2", "GITLAB_PAGES_VERSION": "1.56.1", - "GITLAB_SHELL_VERSION": "13.24.0", - "GITLAB_WORKHORSE_VERSION": "14.9.2" + "GITLAB_SHELL_VERSION": "13.25.1", + "GITLAB_WORKHORSE_VERSION": "14.10.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 78296dff887fd..787e705f94572 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.1.4.6' +gem 'activesupport', '~> 6.1.4.7' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 752883d801d1a..cc37adacce62c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.1.4.6) - actionview (= 6.1.4.6) - activesupport (= 6.1.4.6) + actionpack (6.1.4.7) + actionview (= 6.1.4.7) + activesupport (= 6.1.4.7) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.4.6) - activesupport (= 6.1.4.6) + actionview (6.1.4.7) + activesupport (= 6.1.4.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.4.6) + activesupport (6.1.4.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -34,7 +34,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) crass (1.0.6) diff-lcs (1.3) dotenv (2.7.6) @@ -88,7 +88,7 @@ GEM google-protobuf (~> 3.18) googleapis-common-protos-types (~> 1.0) grpc-tools (1.42.0) - i18n (1.9.1) + i18n (1.10.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jaeger-client (1.1.0) @@ -101,7 +101,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.14.0) + loofah (2.16.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -111,12 +111,12 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2020.1104) mini_mime (1.0.2) - mini_portile2 (2.6.1) + mini_portile2 (2.8.0) minitest (5.15.0) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.20.0) faraday (>= 0.9) @@ -225,7 +225,7 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.1.4.6) + activesupport (~> 6.1.4.7) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index cd76768aee495..127a4ec461fc4 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "14.9.2"; + version = "14.10.2"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -23,10 +23,10 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-eEo+WZ2N/5bLfvwJCNf9qt+h/V5dIVqCjVJeomzw/Ps="; + sha256 = "sha256-hLTzkW5GDq1AgTwe1pVj6Tiyd0JpJ76ATFu3Q+m9MVg="; }; - vendorSha256 = "sha256-kEjgWA/Task23PScPYrqdDu3vdVR/FJl7OilUug/Bds="; + vendorSha256 = "sha256-ZL61t+Ii2Ns3TmitiF93exinod54+RCqrbdpU67HeY0="; passthru = { inherit rubyEnv; @@ -42,7 +42,7 @@ buildGoModule { postInstall = '' mkdir -p $ruby cp -rv $src/ruby/{bin,lib,proto} $ruby - mv $out/bin/gitaly-git2go $out/bin/gitaly-git2go-${version} + mv $out/bin/gitaly-git2go-v${lib.versions.major version} $out/bin/gitaly-git2go-${version} ''; outputs = [ "out" "ruby" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index c55d094db5f85..21db54b6ed566 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y"; + sha256 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk"; + sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35"; + sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -122,10 +122,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; crass = { groups = ["default"]; @@ -343,10 +343,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8"; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; type = "gem"; }; - version = "1.9.1"; + version = "1.10.0"; }; ice_nine = { source = { @@ -394,10 +394,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w"; + sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; type = "gem"; }; - version = "2.14.0"; + version = "2.16.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -452,10 +452,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.6.1"; + version = "2.8.0"; }; minitest = { groups = ["default" "development" "test"]; @@ -493,10 +493,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; + sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; type = "gem"; }; - version = "1.12.5"; + version = "1.13.3"; }; octokit = { dependencies = ["faraday" "sawyer"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 971ef2af955c1..915d52f1635ba 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.24.0"; + version = "13.25.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-/SH1YNmZr/NuCvyL6tmyTj1C2LUuxldeHwmJHWKPz2M="; + sha256 = "sha256-JItk6gfpBNxabI0vsIOHIBhK7L6E1ijPgrnzhQiKPYw="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-RLV01CM5O0K4R8XDDcas2LjIig0S7GoyAo/S8+Vx2bY="; + vendorSha256 = "sha256-S7bVQxb+p6o0LPAdx7S6dlsHLecPwMS7myjQZwYhHcU="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 9fcecc53a0709..2613fe85f81bd 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.9.2"; + version = "14.10.2"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-ubuMuO8tDjdVZWehsmsJqUgvmySIBJ15D9GHZFzApFw="; + vendorSha256 = "sha256-TNZtggUBMwIPO6ZZGk/EkRcilh7sztlAT7Hu4vhME0w="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index ae8a8e0124142..732591ae170f5 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.1.4.6' +gem 'rails', '~> 6.1.4.7' gem 'bootsnap', '~> 1.9.1', require: false @@ -41,6 +41,7 @@ gem 'omniauth-azure-activedirectory-v2', '~> 1.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-dingtalk-oauth2', '~> 1.0' +gem 'omniauth-alicloud', '~> 1.0.1' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.4' gem 'omniauth-gitlab', '~> 1.0.2' @@ -163,7 +164,7 @@ gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' -gem 'asciidoctor-include-ext', '~> 0.3.1', require: false +gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-kroki', '~> 0.5.0', require: false gem 'rouge', '~> 3.27.0' @@ -285,7 +286,7 @@ gem 'fast_blank' gem 'gitlab-chronic', '~> 0.10.5' gem 'gitlab_chronic_duration', '~> 0.10.6.2' -gem 'rack-proxy', '~> 0.6.0' +gem 'rack-proxy', '~> 0.7.2' gem 'sassc-rails', '~> 2.1.0' gem 'autoprefixer-rails', '10.2.5.1' @@ -344,7 +345,7 @@ gem 'warning', '~> 1.2.0' group :development do gem 'lefthook', '~> 0.7.0', require: false - gem 'solargraph', '~> 0.43', require: false + gem 'solargraph', '~> 0.44.3', require: false gem 'letter_opener_web', '~> 2.0.0' @@ -389,7 +390,7 @@ group :development, :test do gem 'knapsack', '~> 1.21.1' gem 'crystalball', '~> 0.7.0', require: false - gem 'simple_po_parser', '~> 1.1.2', require: false + gem 'simple_po_parser', '~> 1.1.6', require: false gem 'timecop', '~> 0.9.1' @@ -403,7 +404,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 2.11.0', require: false + gem 'gitlab-dangerfiles', '~> 3.0', require: false end group :development, :test, :coverage do @@ -481,7 +482,7 @@ gem 'ssh_data', '~> 1.2' gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.9.0.pre.rc4' +gem 'gitaly', '~> 14.10.0-rc1' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -497,7 +498,7 @@ gem 'flipper', '~> 0.21.0' gem 'flipper-active_record', '~> 0.21.0' gem 'flipper-active_support_cache_store', '~> 0.21.0' gem 'unleash', '~> 3.2.2' -gem 'gitlab-experiment', '~> 0.7.0' +gem 'gitlab-experiment', '~> 0.7.1' # Structured logging gem 'lograge', '~> 0.5' @@ -542,4 +543,4 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', '0.4.4' +gem 'ipynbdiff', '0.4.5' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 658d79dfcc663..eeb2a8d8a7334 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -4,63 +4,63 @@ GEM RedCloth (4.3.2) acme-client (2.0.9) faraday (>= 0.17, < 2.0.0) - actioncable (6.1.4.6) - actionpack (= 6.1.4.6) - activesupport (= 6.1.4.6) + actioncable (6.1.4.7) + actionpack (= 6.1.4.7) + activesupport (= 6.1.4.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.6) - actionpack (= 6.1.4.6) - activejob (= 6.1.4.6) - activerecord (= 6.1.4.6) - activestorage (= 6.1.4.6) - activesupport (= 6.1.4.6) + actionmailbox (6.1.4.7) + actionpack (= 6.1.4.7) + activejob (= 6.1.4.7) + activerecord (= 6.1.4.7) + activestorage (= 6.1.4.7) + activesupport (= 6.1.4.7) mail (>= 2.7.1) - actionmailer (6.1.4.6) - actionpack (= 6.1.4.6) - actionview (= 6.1.4.6) - activejob (= 6.1.4.6) - activesupport (= 6.1.4.6) + actionmailer (6.1.4.7) + actionpack (= 6.1.4.7) + actionview (= 6.1.4.7) + activejob (= 6.1.4.7) + activesupport (= 6.1.4.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.4.6) - actionview (= 6.1.4.6) - activesupport (= 6.1.4.6) + actionpack (6.1.4.7) + actionview (= 6.1.4.7) + activesupport (= 6.1.4.7) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.4.6) - actionpack (= 6.1.4.6) - activerecord (= 6.1.4.6) - activestorage (= 6.1.4.6) - activesupport (= 6.1.4.6) + actiontext (6.1.4.7) + actionpack (= 6.1.4.7) + activerecord (= 6.1.4.7) + activestorage (= 6.1.4.7) + activesupport (= 6.1.4.7) nokogiri (>= 1.8.5) - actionview (6.1.4.6) - activesupport (= 6.1.4.6) + actionview (6.1.4.7) + activesupport (= 6.1.4.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.4.6) - activesupport (= 6.1.4.6) + activejob (6.1.4.7) + activesupport (= 6.1.4.7) globalid (>= 0.3.6) - activemodel (6.1.4.6) - activesupport (= 6.1.4.6) - activerecord (6.1.4.6) - activemodel (= 6.1.4.6) - activesupport (= 6.1.4.6) + activemodel (6.1.4.7) + activesupport (= 6.1.4.7) + activerecord (6.1.4.7) + activemodel (= 6.1.4.7) + activesupport (= 6.1.4.7) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.1.4.6) - actionpack (= 6.1.4.6) - activejob (= 6.1.4.6) - activerecord (= 6.1.4.6) - activesupport (= 6.1.4.6) + activestorage (6.1.4.7) + actionpack (= 6.1.4.7) + activejob (= 6.1.4.7) + activerecord (= 6.1.4.7) + activesupport (= 6.1.4.7) marcel (~> 1.0.0) mini_mime (>= 1.1.0) - activesupport (6.1.4.6) + activesupport (6.1.4.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -82,7 +82,7 @@ GEM faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.4) asciidoctor (2.0.15) - asciidoctor-include-ext (0.3.1) + asciidoctor-include-ext (0.4.0) asciidoctor (>= 1.5.6, < 3.0.0) asciidoctor-kroki (0.5.0) asciidoctor (~> 2.0) @@ -130,7 +130,7 @@ GEM base32 (0.3.2) batch-loader (2.0.1) bcrypt (3.1.16) - benchmark (0.1.1) + benchmark (0.2.0) benchmark-ips (2.3.0) benchmark-malloc (0.2.0) benchmark-memory (0.1.2) @@ -196,7 +196,7 @@ GEM coderay (1.1.3) colored2 (3.1.2) commonmarker (0.23.4) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) connection_pool (2.2.5) contracts (0.11.0) cork (0.3.0) @@ -217,7 +217,7 @@ GEM css_parser (1.7.0) addressable daemons (1.3.1) - danger (8.4.5) + danger (8.5.0) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -448,7 +448,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.9.0.pre.rc4) + gitaly (14.10.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -456,10 +456,11 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.11.0) + gitlab-dangerfiles (3.0.0) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) - gitlab-experiment (0.7.0) + rake + gitlab-experiment (0.7.1) activesupport (>= 3.0) request_store (>= 1.0) gitlab-fog-azure-rm (1.2.0) @@ -526,7 +527,7 @@ GEM signet (~> 0.12) google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) - google-protobuf (3.19.1) + google-protobuf (3.19.4) googleapis-common-protos-types (1.3.0) google-protobuf (~> 3.14) googleauth (0.14.0) @@ -647,7 +648,7 @@ GEM invisible_captcha (1.1.0) rails (>= 4.2) ipaddress (0.8.3) - ipynbdiff (0.4.4) + ipynbdiff (0.4.5) diffy (~> 3.3) json (~> 2.5, >= 2.5.1) jaeger-client (1.1.0) @@ -729,7 +730,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.12.0) + loofah (2.16.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -748,8 +749,8 @@ GEM mime-types-data (3.2020.0512) mini_histogram (0.3.1) mini_magick (4.10.1) - mini_mime (1.1.1) - mini_portile2 (2.6.1) + mini_mime (1.1.2) + mini_portile2 (2.8.0) minitest (5.11.3) mixlib-cli (2.1.8) mixlib-config (3.0.9) @@ -787,8 +788,8 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) @@ -821,6 +822,8 @@ GEM omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) + omniauth-alicloud (1.0.1) + omniauth-oauth2 (~> 1.7.1) omniauth-atlassian-oauth2 (0.2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) @@ -961,25 +964,25 @@ GEM httpclient json-jwt (>= 1.11.0) rack (>= 2.1.0) - rack-proxy (0.6.0) + rack-proxy (0.7.2) rack rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.1.4.6) - actioncable (= 6.1.4.6) - actionmailbox (= 6.1.4.6) - actionmailer (= 6.1.4.6) - actionpack (= 6.1.4.6) - actiontext (= 6.1.4.6) - actionview (= 6.1.4.6) - activejob (= 6.1.4.6) - activemodel (= 6.1.4.6) - activerecord (= 6.1.4.6) - activestorage (= 6.1.4.6) - activesupport (= 6.1.4.6) + rails (6.1.4.7) + actioncable (= 6.1.4.7) + actionmailbox (= 6.1.4.7) + actionmailer (= 6.1.4.7) + actionpack (= 6.1.4.7) + actiontext (= 6.1.4.7) + actionview (= 6.1.4.7) + activejob (= 6.1.4.7) + activemodel (= 6.1.4.7) + activerecord (= 6.1.4.7) + activestorage (= 6.1.4.7) + activesupport (= 6.1.4.7) bundler (>= 1.15.0) - railties (= 6.1.4.6) + railties (= 6.1.4.7) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -993,9 +996,9 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.1.4.6) - actionpack (= 6.1.4.6) - activesupport (= 6.1.4.6) + railties (6.1.4.7) + actionpack (= 6.1.4.7) + activesupport (= 6.1.4.7) method_source rake (>= 0.13) thor (~> 1.0) @@ -1199,7 +1202,7 @@ GEM faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simple_po_parser (1.1.2) + simple_po_parser (1.1.6) simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) @@ -1213,7 +1216,7 @@ GEM slack-messenger (2.3.4) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) - solargraph (0.43.0) + solargraph (0.44.3) backport (~> 1.2) benchmark bundler (>= 1.17.2) @@ -1240,11 +1243,11 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.3.13) + sqlite3 (1.4.2) ssh_data (1.2.0) ssrf_filter (1.0.7) stackprof (0.2.15) @@ -1410,7 +1413,7 @@ DEPENDENCIES apollo_upload_server (~> 2.1.0) asana (~> 0.10.3) asciidoctor (~> 2.0.10) - asciidoctor-include-ext (~> 0.3.1) + asciidoctor-include-ext (~> 0.4.0) asciidoctor-kroki (~> 0.5.0) asciidoctor-plantuml (~> 0.0.12) atlassian-jwt (~> 0.2.0) @@ -1484,11 +1487,11 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.9.0.pre.rc4) + gitaly (~> 14.10.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 2.11.0) - gitlab-experiment (~> 0.7.0) + gitlab-dangerfiles (~> 3.0) + gitlab-experiment (~> 0.7.1) gitlab-fog-azure-rm (~> 1.2.0) gitlab-labkit (~> 0.22.0) gitlab-license (~> 2.1.0) @@ -1528,7 +1531,7 @@ DEPENDENCIES icalendar invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) - ipynbdiff (= 0.4.4) + ipynbdiff (= 0.4.5) jira-ruby (~> 2.1.4) js_regex (~> 3.7) json (~> 2.5.1) @@ -1561,6 +1564,7 @@ DEPENDENCIES ohai (~> 16.10) oj (~> 3.10.6) omniauth (~> 1.8) + omniauth-alicloud (~> 1.0.1) omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.3) @@ -1597,9 +1601,9 @@ DEPENDENCIES rack-attack (~> 6.3.0) rack-cors (~> 1.0.6) rack-oauth2 (~> 1.16.0) - rack-proxy (~> 0.6.0) + rack-proxy (~> 0.7.2) rack-timeout (~> 0.5.1) - rails (~> 6.1.4.6) + rails (~> 6.1.4.7) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) @@ -1644,13 +1648,13 @@ DEPENDENCIES sidekiq (~> 6.4) sidekiq-cron (~> 1.2) sigdump (~> 0.2.4) - simple_po_parser (~> 1.1.2) + simple_po_parser (~> 1.1.6) simplecov (~> 0.21) simplecov-cobertura (~> 1.3.1) simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.4) snowplow-tracker (~> 0.6.1) - solargraph (~> 0.43) + solargraph (~> 0.44.3) spamcheck (~> 0.1.0) spring (~> 2.1.0) spring-commands-rspec (~> 1.0.4) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index cc88cbbbab5b4..e9bd35cea5843 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0abclh3rd7s2k88bj40jn9wcmal8dcybvn5xrnl80xknmxh3zigp"; + sha256 = "0knrmrqmjl4gdzvmxk5plc9i5ipclncg7l0l0yhvy07779j3xqpd"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qhnkz4fs45zid30lnc77m4rw7an6pp2pdmkwkn6cczikqz5sklw"; + sha256 = "1ksps8lzmggdhbr0d45qyp2s70kfapx1x0j77xmacw9c749y5jxd"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mqcmxv28wy2jrpk9vghq7njjr03drw0ab3hw64j2d9kbpnpb8w8"; + sha256 = "0rjm6rx3qbqgxczy2a8l6hff72166hsf878fy2v1ik4pp8rh9cxa"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y"; + sha256 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n2n52m5j6h370r5j18w76kgqzzkcv8x72p040l16ax40ysglq7p"; + sha256 = "0dwinzhsfcysz9khk137z92qr5kx6aw5f2ybkdjk1yqml8avv1wd"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk"; + sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02dnr16mgwp98n9q733nprfx7dn09z6pa11cfk0pivj8daad5x1l"; + sha256 = "1g8dpxjzj7k3sjfjhfia21bwzmgc721lafpk2napravmq1qi0rkj"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0izra8g3g1agv3mz72b0474adkj4ldszj3nwk3l0szgrln7df0lv"; + sha256 = "01mzgr5pdxcki023p96bj77by1iblv9bq6pwmbly931bjwhr5irv"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15v0dwp2122yzwlw8ca0lgx5qbw8fsasbn8zzcks1mvmc9afisss"; + sha256 = "1idirwh7dzhzcjsssnghqyjl87inh84za0cmrf8g323p9qsx879l"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kngq1555jphy5yhmz4yfigpk3ms4b65ynzy5yssrlhbmdf8r430"; + sha256 = "18gxckrydsyciaiq5j981sf522kfqpq74yvf405dgn688y5927il"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -137,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35"; + sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -232,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alaqfh31hd98yhqq8fsc50zzqw04p3d83pc35gdx3x9p3j1ds7d"; + sha256 = "0y3qixbssfrzp04ng7g4lh3dq16pgrw3p8cwc0v5bhmz5yfxnsj0"; type = "gem"; }; - version = "0.3.1"; + version = "0.4.0"; }; asciidoctor-kroki = { dependencies = ["asciidoctor"]; @@ -484,10 +484,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6"; + sha256 = "0xwcnbwnbqq8jp92mvawn6y69cb53wsz84wwmk9vsfk1jjvqfw2z"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.0"; }; benchmark-ips = { groups = ["development" "test"]; @@ -824,10 +824,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; connection_pool = { groups = ["default"]; @@ -951,10 +951,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bmbqxscz0whc3kf5622ffp83k96h0vx71bhb5rzi3zzmg6b4vkl"; + sha256 = "0xmckbl41v27x9ri6snrl01alsbwxcqsfc4a1nfhgx0py6y0dmjg"; type = "gem"; }; - version = "8.4.5"; + version = "8.5.0"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -1916,10 +1916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13yq0ln40iy0wjapdg5phkqgr2bbdfk3xccyr1828yxpgkd44716"; + sha256 = "0ls4x3h1c3axx9kqmvs1mpcmjqchl297sh1bzzl5zjgdz25w24di"; type = "gem"; }; - version = "14.9.0.pre.rc4"; + version = "14.10.0.pre.rc1"; }; github-markup = { groups = ["default"]; @@ -1954,15 +1954,15 @@ version = "0.10.5"; }; gitlab-dangerfiles = { - dependencies = ["danger" "danger-gitlab"]; + dependencies = ["danger" "danger-gitlab" "rake"]; groups = ["danger" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1in56r2mdi6ghwx4nxvfihb2sg73xhnpw0w42wc5f57wwy6m1s24"; + sha256 = "1kyp5kxp0jsk224y2nq4yg37wnn824ialdjvsf8fv3a20q9w4k7i"; type = "gem"; }; - version = "2.11.0"; + version = "3.0.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -1970,10 +1970,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ph12qxhml2iq02sad7hybi5yrc5zvz2spav2ahfh3ks2fvs7cbx"; + sha256 = "093q9b2nv010n10axlhz68gxdi0xs176hd9wm758nhl3marxsv8n"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.1"; }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; @@ -2152,10 +2152,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dwx4ns39bpmzmhglyip9d68i117zspf5lp865pf6hrsmmdf2k53"; + sha256 = "1q0aknwpr8k1v92qcm1rz1zyrgdpf1i1b9mxa1gi48y0aawlnb7j"; type = "gem"; }; - version = "3.19.1"; + version = "3.19.4"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -2623,10 +2623,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cgrr3pc0y11gas6k2js33qghj7rpdh99vavda712wbq3hz42jx2"; + sha256 = "1r1pl4imiqi75bksh17r2j3w74x561z4bx1mpgv6cin1fcrzw9zy"; type = "gem"; }; - version = "0.4.4"; + version = "0.4.5"; }; jaeger-client = { dependencies = ["opentracing" "thrift"]; @@ -2944,10 +2944,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw"; + sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; type = "gem"; }; - version = "2.12.0"; + version = "2.16.0"; }; lru_redux = { groups = ["default"]; @@ -3081,20 +3081,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "173dp4vqvx1sl6aq83daxwn5xvb5rn3jgynjmb91swl7gmgp17yl"; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; mini_portile2 = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.6.1"; + version = "2.8.0"; }; minitest = { groups = ["development" "test"]; @@ -3350,10 +3350,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; + sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; type = "gem"; }; - version = "1.12.5"; + version = "1.13.3"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -3440,6 +3440,17 @@ }; version = "1.9.1"; }; + omniauth-alicloud = { + dependencies = ["omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yk9vlqm7warm83l5vy44z7q4rg4mismqmb4bmgapllqiw5yr09g"; + type = "gem"; + }; + version = "1.0.1"; + }; omniauth-atlassian-oauth2 = { dependencies = ["omniauth" "omniauth-oauth2"]; groups = ["default"]; @@ -4081,10 +4092,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4"; + sha256 = "1dpl6vi9yiv6k8gnr3zrsq7kd1dwbn8vkn70sw7dp975sgb4ziw9"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.2"; }; rack-test = { dependencies = ["rack"]; @@ -4113,10 +4124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01mvxg2rmwiqcw0alfd526axg7y1knj0lhy4i2mmxa3q0v7xb8za"; + sha256 = "0kwpw06ylmjbfldqjzhy5m6chr6q6g0gm6p6h98sbjj8awri72n5"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4168,10 +4179,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1snhwpbnmsyhr297qmin8i5i631aimjca1hiazi128i1355255hb"; + sha256 = "0g6hvhvqdmgabcpmdiby4b77ni3rsgd5p7sd1qkqj34r4an0ldyd"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.4.7"; }; rainbow = { groups = ["default" "development" "test"]; @@ -5101,10 +5112,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08wkp4gcrd89k5yari9j94if9ffkj3rka4llcwrhdgsi3l15p5f3"; + sha256 = "1wybcipkfawg4pragmayiig03xc084x3hbwywsh1dr9x9pa8f9hj"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.6"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -5195,10 +5206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i2prnczlg871l3kyqy08z8axsilgv3wm4zw061wjyzqglx7xghg"; + sha256 = "1h3i4fkn028ylhgbqac0bgpbbikjcd5ks7id8wm94ahnq89z4mh8"; type = "gem"; }; - version = "0.43.0"; + version = "0.44.3"; }; sorted_set = { dependencies = ["rbtree" "set"]; @@ -5270,20 +5281,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2"; + sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min"; type = "gem"; }; - version = "3.2.2"; + version = "3.4.2"; }; sqlite3 = { - groups = ["default" "development" "test"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; + sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; type = "gem"; }; - version = "1.3.13"; + version = "1.4.2"; }; ssh_data = { groups = ["default"]; diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index a721834725889..31ab40d79478f 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -15,16 +15,15 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-xo5EWtP2aN8YzP8ro3bnxZwUGUp0PHD0g8hk+Y+gExE="; }; + nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; + propagatedBuildInputs = with python3.pkgs; [ sh pygit2 clint ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pygit2==0.28.2" "pygit2>=0.28.2" - ''; + pythonRelaxDeps = [ "pygit2" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 570a4c06abf9a..5b1bdeb22b45c 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "sha256-c29gmmkIOyS+HNq2kv53yq+sdEDmQbSmcvVGcd55/hk="; + sha256 = "sha256-hDNlnNGm9of6Yu9WRVTRH5g4fAXlUxAexdufbZ0vMOo="; }; - cargoSha256 = "sha256-oc7XpiOZj4bfqdwrEHj/CzNtWzYWFkgMJOySJNgxAGQ="; + cargoSha256 = "sha256-026DFEWu7PTvhJZP7YW3KOBOkzFRoxrc+THilit87jU="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = if stdenv.isDarwin diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 9e444fb3b39e0..f38bb042c435f 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, openssl, libuuid, libmd, zlib, ncurses }: +{ lib, stdenv, fetchurl, pkg-config, openssl, libbsd, libuuid, libmd, zlib, ncurses }: stdenv.mkDerivation rec { pname = "got"; - version = "0.68.1"; + version = "0.69"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "122wignzrhsw00mfnh7mxcxvjyp9rk73yxzfyvmg7f5kmb0hng35"; + sha256 = "1cnl0yk866wzjwgas587kvb08njq7db71b5xqsdrwd1varp010vm"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl libuuid libmd zlib ncurses ]; + buildInputs = [ openssl libbsd libuuid libmd zlib ncurses ]; doInstallCheck = true; diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index fbf800363ab0e..c99bb409c3e90 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -9,7 +9,7 @@ , Security , SystemConfiguration , libiconv -, testVersion +, testers , jujutsu }: @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { ]; passthru.tests = { - version = testVersion { + version = testers.testVersion { package = jujutsu; command = "jj --version"; }; @@ -56,5 +56,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ _0x4A6F ]; + mainProgram = "jj"; }; } diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 462744641e3b1..f8f58cdcaba29 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -36,6 +36,13 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch"; sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ="; }) + + # Fix view not rendering with adwaita-icon-theme 42 due to removed icons. + # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/83 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/meld/-/commit/f850cdf3eaf0f08abea003d5fae118a5e92a3d61.patch"; + sha256 = "PaK8Rpv79UwMUligm9pIY16JW/dm7eVXntAwTV4hnbE="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 4898729159907..96dc830248857 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.1.1"; + version = "6.1.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-V7ikYdDOE9muOBfYqL35Ay407fqsPbzLO2a4NdzpM4g="; + sha256 = "sha256-pSgQ/AFAmCjEl00Lwsu1yA6UjVtYTPsadpliPpJKLyo="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-HYH7+OD11kdZdxFrx1KVle1NesS3fAgwVXJpAeiXDTo="; + sha256 = "sha256-OSaeOp+SjQ5n61jV8UthtQQqkneBYJhESoQDCwRSTco="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -151,6 +151,8 @@ let EOF export HGTEST_REAL_HG="${mercurial}/bin/hg" + # include tests for native components + export HGMODULEPOLICY="rust+c" # extended timeout necessary for tests to pass on the busy CI workers export HGTESTFLAGS="--blacklist blacklists/nix --timeout 1800 -j$NIX_BUILD_CORES ${flags}" make check diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 6ea66b296d747..34c3e611d4059 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc ''; + CXXFLAGS=" --std=c++11 "; + nativeBuildInputs = [ pkg-config autoreconfHook texinfo ]; buildInputs = [ boost zlib botan2 libidn lua pcre sqlite expect openssl gmp bzip2 perl ]; diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 4d3e471cca249..7091f0fbc6f9c 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { 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-cmIMVek4lwVYJQbW8ziABftPZ0iIoAoSpR7cKuN4I7M="; + sha256 = "sha256-SrfI2ZD7KDyttCd8+fo8g4UZKljYYO/SbzqrS9tAcC8="; }; sourceRoot = "."; diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 476df99d2324e..2e0e01e5c9862 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -1,12 +1,38 @@ -{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebengine, qtwebkit, openssl, xkeyboard_config, patchelfUnstable, wrapQtAppsHook }: +{ stdenv +, fetchurl +, lib +, qtbase +, qtwebengine +, qtdeclarative +, qtwebchannel +, syntax-highlighting +, openssl +, xkeyboard_config +, patchelfUnstable +, wrapQtAppsHook +, writeText +}: +let + # This abomination exists because p4v calls CRYPTO_set_mem_functions and + # expects it to succeed. The function will fail if CRYPTO_malloc has already + # been called, which happens at init time via qtwebengine -> ... -> libssh. I + # suspect it was meant to work with a version of Qt where openssl is + # statically linked or some other library is used. + crypto-hack = writeText "crypto-hack.c" '' + #include <stddef.h> + int CRYPTO_set_mem_functions( + void *(*m)(size_t, const char *, int), + void *(*r)(void *, size_t, const char *, int), + void (*f)(void *, const char *, int)) { return 1; } + ''; -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "p4v"; - version = "2020.1.1966006"; + version = "2021.3.2186916"; src = fetchurl { - url = "https://cdist2.perforce.com/perforce/r20.1/bin.linux26x86_64/p4v.tgz"; - sha256 = "0zc70d7jgdrd2jli338n1h05hgb7jmmv8hvq205wh78vvllrlv10"; + url = "http://web.archive.org/web/20211118024745/https://cdist2.perforce.com/perforce/r21.3/bin.linux26x86_64/p4v.tgz"; + sha256 = "1zldg21xq4srww9pcfbv3p8320ghjnh333pz5r70z1gwbq4vf3jq"; }; dontBuild = true; @@ -15,11 +41,10 @@ stdenv.mkDerivation rec { ldLibraryPath = lib.makeLibraryPath [ stdenv.cc.cc.lib qtbase - qtmultimedia - qtscript - qtsensors qtwebengine - qtwebkit + qtdeclarative + qtwebchannel + syntax-highlighting openssl ]; @@ -29,14 +54,17 @@ stdenv.mkDerivation rec { cp -r bin $out mkdir -p $out/lib cp -r lib/P4VResources $out/lib + $CC -fPIC -shared -o $out/lib/libcrypto-hack.so ${crypto-hack} for f in $out/bin/*.bin ; do patchelf --set-rpath $ldLibraryPath --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f # combining this with above breaks rpath (patchelf bug?) - patchelf --add-needed libstdc++.so $f \ + patchelf --add-needed libstdc++.so \ + --add-needed $out/lib/libcrypto-hack.so \ --clear-symbol-version _ZNSt20bad_array_new_lengthD1Ev \ --clear-symbol-version _ZTVSt20bad_array_new_length \ --clear-symbol-version _ZTISt20bad_array_new_length \ + --clear-symbol-version _ZdlPvm \ $f wrapQtApp $f \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 858f15a50bbe3..f4fa942a48430 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-beta"; + version = "1.0.0-beta.1"; src = fetchCrate { inherit version pname; - sha256 = "sha256-s7fHg6Le4y0yAyxOQf6iUUHA4dYsamlTUb0KISOHI7Q="; + sha256 = "sha256-XdbZFWtHKXjcGV1vYn7MYdevW+Vc/IKON1DOU49Kzlo="; }; - cargoSha256 = "sha256-09PWy1yfr1FY2AsKaoZZswi4P5JdNcumIOmTm+M21UE="; + cargoSha256 = "sha256-9kPeJ0tOhA4oqFOdwGDkXMnNViklMlNO7VbbWXYrk3I="; doCheck = false; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 60d011b653d4e..bcb90c20698b7 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python2 }: +{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python3, fetchpatch }: stdenv.mkDerivation rec { pname = "rapidsvn"; @@ -9,13 +9,28 @@ stdenv.mkDerivation rec { sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; }; - buildInputs = [ wxGTK subversion apr aprutil python2 ]; + buildInputs = [ wxGTK subversion apr aprutil python3 ]; + + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; configureFlags = [ "--with-svn-include=${subversion.dev}/include" "--with-svn-lib=${subversion.out}/lib" ]; patches = [ ./fix-build.patch + # Python 3 compatibility patches + (fetchpatch { + url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/2e26fd5d6a413d6c3a055c17ac4840b95d1537e9.patch"; + hash = "sha256-8acABzscgZh1bfAt35KHfU+nfaiO7P1b+lh34Bj0REI="; + }) + (fetchpatch { + url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/92927af764f92b3731333ed3dba637f98611167a.patch"; + hash = "sha256-4PdShGcfFwxjdI3ygbnKFAa8l9dGERq/xSl54WisgKM="; + }) + (fetchpatch { + url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/3e375f11d94cb8faddb8b7417354a9fb51f304ec.patch"; + hash = "sha256-BUpCMEH7jctOLtJktDUE52bxexfLemLItZ0IgdAnq9g="; + }) ]; meta = { @@ -23,5 +38,7 @@ stdenv.mkDerivation rec { homepage = "http://rapidsvn.tigris.org/"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 6982bd43b2632..5f2f9aab2b3c3 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed, lzip }: +{ lib, stdenv, fetchurl, buildPackages, diffutils, ed, lzip }: stdenv.mkDerivation rec { pname = "rcs"; @@ -9,14 +9,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-Q93+EHJKi4XiRo9kA7YABzcYbwHmDgvWL95p2EIjTMU="; }; - patches = [ - # glibc 2.34 compat - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/rcs/raw/f8e07cd37f4abfb36e37d41852bb8f9e234d3fb1/f/rcs-5.10.0-SIGSTKSZ.patch"; - sha256 = "sha256-mc6Uye9mdEsLBcOnf1m1TUb1BV0ncNU//iKBpLGBjho="; - }) - ]; - ac_cv_path_ED = "${ed}/bin/ed"; DIFF = "${diffutils}/bin/diff"; DIFF3 = "${diffutils}/bin/diff3"; diff --git a/pkgs/applications/version-management/rcshist/default.nix b/pkgs/applications/version-management/rcshist/default.nix new file mode 100644 index 0000000000000..a9c7bbefc1318 --- /dev/null +++ b/pkgs/applications/version-management/rcshist/default.nix @@ -0,0 +1,22 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation { + pname = "rcshist"; + version = "1.04"; + + src = fetchurl { + url = "https://web.archive.org/web/20220508220019/https://invisible-island.net/datafiles/release/rcshist.tar.gz"; + sha256 = "01ab3xwgm934lxr8bm758am3vxwx4hxx7cc9prbgqj5nh30vdg1n"; + }; + + meta = { + description = "Utitity to display complete revision history of a set of RCS files"; + homepage = "https://invisible-island.net/rcshist/rcshist.html"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.kaction ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index c3c25dafd544d..3b1ac09c8a4cd 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.6.2' +gem 'rails', '5.2.6.3' 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' @@ -24,7 +24,7 @@ gem 'rubyzip', '~> 2.3.0' gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] # TOTP-based 2-factor authentication -gem 'rotp' +gem 'rotp', '>= 5.0.0' gem 'rqrcode' # Optional gem for LDAP authentication diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index b745c54520b11..2643918716afb 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.6.2) - actionpack (= 5.2.6.2) + actioncable (5.2.6.3) + actionpack (= 5.2.6.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.6.2) - actionpack (= 5.2.6.2) - actionview (= 5.2.6.2) - activejob (= 5.2.6.2) + actionmailer (5.2.6.3) + actionpack (= 5.2.6.3) + actionview (= 5.2.6.3) + activejob (= 5.2.6.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.6.2) - actionview (= 5.2.6.2) - activesupport (= 5.2.6.2) + actionpack (5.2.6.3) + actionview (= 5.2.6.3) + activesupport (= 5.2.6.3) 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.6.2) - activesupport (= 5.2.6.2) + actionview (5.2.6.3) + activesupport (= 5.2.6.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.6.2) - activesupport (= 5.2.6.2) + activejob (5.2.6.3) + activesupport (= 5.2.6.3) globalid (>= 0.3.6) - activemodel (5.2.6.2) - activesupport (= 5.2.6.2) - activerecord (5.2.6.2) - activemodel (= 5.2.6.2) - activesupport (= 5.2.6.2) + activemodel (5.2.6.3) + activesupport (= 5.2.6.3) + activerecord (5.2.6.3) + activemodel (= 5.2.6.3) + activesupport (= 5.2.6.3) arel (>= 9.0) - activestorage (5.2.6.2) - actionpack (= 5.2.6.2) - activerecord (= 5.2.6.2) + activestorage (5.2.6.3) + actionpack (= 5.2.6.3) + activerecord (= 5.2.6.3) marcel (~> 1.0.0) - activesupport (5.2.6.2) + activesupport (5.2.6.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -60,7 +60,7 @@ GEM xpath (~> 3.2) childprocess (4.1.0) chunky_png (1.4.0) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) crass (1.0.6) css_parser (1.11.0) addressable @@ -72,7 +72,7 @@ GEM htmlentities (4.3.4) i18n (1.8.11) concurrent-ruby (~> 1.0) - loofah (2.14.0) + loofah (2.16.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -81,21 +81,19 @@ GEM method_source (1.0.0) mini_magick (4.11.0) mini_mime (1.0.3) - mini_portile2 (2.5.3) minitest (5.15.0) mocha (1.13.0) mysql2 (0.5.3) net-ldap (0.17.0) nio4r (2.5.8) nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) racc (~> 1.4) - parallel (1.21.0) - parser (3.1.1.0) + parallel (1.22.1) + parser (3.1.2.0) ast (~> 2.4.1) pg (1.2.3) - public_suffix (4.0.6) - puma (5.6.2) + public_suffix (4.0.7) + puma (5.6.4) nio4r (~> 2.0) racc (1.6.0) rack (2.2.3) @@ -104,27 +102,27 @@ GEM ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.6.2) - actioncable (= 5.2.6.2) - actionmailer (= 5.2.6.2) - actionpack (= 5.2.6.2) - actionview (= 5.2.6.2) - activejob (= 5.2.6.2) - activemodel (= 5.2.6.2) - activerecord (= 5.2.6.2) - activestorage (= 5.2.6.2) - activesupport (= 5.2.6.2) + rails (5.2.6.3) + actioncable (= 5.2.6.3) + actionmailer (= 5.2.6.3) + actionpack (= 5.2.6.3) + actionview (= 5.2.6.3) + activejob (= 5.2.6.3) + activemodel (= 5.2.6.3) + activerecord (= 5.2.6.3) + activestorage (= 5.2.6.3) + activesupport (= 5.2.6.3) bundler (>= 1.3.0) - railties (= 5.2.6.2) + railties (= 5.2.6.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (5.2.6.2) - actionpack (= 5.2.6.2) - activesupport (= 5.2.6.2) + railties (5.2.6.3) + actionpack (= 5.2.6.3) + activesupport (= 5.2.6.3) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -160,7 +158,7 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) + rubocop-ast (1.17.0) parser (>= 3.1.1.0) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) @@ -180,7 +178,7 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.3) - sprockets (4.0.2) + sprockets (4.0.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.4.2) @@ -227,13 +225,13 @@ DEPENDENCIES pg (~> 1.2.2) puma rack-openid - rails (= 5.2.6.2) + rails (= 5.2.6.3) rails-dom-testing rbpdf (~> 1.20.0) redcarpet (~> 3.5.1) request_store (~> 1.5.0) roadie-rails (~> 2.2.0) - rotp + rotp (>= 5.0.0) rouge (~> 3.26.0) rqrcode rubocop (~> 1.12.0) @@ -248,7 +246,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 2.7.4p191 + ruby 2.7.6p219 BUNDLED WITH - 2.1.4 + 2.2.33 diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 39e46d90b88da..1f0f9f4e788d8 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 }: let - version = "4.2.4"; + version = "4.2.5"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -15,10 +15,8 @@ in inherit version; src = fetchurl { - # https://www.redmine.org/news/134 - # > "These releases are not available yet on the releases page from a technical reason, we are sorry for this and we expected to have them uploaded next week. I'll post here an update after we have them uploaded." - url = "https://www.redmine.org/attachments/download/28862/${pname}-${version}.tar.gz"; - sha256 = "7f50fd4a6cf1c1e48091a87696b813ba264e11f04dec67fb006858a1b49a5c7d"; + url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; + sha256 = "112rc2sjx6x7046fjz7np0ilszvkqapc180ld02ncwmdxaq88w6r"; }; nativeBuildInputs = [ makeWrapper ]; @@ -47,7 +45,7 @@ in meta = with lib; { homepage = "https://www.redmine.org/"; platforms = platforms.linux; - maintainers = [ maintainers.aanderse ]; + maintainers = with maintainers; [ aanderse felixsinger ]; license = licenses.gpl2; }; } diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index a18e819fc90a4..77d1d997fd8b6 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 = "0il9l30jz1gfjccrahfk2gl57b31dqgjlzjc8cfifm76ggywmz67"; + sha256 = "1gmwailk92znzrdpi4116ih6bq609a38rpnszzh5piq7b507ikpn"; type = "gem"; }; - version = "5.2.6.2"; + version = "5.2.6.3"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cci24da56d467ldq40n3l176h9qdw691w1b703c251izh6c4n5d"; + sha256 = "103a1nixkazzdk21bg42vs722m6gm0vf17ag2fdad5dycwk3ycpp"; type = "gem"; }; - version = "5.2.6.2"; + version = "5.2.6.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xis55xvs4hja6fnmj4785rzafk553k5f0xb7jprqf38c6dzmiak"; + sha256 = "15fz3rjk85svpx9lsqfdwlvyd972zf0g5jasnsllcbf6d300gdj6"; type = "gem"; }; - version = "5.2.6.2"; + version = "5.2.6.3"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00a9g63xwfimnzsrcrnr4vmdwhg7jaic49jas70r695nznwkxr9x"; + sha256 = "00cfpmbk8gw9c589xnqazsbd860p2368gyh8nyzixcsa6k28wfwv"; type = "gem"; }; - version = "5.2.6.2"; + version = "5.2.6.3"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fm5qxrv8pxhl7m88p17xxpizddasm9kknaldkax8im3b9vrgnr9"; + sha256 = "1gczbnk7qy4rjhv0q82nd70xawc9lb1vinvwr4ngpim5rqwzm6d6"; type = "gem"; }; - version = "5.2.6.2"; + version = "5.2.6.3"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k0xizwbcadmslc8rkg2vnsbrsqivm6yj2yjrzb6rhqwphcr9zjf"; + sha256 = "0ib8qlbwr9hp5284c6bmx08lrfy45zzd4inzmawz08alkgdcrzca"; type = "gem"; }; - version = "5.2.6.2"; + version = "5.2.6.3"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m00zh62rfn2h15vfn89jg39wxmghc88v2vjb5r4m0c7g24vrb14"; + sha256 = "0ky3zc8i5rjg2dpdb95icsgb443siim9sv71xwcmryjxp5rhkqyx"; type = "gem"; }; - version = "5.2.6.2"; + version = "5.2.6.3"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h3z331xli0j5didh0g9cv4zrlx32b5csp1566fpy0fr2kgqmpi9"; + sha256 = "1risg5jklxrm7j5i4rzaqpb94822ivbjaasblppwmx5f33vhfpca"; type = "gem"; }; - version = "5.2.6.2"; + version = "5.2.6.3"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "164lmi9w96wdwd00dnly8f9dcak3blv49ymyqz30q2fdjn45c775"; + sha256 = "09vif5aajkvrsdcl51kvk8crz8hl38awprh7d5wj93nscpxmqgns"; type = "gem"; }; - version = "5.2.6.2"; + version = "5.2.6.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -186,10 +186,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; crass = { groups = ["default"]; @@ -280,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w"; + sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; type = "gem"; }; - version = "2.14.0"; + version = "2.16.0"; }; mail = { dependencies = ["mini_mime"]; @@ -336,16 +336,6 @@ }; version = "1.0.3"; }; - mini_portile2 = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; - type = "gem"; - }; - version = "2.5.3"; - }; minitest = { groups = ["default" "test"]; platforms = []; @@ -405,7 +395,7 @@ version = "2.5.8"; }; nokogiri = { - dependencies = ["mini_portile2" "racc"]; + dependencies = ["racc"]; groups = ["default" "test"]; platforms = []; source = { @@ -420,10 +410,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4"; + sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; type = "gem"; }; - version = "1.21.0"; + version = "1.22.1"; }; parser = { dependencies = ["ast"]; @@ -431,10 +421,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c"; + sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; type = "gem"; }; - version = "3.1.1.0"; + version = "3.1.2.0"; }; pg = { groups = ["default"]; @@ -459,10 +449,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; puma = { dependencies = ["nio4r"]; @@ -470,10 +460,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56"; + sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw"; type = "gem"; }; - version = "5.6.2"; + version = "5.6.4"; }; racc = { groups = ["default" "test"]; @@ -523,10 +513,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fgbld733j2j85pf8kpv1mvp8rmlkqs7ccv77q2mwfm7ri4yisy0"; + sha256 = "19962nkjssr77753a8893yz17kmvb63h9rl3ajq6r8rx9xifq8fn"; type = "gem"; }; - version = "5.2.6.2"; + version = "5.2.6.3"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -556,10 +546,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fgyw80j2mss3hdhzxa1b12c7j17az55znq0d16md69if8dwfmic"; + sha256 = "0waa50li6vvckz9mznyz4jhks46ba09fmbdadrrj35mzwahyb6fy"; type = "gem"; }; - version = "5.2.6.2"; + version = "5.2.6.3"; }; rainbow = { groups = ["default" "test"]; @@ -723,10 +713,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv"; + sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -818,10 +808,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ikgwbl6jv3frfiy3xhg5yxw9d0064rgzghar1rg391xmrc4gm38"; + sha256 = "19k5cwg8gyb6lkmz4kab7c5nlplpgj64jy7vw8p5l2i2ysq5hym0"; type = "gem"; }; - version = "4.0.2"; + version = "4.0.3"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; diff --git a/pkgs/applications/version-management/redmine/update.sh b/pkgs/applications/version-management/redmine/update.sh new file mode 100755 index 0000000000000..de59f4685d5c2 --- /dev/null +++ b/pkgs/applications/version-management/redmine/update.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i bash -p cacert bundix + +# Do these steps before running this script: +# 1. Copy Gemfile from new Redmine version to this folder +# 2. Manually modify the database lines in Gemfile (diff the two files, it's obvious) + +pkg_dir="$(dirname "$0")" +cd ${pkg_dir} + +for file in "gemset.nix" "Gemfile.lock"; do + if [ -f ${file} ]; then + rm ${file} + fi +done + +bundix -l diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index fc8e5d4e4b17f..6526fdb2d1bed 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,13 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2068"; - sha256 = "sha256-CseZQgjqr8B66Slf/yFZZsnRFc3zqCGKFAzSdMRQdNI="; + buildVersion = "2071"; + sha256 = "xYVk5Fx6VdoHzf0cbmhwKyEr5HDEZgPgDoBWQg/tS0U="; } {}; sublime-merge-dev = common { - buildVersion = "2067"; - sha256 = "sha256-ViBBi9Ghh4dHg7Gmg4i/B+Q4OgDd4XiHNIs12qffZdg="; + buildVersion = "2070"; + sha256 = "2AA2HBF19g34ov6ytjL2caqS7Ro4eyj18vzwINm0CTw="; dev = true; } {}; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 0f88a18a47876..13bdc31f735df 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -119,13 +119,8 @@ let }); in { - subversion_1_10 = common { - version = "1.10.7"; - sha256 = "1nhrd8z6c94sc0ryrzpyd98qdn5a5g3x0xv1kdb9da4drrk8y2ww"; - }; - subversion = common { - version = "1.14.1"; - sha256 = "1ag1hvcm9q92kgalzbbgcsq9clxnzmbj9nciz9lmabjx4lyajp9c"; + version = "1.14.2"; + sha256 = "sha256-yRMOjQt1copm8OcDj8dwUuZxgw14W1YWqtU7SBDTzCg="; }; } diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index 1cd44bd34883b..720df51a34ef5 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - sha256 = "sha256-cDxb/IcpzR5akWnA8RN+fKQn0+QnpBV8tAbUjjPICsA="; + sha256 = "sha256-A1c7YdBh2VOhw/xTvhNV50j9n+SELyRTHI5w+AeiWDs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 2919cb10ca3f8..5e60bb7fd9086 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,13 +1,26 @@ -{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }: +{ lib, stdenv +, fetchgit +, wrapGAppsHook +, cairo +, glib +, gnome +, gst_all_1 +, gtk3 +, intltool +, libtool +, pkg-config +, which +, xorg +}: stdenv.mkDerivation { - version = "0.2.3.alpha"; pname = "byzanz"; + version = "unstable-2016-03-12"; src = fetchgit { url = "https://gitlab.gnome.org/Archive/byzanz"; - rev = "1875a7f6a3903b83f6b1d666965800f47db9286a"; - sha256 = "0a72fw2mxl8vdcdnzy0bwis4jk28pd7nc8qgr4vhyw5pd48dynvh"; + rev = "81235d235d12c9687897f7fc6ec0de1feaed6623"; + hash = "sha256-3DUwXCPBAmeCRlDkiPUgwNyBa6bCvC/TLguMCK3bo4E="; }; patches = [ ./add-amflags.patch ]; @@ -16,11 +29,31 @@ stdenv.mkDerivation { ./autogen.sh --prefix=$out ''; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = builtins.concatStringsSep " " [ + "-Wno-error=deprecated-declarations" + "-Wno-error=incompatible-pointer-types" + ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ which gnome.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ] - ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); + buildInputs = [ + which + gnome.gnome-common + glib + intltool + libtool + cairo + gtk3 + xorg.xwininfo + xorg.libXdamage + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-bad + gst-plugins-good + gst-plugins-ugly + gst-libav + wrapGAppsHook + ]); meta = with lib; { description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser"; diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index 291b4b9ebfc64..98495ca5affb7 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "celluloid"; - version = "0.22"; + version = "0.23"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; rev = "v${version}"; - hash = "sha256-QGN8YLtyb9YVNDK2ZDQwHJVg6UTIQssfNK9lQqxMNKQ="; + hash = "sha256-YKDud/UJJx9ko5k+Oux8mUUme0MXaRMngESE14Hhxv8="; }; nativeBuildInputs = [ @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs meson-post-install.py src/generate-authors.py - # Remove this for next release - substituteInPlace meson-post-install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; doCheck = true; diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix index 09b24663080be..ce63b9240306a 100644 --- a/pkgs/applications/video/clickshare-csc1/default.nix +++ b/pkgs/applications/video/clickshare-csc1/default.nix @@ -4,7 +4,6 @@ , alsa-lib , autoPatchelfHook , binutils-unwrapped -, gnutar , libav_0_8 , libnotify , libresample @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook binutils-unwrapped - gnutar rpmextract unzip ]; diff --git a/pkgs/applications/video/clip/default.nix b/pkgs/applications/video/clip/default.nix new file mode 100644 index 0000000000000..43f9437c57ad2 --- /dev/null +++ b/pkgs/applications/video/clip/default.nix @@ -0,0 +1,58 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, applet-window-buttons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, mauikit-filebrowsing +, qtmultimedia +, qtquickcontrols2 +, taglib +, ffmpeg +}: + +mkDerivation rec { + pname = "clip"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "clip"; + rev = "v${version}"; + sha256 = "sha256-vW3A0PKJSC2QNs+QVZ9w0g4aVmcndhahrpkd4wWoUko="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + applet-window-buttons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + mauikit-filebrowsing + qtmultimedia + qtquickcontrols2 + taglib + ffmpeg + ]; + + meta = with lib; { + description = "Video player and video collection manager"; + homepage = "https://invent.kde.org/maui/clip"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 5a3e76ffcaf58..6ae5759f6d161 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -16,7 +16,7 @@ , xkeyboard_config , glib , libarchive -, python +, python2 }: let @@ -155,7 +155,7 @@ buildFHSUserEnv { glib libarchive xdg-utils # xdg-open needed to open URLs - python + python2 # currently they want python 3.6 which is EOL #python3 ]; diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index 77510ae153deb..1f5d23a684a8a 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -1,8 +1,7 @@ { lib , stdenv , fetchFromGitHub -, common-updater-scripts -, genericUpdater +, gitUpdater , writers , makeWrapper , bash @@ -24,18 +23,6 @@ let sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig="; }; - workaround-opencollective-buildfailures = stdenv.mkDerivation { - # FIXME: This should be removed when a complete fix is available - # https://github.com/svanderburg/node2nix/issues/145 - name = "workaround-opencollective-buildfailures"; - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - touch $out/bin/opencollective-postinstall - chmod +x $out/bin/opencollective-postinstall - ''; - }; - client = nodePackages.epgstation-client.override (drv: { # FIXME: remove this option if possible # @@ -50,21 +37,14 @@ let server = nodePackages.epgstation.override (drv: { inherit src; - bypassCache = false; - # This is set to false to keep devDependencies at build time. Build time # dependencies are pruned afterwards. production = false; - buildInputs = [ bash ]; - nativeBuildInputs = [ - nodejs - workaround-opencollective-buildfailures + buildInputs = (drv.buildInputs or [ ]) ++ [ bash ]; + nativeBuildInputs = (drv.nativeBuildInputs or [ ]) ++ [ makeWrapper - ] ++ (with nodePackages; [ - node-pre-gyp - node-gyp-build - ]); + ]; preRebuild = '' # Fix for not being able to connect to mysql using domain sockets. @@ -115,7 +95,7 @@ let ln -sfT /var/lib/epgstation/thumbnail thumbnail makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \ - --run "cd $out/lib/node_modules/epgstation" \ + --chdir "$out/lib/node_modules/epgstation" \ --prefix PATH : ${lib.makeBinPath runtimeDeps} \ --set APP_ROOT_PATH "$out/lib/node_modules/epgstation" @@ -130,8 +110,7 @@ let inherit pname version - common-updater-scripts - genericUpdater + gitUpdater writers jq yq; diff --git a/pkgs/applications/video/epgstation/update.nix b/pkgs/applications/video/epgstation/update.nix index 5eb23be6c52b6..387fbe0db62d2 100644 --- a/pkgs/applications/video/epgstation/update.nix +++ b/pkgs/applications/video/epgstation/update.nix @@ -2,19 +2,17 @@ , version , homepage , lib -, common-updater-scripts -, genericUpdater +, gitUpdater , writers , jq , yq }: let - updater = genericUpdater { + updater = gitUpdater { inherit pname version; attrPath = lib.toLower pname; rev-prefix = "v"; - versionLister = "${common-updater-scripts}/bin/list-git-tags --url=${homepage}"; }; updateScript = builtins.elemAt updater 0; updateArgs = map (lib.escapeShellArg) (builtins.tail updater); diff --git a/pkgs/applications/video/f1viewer/default.nix b/pkgs/applications/video/f1viewer/default.nix index c241dd8a7458f..2620142fb11e9 100644 --- a/pkgs/applications/video/f1viewer/default.nix +++ b/pkgs/applications/video/f1viewer/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "f1viewer"; - version = "2.6.2"; + version = "2.7.0"; src = fetchFromGitHub { owner = "SoMuchForSubtlety"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z6rnkHypk7r9NnYwqZpWQOuGPbWn/EppS+46PQHIdDM="; + sha256 = "sha256-jXC2dENXuqicNQqTHyZKsjibDvjta/npQmf3+uivjX0="; }; vendorSha256 = "sha256-UNeH3zxgssXxFpJws6nAL8EgXt0DRyAQfmlJWz/qyDg="; diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index a2f802c6e87bb..7f705bc3526df 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.8"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vxiq6q8fPh8ZLKnxYdIN591UQW73FWsoke1PvKTkko8="; + sha256 = "sha256-DSBh3m7gGm5fWH47YWALlyhi4x6A2RcVrpuDDpXolSI="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 841604399ed36..3c73e7f59944b 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -11,7 +11,7 @@ , lib , fetchFromGitHub # For tests -, testVersion +, testers , runCommand , fetchurl # Main build tools @@ -230,7 +230,7 @@ let self = stdenv.mkDerivation rec { HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160 test -e test.mkv ''; - version = testVersion { package = self; command = "HandBrakeCLI --version"; }; + version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; }; }; meta = with lib; { diff --git a/pkgs/applications/video/hdhomerun-config-gui/default.nix b/pkgs/applications/video/hdhomerun-config-gui/default.nix index 62726dff41123..32f4267d9fcc1 100644 --- a/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { makeFlags = [ "SUBDIRS=src" ]; installPhase = '' - install -vDm 755 src/hdhomerun_config_gui $out/usr/bin/hdhomerun_config_gui + runHook preInstall + install -vDm 755 src/hdhomerun_config_gui $out/bin/hdhomerun_config_gui + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix new file mode 100644 index 0000000000000..9bee8715b98d0 --- /dev/null +++ b/pkgs/applications/video/hyperion-ng/default.nix @@ -0,0 +1,50 @@ +{ avahi-compat, cmake, fetchFromGitHub, flatbuffers, hidapi, lib, libcec +, libusb1, libX11, libxcb, libXrandr, mbedtls, mkDerivation, protobuf, python3 +, qtbase, qtserialport, qtsvg, qtx11extras, wrapQtAppsHook }: + +mkDerivation rec { + pname = "hyperion.ng"; + version = "2.0.12"; + + src = fetchFromGitHub { + owner = "hyperion-project"; + repo = pname; + rev = version; + sha256 = "sha256-J31QaWwGNhIpnZmWN9lZEI6fC0VheY5X8fGchQqtAlQ="; + }; + + buildInputs = [ + avahi-compat + flatbuffers + hidapi + libcec + libusb1 + libX11 + libxcb + libXrandr + mbedtls + protobuf + python3 + qtbase + qtserialport + qtsvg + qtx11extras + ]; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DUSE_SYSTEM_MBEDTLS_LIBS=ON" + "-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON" + "-DUSE_SYSTEM_PROTO_LIBS=ON" + ]; + + meta = with lib; { + description = "Open Source Ambilight solution"; + homepage = "https://github.com/hyperion-project/hyperion.ng"; + license = licenses.mit; + maintainers = with maintainers; [ algram ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch b/pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch new file mode 100644 index 0000000000000..ae221eff60450 --- /dev/null +++ b/pkgs/applications/video/kodi/add-KODI_WEBSERVER_EXTRA_WHITELIST.patch @@ -0,0 +1,88 @@ +From 620c3eb38f0dbea6e877e37e97508513e87a0732 Mon Sep 17 00:00:00 2001 +From: Jeremy Fleischman <jeremyfleischman@gmail.com> +Date: Sun, 27 Mar 2022 00:44:52 -0700 +Subject: [PATCH] Add new KODI_WEBSERVER_EXTRA_WHITELIST cmake var to allow + access to more directories + +(This is a backport of +https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 +to Kodi 19.4 Matrix) + +This is useful for NixOS, which often ends up creating a `KODI_HOME` +with symlinks to other files (including the chorus2 interface). Kodi's +webserver cautiously refuses to follow these symlinks, and you end up +getting 404s rather than the web page. + +See https://forum.kodi.tv/showthread.php?tid=366338&pid=3079493 for a +discussion of this on the Kodi forum. +--- + CMakeLists.txt | 1 + + xbmc/CompileInfo.cpp.in | 5 +++++ + xbmc/CompileInfo.h | 1 + + xbmc/utils/FileUtils.cpp | 6 +++++- + 4 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d5369798df23..d5ef6d9390ef0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -243,6 +243,7 @@ add_custom_command(OUTPUT ${CORE_BUILD_DIR}/xbmc/CompileInfo.cpp + -DAPP_BUILD_DATE=${APP_BUILD_DATE} + -DAPP_SHARED_LIBRARY_SUFFIX="${APP_SHARED_LIBRARY_SUFFIX}" + -Dprefix=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} ++ -DKODI_WEBSERVER_EXTRA_WHITELIST="${KODI_WEBSERVER_EXTRA_WHITELIST}" + -P ${CMAKE_SOURCE_DIR}/cmake/scripts/common/GenerateVersionedFiles.cmake + DEPENDS ${CMAKE_SOURCE_DIR}/version.txt + export-files +diff --git a/xbmc/CompileInfo.cpp.in b/xbmc/CompileInfo.cpp.in +index f81fe77902236..4f19203a89cde 100644 +--- a/xbmc/CompileInfo.cpp.in ++++ b/xbmc/CompileInfo.cpp.in +@@ -105,3 +105,8 @@ std::vector<std::string> CCompileInfo::GetAvailableWindowSystems() + { + return StringUtils::Split("@CORE_PLATFORM_NAME_LC@", ' '); + } ++ ++const std::vector<std::string> CCompileInfo::GetWebserverExtraWhitelist() ++{ ++ return StringUtils::Split("@KODI_WEBSERVER_EXTRA_WHITELIST@", ','); ++} +diff --git a/xbmc/CompileInfo.h b/xbmc/CompileInfo.h +index 553a0194ee77f..e2521324e6576 100644 +--- a/xbmc/CompileInfo.h ++++ b/xbmc/CompileInfo.h +@@ -32,4 +32,5 @@ class CCompileInfo + static const char* GetVersionCode(); + static std::vector<std::string> GetAvailableWindowSystems(); + static std::vector<ADDON::RepoInfo> LoadOfficialRepoInfos(); ++ static const std::vector<std::string> GetWebserverExtraWhitelist(); + }; +diff --git a/xbmc/utils/FileUtils.cpp b/xbmc/utils/FileUtils.cpp +index e51f3d631c256..fc717c9608098 100644 +--- a/xbmc/utils/FileUtils.cpp ++++ b/xbmc/utils/FileUtils.cpp +@@ -6,6 +6,7 @@ + * See LICENSES/README.md for more information. + */ + ++#include "CompileInfo.h" + #include "FileUtils.h" + #include "ServiceBroker.h" + #include "guilib/GUIKeyboardFactory.h" +@@ -261,12 +262,15 @@ bool CFileUtils::CheckFileAccessAllowed(const std::string &filePath) + "/.ssh/", + }; + // ALLOW kodi paths +- const std::vector<std::string> whitelist = { ++ std::vector<std::string> whitelist = { + CSpecialProtocol::TranslatePath("special://home"), + CSpecialProtocol::TranslatePath("special://xbmc"), + CSpecialProtocol::TranslatePath("special://musicartistsinfo") + }; + ++ auto kodiExtraWhitelist = CCompileInfo::GetWebserverExtraWhitelist(); ++ whitelist.insert(whitelist.end(), kodiExtraWhitelist.begin(), kodiExtraWhitelist.end()); ++ + // image urls come in the form of image://... sometimes with a / appended at the end + // and can be embedded in a music or video file image://music@... + // strip this off to get the real file path diff --git a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix index 7698e6619d91c..1319f72f4e975 100644 --- a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "inputstreamhelper"; namespace = "script.module.inputstreamhelper"; - version = "0.5.8+matrix.1"; + version = "0.5.10+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "xdsUzmz8ji9JcYLEUFWwvXq0Oig5i08VPQD93K8R9hk="; + sha256 = "FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4="; }; passthru = { diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 18319468eae90..a37e5c92e241f 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper -, pkg-config, cmake, gnumake, yasm, python3Packages +, pkg-config, cmake, yasm, python3Packages , libgcrypt, libgpg-error, libunistring , boost, avahi, lame , gettext, pcre-cpp, yajl, fribidi, which @@ -107,6 +107,15 @@ in stdenv.mkDerivation { src = kodi_src; + # This is a backport of + # https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 + # to Kodi 19.4 Matrix. + # This can be removed once a new release of Kodi comes out and we upgrade + # to it. + patches = [ + ./add-KODI_WEBSERVER_EXTRA_WHITELIST.patch + ]; + buildInputs = [ gnutls libidn libtasn1 nasm p11-kit libxml2 python3Packages.python @@ -160,7 +169,7 @@ in stdenv.mkDerivation { doxygen makeWrapper which - pkg-config gnumake + pkg-config autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 jre_headless yasm gettext python3Packages.python flatbuffers @@ -185,6 +194,12 @@ in stdenv.mkDerivation { "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc" "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python" + # When wrapped KODI_HOME will likely contain symlinks to static assets + # that Kodi's built in webserver will cautiously refuse to serve up + # (because their realpaths are outside of KODI_HOME and the other + # whitelisted directories). This adds the entire nix store to the Kodi + # webserver whitelist to avoid this problem. + "-DKODI_WEBSERVER_EXTRA_WHITELIST=${builtins.storeDir}" ] ++ lib.optional waylandSupport [ "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++" ]; diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 2380d0023d576..52b7679a325ea 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -35,11 +35,5 @@ buildEnv { (lib.concatMap (plugin: plugin.extraRuntimeDependencies or []) addons)}" done - - # makeWrapper just created webinterface.default as a symlink. However, - # kodi's webserver carefully refuses to follow symlinks, so we need to copy - # these assets instead. - rm $out/share/kodi/addons/webinterface.default - cp -r ${kodi}/share/kodi/addons/webinterface.default/ $out/share/kodi/addons/webinterface.default ''; } diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index affc585ed3513..6bec6e25533f1 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -23,15 +23,15 @@ let ]; lightworks = stdenv.mkDerivation rec { - version = "2021.2.1"; - rev = "128456"; + version = "2022.1.1"; + rev = "132926"; pname = "lightworks"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://cdn.lwks.com/releases/${version}/lightworks_${lib.versions.majorMinor version}_r${rev}.deb"; - sha256 = "sha256-GkTg43IUF1NgEm/wT9CZw68Dw/R2BYBU/F4bsCxQowQ="; + url = "https://cdn.lwks.com/releases/${version}/lightworks_${version}_r${rev}.deb"; + sha256 = "sha256-f2lxfv0sFESpDnINDKlfVcR0pySAueMeOMbkgBWzz7Q="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/video/mirakurun/default.nix b/pkgs/applications/video/mirakurun/default.nix index 3987e12528444..d0d52ade25ad9 100644 --- a/pkgs/applications/video/mirakurun/default.nix +++ b/pkgs/applications/video/mirakurun/default.nix @@ -6,9 +6,8 @@ { lib , stdenvNoCC , bash -, common-updater-scripts , fetchFromGitHub -, genericUpdater +, gitUpdater , jq , makeWrapper , mkYarnPackage @@ -61,7 +60,7 @@ stdenvNoCC.mkDerivation rec { mkdir -p $out/bin makeWrapper ${mirakurun}/bin/mirakurun-epgdump $out/bin/mirakurun-epgdump \ - --run "cd ${mirakurun}/libexec/mirakurun/node_modules/mirakurun" \ + --chdir "${mirakurun}/libexec/mirakurun/node_modules/mirakurun" \ --prefix PATH : ${lib.makeBinPath runtimeDeps} # XXX: The original mirakurun command uses PM2 to manage the Mirakurun @@ -70,7 +69,7 @@ stdenvNoCC.mkDerivation rec { # unique to PM2 is currently being used. makeWrapper ${yarn}/bin/yarn $out/bin/mirakurun-start \ --add-flags "start" \ - --run "cd ${mirakurun}/libexec/mirakurun/node_modules/mirakurun" \ + --chdir "${mirakurun}/libexec/mirakurun/node_modules/mirakurun" \ --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; @@ -80,8 +79,7 @@ stdenvNoCC.mkDerivation rec { inherit pname version - common-updater-scripts - genericUpdater + gitUpdater writers jq yarn diff --git a/pkgs/applications/video/mirakurun/update.nix b/pkgs/applications/video/mirakurun/update.nix index 18a4d0ab25629..6fd13f81b87ad 100644 --- a/pkgs/applications/video/mirakurun/update.nix +++ b/pkgs/applications/video/mirakurun/update.nix @@ -2,8 +2,7 @@ , version , homepage , lib -, common-updater-scripts -, genericUpdater +, gitUpdater , writers , jq , yarn @@ -11,15 +10,12 @@ }: let - updater = genericUpdater { + updater = gitUpdater { inherit pname version; attrPath = lib.toLower pname; # exclude prerelease versions - versionLister = writers.writeBash "list-mirakurun-versions" '' - ${common-updater-scripts}/bin/list-git-tags --url=${homepage} \ - | grep '^[0-9]\+\.[0-9]\+\.[0-9]\+$' - ''; + ignoredVersions = "-"; }; updateScript = builtins.elemAt updater 0; updateArgs = map (lib.escapeShellArg) (builtins.tail updater); diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 137731312b0e3..e44471c6f8599 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "66.0.0"; + version = "67.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "sha256-JTPayZhV3Z+o1v+TbHp9SGMAZk1oEzMdNhk67BYB75A="; + sha256 = "0gyjgp5iyr9kvgpgl064w025ji1w8dy0cnw4fmbp71wis7qp7yl1"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 0c435bfbe158d..6d280e71b8610 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,60 +1,37 @@ { config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg -, aalibSupport ? true, aalib ? null -, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null -, fribidiSupport ? true, fribidi ? null -, x11Support ? true, libX11 ? null, libXext ? null, libGLU, libGL ? null -, xineramaSupport ? true, libXinerama ? null -, xvSupport ? true, libXv ? null -, alsaSupport ? stdenv.isLinux, alsa-lib ? null -, screenSaverSupport ? true, libXScrnSaver ? null -, vdpauSupport ? false, libvdpau ? null -, cddaSupport ? !stdenv.isDarwin, cdparanoia ? null -, dvdnavSupport ? !stdenv.isDarwin, libdvdnav ? null -, dvdreadSupport ? true, libdvdread ? null -, bluraySupport ? true, libbluray ? null -, amrSupport ? false, amrnb ? null, amrwb ? null -, cacaSupport ? true, libcaca ? null -, lameSupport ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, x264Support ? false, x264 ? null -, jackaudioSupport ? false, libjack2 ? null -, pulseSupport ? config.pulseaudio or false, libpulseaudio ? null -, bs2bSupport ? false, libbs2b ? null -, v4lSupport ? false, libv4l ? null +, aalibSupport ? true, aalib +, fontconfigSupport ? true, fontconfig, freefont_ttf +, fribidiSupport ? true, fribidi +, x11Support ? true, libX11, libXext, libGLU, libGL +, xineramaSupport ? true, libXinerama +, xvSupport ? true, libXv +, alsaSupport ? stdenv.isLinux, alsa-lib +, screenSaverSupport ? true, libXScrnSaver +, vdpauSupport ? false, libvdpau +, cddaSupport ? !stdenv.isDarwin, cdparanoia +, dvdnavSupport ? !stdenv.isDarwin, libdvdnav +, dvdreadSupport ? true, libdvdread +, bluraySupport ? true, libbluray +, amrSupport ? false, amrnb, amrwb +, cacaSupport ? true, libcaca +, lameSupport ? true, lame +, speexSupport ? true, speex +, theoraSupport ? true, libtheora +, x264Support ? false, x264 +, jackaudioSupport ? false, libjack2 +, pulseSupport ? config.pulseaudio or false, libpulseaudio +, bs2bSupport ? false, libbs2b +, v4lSupport ? false, libv4l # For screenshots -, libpngSupport ? true, libpng ? null -, libjpegSupport ? true, libjpeg ? null +, libpngSupport ? true, libpng +, libjpegSupport ? true, libjpeg , useUnfreeCodecs ? false -, darwin ? null +, darwin , buildPackages }: -assert fontconfigSupport -> (fontconfig != null); -assert (!fontconfigSupport) -> (freefont_ttf != null); -assert fribidiSupport -> (fribidi != null); -assert x11Support -> (libX11 != null && libXext != null && libGLU != null && libGL != null); -assert xineramaSupport -> (libXinerama != null && x11Support); -assert xvSupport -> (libXv != null && x11Support); -assert alsaSupport -> alsa-lib != null; -assert screenSaverSupport -> libXScrnSaver != null; -assert vdpauSupport -> libvdpau != null; -assert cddaSupport -> cdparanoia != null; -assert dvdnavSupport -> libdvdnav != null; -assert dvdreadSupport -> libdvdread != null; -assert bluraySupport -> libbluray != null; -assert amrSupport -> (amrnb != null && amrwb != null); -assert cacaSupport -> libcaca != null; -assert lameSupport -> lame != null; -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert x264Support -> x264 != null; -assert jackaudioSupport -> libjack2 != null; -assert pulseSupport -> libpulseaudio != null; -assert bs2bSupport -> libbs2b != null; -assert libpngSupport -> libpng != null; -assert libjpegSupport -> libjpeg != null; -assert v4lSupport -> libv4l != null; +assert xineramaSupport -> x11Support; +assert xvSupport -> x11Support; let diff --git a/pkgs/applications/video/mpv/scripts/autocrop.nix b/pkgs/applications/video/mpv/scripts/autocrop.nix new file mode 100644 index 0000000000000..645a4dd16899f --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/autocrop.nix @@ -0,0 +1,19 @@ +{ stdenvNoCC, mpv-unwrapped, lib }: + +stdenvNoCC.mkDerivation rec { + pname = "mpv-autocrop"; + version = mpv-unwrapped.version; + src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autocrop.lua"; + dontBuild = true; + dontUnpack = true; + installPhase = '' + install -Dm644 ${src} $out/share/mpv/scripts/autocrop.lua + ''; + passthru.scriptName = "autocrop.lua"; + + meta = { + description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video."; + homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autocrop.lua"; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/autodeint.nix b/pkgs/applications/video/mpv/scripts/autodeint.nix new file mode 100644 index 0000000000000..b5369b748faf6 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/autodeint.nix @@ -0,0 +1,19 @@ +{ stdenvNoCC, mpv-unwrapped, lib }: + +stdenvNoCC.mkDerivation rec { + pname = "mpv-autodeint"; + version = mpv-unwrapped.version; + src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autodeint.lua"; + dontBuild = true; + dontUnpack = true; + installPhase = '' + install -Dm644 ${src} $out/share/mpv/scripts/autodeint.lua + ''; + passthru.scriptName = "autodeint.lua"; + + meta = { + description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video."; + homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autodeint.lua"; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 472a56855182c..83514923331ab 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -46,13 +46,13 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "27.2.2"; + version = "27.2.4"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "sha256-iZekhsqvtlMeKX2bQ+w/womkOTDLbbP0MmoTzbvpNtU="; + sha256 = "sha256-OiSejQovSmhItrnrQlcVp9PCDRgAhuxTinSpXbH8bo0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 95b41c1c86f13..844d4a50b8526 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -9,4 +9,5 @@ wlrobs = callPackage ./wlrobs.nix {}; looking-glass-obs = callPackage ./looking-glass-obs.nix {}; obs-nvfbc = callPackage ./obs-nvfbc.nix {}; + obs-vkcapture = callPackage ./obs-vkcapture.nix {}; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index d21d78c42b2a2..20c49692b8d3d 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -10,21 +10,21 @@ stdenv.mkDerivation rec { pname = "obs-gstreamer"; - version = "0.2.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "fzwoch"; repo = "obs-gstreamer"; rev = "v${version}"; - sha256 = "1fdpwr8br8x9cnrhr3j4f0l81df26n3bj2ibi3cg96rl86054nid"; + hash = "sha256-KhSBZcV2yILTf5+aNoYWDfNwPiJoyYPeIOQMDFvOusg="; }; nativeBuildInputs = [ pkg-config meson ninja ]; - buildInputs = [ gst_all_1.gstreamermm obs-studio ]; + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base obs-studio ]; meta = with lib; { description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio"; - homepage = "https://github.com/fswoch/obs-gstreamer"; + homepage = "https://github.com/fzwoch/obs-gstreamer"; maintainers = with maintainers; [ ahuzik ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix new file mode 100644 index 0000000000000..bd74feb3bcc9f --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, wayland +, obs-studio +, libX11 +, vulkan-headers +, vulkan-loader +, libGL +}: + +stdenv.mkDerivation rec { + pname = "obs-vkcapture"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "nowrep"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-iIV9ke2yPEt2Lf4bwiEHFip4tLhMS4raWGyCWpao74w="; + }; + + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ libGL libX11 obs-studio vulkan-headers vulkan-loader wayland ]; + + meta = with lib; { + description = "OBS Linux Vulkan/OpenGL game capture"; + homepage = "https://github.com/nowrep/obs-vkcapture"; + maintainers = with maintainers; [ atila ]; + license = licenses.gpl2Only; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 9f7e08a9ddf4a..48f1b98f6e537 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ libogg libvorbis libdvdread ]; + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + meta = { description = "Tools for modifying and inspecting OGG media streams"; longDescription = '' diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 27064077a9f83..c39363ee36357 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -10,7 +10,6 @@ , appstream-glib , pkg-config , txt2man -, gzip , vala , wrapGAppsHook , gsettings-desktop-schemas @@ -50,7 +49,6 @@ stdenv.mkDerivation rec { appstream-glib desktop-file-utils gettext - gzip meson ninja libxml2 diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index f7eb5f201e851..e8675263720c1 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -238,94 +238,19 @@ in { }; }; - fritzbox = let - libconvpp = stdenv.mkDerivation { - name = "jowi24-libconv++-20130216"; - propagatedBuildInputs = [ libiconv ]; - CXXFLAGS = "-std=gnu++11 -Os"; - src = fetchFromGitHub { - owner = "jowi24"; - repo = "libconvpp"; - rev = "90769b2216bc66c5ea5e41a929236c20d367c63b"; - sha256 = "0bf0dwxrzd42l84p8nxcsjdk1gvzlhad93nsbn97z6kr61n4cr33"; - }; - installPhase = '' - mkdir -p $out/lib $out/include/libconv++ - cp source.a $out/lib/libconv++.a - cp *.h $out/include/libconv++ - ''; - }; - - liblogpp = stdenv.mkDerivation { - name = "jowi24-liblogpp-20130216"; - CXXFLAGS = "-std=gnu++11 -Os"; - src = fetchFromGitHub { - owner = "jowi24"; - repo = "liblogpp"; - rev = "eee4046d2ae440974bcc8ceec00b069f0a2c62b9"; - sha256 = "01aqvwmwh5kk3mncqpim8llwha9gj5qq0c4cvqfn4h8wqi3d9l3p"; - }; - installPhase = '' - mkdir -p $out/lib $out/include/liblog++ - cp source.a $out/lib/liblog++.a - cp *.h $out/include/liblog++ - ''; - }; - - libnetpp = stdenv.mkDerivation { - name = "jowi24-libnet++-20180628"; - CXXFLAGS = "-std=gnu++11 -Os"; - src = fetchFromGitHub { - owner = "jowi24"; - repo = "libnetpp"; - rev = "212847f0efaeffee8422059b8e202d844174aaf3"; - sha256 = "0vjl6ld6aj25rzxm26yjv3h2gy7gp7qnbinpw6sf1shg2xim9x0b"; - }; - installPhase = '' - mkdir -p $out/lib $out/include/libnet++ - cp source.a $out/lib/libnet++.a - cp *.h $out/include/libnet++ - ''; - buildInputs = [ boost liblogpp libconvpp ]; - }; - - libfritzpp = stdenv.mkDerivation { - name = "jowi24-libfritzpp-20131201"; - CXXFLAGS = "-std=gnu++11 -Os"; - src = fetchFromGitHub { - owner = "jowi24"; - repo = "libfritzpp"; - rev = "ca19013c9451cbac7a90155b486ea9959ced0f67"; - sha256 = "0jk93zm3qzl9z96gfs6xl1c8ip8lckgbzibf7jay7dbgkg9kyjfg"; - }; - installPhase = '' - mkdir -p $out/lib $out/include/libfritz++ - cp source.a $out/lib/libfritz++.a - cp *.h $out/include/libfritz++ - ''; - propagatedBuildInputs = [ libgcrypt ]; - buildInputs = [ boost liblogpp libconvpp libnetpp ]; - }; - - in stdenv.mkDerivation rec { + fritzbox = stdenv.mkDerivation rec { pname = "vdr-fritzbox"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "jowi24"; repo = "vdr-fritz"; rev = version; - sha256 = "0wab1kyma9jzhm6j33cv9hd2a5d1334ghgdi2051nmr1bdcfcsw8"; + sha256 = "sha256-DGD73i+ZHFgtCo+pMj5JaMovvb5vS1x20hmc5t29//o="; + fetchSubmodules = true; }; - postUnpack = '' - cp ${libfritzpp}/lib/* $sourceRoot/libfritz++ - cp ${liblogpp}/lib/* $sourceRoot/liblog++ - cp ${libnetpp}/lib/* $sourceRoot/libnet++ - cp ${libconvpp}/lib/* $sourceRoot/libconv++ - ''; - - buildInputs = [ vdr boost libconvpp libfritzpp libnetpp liblogpp ]; + buildInputs = [ vdr boost libgcrypt ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/video/vdr/wrapper.nix b/pkgs/applications/video/vdr/wrapper.nix index 04984212b249c..431d2dae4f049 100644 --- a/pkgs/applications/video/vdr/wrapper.nix +++ b/pkgs/applications/video/vdr/wrapper.nix @@ -17,7 +17,7 @@ in symlinkJoin { postBuild = '' wrapProgram $out/bin/vdr \ --add-flags "-L $out/lib/vdr --localedir=$out/share/locale" \ - --prefix XINE_PLUGIN_PATH ":" ${makeXinePluginPath requiredXinePlugins} + --prefix XINE_PLUGIN_PATH ":" ${lib.escapeShellArg (makeXinePluginPath requiredXinePlugins)} ''; meta = with vdr.meta; { diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index c19b8fa15cd16..700730a57fc97 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -82,11 +82,11 @@ let in stdenv.mkDerivation rec { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.17"; + version = "3.0.17.3"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; - sha256 = "sha256-SL2b8zeqEHoVJOulfFLcSpHin1qX+97pL2pNupA4PNA="; + sha256 = "sha256-b36Q74lz0x2W3mTbgXFz40UVCClxepQISxu4MhzeIBQ="; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of diff --git a/pkgs/applications/video/vvave/default.nix b/pkgs/applications/video/vvave/default.nix new file mode 100644 index 0000000000000..1612ce4200121 --- /dev/null +++ b/pkgs/applications/video/vvave/default.nix @@ -0,0 +1,59 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, applet-window-buttons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, mauikit-accounts +, mauikit-filebrowsing +, qtmultimedia +, qtquickcontrols2 +, taglib +}: + +mkDerivation rec { + pname = "vvave"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "vvave"; + rev = "v${version}"; + sha256 = "sha256-ykX1kd3106KTDTJQIGk6miSgbj+oROiXQl/nkCjTphE="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + applet-window-buttons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + mauikit-accounts + mauikit-filebrowsing + qtmultimedia + qtquickcontrols2 + taglib + ]; + + meta = with lib; { + description = "Multi-platform media player"; + homepage = "https://invent.kde.org/maui/vvave"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} + diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index 63f1e885af309..b9c21b7ad7d17 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,13 +1,13 @@ -{ lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, qmake +{ lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, cmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 , ffmpeg-full, gst_all_1, libpulseaudio, alsa-lib, jack2 , v4l-utils }: mkDerivation rec { pname = "webcamoid"; - version = "8.8.0"; + version = "9.0.0"; src = fetchFromGitHub { - sha256 = "0a8M9GQ6Ea9jBCyfbORVyB6HC/O6jdcIZruQZj9Aai4="; + sha256 = "sha256-NV1BmG+fgy+ZcvHl+05VX5J1BAz8PxKiZ3z9BxjhMU0="; rev = version; repo = "webcamoid"; owner = "webcamoid"; @@ -22,12 +22,7 @@ mkDerivation rec { v4l-utils ]; - nativeBuildInputs = [ pkg-config qmake ]; - - qmakeFlags = [ - "Webcamoid.pro" - "INSTALLQMLDIR=${placeholder "out"}/lib/qt/qml" - ]; + nativeBuildInputs = [ pkg-config cmake ]; meta = with lib; { description = "Webcam Capture Software"; diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index b381d3ccca179..9e6de7890a48d 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "22.1"; + version = "23.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KWCGcGB4HCpV7uSM4otQhSGEzQ+1jQip2fiAysNN54k="; + sha256 = "0gq23zhpl1rw8i3yv0f058lycsr078yfy8vkb5w382pifgrww1zh"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "sha256-R70H1R9jFnQyOLI4UNuRzpOAAnGSBGpiHFKbxP2472o="; + cargoSha256 = "0r3r6r5scbw23ipz24glcyvaxx9sffy8kp27fpqvwdha915c1zkp"; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 367f43deb8093..c1302ac2de492 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.2"; + version = "1.6.4"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-l/9jOvZ4nn/wy+XPRoT1lojfGvPEXhPz2FJjLpZ/EE8="; + sha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/crosvm/Cargo.lock b/pkgs/applications/virtualization/crosvm/Cargo.lock index 3746d87cf0af1..7016457499fcf 100644 --- a/pkgs/applications/virtualization/crosvm/Cargo.lock +++ b/pkgs/applications/virtualization/crosvm/Cargo.lock @@ -106,9 +106,9 @@ checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" [[package]] name = "async-trait" -version = "0.1.52" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ "proc-macro2", "quote", @@ -142,6 +142,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "balloon_control" +version = "0.1.0" +dependencies = [ + "serde", +] + +[[package]] name = "base" version = "0.1.0" dependencies = [ @@ -360,6 +367,7 @@ dependencies = [ "argh", "async-task", "audio_streams", + "balloon_control", "base", "bit_field", "cros_async", @@ -578,9 +586,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if 1.0.0", "libc", @@ -726,9 +734,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.120" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09" +checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" [[package]] name = "libcras" @@ -763,9 +771,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" dependencies = [ "cfg-if 1.0.0", ] @@ -854,9 +862,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "pin-project-lite" @@ -872,9 +880,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "poll_token_derive" @@ -964,9 +972,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" dependencies = [ "proc-macro2", ] @@ -1088,9 +1096,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags", ] @@ -1209,9 +1217,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "smallvec" @@ -1221,9 +1229,9 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "syn" -version = "1.0.88" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd69e719f31e88618baa1eaa6ee2de5c9a1c004f1e9ecdb58e8352a13f20a01" +checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f" dependencies = [ "proc-macro2", "quote", @@ -1376,6 +1384,7 @@ dependencies = [ name = "vm_control" version = "0.1.0" dependencies = [ + "balloon_control", "base", "data_model", "gdbstub_arch", @@ -1426,9 +1435,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "which" -version = "4.2.4" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2" +checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" dependencies = [ "either", "lazy_static", diff --git a/pkgs/applications/virtualization/crosvm/generate-cargo.sh b/pkgs/applications/virtualization/crosvm/generate-cargo.sh new file mode 100644 index 0000000000000..216cafe367ca1 --- /dev/null +++ b/pkgs/applications/virtualization/crosvm/generate-cargo.sh @@ -0,0 +1,7 @@ +dir="$(mktemp -d)" && + cd "$dir" && + unpackPhase && + cd "${sourceRoot:-}" && + cargo generate-lockfile && + mv Cargo.lock "$1" +rm -rf "$dir" diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py index 6e36e524b78d1..f9fc90c6b349b 100755 --- a/pkgs/applications/virtualization/crosvm/update.py +++ b/pkgs/applications/virtualization/crosvm/update.py @@ -5,9 +5,10 @@ import base64 import json import re +import shlex import subprocess from codecs import iterdecode -from os.path import dirname, splitext +from os.path import abspath, dirname, splitext from lxml import etree from lxml.etree import HTMLParser from urllib.request import urlopen @@ -78,7 +79,14 @@ argv = ['nix-instantiate', '--eval', '--json', '-A', 'crosvm.meta.position'] position = json.loads(subprocess.check_output(argv).decode('utf-8')) filename = re.match(r'[^:]*', position)[0] -# Finally, write the output. +# Write the output. with open(dirname(filename) + '/upstream-info.json', 'w') as out: json.dump(data, out, indent=2) out.write('\n') + +# Generate a Cargo.lock +run = ['.', + dirname(abspath(__file__)) + '/generate-cargo.sh', + dirname(filename) + '/Cargo.lock'] +expr = '(import ./. {}).crosvm.overrideAttrs (_: { dontCargoSetupPostUnpack = true; })' +subprocess.run(['nix-shell', '-E', expr, '--run', shlex.join(run)]) diff --git a/pkgs/applications/virtualization/crosvm/upstream-info.json b/pkgs/applications/virtualization/crosvm/upstream-info.json index 437e8f4186994..c994ff1a5fda2 100644 --- a/pkgs/applications/virtualization/crosvm/upstream-info.json +++ b/pkgs/applications/virtualization/crosvm/upstream-info.json @@ -1,11 +1,11 @@ { - "version": "99.14468.0.0-rc1", + "version": "100.14526.0.0-rc1", "src": { "url": "https://chromium.googlesource.com/chromiumos/platform/crosvm", - "rev": "410ea3a1980bfe96968a7dfb7a7d203d43b186b2", - "date": "2022-01-11T00:01:17-08:00", - "path": "/nix/store/y2rpzh1any8c4nwnwkvir7241kbcj8fn-crosvm-410ea3a", - "sha256": "1bgwndh2f60ka1f8c8yqnqqkra510ai9miyfvvm0b3dnsdpy77kd", + "rev": "bdf5e4d4379030cfa2d0510328b8acce73162217", + "date": "2022-02-14T19:13:41+00:00", + "path": "/nix/store/xw31chiwnpzgcp07nf448g2npcwiwkkm-crosvm-bdf5e4d", + "sha256": "0mrnjyyqmz24z1yvdq2mysmhmz0577k8kf9y4v51g7860crqp9ji", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 5855eee63792e..2d35b1c4a039a 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-ITUj905ZSdCH0mcw8tubyVKqI6p/oNcC4OW7/NbkR5o="; + sha256 = "sha256-YXbyGUY/E8odjljDok+yYyU8yZSyUFc22zumrUuuXXQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index e67509c54f85f..e29de7a52fdd2 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.2.14"; + version = "1.2.15"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-gHKyuIL4K/SLBJw8xNuPdNifDcHI91AFTiHaiv38gus="; + sha256 = "sha256-9rivXnHyEE1MoGY+CwUeDStLGPVq+4FvwPjV7Nblk60="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index a7261dac6d1f8..dbf4bb734d84e 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.37.5"; + version = "1.37.6"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "sha256-MBs0ybBXsanNFt6R7+ZYvtCh7iHE3FtWXE9uy9tbrE4="; + sha256 = "sha256-Jzi6JC6DRklZhNqmFx6eHx6qR8/fb/JuSpgwtPThcc4="; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index fc264cdc59083..1b58b4ee9cf6a 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-6yc+7Fc22b8xN8thRrxxpjdEz19aBYCWxgkh/nra784="; + sha256 = "sha256-gb2XFIzYU1dZh8WPheb4073AOLdfT7CbBD89HxobY9Y="; }; - vendorSha256 = "sha256-N+paN3zEXzzUFb2JPVIDZYZ0h0iu7naiw4pSVnGsuKQ="; + vendorSha256 = "sha256-2pWBMXVnmKE4D7JXaKOqtuCz7nsX2a/58lyLp58OTYI="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ef9050f47d969..125061bedaf2c 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -186,7 +186,7 @@ rec { export BUILDTIME="1970-01-01T00:00:00Z" source ./scripts/build/.variables export CGO_ENABLED=1 - go build -tags pkcs11 --ldflags "$LDFLAGS" github.com/docker/cli/cmd/docker + go build -tags pkcs11 --ldflags "$GO_LDFLAGS" github.com/docker/cli/cmd/docker cd - ''; @@ -243,19 +243,19 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.14"; + version = "20.10.15"; rev = "v${version}"; - sha256 = "sha256-eDwgqFx4io++SMOjhxMxVzqzcOgOnv6Xe/qmmPCvZts="; + sha256 = "sha256-uzwnXDomho5/Px4Ou/zP8Vedo2J9hVfcaFzM9vWh2Mo="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "sha256-I5oxpFLH789I2Sb29OXDaM4fCbQT/KvPq0DYcAVp0aI="; + sha256 = "sha256-+Eds5WI+Ujz/VxkWb1ToaGLk7wROTwWwJYpiZRIxAf0"; }; - runcRev = "v1.0.3"; - runcSha256 = "sha256-Tl/JKbIpao+FCjngPzaVkxse50zo3XQ9Mg/AdkblMcI="; - containerdRev = "v1.5.11"; - containerdSha256 = "sha256-YzFtv6DIjImSK0SywxhZrEeEmCnHTceAi3pfwnPubKg="; + runcRev = "v1.1.1"; + runcSha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY="; + containerdRev = "v1.6.4"; + containerdSha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0="; tiniRev = "v0.19.0"; tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 390f3049c0266..1890f29c52a06 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -20,6 +20,7 @@ buildGoPackage rec { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; + mainProgram = "agent"; }; } diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix index ac531b36dd21a..458e2ffc7e5ee 100644 --- a/pkgs/applications/virtualization/firectl/default.nix +++ b/pkgs/applications/virtualization/firectl/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "firectl"; - version = "0.1.0"; - - patches = [ ./gomod.patch ]; + # The latest upstream 0.1.0 is incompatible with firecracker + # v0.1.0. See issue: https://github.com/firecracker-microvm/firectl/issues/82 + version = "unstable-2022-03-01"; src = fetchFromGitHub { owner = "firecracker-microvm"; repo = pname; - rev = "v${version}"; - sha256 = "1ni3yx4rjhrkqk2038c6hkb2jwsdj2llx233wd5wgpvb6c57652p"; + rev = "9f1b639a446e8d75f31787a00b9f273c1e68f12c"; + sha256 = "TjzzHY9VYPpWoPt6nHYUerKX94O03sm524wGM9lGzno="; }; - vendorSha256 = "1xbpck1gvzl75xgrajf5yzl199l4f2f6j3mac5586i7b00b9jxqj"; + vendorSha256 = "3SVEvvGNx6ienyJZg0EOofHNHCPSpJUGXwHxokdRG1c="; doCheck = false; diff --git a/pkgs/applications/virtualization/firectl/gomod.patch b/pkgs/applications/virtualization/firectl/gomod.patch deleted file mode 100644 index 96c65e7282211..0000000000000 --- a/pkgs/applications/virtualization/firectl/gomod.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/go.mod b/go.mod -index 1044001..7bafeda 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,7 +1,10 @@ - module github.com/firecracker-microvm/firectl - -+go 1.14 -+ - require ( - github.com/firecracker-microvm/firecracker-go-sdk v0.15.1 -+ github.com/go-openapi/strfmt v0.17.1 - github.com/jessevdk/go-flags v1.4.0 - github.com/pkg/errors v0.8.0 - github.com/sirupsen/logrus v1.1.1 diff --git a/pkgs/applications/virtualization/imgcrypt/default.nix b/pkgs/applications/virtualization/imgcrypt/default.nix index ce12fb8f387b2..df9e3e73114ab 100644 --- a/pkgs/applications/virtualization/imgcrypt/default.nix +++ b/pkgs/applications/virtualization/imgcrypt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "imgcrypt"; - version = "1.1.1"; + version = "1.1.4"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "177fs3p2xzwjsffcxqqllx6wi6ghfyqbvfgn95v3q7a2993yqk4k"; + sha256 = "sha256-a5IQahhonaXA74gY+zR6BbV9MdyEu70j0E6YlNmN3DA="; }; ldflags = [ diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/applications/virtualization/kvmtool/default.nix new file mode 100644 index 0000000000000..a99a9f64d8616 --- /dev/null +++ b/pkgs/applications/virtualization/kvmtool/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, lib }: + +stdenv.mkDerivation { + pname = "kvmtool"; + version = "unstable-2022-04-04"; + + src = fetchgit { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git"; + rev = "5657dd3e48b41bc6db38fa657994bc0e030fd31f"; + sha256 = "1y1j44lk9957f2dmyrscbxl4zncp4ibvvcdj6bwylb8jsvmd5fs2"; + }; + + enableParallelBuilding = true; + makeFlags = [ "prefix=${placeholder "out"}" ]; + + meta = with lib; { + description = "A lightweight tool for hosting KVM guests"; + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/tree/README"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ astro ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix index c7743bf44fc03..c74416ac33ba7 100644 --- a/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, addOpenGLRunpath , fetchFromGitHub , pkg-config , libelf @@ -8,25 +9,31 @@ , rpcsvc-proto , libtirpc , makeWrapper +, substituteAll +, go }: let - modp-ver = "450.57"; + modprobeVersion = "495.44"; nvidia-modprobe = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-modprobe"; - rev = modp-ver; - sha256 = "0r4f6lpbbqqs9932xd2mr7bxn6a3xdalcwq332fc1amrrkgzfyv7"; + rev = modprobeVersion; + sha256 = "sha256-Y3ZOfge/EcmhqI19yWO7UfPqkvY1CHHvFC5l9vYyGuU="; + }; + modprobePatch = substituteAll { + src = ./modprobe.patch; + inherit modprobeVersion; }; in stdenv.mkDerivation rec { pname = "libnvidia-container"; - version = "1.5.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b9yQ1mEo1EkjXMguV0t98OvFEQO4h76EVu154MsB2II="; + sha256 = "sha256-7OTawWwjeKU8wIa8I/+aSvAJli4kEua94nJSNyCajpE="; }; patches = [ @@ -36,18 +43,8 @@ stdenv.mkDerivation rec { # path. ./libnvc-ldconfig-and-path-fixes.patch - # the libnvidia-container Makefile wants to build and install static - # libtirpc libraries; this patch prevents that from happening - ./avoid-static-libtirpc-build.patch - ]; - - makeFlags = [ - "WITH_LIBELF=yes" - "prefix=$(out)" - # we can't use the WITH_TIRPC=yes flag that exists in the Makefile for the - # same reason we patch out the static library use of libtirpc so we set the - # define in CFLAGS - "CFLAGS=-DWITH_TIRPC" + # fix bogus struct declaration + ./inline-c-struct.patch ]; postPatch = '' @@ -56,27 +53,61 @@ stdenv.mkDerivation rec { -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \ mk/common.mk - mkdir -p deps/src/nvidia-modprobe-${modp-ver} - cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver} + mkdir -p deps/src/nvidia-modprobe-${modprobeVersion} + cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modprobeVersion} chmod -R u+w deps/src pushd deps/src - patch -p0 < ${./modprobe.patch} - touch nvidia-modprobe-${modp-ver}/.download_stamp + + patch -p0 < ${modprobePatch} + touch nvidia-modprobe-${modprobeVersion}/.download_stamp popd + + # 1. replace DESTDIR=$(DEPS_DIR) with empty strings to prevent copying + # things into deps/src/nix/store + # 2. similarly, remove any paths prefixed with DEPS_DIR + # 3. prevent building static libraries because we don't build static + # libtirpc (for now) + # 4. prevent installation of static libraries because of step 3 + # 5. prevent installation of libnvidia-container-go.so twice + sed -i Makefile \ + -e 's#DESTDIR=\$(DEPS_DIR)#DESTDIR=""#g' \ + -e 's#\$(DEPS_DIR)\$#\$#g' \ + -e 's#all: shared static tools#all: shared tools#g' \ + -e '/$(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir)/d' \ + -e '/$(INSTALL) -m 755 $(libdir)\/$(LIBGO_SHARED) $(DESTDIR)$(libdir)/d' ''; - postInstall = '' - wrapProgram $out/bin/nvidia-container-cli \ - --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib + enableParallelBuilding = true; + + preBuild = '' + HOME="$(mktemp -d)" ''; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; - nativeBuildInputs = [ pkg-config rpcsvc-proto makeWrapper ]; + nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper ]; buildInputs = [ libelf libcap libseccomp libtirpc ]; + makeFlags = [ + "WITH_LIBELF=yes" + "prefix=$(out)" + # we can't use the WITH_TIRPC=yes flag that exists in the Makefile for the + # same reason we patch out the static library use of libtirpc so we set the + # define in CFLAGS + "CFLAGS=-DWITH_TIRPC" + ]; + + postInstall = + let + inherit (addOpenGLRunpath) driverLink; + libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ]; + in + '' + wrapProgram $out/bin/nvidia-container-cli --prefix LD_LIBRARY_PATH : ${libraryPath} + ''; + meta = with lib; { homepage = "https://github.com/NVIDIA/libnvidia-container"; description = "NVIDIA container runtime library"; diff --git a/pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch b/pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch new file mode 100644 index 0000000000000..dab574e58398c --- /dev/null +++ b/pkgs/applications/virtualization/libnvidia-container/inline-c-struct.patch @@ -0,0 +1,14 @@ +diff --git a/src/nvcgo.c b/src/nvcgo.c +index 98789a3..47ad02b 100644 +--- a/src/nvcgo.c ++++ b/src/nvcgo.c +@@ -33,7 +33,8 @@ + void nvcgo_program_1(struct svc_req *, register SVCXPRT *); + + static struct nvcgo_ext { +- struct nvcgo; ++ struct rpc rpc; ++ struct libnvcgo api; + bool initialized; + void *dl_handle; + } global_nvcgo_context; diff --git a/pkgs/applications/virtualization/libnvidia-container/modprobe.patch b/pkgs/applications/virtualization/libnvidia-container/modprobe.patch index 8e7b0a723ec0c..c28b6bad291db 100644 --- a/pkgs/applications/virtualization/libnvidia-container/modprobe.patch +++ b/pkgs/applications/virtualization/libnvidia-container/modprobe.patch @@ -1,6 +1,6 @@ -diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c ---- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000 -+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000 +diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c +--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000 ++++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000 @@ -840,10 +840,10 @@ return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH); } @@ -16,9 +16,9 @@ diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-m { char field[32]; FILE *fp; -diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h ---- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000 -+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000 +diff -ruN nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h +--- nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000 ++++ nvidia-modprobe-@modprobeVersion@/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000 @@ -81,6 +81,7 @@ int nvidia_nvswitch_get_file_state(int minor); int nvidia_cap_mknod(const char* cap_file_path, int *minor); diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index db3ed3500e348..c937cce79b148 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,19 +8,24 @@ buildGoModule rec { pname = "lima"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GS/mzBoVL78U7vMxkbnQfb89U640w8YdA8YhPH4Iwrc="; + sha256 = "sha256-xlpNJjSBw1iL8CjbWE6v4u7Vq5PjkGv0tQKU5eRN13w="; }; - vendorSha256 = "sha256-funVyM0RhDzGQPyzsABzXu3ETPYJwRosqkQreGBADZc="; + vendorSha256 = "sha256-uTkCi969RQ4K0ZJ2vOgqv3OJgzVVRX7b2sXNfmR6qoA="; nativeBuildInputs = [ makeWrapper installShellFiles ]; + # clean fails with read only vendor dir + postPatch = '' + substituteInPlace Makefile --replace 'binaries: clean' 'binaries:' + ''; + buildPhase = '' runHook preBuild make "VERSION=v${version}" binaries diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index 17272acd86ebb..bfd6ba4135b34 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -6,18 +6,18 @@ , gpgme , libassuan , lvm2 -, testVersion +, testers , podman-tui }: buildGoModule rec { pname = "podman-tui"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - sha256 = "sha256-1WbDmnKyFosp4Kz9QINr3lOR/wD0UW2QZf7nAAaoClM="; + sha256 = "sha256-Xc6F87evQiv4jRbxxRBzJBeI8653HvlQL+UwcVWY0wk="; }; vendorSha256 = null; @@ -33,7 +33,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - passthru.tests.version = testVersion { + passthru.tests.version = testers.testVersion { package = podman-tui; command = "podman-tui version"; version = "v${version}"; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 1f596c609062c..0c9ecf7e4d8ff 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "4.0.3"; + version = "4.1.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-o/CIs+3LnbaUUpOQI1hijrxH7f1qBnrQw56TJ18jKQw="; + sha256 = "sha256-3MR4ZhkhMLAK3KHu7JEV9z1/wlyCkxfx1i267TGxwt8="; }; vendorSha256 = null; @@ -88,6 +88,7 @@ buildGoModule rec { podman-tls-ghostunnel podman-dnsname ; + oci-containers-podman = nixosTests.oci-containers.podman; }; meta = with lib; { @@ -96,5 +97,8 @@ buildGoModule rec { changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md"; license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; + # requires >= 10.13 SDK https://github.com/NixOS/nixpkgs/issues/101229 + # Undefined symbols for architecture x86_64: "_utimensat" + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index fa3a50bc53575..48a08f5184457 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -76,5 +76,5 @@ in runCommand podman.name { ln -s ${podman-unwrapped}/share $out/share makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \ - --prefix PATH : ${binPath} + --prefix PATH : ${lib.escapeShellArg binPath} '' diff --git a/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch b/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch deleted file mode 100644 index a498d309c233e..0000000000000 --- a/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 4ca09b7cd1d42eb6b1587fed74cd4d684e31bfbe Mon Sep 17 00:00:00 2001 -From: Keno Fischer <keno@juliacomputing.com> -Date: Sun, 27 Feb 2022 17:35:22 -0500 -Subject: [PATCH] 9p: darwin: meson: Allow VirtFS on Darwin - -To allow VirtFS on darwin, we need to check that pthread_fchdir_np is -available, which has only been available since macOS 10.12. - -Additionally, virtfs_proxy_helper is disabled on Darwin. This patch -series does not currently provide an implementation of the proxy-helper, -but this functionality could be implemented later on. - -Signed-off-by: Keno Fischer <keno@juliacomputing.com> -[Michael Roitzsch: - Rebase for NixOS] -Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com> -[Will Cohen: - Rebase to master] -Signed-off-by: Will Cohen <wwcohen@gmail.com> -Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> -[Will Cohen: - Add check for pthread_fchdir_np to virtfs - - Add comments to patch commit - - Note that virtfs_proxy_helper does not work - on macOS - - Fully adjust meson virtfs error note to specify - macOS - - Rebase to master] -Signed-off-by: Will Cohen <wwcohen@gmail.com> -Message-Id: <20220227223522.91937-12-wwcohen@gmail.com> -Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> -Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com> ---- - fsdev/meson.build | 1 + - meson.build | 17 +++++++++++------ - 2 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/fsdev/meson.build b/fsdev/meson.build -index adf57cc43e..b632b66348 100644 ---- a/fsdev/meson.build -+++ b/fsdev/meson.build -@@ -7,6 +7,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files( - 'qemu-fsdev.c', - ), if_false: files('qemu-fsdev-dummy.c')) - softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss) -+softmmu_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss) - - if have_virtfs_proxy_helper - executable('virtfs-proxy-helper', -diff --git a/meson.build b/meson.build -index 2265fa409a..6d73c02903 100644 ---- a/meson.build -+++ b/meson.build -@@ -1383,12 +1383,17 @@ endif - have_host_block_device = (targetos != 'darwin' or - cc.has_header('IOKit/storage/IOMedia.h')) - --have_virtfs = (targetos == 'linux' and -- have_system and -- libattr.found() and -- libcap_ng.found()) -- --have_virtfs_proxy_helper = have_virtfs and have_tools -+have_virtfs = get_option('virtfs') \ -+ .require(targetos == 'linux' or targetos == 'darwin', -+ error_message: 'virtio-9p (virtfs) requires Linux or macOS') \ -+ .require(targetos == 'linux' or cc.has_function('pthread_fchdir_np'), -+ error_message: 'virtio-9p (virtfs) on macOS requires the presence of pthread_fchdir_np') \ -+ .require(targetos == 'darwin' or (libattr.found() and libcap_ng.found()), -+ error_message: 'virtio-9p (virtfs) on Linux requires libcap-ng-devel and libattr-devel') \ -+ .disable_auto_if(not have_tools and not have_system) \ -+ .allowed() -+ -+have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools - - if get_option('virtfs').enabled() - if not have_virtfs --- -2.35.1 - diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 68082f5de41b4..9f9b0389cedf0 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -4,6 +4,7 @@ , makeWrapper, runtimeShell, removeReferencesTo , attr, libcap, libcap_ng, socat , CoreServices, Cocoa, Hypervisor, rez, setfile +, guestAgentSupport ? with stdenv.hostPlatform; isLinux || isSunOS || isWindows , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp , alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner @@ -40,11 +41,11 @@ stdenv.mkDerivation rec { + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests"; - version = "6.2.0"; + version = "7.0.0"; src = fetchurl { url= "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "0iavlsy9hin8k38230j8lfmyipx3965zljls1dp34mmc8n75vqb8"; + sha256 = "sha256-9rN1x5UfcoQCeYsLqrsthkeMpT1Eztvvq74cRr9G+Dk="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -82,80 +83,32 @@ stdenv.mkDerivation rec { dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build - outputs = [ "out" "ga" ]; + outputs = [ "out" ] ++ lib.optional guestAgentSupport "ga"; # On aarch64-linux we would shoot over the Hydra's 2G output limit. separateDebugInfo = !(stdenv.isAarch64 && stdenv.isLinux); patches = [ ./fix-qemu-ga.patch - # MTP Devices were broken in QEMU 6.1.0, this patch fixes that. - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/9d30c78c7d3b994825cbe63fa277279ae3ef4248.patch"; - sha256 = "sha256-AChB9HMEShrM+2UW2aOT9+MqlAm568sG3HxHK3nDC/M="; - }) + + # QEMU upstream does not demand compatibility to pre-10.13, so 9p-darwin + # support on nix requires utimensat fallback. The patch adding this fallback + # set was removed during the process of upstreaming this functionality, and + # will still be needed in nix until the macOS SDK reaches 10.13+. + ./provide-fallback-for-utimensat.patch # Cocoa clipboard support only works on macOS 10.14+ + ./revert-ui-cocoa-add-clipboard-support.patch + # Standard about panel requires AppKit and macOS 10.13+ (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/7e3e20d89129614f4a7b2451fe321cc6ccca3b76.diff"; - sha256 = "09xz06g57wxbacic617pq9c0qb7nly42gif0raplldn5lw964xl2"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/99eb313ddbbcf73c1adcdadceba1423b691c6d05.diff"; + sha256 = "sha256-gTRf9XENAfbFB3asYCXnw4OV4Af6VE1W56K2xpYDhgM="; revert = true; }) - # 9p-darwin for 7.0 backported to 6.2.0 - # - # Can generally be removed when updating derivation to 7.0. Nine of the - # patches can be drawn directly from QEMU upstream, but the second commit - # and the eleventh commit had to be modified when rebasing back to 6.2.0. - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/e0bd743bb2dd4985791d4de880446bdbb4e04fed.patch"; - sha256 = "sha256-c6QYL3zig47fJwm6rqkqGp3E1PakVTaihvXDRebbBlQ="; - }) - ./rename-9p-util.patch - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/f41db099c71151291c269bf48ad006de9cbd9ca6.patch"; - sha256 = "sha256-70/rrhZw+02JJbJ3CoW8B1GbdM4Lwb2WkUdwstYAoIQ="; - }) - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/6b3b279bd670c6a2fa23c9049820c814f0e2c846.patch"; - sha256 = "sha256-7WqklSvLirEuxTXTIMQDQhWpXnwMseJ1RumT+faq/Y8="; - }) - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/67a71e3b71a2834d028031a92e76eb9444e423c6.patch"; - sha256 = "sha256-COFm/SwfJSoSl9YDpL6ceAE8CcE4mGhsGxw1HMuL++o="; - }) - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/38d7fd68b0c8775b5253ab84367419621aa032e6.patch"; - sha256 = "sha256-iwGIzq9FWW6zpbDg/IKrp5OZpK9cgQqTRWWq8WBIHRQ="; - }) + # make nixos tests that boot from USB more stable + # https://lists.nongnu.org/archive/html/qemu-devel/2022-05/msg01484.html (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/57b3910bc3513ab515296692daafd1c546f3c115.patch"; - sha256 = "sha256-ybl9+umZAcQKHYL7NkGJQC0W7bccTagA9KQiFaR2LYA="; + url = "https://gitlab.com/raboof/qemu/-/commit/3fb5e8fe4434130b1167a995b2a01c077cca2cd5.patch"; + sha256 = "sha256-evzrN3i4ntc/AFG0C0rezQpQbWcnx74nXO+5DLErX8o="; }) - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/b5989326f558faedd2511f29459112cced2ca8f5.patch"; - sha256 = "sha256-s+O9eCgj2Ev+INjL9LY9MJBdISIdZLslI3lue2DICGM="; - }) - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/029ed1bd9defa33a80bb40cdcd003699299af8db.patch"; - sha256 = "sha256-mGqcRWcEibDJdhTRrN7ZWrMuCfUWW8vWiFj7sb2/RYo="; - }) - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/d3671fd972cd185a6923433aa4802f54d8b62112.patch"; - sha256 = "sha256-GUh5o7mbFTm/dm6CqcGdoMlC+YrV8RlcEwu/mxrfTzo="; - }) - # The next two commits are to make Linux v5.17 work on aarch64-darwin. These are included in QEMU v7. - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/ad99f64f1cfff7c5e7af0e697523d9b7e45423b6.patch"; - sha256 = "sha256-e6WtfQIPEiXhWucd5ab7UIoccbWEAv3bwksn4hR85CY="; - }) - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/7f6c295cdfeaa229c360cac9a36e4e595aa902ae.patch"; - sha256 = "sha256-mORtgfU1CYQFKO5UrXgM9cJyZxeF2bz8iAoq0UlFQeY="; - }) - ./allow-virtfs-on-darwin.patch - # QEMU upstream does not demand compatibility to pre-10.13, so 9p-darwin - # support on nix requires utimensat fallback. The patch adding this fallback - # set was removed during the process of upstreaming this functionality, and - # will still be needed in nix until the macOS SDK reaches 10.13+. - ./provide-fallback-for-utimensat.patch ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; @@ -194,7 +147,6 @@ stdenv.mkDerivation rec { "--disable-strip" # We'll strip ourselves after separating debug info. "--enable-docs" "--enable-tools" - "--enable-guest-agent" "--localstatedir=/var" "--sysconfdir=/etc" # Always use our Meson, not the bundled version, which doesn't @@ -202,6 +154,7 @@ stdenv.mkDerivation rec { "--meson=meson" "--cross-prefix=${stdenv.cc.targetPrefix}" "--cpu=${stdenv.hostPlatform.uname.processor}" + (lib.enableFeature guestAgentSupport "guest-agent") ] ++ lib.optional numaSupport "--enable-numa" ++ lib.optional seccompSupport "--enable-seccomp" ++ lib.optional smartcardSupport "--enable-smartcard" @@ -233,7 +186,7 @@ stdenv.mkDerivation rec { postFixup = '' # the .desktop is both invalid and pointless rm -f $out/share/applications/qemu.desktop - + '' + lib.optionalString guestAgentSupport '' # move qemu-ga (guest agent) to separate output mkdir -p $ga/bin mv $out/bin/qemu-ga $ga/bin/ diff --git a/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch b/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch index dbc4e2b9af512..98cc09d720032 100644 --- a/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch +++ b/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch @@ -1,4 +1,4 @@ -From 70328c307001f4bb75d30d93c5bba3c3cd790c88 Mon Sep 17 00:00:00 2001 +From 747a741772cde6bb340eb8bdb493390280de8d16 Mon Sep 17 00:00:00 2001 From: Keno Fischer <keno@juliacomputing.com> Date: Sat, 16 Jun 2018 20:56:54 -0400 Subject: [PATCH] 9p: darwin: Provide fallback impl for utimensat @@ -160,7 +160,7 @@ index db451b0784..320697f347 100644 + return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); +} diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h -index 1f74d37558..a4b002d1b5 100644 +index 97e681e167..fd50d6243a 100644 --- a/hw/9pfs/9p-util.h +++ b/hw/9pfs/9p-util.h @@ -36,6 +36,12 @@ static inline int qemu_lsetxattr(const char *path, const char *name, @@ -176,14 +176,14 @@ index 1f74d37558..a4b002d1b5 100644 static inline void close_preserve_errno(int fd) { int serrno = errno; -@@ -96,6 +102,8 @@ ssize_t flistxattrat_nofollow(int dirfd, const char *filename, +@@ -98,6 +104,8 @@ ssize_t flistxattrat_nofollow(int dirfd, const char *filename, char *list, size_t size); ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, const char *name); +int utimensat_nofollow(int dirfd, const char *filename, + const struct timespec times[2]); - /** + /* * Darwin has d_seekoff, which appears to function similarly to d_off. -- 2.35.1 diff --git a/pkgs/applications/virtualization/qemu/rename-9p-util.patch b/pkgs/applications/virtualization/qemu/rename-9p-util.patch deleted file mode 100644 index fe3e2d7b4b8f1..0000000000000 --- a/pkgs/applications/virtualization/qemu/rename-9p-util.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 011b121d7f84c8974f03a81582cf1107249245bb Mon Sep 17 00:00:00 2001 -From: Keno Fischer <keno@juliacomputing.com> -Date: Sun, 27 Feb 2022 17:35:13 -0500 -Subject: [PATCH] 9p: Rename 9p-util -> 9p-util-linux -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The current file only has the Linux versions of these functions. -Rename the file accordingly and update the Makefile to only build -it on Linux. A Darwin version of these will follow later in the -series. - -Signed-off-by: Keno Fischer <keno@juliacomputing.com> -[Michael Roitzsch: - Rebase for NixOS] -Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com> -Signed-off-by: Will Cohen <wwcohen@gmail.com> -Reviewed-by: Greg Kurz <groug@kaod.org> -Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> -Message-Id: <20220227223522.91937-3-wwcohen@gmail.com> -Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> ---- - hw/9pfs/{9p-util.c => 9p-util-linux.c} | 0 - hw/9pfs/meson.build | 2 +- - 2 files changed, 1 insertion(+), 1 deletion(-) - rename hw/9pfs/{9p-util.c => 9p-util-linux.c} (100%) - -diff --git a/hw/9pfs/9p-util.c b/hw/9pfs/9p-util-linux.c -similarity index 100% -rename from hw/9pfs/9p-util.c -rename to hw/9pfs/9p-util-linux.c -diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build -index 99be5d9119..1b28e70040 100644 ---- a/hw/9pfs/meson.build -+++ b/hw/9pfs/meson.build -@@ -4,7 +4,6 @@ fs_ss.add(files( - '9p-posix-acl.c', - '9p-proxy.c', - '9p-synth.c', -- '9p-util.c', - '9p-xattr-user.c', - '9p-xattr.c', - '9p.c', -@@ -14,6 +13,7 @@ fs_ss.add(files( - 'coth.c', - 'coxattr.c', - )) -+fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c')) - fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c')) - softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss) - --- -2.35.1 - diff --git a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch new file mode 100644 index 0000000000000..775066f6fdded --- /dev/null +++ b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch @@ -0,0 +1,208 @@ +From 19b0952b36b6b5c4bd2665cc0bd4e55a85f81b55 Mon Sep 17 00:00:00 2001 +From: Will Cohen <willcohen@users.noreply.github.com> +Date: Tue, 29 Mar 2022 14:00:56 -0400 +Subject: [PATCH] Revert "ui/cocoa: Add clipboard support" + +This reverts commit 7e3e20d89129614f4a7b2451fe321cc6ccca3b76. +--- + include/ui/clipboard.h | 2 +- + ui/clipboard.c | 2 +- + ui/cocoa.m | 121 ----------------------------------------- + 3 files changed, 2 insertions(+), 123 deletions(-) + +diff --git a/include/ui/clipboard.h b/include/ui/clipboard.h +index ce76aa451f..c4e1dc4ff4 100644 +--- a/include/ui/clipboard.h ++++ b/include/ui/clipboard.h +@@ -269,7 +269,7 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer, + QemuClipboardInfo *info, + QemuClipboardType type, + uint32_t size, +- const void *data, ++ void *data, + bool update); + + G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuClipboardInfo, qemu_clipboard_info_unref) +diff --git a/ui/clipboard.c b/ui/clipboard.c +index 9079ef829b..6b9ed59e1b 100644 +--- a/ui/clipboard.c ++++ b/ui/clipboard.c +@@ -140,7 +140,7 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer, + QemuClipboardInfo *info, + QemuClipboardType type, + uint32_t size, +- const void *data, ++ void *data, + bool update) + { + if (!info || +diff --git a/ui/cocoa.m b/ui/cocoa.m +index c4e5468f9e..cd3bdf0cec 100644 +--- a/ui/cocoa.m ++++ b/ui/cocoa.m +@@ -28,7 +28,6 @@ + #include <crt_externs.h> + + #include "qemu-common.h" +-#include "ui/clipboard.h" + #include "ui/console.h" + #include "ui/input.h" + #include "ui/kbd-state.h" +@@ -107,10 +106,6 @@ static void cocoa_switch(DisplayChangeListener *dcl, + static QemuSemaphore app_started_sem; + static bool allow_events; + +-static NSInteger cbchangecount = -1; +-static QemuClipboardInfo *cbinfo; +-static QemuEvent cbevent; +- + // Utility functions to run specified code block with iothread lock held + typedef void (^CodeBlock)(void); + typedef bool (^BoolCodeBlock)(void); +@@ -1805,105 +1800,6 @@ static void addRemovableDevicesMenuItems(void) + qapi_free_BlockInfoList(pointerToFree); + } + +-@interface QemuCocoaPasteboardTypeOwner : NSObject<NSPasteboardTypeOwner> +-@end +- +-@implementation QemuCocoaPasteboardTypeOwner +- +-- (void)pasteboard:(NSPasteboard *)sender provideDataForType:(NSPasteboardType)type +-{ +- if (type != NSPasteboardTypeString) { +- return; +- } +- +- with_iothread_lock(^{ +- QemuClipboardInfo *info = qemu_clipboard_info_ref(cbinfo); +- qemu_event_reset(&cbevent); +- qemu_clipboard_request(info, QEMU_CLIPBOARD_TYPE_TEXT); +- +- while (info == cbinfo && +- info->types[QEMU_CLIPBOARD_TYPE_TEXT].available && +- info->types[QEMU_CLIPBOARD_TYPE_TEXT].data == NULL) { +- qemu_mutex_unlock_iothread(); +- qemu_event_wait(&cbevent); +- qemu_mutex_lock_iothread(); +- } +- +- if (info == cbinfo) { +- NSData *data = [[NSData alloc] initWithBytes:info->types[QEMU_CLIPBOARD_TYPE_TEXT].data +- length:info->types[QEMU_CLIPBOARD_TYPE_TEXT].size]; +- [sender setData:data forType:NSPasteboardTypeString]; +- [data release]; +- } +- +- qemu_clipboard_info_unref(info); +- }); +-} +- +-@end +- +-static QemuCocoaPasteboardTypeOwner *cbowner; +- +-static void cocoa_clipboard_notify(Notifier *notifier, void *data); +-static void cocoa_clipboard_request(QemuClipboardInfo *info, +- QemuClipboardType type); +- +-static QemuClipboardPeer cbpeer = { +- .name = "cocoa", +- .notifier = { .notify = cocoa_clipboard_notify }, +- .request = cocoa_clipboard_request +-}; +- +-static void cocoa_clipboard_update_info(QemuClipboardInfo *info) +-{ +- if (info->owner == &cbpeer || info->selection != QEMU_CLIPBOARD_SELECTION_CLIPBOARD) { +- return; +- } +- +- if (info != cbinfo) { +- NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; +- qemu_clipboard_info_unref(cbinfo); +- cbinfo = qemu_clipboard_info_ref(info); +- cbchangecount = [[NSPasteboard generalPasteboard] declareTypes:@[NSPasteboardTypeString] owner:cbowner]; +- [pool release]; +- } +- +- qemu_event_set(&cbevent); +-} +- +-static void cocoa_clipboard_notify(Notifier *notifier, void *data) +-{ +- QemuClipboardNotify *notify = data; +- +- switch (notify->type) { +- case QEMU_CLIPBOARD_UPDATE_INFO: +- cocoa_clipboard_update_info(notify->info); +- return; +- case QEMU_CLIPBOARD_RESET_SERIAL: +- /* ignore */ +- return; +- } +-} +- +-static void cocoa_clipboard_request(QemuClipboardInfo *info, +- QemuClipboardType type) +-{ +- NSData *text; +- +- switch (type) { +- case QEMU_CLIPBOARD_TYPE_TEXT: +- text = [[NSPasteboard generalPasteboard] dataForType:NSPasteboardTypeString]; +- if (text) { +- qemu_clipboard_set_data(&cbpeer, info, type, +- [text length], [text bytes], true); +- [text release]; +- } +- break; +- default: +- break; +- } +-} +- + /* + * The startup process for the OSX/Cocoa UI is complicated, because + * OSX insists that the UI runs on the initial main thread, and so we +@@ -1938,7 +1834,6 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info, + COCOA_DEBUG("Second thread: calling qemu_main()\n"); + status = qemu_main(gArgc, gArgv, *_NSGetEnviron()); + COCOA_DEBUG("Second thread: qemu_main() returned, exiting\n"); +- [cbowner release]; + exit(status); + } + +@@ -2054,18 +1949,6 @@ static void cocoa_refresh(DisplayChangeListener *dcl) + [cocoaView setAbsoluteEnabled:YES]; + }); + } +- +- if (cbchangecount != [[NSPasteboard generalPasteboard] changeCount]) { +- qemu_clipboard_info_unref(cbinfo); +- cbinfo = qemu_clipboard_info_new(&cbpeer, QEMU_CLIPBOARD_SELECTION_CLIPBOARD); +- if ([[NSPasteboard generalPasteboard] availableTypeFromArray:@[NSPasteboardTypeString]]) { +- cbinfo->types[QEMU_CLIPBOARD_TYPE_TEXT].available = true; +- } +- qemu_clipboard_update(cbinfo); +- cbchangecount = [[NSPasteboard generalPasteboard] changeCount]; +- qemu_event_set(&cbevent); +- } +- + [pool release]; + } + +@@ -2105,10 +1988,6 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) + + // register vga output callbacks + register_displaychangelistener(&dcl); +- +- qemu_event_init(&cbevent, false); +- cbowner = [[QemuCocoaPasteboardTypeOwner alloc] init]; +- qemu_clipboard_peer_register(&cbpeer); + } + + static QemuDisplay qemu_display_cocoa = { +-- +2.35.1 + diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index e295a51637a7e..dbe434578963b 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY="; + sha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index aa225c1d17308..99299ce31f9f5 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook, gtk-vnc , vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, libosinfo, gnome, gtksourceview4, docutils, cpio -, e2fsprogs, findutils, gzip, cdrtools, xorriso +, e2fsprogs, findutils, gzip, cdrtools, xorriso, fetchpatch , spiceSupport ? true, spice-gtk ? null }: @@ -35,11 +35,21 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ipaddress libvirt libxml2 requests cdrtools ]; - patchPhase = '' + prePatch = '' sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py sed -i "/'install_egg_info'/d" setup.py ''; + patches = [ + # due to a recent change in setuptools-61, "packages=[]" needs to be included + # this patch can hopefully be removed, once virt-manager has an upstream version bump + (fetchpatch { + name = "fix-for-setuptools-61.patch"; + url = "https://github.com/virt-manager/virt-manager/commit/46dc0616308a73d1ce3ccc6d716cf8bbcaac6474.patch"; + sha256 = "sha256-/RZG+7Pmd7rmxMZf8Fvg09dUggs2MqXZahfRQ5cLcuM="; + }) + ]; + postConfigure = '' ${python3.interpreter} setup.py configure --prefix=$out ''; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 865dcad157bd9..fc37456919d08 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -5,13 +5,9 @@ let version = virtualbox.version; xserverVListFunc = builtins.elemAt (lib.splitVersion xorg.xorgserver.version); - # Forced to 1.18 in <nixpkgs/nixos/modules/services/x11/xserver.nix> - # as it even fails to build otherwise. Still, override this even here, - # in case someone does just a standalone build - # (not via videoDrivers = ["vboxvideo"]). - # It's likely to work again in some future update. - xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1; - in if abi == "119" || abi == "120" then "118" else abi; + # Forced to 1.18; vboxvideo doesn't seem to provide any newer ABI, + # and nixpkgs doesn't support older ABIs anymore. + xserverABI = "118"; # Specifies how to patch binaries to make sure that libraries loaded using # dlopen are found. We grep binaries for specific library names and patch diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix new file mode 100755 index 0000000000000..58cd4092a95d5 --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -0,0 +1,341 @@ +{ stdenv +, buildFHSUserEnv +, fetchurl +, lib +, zlib +, gdbm +, bzip2 +, libxslt +, libxml2 +, libuuid +, readline +, xz +, cups +, glibc +, libaio +, vulkan-loader +, alsa-lib +, libpulseaudio +, libGL +, numactl +, libX11 +, libXi +, kmod +, python3 +, autoPatchelfHook +, makeWrapper +, sqlite +, enableInstaller ? false +}: + +let + vmware-unpack-env = buildFHSUserEnv rec { + name = "vmware-unpack-env"; + targetPkgs = pkgs: [ zlib ]; + }; + gdbm3 = gdbm.overrideAttrs (old: rec { + version = "1.8.3"; + + src = fetchurl { + url = "mirror://gnu/gdbm/gdbm-${version}.tar.gz"; + sha256 = "sha256-zDQDOKLii0AFirnrU1SiHVP4ihWC6iG6C7GFw3ooHck="; + }; + + installPhase = '' + mkdir -p $out/lib + cp .libs/libgdbm*.so* $out/lib/ + ''; + }); +in +stdenv.mkDerivation rec { + pname = "vmware-workstation"; + version = "16.2.3"; + build = "19376536"; + + buildInputs = [ + libxslt + libxml2 + libuuid + gdbm3 + readline + xz + cups + glibc + libaio + vulkan-loader + alsa-lib + libpulseaudio + libGL + numactl + libX11 + libXi + kmod + ]; + + nativeBuildInputs = [ python3 vmware-unpack-env autoPatchelfHook makeWrapper ] + ++ lib.optionals enableInstaller [ sqlite bzip2 ]; + + src = fetchurl { + url = "https://download3.vmware.com/software/WKST-1623-LX-New/VMware-Workstation-Full-${version}-${build}.x86_64.bundle"; + sha256 = "sha256-+JE1KnRfawcaBannIyEr1TNZTF7YXRYYaFMVq0/erbM="; + }; + + unpackPhase = '' + ${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} --extract unpacked" + ''; + + installPhase = '' + mkdir -p \ + $out/bin \ + $out/etc/vmware \ + $out/etc/init.d \ + $out/lib/vmware \ + $out/share/doc + + #### Replicate vmware-installer's order but VMX first because of appLoader + ${lib.optionalString enableInstaller '' + ## VMware installer + echo "Installing VMware Installer" + unpacked="unpacked/vmware-installer" + vmware_installer_version=$(cat "unpacked/vmware-installer/manifest.xml" | grep -oPm1 "(?<=<version>)[^<]+") + dest="$out/lib/vmware-installer/$vmware_installer_version" + + mkdir -p $dest + cp -r $unpacked/vmis* $dest/ + cp -r $unpacked/sopython $dest/ + cp -r $unpacked/python $dest/ + cp -r $unpacked/cdsHelper $dest/ + cp -r $unpacked/vmware* $dest/ + cp -r $unpacked/bin $dest/ + cp -r $unpacked/lib $dest/ + + chmod +x $dest/vmis-launcher $dest/sopython/* $dest/python/init.sh $dest/vmware-* + ln -s $dest/vmware-installer $out/bin/vmware-installer + + mkdir -p $out/etc/vmware-installer + cp ${./vmware-installer-bootstrap} $out/etc/vmware-installer/bootstrap + sed -i -e "s,@@INSTALLERDIR@@,$dest," $out/etc/vmware-installer/bootstrap + sed -i -e "s,@@IVERSION@@,$vmware_installer_version," $out/etc/vmware-installer/bootstrap + sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware-installer/bootstrap + + # create database of vmware guest tools (avoids vmware fetching them later) + mkdir -p $out/etc/vmware-installer/components + database_filename=$out/etc/vmware-installer/database + touch $database_filename + sqlite3 "$database_filename" "CREATE TABLE settings(key VARCHAR PRIMARY KEY, value VARCHAR NOT NULL, component_name VARCHAR NOT NULL);" + sqlite3 "$database_filename" "INSERT INTO settings(key,value,component_name) VALUES('db.schemaVersion','2','vmware-installer');" + sqlite3 "$database_filename" "CREATE TABLE components(id INTEGER PRIMARY KEY, name VARCHAR NOT NULL, version VARCHAR NOT NULL, buildNumber INTEGER NOT NULL, component_core_id INTEGER NOT NULL, longName VARCHAR NOT NULL, description VARCHAR, type INTEGER NOT NULL);" + for folder in unpacked/**/.installer ; do + component="$(basename $(dirname $folder))" + component_version=$(cat unpacked/$component/manifest.xml | grep -oPm1 "(?<=<version>)[^<]+") + component_core_id=$([ "$component" == "vmware-installer" ] && echo "-1" || echo "1") + type=$([ "$component" == "vmware-workstation" ] && echo "0" || echo "1") + sqlite3 "$database_filename" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES(\"$component\",\"$component_version\",\"${build}\",$component_core_id,\"$component\",\"$component\",$type);" + mkdir -p $out/etc/vmware-installer/components/$component + cp -r $folder/* $out/etc/vmware-installer/components/$component + done + ''} + + ## VMware Bootstrap + echo "Installing VMware Bootstrap" + cp ${./vmware-bootstrap} $out/etc/vmware/bootstrap + sed -i -e "s,@@PREFIXDIR@@,$out," $out/etc/vmware/bootstrap + + ## VMware Config + echo "Installing VMware Config" + cp ${./vmware-config} $out/etc/vmware/config + sed -i -e "s,@@VERSION@@,${version}," $out/etc/vmware/config + sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware/config + sed -i -e "s,@@PREFIXDIR@@,$out," $out/etc/vmware/config + + ## VMware VMX + echo "Installing VMware VMX" + unpacked="unpacked/vmware-vmx" + cp -r $unpacked/bin/* $out/bin/ + cp -r $unpacked/etc/modprobe.d $out/etc/ + cp -r $unpacked/etc/init.d/* $out/etc/init.d/ + cp -r $unpacked/roms $out/lib/vmware/ + cp -r $unpacked/sbin/* $out/bin/ + + cp -r $unpacked/lib/libconf $out/lib/vmware/ + cp -r $unpacked/lib/bin $out/lib/vmware/ + cp -r $unpacked/lib/lib $out/lib/vmware/ + cp -r $unpacked/lib/scripts $out/lib/vmware/ + cp -r $unpacked/lib/icu $out/lib/vmware/ + cp -r $unpacked/lib/share $out/lib/vmware/ + cp -r $unpacked/lib/modules $out/lib/vmware/ + cp -r $unpacked/lib/include $out/lib/vmware/ + + cp -r $unpacked/extra/checkvm $out/bin/ + cp -r $unpacked/extra/modules.xml $out/lib/vmware/modules/ + + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-vmblock-fuse + ln -s $out/lib/vmware/icu $out/etc/vmware/icu + + # Replace vmware-modconfig with simple error dialog + cp ${./vmware-modconfig} $out/bin/vmware-modconfig + sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware," $out/bin/vmware-modconfig + + # Patch dynamic libs in + for binary in "mksSandbox" "mksSandbox-debug" "mksSandbox-stats" "vmware-vmx" "vmware-vmx-debug" "vmware-vmx-stats" + do + patchelf \ + --add-needed ${libaio}/lib/libaio.so.1 \ + --add-needed ${vulkan-loader}/lib/libvulkan.so.1 \ + --add-needed ${alsa-lib}/lib/libasound.so \ + --add-needed ${libpulseaudio}/lib/libpulse.so.0 \ + --add-needed ${libGL}/lib/libEGL.so.1 \ + --add-needed ${numactl}/lib/libnuma.so.1 \ + --add-needed ${libX11}/lib/libX11.so.6 \ + --add-needed ${libXi}/lib/libXi.so.6 \ + --add-needed ${libGL}/lib/libGL.so.1 \ + $out/lib/vmware/bin/$binary + done + + ## VMware USB Arbitrator + echo "Installing VMware USB Arbitrator" + unpacked="unpacked/vmware-usbarbitrator" + cp -r $unpacked/etc/init.d/* $out/etc/init.d/ + cp -r $unpacked/bin/* $out/bin/ + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-usbarbitrator + + ## VMware Player Setup + echo "Installing VMware Player Setup" + unpacked="unpacked/vmware-player-setup" + mkdir -p $out/lib/vmware/setup + cp $unpacked/vmware-config $out/lib/vmware/setup/ + + ## VMware Network Editor + echo "Installing VMware Network Editor" + unpacked="unpacked/vmware-network-editor" + cp -r $unpacked/lib $out/lib/vmware/ + + ## VMware Tools + Virtual Printer + echo "Installing VMware Tools + Virtual Printer" + mkdir -p $out/lib/vmware/isoimages/ + cp unpacked/vmware-tools-linuxPreGlibc25/linuxPreGlibc25.iso \ + unpacked/vmware-tools-windows/windows.iso \ + unpacked/vmware-tools-winPreVista/winPreVista.iso \ + unpacked/vmware-virtual-printer/VirtualPrinter-Linux.iso \ + unpacked/vmware-virtual-printer/VirtualPrinter-Windows.iso \ + unpacked/vmware-tools-winPre2k/winPre2k.iso \ + unpacked/vmware-tools-linux/linux.iso \ + unpacked/vmware-tools-netware/netware.iso \ + unpacked/vmware-tools-solaris/solaris.iso \ + $out/lib/vmware/isoimages/ + + ## VMware Player Application + echo "Installing VMware Player Application" + unpacked="unpacked/vmware-player-app" + cp -r $unpacked/lib/* $out/lib/vmware/ + cp -r $unpacked/etc/* $out/etc/ + cp -r $unpacked/share/* $out/share/ + cp -r $unpacked/bin/* $out/bin/ + cp -r $unpacked/doc/* $out/share/doc/ # Licences + + mkdir -p $out/etc/thnuclnt + cp -r $unpacked/extras/.thnumod $out/etc/thnuclnt/ + + mkdir -p $out/lib/cups/filter + cp -r $unpacked/extras/thnucups $out/lib/cups/filter/ + + for target in "vmplayer" "vmware-enter-serial" "vmware-setup-helper" "licenseTool" "vmware-mount" "vmware-fuseUI" "vmware-app-control" "vmware-zenity" + do + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/$target + done + + ln -s $out/lib/vmware/bin/vmware-mount $out/bin/vmware-mount + ln -s $out/lib/vmware/bin/vmware-fuseUI $out/bin/vmware-fuseUI + ln -s $out/lib/vmware/bin/vmrest $out/bin/vmrest + + # Patch vmplayer + sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware," $out/bin/vmplayer + sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe," $out/bin/vmplayer + sed -i -e "s,@@BINARY@@,$out/bin/vmplayer," $out/share/applications/vmware-player.desktop + + ## VMware OVF Tool compoment + echo "Installing VMware OVF Tool for Linux" + unpacked="unpacked/vmware-ovftool" + mkdir -p $out/lib/vmware-ovftool/ + + cp -r $unpacked/* $out/lib/vmware-ovftool/ + chmod 755 $out/lib/vmware-ovftool/ovftool* + makeWrapper "$out/lib/vmware-ovftool/ovftool.bin" "$out/bin/ovftool" + + ## VMware Network Editor User Interface + echo "Installing VMware Network Editor User Interface" + unpacked="unpacked/vmware-network-editor-ui" + cp -r $unpacked/share/* $out/share/ + + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-netcfg + ln -s $out/lib/vmware/bin/vmware-netcfg $out/bin/vmware-netcfg + + # Patch network editor ui + + sed -i -e "s,@@BINARY@@,$out/bin/vmware-netcfg," $out/share/applications/vmware-netcfg.desktop + + ## VMware VIX Core Library + echo "Installing VMware VIX Core Library" + unpacked="unpacked/vmware-vix-core" + mkdir -p $out/lib/vmware-vix + cp -r $unpacked/lib/* $out/lib/vmware-vix/ + cp -r $unpacked/bin/* $out/bin/ + cp $unpacked/*.txt $out/lib/vmware-vix/ + + mkdir -p $out/share/doc/vmware-vix/ + cp -r $unpacked/doc/* $out/share/doc/vmware-vix/ + + mkdir -p $out/include/ + cp -r $unpacked/include/* $out/include/ + + ## VMware VIX Workstation-16.0.0 Library + echo "Installing VMware VIX Workstation-16.0.0 Library" + unpacked="unpacked/vmware-vix-lib-Workstation1600" + cp -r $unpacked/lib/* $out/lib/vmware-vix/ + + ## VMware VProbes component for Linux + echo "Installing VMware VProbes component for Linux" + unpacked="unpacked/vmware-vprobe" + cp -r $unpacked/bin/* $out/bin/ + cp -r $unpacked/lib/* $out/lib/vmware/ + + ## VMware Workstation + echo "Installing VMware Workstation" + unpacked="unpacked/vmware-workstation" + cp -r $unpacked/bin/* $out/bin/ + cp -r $unpacked/lib/* $out/lib/vmware/ + cp -r $unpacked/share/* $out/share/ + cp -r $unpacked/man $out/share/ + cp -r $unpacked/doc $out/share/ + + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-tray + ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-vprobe + + # Patch vmware + sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware,g" $out/bin/vmware + sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe,g" $out/bin/vmware + sed -i -e "s,@@BINARY@@,$out/bin/vmware," $out/share/applications/vmware-workstation.desktop + + chmod +x $out/bin/* $out/lib/vmware/bin/* $out/lib/vmware/setup/* + + # Harcoded pkexec hack + for lib in "lib/vmware/lib/libvmware-mount.so/libvmware-mount.so" "lib/vmware/lib/libvmwareui.so/libvmwareui.so" "lib/vmware/lib/libvmware-fuseUI.so/libvmware-fuseUI.so" + do + sed -i -e "s,/usr/local/sbin,/run/vmware/bin," "$out/$lib" + done + + # SUID hack + wrapProgram $out/lib/vmware/bin/vmware-vmx + rm $out/lib/vmware/bin/vmware-vmx + ln -s /run/wrappers/bin/vmware-vmx $out/lib/vmware/bin/vmware-vmx + ''; + + meta = with lib; { + description = "Industry standard desktop hypervisor for x86-64 architecture"; + homepage = "https://www.vmware.com/products/workstation-pro.html"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ deinferno ]; + }; +} diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap b/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap new file mode 100644 index 0000000000000..93787870ec3cf --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap @@ -0,0 +1,11 @@ +PREFIX="@@PREFIXDIR@@" +BINDIR="@@PREFIXDIR@@/bin" +SBINDIR="@@PREFIXDIR@@/sbin" +LIBDIR="@@PREFIXDIR@@/lib" +DATADIR="@@PREFIXDIR@@/share" +SYSCONFDIR="@@PREFIXDIR@@/etc" +DOCDIR="@@PREFIXDIR@@/share/doc" +MANDIR="@@PREFIXDIR@@/share/man" +INCLUDEDIR="@@PREFIXDIR@@/include" +INITDIR="@@PREFIXDIR@@/etc" +INITSCRIPTDIR="@@PREFIXDIR@@/etc/init.d" diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-config b/pkgs/applications/virtualization/vmware-workstation/vmware-config new file mode 100644 index 0000000000000..9b3714bc3136c --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/vmware-config @@ -0,0 +1,21 @@ +.encoding = "UTF-8" +product.name = "VMware Workstation" +product.version = "@@VERSION@@" +product.buildNumber = "@@BUILD@@" +workstation.product.version = "@@VERSION@@" +player.product.version = "@@VERSION@@" +vix.config.version = "1" +bindir = "@@PREFIXDIR@@/bin" +libdir = "@@PREFIXDIR@@/lib/vmware" +vix.libdir = "@@PREFIXDIR@@/lib/vmware-vix" +initscriptdir = "@@PREFIXDIR@@/lib/systemd/scripts" +vmware.fullpath = "@@PREFIXDIR@@/bin/vmware" +authd.fullpath = "@@PREFIXDIR@@/bin/vmware-authd" +gksu.rootMethod = "su" +NETWORKING = "yes" +installerDefaults.autoSoftwareUpdateEnabled = "no" +installerDefaults.dataCollectionEnabled = "no" +installerDefaults.componentDownloadEnabled = "no" +installerDefaults.transferVersion = "1" +acceptOVFEULA = "yes" +acceptEULA = "yes" diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap b/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap new file mode 100644 index 0000000000000..4db8f7a1b458f --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap @@ -0,0 +1,5 @@ +VMWARE_INSTALLER="@@INSTALLERDIR@@" +VERSION="@@IVERSION@@" # For backwards compability +VMISVERSION="@@IVERSION@@" +VMISBUILDNUM="@@BUILD@@" +VMISPYVERSION="39" diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig b/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig new file mode 100644 index 0000000000000..c93a371579667 --- /dev/null +++ b/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig @@ -0,0 +1,8 @@ +#!/bin/bash + +set -e + +ETCDIR=/etc/vmware +. $ETCDIR/bootstrap + +exec "$LIBDIR"/vmware/bin/vmware-zenity --error --text "Reboot is required to load VMware kernel modules (make sure that 'virtualisation.vmware.host.enable' is enabled)" diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index a26f824cd1831..4bc757f27212f 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -45,7 +45,19 @@ stdenv.mkDerivation rec { # A strange type of bug: dbus is not immediately found by pkg-config preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)" + # binutils 2.37 fix + # https://github.com/afterstep/afterstep/issues/2 + fixupList=( + "autoconf/Makefile.defines.in" + "libAfterImage/aftershow/Makefile.in" + "libAfterImage/apps/Makefile.in" + "libAfterBase/Makefile.in" + "libAfterImage/Makefile.in" + ) + for toFix in "''${fixupList[@]}"; do + substituteInPlace "$toFix" --replace "clq" "cq" + done + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)" ''; # Parallel build fails due to missing dependencies between private libaries: diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 2ed6bc303668e..e999a458d13a0 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, freetype, asciidoc +{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, libXdmcp, libXfixes, freetype, asciidoc , xdotool, xorgserver, xsetroot, xterm, runtimeShell , nixosTests }: stdenv.mkDerivation rec { pname = "herbstluftwm"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; - sha256 = "01f1bv9axjhw1l2gwhdwahljssj0h8q7a1bqwbpnwvln0ayv39qb"; + sha256 = "1k03rdr6irsgnjl4w0vac0kk9nsz46qhy74iflmaycxgfv8fxy7f"; }; outputs = [ @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { libXrandr libXft libXrender + libXdmcp + libXfixes freetype ]; @@ -75,7 +77,10 @@ stdenv.mkDerivation rec { pytestFlagsArray = [ "../tests" ]; disabledTests = [ - "test_title_different_letters_are_drawn" + "test_title_different_letters_are_drawn" # font problems + "test_completable_commands" # font problems + "test_autostart" # $PATH problems + "test_wmexec_to_other" # timeouts in sandbox ]; passthru = { diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index 4acc2fb669c6a..deb0c99c313ac 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -28,17 +28,21 @@ stdenv.mkDerivation rec { buildInputs = optional (contains_any scripts perlscripts) perl; nativeBuildInputs = [ makeWrapper ]; - postFixup = '' + postFixup = optionalString (elem "bandwidth" scripts) '' wrapProgram $out/libexec/i3blocks/bandwidth \ - --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute2)} + --prefix PATH : ${makeBinPath [ iproute2 ]} + '' + optionalString (elem "battery" scripts) '' wrapProgram $out/libexec/i3blocks/battery \ - --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)} + --prefix PATH : ${makeBinPath [ acpi ]} + '' + optionalString (elem "cpu_usage" scripts) '' wrapProgram $out/libexec/i3blocks/cpu_usage \ - --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)} + --prefix PATH : ${makeBinPath [ sysstat ]} + '' + optionalString (elem "iface" scripts) '' wrapProgram $out/libexec/i3blocks/iface \ - --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute2)} + --prefix PATH : ${makeBinPath [ iproute2 ]} + '' + optionalString (elem "volume" scripts) '' wrapProgram $out/libexec/i3blocks/volume \ - --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsa-utils)} + --prefix PATH : ${makeBinPath [ alsa-utils ]} ''; meta = with lib; { diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 83406d33961ca..c3d8d96bba4e1 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.9"; + version = "0.21.10"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UbQEPY/Qzu3akWqCTdbhO8V46KyNh/4XCA+PySQyNaw="; + sha256 = "sha256-HtPgl52ysE/CVX706YeKBFc6CgGpHzvHwZoS+DzHADY="; }; - cargoSha256 = "sha256-Bb4kkS0eSg0ue24UIy8f0kwD9w4kSCVTd1OqwEggyVs="; + cargoSha256 = "sha256-ini0AIYwvTskNFMSC+Gy23ohL75PTET95e1mjpjCsWE="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index d24abb68fb7e7..275db56dadaea 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -1,27 +1,54 @@ -{ lib, stdenv, fetchurl, pkg-config -, freetype, fribidi -, libSM, libICE, libXt, libXaw, libXmu -, libXext, libXft, libXpm, libXrandr -, libXrender, xorgproto, libXinerama }: +{ lib +, stdenv +, fetchurl +, freetype +, fribidi +, libICE +, libSM +, libXaw +, libXext +, libXft +, libXinerama +, libXmu +, libXpm +, libXrandr +, libXrender +, libXt +, pkg-config +, xorgproto +}: -with lib; stdenv.mkDerivation rec { - pname = "oroborus"; version = "2.0.20"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext - libXft libXpm libXrandr libXrender xorgproto libXinerama ]; - src = fetchurl { url = "mirror://debian/pool/main/o/oroborus/oroborus_${version}.tar.gz"; - sha256 = "12bvk8x8rfnymbfbwmdcrd9g8m1zxbcq7rgvfdkjr0gnpi0aa82j"; + hash = "sha256-UiClQLz2gSxnc/vlg9nqP1T0UsusVb7cqt66jDqae4k=a"; }; - meta = { + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + freetype + fribidi + libICE + libSM + libXaw + libXext + libXft + libXinerama + libXmu + libXpm + libXrandr + libXrender + libXt + xorgproto + ]; + + meta = with lib; { + homepage = "https://web.archive.org/web/20191129172107/https://www.oroborus.org/"; description = "A really minimalistic X window manager"; - homepage = "https://www.oroborus.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 77a65eef66715..6a37809bb5f55 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-nxQYVWUXT1fNgOTRB3iWCLWYI/STk8vtguTbPPNTHdg="; + sha256 = "sha256-o/0NJZo1EPpXguN/tkUc+/9XaVTQWaLGe+2pU0B91Cg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index e98adefa4476a..7ef4a7d1f6ad5 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { hash = "sha256-Lt/hn/K+CjcmU3Bs5wChiZq0VGNcraH4tSVYsmYnKjc="; }; + strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ]; diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix index caf34e543b7b4..a221eb7a8e65b 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -10,6 +10,7 @@ , slurp , grim , jq +, bash , python3Packages }: @@ -27,8 +28,9 @@ grimshot = stdenv.mkDerivation rec { outputs = [ "out" "man" ]; + strictDeps = true; nativeBuildInputs = [ makeWrapper installShellFiles ]; - + buildInputs = [ bash ]; installPhase = '' installManPage contrib/grimshot.1 diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 727d9b4e6b36b..1b66257513457 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { ./sway-config-nixos-paths.patch ]; + strictDeps = true; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index da23386d41ce8..4b2909eac2160 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "06iq12p4438d6bv3jlqsf01wjaxrzlnj1bnicn41kad563aq41xl"; }; + strictDeps = true; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols ] ++ lib.optionals systemdSupport [ systemd ]; diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index 25714f1f8a94d..6f1f337d23eec 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -7,6 +7,7 @@ , scdoc , wayland , wayland-protocols +, wayland-scanner , libxkbcommon , cairo , gdk-pixbuf @@ -15,20 +16,21 @@ stdenv.mkDerivation rec { pname = "swaylock-effects"; - version = "1.6-3"; + version = "unstable-2021-10-21"; src = fetchFromGitHub { owner = "mortie"; repo = "swaylock-effects"; - rev = "v${version}"; - sha256 = "sha256-71IX0fC4xCPP6pK63KtvDMb3KoP1rw/Iz3S7BgiLSpg="; + rev = "a8fc557b86e70f2f7a30ca9ff9b3124f89e7f204"; + sha256 = "sha256-GN+cxzC11Dk1nN9wVWIyv+rCrg4yaHnCePRYS1c4JTk="; }; postPatch = '' sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc ]; + strictDeps = true; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; mesonFlags = [ @@ -45,6 +47,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ gnxlxnxx ]; + maintainers = with maintainers; [ gnxlxnxx ma27 ]; }; } diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/applications/window-managers/sway/lock-fancy.nix index 8c2a7e91649ab..8ca1dd7787756 100644 --- a/pkgs/applications/window-managers/sway/lock-fancy.nix +++ b/pkgs/applications/window-managers/sway/lock-fancy.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, coreutils, grim, gawk, jq, swaylock -, imagemagick, getopt, fontconfig, wmctrl, makeWrapper +, imagemagick, getopt, fontconfig, wmctrl, makeWrapper, bash }: let @@ -30,7 +30,9 @@ in stdenv.mkDerivation rec { --replace "/usr/share" "$out/share" ''; + strictDeps = true; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index b70160b1dbfd6..970fdfe371fe8 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: @@ -14,6 +14,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY="; }; + patches = [ + # remove once when updating to 1.7 + # https://github.com/swaywm/swaylock/pull/235 + (fetchpatch { + url = "https://github.com/swaywm/swaylock/commit/5a1e6ad79aa7d79b32d36cda39400f3e889b8f8f.diff"; + sha256 = "sha256-ZcZVImUzvng7sluC6q2B5UL8sVunLe4PIfc+tyw48RQ="; + }) + ]; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index c1f531683d70b..1eb9693379e62 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -37,6 +37,7 @@ in symlinkJoin { paths = (optional withBaseWrapper baseWrapper) ++ [ sway ]; + strictDeps = true; nativeBuildInputs = [ makeWrapper ] ++ (optional withGtkWrapper wrapGAppsHook); diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/applications/window-managers/wmfs/default.nix index 83c7d787d8824..eaafac71b6c18 100644 --- a/pkgs/applications/window-managers/wmfs/default.nix +++ b/pkgs/applications/window-managers/wmfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnumake, +{ lib, stdenv, fetchFromGitHub, fetchpatch, libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }: stdenv.mkDerivation { pname = "wmfs"; @@ -12,8 +12,15 @@ stdenv.mkDerivation { rev = "b7b8ff812d28c79cb22a73db2739989996fdc6c2"; }; - nativeBuildInputs = [ - gnumake + patches = [ + # Pull patch pending upstream inclusion to fix build on + # -fno-common toolchain like upstream gcc-10: + # https://github.com/xorg62/wmfs/pull/104 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/xorg62/wmfs/commit/e4ec12618f4689d791892ebb49df9610a25d24d3.patch"; + sha256 = "0qvwry9sikvr85anzha9x4gcx0r2ckwdxqw2in2l6bl9z9d9c0w2"; + }) ]; buildInputs = [ diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix deleted file mode 100644 index 6759e15ee8337..0000000000000 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python2, which -, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: - -stdenv.mkDerivation rec { - rev = "2823"; - version = "hg-2012-12-09"; - pname = "wmii"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip"; - sha256 = "1wmkq14zvmfrmydl8752xz852cy7agrx3qp4fy2cc5asb2r9abaz"; - }; - - # for dlopen-ing - patchPhase = '' - substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "$(pkg-config --variable=libdir xft)/libXft.so.2" - substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which" - ''; - - configurePhase = '' - for file in $(grep -lr '#!.*sh'); do - sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file - done - - cat <<EOF >> config.mk - PREFIX = $out - LIBIXP = ${libixp_hg}/lib/libixp.a - BINSH = ${dash}/bin/dash - EOF - ''; - - nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ libixp_hg txt2tags dash python2 which - libX11 libXrender libXext libXinerama libXrandr libXft ]; - - # For some reason including mercurial in buildInputs did not help - makeFlags = [ "WMII_HGVERSION=hg${rev}" ]; - - meta = { - homepage = "https://suckless.org/"; # https://wmii.suckless.org/ does not exist anymore - description = "A small window manager controlled by a 9P filesystem"; - maintainers = with lib.maintainers; [ kovirobi ]; - license = lib.licenses.mit; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix new file mode 100644 index 0000000000000..11f669da37a6f --- /dev/null +++ b/pkgs/applications/window-managers/wmii/default.nix @@ -0,0 +1,72 @@ +{ lib, stdenv +, fetchFromGitHub +, dash +, libX11 +, libXext +, libXft +, libXinerama +, libXrandr +, libXrender +, libixp +, pkg-config +, txt2tags +, unzip +, which +}: + +stdenv.mkDerivation rec { + pname = "wmii"; + version = "unstable-2022-04-04"; + + src = fetchFromGitHub { + owner = "0intro"; + repo = "wmii"; + rev = "ff120c7fee6e1b3a30a4a800074394327fb1da9d"; + hash = "sha256-KEmWnobpT/5TdgT2HGPCpG1duz9Q6Z6PFSEBs2Ce+7g="; + }; + + # for dlopen-ing + postPatch = '' + substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "$(pkg-config --variable=libdir xft)/libXft.so.2" + substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which" + ''; + + postConfigure = '' + for file in $(grep -lr '#!.*sh'); do + sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file + done + + cat <<EOF >> config.mk + PREFIX = $out + LIBIXP = ${libixp}/lib/libixp.a + BINSH = ${dash}/bin/dash + EOF + ''; + + # Remove optional python2 functionality + postInstall = '' + rm -rf $out/lib/python* $out/etc/wmii-hg/python + ''; + + nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ + dash + libX11 + libXext + libXft + libXinerama + libXrandr + libXrender + libixp + txt2tags + which + ]; + + meta = { + homepage = "https://github.com/0intro/wmii"; + description = "A small, scriptable window manager, with a 9P filesystem interface and an acme-like layout"; + maintainers = with lib.maintainers; [ kovirobi ]; + license = lib.licenses.mit; + platforms = with lib.platforms; linux; + }; +} |